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

2026-05-29 17:57:28 +08:00 · 2026-05-29 17:57:28 +08:00 · 4df2c044db
commit 4df2c044db
parent 699daf23ed 7237c94785
21 changed files with 5363 additions and 5198 deletions
--- a/DOC/bugs.json
+++ b/DOC/bugs.json
@ -2699,12 +2699,12 @@
      "id": 272,
      "title": "早苗升级的英文问题",
      "description": "",
-      "status": "open",
+      "status": "fixed",
      "priority": "medium",
      "module": "",
      "longTerm": false,
      "createdAt": 1779954580654,
-      "updatedAt": 1779954580654
+      "updatedAt": 1780045493539
    }
  ]
 }
--- a/Tools/Multilingual.xlsx
+++ b/Tools/Multilingual.xlsx
--- a/Tools/MultilingualTxt.txt
+++ b/Tools/MultilingualTxt.txt
--- a/Unity/Assets/OPS/Obfuscator/Settings/Obfuscator_Settings.json
+++ b/Unity/Assets/OPS/Obfuscator/Settings/Obfuscator_Settings.json
--- a/Unity/Assets/Resources/DataAssets/VersionConfig.asset
+++ b/Unity/Assets/Resources/DataAssets/VersionConfig.asset
@ -12,8 +12,13 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: c659b850b20e460f866ed3f696be406b, type: 3}
  m_Name: VersionConfig
  m_EditorClassIdentifier: 
-  CurVersionId: 70112
+  CurVersionId: 70200
  Versions:
