Merge branch 'main' of http://10.27.16.144:3000/kawagiri/TH1 into main

Unity/Assets/Resources/Export/Multilingual.asset

@@ -1012,7 +1012,7 @@ MonoBehaviour:
   - ID: 152
     ZH: "\u4F1F\u4EBA\u804C\u9636\uFF1A<color=yellow>\u9A6C(Knights)</color>\r\n\u7EE7\u627F<color=yellow>\u8D5B\u7279</color>\u610F\u5FD7\u7684\u7EA2\u9B54\u9986\u4E8C\u5C0F\u59D0\u3002\u62E5\u6709\u7279\u8272\u7834\u5C40\u6280\u80FD<color=red>\u56DB\u91CD\u5B58\u5728</color>\u3002"
     TDZH: 
-    EN: 'Great Person Class: <color=yellow>Knights</color>
+    EN: 'Great Person Class: <color=yellow>Knights</color>
 
       The second young
       lady of the Scarlet Devil Mansion inheriting the will of <color=yellow>Set</color>.
@@ -1034,7 +1034,7 @@ MonoBehaviour:
   - ID: 154
     ZH: "\u4F1F\u4EBA\u804C\u9636\uFF1A<color=yellow>\u540E(Queen)</color>\r\n\u7EE7\u627F<color=yellow>\u514B\u91CC\u6B27\u5E15\u7279\u62C9</color>\u610F\u5FD7\u7684\u9B54\u5973\u3002\u62E5\u6709\u7279\u8272\u8303\u56F4\u4F24\u5BB3\u6280\u80FD<color=red>\u7687\u5BB6\u70C8\u7130</color>\u3002"
     TDZH: 
-    EN: 'Great Person Class: <color=yellow>Queen</color>
+    EN: 'Great Person Class: <color=yellow>Queen</color>
 
       A witch inheriting
       the will of <color=yellow>Cleopatra</color>. Has the unique area damage skill
@@ -1049,7 +1049,7 @@ MonoBehaviour:
   - ID: 155
     ZH: "\u4F1F\u4EBA\u804C\u9636\uFF1A<color=yellow>\u738B(King)</color>\r\n\u7EE7\u627F<color=yellow>\u5965\u897F\u91CC\u65AF</color>\u610F\u5FD7\u7684\u5438\u8840\u9B3C\u3002\u62E5\u6709\u7279\u8272\u53CD\u51FB\u56DE\u590D\u6280\u80FD<color=red>\u7EA2\u8272\u4E0D\u591C\u57CE</color>\u3002"
     TDZH: 
-    EN: 'Great Person Class: <color=yellow>King</color>
+    EN: 'Great Person Class: <color=yellow>King</color>
 
       A vampire inheriting
       the will of <color=yellow>Osiris</color>. Has the unique counter-healing skill
@@ -1064,7 +1064,7 @@ MonoBehaviour:
   - ID: 156
     ZH: "\u4F1F\u4EBA\u804C\u9636\uFF1A<color=yellow>\u76F8(Bishop)</color>\r\n\u7EE7\u627F<color=yellow>\u963F\u52AA\u6BD4\u65AF</color>\u610F\u5FD7\u7684\u5973\u4EC6\u957F\u3002\u62E5\u6709\u7279\u8272\u7A81\u88AD\u6280\u80FD<color=red>\u94F6\u4E4B\u8DF3\u8DC3</color>\u3002"
     TDZH: 
-    EN: 'Great Person Class: <color=yellow>Bishop</color>
+    EN: 'Great Person Class: <color=yellow>Bishop</color>
 
       The head maid inheriting
       the will of <color=yellow>Anubis</color>. Has the unique surprise attack skill
