diff --git a/Editor/AlicizaX.EditorExtension.Editor.asmdef b/Editor/AlicizaX.EditorExtension.Editor.asmdef index eabc31b..59d69b9 100644 --- a/Editor/AlicizaX.EditorExtension.Editor.asmdef +++ b/Editor/AlicizaX.EditorExtension.Editor.asmdef @@ -9,7 +9,8 @@ "GUID:acfef7cabed3b0a42b25edb1cd4fa259", "GUID:2765e68924a08a94ea0ea66b31c0168f", "GUID:1619e00706139ce488ff80c0daeea8e7", - "GUID:2373f786d14518f44b0f475db77ba4de" + "GUID:2373f786d14518f44b0f475db77ba4de", + "GUID:fb064c8bf96bac94e90d2f39090daa94" ], "includePlatforms": [ "Editor" diff --git a/Editor/Build/BuildCLI/AppBuildHelper.cs b/Editor/Build/BuildCLI/AppBuildHelper.cs index a1e002d..f428e6f 100644 --- a/Editor/Build/BuildCLI/AppBuildHelper.cs +++ b/Editor/Build/BuildCLI/AppBuildHelper.cs @@ -9,7 +9,7 @@ using UnityEngine; public static class AppBuildHelper { - public static void GeneratAppBuilderSetting(Language language, bool debugMode, int resMode) + public static void GeneratAppBuilderSetting(string language, bool debugMode, int resMode) { const string AppBuilderSettingPath = "Assets/Resources/AppBuilderSetting.bytes"; AppBuilderSetting appBuilderSetting = new AppBuilderSetting(); diff --git a/Editor/Build/BuildCLI/BuildParameter.cs b/Editor/Build/BuildCLI/BuildParameter.cs index ee26ef8..6d12a13 100644 --- a/Editor/Build/BuildCLI/BuildParameter.cs +++ b/Editor/Build/BuildCLI/BuildParameter.cs @@ -15,7 +15,7 @@ public class AppBuildParameter public bool DevelopBuild; public int ResMode; public string FileName; - public Language Language; + public string Language; public string[] Scenes; /// diff --git a/Editor/EditorIcons.cs b/Editor/EditorIcons.cs index 2be3d60..3473a9a 100644 --- a/Editor/EditorIcons.cs +++ b/Editor/EditorIcons.cs @@ -9,7 +9,7 @@ using System.IO; public class EditorIcons : EditorWindow { - [MenuItem("Tools/EditorExtension/Editor Icons %e", priority = -1001)] + [MenuItem("Tools/Extension/Editor Icons %e", priority = -1001)] public static void EditorIconsOpen() { #if UNITY_2018 diff --git a/Editor/Postprocessor/Atlas/AtlasEditorWindow.cs b/Editor/Postprocessor/Atlas/AtlasEditorWindow.cs index aa638de..9117026 100644 --- a/Editor/Postprocessor/Atlas/AtlasEditorWindow.cs +++ b/Editor/Postprocessor/Atlas/AtlasEditorWindow.cs @@ -5,7 +5,7 @@ using UnityEngine; public class AtlasConfigWindow : EditorWindow { - [MenuItem("Tools/EditorExtension/图集工具/Configuration Panel")] + [MenuItem("Tools/Extension/图集工具/Configuration Panel")] public static void ShowWindow() { GetWindow("Atlas Config").minSize = new Vector2(500, 600); diff --git a/Editor/Postprocessor/Atlas/EditorSpriteSaveInfo.cs b/Editor/Postprocessor/Atlas/EditorSpriteSaveInfo.cs index 78691c1..5298971 100644 --- a/Editor/Postprocessor/Atlas/EditorSpriteSaveInfo.cs +++ b/Editor/Postprocessor/Atlas/EditorSpriteSaveInfo.cs @@ -110,7 +110,7 @@ public static class EditorSpriteSaveInfo } } - [MenuItem("Tools/EditorExtension/图集工具/ForceGenerateAll")] + [MenuItem("Tools/Extension/图集工具/ForceGenerateAll")] public static void ForceGenerateAll() { _atlasMap.Clear(); diff --git a/Editor/ReferenceFinder/ResourceReferenceInfo.cs b/Editor/ReferenceFinder/ResourceReferenceInfo.cs index 1010faa..1ccad68 100644 --- a/Editor/ReferenceFinder/ResourceReferenceInfo.cs +++ b/Editor/ReferenceFinder/ResourceReferenceInfo.cs @@ -40,7 +40,7 @@ namespace TEngine.Editor mAssetTreeView?.OnGUI(new Rect(0, _toolbarGUIStyle.fixedHeight, position.width, position.height - _toolbarGUIStyle.fixedHeight)); } - [MenuItem("Tools/EditorExtension/查找资产引用 _F10", false, 100)] + [MenuItem("Tools/Extension/查找资产引用 _F10", false, 100)] public static void FindRef() { InitDataIfNeeded(); diff --git a/Editor/ToolBarExtension/LocalizationDropdownField.cs b/Editor/ToolBarExtension/LocalizationDropdownField.cs index 55aef23..c4d40a3 100644 --- a/Editor/ToolBarExtension/LocalizationDropdownField.cs +++ b/Editor/ToolBarExtension/LocalizationDropdownField.cs @@ -1,6 +1,8 @@ using System; +using System.Linq; using AlicizaX.Localization.Runtime; using AlicizaX; +using AlicizaX.Localization.Editor; using Paps.UnityToolbarExtenderUIToolkit; using UnityEditor; using UnityEngine; @@ -15,12 +17,7 @@ public class LocalizationDropdownField : IMGUIContainer public void InitializeElement() { - var nameArray = Enum.GetNames(typeof(Language)); - _languageTypeNames = new string[nameArray.Length]; - for (int i = 0; i < nameArray.Length; i++) - { - _languageTypeNames[i] = nameArray[i]; - } + _languageTypeNames = LocalizationConfiguration.Instance.LanguageTypeNames.ToArray(); appConfigBtContent = EditorGUIUtility.TrTextContentWithIcon("", "", @@ -31,7 +28,7 @@ public class LocalizationDropdownField : IMGUIContainer private void MyGUIMethod() { GUILayout.BeginHorizontal(); - string title = _languageTypeNames[GetPrefsIndex()]; + string title = GetPrefsStr(); appConfigBtContent.text = title; if (EditorGUILayout.DropdownButton(appConfigBtContent, FocusType.Passive, EditorStyles.toolbarPopup, GUILayout.MaxWidth(120))) { @@ -44,26 +41,26 @@ public class LocalizationDropdownField : IMGUIContainer static void DrawEditorToolDropdownMenus() { - int index = GetPrefsIndex(); + string langaugeName = GetPrefsStr(); GenericMenu popMenu = new GenericMenu(); for (int i = 0; i < _languageTypeNames.Length; i++) { - var selected = index == i; var toolAttr = _languageTypeNames[i]; - popMenu.AddItem(new GUIContent(toolAttr), selected, menuIdx => { ClickToolsSubmenu((int)menuIdx); }, i); + var selected = langaugeName == toolAttr; + popMenu.AddItem(new GUIContent(toolAttr), selected, menuIdx => { ClickToolsSubmenu(toolAttr); }, toolAttr); } popMenu.ShowAsContext(); } - static void ClickToolsSubmenu(int menuIdx) + static void ClickToolsSubmenu(string langaugeName) { - EditorPrefs.SetInt(LocalizationComponent.PrefsKey, menuIdx); - Debug.Log(((Language)menuIdx).ToString()); + EditorPrefs.SetString(LocalizationComponent.PrefsKey, langaugeName); + Debug.Log(langaugeName); } - static int GetPrefsIndex() + static string GetPrefsStr() { - return EditorPrefs.GetInt(LocalizationComponent.PrefsKey, 1); + return EditorPrefs.GetString(LocalizationComponent.PrefsKey, "None"); } } diff --git a/Editor/Toolbar/Helpers/ToolInfo.cs b/Editor/Toolbar/Helpers/ToolInfo.cs index 2b14392..6b9d712 100644 --- a/Editor/Toolbar/Helpers/ToolInfo.cs +++ b/Editor/Toolbar/Helpers/ToolInfo.cs @@ -2,7 +2,7 @@ { internal static class ToolInfo { - public const string COMPANY_NAME = "Tools/EditorExtension/Toolbar"; + public const string COMPANY_NAME = "Tools/Extension/Toolbar"; public const string EDITOR_MENU_BASE = COMPANY_NAME + "/" ; } }