+  - MajorVersion: 0
+    MinorVersion: 7
+    PatchVersion: 2
+    Description: "[\u7248\u672C V0.7.2]\n\u53D1\u5E03\u65E5\u671F:26.5.29\n\n\u672C\u6B21\u66F4\u65B0\u4E3B\u8981\u96C6\u4E2D\u5728\u8054\u673A\u529F\u80FD\u7684\u8FED\u4EE3\u4E0A\uFF0C\u5E76\u4E14\u4FEE\u590D\u4E86\u90E8\u5206bug\u3002\n\u5176\u4ED6bug\u6211\u4EEC\u4ECD\u5728\u5168\u529B\u4FEE\u590D\u4E2D\u3002\n\n---------[\u65B0\u589E\u8054\u673A\u529F\u80FD]-------------\n1.\u7EC4\u961F\uFF1A\u652F\u6301\u7EC4\u961F\u6E38\u73A9\uFF0C\u53EF\u4E0E\u771F\u4EBA\u73A9\u5BB6\u6216\u8005AI\u7EC4\u961F\uFF0C\u4EC5\u5728\u81EA\u7531\u6A21\u5F0F\u4E0B\u5F00\u653E\n2.\u9009\u62E9\u80DC\u5229\u6761\u4EF6\uFF1A\u81EA\u7531\u6A21\u5F0F\u4E0B\u53EF\u9009\u62E9\u4E0D\u540C\u7684\u80DC\u5229\u6761\u4EF6\n3.\u56DE\u5408\u9650\u65F6\uFF1A\u53EF\u9009\u62E9\u56DE\u5408\u57FA\u7840\u9650\u65F6\u3002\u6BCF\u56DE\u5408\u9650\u65F6\u903B\u8F91\u4E3A\u57FA\u7840\u9650\u65F6+\u57CE\u5E02\u6570\u91CF*5s+\u5355\u4F4D\u6570\u91CF*2s\n4.\u623F\u540D\u81EA\u5B9A\u4E49\uFF1A\u53EF\u66F4\u6539\u623F\u95F4\u540D\u79F0\u3002\n5.\u623F\u95F4\u804A\u5929\uFF1A\u8FDB\u5165\u6E38\u620F\u524D\uFF0C\u53EF\u5728\u8054\u673A\u623F\u95F4\u804A\u5929\n6.\u6389\u7EBFAI\u63A5\u7BA1\uFF1A\u6E38\u620F\u65F6\u82E5\u73A9\u5BB6\u6389\u7EBF\uFF0C\u623F\u4E3B\u53EF\u624B\u52A8\u9009\u62E9\u7531AI\u63A5\u7BA1\uFF0C\u6216\u53D6\u6D88AI\u63A5\u7BA1\u91CD\u65B0\u9080\u8BF7\u8BE5\u73A9\u5BB6\n7.\u63D0\u793A\u97F3\uFF1A\u65B0\u589E\u73A9\u5BB6\u52A0\u5165\u623F\u95F4/\u65B0\u5BF9\u8BDD\u6D88\u606F/\u5012\u8BA1\u65F6\u7B49\u63D0\u793A\u97F3\u6548\n8.\u5C4F\u853D\uFF1A\u65B0\u589E\u5C4F\u853D/\u4E3E\u62A5\u623F\u95F4\u529F\u80FD\uFF0C\u8BF7\u5927\u5BB6\u5728\u81EA\u5B9A\u4E49\u623F\u95F4\u540D\u79F0\u7684\u65F6\u5019\u6CE8\u610F\u793C\u4EEA\u89C4\u8303\u54E6!\n9.\u7F51\u7EDC\u9519\u8BEF\u8BE6\u60C5\uFF1A\u5DE6\u4E0A\u89D2\u65B0\u589E\u7F51\u7EDC\u9519\u8BEF\u8BE6\u60C5\u6309\u94AE\uFF0C\u5C55\u5F00\u540E\u53EF\u4EE5\u770B\u5230\u8BE6\u7EC6\u7684\u7F51\u7EDC\u9519\u8BEF\u60C5\u51B5\uFF0C\u4FBF\u4E8E\u540E\u7EED\u8054\u7F51\u60C5\u51B5\u5FEB\u901F\u5B9A\u4F4D\u95EE\u9898\n\n\n---------[bug\u4FEE\u590D\u4E0E\u4F18\u5316]-------------\n1.\u4FEE\u590D\u4E86\u7AF9\u6797\u72FC\u4E0A\u6821\u4ECE\u6C34\u4E2D\u767B\u9646\u65F6\u4F1A\u9519\u8BEF\u83B7\u5F975\u5C42\u6EE1\u6708\u7684bug\n2.\u4FEE\u590D\u4E86\u97F3\u4E50\u5BA4\u97F3\u4E50\u8BE6\u60C5\u53CA\u5531\u7247\u754C\u9762\u4E0D\u663E\u793A\u7684bug\n3.\u4FEE\u590D\u4E86\u90E8\u5206\u4F1A\u5BFC\u81F40\u8840\u5355\u4F4D\u5B58\u6D3B\u7684bug\n4.\u4FEE\u590D\u4E86\u90E8\u5206\u4F1A\u5BFC\u81F4\u8239\u53EA\u5B58\u5728\u4E8E\u9646\u5730\u4E0A\u7684bug\n5.\u4F18\u5316\u4E86\u8054\u673A\u4F20\u8F93\u7684\u6570\u636E\u5927\u5C0F\n6.\u4F18\u5316\u4E86\u53F2\u8BD7\u754C\u9762\uFF0C\u73B0\u5728\u53EF\u4EE5\u770B\u5230\u5404\u5947\u89C2\u4EFB\u52A1\u7684\u5B8C\u6210\u8FDB\u5EA6\n7.\u4FEE\u590D\u4E86\u597D\u53CB\u9080\u8BF7\u5217\u8868\u51FA\u73B0\u975E\u597D\u53CB\u7684bug\n8.\u4FEE\u590D\u4E86\u8BF9\u8BBF\u5B50\u521B\u5EFA\u5FA1\u5C04\u5BAB\u53F8\u5927\u4EBA\u53EF\u80FD\u4E8E\u9690\u8EAB\u5355\u4F4D\u91CD\u53E0\u7684bug"
+    FourthVersion: 0
  - MajorVersion: 0
    MinorVersion: 7
    PatchVersion: 1