@@ -1079,11 +1079,11 @@ MonoBehaviour:
   - ID: 157
     ZH: "\u4F1F\u4EBA\u804C\u9636\uFF1A<color=yellow>\u8F66(Rook)</color>\r\n\u7EE7\u627F<color=yellow>\u8377\u9C81\u65AF</color>\u610F\u5FD7\u7684\u6B66\u672F\u5BB6\u3002\u62E5\u6709\u7279\u8272\u53CD\u4F24\u6280\u80FD<color=red>\u8679\u8272\u592A\u6781\u62F3</color>\u3002"
     TDZH: 
-    EN: 'Great Person Class: <color=yellow>Rook</color>
+    EN: 'Great Person Class: <color=yellow>Rook</color>
 
-      A martial artist
-      inheriting the will of <color=yellow>Horus</color>. Has the unique damage reflection
-      skill <color=red>Iridescent Tai Chi</color>.'
+      A martial artist inheriting
+      the will of <color=yellow>Horus</color>. Has the unique damage reflection skill
+      <color=red>Iridescent Tai Chi</color>.'
     JP: "\u5049\u4EBA\u8077\u968E\uFF1A<color=yellow> \u30EB\u30FC\u30AF</color>\r\n<color=yellow>
       \u30DB\u30EB\u30B9</color>\u306E\u610F\u5FD7\u3092\u7D99\u627F\u3059\u308B\u6B66\u9053\u5BB6\u3002\u7279\u5FB4\u7684\u306A\u53CD\u50B7\u30B9\u30AD\u30EB
       <color=red> \u8679\u8272\u592A\u6975\u62F3</color>\u3092\u6301\u3064\u3002"
@@ -1106,7 +1106,7 @@ MonoBehaviour:
   - ID: 160
     ZH: "\u9886\u571F\u5185\u672A\u6539\u9020\u7684<color=yellow>\u68EE\u6797</color>\u53EF\u8BAD\u7EC3\u57FA\u7840\u5355\u4F4D\u3002\r\n<color=#888888>\u5996\u7CBE\u662F\u68EE\u6797\u7684\u547C\u5438\uFF0C\u662F\u81EA\u7136\u7684\u5316\u8EAB\u3002</color>"
     TDZH: 
-    EN: 'Unmodified <color=yellow>forests</color> in territory can train basic units.
+    EN: 'Unmodified <color=yellow>forests</color> in territory can train basic units.
 
       <color=#888888>Fairies
       are the breath of the forest, the embodiment of nature.</color>'
@@ -1244,10 +1244,10 @@ MonoBehaviour:
     ZH: "\u6C38\u8FDC\u4EAD\u9635\u8425\u7684\u5355\u4F4D\u5728\u9886\u571F\u5185\u7684<color=yellow>\u6062\u590D</color>\u91CF\u75314\u70B9\u63D0\u5347\u81F35\u70B9\u3002\r\n<color=#888888>\u5154\u5B50\u8F7B\u8DF3\u800C\u8FC7\uFF0C\u597D\u8FD0\u6084\u7136\u800C\u81F3\u3002</color>"
     TDZH: 
     EN: 'Units of the Eientei faction gain <color=yellow>healing</color> increased
-      from 4 to 5 within their territory.
+      from 4 to 5 within their territory.
 
-      <color=#888888>Rabbits hop by,
-      and good luck comes quietly.</color>'
+      <color=#888888>Rabbits hop by, and
+      good luck comes quietly.</color>'
     JP: "\u6C38\u9060\u4EAD\u9663\u55B6\u306E\u30E6\u30CB\u30C3\u30C8\u306F\u9818\u571F\u5185\u3067\u306E
       <color=yellow> \u56DE\u5FA9</color>\u91CF\u304C 4 \u304B\u3089 5 \u306B\u4E0A\u304C\u308B\u3002\r\n<color=#888888>
       \u30A6\u30B5\u30AE\u304C\u8EFD\u3084\u304B\u306B\u8DF3\u3073\u8D8A\u3048\u308B\u3068\u3001\u5E78\u904B\u304C\u9759\u304B\u306B\u8A2A\u308C\u308B\u3002</color>"
