diff --git a/My project/Assets/Scripts/Logic/Editor/MultilingualEditorWindow.cs b/My project/Assets/Scripts/Logic/Editor/MultilingualEditorWindow.cs index ca87be527..2b1d9d027 100644 --- a/My project/Assets/Scripts/Logic/Editor/MultilingualEditorWindow.cs +++ b/My project/Assets/Scripts/Logic/Editor/MultilingualEditorWindow.cs @@ -111,10 +111,6 @@ namespace Logic.Editor { ExcelExportToAsset(); } - if (InspectorUtils.InspectorButtonWithTextWidth("去重")) - { - DuplicateRemoval(); - } EditorGUILayout.EndHorizontal(); EditorGUILayout.BeginHorizontal(); @@ -245,6 +241,7 @@ namespace Logic.Editor private void AssetExportToExcel() { _zhStrDict.Clear(); + DuplicateRemoval(); foreach (var item in _asset.Items) _zhStrDict[item.ZH] = item.ID; if (_asset.Items.Count != 0) _idIndex = _asset.Items[^1].ID + 1; else _idIndex = 1; diff --git a/My project/Assets/Scripts/Logic/Multilingual/MultilingualManager.cs b/My project/Assets/Scripts/Logic/Multilingual/MultilingualManager.cs index 4f0abe826..46c436a9e 100644 --- a/My project/Assets/Scripts/Logic/Multilingual/MultilingualManager.cs +++ b/My project/Assets/Scripts/Logic/Multilingual/MultilingualManager.cs @@ -24,23 +24,26 @@ namespace Logic.Multilingual public void Init() { - if (!_multilingualData) _multilingualData = Resources.Load("Export/Multilingual"); + RefreshMultilingualData(); _currentType = (MultilingualType)PlayerPrefs.GetInt("Multilingual", 0); ChangedMultilingual(_currentType); } public string GetMultilingualText(uint id) { + RefreshMultilingualData(); return _multilingualData.GetMultilingualStr(id, _currentType); } public TMP_FontAsset GetMultilingualFont(uint fontId) { + RefreshMultilingualData(); return _multilingualData.GetMultilingualFont(fontId, _currentType); } public void ChangedMultilingual(MultilingualType type) { + RefreshMultilingualData(); RefreshTextComs(); _currentType = type; foreach (var textCom in _textComs) textCom.OnMultilingualChanged(); @@ -48,6 +51,7 @@ namespace Logic.Multilingual public uint GetFontGroupID(TMP_FontAsset font) { + RefreshMultilingualData(); return _multilingualData.GetFontGroupID(font); } @@ -61,6 +65,11 @@ namespace Logic.Multilingual multilingual.OnMultilingualChanged(); } + private void RefreshMultilingualData() + { + if (!_multilingualData) _multilingualData = Resources.Load("Export/Multilingual"); + } + private void RefreshTextComs() { var uiObj = GameObject.Find("UICanvas");