--- a/Unity/Assets/Resources/Export/Multilingual.asset
+++ b/Unity/Assets/Resources/Export/Multilingual.asset
--- a/Unity/Assets/Resources/Export/VersionConfig.asset
+++ b/Unity/Assets/Resources/Export/VersionConfig.asset
@ -12,8 +12,13 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: c659b850b20e460f866ed3f696be406b, type: 3}
  m_Name: VersionConfig
  m_EditorClassIdentifier: 
-  CurVersionId: 70112
+  CurVersionId: 70200
  Versions:
+  - MajorVersion: 0
+    MinorVersion: 7
+    PatchVersion: 2
+    Description: 20135
+    FourthVersion: 0
  - MajorVersion: 0
    MinorVersion: 7
    PatchVersion: 1
--- a/Unity/Assets/Resources/MatchLevelData/ExportLevelData.bytes
+++ b/Unity/Assets/Resources/MatchLevelData/ExportLevelData.bytes
--- a/Unity/Assets/Resources/Prefab/UI/Outside/UIOutsideMultiplay.prefab
+++ b/Unity/Assets/Resources/Prefab/UI/Outside/UIOutsideMultiplay.prefab
@ -9767,7 +9767,7 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_text: "\u5B58\u5728\u76F8\u540C\u7684\u9635\u8425\uFF0C\u65E0\u6CD5\u5F00\u59CB"
+  m_text: Unknow Error
  m_isRightToLeft: 0
  m_fontAsset: {fileID: 11400000, guid: 8e119f168f1a6b745be02ef19f51610f, type: 2}
  m_sharedMaterial: {fileID: -8081454072124122709, guid: 8e119f168f1a6b745be02ef19f51610f, type: 2}
@ -9852,7 +9852,7 @@ MonoBehaviour:
  NoExport: 0
  FontBan: 0
  Preset: 0
-  ID: 2502
+  ID: 20134
  FontID: 1
  TextCfg:
  - Type: 0
@ -13000,8 +13000,8 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 1}
  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 299.8637, y: -20.1559}
-  m_SizeDelta: {x: 599.6793, y: 40.3085}
+  m_AnchoredPosition: {x: 53.471, y: -21}
+  m_SizeDelta: {x: 106.93, y: 41.997}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2694649373525517121
 CanvasRenderer:
--- a/Unity/Assets/Resources/Prefab/UI/Top/UITopSetting.prefab
+++ b/Unity/Assets/Resources/Prefab/UI/Top/UITopSetting.prefab
@ -2953,7 +2953,7 @@ MonoBehaviour:
  m_faceColor:
    serializedVersion: 2
    rgba: 4294967295
-  m_fontSize: 24
+  m_fontSize: 21.25
  m_fontSizeBase: 24
  m_fontWeight: 400
  m_enableAutoSizing: 1
@ -5287,7 +5287,7 @@ RectTransform:
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 316.52, y: 43.455}
+  m_SizeDelta: {x: 607.25, y: 39.747}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &5173756232815940152
 MonoBehaviour:
@ -6348,7 +6348,7 @@ RectTransform:
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 316.52, y: 43.455}
+  m_SizeDelta: {x: 607.25, y: 43.455}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4395786735994074065
 MonoBehaviour:
@ -9261,8 +9261,8 @@ MonoBehaviour:
  m_TargetGraphic: {fileID: 7771937312228267370}
  m_HandleRect: {fileID: 6801890359025387631}
  m_Direction: 2
-  m_Value: 1.0000005
-  m_Size: 0.86258847
+  m_Value: 1.0000006
+  m_Size: 0.8664572
  m_NumberOfSteps: 0
  m_OnValueChanged:
    m_PersistentCalls:
@ -10341,7 +10341,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 1}
  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 313.6242, y: -444.7841}
+  m_AnchoredPosition: {x: 313.6242, y: -442.93008}
  m_SizeDelta: {x: 607.2484, y: 0}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7594668559876856041
@ -10428,7 +10428,7 @@ RectTransform:
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 316.52, y: 43.455}
+  m_SizeDelta: {x: 6, y: 43.455}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1128881828376385442
 MonoBehaviour:
@ -10679,7 +10679,7 @@ RectTransform:
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 0, y: 0}
  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 316.52, y: 43.455}