@@ -1263,7 +1263,7 @@ MonoBehaviour:
   - ID: 180
     ZH: "\u5728\u6E38\u620F\u5F00\u59CB\u65F6\u62E5\u6709<color=yellow>\u91C7\u96C6</color>\u79D1\u6280\u3002\r\n<color=#888888>\u6587\u660E\u7684\u7B2C\u4E00\u8BFE\uFF0C\u5C31\u5728\u8461\u8404\u85E4\u4E0E\u73AB\u7470\u82B1\u95F4\u3002</color>"
     TDZH: 
-    EN: 'Starts with the <color=yellow>Gathering</color> technology.
+    EN: 'Starts with the <color=yellow>Gathering</color> technology.
 
       <color=#888888>The
       first lesson of civilization is among grapevines and roses.</color>'
@@ -1294,7 +1294,7 @@ MonoBehaviour:
   - ID: 184
     ZH: "\u666E\u9C81\u58EB\u5E1D\u56FD \r\n\u5B88\u77E2\u738B\u671D"
     TDZH: 
-    EN: 'Prussian Empire
+    EN: 'Prussian Empire
 
       Moriyama Dynasty'
     JP: "\u30D7\u30EB\u30B7\u30E3\u5E1D\u56FD\r\n\u5B88\u77E2\u738B\u671D"
@@ -1397,7 +1397,7 @@ MonoBehaviour:
   - ID: 198
     ZH: "\u5370\u5EA6\u5E1D\u56FD \r\n\u53E4\u660E\u5730\u738B\u671D"
     TDZH: 
-    EN: 'Indian Empire
+    EN: 'Indian Empire
 
       Komeiji Dynasty'
     JP: "\u30A4\u30F3\u30C9\u5E1D\u56FD\r\n\u53E4\u660E\u5730\u738B\u671D"
@@ -1622,7 +1622,7 @@ MonoBehaviour:
   - ID: 227
     ZH: "\u5E1D\u738B\u661F\u6536\u96C6 3 / 5 \r\n\u5728\u6E38\u620F\u4E2D\u53EC\u5524\u5BF9\u5E94\u7684\u4F1F\u4EBA\uFF0C\u70B9\u4EAE\u5E1D\u738B\u661F\u5427\uFF01"
     TDZH: 
-    EN: 'Imperial Star Collection 3/5
+    EN: 'Imperial Star Collection 3/5
 
       Summon the corresponding Great Persons
       in the game to light up the Imperial Stars!'
@@ -1849,7 +1849,7 @@ MonoBehaviour:
       \u5728\u6E38\u620F\u4E2D\uFF0C\u4F5C\u4E3A<color=red>\u77E5\u8BC6\u7C7B\u5947\u89C2</color>\uFF0C\u89E3\u9501\u5168\u90E8\u79D1\u540E\u5373\u53EF\u83B7\u5F97\uFF0C\u63D0\u4F9B3\u70B9\u57CE\u5E02\u7ECF\u9A8C\u3002"
     TDZH: 
     EN: 'The largest and most famous library of the ancient world, built in Ptolemaic
-      Egypt to house all knowledge. Repeatedly burned due to war and political upheaval.
+      Egypt to house all knowledge. Repeatedly burned due to war and political upheaval.
 
       In
       the game, as a <color=red>Knowledge Wonder</color>, it is obtained after unlocking
@@ -2501,7 +2501,7 @@ MonoBehaviour:
   - ID: 401
     ZH: "\u5B66\u4E60<\u72E9\u730E>\u79D1\u6280\u540E\u53EF\u6267\u884C\u3002 \\n\u6536\u83B7\u6B64\u5904\u7684\u52A8\u7269\u8D44\u6E90\uFF0C\u5E76\u83B7\u5F971\u70B9\u57CE\u5E02\u7ECF\u9A8C\u3002"
     TDZH: 
