com.typhoon.unitysdk 1.0.90 → 1.0.92

package/CHANGELOG.md

@@ -1,7 +1,19 @@
 # 更新日志
-## [1.0.90] - 2024-01-07
+## [1.0.92] - 2024-01-13
 
 ### 修复
+* 输入框中文bug
+
+
+## [1.0.91] - 2024-01-13
+
+### 修复
+* 样式出错问题
+
+
+## [1.0.90] - 2024-01-07
+
+### 修复
 * 字体丢失问题
 
 

package/Editor/GUIDrawer.cs

@@ -98,7 +98,7 @@ namespace TyphoonUnitySDK
         {
             var click = GUILayout.Button(
                 new GUIContent($"{content}", foldout ? EditorIcons.icon_drop_arrow : EditorIcons.icon_arrow_right),
-                Styles.TitleFoldoutButton, option);
+                Styles.Square.BtnLeft, option);
             if (click)
             {
                 return !foldout;

package/Editor/HistoryVersionWindow.cs

@@ -124,7 +124,7 @@ namespace TyphoonUnitySDK
         {
             if (History.Count <= 0)
             {
-                GUILayout.Label("读取失败，请检查更新后再重试", Styles.BoldTitle);
+                GUILayout.Label("读取失败，请检查更新后再重试", Styles.BoldLabel);
             }
             else
             {
@@ -146,6 +146,8 @@ namespace TyphoonUnitySDK
                 rectRight.width = rect.xMax - rectRight.x;
                 DrawRightGUI(rectRight);
             }
+
+            Repaint();
         }
 
         private void DrawLeftMenu(Rect rect)
@@ -156,7 +158,7 @@ namespace TyphoonUnitySDK
             rectView.height -= 8;
             rectView.center = center;
             GUILayout.BeginArea(rectView);
-            _inputSearch = GUILayout.TextField(_inputSearch);
+            _inputSearch = EditorGUILayout.TextField(_inputSearch);
             var low = string.IsNullOrWhiteSpace(_inputSearch) ? null : _inputSearch.ToLower();
             _scroll = GUILayout.BeginScrollView(_scroll);
 
@@ -240,7 +242,7 @@ namespace TyphoonUnitySDK
                     title += $" [重大修复版本]";
                 }
 
-                GUILayout.Label(title, Styles.BoldTitle, GUILayout.Height(24));
+                GUILayout.Label(title, Styles.BoldLabel, GUILayout.Height(24));
                 GUILayout.Label($"发布时间: {_select.GetPublishTimeString()}", Styles.ItalicLabel);
                 GUILayout.Space(5);
                 GUILayout.Label("版本更新日志:", Styles.BoldLabel);
@@ -289,7 +291,7 @@ namespace TyphoonUnitySDK
                 var used = CurrentVersion.Version == _select.Version;
                 GUI.enabled = !used;
                 var txt = used ? "使用中" : $"安装";
-                if (GUI.Button(draw, txt, Styles.BoldButton))
+                if (GUI.Button(draw, txt, Styles.BtnGreen))
                 {
                     UniEditor.UpdateInstallVersion(_select);
                 }

package/Editor/OppoMiniConfig.cs

