Merge pull request #295 from JasonXuDeveloper/development

fixed #294 + fixed localization bug
JasonXuDeveloper · Apr 7, 2022 · 0e204fa · 0e204fa
2 parents 6d4082c + 23ede1d
commit 0e204fa
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 104 deletions.
diff --git a/UnityProject/Assets/Dependencies/JEngine/Core/Localization/Localization.cs b/UnityProject/Assets/Dependencies/JEngine/Core/Localization/Localization.cs
@@ -161,17 +161,18 @@ public static string GetString(string key)
                 Init();
             }
 
-            if (_phrases != null && !_phrases.TryGetValue(_language,out var dic))
+            if (_phrases != null && !_phrases.ContainsKey(_language))
             {
-                string newLang = _phrases.Keys.ToList().Find(k => k.Split('-')[0] == _language.Split('-')[0]);
+                string newLang = _phrases.Keys.ToList().Find(k => k.StartsWith($"{_language.Split('-')[0]}-"));
                 if (_language != "zh-cn" && newLang == null)
                 {
                     newLang = "zh-cn";
                 }
-                else
+                else if (newLang == null)
                 {
-                    return $"[invalid language: {_language}]";;
+                    return $"[invalid language: {_language}]";
                 }
+
                 Log.PrintError($"不存在语言{_language}，自动替换为{newLang}");
                 ChangeLanguage(newLang);
             }

diff --git a/UnityProject/Assets/HotUpdateResources/Dll/Hidden~/HotUpdateScripts.dll b/UnityProject/Assets/HotUpdateResources/Dll/Hidden~/HotUpdateScripts.dll
diff --git a/UnityProject/Assets/HotUpdateResources/Dll/Hidden~/HotUpdateScripts.pdb b/UnityProject/Assets/HotUpdateResources/Dll/Hidden~/HotUpdateScripts.pdb
diff --git a/UnityProject/HotUpdateScripts/HotUpdateScripts.csproj b/UnityProject/HotUpdateScripts/HotUpdateScripts.csproj
@@ -47,7 +47,6 @@
     <Compile Include="JEngine\Core\JSaver.cs" />
     <Compile Include="JEngine\Core\JObjectPool.cs" />
     <Compile Include="JEngine\Core\JBehaviour.cs" />
-    <Compile Include="JEngine\Core\JResource.cs" />
     <Compile Include="JEngine\Core\JAction.cs" />
     <Compile Include="JEngine\Core\StringifyHelper.cs" />
     <Compile Include="JEngine\Core\JPrefab.cs" />

diff --git a/UnityProject/HotUpdateScripts/JEngine/Core/JResource.cs b/UnityProject/HotUpdateScripts/JEngine/Core/JResource.cs