-    EN: 'Can be performed after learning the <Hunting> technology.
+    EN: 'Can be performed after learning the <Hunting> technology.
 
       Harvest
       animal resources here and gain 1 city experience.'
@@ -5558,7 +5558,7 @@ MonoBehaviour:
     JP: 
     KR: 
   - ID: 884
-    ZH: 'All Unit Panel
+    ZH: 'All Unit Panel
 
       (Coming soon)'
     TDZH: 
@@ -5566,7 +5566,7 @@ MonoBehaviour:
     JP: 
     KR: 
   - ID: 885
-    ZH: 'All City Panel
+    ZH: 'All City Panel
 
       (Coming soon)'
     TDZH: 
@@ -5574,7 +5574,7 @@ MonoBehaviour:
     JP: 
     KR: 
   - ID: 886
-    ZH: 'All Player Panel
+    ZH: 'All Player Panel
 
       (Coming soon)'
     TDZH: 
@@ -7982,4 +7982,4 @@ MonoBehaviour:
     EN: 
     JP: 
     KR: 
-  TargetTypes: 0000000000000000000000000000000000000000
+  TargetTypes: 0100000003000000030000000300000003000000

Unity/Assets/Scripts/Logic/Editor/MultilingualEditorWindow.cs

@@ -163,10 +163,12 @@ namespace Logic.Editor
                 for (int i = (int)MultilingualType.ZH; i <= (int)MultilingualType.KR; i++) 
                     _asset.TargetTypes.Add((MultilingualType)i);
             }
+
             for (int i = 0; i < _asset.TargetTypes.Count; i++)
             {
                 EditorGUILayout.BeginHorizontal();
-                InspectorUtils.InspectorTextWidthRich($"<b>系统语言{(MultilingualType)i} 对应游戏语言： </b>");
+                var type = (MultilingualType)(i + 1);
+                InspectorUtils.InspectorTextWidthRich($"<b>系统语言{type} 对应游戏语言： </b>");
                 _asset.TargetTypes[i] = (MultilingualType)EditorGUILayout.EnumPopup(_asset.TargetTypes[i]);
                 EditorGUILayout.EndHorizontal();
             }

Unity/Assets/Scripts/Logic/Multilingual/MultilingualData.cs

@@ -91,7 +91,7 @@ namespace Logic.Multilingual
 
         public MultilingualType GetSystemLanguageTargetMultilingual(MultilingualType type)
         {
-            var index = (int)type;
+            var index = (int)type - 1;
             if (index >= TargetTypes.Count) return type;
             return TargetTypes[index];
         }

Unity/Assets/Scripts/Logic/Multilingual/MultilingualManager.cs

@@ -100,12 +100,9 @@ namespace Logic.Multilingual
             _textComs = uiObj.GetComponentsInChildren<MultilingualTextMono>(true).ToList();
         }
 
-        /// <summary>
-        /// 根据系统语言自动切换多语言设置（仅PC平台）
-        /// </summary>
+        // 这里仅考虑了 PC
         public MultilingualType GetSystemLanguage()
         {
-            #if UNITY_STANDALONE_WIN
             // 获取系统语言
             var systemLanguage = Application.systemLanguage;
             
@@ -113,6 +110,7 @@ namespace Logic.Multilingual
             var systemType = systemLanguage switch
             {
                 SystemLanguage.Chinese => MultilingualType.ZH,
+                SystemLanguage.ChineseSimplified => MultilingualType.ZH,
                 SystemLanguage.ChineseTraditional => MultilingualType.TDZH,
                 SystemLanguage.Japanese => MultilingualType.JP,
                 SystemLanguage.Korean => MultilingualType.KR,
@@ -120,8 +118,6 @@ namespace Logic.Multilingual
             };
 
             return _multilingualData.GetSystemLanguageTargetMultilingual(systemType);
-            #endif
-            return MultilingualType.ZH; // 默认返回英语
         }
     }
 }