+  m_SizeDelta: {x: 607, y: 43.455}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &7449948995218195977
 MonoBehaviour:
--- a/Unity/Assets/Scripts/TH1_Logic/Editor/MultilingualEditorWindow.cs
+++ b/Unity/Assets/Scripts/TH1_Logic/Editor/MultilingualEditorWindow.cs
@ -63,7 +63,7 @@ namespace Logic.Editor
        private bool _isProperNoun = false;
        private bool _isDialogue = false;
        private bool _isDeprecated = false;
-        private bool _isENNoTranslate = false;
+        private bool _isENNoTranslate = true;
        private bool _isTDZHNoTranslate = false;
        private bool _isJPNoTranslate = false;
        private bool _isKRNoTranslate = false;
--- a/Unity/Assets/Scripts/TH1_Logic/Multilingual/MultilingualData.cs
+++ b/Unity/Assets/Scripts/TH1_Logic/Multilingual/MultilingualData.cs
@ -13,7 +13,6 @@ using Logic.CrashSight;
 using TMPro;
 using Unity.VisualScripting;
 using UnityEngine;
-using ColorUtility = UnityEngine.ColorUtility;


 namespace Logic.Multilingual
@ -67,6 +66,11 @@ namespace Logic.Multilingual
        Max = 1000,   // 最大值 / Max value
    }

+    internal static class MultilingualRichTextColors
+    {
+        public const string DefaultEmbeddedHex = "#D98200";
+    }
+

    public class MultilingualData : ScriptableObject
    {
@ -245,8 +249,7 @@ namespace Logic.Multilingual
                var hex = subItem.Color;
                if (string.IsNullOrEmpty(hex))
                {
-                    var color = new Color(1f, 0.647f, 0f);
-                    hex = ColorUtility.ToHtmlStringRGB(color);
+                    hex = MultilingualRichTextColors.DefaultEmbeddedHex;
                }
                if (!hex.StartsWith("#")) hex = "#" + hex;

--- a/Unity/Assets/Scripts/TH1_Logic/Multilingual/MultilingualManager.cs
+++ b/Unity/Assets/Scripts/TH1_Logic/Multilingual/MultilingualManager.cs
@ -267,14 +267,9 @@ namespace Logic.Multilingual
        
        private void RefreshTextComs()
        {
-            var uiObj = GameObject.Find("UICanvas");
-            if (!uiObj)
-            {
-                LogSystem.LogError($"找不到UI根节点 UICanvas");
-                return;
-            }
-
-            _textComs = uiObj.GetComponentsInChildren<MultilingualTextMono>(true).ToList();
+            _textComs = Resources.FindObjectsOfTypeAll<MultilingualTextMono>()
+                .Where(textCom => textCom && textCom.gameObject.scene.IsValid())
+                .ToList();
        }

        // 这里仅考虑了 PC
@ -519,4 +514,4 @@ namespace Logic.Multilingual
            item.Custom = Custom;
        }
    }
-}
+}
--- a/Unity/Assets/Scripts/TH1_Logic/Multilingual/MultilingualTextMono.cs
+++ b/Unity/Assets/Scripts/TH1_Logic/Multilingual/MultilingualTextMono.cs
@ -76,11 +76,7 @@ namespace Logic.Multilingual
                        index < _paramList.Count ? _paramList[index++] : m.Value);
                }

-                // TODO 临时换色
-                text.text = text.text.Replace( "<color=yellow>", "<color=orange>");
-                // TODO 临时转义换色
-                text.text = text.text.Replace( "**<", "<color=orange>");
-                text.text = text.text.Replace( ">**", "</color>");
+                ApplyDefaultEmbeddedColor(text);

                // RTL 方向切换：阿语/希伯来语开 RTL，其他语言关掉。
                // 注意：仅控制字符排列方向，不做 shaping(字母连写)；连写需第三方库 ArabicFixer 预处理字符串。
@ -160,15 +156,20 @@ namespace Logic.Multilingual
            var text = GetComponent<TextMeshProUGUI>();
            if (!text) return;
            text.text = str;
