com.typhoon.unitysdk 1.0.9 → 1.0.11

package/Editor/Interactive/test_native.png.meta

@@ -0,0 +1,144 @@
+fileFormatVersion: 2
+guid: 1342752c873f2bd419b0a72b147c5b53
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Editor/InteractiveSources.asset

@@ -0,0 +1,23 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d618400c29489154a8e54a537e920476, type: 3}
+  m_Name: InteractiveSources
+  m_EditorClassIdentifier: 
+  Texture2Ds:
+  - {fileID: 2800000, guid: 09146621f89d84247ad264913de8404d, type: 3}
+  - {fileID: 2800000, guid: 2de72b376d420254393982d84f3f41ca, type: 3}
+  - {fileID: 2800000, guid: d1ec77e647198434784dffd8b02b6e26, type: 3}
+  - {fileID: 2800000, guid: e0465c23f8a29784f9676b2a6e442ef7, type: 3}
+  - {fileID: 2800000, guid: cd0df8fe09ca141488eea923ab165ce1, type: 3}
+  - {fileID: 2800000, guid: 9f6b6c9d98ba08347887bb5a599b29a0, type: 3}
+  - {fileID: 2800000, guid: 4f0dcc93a5975224199b78c2e62b251c, type: 3}
+  - {fileID: 2800000, guid: 1342752c873f2bd419b0a72b147c5b53, type: 3}

package/Editor/{Interactive/SDKInteractiveUI.prefab.meta → InteractiveSources.asset.meta}

@@ -1,7 +1,8 @@
 fileFormatVersion: 2
-guid: e82d5c97ef8f273478aeb7823a1ddade
-PrefabImporter:
+guid: 4abaf8f1a42971b49a97e8d8ab92e730
+NativeFormatImporter:
   externalObjects: {}
+  mainObjectFileID: 11400000
   userData: 
   assetBundleName: 
   assetBundleVariant: 

package/Editor/PreferencesWindow.cs