@@ -64,7 +64,7 @@ namespace TyphoonUnitySDK
         private static bool DrawProperty_EnableTrack(OppoMiniConfig arg)
         {
             GUILayout.Space(10);
-            GUILayout.Label("事件上报", Styles.BoldTitle);
+            GUILayout.Label("事件上报", Styles.BoldLabel);
             GUILayout.BeginHorizontal();
             GUILayout.Label("开启事件上报", GUILayout.Width(146));
             GUIDrawer.DrawPopUpToggle(arg.EnableTrack, (v) => arg.EnableTrack = v);
@@ -96,7 +96,7 @@ namespace TyphoonUnitySDK
         private static bool DrawProperty_PrivacyPolicy(OppoMiniConfig arg)
         {
             GUILayout.Space(10);
-            GUILayout.Label("隐私政策", Styles.BoldTitle);
+            GUILayout.Label("隐私政策", Styles.BoldLabel);
             arg.PrivacyPolicyImage =
                 (Texture)EditorGUILayout.ObjectField("文案长图", arg.PrivacyPolicyImage, typeof(Texture), false);
             GUIDrawer.DrawKeynotes("文本转长图在线转换工具：（点击链接跳转）");
@@ -253,7 +253,7 @@ namespace TyphoonUnitySDK
         private static bool DrawProperty_BannerEnable(OppoMiniConfig arg)
         {
             GUILayout.Space(10);
-            GUILayout.Label("广告参数", Styles.BoldTitle);
+            GUILayout.Label("广告参数", Styles.BoldLabel);
             GUILayout.BeginHorizontal();
             GUILayout.Label("Banner开关", GUILayout.Width(146));
             GUIDrawer.DrawPopUpToggle(arg.BannerEnable, (v) => arg.BannerEnable = v);
@@ -284,7 +284,7 @@ namespace TyphoonUnitySDK
             btnNewRect.height -= 4;
             btnNewRect.center = center;
             btnNewRect.x = last.xMax - btnNewRect.width - 2;
-            if (GUI.Button(btnNewRect, "创建签名", Styles.BoldButton))
+            if (GUI.Button(btnNewRect, "创建签名", Styles.Square.Btn))
             {
                 //创建openssl 签名
                 UniEditor.CreateOpensslKeystore();
@@ -297,7 +297,7 @@ namespace TyphoonUnitySDK
         {
             GUILayout.Space(10);
 
-            GUILayout.Label("签名", Styles.BoldTitle);
+            GUILayout.Label("签名", Styles.BoldLabel);
             GUILayout.BeginHorizontal();
             arg.PrivatePem = EditorGUILayout.TextField("private.pem", arg.PrivatePem);
             if (GUILayout.Button("选择", GUILayout.Width(60)))
@@ -324,7 +324,7 @@ namespace TyphoonUnitySDK
             rectBtn.y += 2;
             rectBtn.x = last.xMax - rectBtn.width;
             rectBtn.x -= 2;
-            if (GUI.Button(rectBtn, "自动版本号", Styles.BoldButton))
+            if (GUI.Button(rectBtn, "自动版本号", Styles.Square.BtnBlue))
             {
                 arg.VersionCode += 1;
                 try
@@ -360,7 +360,7 @@ namespace TyphoonUnitySDK
         private static bool DrawProperty_VersionName(OppoMiniConfig arg)
         {
             GUILayout.Space(10);
-            GUILayout.Label("版本信息", Styles.BoldTitle);
+            GUILayout.Label("版本信息", Styles.BoldLabel);
             arg.VersionName = EditorGUILayout.TextField("版本名", arg.VersionName);
             return true;
         }

package/Editor/PreferencesWindow.cs

@@ -27,8 +27,7 @@ namespace TyphoonUnitySDK
             rectTitle.x += 4;
             rectTitle.width -= 8;
             rectTitle.height = 32;
-            EditorGUI.DrawRect(rectTitle, Styles.TitleBgColor);
-            GUI.Label(rectTitle, "选项", Styles.BoldTitle);
+            GUI.Label(rectTitle, "选项", Styles.TitleBar);
 
             var rectSave = rectTitle;
             rectSave.width = 90;

package/Editor/PublishSettingGUIDrawer.cs

@@ -462,7 +462,7 @@ namespace TyphoonUnitySDK
                     menu.ShowAsContext();
                 }
 
-                modify.VariableValue = GUILayout.TextField(modify.VariableValue);
+                modify.VariableValue = EditorGUILayout.TextField(modify.VariableValue);
                 GUILayout.EndHorizontal();
             }
 
@@ -580,7 +580,7 @@ namespace TyphoonUnitySDK
                 }
 
                 var tem = modify.VariableValue;
-                modify.VariableValue = GUILayout.TextField(modify.VariableValue);
+                modify.VariableValue = EditorGUILayout.TextField(modify.VariableValue);
                 if (tem != modify.VariableValue)
                 {
                     VariablePreset.Default.Modify(modify.VariableName, modify.VariableValue);

package/Editor/PublishSettingInspector.cs

@@ -11,12 +11,12 @@ namespace TyphoonUnitySDK
         public override void OnInspectorGUI()
         {
             base.OnInspectorGUI();
-            if (GUILayout.Button("应用", Styles.BlueButton, GUILayout.Height(32)))
+            if (GUILayout.Button("应用", Styles.Square.BtnGreen, GUILayout.Height(32)))
             {
                 Target.Apply();
             }
 
-            if (GUILayout.Button("发布", Styles.BlueButton, GUILayout.Height(32)))
+            if (GUILayout.Button("发布", Styles.Square.BtnBlue, GUILayout.Height(32)))
             {
                 Target.Apply();
             }

package/Editor/PublishWindow.cs

@@ -144,7 +144,7 @@ namespace TyphoonUnitySDK
             {
                 var tipRect = rect;
                 tipRect.height = 44;
-                GUI.TextArea(tipRect, "编译中,请稍等...\n\r", Styles.BoldTitle);
+                GUI.TextArea(tipRect, "编译中,请稍等...\n\r", Styles.BoldLabel);
             }
             else
             {
@@ -177,21 +177,21 @@ namespace TyphoonUnitySDK
             GUILayout.BeginHorizontal();
             GUILayout.Label("发布配置", Styles.BoldLabel, GUILayout.Width(70));
             GUILayout.Space(1);
-            if (GUILayout.Button(new GUIContent(EditorIcons.icon_import, "导入常用配置"), Styles.Button,
+            if (GUILayout.Button(new GUIContent(EditorIcons.icon_import, "导入常用配置"), Styles.Square.Btn,
                     GUILayout.Width(40), GUILayout.Height(20)))
             {
                 UniEditor.ImportPackage(UniEditor.PackagePath_PublishSetting);
             }
 
             GUILayout.Space(1);
-            if (GUILayout.Button(new GUIContent(EditorIcons.icon_variable, "自定义变量"), Styles.Button,
+            if (GUILayout.Button(new GUIContent(EditorIcons.icon_variable, "自定义变量"), Styles.Square.Btn,
                     GUILayout.Width(40), GUILayout.Height(20)))
             {
                 VariablePresetWindow.Open();
             }
 
             GUILayout.Space(1);
-            if (GUILayout.Button(new GUIContent(EditorIcons.icon_refresh, "刷新"), Styles.Button,
+            if (GUILayout.Button(new GUIContent(EditorIcons.icon_refresh, "刷新"), Styles.Square.Btn,
                     GUILayout.Width(40), GUILayout.Height(20)))
             {
                 ReloadSettings();
@@ -200,7 +200,7 @@ namespace TyphoonUnitySDK
 
             GUILayout.Space(1);
 
-            if (GUILayout.Button(new GUIContent(EditorIcons.icon_extension, "更多"), Styles.Button,
+            if (GUILayout.Button(new GUIContent(EditorIcons.icon_extension, "更多"), Styles.Square.Btn,
                     GUILayout.Width(40), GUILayout.Height(20)))
             {
                 var menu = new GenericMenu();
@@ -214,8 +214,10 @@ namespace TyphoonUnitySDK
             var rectSearch = rectLeftMenu;
             rectSearch.y = rectToolbar.yMax;
             rectSearch.height = 22;
-            InputTxtSearchSetting = GUI.TextField(rectSearch, InputTxtSearchSetting);
-            if (string.IsNullOrEmpty(InputTxtSearchSetting))
+            var searchControl = $"{nameof(PublishWindow)}.InputTxtSearchSetting";
+            GUI.SetNextControlName(searchControl);
+            InputTxtSearchSetting = EditorGUI.TextField(rectSearch, InputTxtSearchSetting);
+            if (string.IsNullOrEmpty(InputTxtSearchSetting) && GUI.GetNameOfFocusedControl() != searchControl)
             {
                 GUI.Label(rectSearch, "搜索...", Styles.ItalicLabel);
             }
@@ -249,7 +251,7 @@ namespace TyphoonUnitySDK
                 rectItem.height = MENU_ITEM_HEIGHT - 2;
                 if (setting != null)
                 {
-                    var style = _select == setting ? Styles.MenuButtonActive : Styles.MenuButtonNormal;
+                    var style = _select == setting ? Styles.Square.MenuButtonActive : Styles.Square.MenuButton;
 
                     if (Event.current.type == EventType.MouseDown && rectItem.Contains(Event.current.mousePosition))
                     {
@@ -276,7 +278,7 @@ namespace TyphoonUnitySDK
                         var lockRect = rectItem;
                         lockRect.width = 60;
                         lockRect.x = rectItem.xMax - lockRect.width;
-                        GUI.Label(lockRect, "未开放", Styles.ItalicLabel);
+                        GUI.Label(lockRect, "未开放", Styles.ItalicLabelMiddle);
                     }
                 }
 
@@ -288,7 +290,7 @@ namespace TyphoonUnitySDK
             {
                 var rectImport = rectPos;
                 rectImport.height = MENU_ITEM_HEIGHT;
-                if (GUI.Button(rectImport, new GUIContent("导入常用配置", EditorIcons.icon_import), Styles.Button))
+                if (GUI.Button(rectImport, new GUIContent("导入常用配置", EditorIcons.icon_import), Styles.Square.Btn))
                 {
                     UniEditor.ImportPackage(UniEditor.PackagePath_PublishSetting);
                 }
@@ -321,7 +323,9 @@ namespace TyphoonUnitySDK
             rect.width -= 4;
             rect.height -= 4;
             rect.center = center;
-            GUILayout.BeginArea(rect);
+            var labRect = rect;
+            labRect.width -= 70;
+            GUILayout.BeginArea(labRect);
 
             GUIDrawer.DrawKeynotes(
                 $"当前 {CurrentVersionInfo.Version} {CurrentVersionInfo.GetWriteTimeDateString()}");
@@ -347,7 +351,7 @@ namespace TyphoonUnitySDK
             draw.width -= 4;
             draw.height -= 4;
             draw.center = center;
-            if (GUI.Button(draw, "检查更新", Styles.Button))
+            if (GUI.Button(draw, "检查更新"))
             {
                 UniEditor.ManualCheckNewVersion();
             }
@@ -359,7 +363,7 @@ namespace TyphoonUnitySDK
             draw.width -= 4;
             draw.height -= 4;
             draw.center = center;
-            if (GUI.Button(draw, "所有版本", Styles.Button))
+            if (GUI.Button(draw, "所有版本"))
             {
                 if (CheckUpdateCacheData.Default.AllVersions.Count < 0)
                 {
@@ -379,7 +383,7 @@ namespace TyphoonUnitySDK
             draw.width -= 4;
             draw.height -= 4;
             draw.center = center;
-            if (GUI.Button(draw, "说明文档", Styles.Button))
+            if (GUI.Button(draw, "说明文档"))
             {
                 //读取所有历史版本，弹出右键菜单
                 UniEditor.OpenDoc();
@@ -416,14 +420,13 @@ namespace TyphoonUnitySDK
             {
                 var tipRect = rectContent;
                 tipRect.height = 44;
-                GUI.TextArea(tipRect, "请选择配置...\n\r初次使用,可从左侧菜单栏中导入常用配置", Styles.BoldTitle);
+                GUI.TextArea(tipRect, "请选择配置...\n\r初次使用,可从左侧菜单栏中导入常用配置", Styles.BoldLabel);
             }
             else
             {
                 var rectTitle = rectContent;
                 rectTitle.height = 32;
-                EditorGUI.DrawRect(rectTitle, Styles.TitleBgColor);
-                GUI.Label(rectTitle, $"{_select.name}", Styles.BoldTitle);
+                GUI.Label(rectTitle, $"{_select.name}", Styles.TitleBar);
                 var rectSave = rectTitle;
                 rectSave.width = 90;
                 rectSave.x = rectTitle.xMax - rectSave.width;
@@ -431,7 +434,7 @@ namespace TyphoonUnitySDK
                 rectSave.width -= 8;
                 rectSave.height -= 8;
                 rectSave.center = center;
-                if (GUI.Button(rectSave, new GUIContent("保存配置", EditorIcons.icon_save)))
+                if (GUI.Button(rectSave, new GUIContent("保存配置", EditorIcons.icon_save), Styles.Square.Btn))
                 {
                     EditorUtility.SetDirty(_select);
                     ApplyTool.SaveAllChannelConfig();
@@ -474,7 +477,7 @@ namespace TyphoonUnitySDK
                 var rectBtnPublish = rectArea;
                 rectBtnPublish.width = 128;
                 rectBtnPublish.x = rectArea.xMax - rectBtnPublish.width;
-                bool clickPublish = GUI.Button(rectBtnPublish, "发布", Styles.BoldButton);
+                bool clickPublish = GUI.Button(rectBtnPublish, "发布", Styles.Square.BtnBold);
 
                 var rectNextBtn = rectBtnPublish;
                 rectNextBtn.x -= 2;
@@ -482,12 +485,12 @@ namespace TyphoonUnitySDK
                 bool clickBuildAA = false;
                 if (UniEditor.HasAddressableSupport())
                 {
-                    clickBuildAA = GUI.Button(rectNextBtn, "构建AA", Styles.BoldButton);
+                    clickBuildAA = GUI.Button(rectNextBtn, "构建AA", Styles.Square.BtnBold);
                     rectNextBtn.x -= 2;
                     rectNextBtn.x -= rectNextBtn.width;
                 }
 
-                bool clickApply = GUI.Button(rectNextBtn, "应用", Styles.BoldButton);
+                bool clickApply = GUI.Button(rectNextBtn, "应用", Styles.Square.BtnBold);
 
                 foreach (var bottomGUI in ExtensionBottomGUI)
                 {