-            // TODO 临时换色
-            text.text = text.text.Replace( "<color=yellow>", "<color=orange>");
-            // TODO 临时转义换色
-            text.text = text.text.Replace( "**<", "<color=orange>");
-            text.text = text.text.Replace( ">**", "</color>");
+            ApplyDefaultEmbeddedColor(text);

            if (font != null) text.font = font;
            MatchTextCfg(text, type);
            ApplyRTLDirection(text, type);
        }
+
+        private static void ApplyDefaultEmbeddedColor(TextMeshProUGUI text)
+        {
+            var colorTag = $"<color={MultilingualRichTextColors.DefaultEmbeddedHex}>";
+            text.text = text.text.Replace("<color=yellow>", colorTag);
+            text.text = text.text.Replace("<color=orange>", colorTag);
+            text.text = text.text.Replace("**<", colorTag);
+            text.text = text.text.Replace(">**", "</color>");
+        }
    }
-}
+}
--- a/Unity/Assets/Scripts/TH1_UI/Core/UIResourceController.cs
+++ b/Unity/Assets/Scripts/TH1_UI/Core/UIResourceController.cs
@ -23,7 +23,7 @@ namespace TH1_UI.Core
        //设置具体某个UIRootType类型的root
        public void SetUIRoot(UIRootType type, Transform root)
        {
-            _UIRootTypeDict.TryAdd(type, root);
+            _UIRootTypeDict[type] = root;
        }
        
        /// <summary>
--- a/Unity/Assets/Scripts/TH1_UI/HintUI/HintTrigger.cs
+++ b/Unity/Assets/Scripts/TH1_UI/HintUI/HintTrigger.cs
@ -34,7 +34,7 @@ namespace TH1_UI.HintUI
                EventManager.Publish(new ShowHeroHintPanelEvent
                {
                    GiantType = DataProvider.UnitFullType.GiantType,
-                    Position = (Vector2)eventData.position + this.positionOffset,
+                    Position = eventData.position,
                    Pinned = false
                });
                return;
@ -72,7 +72,7 @@ namespace TH1_UI.HintUI
                EventManager.Publish(new ShowHeroHintPanelEvent
                {
                    GiantType = DataProvider.UnitFullType.GiantType,
-                    Position = (Vector2)eventData.position + this.positionOffset,
+                    Position = eventData.position,
                    Pinned = true
                });
            }
@ -101,4 +101,4 @@ namespace TH1_UI.HintUI

        #endregion
    }
-}
+}
--- a/Unity/Assets/Scripts/TH1_UI/HintUI/HintUI.cs
+++ b/Unity/Assets/Scripts/TH1_UI/HintUI/HintUI.cs
@ -218,7 +218,9 @@ namespace TH1_UI.HintUI
            float windowH = panelRt.rect.height * scaleFactor;

            Vector2 anchorOffset = new Vector2(16, 16);
-            Vector2 desiredTopLeft = mouseScreenPos + anchorOffset;
+            Vector2 desiredTopLeft = new Vector2(
+                mouseScreenPos.x + anchorOffset.x,
+                mouseScreenPos.y + windowH + anchorOffset.y);

            Rect visibleRect = _rootCanvas.worldCamera != null
                ? _rootCanvas.worldCamera.pixelRect
--- a/Unity/ProjectSettings/ProjectSettings.asset
+++ b/Unity/ProjectSettings/ProjectSettings.asset
@ -140,7 +140,7 @@ PlayerSettings:
  loadStoreDebugModeEnabled: 0
  visionOSBundleVersion: 1.0
  tvOSBundleVersion: 1.0
-  bundleVersion: 0.7.1m
+  bundleVersion: 0.7.2
  preloadedAssets: []
  metroInputSource: 0
  wsaTransparentSwapchain: 0
--- a/Unity/graphify-out/GRAPH_REPORT.md
+++ b/Unity/graphify-out/GRAPH_REPORT.md
--- a/Unity/graphify-out/graph.json
+++ b/Unity/graphify-out/graph.json
--- a/graphify-out/GRAPH_REPORT.md
+++ b/graphify-out/GRAPH_REPORT.md