@@ -7,7 +7,7 @@ using Object = UnityEngine.Object;
 
 namespace TyphoonUnitySDK
 {
-    public class PreferencesWindow : StyleEditorWindow
+    public class PreferencesWindow : EditorWindow
     {
         /// <summary>
         /// 绑定重绘逻辑
@@ -50,9 +50,8 @@ namespace TyphoonUnitySDK
         }
 
 
-        protected override void OnDrawGUI()
+        protected  void OnGUI()
         {
-            base.OnDrawGUI();
             var rect = new Rect(0, 0, position.width, position.height);
             var area = rect;
             area.height -= 8;
@@ -65,7 +64,7 @@ namespace TyphoonUnitySDK
             rectSave.x = area.width - rectSave.width;
             rectSave.x -= 4;
             rectSave.y += 4;
-            if (GUI.Button(rectSave, new GUIContent("保存配置", EditorIcons.icon_save), Styles.rbutton_green))
+            if (GUI.Button(rectSave, new GUIContent("保存配置", EditorIcons.icon_save), Styles.rbutton))
             {
                 EditorUtility.SetDirty(Preferences.Default);
                 AssetDatabase.SaveAssets();
@@ -124,7 +123,7 @@ namespace TyphoonUnitySDK
             var color = GUI.color;
             if (!UniEditor.GradleIsMatch())
             {
-                GUILayout.Label(new GUIContent("未配置gradle路径", EditorIcons.icon_error), Styles.ToolbarBoldLabel,
+                GUILayout.Label(new GUIContent("未配置gradle路径", EditorIcons.icon_error), Styles.rbold_label,
                     GUILayout.Height(24));
                 color = GUI.color;
                 GUI.color = Color.green;
@@ -135,17 +134,17 @@ namespace TyphoonUnitySDK
             }
             else
             {
-                GUILayout.Label(new GUIContent("gradle路径", EditorIcons.icon_success), Styles.ToolbarBoldLabel,
+                GUILayout.Label(new GUIContent("gradle路径", EditorIcons.icon_success), Styles.rbold_label,
                     GUILayout.Height(24));
             }
 
             GUILayout.BeginHorizontal();
-            GUILayout.Label("目录:", Styles.ToolbarBoldLabel, GUILayout.Width(40));
+            GUILayout.Label("目录:", Styles.rbold_title, GUILayout.Width(40),GUILayout.Height(44));
             color = GUI.color;
-            GUI.color = error ? Color.red : color;
+            GUI.color = error ? Color.red*0.7f : color;
             preferences.GradlePath = GUILayout.TextArea(preferences.GradlePath, GUILayout.Height(44));
             GUI.color = color;
-            if (GUILayout.Button("选择", GUILayout.Width(60)))
+            if (GUILayout.Button("选择", GUILayout.Width(60),GUILayout.Height(44)))
             {
                 // 获取当前用户的 Windows 用户文件夹路径
                 var userFolder = UniEditor.GetWindowUserFolder();

package/Editor/PublishSettingGUIDrawer.cs

@@ -141,6 +141,7 @@ namespace TyphoonUnitySDK
         /*重绘EnableSignature*/
         private static bool DrawProperty_EnableSignature(PublishSetting setting)
         {
+           
             return setting.BuildTarget != BuildTarget.Android;
         }
 
@@ -256,7 +257,9 @@ namespace TyphoonUnitySDK
 
             GUILayout.BeginHorizontal();
             GUILayout.Label("关联profile", GUILayout.Width(142));
-            if (GUILayout.Button(setting.AAUseProfile, Styles.DropDownButtonLeft))
+            var txt = setting.AAUseProfile;
+            txt = string.IsNullOrEmpty(txt) ? "请选择" : txt;
+            if (GUILayout.Button(txt, Styles.DropDownButtonLeft))
             {
                 AddressableSupport.PopUpProfileSelectorMenu(setting);
             }

package/Editor/PublishVivoBatSettingWindow.cs

@@ -3,7 +3,7 @@ using UnityEngine;
 
 namespace TyphoonUnitySDK
 {
-    public class PublishVivoBatSettingWindow : StyleEditorWindow
+    public class PublishVivoBatSettingWindow : EditorWindow
     {
         [MenuItem("临时发布/发布vivo", priority = 10000)]
         public static void Open()
@@ -36,9 +36,8 @@ namespace TyphoonUnitySDK
         }
 
 
-        protected override void OnDrawGUI()
+        protected  void OnGUI()
         {
-            base.OnDrawGUI();
             var rect = new Rect(0, 0, position.width, position.height);
             var area = rect;
             area.height -= 8;
@@ -52,7 +51,7 @@ namespace TyphoonUnitySDK
             rectSave.x -= 4;
             GUILayout.Space(36);
             Editor.OnInspectorGUI();
-            if (GUI.Button(rectSave, new GUIContent("保存配置", EditorIcons.icon_save), Styles.rbutton_green))
+            if (GUI.Button(rectSave, new GUIContent("保存配置", EditorIcons.icon_save), Styles.rbutton_bold))
             {
                 EditorUtility.SetDirty(PublishVivoBatSetting.Default);
                 AssetDatabase.SaveAssets();

package/Editor/PublishWindow.cs

@@ -5,7 +5,7 @@ using UnityEngine;
 
 namespace TyphoonUnitySDK
 {
-    public class PublishWindow : StyleEditorWindow
+    public class PublishWindow : EditorWindow
     {
         //锁定，未开放
         private static HashSet<AppChannel> _LockChannel = new HashSet<AppChannel>()
@@ -76,9 +76,9 @@ namespace TyphoonUnitySDK
             ReloadSettings();
         }
 
-        protected override void OnDrawGUI()
+        protected  void OnGUI()
         {
-            base.OnDrawGUI();
+            
             var temEnable = GUI.enabled;
             if (EditorApplication.isPlaying)
             {
@@ -89,7 +89,9 @@ namespace TyphoonUnitySDK
             var rect = new Rect(0, 0, position.width, position.height);
             if (EditorApplication.isCompiling)
             {
-                GUI.TextArea(rect, "编译中,请稍等...\n\r", Styles.rbold_label);
+                var tipRect = rect;
+                tipRect.height = 44;
+                GUI.TextArea(tipRect, "编译中,请稍等...\n\r", Styles.rbold_title);
             }
             else
             {
@@ -120,23 +122,24 @@ namespace TyphoonUnitySDK
             rectToolbar.height = 22;
             GUILayout.BeginArea(rectToolbar);
             GUILayout.BeginHorizontal();
-            GUILayout.Label("发布配置", Styles.ToolbarBoldLabel);
-            if (GUILayout.Button(new GUIContent(EditorIcons.icon_import, "导入常用配置"), Styles.toolbarbuttonRight,
-                    GUILayout.Width(40)))
+            GUILayout.Label("发布配置", Styles.rbold_label,GUILayout.Width(110));
+            GUILayout.Space(1);
+            if (GUILayout.Button(new GUIContent(EditorIcons.icon_import, "导入常用配置"), Styles.rbutton,
+                    GUILayout.Width(40),GUILayout.Height(20)))
             {
                 UniEditor.ImportPackage(UniEditor.PackagePath_PublishSetting);
             }
-
-            if (GUILayout.Button(new GUIContent(EditorIcons.icon_refresh, "刷新"), Styles.toolbarbuttonRight,
-                    GUILayout.Width(40)))
+            GUILayout.Space(1);
+            if (GUILayout.Button(new GUIContent(EditorIcons.icon_refresh, "刷新"), Styles.rbutton,
+                    GUILayout.Width(40),GUILayout.Height(20)))
             {
                 ReloadSettings();
                 Repaint();
             }
+            GUILayout.Space(1);
 
-
-            if (GUILayout.Button(new GUIContent(EditorIcons.icon_extension, "更多"), Styles.toolbarbuttonRight,
-                    GUILayout.Width(40)))
+            if (GUILayout.Button(new GUIContent(EditorIcons.icon_extension, "更多"), Styles.rbutton,
+                    GUILayout.Width(40),GUILayout.Height(20)))
             {
                 var menu = new GenericMenu();
                 menu.AddItem(new GUIContent("导入常用配置"), false,
@@ -149,7 +152,10 @@ namespace TyphoonUnitySDK
             var rectSearch = rectLeftMenu;
             rectSearch.y = rectToolbar.yMax;
             rectSearch.height = 22;
-            InputTxtSearchSetting = GUI.TextField(rectSearch, InputTxtSearchSetting, Styles.SearchTextField);
+            InputTxtSearchSetting = GUI.TextField(rectSearch, InputTxtSearchSetting);
+            if(string.IsNullOrEmpty(InputTxtSearchSetting)){
+                GUI.Label(rectSearch,"搜索...",Styles.rlabel_italic);
+            }
 
             /*绘制菜单栏*/
             var rectPos = rectLeftMenu;
@@ -194,6 +200,14 @@ namespace TyphoonUnitySDK
                     {
                         _select = setting;
                     }
+
+                    if (_LockChannel.Contains(setting.Channel))
+                    {
+                        var lockRect = rectItem;
+                        lockRect.width = 60;
+                        lockRect.x = rectItem.xMax - lockRect.width;
+                        GUI.Label(lockRect,"未开放");
+                    }
                 }
 
                 index += 1;
@@ -204,7 +218,7 @@ namespace TyphoonUnitySDK
             {
                 var rectImport = rectPos;
                 rectImport.height = MENU_ITEM_HEIGHT;
-                if (GUI.Button(rectImport, new GUIContent("导入常用配置", EditorIcons.icon_import), Styles.rbutton_left))
+                if (GUI.Button(rectImport, new GUIContent("导入常用配置", EditorIcons.icon_import), Styles.rbutton))
                 {
                     UniEditor.ImportPackage(UniEditor.PackagePath_PublishSetting);
                 }
@@ -227,16 +241,19 @@ namespace TyphoonUnitySDK
             rectContent.height -= 8;
             rectContent.width -= 8;
             rectContent.center = rect.center;
+          
             if (_select == null)
             {
-                GUI.TextArea(rectContent, "请选择配置...\n\r初次使用,可从左侧菜单栏中导入常用配置", Styles.rbold_label);
+                var tipRect = rectContent;
+                tipRect.height = 44;
+                GUI.TextArea(tipRect, "请选择配置...\n\r初次使用,可从左侧菜单栏中导入常用配置", Styles.rbold_title);
             }
             else
             {
                 var rectTitle = rectContent;
                 rectTitle.height = 32;
-                EditorGUI.DrawRect(rectTitle, new Color(0.17f, 0.17f, 0.17f, 1f));
-                GUI.Label(rectTitle, $"{_select.name}", Styles.ToolbarTitleLab);
+                EditorGUI.DrawRect(rectTitle, Skins.PublishWindowTitleBgColor);
+                GUI.Label(rectTitle, $"{_select.name}", Styles.rbold_title);
                 var rectSave = rectTitle;
                 rectSave.width = 60;
                 rectSave.x = rectTitle.xMax - rectSave.width;
@@ -286,7 +303,7 @@ namespace TyphoonUnitySDK
                 var rectBtnPublish = rectArea;
                 rectBtnPublish.width = 128;
                 rectBtnPublish.x = rectArea.xMax - rectBtnPublish.width;
-                bool clickPublish = GUI.Button(rectBtnPublish, "发布", Styles.rbutton_green);
+                bool clickPublish = GUI.Button(rectBtnPublish, "发布", Styles.rbutton_bold);
 
                 var rectNextBtn = rectBtnPublish;
                 rectNextBtn.x -= 2;
@@ -295,16 +312,16 @@ namespace TyphoonUnitySDK
                 var index = 0;
                 if (UniEditor.HasAddressableSupport())
                 {
-                    clickBuildAA = GUI.Button(rectNextBtn, "构建AA", Styles.rbutton_yellow);
+                    clickBuildAA = GUI.Button(rectNextBtn, "构建AA", Styles.rbutton_bold);
                     rectNextBtn.x -= 2;
                     rectNextBtn.x -= rectNextBtn.width;
                 }
 
-                bool clickApply = GUI.Button(rectNextBtn, "应用", Styles.rbutton_blue);
+                bool clickApply = GUI.Button(rectNextBtn, "应用", Styles.rbutton_bold);
                 GUILayout.EndArea();
                 var rectBarLine = rectBar;
                 rectBarLine.height = 2;
-                EditorGUI.DrawRect(rectBar, Color.black * 0.2f);
+                // EditorGUI.DrawRect(rectBar, Color.black * 0.2f);
 
                 if (clickApply)
                 {
@@ -327,13 +344,6 @@ namespace TyphoonUnitySDK
                 }
 
                 GUI.enabled = temEnable;
-                if (isLocked)
-                {
-                    var temColor = GUI.color;
-                    GUI.color = Color.red;
-                    GUI.Label(rectBar, "未开放", Styles.ToolbarTitleLab);
-                    GUI.color = temColor;
-                }
             }
         }