Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

Assets/Editor/ChineseCodeCollector.cs

@@ -0,0 +1,255 @@
+using UnityEngine;
+using UnityEditor;
+using System.IO;
+using System.Text.RegularExpressions;
+using System.Collections.Generic;
+
+public class ChineseCodeCollectorUltimate : EditorWindow
+{
+    private string searchPath = "Assets/Scripts";
+    private int maxLinesPerFile = 20;
+    private Vector2 scrollPos;
+    private List<ChineseCodeInfo> results = new List<ChineseCodeInfo>();
+
+    [MenuItem("Tools/收集中文代码")]
+    static void Open() => GetWindow<ChineseCodeCollectorUltimate>("中文代码精准收集器");
+
+    void OnGUI()
+    {
+        GUILayout.Label("中文硬编码精准收集器", EditorStyles.boldLabel);
+        GUILayout.Label("只排除含有 LogTool./Debug. 的日志行，其他中文照收", EditorStyles.miniLabel);
+
+        GUILayout.Space(10);
+
+        GUILayout.BeginHorizontal();
+        GUILayout.Label("搜索目录：", GUILayout.Width(90));
+        searchPath = EditorGUILayout.TextField(searchPath);
+        if (GUILayout.Button("浏览", GUILayout.Width(60)))
+        {
+            string p = EditorUtility.OpenFolderPanel("选择目录", searchPath, "");
+            if (!string.IsNullOrEmpty(p) && p.StartsWith(Application.dataPath))
+                searchPath = "Assets" + p.Substring(Application.dataPath.Length);
+        }
+        GUILayout.EndHorizontal();
+
+        GUILayout.BeginHorizontal();
+        GUILayout.Label("每文件最多收集：", GUILayout.Width(110));
+        maxLinesPerFile = EditorGUILayout.IntField(maxLinesPerFile, GUILayout.Width(60));
+        maxLinesPerFile = Mathf.Max(1, maxLinesPerFile);
+        GUILayout.Label("行");
+        GUILayout.EndHorizontal();
+
+        GUILayout.Space(10);
+
+        if (GUILayout.Button("开始精准扫描", GUILayout.Height(40)))
+            ScanWithPrecision();
+
+        if (results.Count > 0)
+        {
+            GUILayout.Label($"发现 {results.Count} 个文件含有非日志中文", EditorStyles.boldLabel);
+            scrollPos = EditorGUILayout.BeginScrollView(scrollPos);
+            foreach (var info in results)
+                DrawResult(info);
+            EditorGUILayout.EndScrollView();
+
+            if (GUILayout.Button("导出报告（TXT）", GUILayout.Height(35)))
+                ExportReport();
+        }
+    }
+
+    void ScanWithPrecision()
+    {
+        results.Clear();
+        if (!Directory.Exists(searchPath))
+        {
+            EditorUtility.DisplayDialog("错误", "目录不存在：" + searchPath, "OK");
+            return;
+        }
+
+        var files = Directory.GetFiles(searchPath, "*.cs", SearchOption.AllDirectories);
+
+        foreach (var file in files)
+        {
+            // 只排除 Editor 文件夹下的脚本
+            if (file.Contains("/Editor/") || file.Contains("\\Editor\\"))
+                continue;
+
+            var info = AnalyzeFilePrecisely(file);
+            if (info != null && info.lines.Count > 0)
+                results.Add(info);
+        }
+
+        Debug.Log($"精准扫描完成！共 {results.Count} 个文件含有非日志中文");
+    }
+
+    ChineseCodeInfo AnalyzeFilePrecisely(string path)
+    {
+        string[] lines = File.ReadAllLines(path);
+        string className = ExtractClassName(lines);
+        var chineseLines = new List<ChineseLine>();
+
+        bool inRegion = false;
+        bool inMultiLineComment = false;
+
+        for (int i = 0; i < lines.Length; i++)
+        {
+            string raw = lines[i];
+            string trimmed = raw.Trim();
+
+            // 空行跳过
+            if (string.IsNullOrWhiteSpace(trimmed)) continue;
+
+            // #region 区域完全跳过
+            if (trimmed.StartsWith("#region") || trimmed.Contains(" #region "))
+                inRegion = true;
+            if (trimmed.StartsWith("#endregion") || trimmed.Contains(" #endregion"))
+            {
+                inRegion = false;
+                continue;
+            }
+            if (inRegion) continue;
+
+            // 多行注释处理
+            if (inMultiLineComment)
+            {
+                if (trimmed.Contains("*/")) inMultiLineComment = false;
+                continue;
+            }
+            if (trimmed.Contains("/*") && !trimmed.Contains("*/"))
+            {
+                inMultiLineComment = true;
+                continue;
+            }
+
+            // 单行注释跳过
+            if (trimmed.StartsWith("//")) continue;
+
+            // 这行如果包含日志调用，直接跳过这行
+            if (IsLogLine(trimmed))
+                continue;
+
+            // 是否包含中文
+            if (!ContainsChinese(raw))
+                continue;
+
+            chineseLines.Add(new ChineseLine
+            {
+                lineNumber = i + 1,
+                code = raw.TrimEnd()
+            });
+
+            if (chineseLines.Count >= maxLinesPerFile)
+                break;
+        }
+
+        if (chineseLines.Count > 0)
+        {
+            return new ChineseCodeInfo
+            {
+                filePath = path.Replace(Application.dataPath, "Assets"),
+                className = className ?? Path.GetFileNameWithoutExtension(path),
+                lines = chineseLines
+            };
+        }
+        return null;
+    }
+
+    // 判断是否为日志行
+    bool IsLogLine(string line)
+    {
+        // 常见日志调用模式（不区分大小写）
+        string lower = line.ToLower();
+        return lower.Contains("logtool.") ||
+               lower.Contains("debug.log") ||
+               lower.Contains("debug.warn") ||
+               lower.Contains("debug.error") ||
+               lower.Contains("debug.assert") ||
+               lower.Contains("debug.draw") ||
+               lower.Contains("debug.break") ||
+               lower.Contains("logger.") ||
+               lower.Contains("log.") && lower.Contains("info") ||
+               lower.Contains("log.") && lower.Contains("warning") ||
+               lower.Contains("log.") && lower.Contains("error");
+    }
+
+    bool ContainsChinese(string text)
+    {
+        return Regex.IsMatch(text, @"[\u4e00-\u9fff]");
+    }
+
+    string ExtractClassName(string[] lines)
+    {
+        foreach (string line in lines)
+        {
+            var m = Regex.Match(line, @"class\s+(\w+)");
+            if (m.Success) return m.Groups[1].Value;
+        }
+        return null;
+    }
+
+    void DrawResult(ChineseCodeInfo info)
+    {
+        EditorGUILayout.BeginVertical("box");
+        EditorGUILayout.LabelField($"{Path.GetFileName(info.filePath)}", EditorStyles.boldLabel);
+        EditorGUILayout.LabelField($"类名：{info.className}", EditorStyles.miniLabel);
+        EditorGUILayout.SelectableLabel(info.filePath, EditorStyles.miniLabel, GUILayout.Height(16));
+
+        foreach (var cl in info.lines)
+        {
+            EditorGUILayout.BeginHorizontal();
+            GUILayout.Label(cl.lineNumber.ToString("D4"), GUILayout.Width(50));
+            GUILayout.Label(">", GUILayout.Width(15));
+            EditorGUILayout.SelectableLabel(cl.code, GUILayout.Height(18));
+            EditorGUILayout.EndHorizontal();
+        }
+        EditorGUILayout.EndVertical();
+        GUILayout.Space(6);
+    }
+
+    void ExportReport()
+    {
+        string path = EditorUtility.SaveFilePanel("导出中文报告", "", "非日志中文硬编码报告.txt", "txt");
+        if (string.IsNullOrEmpty(path)) return;
+
+        using (var sw = new StreamWriter(path, false, System.Text.Encoding.UTF8))
+        {
+            sw.WriteLine("============================================");
+            sw.WriteLine("   Unity 非日志中文硬编码精准检测报告");
+            sw.WriteLine("============================================");
+            sw.WriteLine($"生成时间：{System.DateTime.Now:yyyy-MM-dd HH:mm:ss}");
+            sw.WriteLine($"搜索目录：{searchPath}");
+            sw.WriteLine($"已排除：#region 区域、Editor 文件夹、所有日志行（LogTool./Debug./Log.等）");
+            sw.WriteLine($"共发现 {results.Count} 个文件含有非日志中文");
+            sw.WriteLine();
+
+            foreach (var r in results)
+            {
+                sw.WriteLine($"文件：{r.filePath}");
+                sw.WriteLine($"类名：{r.className}");
+                sw.WriteLine("非日志中文行：");
+                foreach (var l in r.lines)
+                    sw.WriteLine($"  第 {l.lineNumber,4} 行：{l.code}");
+                sw.WriteLine(new string('-', 70));
+            }
+        }
+
+        Debug.Log("精准中文报告已导出：" + path);
+        EditorUtility.RevealInFinder(path);
+    }
+}
+
+// 数据结构
+[System.Serializable]
+public class ChineseCodeInfo
+{
+    public string filePath;
+    public string className;
+    public List<ChineseLine> lines;
+}
+
+[System.Serializable]
+public class ChineseLine
+{
+    public int lineNumber;
+    public string code;
+}

Assets/Editor/ChineseCodeCollector.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: DnhOtnirWn9qAM2hmdNRRApkmF3cXmupNtpn3S69USXSUi1Whc1/SLDnUk8I
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Config/BuffConfig.json

@@ -215,7 +215,7 @@
       "buffGroup": 1013,
       "overlayCount": 15,
       "effectValue": [
-        2.0
+        1.0
       ],
       "timeType": 2,
       "buffTime": 15.0,

Assets/Res/Config/LanguageChineseConfig.json

@@ -39214,579 +39214,579 @@
     },
     {
       "ID": 10544,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10545,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10546,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10547,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10548,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10549,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10550,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10551,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10552,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10553,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10554,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10555,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10556,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10557,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10558,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10559,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10560,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10561,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10562,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10563,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10564,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10565,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10566,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10567,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10568,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10569,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10570,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10571,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10572,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10573,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10574,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10575,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10576,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10577,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10578,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10579,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10580,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10581,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10582,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10583,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10584,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10585,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10586,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10587,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10588,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10589,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10590,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10591,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10592,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10593,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10594,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10595,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10596,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10597,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10598,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10599,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10600,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10601,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10602,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10603,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10604,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10605,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10606,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10607,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10608,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10609,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10610,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10611,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10612,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10613,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10614,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10615,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10616,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10617,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10618,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10619,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10620,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10621,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10622,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10623,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10624,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10625,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10626,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10627,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10628,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10629,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10630,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10631,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10632,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10633,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10634,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10635,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10636,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10637,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10638,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10639,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10640,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10641,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10642,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10643,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10644,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10645,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10646,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10647,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10648,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10649,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10650,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10651,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10652,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10653,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10654,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10655,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10656,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10657,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10658,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10659,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10660,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10661,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10662,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10663,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10664,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10665,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10666,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10667,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10668,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10669,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10670,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10671,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10672,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10673,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10674,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10675,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10676,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10677,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10678,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10679,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10680,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10681,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10682,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10683,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10684,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10685,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10686,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10687,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 10688,
@@ -40342,67 +40342,347 @@
     },
     {
       "ID": 10826,
-      "txt": "0"
+      "txt": "等级:{0)"
     },
     {
       "ID": 10827,
-      "txt": "0"
+      "txt": "法宝"
     },
     {
       "ID": 10828,
-      "txt": "0"
+      "txt": "法宝详情："
     },
     {
       "ID": 10829,
-      "txt": "0"
+      "txt": "强度:{0}"
     },
     {
       "ID": 10830,
-      "txt": "0"
+      "txt": "功法"
     },
     {
       "ID": 10831,
-      "txt": "0"
+      "txt": "功法详情："
     },
     {
       "ID": 10832,
-      "txt": "0"
+      "txt": "层数:{0}"
     },
     {
       "ID": 10833,
-      "txt": "0"
+      "txt": "详情:"
     },
     {
       "ID": 10834,
-      "txt": "0"
+      "txt": "buff"
     },
     {
       "ID": 10835,
-      "txt": "0"
+      "txt": "免费"
     },
     {
       "ID": 10836,
-      "txt": "0"
+      "txt": "当前进度:{0}/{1}"
     },
     {
       "ID": 10837,
-      "txt": "0"
+      "txt": "未选择"
     },
     {
       "ID": 10838,
-      "txt": "0"
+      "txt": "主动功法已经上满"
     },
     {
       "ID": 10839,
-      "txt": "0"
+      "txt": "被动功法已经上满"
     },
     {
       "ID": 10840,
-      "txt": "0"
+      "txt": "主动"
     },
     {
       "ID": 10841,
-      "txt": "0"
+      "txt": "被动"
+    },
+    {
+      "ID": 10842,
+      "txt": "辅助"
+    },
+    {
+      "ID": 10843,
+      "txt": "{0}级"
+    },
+    {
+      "ID": 10844,
+      "txt": "名称:{0}"
+    },
+    {
+      "ID": 10845,
+      "txt": "境界:{0}"
+    },
+    {
+      "ID": 10846,
+      "txt": "金:{0}木:{1}水:{2}火:{3}土:{4}"
+    },
+    {
+      "ID": 10847,
+      "txt": "此类型不能重复选择"
+    },
+    {
+      "ID": 10848,
+      "txt": "事件的选择会影响获得的道具"
+    },
+    {
+      "ID": 10849,
+      "txt": "放弃后，事件会从列表消失。已消耗的神识不会返还。是否确认？"
+    },
+    {
+      "ID": 10850,
+      "txt": "已经满星"
+    },
+    {
+      "ID": 10851,
+      "txt": "已经满级"
+    },
+    {
+      "ID": 10852,
+      "txt": "需要境界达到:{0}"
+    },
+    {
+      "ID": 10853,
+      "txt": "丹药"
+    },
+    {
+      "ID": 10854,
+      "txt": "成功几率+{0}%"
+    },
+    {
+      "ID": 10855,
+      "txt": "失败损耗-{0}%"
+    },
+    {
+      "ID": 10856,
+      "txt": "离开"
+    },
+    {
+      "ID": 10857,
+      "txt": "正在探索遗迹"
+    },
+    {
+      "ID": 10858,
+      "txt": "道友等级已到最高"
+    },
+    {
+      "ID": 10859,
+      "txt": "心情已经到最高"
+    },
+    {
+      "ID": 10860,
+      "txt": "当前选择数量:{0}"
+    },
+    {
+      "ID": 10861,
+      "txt": "取消事件"
+    },
+    {
+      "ID": 10862,
+      "txt": "没有破除心魔"
+    },
+    {
+      "ID": 10863,
+      "txt": "生命值不够！"
+    },
+    {
+      "ID": 10864,
+      "txt": "已破除"
+    },
+    {
+      "ID": 10865,
+      "txt": "破除"
+    },
+    {
+      "ID": 10866,
+      "txt": "是否确认突破"
+    },
+    {
+      "ID": 10867,
+      "txt": "需要"
+    },
+    {
+      "ID": 10868,
+      "txt": " 破除心魔"
+    },
+    {
+      "ID": 10869,
+      "txt": "失败损失修为：{0}"
+    },
+    {
+      "ID": 10870,
+      "txt": "成功几率：{0}%"
+    },
+    {
+      "ID": 10871,
+      "txt": "生命"
+    },
+    {
+      "ID": 10872,
+      "txt": "攻击"
+    },
+    {
+      "ID": 10873,
+      "txt": "防御"
+    },
+    {
+      "ID": 10874,
+      "txt": "缺少：{0}"
+    },
+    {
+      "ID": 10875,
+      "txt": "法宝倍率"
+    },
+    {
+      "ID": 10876,
+      "txt": "护盾倍率"
+    },
+    {
+      "ID": 10877,
+      "txt": "防御系数K"
+    },
+    {
+      "ID": 10878,
+      "txt": "神识上限"
+    },
+    {
+      "ID": 10879,
+      "txt": "使用"
+    },
+    {
+      "ID": 10880,
+      "txt": "取消"
+    },
+    {
+      "ID": 10881,
+      "txt": "今日使用经验已达上限！"
+    },
+    {
+      "ID": 10882,
+      "txt": "今日\\n{0}/{1}"
+    },
+    {
+      "ID": 10883,
+      "txt": "功法运转周期：{0}转"
+    },
+    {
+      "ID": 10884,
+      "txt": "用途"
+    },
+    {
+      "ID": 10885,
+      "txt": "使用效果"
+    },
+    {
+      "ID": 10886,
+      "txt": "道具数量"
+    },
+    {
+      "ID": 10887,
+      "txt": "完成度 "
+    },
+    {
+      "ID": 10888,
+      "txt": "金灵根"
+    },
+    {
+      "ID": 10889,
+      "txt": "木灵根"
+    },
+    {
+      "ID": 10890,
+      "txt": "水灵根"
+    },
+    {
+      "ID": 10891,
+      "txt": "火灵根"
+    },
+    {
+      "ID": 10892,
+      "txt": "土灵根"
+    },
+    {
+      "ID": 10893,
+      "txt": "当前法宝已经被装备"
+    },
+    {
+      "ID": 10894,
+      "txt": "未激活"
+    },
+    {
+      "ID": 10895,
+      "txt": "前置节点没有解锁"
+    },
+    {
+      "ID": 10896,
+      "txt": "已经达到最大等级"
+    },
+    {
+      "ID": 10897,
+      "txt": "MAX级"
+    },
+    {
+      "ID": 10898,
+      "txt": "上传成功！"
+    },
+    {
+      "ID": 10899,
+      "txt": "上传失败！"
+    },
+    {
+      "ID": 10900,
+      "txt": "已复制"
+    },
+    {
+      "ID": 10901,
+      "txt": "已经开启200抽挑战，不能进行单抽了"
+    },
+    {
+      "ID": 10902,
+      "txt": "今日单抽免费次数已用完"
+    },
+    {
+      "ID": 10903,
+      "txt": "还未到达免费时间！请稍后再试"
+    },
+    {
+      "ID": 10904,
+      "txt": "当前拥有：{0}"
+    },
+    {
+      "ID": 10905,
+      "txt": "无"
+    },
+    {
+      "ID": 10906,
+      "txt": "免费"
+    },
+    {
+      "ID": 10907,
+      "txt": "总计：{0} x {1} = {2}"
+    },
+    {
+      "ID": 10908,
+      "txt": "已获得 <color=#FDB34A>{0}</color> 倍奖励"
+    },
+    {
+      "ID": 10909,
+      "txt": "上一关还没有解锁！"
+    },
+    {
+      "ID": 10910,
+      "txt": "选项："
+    },
+    {
+      "ID": 10911,
+      "txt": "确认删除"
     }
   ]
 }

Assets/Res/Config/SkillConfig.json

@@ -8048,7 +8048,7 @@
       "level": 1,
       "effectUpK": 10,
       "effectValue": [
-        20.0
+        10.0
       ],
       "intensifierIndex": [
         1
@@ -8075,7 +8075,7 @@
       "level": 2,
       "effectUpK": 10,
       "effectValue": [
-        30.0
+        13.0
       ],
       "intensifierIndex": [
         1
@@ -8111,7 +8111,7 @@
       "level": 3,
       "effectUpK": 10,
       "effectValue": [
-        40.0
+        16.0
       ],
       "intensifierIndex": [
         1
@@ -8147,7 +8147,7 @@
       "level": 4,
       "effectUpK": 10,
       "effectValue": [
-        50.0
+        19.0
       ],
       "intensifierIndex": [
         1
@@ -8183,7 +8183,7 @@
       "level": 5,
       "effectUpK": 10,
       "effectValue": [
-        60.0
+        22.0
       ],
       "intensifierIndex": [
         1
@@ -8219,7 +8219,7 @@
       "level": 6,
       "effectUpK": 10,
       "effectValue": [
-        70.0
+        25.0
       ],
       "intensifierIndex": [
         1

Assets/Res/UI/BackgroundPanel/BackgroundPanel.controller

@@ -11,7 +11,7 @@ AnimatorStateMachine:
   m_ChildStates:
   - serializedVersion: 1
     m_State: {fileID: -2311901305850202280}
-    m_Position: {x: 200, y: 0, z: 0}
+    m_Position: {x: 250, y: 40, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []

Assets/Scenes/testCombat.scene

@@ -124,6 +124,221 @@ NavMeshSettings:
     debug:
       m_Flags: 0
   m_NavMeshData: {fileID: 0}
+--- !u!213 &47866645
+Sprite:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: dec_jianbian_tiao(Clone)
+  m_Rect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 115
+    height: 33
+  m_Offset: {x: 0, y: 0}
+  m_Border: {x: 0, y: 6, z: 0, w: 4}
+  m_PixelsToUnits: 100
+  m_Pivot: {x: 0.5, y: 0.5}
+  m_Extrude: 1
+  m_IsPolygon: 0
+  m_AtlasName: 
+  m_PackingTag: 
+  m_RenderDataKey:
+    c0c46614f24bc234b92e828eae8336c3: 21300000
+  m_AtlasTags:
+  - tongyong
+  m_SpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  m_RD:
+    serializedVersion: 3
+    texture: {fileID: 2800000, guid: c0c46614f24bc234b92e828eae8336c3, type: 3}
+    alphaTexture: {fileID: 0}
+    secondaryTextures: []
+    m_SubMeshes:
+    - serializedVersion: 2
+      firstByte: 0
+      indexCount: 6
+      topology: 0
+      baseVertex: 0
+      firstVertex: 0
+      vertexCount: 4
+      localAABB:
+        m_Center: {x: 0, y: 0, z: 0}
+        m_Extent: {x: 0, y: 0, z: 0}
+    m_IndexBuffer: 030000000100020001000000
+    m_VertexData:
+      serializedVersion: 3
+      m_VertexCount: 4
+      m_Channels:
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 3
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 1
+        offset: 0
+        format: 0
+        dimension: 2
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      m_DataSize: 80
+      _typelessdata: 333313bfc3f5283e000000003333133fc3f528be000000003333133fc3f5283e00000000333313bfc3f528be000000000000000000000000000000000000000000000000000000000000000000000000
+    m_Bindpose: []
+    textureRect:
+      serializedVersion: 2
+      x: 0
+      y: 0
+      width: 115
+      height: 33
+    textureRectOffset: {x: 0, y: 0}
+    atlasRectOffset: {x: -1, y: -1}
+    settingsRaw: 64
+    uvTransform: {x: 100, y: 57.5, z: 100, w: 16.5}
+    downscaleMultiplier: 1
+  m_AtlasRD:
+    serializedVersion: 3
+    texture: {fileID: 8711939763936270973, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+    alphaTexture: {fileID: 0}
+    secondaryTextures: []
+    m_SubMeshes:
+    - serializedVersion: 2
+      firstByte: 0
+      indexCount: 6
+      topology: 0
+      baseVertex: 0
+      firstVertex: 0
+      vertexCount: 4
+      localAABB:
+        m_Center: {x: 0, y: 0, z: 0}
+        m_Extent: {x: 0, y: 0, z: 0}
+    m_IndexBuffer: 030000000100020001000000
+    m_VertexData:
+      serializedVersion: 3
+      m_VertexCount: 4
+      m_Channels:
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 3
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 1
+        offset: 0
+        format: 0
+        dimension: 2
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      m_DataSize: 80
+      _typelessdata: 333313bfc3f5283e000000003333133fc3f528be000000003333133fc3f5283e00000000333313bfc3f528be000000000000000000000000000000000000000000000000000000000000000000000000
+    m_Bindpose: []
+    textureRect:
+      serializedVersion: 2
+      x: 0
+      y: 1562
+      width: 115
+      height: 33
+    textureRectOffset: {x: 0, y: 0}
+    atlasRectOffset: {x: 0, y: 1562}
+    settingsRaw: 67
+    uvTransform: {x: 100, y: 57.5, z: 100, w: 1578.5}
+    downscaleMultiplier: 1
+  m_PhysicsShape:
+  - - {x: 0.345, y: 0.16499999}
+    - {x: 0.345, y: -0.16499999}
+    - {x: 0.575, y: -0.16499999}
+    - {x: 0.575, y: 0.16499999}
+  m_Bones: []
+  m_SpriteID: 5e97eb03825dee720800000000000000
 --- !u!1 &123020043
 GameObject:
   m_ObjectHideFlags: 0
@@ -995,221 +1210,6 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: -6.0000024, y: -6}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!213 &1164457726
-Sprite:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: dec_jianbian_tiao(Clone)
-  m_Rect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 115
-    height: 33
-  m_Offset: {x: 0, y: 0}
-  m_Border: {x: 0, y: 6, z: 0, w: 4}
-  m_PixelsToUnits: 100
-  m_Pivot: {x: 0.5, y: 0.5}
-  m_Extrude: 1
-  m_IsPolygon: 0
-  m_AtlasName: 
-  m_PackingTag: 
-  m_RenderDataKey:
-    c0c46614f24bc234b92e828eae8336c3: 21300000
-  m_AtlasTags:
-  - tongyong
-  m_SpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
-  m_RD:
-    serializedVersion: 3
-    texture: {fileID: 2800000, guid: c0c46614f24bc234b92e828eae8336c3, type: 3}
-    alphaTexture: {fileID: 0}
-    secondaryTextures: []
-    m_SubMeshes:
-    - serializedVersion: 2
-      firstByte: 0
-      indexCount: 6
-      topology: 0
-      baseVertex: 0
-      firstVertex: 0
-      vertexCount: 4
-      localAABB:
-        m_Center: {x: 0, y: 0, z: 0}
-        m_Extent: {x: 0, y: 0, z: 0}
-    m_IndexBuffer: 030000000100020001000000
-    m_VertexData:
-      serializedVersion: 3
-      m_VertexCount: 4
-      m_Channels:
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 3
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 1
-        offset: 0
-        format: 0
-        dimension: 2
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      m_DataSize: 80
-      _typelessdata: 333313bfc3f5283e000000003333133fc3f528be000000003333133fc3f5283e00000000333313bfc3f528be000000000000000000000000000000000000000000000000000000000000000000000000
-    m_Bindpose: []
-    textureRect:
-      serializedVersion: 2
-      x: 0
-      y: 0
-      width: 115
-      height: 33
-    textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: -1, y: -1}
-    settingsRaw: 64
-    uvTransform: {x: 100, y: 57.5, z: 100, w: 16.5}
-    downscaleMultiplier: 1
-  m_AtlasRD:
-    serializedVersion: 3
-    texture: {fileID: 8711939763936270973, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
-    alphaTexture: {fileID: 0}
-    secondaryTextures: []
-    m_SubMeshes:
-    - serializedVersion: 2
-      firstByte: 0
-      indexCount: 6
-      topology: 0
-      baseVertex: 0
-      firstVertex: 0
-      vertexCount: 4
-      localAABB:
-        m_Center: {x: 0, y: 0, z: 0}
-        m_Extent: {x: 0, y: 0, z: 0}
-    m_IndexBuffer: 030000000100020001000000
-    m_VertexData:
-      serializedVersion: 3
-      m_VertexCount: 4
-      m_Channels:
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 3
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 1
-        offset: 0
-        format: 0
-        dimension: 2
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      m_DataSize: 80
-      _typelessdata: 333313bfc3f5283e000000003333133fc3f528be000000003333133fc3f5283e00000000333313bfc3f528be000000000000000000000000000000000000000000000000000000000000000000000000
-    m_Bindpose: []
-    textureRect:
-      serializedVersion: 2
-      x: 0
-      y: 1562
-      width: 115
-      height: 33
-    textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 0, y: 1562}
-    settingsRaw: 67
-    uvTransform: {x: 100, y: 57.5, z: 100, w: 1578.5}
-    downscaleMultiplier: 1
-  m_PhysicsShape:
-  - - {x: 0.345, y: 0.16499999}
-    - {x: 0.345, y: -0.16499999}
-    - {x: 0.575, y: -0.16499999}
-    - {x: 0.575, y: 0.16499999}
-  m_Bones: []
-  m_SpriteID: 5e97eb03825dee720800000000000000
 --- !u!1 &1296517488
 GameObject:
   m_ObjectHideFlags: 0
@@ -1510,7 +1510,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 1164457726}
+  m_Sprite: {fileID: 47866645}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

Assets/Scripts/GameData/ExcelConfig/SkillConfig.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\Skill.xlsx. SheetName: SkillConfig
+// Generate From Excel\skill.xlsx. SheetName: SkillConfig
 
 using System;
 using Fort23.GameData;

Assets/Scripts/GameData/ExcelConfig/SkillConstant.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\Skill.xlsx. SheetName: SkillConstant
+// Generate From Excel\skill.xlsx. SheetName: SkillConstant
 
 using System;
 using Fort23.GameData;

Assets/Scripts/GameData/ExcelConfig/SkillPowerupConfig.cs

@@ -1,5 +1,5 @@
 // Auto Generated Code By excel2json
-// Generate From Excel\Skill.xlsx. SheetName: SkillPowerupConfig
+// Generate From Excel\skill.xlsx. SheetName: SkillPowerupConfig
 
 using System;
 using Fort23.GameData;

Assets/Scripts/GameUI/UI/BoxPanel/BoxPanel.cs

@@ -50,12 +50,9 @@ namespace Fort23.Mono
                 {
                     if (AccountFileInfo.Instance.playerData.todayTotalAds >= 80)
                     {
-                        TipMessagePanel.OpenTipMessagePanel("今日看广告次数已经达上限！");
+                        TipMessagePanel.OpenTipMessagePanel(10821);
                         return null;
                     }
-
-                    // AccountFileInfo.Instance.playerData.todayTotalAds++;
-                    // AccountFileInfo.Instance.SavePlayerData();
                 }
 
                 if (!PlayerManager.Instance.BagController.IsEnough(23002, 1))
@@ -280,7 +277,7 @@ namespace Fort23.Mono
                     Text_TenFree.gameObject.SetActive(false);
                     if (summonData.tenFreeCount < openBoxConfig.oneConsumeFreePara_1[1])
                     {
-                        tenCion.text = "免费";
+                        tenCion.text =  LanguageManager.Instance.Text(10835);
                     }
                     else
                     {
@@ -302,7 +299,8 @@ namespace Fort23.Mono
                     Text_OneFree.gameObject.SetActive(false);
                     if (summonData.oneFreeCount < openBoxConfig.oneConsumeFreePara[1])
                     {
-                        onCion.text = "免费";
+                        onCion.text =  LanguageManager.Instance.Text(10835);
+
                     }
                     else
                     {
@@ -324,7 +322,7 @@ namespace Fort23.Mono
                 PlayerManager.Instance.serverTime >= summonData.nextTenFreeTime)
             {
                 Text_TenFree.gameObject.SetActive(false);
-                tenCion.text = "免费";
+                tenCion.text =  LanguageManager.Instance.Text(10835);
             }
             //今日次数已用完
             else if (summonData.tenFreeCount >= openBoxConfig.oneConsumeFreePara_1[1])
@@ -343,7 +341,7 @@ namespace Fort23.Mono
                 PlayerManager.Instance.serverTime >= summonData.nextOneFreeTime)
             {
                 Text_OneFree.gameObject.SetActive(false);
-                onCion.text = "免费";
+                onCion.text = LanguageManager.Instance.Text(10835);
             }
             else if (summonData.oneFreeCount >= openBoxConfig.oneConsumeFreePara[1])
             {

Assets/Scripts/GameUI/UI/BoxPanel/GachaPanel.cs

@@ -100,7 +100,6 @@ namespace Fort23.Mono
                     ItemInfo itemInfo1 = new ItemInfo(itemInfo.itemID, (long)(itemInfo.count.Value * (beLv - 1)));
                     //TODO 功法双倍奖励
                     PlayerManager.Instance.BagController.AddItem(itemInfo1);
-                    
                 }
 
                 if (itemInfos.Count == 1)
@@ -116,7 +115,7 @@ namespace Fort23.Mono
                 }
 
 
-                Text_Tips.text = $"已获得{beLv}倍奖励";
+                Text_Tips.text = LanguageManager.Instance.Text(10062, beLv);
                 Text_Tips.gameObject.SetActive(true);
                 // UIManager.Instance.HideUIUIPanel<GachaPanel>();
             });

Assets/Scripts/GameUI/UI/BoxPanel/OpenBoxScorePanel.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Core.Language;
 using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
@@ -47,9 +48,10 @@ namespace Fort23.Mono
                 StartRoot.gameObject.SetActive(summonData.isSummonSocre);
                 if (summonData.isSummonSocre)
                 {
-                    Text_JingDu.text =
-                        $"当前进度：{summonData.drawHistory.Count * 10}/{openBoxConfig.ProgressRewardChoukaCount}";
-                    Text_Score.text = $"目前得分：{summonData.score}";
+                    Text_JingDu.text = LanguageManager.Instance.Text(10836, summonData.drawHistory.Count * 10,
+                        openBoxConfig.ProgressRewardChoukaCount);
+                     
+                    Text_Score.text = LanguageManager.Instance.Text(10261,summonData.score);
                 }
             });
         }
@@ -64,8 +66,9 @@ namespace Fort23.Mono
             if (summonData.isSummonSocre)
             {
                 Text_JingDu.text =
-                    $"当前进度：{summonData.drawHistory.Count * 10}/{openBoxConfig.ProgressRewardChoukaCount}";
-                Text_Score.text = $"目前得分：{summonData.score}";
+                    LanguageManager.Instance.Text(10836, summonData.drawHistory.Count * 10,
+                        openBoxConfig.ProgressRewardChoukaCount);
+                Text_Score.text =  LanguageManager.Instance.Text(10261,summonData.score);
             }
 
             using (CTaskAwaitBuffer cts =

Assets/Scripts/GameUI/UI/CheckBoxPanel/CheckBoxPanel.cs

@@ -1,3 +1,4 @@
+using Core.Language;
 using Fort23.Core;
 
 namespace Fort23.Mono
@@ -24,7 +25,7 @@ namespace Fort23.Mono
         {
             Btn_Baochun.onClick.AddListener(() =>
             {
-                if (InputField_Name.text == "确认删除")
+                if (InputField_Name.text == LanguageManager.Instance.Text(10911))
                 {
                     isok = true;
                     UIManager.Instance.HideUIUIPanel(this);

Assets/Scripts/GameUI/UI/CombatPanel/SkillSelectPanel.cs

@@ -545,7 +545,7 @@ namespace Fort23.Mono
             }
             else
             {
-                Text_RoadName.text = "未选择";
+                Text_RoadName.text = LanguageManager.Instance.Text(10837);
             }
             // 
         }
@@ -833,7 +833,7 @@ namespace Fort23.Mono
                 {
                     if (!IsMainGongFaChange(selectSkillConfig.skillConfig))
                     {
-                        TipMessagePanel.OpenTipMessagePanel("主动功法已经上满");
+                        TipMessagePanel.OpenTipMessagePanel(10838);
                         CloseSelect();
                         return;
                     }
@@ -843,7 +843,7 @@ namespace Fort23.Mono
                 {
                     if (!IsPassiveGongFaChange(selectSkillConfig.skillConfig))
                     {
-                        TipMessagePanel.OpenTipMessagePanel("被动功法已经上满");
+                        TipMessagePanel.OpenTipMessagePanel(10839);
                         CloseSelect();
                         return;
                     }
@@ -878,7 +878,7 @@ namespace Fort23.Mono
                 if (!IsPassiveGongFaChange(selectSkillConfig.skillConfig) &&
                     allUseSkill[skillKongWidget.SkillInfo.index].skillConfig.SkillType != 2)
                 {
-                    TipMessagePanel.OpenTipMessagePanel("被动功法已经上满");
+                    TipMessagePanel.OpenTipMessagePanel(10839);
                     CloseSelect();
                     return;
                 }
@@ -886,7 +886,7 @@ namespace Fort23.Mono
                 if (!IsMainGongFaChange(selectSkillConfig.skillConfig) &&
                     allUseSkill[skillKongWidget.SkillInfo.index].skillConfig.SkillType != 1)
                 {
-                    TipMessagePanel.OpenTipMessagePanel("主动功法已经上满");
+                    TipMessagePanel.OpenTipMessagePanel(10838);
                     CloseSelect();
                     return;
                 }

Assets/Scripts/GameUI/UI/CombatPanel/SkillWidget.cs

@@ -44,7 +44,8 @@ namespace Fort23.Mono
             SkillConfig skillConfig = skillId.skillConfig;
             icon.icon_name = skillConfig.icon;
 
-            Text_Level.text = skillConfigId.SkillPowerupConfig.ID.ToString() + "级";
+
+            Text_Level.text = LanguageManager.Instance.Text(10843, skillConfigId.SkillPowerupConfig.ID.ToString());
             Text_SkillName.text = LanguageManager.Instance.Text(skillConfig.name);
 
             for (var i = 0; i < StarRoot.Count; i++)
@@ -89,13 +90,12 @@ namespace Fort23.Mono
             {
                 ShuXingCsc.ChangeState(4);
             }
-            
+
             //土
             if (skillConfigId.skillConfig.attribute == 0)
             {
                 ShuXingCsc.ChangeState(5);
             }
-       
 
 
             // for (var i = 0; i < StarRoot.Count; i++)
@@ -134,18 +134,19 @@ namespace Fort23.Mono
             switch (skillConfig.SkillType)
             {
                 case 1:
-                    Text_SkillType.text = "主动";
+                    Text_SkillType.text = LanguageManager.Instance.Text(10840);
                     csc.ChangeState(0);
                     break;
                 case 5:
-                    Text_SkillType.text = "被动";
+                    Text_SkillType.text = LanguageManager.Instance.Text(10841);
                     csc.ChangeState(1);
                     break;
                 case 2:
-                    Text_SkillType.text = "辅助";
+                    Text_SkillType.text = LanguageManager.Instance.Text(10842);
                     csc.ChangeState(1);
                     break;
             }
+
             redDotComType01.CustomInit(2, skillConfigId);
             // if (PlayerManager.Instance.GongFaControl.allUseSkill.Contains(skillConfigId))
             // {
@@ -155,8 +156,6 @@ namespace Fort23.Mono
             // {
             //     redDotComType01.CustomInit(2, null);
             // }
-
-         
         }
 
         public override void DormancyObj()

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouGuaJiWidget.cs

@@ -34,11 +34,11 @@ namespace Fort23.Mono
 			Text_GaiLv.text = PlayerManager.Instance.GetBl(daoYouData, daoyouModelConfig.guajiBuffID[0]) + "%";
 			if (TimeHelper.ClientNow() >= daoYouGuaJiData.leaveTime)
 			{
-				Text_State.text = "离开";
+				Text_State.text = LanguageManager.Instance.Text(10856);
 			}
 			else
 			{
-				Text_State.text = "正在探索遗迹";
+				Text_State.text =LanguageManager.Instance.Text(10857);
 			}
 
 			Text_Time.text = PlayerManager.TimeToHSM(daoYouGuaJiData.guajiTime/1000);

Assets/Scripts/GameUI/UI/DaoYouPanel/DaoYouInfoPanel.cs

@@ -66,7 +66,7 @@ namespace Fort23.Mono
             {
                 if (daoYouData.favorabilityLv >= _daoYouLevelWidgets.Count)
                 {
-                    TipMessagePanel.OpenTipMessagePanel("道友等级已到最高");
+                    TipMessagePanel.OpenTipMessagePanel(10858);
                     return;
                 }
 
@@ -200,7 +200,7 @@ namespace Fort23.Mono
                 {
                     if (daoYouData.emotionValue >= 100)
                     {
-                        TipMessagePanel.OpenTipMessagePanel("心情已经到最高");
+                        TipMessagePanel.OpenTipMessagePanel(10859);
                         return;
                     }
 
@@ -601,7 +601,7 @@ namespace Fort23.Mono
         private void UpdateGiveItemCount()
         {
             emotionConfig emotionConfig = ConfigComponent.Instance.Get<emotionConfig>(daoYouData.emotion);
-            Text_Count.text = $"当前选择数量{count}";
+            Text_Count.text = LanguageManager.Instance.Text(10860, count);
             if (widgetItem1 != null && daoyouGiftConfig.ID != 0)
             {
                 if (_daoyouModelConfig.PreferGiftID.Contains(daoyouGiftConfig.ItemID))

Assets/Scripts/GameUI/UI/DialoguePanel/DialogueOptionWidget.cs

@@ -62,7 +62,7 @@ namespace Fort23.Mono
         {
             type = 2;
 
-            Text_desc.text = "取消事件";
+            Text_desc.text = LanguageManager.Instance.Text(10861);
             this.callback = callback;
             transform.RecoverColor();
             LayoutRebuilder.ForceRebuildLayoutImmediate(Text_desc.GetComponent<RectTransform>());

Assets/Scripts/GameUI/UI/DivineSence/BossInfoPanel.cs

@@ -145,17 +145,20 @@ namespace Fort23.Mono
                 Icon_Select.transform.SetParent(Btn_Player.transform);
                 Icon_Select.transform.SetAsFirstSibling();
                 Icon_Select.GetComponent<RectTransform>().anchoredPosition = new Vector2(0, 0);
-                Text_Name.text = "名称：" + PlayerManager.Instance.PlayerName;
 
+                Text_Name.text = LanguageManager.Instance.Text(10844, PlayerManager.Instance.PlayerName);
 
-                Text_Jingjie.text =
-                    "境界：" +
+
+                string jingjie =
                     LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[0]) +
                     LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[1]) +
                     LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[2]);
+                Text_Jingjie.text = LanguageManager.Instance.Text(10845, jingjie);
+
 
-                Text_Linggen.text =
-                    $"金：{PlayerManager.Instance.myHero.Metal} 木：{PlayerManager.Instance.myHero.Wood} 水：{PlayerManager.Instance.myHero.Water} 火：{PlayerManager.Instance.myHero.Fire} 土：{PlayerManager.Instance.myHero.Earth}";
+                Text_Linggen.text = LanguageManager.Instance.Text(10846, PlayerManager.Instance.myHero.Metal,
+                    PlayerManager.Instance.myHero.Wood, PlayerManager.Instance.myHero.Water,
+                    PlayerManager.Instance.myHero.Fire, PlayerManager.Instance.myHero.Earth);
                 Text_Hp.text = PlayerManager.Instance.myHero.hp.Value.ToString();
 
                 using (CTaskAwaitBuffer cTaskAwaitBuffer = new CTaskAwaitBuffer())
@@ -196,13 +199,15 @@ namespace Fort23.Mono
                 // Icon_Select.transform.SetParent(Btn_Boss.transform);
                 // Icon_Select.transform.SetAsFirstSibling();
 
-                Text_Name.text = "名称：" + LanguageManager.Instance.Text(combatHeroInfo.modelConfig.name);
+
+                Text_Name.text = LanguageManager.Instance.Text(10844,
+                    LanguageManager.Instance.Text(combatHeroInfo.modelConfig.name));
 
 
-                Text_Jingjie.text =
-                    "境界：" + LanguageManager.Instance.Text(combatHeroInfo.MonsterPowerUpConfig.jingjie1) +
-                    LanguageManager.Instance.Text(combatHeroInfo.MonsterPowerUpConfig.jingjie2) +
-                    LanguageManager.Instance.Text(combatHeroInfo.MonsterPowerUpConfig.jingjie3);
+                string jingjie = LanguageManager.Instance.Text(combatHeroInfo.MonsterPowerUpConfig.jingjie1) +
+                                 LanguageManager.Instance.Text(combatHeroInfo.MonsterPowerUpConfig.jingjie2) +
+                                 LanguageManager.Instance.Text(combatHeroInfo.MonsterPowerUpConfig.jingjie3);
+                Text_Jingjie.text = LanguageManager.Instance.Text(10845, jingjie);
 
                 using (CTaskAwaitBuffer cTaskAwaitBuffer = new CTaskAwaitBuffer())
                 {
@@ -253,8 +258,8 @@ namespace Fort23.Mono
                 }
 
 
-                Text_Linggen.text =
-                    $"金：{combatHeroInfo.Metal} 木：{combatHeroInfo.Wood} 水：{combatHeroInfo.Water} 火：{combatHeroInfo.Fire} 土：{combatHeroInfo.Earth}";
+                Text_Linggen.text = LanguageManager.Instance.Text(10846, combatHeroInfo.Metal, combatHeroInfo.Wood,
+                    combatHeroInfo.Water, combatHeroInfo.Fire, combatHeroInfo.Earth);
                 Text_Hp.text = combatHeroInfo.hp.Value.ToString();
             }
         }

Assets/Scripts/GameUI/UI/DivineSence/DivineSenceItemPanel.cs

@@ -39,7 +39,7 @@ namespace Fort23.Mono
             {
                 if (selectType.Contains(6))
                 {
-                    TipMessagePanel.OpenTipMessagePanel("此类型不能重复选择！");
+                    TipMessagePanel.OpenTipMessagePanel(10847);
                     return;
                 }
 
@@ -56,7 +56,7 @@ namespace Fort23.Mono
             {
                 if (selectType.Contains(7))
                 {
-                    TipMessagePanel.OpenTipMessagePanel("此类型不能重复选择！");
+                    TipMessagePanel.OpenTipMessagePanel(10847);
                     return;
                 }
 

Assets/Scripts/GameUI/UI/DivineSence/GongFaWidgetType2.cs

@@ -1,3 +1,4 @@
+using Core.Language;
 using GameLogic.Hero;
 
 namespace Fort23.Mono
@@ -30,7 +31,8 @@ namespace Fort23.Mono
             Icon_FabaoIcon.transform.parent.gameObject.SetActive(true);
             Icon_GongFaIcon.gameObject.SetActive(false);
             this.faBaoInfo = faBaoInfo;
-            Text_Level.text = faBaoInfo.FaBaoData.level.ToString() + "级";
+
+            Text_Level.text = LanguageManager.Instance.Text(10843, faBaoInfo.FaBaoData.level.ToString());
             Icon_FabaoIcon.icon_name = faBaoInfo.SkillConfig.icon;
 
             if (isUlock)
@@ -50,7 +52,8 @@ namespace Fort23.Mono
             Icon_FabaoIcon.transform.parent.gameObject.SetActive(false);
             Icon_GongFaIcon.gameObject.SetActive(true);
             this.skillInfo = skillInfo;
-            Text_Level.text = skillInfo.SkillPowerupConfig.ID.ToString() + "级";
+
+            Text_Level.text = LanguageManager.Instance.Text(10843, skillInfo.SkillPowerupConfig.ID.ToString());
             Icon_GongFaIcon.icon_name = skillInfo.skillConfig.icon;
             if (isUlock)
             {

Assets/Scripts/GameUI/UI/DivineSence/ShengShiEventWidgetType2.cs

@@ -38,11 +38,11 @@ namespace Fort23.Mono
         {
             base.AddButtonEvent();
 
-            Btn_Bag.onClick.AddListener(() => { TipMessagePanel.OpenTipMessagePanel("事件的选择会影响获得的道具！"); });
+            Btn_Bag.onClick.AddListener(() => { TipMessagePanel.OpenTipMessagePanel(10848); });
 
             Btn_RemoveEvent.onClick.AddListener(async () =>
             {
-                var isOk = await TipsPanle.OpenPnael("", "放弃后，事件会从列表消失。已消耗的神识不会返还。是否确认？");
+                var isOk = await TipsPanle.OpenPnael(10849);
                 if (isOk)
                     EventSystemManager.Instance.RemoveEvent(eventList);
             });
@@ -118,7 +118,7 @@ namespace Fort23.Mono
             {
                 Text_Go.text = LanguageManager.Instance.Text(10156);
             }
-         
+
             if (eventLinkData == null || eventLinkData.eventConditions == null ||
                 eventLinkData.eventConditions.Count == 0)
             {
@@ -164,8 +164,8 @@ namespace Fort23.Mono
 
                 Text_Eventcondition.text = desc;
             }
-            
-         
+
+
             Btn_ZuiZhong.gameObject.SetActive(AccountFileInfo.Instance.playerData.CurrentZuiZhongEventListId !=
                                               eventList.guid);
 
@@ -201,9 +201,6 @@ namespace Fort23.Mono
             Text_Type.text = EventHelper.GetEventType(randomEventConfig.EventTag);
 
 
-
-
-
             using (CTaskAwaitBuffer<WidgetItem> cts = new CTaskAwaitBuffer<WidgetItem>())
             {
                 for (var i = 0; i < eventList.itemInfos.Count; i++)
@@ -213,6 +210,7 @@ namespace Fort23.Mono
                     {
                         continue;
                     }
+
                     cts.AddTask(UIManager.Instance.CreateGComponent<WidgetItem>(null, ItemRoot));
                 }
 
@@ -220,14 +218,15 @@ namespace Fort23.Mono
             }
 
             int index = 0;
-            for (var i = 0; i <  eventList.itemInfos.Count; i++)
+            for (var i = 0; i < eventList.itemInfos.Count; i++)
             {
                 ItemConfig itemConfig = ConfigComponent.Instance.Get<ItemConfig>(eventList.itemInfos[i].itemId);
                 if (itemConfig.isVisible == 0)
                 {
                     continue;
                 }
-                widgetList[index++].InitWidget(new ItemInfo( eventList.itemInfos[i]));
+
+                widgetList[index++].InitWidget(new ItemInfo(eventList.itemInfos[i]));
             }
 
 
@@ -240,7 +239,7 @@ namespace Fort23.Mono
                 if (eventLinkConfig.optionType == 3)
                 {
                     WidgetItem widgetItem = await UIManager.Instance.CreateGComponent<WidgetItem>(null, ItemRoot);
-                    widgetItem.ShowShenShiWenHao(() => { TipMessagePanel.OpenTipMessagePanel("事件的选择会影响获得的道具！"); });
+                    widgetItem.ShowShenShiWenHao(() => { TipMessagePanel.OpenTipMessagePanel(10848); });
                     widgetList.Add(widgetItem);
                     break;
                 }

Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradePanel.cs

@@ -188,7 +188,7 @@ namespace Fort23.Mono
             if (_skillInfo.SkillData.star > _gongFaUpgradeInfoWidgets.Count)
             {
                 AudioManager.Instance.PlayAudio("ui_chaozuoshibai.wav");
-                TipMessagePanel.OpenTipMessagePanel("已经满星！");
+                TipMessagePanel.OpenTipMessagePanel(10850);
                 return;
             }
 
@@ -243,7 +243,7 @@ namespace Fort23.Mono
 
             if (_skillInfo.SkillData.level >= _skillPowerupConfigs.Count)
             {
-                TipMessagePanel.OpenTipMessagePanel("已经满级！");
+                TipMessagePanel.OpenTipMessagePanel(10851);
                 AudioManager.Instance.PlayAudio("ui_chaozuoshibai.wav");
                 return;
             }
@@ -253,8 +253,10 @@ namespace Fort23.Mono
                 AudioManager.Instance.PlayAudio("ui_chaozuoshibai.wav");
                 HeroPowerUpConfig heroPowerUpConfig =
                     ConfigComponent.Instance.Get<HeroPowerUpConfig>(_skillInfo.SkillPowerupConfig.PlayerLevelLimit);
-                TipMessagePanel.OpenTipMessagePanel(
-                    $"需境界达到{LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[0]) + LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[1]) + LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[2])}");
+                string jingjie = LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[0]) +
+                                 LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[1]) +
+                                 LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[2]);
+                TipMessagePanel.OpenTipMessagePanel(LanguageManager.Instance.Text(10852, jingjie));
                 return;
             }
 
@@ -455,8 +457,10 @@ namespace Fort23.Mono
                         HeroPowerUpConfig heroPowerUpConfig =
                             ConfigComponent.Instance.Get<HeroPowerUpConfig>(_skillInfo.SkillPowerupConfig
                                 .PlayerLevelLimit);
-                        Text_UpGrade.text =
-                            $"需境界达到{LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[0]) + LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[1]) + LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[2])}";
+                        string jingjie = LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[0]) +
+                                         LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[1]) +
+                                         LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[2]);
+                        Text_UpGrade.text =LanguageManager.Instance.Text(10852,jingjie);
                         Btn_UpGradeOk.gameObject.transform.Gray(true);
                         UpGradeItemRoot.SetActive(false);
                     }

Assets/Scripts/GameUI/UI/GongFaUpgradePanel/SkillRoadSelecPanel.cs

@@ -52,7 +52,7 @@ namespace Fort23.Mono
 
             if (currentSelectId == 0)
             {
-                Text_SkillName.text = "未选择";
+                Text_SkillName.text = LanguageManager.Instance.Text(10837);
             }
             else
             {

Assets/Scripts/GameUI/UI/HeroInformationPanel/BreakthroughItemWidget.cs

@@ -53,7 +53,7 @@ namespace Fort23.Mono
                             Icon_ItemIcon.gameObject.SetActive(false);
                             widgetItem = null;
                             Text_Bl.text = $"+{0}";
-                            Text_ItemName.text = "丹药";
+                            Text_ItemName.text = LanguageManager.Instance.Text(10853);
                         }
                         else
                         {
@@ -117,7 +117,7 @@ namespace Fort23.Mono
             if (type == 1)
             {
                 Text_Bl.text = $"+{0}";
-                Text_ItemName.text = "丹药";
+                Text_ItemName.text =LanguageManager.Instance.Text(10853);
             }
             else
             {

Assets/Scripts/GameUI/UI/HeroInformationPanel/ElixirItemWidget.cs

@@ -30,8 +30,9 @@ namespace Fort23.Mono
         {
             _itemConfig = ConfigComponent.Instance.Get<ItemConfig>(itemId);
 
-            Text_FailDesc.text = $"成功几率+{_itemConfig.associateVlaue[2]}%";
-            Text_SucceedDesc.text = $"失败损耗-{_itemConfig.associateVlaue[3]}%";
+
+            Text_FailDesc.text = LanguageManager.Instance.Text(10854, _itemConfig.associateVlaue[2]);
+            Text_SucceedDesc.text = LanguageManager.Instance.Text(10855, _itemConfig.associateVlaue[3]);
             Text_ItemName.text = LanguageManager.Instance.Text(_itemConfig.itemName);
 
             if (PlayerManager.Instance.BagController.IsEnough(itemId, 1))

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroAttributeWidget.cs

@@ -1,3 +1,5 @@
+using Core.Language;
+
 namespace Fort23.Mono
 {
     public class HeroAttributeData
@@ -13,6 +15,13 @@ namespace Fort23.Mono
             this.currentValue = currentValue;
             this.nextValue = nextValue;
         }
+        public HeroAttributeData(int name, string currentValue, string nextValue)
+        {
+            
+            this.name = LanguageManager.Instance.Text(name);
+            this.currentValue = currentValue;
+            this.nextValue = nextValue;
+        }
     }
     
     [UIBinding(prefab = "HeroAttributeWidget")]

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughPanel.cs

@@ -75,7 +75,7 @@ namespace Fort23.Mono
                 {
                     if (heroPowerUpConfig.DujieLevelbattleID != -1 && !PlayerManager.Instance.myHero.heroData.isCombat)
                     {
-                        TipMessagePanel tipMessage = await TipMessagePanel.OpenTipMessagePanel("没有破除心魔");
+                        TipMessagePanel tipMessage = await TipMessagePanel.OpenTipMessagePanel(10862);
                         return;
                     }
 
@@ -97,7 +97,9 @@ namespace Fort23.Mono
                             ItemConfig itemConfig =
                                 ConfigComponent.Instance.Get<ItemConfig>(PlayerManager.Instance.myHero.powerUpConfig
                                     .DujieMustItemIDs[i]);
-                            string tips = "缺少" + LanguageManager.Instance.Text(itemConfig.itemName);
+
+                            string tips = LanguageManager.Instance.Text(10874,
+                                LanguageManager.Instance.Text(itemConfig.itemName));
                             TipMessagePanel tipMessage = await TipMessagePanel.OpenTipMessagePanel(tips);
                             return;
                         }
@@ -110,7 +112,7 @@ namespace Fort23.Mono
                                 PlayerManager.Instance.myHero.powerUpConfig.DujieMustItemIDs[i],
                                 1))
                         {
-                            TipMessagePanel tipMessage = await TipMessagePanel.OpenTipMessagePanel("道具不足！");
+                            TipMessagePanel tipMessage = await TipMessagePanel.OpenTipMessagePanel(10324);
                             return;
                         }
                     }
@@ -172,7 +174,7 @@ namespace Fort23.Mono
                     {
                         if (PlayerManager.Instance.myHero.hp.Value < heroPowerUpConfig.LeijieDamages[0])
                         {
-                            TipMessagePanel.OpenTipMessagePanel("生命值不够！");
+                            TipMessagePanel.OpenTipMessagePanel(10863);
                             return;
                         }
 
@@ -233,7 +235,7 @@ namespace Fort23.Mono
                             AccountFileInfo.Instance.SavePlayerData();
                             Btn_StartCombat.gameObject.SetActive(false);
                             CombatTrue.gameObject.SetActive(true);
-                            Text_Combat.text = "已破除";
+                            Text_Combat.text = LanguageManager.Instance.Text(10864);
                             RefenceSuccessProbability(PlayerManager.Instance.myHero);
                             // UIManager.Instance.ShowLastHindAllShowPanel();
                         }
@@ -453,13 +455,13 @@ namespace Fort23.Mono
                 {
                     Btn_StartCombat.gameObject.SetActive(false);
                     CombatTrue.gameObject.SetActive(true);
-                    Text_Combat.text = "已破除";
+                    Text_Combat.text = LanguageManager.Instance.Text(10864);
                 }
                 else
                 {
                     Btn_StartCombat.gameObject.SetActive(true);
                     CombatTrue.gameObject.SetActive(false);
-                    Text_Combat.text = "破除";
+                    Text_Combat.text = LanguageManager.Instance.Text(10865);
                 }
             }
             else
@@ -583,25 +585,25 @@ namespace Fort23.Mono
                 {
                     if (PlayerManager.Instance.myHero.heroData.isYuanMan)
                     {
-                        Text_AffirmTips.text = "是否确认渡劫";
+                        Text_AffirmTips.text = LanguageManager.Instance.Text(10433);
                     }
                     else
                     {
-                        Text_AffirmTips.text = "是否确认圆满";
+                        Text_AffirmTips.text = LanguageManager.Instance.Text(10434);
                     }
                 }
                 else
                 {
-                    Text_AffirmTips.text = "是否确认突破";
+                    Text_AffirmTips.text = LanguageManager.Instance.Text(10866);
                 }
             }
             else
             {
                 //提示需要什么道具
-                string tips = "需要";
+                string tips = LanguageManager.Instance.Text(10867);
                 if (heroPowerUpConfig.DujieLevelbattleID != -1 && !hero.heroData.isCombat)
                 {
-                    tips += " 破除心魔";
+                    tips += LanguageManager.Instance.Text(10868);
                 }
 
                 foreach (var dujieMustItemID in hero.powerUpConfig.DujieMustItemIDs)
@@ -626,8 +628,9 @@ namespace Fort23.Mono
             failXw = (int)(hero.powerUpConfig.levelUpExp * failbl * 0.01f);
 
 
-            Text_FailDesc.text = $"失败损失修为：{failXw}修为";
-            Text_SucceedDesc.text = $"成功几率：{successBl}%";
+            Text_FailDesc.text = LanguageManager.Instance.Text(10869, failXw);
+
+            Text_SucceedDesc.text = LanguageManager.Instance.Text(10870, successBl);
 
             LayoutRebuilder.ForceRebuildLayoutImmediate(Text_AffirmTips.GetComponent<RectTransform>());
             LayoutRebuilder.ForceRebuildLayoutImmediate(Text_AffirmTips.transform.parent.GetComponent<RectTransform>());
@@ -674,132 +677,132 @@ namespace Fort23.Mono
 
 
         //渡劫预览
-        public async static CTask<HeroBreakthroughPanel> OpenPanel1(HeroInfo heroInfo1)
-        {
-            HeroBreakthroughPanel heroBreakthroughPanel =
-                await UIManager.Instance.LoadAndOpenPanel<HeroBreakthroughPanel>(null, UILayer.Top, isShowBG: true);
-            heroBreakthroughPanel.CustomInit(heroInfo1);
-            return heroBreakthroughPanel;
-        }
-
-        public async CTask CustomInit(HeroInfo heroInfo1)
-        {
-            type = 2;
-            heroPowerUpConfig = heroInfo1.powerUpConfig;
-            nextHeroInfo = PlayerManager.Instance.myHero.CopyHero();
-            nextHeroInfo.InitHero(PlayerManager.Instance.myHero.heroData.heroModelId,
-                heroInfo1.heroData.heroPowerId + 1);
-
-            Text_CurrrentJIngjie.text = LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[0]) +
-                                        LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[1]) +
-                                        LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[2]);
-
-            Text_NextJinfjie.text = LanguageManager.Instance.Text(nextHeroInfo.powerUpConfig.jingjieLanIDs[0]) +
-                                    LanguageManager.Instance.Text(nextHeroInfo.powerUpConfig.jingjieLanIDs[1]) +
-                                    LanguageManager.Instance.Text(nextHeroInfo.powerUpConfig.jingjieLanIDs[2]);
-
-            if (heroPowerUpConfig.jingjie1 != nextHeroInfo.powerUpConfig.jingjie1)
-            {
-                Text_TitleName.text = "渡劫预览";
-                Text_Affirm.text = "逆天而行";
-                Text_AffirmTips.text = "是否确认渡劫";
-
-                if (heroPowerUpConfig.LeijieDamages != null && heroPowerUpConfig.LeijieDamages.Length > 1)
-                {
-                    LeiJieRooot.gameObject.SetActive(true);
-                    Text_LeiJieHarm.text = $"{heroPowerUpConfig.LeijieDamages[0]}-{heroPowerUpConfig.LeijieDamages[1]}";
-                    Text_HeroHp.text = PlayerManager.Instance.myHero.hp.Value.ToString();
-
-                    if (PlayerManager.Instance.myHero.hp.Value < heroPowerUpConfig.LeijieDamages[0])
-                    {
-                        Text_HeroHp.color = Color.red;
-                    }
-                    else
-                    {
-                        Text_HeroHp.color = new Color32(249, 240, 204, 255);
-                    }
-                }
-                else
-                {
-                    LeiJieRooot.gameObject.SetActive(false);
-                }
-            }
-            else
-            {
-                Text_AffirmTips.text = "是否确认突破";
-                Text_Affirm.text = "突破";
-                Text_TitleName.text = "突破";
-                LeiJieRooot.gameObject.SetActive(false);
-            }
-
-
-            if (heroPowerUpConfig.DujieLevelbattleID != -1)
-            {
-                CombatRoot.gameObject.SetActive(true);
-                if (heroInfo1.heroData.isCombat)
-                {
-                    Btn_StartCombat.gameObject.SetActive(false);
-                    CombatTrue.gameObject.SetActive(true);
-                    Text_Combat.text = "已破除";
-                }
-                else
-                {
-                    Btn_StartCombat.gameObject.SetActive(true);
-                    CombatTrue.gameObject.SetActive(false);
-                    Text_Combat.text = "破除";
-                }
-            }
-            else
-            {
-                CombatRoot.gameObject.SetActive(false);
-            }
-
-            RefenceSuccessProbability(heroInfo1);
-
-            Btn_Affirm.transform.Gray(false);
-
-
-            using (CTaskAwaitBuffer<BreakthroughItemWidget> cTaskAwaitBuffer =
-                   new CTaskAwaitBuffer<BreakthroughItemWidget>())
-            {
-                for (int i = 0;
-                     i < 1 + heroPowerUpConfig.DujieMustItemIDs.Length + heroPowerUpConfig.DujieItemIDs?.Length;
-                     i++)
-                {
-                    cTaskAwaitBuffer.AddTask(
-                        UIManager.Instance.CreateGComponent<BreakthroughItemWidget>(null, Content));
-                }
-
-                breakthroughItemWidgets = await cTaskAwaitBuffer.WaitAll();
-
-                breakthroughItemWidgets[0].CustomInit(1, 0, false);
-
-
-                //必选道具
-                for (var i = 0; i < heroPowerUpConfig.DujieMustItemIDs.Length; i++)
-                {
-                    breakthroughItemWidgets[i + 1].CustomInit(2, heroPowerUpConfig.DujieMustItemIDs[i], true);
-                }
-
-                //可选道具
-                for (var i = 0; i < heroPowerUpConfig.DujieItemIDs?.Length; i++)
-                {
-                    breakthroughItemWidgets[i + heroPowerUpConfig.DujieMustItemIDs.Length + 1]
-                        .CustomInit(2, heroPowerUpConfig.DujieItemIDs[i], false);
-                }
-
-                for (var i = 0; i < breakthroughItemWidgets.Count; i++)
-                {
-                    breakthroughItemWidgets[i].transform.anchoredPosition =
-                        new Vector2((breakthroughItemWidgets[i].transform.sizeDelta.x + 0.22f) * i, 0);
-                }
-
-                Content.sizeDelta =
-                    new Vector2(
-                        (breakthroughItemWidgets[0].transform.sizeDelta.x + 0.22f) * breakthroughItemWidgets.Count,
-                        200);
-            }
-        }
+        // public async static CTask<HeroBreakthroughPanel> OpenPanel1(HeroInfo heroInfo1)
+        // {
+        //     HeroBreakthroughPanel heroBreakthroughPanel =
+        //         await UIManager.Instance.LoadAndOpenPanel<HeroBreakthroughPanel>(null, UILayer.Top, isShowBG: true);
+        //     heroBreakthroughPanel.CustomInit(heroInfo1);
+        //     return heroBreakthroughPanel;
+        // }
+        //
+        // public async CTask CustomInit(HeroInfo heroInfo1)
+        // {
+        //     type = 2;
+        //     heroPowerUpConfig = heroInfo1.powerUpConfig;
+        //     nextHeroInfo = PlayerManager.Instance.myHero.CopyHero();
+        //     nextHeroInfo.InitHero(PlayerManager.Instance.myHero.heroData.heroModelId,
+        //         heroInfo1.heroData.heroPowerId + 1);
+        //
+        //     Text_CurrrentJIngjie.text = LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[0]) +
+        //                                 LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[1]) +
+        //                                 LanguageManager.Instance.Text(heroPowerUpConfig.jingjieLanIDs[2]);
+        //
+        //     Text_NextJinfjie.text = LanguageManager.Instance.Text(nextHeroInfo.powerUpConfig.jingjieLanIDs[0]) +
+        //                             LanguageManager.Instance.Text(nextHeroInfo.powerUpConfig.jingjieLanIDs[1]) +
+        //                             LanguageManager.Instance.Text(nextHeroInfo.powerUpConfig.jingjieLanIDs[2]);
+        //
+        //     if (heroPowerUpConfig.jingjie1 != nextHeroInfo.powerUpConfig.jingjie1)
+        //     {
+        //         Text_TitleName.text = "渡劫预览";
+        //         Text_Affirm.text = "逆天而行";
+        //         Text_AffirmTips.text = "是否确认渡劫";
+        //
+        //         if (heroPowerUpConfig.LeijieDamages != null && heroPowerUpConfig.LeijieDamages.Length > 1)
+        //         {
+        //             LeiJieRooot.gameObject.SetActive(true);
+        //             Text_LeiJieHarm.text = $"{heroPowerUpConfig.LeijieDamages[0]}-{heroPowerUpConfig.LeijieDamages[1]}";
+        //             Text_HeroHp.text = PlayerManager.Instance.myHero.hp.Value.ToString();
+        //
+        //             if (PlayerManager.Instance.myHero.hp.Value < heroPowerUpConfig.LeijieDamages[0])
+        //             {
+        //                 Text_HeroHp.color = Color.red;
+        //             }
+        //             else
+        //             {
+        //                 Text_HeroHp.color = new Color32(249, 240, 204, 255);
+        //             }
+        //         }
+        //         else
+        //         {
+        //             LeiJieRooot.gameObject.SetActive(false);
+        //         }
+        //     }
+        //     else
+        //     {
+        //         Text_AffirmTips.text = "是否确认突破";
+        //         Text_Affirm.text = "突破";
+        //         Text_TitleName.text = "突破";
+        //         LeiJieRooot.gameObject.SetActive(false);
+        //     }
+        //
+        //
+        //     if (heroPowerUpConfig.DujieLevelbattleID != -1)
+        //     {
+        //         CombatRoot.gameObject.SetActive(true);
+        //         if (heroInfo1.heroData.isCombat)
+        //         {
+        //             Btn_StartCombat.gameObject.SetActive(false);
+        //             CombatTrue.gameObject.SetActive(true);
+        //             Text_Combat.text = "已破除";
+        //         }
+        //         else
+        //         {
+        //             Btn_StartCombat.gameObject.SetActive(true);
+        //             CombatTrue.gameObject.SetActive(false);
+        //             Text_Combat.text = "破除";
+        //         }
+        //     }
+        //     else
+        //     {
+        //         CombatRoot.gameObject.SetActive(false);
+        //     }
+        //
+        //     RefenceSuccessProbability(heroInfo1);
+        //
+        //     Btn_Affirm.transform.Gray(false);
+        //
+        //
+        //     using (CTaskAwaitBuffer<BreakthroughItemWidget> cTaskAwaitBuffer =
+        //            new CTaskAwaitBuffer<BreakthroughItemWidget>())
+        //     {
+        //         for (int i = 0;
+        //              i < 1 + heroPowerUpConfig.DujieMustItemIDs.Length + heroPowerUpConfig.DujieItemIDs?.Length;
+        //              i++)
+        //         {
+        //             cTaskAwaitBuffer.AddTask(
+        //                 UIManager.Instance.CreateGComponent<BreakthroughItemWidget>(null, Content));
+        //         }
+        //
+        //         breakthroughItemWidgets = await cTaskAwaitBuffer.WaitAll();
+        //
+        //         breakthroughItemWidgets[0].CustomInit(1, 0, false);
+        //
+        //
+        //         //必选道具
+        //         for (var i = 0; i < heroPowerUpConfig.DujieMustItemIDs.Length; i++)
+        //         {
+        //             breakthroughItemWidgets[i + 1].CustomInit(2, heroPowerUpConfig.DujieMustItemIDs[i], true);
+        //         }
+        //
+        //         //可选道具
+        //         for (var i = 0; i < heroPowerUpConfig.DujieItemIDs?.Length; i++)
+        //         {
+        //             breakthroughItemWidgets[i + heroPowerUpConfig.DujieMustItemIDs.Length + 1]
+        //                 .CustomInit(2, heroPowerUpConfig.DujieItemIDs[i], false);
+        //         }
+        //
+        //         for (var i = 0; i < breakthroughItemWidgets.Count; i++)
+        //         {
+        //             breakthroughItemWidgets[i].transform.anchoredPosition =
+        //                 new Vector2((breakthroughItemWidgets[i].transform.sizeDelta.x + 0.22f) * i, 0);
+        //         }
+        //
+        //         Content.sizeDelta =
+        //             new Vector2(
+        //                 (breakthroughItemWidgets[0].transform.sizeDelta.x + 0.22f) * breakthroughItemWidgets.Count,
+        //                 200);
+        //     }
+        // }
 
 
         // [CustomMethod(CustomMethodType.Update)]

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroHerlp.cs

@@ -12,7 +12,7 @@ namespace Fort23.Mono
             List<HeroAttributeData> heroAttributeDataList = new List<HeroAttributeData>();
             if (currentHero.powerUpConfig.ShenshiMax != newHero.powerUpConfig.ShenshiMax)
             {
-                HeroAttributeData heroAttributeData = new HeroAttributeData("神识上限",
+                HeroAttributeData heroAttributeData = new HeroAttributeData(10878,
                     currentHero.powerUpConfig.ShenshiMax.ToStringEx(),
                     "" + newHero.powerUpConfig.ShenshiMax.ToStringEx());
                 heroAttributeDataList.Add(heroAttributeData);
@@ -21,21 +21,21 @@ namespace Fort23.Mono
 
             if (currentHero.hp != newHero.hp)
             {
-                HeroAttributeData heroAttributeData = new HeroAttributeData("生命", currentHero.hp.Value.ToStringEx(),
+                HeroAttributeData heroAttributeData = new HeroAttributeData(10871, currentHero.hp.Value.ToStringEx(),
                     "" + newHero.hp.Value.ToStringEx());
                 heroAttributeDataList.Add(heroAttributeData);
             }
 
             if (currentHero.attack != newHero.attack)
             {
-                HeroAttributeData heroAttributeData = new HeroAttributeData("攻击", currentHero.attack.Value.ToStringEx(),
+                HeroAttributeData heroAttributeData = new HeroAttributeData(10872, currentHero.attack.Value.ToStringEx(),
                     "" + newHero.attack.Value.ToStringEx());
                 heroAttributeDataList.Add(heroAttributeData);
             }
 
             if (currentHero.defense != newHero.defense)
             {
-                HeroAttributeData heroAttributeData = new HeroAttributeData("防御",
+                HeroAttributeData heroAttributeData = new HeroAttributeData(10873,
                     currentHero.defense.Value.ToStringEx(), "" + newHero.defense.Value.ToStringEx());
                 heroAttributeDataList.Add(heroAttributeData);
             }
@@ -43,14 +43,14 @@ namespace Fort23.Mono
 
             if (currentHero.powerUpConfig.MPFactor != newHero.powerUpConfig.MPFactor)
             {
-                HeroAttributeData heroAttributeData = new HeroAttributeData("法宝倍率",
+                HeroAttributeData heroAttributeData = new HeroAttributeData(10875,
                     currentHero.powerUpConfig.MPFactor.ToString(), "" + currentHero.powerUpConfig.MPFactor.ToString());
                 heroAttributeDataList.Add(heroAttributeData);
             }
 
             if (currentHero.powerUpConfig.MPFactor != newHero.powerUpConfig.MPFactor)
             {
-                HeroAttributeData heroAttributeData = new HeroAttributeData("护盾倍率",
+                HeroAttributeData heroAttributeData = new HeroAttributeData(10876,
                     currentHero.powerUpConfig.HudunFactor.ToString(),
                     "" + currentHero.powerUpConfig.HudunFactor.ToString());
                 heroAttributeDataList.Add(heroAttributeData);
@@ -58,18 +58,18 @@ namespace Fort23.Mono
 
             if (currentHero.powerUpConfig.MPFactor != newHero.powerUpConfig.MPFactor)
             {
-                HeroAttributeData heroAttributeData = new HeroAttributeData("防御系数K",
+                HeroAttributeData heroAttributeData = new HeroAttributeData(10877,
                     currentHero.powerUpConfig.defK.ToStringEx(), "" + currentHero.powerUpConfig.defK.ToStringEx());
                 heroAttributeDataList.Add(heroAttributeData);
             }
 
-            if (currentHero.powerUpConfig.MPFactor != newHero.powerUpConfig.MPFactor)
-            {
-                HeroAttributeData heroAttributeData = new HeroAttributeData("神识上限",
-                    currentHero.powerUpConfig.ShenshiMax.ToStringEx(),
-                    "" + currentHero.powerUpConfig.ShenshiMax.ToStringEx());
-                heroAttributeDataList.Add(heroAttributeData);
-            }
+            // if (currentHero.powerUpConfig.MPFactor != newHero.powerUpConfig.MPFactor)
+            // {
+            //     HeroAttributeData heroAttributeData = new HeroAttributeData("神识上限",
+            //         currentHero.powerUpConfig.ShenshiMax.ToStringEx(),
+            //         "" + currentHero.powerUpConfig.ShenshiMax.ToStringEx());
+            //     heroAttributeDataList.Add(heroAttributeData);
+            // }
 
             return heroAttributeDataList;
         }
@@ -80,7 +80,7 @@ namespace Fort23.Mono
             List<HeroAttributeData> heroAttributeDataList = new List<HeroAttributeData>();
             if (currentHero.powerUpConfig.ShenshiMax != newHero.powerUpConfig.ShenshiMax)
             {
-                HeroAttributeData heroAttributeData = new HeroAttributeData("神识上限",
+                HeroAttributeData heroAttributeData = new HeroAttributeData(10878,
                     currentHero.powerUpConfig.ShenshiMax.ToStringEx(),
                     newHero.powerUpConfig.ShenshiMax - currentHero.powerUpConfig.ShenshiMax + "");
                 heroAttributeDataList.Add(heroAttributeData);
@@ -89,21 +89,21 @@ namespace Fort23.Mono
 
             if (currentHero.hp != newHero.hp)
             {
-                HeroAttributeData heroAttributeData = new HeroAttributeData("生命", currentHero.hp.Value.ToStringEx(),
+                HeroAttributeData heroAttributeData = new HeroAttributeData(10871, currentHero.hp.Value.ToStringEx(),
                     (newHero.hp.Value - currentHero.hp.Value).ToStringEx() + "");
                 heroAttributeDataList.Add(heroAttributeData);
             }
 
             if (currentHero.attack != newHero.attack)
             {
-                HeroAttributeData heroAttributeData = new HeroAttributeData("攻击", currentHero.attack.Value.ToStringEx(),
+                HeroAttributeData heroAttributeData = new HeroAttributeData(10872, currentHero.attack.Value.ToStringEx(),
                     (newHero.attack.Value - currentHero.attack.Value).ToStringEx());
                 heroAttributeDataList.Add(heroAttributeData);
             }
 
             if (currentHero.defense != newHero.defense)
             {
-                HeroAttributeData heroAttributeData = new HeroAttributeData("防御",
+                HeroAttributeData heroAttributeData = new HeroAttributeData(10873,
                     currentHero.defense.Value.ToStringEx(),
                     (newHero.defense.Value - currentHero.defense.Value).ToStringEx() + "");
                 heroAttributeDataList.Add(heroAttributeData);
@@ -112,7 +112,7 @@ namespace Fort23.Mono
 
             if (currentHero.powerUpConfig.MPFactor != newHero.powerUpConfig.MPFactor)
             {
-                HeroAttributeData heroAttributeData = new HeroAttributeData("法宝倍率",
+                HeroAttributeData heroAttributeData = new HeroAttributeData(10875,
                     currentHero.powerUpConfig.MPFactor.ToString(),
                     currentHero.powerUpConfig.MPFactor - currentHero.powerUpConfig.MPFactor + "");
                 heroAttributeDataList.Add(heroAttributeData);
@@ -120,7 +120,7 @@ namespace Fort23.Mono
 
             if (currentHero.powerUpConfig.MPFactor != newHero.powerUpConfig.MPFactor)
             {
-                HeroAttributeData heroAttributeData = new HeroAttributeData("护盾倍率",
+                HeroAttributeData heroAttributeData = new HeroAttributeData(10876,
                     currentHero.powerUpConfig.HudunFactor.ToString(),
                     currentHero.powerUpConfig.HudunFactor - currentHero.powerUpConfig.HudunFactor + "");
                 heroAttributeDataList.Add(heroAttributeData);
@@ -128,19 +128,19 @@ namespace Fort23.Mono
 
             if (currentHero.powerUpConfig.MPFactor != newHero.powerUpConfig.MPFactor)
             {
-                HeroAttributeData heroAttributeData = new HeroAttributeData("防御系数K",
+                HeroAttributeData heroAttributeData = new HeroAttributeData(10877,
                     currentHero.powerUpConfig.defK.ToStringEx(),
                     (currentHero.powerUpConfig.defK - currentHero.powerUpConfig.defK).ToStringEx() + "");
                 heroAttributeDataList.Add(heroAttributeData);
             }
 
-            if (currentHero.powerUpConfig.MPFactor != newHero.powerUpConfig.MPFactor)
-            {
-                HeroAttributeData heroAttributeData = new HeroAttributeData("神识上限",
-                    currentHero.powerUpConfig.ShenshiMax.ToStringEx(),
-                    (currentHero.powerUpConfig.ShenshiMax - currentHero.powerUpConfig.ShenshiMax).ToStringEx() + "");
-                heroAttributeDataList.Add(heroAttributeData);
-            }
+            // if (currentHero.powerUpConfig.MPFactor != newHero.powerUpConfig.MPFactor)
+            // {
+            //     HeroAttributeData heroAttributeData = new HeroAttributeData("神识上限",
+            //         currentHero.powerUpConfig.ShenshiMax.ToStringEx(),
+            //         (currentHero.powerUpConfig.ShenshiMax - currentHero.powerUpConfig.ShenshiMax).ToStringEx() + "");
+            //     heroAttributeDataList.Add(heroAttributeData);
+            // }
 
             return heroAttributeDataList;
         }

Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroInformationPanel.cs

@@ -71,35 +71,35 @@ namespace Fort23.Mono
             Btn_Tips.onClick.AddListener(() => { TipsRoot.gameObject.SetActive(!TipsRoot.gameObject.activeSelf); });
 
 
-            Btn_Dujie.onClick.AddListener(async () =>
-            {
-                if (PlayerManager.Instance.myHero.powerUpConfig.jingjie1 != heroInfo.powerUpConfig.jingjie1)
-                {
-                    HeroBreakthroughPanel.OpenPanel();
-                }
-                //预览
-                else
-                {
-                    HeroPowerUpConfig heroPowerUpConfig = default;
-                    HeroPowerUpConfig[] heroPowerUpConfigs = ConfigComponent.Instance.GetAll<HeroPowerUpConfig>();
-                    for (var i = PlayerManager.Instance.myHero.powerUpConfig.ID; i < heroPowerUpConfigs.Length; i++)
-                    {
-                        if (PlayerManager.Instance.myHero.powerUpConfig.jingjie1 != heroPowerUpConfigs[i].jingjie1)
-                        {
-                            heroPowerUpConfig = heroPowerUpConfigs[i - 1];
-                            break;
-                        }
-                    }
-
-                    AccountFileInfo.HeroData heroData = new AccountFileInfo.HeroData();
-                    heroData.heroModelId = PlayerManager.Instance.myHero.modelID;
-                    heroData.heroPowerId = heroPowerUpConfig.ID;
-                    HeroInfo heroInfo1 = new HeroInfo();
-                    heroInfo1.InitHero(heroData);
-
-                    await HeroBreakthroughPanel.OpenPanel1(heroInfo1);
-                }
-            });
+            // Btn_Dujie.onClick.AddListener(async () =>
+            // {
+            //     if (PlayerManager.Instance.myHero.powerUpConfig.jingjie1 != heroInfo.powerUpConfig.jingjie1)
+            //     {
+            //         HeroBreakthroughPanel.OpenPanel();
+            //     }
+            //     //预览
+            //     else
+            //     {
+            //         HeroPowerUpConfig heroPowerUpConfig = default;
+            //         HeroPowerUpConfig[] heroPowerUpConfigs = ConfigComponent.Instance.GetAll<HeroPowerUpConfig>();
+            //         for (var i = PlayerManager.Instance.myHero.powerUpConfig.ID; i < heroPowerUpConfigs.Length; i++)
+            //         {
+            //             if (PlayerManager.Instance.myHero.powerUpConfig.jingjie1 != heroPowerUpConfigs[i].jingjie1)
+            //             {
+            //                 heroPowerUpConfig = heroPowerUpConfigs[i - 1];
+            //                 break;
+            //             }
+            //         }
+            //
+            //         AccountFileInfo.HeroData heroData = new AccountFileInfo.HeroData();
+            //         heroData.heroModelId = PlayerManager.Instance.myHero.modelID;
+            //         heroData.heroPowerId = heroPowerUpConfig.ID;
+            //         HeroInfo heroInfo1 = new HeroInfo();
+            //         heroInfo1.InitHero(heroData);
+            //
+            //         await HeroBreakthroughPanel.OpenPanel1(heroInfo1);
+            //     }
+            // });
 
 
             Btn_TuPo.onClick.AddListener(async () =>
@@ -251,13 +251,13 @@ namespace Fort23.Mono
                 Btn_TuPo.gameObject.SetActive(false);
 
 
-                HeroAttributeWidgets[0].CustomInit(new HeroAttributeData("生命",
+                HeroAttributeWidgets[0].CustomInit(new HeroAttributeData(10871,
                     PlayerManager.Instance.myHero.hp.Value.ToStringEx(), "Max"));
 
-                HeroAttributeWidgets[1].CustomInit(new HeroAttributeData("攻击",
+                HeroAttributeWidgets[1].CustomInit(new HeroAttributeData(10872,
                     PlayerManager.Instance.myHero.attack.Value.ToStringEx(), "Max"));
 
-                HeroAttributeWidgets[2].CustomInit(new HeroAttributeData("防御",
+                HeroAttributeWidgets[2].CustomInit(new HeroAttributeData(10873,
                     PlayerManager.Instance.myHero.defense.Value.ToStringEx(), "Max"));
             }
             else
@@ -292,14 +292,12 @@ namespace Fort23.Mono
                             }
                         }
 
-                       
-                            if (!redDot.Params.Contains(PlayerManager.Instance.myHero.powerUpConfig.ID.ToString()))
-                            {
-                                redDot.Params.Add(PlayerManager.Instance.myHero.powerUpConfig.ID.ToString());
-                                RedDotManager.Instance.AddRedDot(redDot);
-                            }
-                        
-                    
+
+                        if (!redDot.Params.Contains(PlayerManager.Instance.myHero.powerUpConfig.ID.ToString()))
+                        {
+                            redDot.Params.Add(PlayerManager.Instance.myHero.powerUpConfig.ID.ToString());
+                            RedDotManager.Instance.AddRedDot(redDot);
+                        }
                     }
                 }
                 else
@@ -315,29 +313,26 @@ namespace Fort23.Mono
                         }
                     }
 
-                   
-                        if (!redDot.Params.Contains(PlayerManager.Instance.myHero.powerUpConfig.ID.ToString()))
-                        {
-                            redDot.Params.Add(PlayerManager.Instance.myHero.powerUpConfig.ID.ToString());
-                            RedDotManager.Instance.AddRedDot(redDot);
-                        }
-                    
 
-                  
+                    if (!redDot.Params.Contains(PlayerManager.Instance.myHero.powerUpConfig.ID.ToString()))
+                    {
+                        redDot.Params.Add(PlayerManager.Instance.myHero.powerUpConfig.ID.ToString());
+                        RedDotManager.Instance.AddRedDot(redDot);
+                    }
                 }
 
 
-                HeroAttributeWidgets[0].CustomInit(new HeroAttributeData("生命",
+                HeroAttributeWidgets[0].CustomInit(new HeroAttributeData(10871,
                     PlayerManager.Instance.myHero.hp.Value.ToStringEx(),
                     "+" + (heroInfo.hp.Value - PlayerManager.Instance.myHero.hp.Value).ToStringEx()));
 
 
-                HeroAttributeWidgets[1].CustomInit(new HeroAttributeData("攻击",
+                HeroAttributeWidgets[1].CustomInit(new HeroAttributeData(10872,
                     PlayerManager.Instance.myHero.attack.Value.ToStringEx(),
                     "+" + (heroInfo.attack.Value - PlayerManager.Instance.myHero.attack.Value).ToStringEx()));
 
 
-                HeroAttributeWidgets[2].CustomInit(new HeroAttributeData("防御",
+                HeroAttributeWidgets[2].CustomInit(new HeroAttributeData(10873,
                     PlayerManager.Instance.myHero.defense.Value.ToStringEx(),
                     "+" + (heroInfo.defense.Value - PlayerManager.Instance.myHero.defense.Value).ToStringEx()));
 
@@ -404,7 +399,7 @@ namespace Fort23.Mono
                          PlayerManager.Instance.myHero.powerUpConfig.jingjie2 != heroInfo.powerUpConfig.jingjie2)
                 {
                     Btn_TuPo.GetComponent<MyImage>().icon_name = "btn_xiulianTupo";
-                    Text_TuPo.text = "破镜";
+                    Text_TuPo.text = LanguageManager.Instance.Text(10428);
                 }
 
                 else

Assets/Scripts/GameUI/UI/HeroInformationPanel/SelectBreakthroughItemPanel.cs

@@ -90,14 +90,14 @@ namespace Fort23.Mono
             {
                 if (PlayerManager.Instance.BagController.IsEnough(breakthrough.itemId, 1))
                 {
-                    Text_Affirm.text = "使用";
+                    Text_Affirm.text = LanguageManager.Instance.Text(10879);
                     Btn_Affirm.gameObject.SetActive(true);
                     Btn_Cancel.gameObject.SetActive(true);
                     Text_NoEnough.gameObject.SetActive(false);
                 }
                 else
                 {
-                    Text_Affirm.text = "使用";
+                    Text_Affirm.text = LanguageManager.Instance.Text(10879);
                     Btn_Affirm.gameObject.SetActive(true);
                     Btn_Cancel.gameObject.SetActive(true);
                     Text_NoEnough.gameObject.SetActive(true);
@@ -105,7 +105,7 @@ namespace Fort23.Mono
             }
             else
             {
-                Text_Affirm.text = "取消";
+                Text_Affirm.text =  LanguageManager.Instance.Text(10880);
                 Btn_Affirm.gameObject.SetActive(true);
                 Btn_Cancel.gameObject.SetActive(true);
                 Text_NoEnough.gameObject.SetActive(false);

Assets/Scripts/GameUI/UI/HeroInformationPanel/SelectElixirPanel.cs

@@ -55,7 +55,7 @@ namespace Fort23.Mono
                 {
                     if (!PlayerManager.Instance.BagController.IsEnough(elixirItemWidget._itemConfig.ID, 1))
                     {
-                        TipMessagePanel.OpenTipMessagePanel("道具不足！");
+                        TipMessagePanel.OpenTipMessagePanel(10324);
                         return;
                     }
                 }

Assets/Scripts/GameUI/UI/HeroInformationPanel/UseExpElixirPanel.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Core.Audio;
+using Core.Language;
 using Core.UI.UTool;
 using Excel2Json;
 using Fort23.Core;
@@ -55,7 +56,8 @@ namespace Fort23.Mono
                 _expElixirItemWidgets.Add(elixirItemWidget);
             }
 
-            Text_UseCount.text = $"今日\n{AccountFileInfo.Instance.playerData.todayUseExpElixrPanelCount}/20";
+           
+            Text_UseCount.text =  LanguageManager.Instance.Text(10882, AccountFileInfo.Instance.playerData.todayUseExpElixrPanelCount, 20);
         }
 
         private async void OnClick(ItemWidgetBasic obj)
@@ -63,7 +65,7 @@ namespace Fort23.Mono
             ExpElixirItemWidget elixirItemWidget = obj as ExpElixirItemWidget;
             if (AccountFileInfo.Instance.playerData.todayUseExpElixrPanelCount >= 20)
             {
-                TipMessagePanel.OpenTipMessagePanel("今日使用经验已达上限！");
+                TipMessagePanel.OpenTipMessagePanel(10881);
                 return;
             }
 
@@ -77,7 +79,7 @@ namespace Fort23.Mono
             }
             else
             {
-                TipMessagePanel.OpenTipMessagePanel("道具不足！");
+                TipMessagePanel.OpenTipMessagePanel(10324);
                 return;
             }
 
@@ -115,13 +117,12 @@ namespace Fort23.Mono
                 {
                     PlayerManager.Instance.myHero.heroData.exp += current;
                     AccountFileInfo.Instance.SavePlayerData();
-                    LogTool.Error("z" + current);
+                    // LogTool.Error("z" + current);
                 },
                 () => Debug.Log("累加完成！")
             );
-
-
-            Text_UseCount.text = $"今日\n{AccountFileInfo.Instance.playerData.todayUseExpElixrPanelCount}/20";
+            
+            Text_UseCount.text = LanguageManager.Instance.Text(10882, AccountFileInfo.Instance.playerData.todayUseExpElixrPanelCount, 20);
         }
 
         public async static CTask<UseExpElixirPanel> OpenPanel()

Assets/Scripts/GameUI/UI/ItemDetailsPanel/FaBaoDetailsPanel.cs

@@ -76,9 +76,11 @@ namespace Fort23.Mono
         {
             using (CTaskAwaitBuffer cts = new CTaskAwaitBuffer())
             {
-                Text_Level.text = faBaoInfo.FabaoPowerupConfig.ID + "级";
+          
+                Text_Level.text =       LanguageManager.Instance.Text(10843, faBaoInfo.FabaoPowerupConfig.ID);
                 Text_FaBaoName.text = LanguageManager.Instance.Text(faBaoInfo.FabaoConfig.name);
-                Text_Power.text = $"强度：{faBaoInfo.qiangDu}";
+              
+                Text_Power.text =  LanguageManager.Instance.Text(10829, faBaoInfo.qiangDu);
                 Text_Desc.text = UtilTools.GetString(LanguageManager.Instance.Text(faBaoInfo.SkillConfig.dec),
                     faBaoInfo.effectValue);
 
@@ -166,12 +168,12 @@ namespace Fort23.Mono
             switch (type)
             {
                 case 1:
-                    return "生命";
+                    return LanguageManager.Instance.Text(10871);
 
                 case 2:
-                    return "防御";
+                    return LanguageManager.Instance.Text(10872);
                 case 3:
-                    return "攻击";
+                    return LanguageManager.Instance.Text(10873);
             }
 
             return "";

Assets/Scripts/GameUI/UI/ItemDetailsPanel/GongFaDetailsPanel.cs

@@ -73,7 +73,8 @@ namespace Fort23.Mono
             SkillConfig skillConfig = _skillInfo.skillConfig;
             Icon_GongFaIcon.icon_name = skillConfig.icon;
 
-            Text_SkillCd.text = $"功法运作周期：{skillConfig.cd}转";
+         
+            Text_SkillCd.text =    LanguageManager.Instance.Text(10883, skillConfig.cd);
 
             skillConstant = ConfigComponent.Instance.Get<SkillConstant>(1);
 

Assets/Scripts/GameUI/UI/ItemDetailsPanel/ItemDetailsPanel.cs

@@ -57,7 +57,7 @@ namespace Fort23.Mono
             widgetItem.InitWidget(itemInfo, false);
             ItemDetailsWidget itemDetailsWidget1 =
                 await UIManager.Instance.CreateGComponent<ItemDetailsWidget>(null, Connect);
-            itemDetailsWidget1.CustomInit("用途", LanguageManager.Instance.Text(itemInfo.config.itemDesc));
+            itemDetailsWidget1.CustomInit(LanguageManager.Instance.Text(10884), LanguageManager.Instance.Text(itemInfo.config.itemDesc));
             itemDetailsWidgets.Add(itemDetailsWidget1);
 
 
@@ -68,7 +68,7 @@ namespace Fort23.Mono
             {
                 ItemDetailsWidget itemDetailsWidge2 =
                     await UIManager.Instance.CreateGComponent<ItemDetailsWidget>(null, Connect);
-                itemDetailsWidge2.CustomInit("使用效果",
+                itemDetailsWidge2.CustomInit(LanguageManager.Instance.Text(10885),
                     UtilTools.GetString(LanguageManager.Instance.Text(itemAssociateConfig.LanID),
                         itemInfo.config.associateVlaue));
                 itemDetailsWidgets.Add(itemDetailsWidge2);
@@ -79,8 +79,8 @@ namespace Fort23.Mono
             {
                 ItemDetailsWidget itemDetailsWidget =
                     await UIManager.Instance.CreateGComponent<ItemDetailsWidget>(null, Connect);
-                itemDetailsWidget.CustomInit("道具数量",
-                    "道具数量：" + PlayerManager.Instance.BagController.GetItemCount(itemInfo.itemID).ToStringEx());
+                itemDetailsWidget.CustomInit(LanguageManager.Instance.Text(10886),
+                    LanguageManager.Instance.Text(10327) + PlayerManager.Instance.BagController.GetItemCount(itemInfo.itemID).ToStringEx());
                 itemDetailsWidgets.Add(itemDetailsWidget);
             }
 

Assets/Scripts/GameUI/UI/LevelChoosePanel/BigPlacesChangeInfoPanel.cs

@@ -39,7 +39,7 @@ namespace Fort23.Mono
             }
             else
             {
-                Text_PlacesName.text = "逍遥游";
+                Text_PlacesName.text = LanguageManager.Instance.Text(10825);
             }
 
             timerEntity = TimerComponent.Instance.AddTimer(1500, () => { UIManager.Instance.HideUIUIPanel(this); });

Assets/Scripts/GameUI/UI/LevelChoosePanel/LevelChoosePanel.cs

@@ -135,7 +135,7 @@ namespace Fort23.Mono
                 ConfigComponent.Instance.Get<PlacesConfig>(smallPlacesConfig.PlacesId);
 
             Text_PlacesComplteProgress.text =
-                $"{LanguageManager.Instance.Text(placesConfig.placeName)}完成度：{PlayerManager.Instance.PlacesBl}%";
+                $"{LanguageManager.Instance.Text(placesConfig.placeName)}{LanguageManager.Instance.Text(10887)}{PlayerManager.Instance.PlacesBl}%";
 
             GameObjectPool gameObjectPool2 =
                 await GObjectPool.Instance.FetchAsync<GameObjectPool>(bigMapConfig.mapPrefabName + ".prefab");

Assets/Scripts/GameUI/UI/MainHeroPnael/FaBaoAttributeWidget.cs

@@ -1,3 +1,4 @@
+using Core.Language;
 using GameLogic.Hero;
 using UnityEngine;
 using Utility;
@@ -37,9 +38,10 @@ namespace Fort23.Mono
 
         public void StartUpGrad(FaBaoInfo nextFabaoInfo)
         {
-            Text_NextAttributeValue.text = $"+{(nextFabaoInfo.attriButedIC[key] - faBaoInfo.attriButedIC[key]).ToStringEx()}";
+            Text_NextAttributeValue.text =
+                $"+{(nextFabaoInfo.attriButedIC[key] - faBaoInfo.attriButedIC[key]).ToStringEx()}";
             Text_NextAttributeValue.gameObject.SetActive(true);
-            Text_NextAttributeValue.color = new Color32(15,241,150,255);
+            Text_NextAttributeValue.color = new Color32(15, 241, 150, 255);
         }
 
         public void EndUpGrade()
@@ -49,18 +51,18 @@ namespace Fort23.Mono
 
         public void StartBj(FaBaoInfo nextFabaoInfo)
         {
-            if (nextFabaoInfo == null || !nextFabaoInfo.attriButedIC.ContainsKey(key) || nextFabaoInfo.attriButedIC[key] < faBaoInfo.attriButedIC[key])
+            if (nextFabaoInfo == null || !nextFabaoInfo.attriButedIC.ContainsKey(key) ||
+                nextFabaoInfo.attriButedIC[key] < faBaoInfo.attriButedIC[key])
             {
-                
                 long nextValue = nextFabaoInfo.attriButedIC.ContainsKey(key) ? nextFabaoInfo.attriButedIC[key] : 0;
-                
+
                 Text_NextAttributeValue.text = $"+{(faBaoInfo.attriButedIC[key] - nextValue).ToStringEx()}";
                 Text_NextAttributeValue.gameObject.SetActive(true);
-                Text_NextAttributeValue.color = new Color32(15,241,150,255);
+                Text_NextAttributeValue.color = new Color32(15, 241, 150, 255);
                 // Icon_Bj.gameObject.SetActive(true);
                 // Icon_Bj.icon_name = "dec_fbjia";
             }
-            else if (nextFabaoInfo.attriButedIC[key] >faBaoInfo.attriButedIC[key])
+            else if (nextFabaoInfo.attriButedIC[key] > faBaoInfo.attriButedIC[key])
             {
                 long nextValue = nextFabaoInfo.attriButedIC.ContainsKey(key) ? nextFabaoInfo.attriButedIC[key] : 0;
                 if (nextValue == 0)
@@ -71,9 +73,9 @@ namespace Fort23.Mono
                 {
                     Text_NextAttributeValue.text = $"-{(nextValue - faBaoInfo.attriButedIC[key]).ToStringEx()}";
                 }
-               
+
                 Text_NextAttributeValue.gameObject.SetActive(true);
-                Text_NextAttributeValue.color = new Color32(235,110,109,255);
+                Text_NextAttributeValue.color = new Color32(235, 110, 109, 255);
                 // Icon_Bj.gameObject.SetActive(true);
                 // Icon_Bj.icon_name = "dec_fbjian";
             }
@@ -94,12 +96,11 @@ namespace Fort23.Mono
             switch (type)
             {
                 case 1:
-                    return "生命";
-
+                    return LanguageManager.Instance.Text(10871);
                 case 2:
-                    return "防御";
+                    return LanguageManager.Instance.Text(10873);
                 case 3:
-                    return "攻击";
+                    return LanguageManager.Instance.Text(10872);
             }
 
             return "";

Assets/Scripts/GameUI/UI/MainHeroPnael/FaBaoSkillWidget.cs

@@ -28,7 +28,7 @@ namespace Fort23.Mono
         public void CustomInit(FaBaoInfo currentFabaoInfo, FaBaoInfo fabaoInfo)
         {
             _faBaoInfo = fabaoInfo;
-            Text_Level.text = fabaoInfo.FabaoPowerupConfig.ID + "级";
+            LanguageManager.Instance.Text(10843, fabaoInfo.FabaoPowerupConfig.ID);
             Text_Desc.text = UtilTools.GetString(LanguageManager.Instance.Text(fabaoInfo.SkillConfig.PromoteLan), fabaoInfo.SkillConfig.PromoteLanPara);
             fx_ui_fabao_tiaomu.gameObject.SetActive(false);
 

Assets/Scripts/GameUI/UI/MainHeroPnael/FaBaoWidget.cs

@@ -1,3 +1,4 @@
+using Core.Language;
 using GameLogic.Hero;
 using UnityEngine;
 
@@ -28,7 +29,7 @@ namespace Fort23.Mono
         public void CustomInit(FaBaoInfo faoInfo, bool isShowActive)
         {
             this.faoInfo = faoInfo;
-            Text_Level.text = faoInfo.FaBaoData.level.ToString() + "级";
+            Text_Level.text = LanguageManager.Instance.Text(10843, faoInfo.FaBaoData.level.ToString());
             Icon_FaBaoIcon.icon_name = faoInfo.SkillConfig.icon;
             if (isShowActive)
             {

Assets/Scripts/GameUI/UI/MainHeroPnael/MainHeroPanel.cs

@@ -144,7 +144,7 @@ namespace Fort23.Mono
                 await UIManager.Instance.CreateGComponentForObject<HeroAttributeWidget>(HeroAttributeWidgetGam, null,
                     Content, isInstance: true);
             heroAttributeWidget.OnClick = heroAttributeWidgetOnClick;
-            heroAttributeWidget.CustomInit1(10713, new HeroAttributeData("攻击", "",
+            heroAttributeWidget.CustomInit1(10713, new HeroAttributeData(10871, "",
                 PlayerManager.Instance.myHero.attack.Value.ToStringEx()));
             HeroAttributeWidgets.Add(heroAttributeWidget);
 
@@ -152,7 +152,7 @@ namespace Fort23.Mono
                 await UIManager.Instance.CreateGComponentForObject<HeroAttributeWidget>(HeroAttributeWidgetGam, null,
                     Content, isInstance: true);
             heroAttributeWidget.OnClick = heroAttributeWidgetOnClick;
-            heroAttributeWidget.CustomInit1(10714, new HeroAttributeData("防御", "",
+            heroAttributeWidget.CustomInit1(10714, new HeroAttributeData(10872, "",
                 PlayerManager.Instance.myHero.defense.Value.ToStringEx()));
             HeroAttributeWidgets.Add(heroAttributeWidget);
 
@@ -169,7 +169,7 @@ namespace Fort23.Mono
                 await UIManager.Instance.CreateGComponentForObject<HeroAttributeWidget>(HeroAttributeWidgetGam, null,
                     Content, isInstance: true);
             heroAttributeWidget.OnClick = heroAttributeWidgetOnClick;
-            heroAttributeWidget.CustomInit1(10716, new HeroAttributeData("金灵根", "",
+            heroAttributeWidget.CustomInit1(10716, new HeroAttributeData(10888, "",
                 PlayerManager.Instance.myHero.Metal.ToString()));
             HeroAttributeWidgets.Add(heroAttributeWidget);
 
@@ -177,7 +177,7 @@ namespace Fort23.Mono
                 await UIManager.Instance.CreateGComponentForObject<HeroAttributeWidget>(HeroAttributeWidgetGam, null,
                     Content, isInstance: true);
             heroAttributeWidget.OnClick = heroAttributeWidgetOnClick;
-            heroAttributeWidget.CustomInit1(10717, new HeroAttributeData("木灵根", "",
+            heroAttributeWidget.CustomInit1(10717, new HeroAttributeData(10889, "",
                 PlayerManager.Instance.myHero.Wood.ToString()));
             HeroAttributeWidgets.Add(heroAttributeWidget);
 
@@ -185,7 +185,7 @@ namespace Fort23.Mono
                 await UIManager.Instance.CreateGComponentForObject<HeroAttributeWidget>(HeroAttributeWidgetGam, null,
                     Content, isInstance: true);
             heroAttributeWidget.OnClick = heroAttributeWidgetOnClick;
-            heroAttributeWidget.CustomInit1(10718, new HeroAttributeData("水灵根", "",
+            heroAttributeWidget.CustomInit1(10718, new HeroAttributeData(10890, "",
                 PlayerManager.Instance.myHero.Water.ToString()));
             HeroAttributeWidgets.Add(heroAttributeWidget);
 
@@ -193,7 +193,7 @@ namespace Fort23.Mono
                 await UIManager.Instance.CreateGComponentForObject<HeroAttributeWidget>(HeroAttributeWidgetGam, null,
                     Content, isInstance: true);
             heroAttributeWidget.OnClick = heroAttributeWidgetOnClick;
-            heroAttributeWidget.CustomInit1(10719, new HeroAttributeData("火灵根", "",
+            heroAttributeWidget.CustomInit1(10719, new HeroAttributeData(10891, "",
                 PlayerManager.Instance.myHero.Fire.ToString()));
             HeroAttributeWidgets.Add(heroAttributeWidget);
 
@@ -201,7 +201,7 @@ namespace Fort23.Mono
                 await UIManager.Instance.CreateGComponentForObject<HeroAttributeWidget>(HeroAttributeWidgetGam, null,
                     Content, isInstance: true);
             heroAttributeWidget.OnClick = heroAttributeWidgetOnClick;
-            heroAttributeWidget.CustomInit1(10720, new HeroAttributeData("土灵根", "",
+            heroAttributeWidget.CustomInit1(10720, new HeroAttributeData(10892, "",
                 PlayerManager.Instance.myHero.Earth.ToString()));
             HeroAttributeWidgets.Add(heroAttributeWidget);
         }
@@ -231,7 +231,7 @@ namespace Fort23.Mono
                     }
                 }
 
-                TipMessagePanel.OpenTipMessagePanel("当前位置未解锁");
+                // TipMessagePanel.OpenTipMessagePanel("当前位置未解锁");
                 return;
             }
 

Assets/Scripts/GameUI/UI/MainHeroPnael/SelectFaBaoPanel.cs

@@ -66,7 +66,7 @@ namespace Fort23.Mono
             {
                 if (selectedFaBaoInfo.FaBaoData.useIndex != -1)
                 {
-                    TipMessagePanel.OpenTipMessagePanel("当前法宝已经被装备");
+                    TipMessagePanel.OpenTipMessagePanel(10893);
                     return;
                 }
 

Assets/Scripts/GameUI/UI/SentimentPanel/SentimentEffectWidget.cs

@@ -47,7 +47,7 @@ namespace Fort23.Mono
                 .Where(se => se.groupId == sentimentEffectConfig.groupId).ToList();
             if (sentimentProperty.level == 0)
             {
-                Text_Level.text = "未激活";
+                Text_Level.text = LanguageManager.Instance.Text(10894);
                 transform.Gray();
             }
             else

Assets/Scripts/GameUI/UI/SentimentPanel/SentimentInfoPanel.cs

@@ -103,14 +103,14 @@ namespace Fort23.Mono
                     currentSentimentEffectWidget.lastSentimentWidget.sentimentProperty.level <
                     currentSentimentEffectWidget.sentimentEffectConfig.unlockLevel)
                 {
-                    TipMessagePanel.OpenTipMessagePanel("前置节点没有解锁");
+                    TipMessagePanel.OpenTipMessagePanel(10895);
                     AudioManager.Instance.PlayAudio("ui_chaozuoshibai.wav");
                     return;
                 }
 
                 if (curretnSentimentProperty.level >= currentGroupSentimentEffectConfigs.Count)
                 {
-                    TipMessagePanel.OpenTipMessagePanel("已经达到最大等级");
+                    TipMessagePanel.OpenTipMessagePanel(10896);
                     AudioManager.Instance.PlayAudio("ui_chaozuoshibai.wav");
                     return;
                 }
@@ -303,13 +303,13 @@ namespace Fort23.Mono
 
             if (curretnSentimentProperty.level >= currentGroupSentimentEffectConfigs.Count)
             {
-                Text_CurrentLevel.text = $"{curretnSentimentProperty.level}级 ";
-                Text_NextLevel.text = $"MAX级";
+                Text_CurrentLevel.text = LanguageManager.Instance.Text(10843, curretnSentimentProperty.level);
+                Text_NextLevel.text = LanguageManager.Instance.Text(10897);
             }
             else
             {
-                Text_CurrentLevel.text = $"{curretnSentimentProperty.level}级 ";
-                Text_NextLevel.text = $"{curretnSentimentProperty.level + 1}级";
+                Text_CurrentLevel.text = LanguageManager.Instance.Text(10843, curretnSentimentProperty.level);
+                Text_NextLevel.text = LanguageManager.Instance.Text(10843, curretnSentimentProperty.level + 1);
             }
         }
 
@@ -346,7 +346,7 @@ namespace Fort23.Mono
             curretnSentimentProperty = null;
             // UIManager.Instance.DormancyGComponent(energyWidget);
             // energyWidget = null;
-            
+
             xuanzhong.transform.SetParent(transform);
             // xuanzhong.transform.localPosition = Vector3.zero;
             xuanzhong.gameObject.SetActive(false);

Assets/Scripts/GameUI/UI/SettingPanel/SettingPanel.cs

@@ -97,18 +97,18 @@ namespace Fort23.Mono
                 bool isOk = await FTPManager.Instance.UploadWithFTP();
                 if (isOk)
                 {
-                    TipMessagePanel.OpenTipMessagePanel("上传成功！");
+                    TipMessagePanel.OpenTipMessagePanel(10898);
                 }
                 else
                 {
-                    TipMessagePanel.OpenTipMessagePanel("上传失败！");
+                    TipMessagePanel.OpenTipMessagePanel(10899);
                 }
             });
 
             Btn_ID.onClick.AddListener(() =>
             {
                 GUIUtility.systemCopyBuffer = AccountFileInfo.Instance.playerData.playerId;
-                TipMessagePanel.OpenTipMessagePanel("已复制");
+                TipMessagePanel.OpenTipMessagePanel(10900);
             });
         }
 

Assets/Scripts/GameUI/UI/SettingPanel/UploadLogPanel.cs

@@ -1,3 +1,4 @@
+using Core.Language;
 using Fort23.Core;
 using UnityEngine;
 
@@ -25,11 +26,11 @@ namespace Fort23.Mono
                 bool isOk = await FTPManager.Instance.UploadWithFTP();
                 if (isOk)
                 {
-                    TipMessagePanel.OpenTipMessagePanel("上传成功！", layer: UILayer.Loading);
+                    TipMessagePanel.OpenTipMessagePanel(LanguageManager.Instance.Text(10898), layer: UILayer.Loading);
                 }
                 else
                 {
-                    TipMessagePanel.OpenTipMessagePanel("上传失败！", layer:UILayer.Loading);
+                    TipMessagePanel.OpenTipMessagePanel(LanguageManager.Instance.Text(10899), layer:UILayer.Loading);
                 }
             });
         }

Assets/Scripts/GameUI/UI/ShopPanel/ShopBoxWidget.cs

@@ -82,19 +82,19 @@ namespace Fort23.Mono
         {
             if (summonData.isSummonSocre)
             {
-                TipMessagePanelType2.OpenTipMessagePanel("已经开启200抽挑战，不能进行单抽了");
+                TipMessagePanelType2.OpenTipMessagePanel(10901);
                 return;
             }
 
             if (summonData.oneFreeCount >= openBoxConfig.oneConsumeFreePara[1])
             {
-                TipMessagePanelType2.OpenTipMessagePanel("今日单抽免费次数已用完");
+                TipMessagePanelType2.OpenTipMessagePanel(10902);
                 return;
             }
 
             if (PlayerManager.Instance.serverTime < summonData.nextOneFreeTime)
             {
-                TipMessagePanelType2.OpenTipMessagePanel("还未到达免费时间！请稍后再试");
+                TipMessagePanelType2.OpenTipMessagePanel(10903);
                 return;
             }
 

Assets/Scripts/GameUI/UI/ShopPanel/ShopBuyItemPanel.cs

@@ -87,8 +87,8 @@ namespace Fort23.Mono
             }
 
 
-            Text_ItemCount.text =
-                "当前持有：" + PlayerManager.Instance.BagController.GetItemCount(_shopItemConfig.itemId[0]);
+            Text_ItemCount.text = LanguageManager.Instance.Text(10904,
+                PlayerManager.Instance.BagController.GetItemCount(_shopItemConfig.itemId[0]));
             // UseSlider.value = 1;
             // UseSlider.minValue = 1;
             Text_BuyCount.text = "1";
@@ -103,7 +103,7 @@ namespace Fort23.Mono
             if (_shopItemConfig.buyCount == -1)
             {
                 LimitObj.SetActive(false);
-                Text_LimitCount.text = "无";
+                Text_LimitCount.text = LanguageManager.Instance.Text(10905);
                 if (_shopItemConfig.price != 0)
                 {
                     int total = (int)(PlayerManager.Instance.BagController.GetItemCount(_shopItemConfig.costItemId) /
@@ -156,7 +156,7 @@ namespace Fort23.Mono
             else if (_shopItemConfig.costItemId == 0)
             {
                 ImageCurrency.gameObject.SetActive(false);
-                Text_Price.text = "免费";
+                Text_Price.text = LanguageManager.Instance.Text(10906);
             }
             else
             {
@@ -296,7 +296,7 @@ namespace Fort23.Mono
             }
             else if (_shopItemConfig.costItemId == 0)
             {
-                Text_Price.text = "免费";
+                Text_Price.text = LanguageManager.Instance.Text(10906);
             }
             else
             {

Assets/Scripts/GameUI/UI/ShopPanel/ShopGachaPanel.cs

@@ -95,8 +95,9 @@ namespace Fort23.Mono
                 }
 
                 Btn_ShuangBei.gameObject.SetActive(false);
-                Text_AllCount.text = $"总计：{allConit} x {beLv} = {(int)(allConit * beLv)}";
-                Text_Bl.text = $"已获得 <color=#FDB34A>{beLv}</color> 倍奖励";
+
+                Text_AllCount.text = LanguageManager.Instance.Text(10907, allConit, beLv, (int)(allConit * beLv));
+                Text_Bl.text = LanguageManager.Instance.Text(10908, beLv);
                 Text_Bl.gameObject.SetActive(true);
                 // UIManager.Instance.HideUIUIPanel<ShopGachaPanel>();
             });
@@ -119,7 +120,7 @@ namespace Fort23.Mono
                 }
             }
 
-            Text_AllCount.text = $"总计：{allConit}";
+            Text_AllCount.text = $"{LanguageManager.Instance.Text(10060)} {allConit}";
 
             if (itemInfos.Count > 1)
             {

Assets/Scripts/GameUI/UI/SkillInfopanel.cs

@@ -9,7 +9,8 @@ using Utility;
 namespace Fort23.Mono
 {
     [UIBinding(prefab = "SkillInfopanel")]
-    public partial class SkillInfopanel : UIPanel
+    public partial class
+        SkillInfopanel : UIPanel
     {
         private void Init()
         {
@@ -34,11 +35,12 @@ namespace Fort23.Mono
             Icon_SkillIcon.gameObject.SetActive(false);
             Icon_FabaoIcon.gameObject.SetActive(true);
             Text_Name.text = LanguageManager.Instance.Text(faBaoInfo.FabaoConfig.name);
-            Text_Level.text = "等级：" + faBaoInfo.FaBaoData.level.ToString();
-            Text_Tag.text = "法宝";
-            Text_tip.text = "法宝详情：";
-            Text_Power.text = $"强度：{faBaoInfo.qiangDu}";
-            Text_massge.text = UtilTools.GetString(LanguageManager.Instance.Text(faBaoInfo.SkillConfig.dec), faBaoInfo.effectValue);
+            Text_Level.text = LanguageManager.Instance.Text(10826, faBaoInfo.FaBaoData.level.ToString());
+            Text_Tag.text = LanguageManager.Instance.Text(10827);
+            Text_tip.text = LanguageManager.Instance.Text(10828);
+            Text_Power.text = LanguageManager.Instance.Text(10829, faBaoInfo.qiangDu);
+            Text_massge.text = UtilTools.GetString(LanguageManager.Instance.Text(faBaoInfo.SkillConfig.dec),
+                faBaoInfo.effectValue);
             Text_Power.gameObject.SetActive(true);
             StarRootGam.SetActive(false);
             Icon_FabaoIcon.icon_name = faBaoInfo.SkillConfig.icon;
@@ -68,17 +70,18 @@ namespace Fort23.Mono
         //         }
         //     }
         // }
-        
+
         public void CustomInit(SkillInfo skillInfo)
         {
             Icon_BuffIcon.gameObject.SetActive(false);
             Icon_SkillIcon.gameObject.SetActive(true);
             Icon_FabaoIcon.gameObject.SetActive(false);
             Text_Name.text = LanguageManager.Instance.Text(skillInfo.skillConfig.name);
-            Text_Level.text = "等级：" + skillInfo.SkillPowerupConfig.ID.ToString();
-            Text_Tag.text = "功法";
-            Text_tip.text = "功法详情：";
-            Text_massge.text = UtilTools.GetString(LanguageManager.Instance.Text(skillInfo.skillConfig.dec), skillInfo.effectValue);
+            Text_Level.text = LanguageManager.Instance.Text(10826, skillInfo.SkillPowerupConfig.ID.ToString());
+            Text_Tag.text = LanguageManager.Instance.Text(10830);
+            Text_tip.text = LanguageManager.Instance.Text(10831);
+            Text_massge.text = UtilTools.GetString(LanguageManager.Instance.Text(skillInfo.skillConfig.dec),
+                skillInfo.effectValue);
             Text_Power.gameObject.SetActive(false);
             Icon_SkillIcon.icon_name = skillInfo.skillConfig.icon;
             StarRootGam.SetActive(true);
@@ -97,17 +100,18 @@ namespace Fort23.Mono
             }
         }
 
-        public void CustomInit(BuffConfig buffConfig,int buffCount)
+        public void CustomInit(BuffConfig buffConfig, int buffCount)
         {
             Icon_BuffIcon.gameObject.SetActive(true);
             Icon_SkillIcon.gameObject.SetActive(false);
             Icon_FabaoIcon.gameObject.SetActive(false);
             Text_Name.text = LanguageManager.Instance.Text(buffConfig.buffName);
-            Text_Level.text = "层数：" +buffCount;
-            Text_Tag.text = "buff";
-            Text_tip.text = "详情：";
+            Text_Level.text = LanguageManager.Instance.Text(10832, buffCount);
+            Text_Tag.text = LanguageManager.Instance.Text(10834);
+            Text_tip.text = LanguageManager.Instance.Text(10833);
             Text_Power.text = $"";
-            Text_massge.text = UtilTools.GetString(LanguageManager.Instance.Text(buffConfig.buffEffectDes),buffConfig.effectValue);
+            Text_massge.text = UtilTools.GetString(LanguageManager.Instance.Text(buffConfig.buffEffectDes),
+                buffConfig.effectValue);
             Text_Power.gameObject.SetActive(true);
             StarRootGam.SetActive(false);
             Icon_BuffIcon.icon_name = buffConfig.icon;
@@ -115,27 +119,33 @@ namespace Fort23.Mono
 
         public static async CTask<SkillInfopanel> OpenPanle(FaBaoInfo faBaoInfo)
         {
-            SkillInfopanel skillInfopanel = await UIManager.Instance.LoadAndOpenPanel<SkillInfopanel>(null, UILayer.Top);
+            SkillInfopanel skillInfopanel =
+                await UIManager.Instance.LoadAndOpenPanel<SkillInfopanel>(null, UILayer.Top);
             skillInfopanel.CustomInit(faBaoInfo);
             return skillInfopanel;
         }
 
-        public static async  CTask<SkillInfopanel> OpenPanle(SkillInfo faBaoInfo)
+        public static async CTask<SkillInfopanel> OpenPanle(SkillInfo faBaoInfo)
         {
-            SkillInfopanel skillInfopanel = await UIManager.Instance.LoadAndOpenPanel<SkillInfopanel>(null, UILayer.Top);
+            SkillInfopanel skillInfopanel =
+                await UIManager.Instance.LoadAndOpenPanel<SkillInfopanel>(null, UILayer.Top);
             skillInfopanel.CustomInit(faBaoInfo);
             return skillInfopanel;
         }
-        public static async  CTask<SkillInfopanel> OpenPanle(BuffBasic faBaoInfo)
+
+        public static async CTask<SkillInfopanel> OpenPanle(BuffBasic faBaoInfo)
         {
-            SkillInfopanel skillInfopanel = await UIManager.Instance.LoadAndOpenPanel<SkillInfopanel>(null, UILayer.Top);
-            skillInfopanel.CustomInit(faBaoInfo.BuffConfig,faBaoInfo.buffCount);
+            SkillInfopanel skillInfopanel =
+                await UIManager.Instance.LoadAndOpenPanel<SkillInfopanel>(null, UILayer.Top);
+            skillInfopanel.CustomInit(faBaoInfo.BuffConfig, faBaoInfo.buffCount);
             return skillInfopanel;
         }
-        public static async  CTask<SkillInfopanel> OpenPanle(BuffInfo buffInfo)
+
+        public static async CTask<SkillInfopanel> OpenPanle(BuffInfo buffInfo)
         {
-            SkillInfopanel skillInfopanel = await UIManager.Instance.LoadAndOpenPanel<SkillInfopanel>(null, UILayer.Top);
-            skillInfopanel.CustomInit(buffInfo.BuffConfig,1);
+            SkillInfopanel skillInfopanel =
+                await UIManager.Instance.LoadAndOpenPanel<SkillInfopanel>(null, UILayer.Top);
+            skillInfopanel.CustomInit(buffInfo.BuffConfig, 1);
             return skillInfopanel;
         }
     }

Assets/Scripts/GameUI/UI/Task/TaskInfoPanel.cs

@@ -40,7 +40,7 @@ namespace Fort23.Mono
 
                 UIManager.Instance.HideUIUIPanel(this);
             });
-            Btn_Bag.onClick.AddListener(() => { TipMessagePanel.OpenTipMessagePanel("事件的选择会影响获得的道具！"); });
+            Btn_Bag.onClick.AddListener(() => { TipMessagePanel.OpenTipMessagePanel(10848); });
             Btn_Ok.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
         }
 

Assets/Scripts/GameUI/UI/TowerPanel/TowerPanel.cs

@@ -60,7 +60,7 @@ namespace Fort23.Mono
                      !lastTowerLevelData.finish) &&
                     ulockId != 1)
                 {
-                    TipMessagePanel.OpenTipMessagePanel("上一关还没有解锁！");
+                    TipMessagePanel.OpenTipMessagePanel(10909);
                     return;
                 }
 

Assets/Scripts/GameUI/UI/XianTuLogPanel/XianTuLogInfoPanel.cs

@@ -185,12 +185,12 @@ namespace Fort23.Mono
                                 if (eventLinkConfig.NPCID != 0)
                                 {
                                     xianTuLogInfoData1.message =
-                                        $"<color=#A6A6A6>选项：{LanguageManager.Instance.Text(eventLinkConfig.optionPara2[index])}</color>";
+                                        $"<color=#A6A6A6>{LanguageManager.Instance.Text(10910)}{LanguageManager.Instance.Text(eventLinkConfig.optionPara2[index])}</color>";
                                 }
                                 else
                                 {
                                     xianTuLogInfoData1.message =
-                                        $"<color=#867169>选项：{LanguageManager.Instance.Text(eventLinkConfig.optionPara2[index])}</color>";
+                                        $"<color=#867169>{LanguageManager.Instance.Text(10910)}{LanguageManager.Instance.Text(eventLinkConfig.optionPara2[index])}</color>";
                                 }
 
                                 showXianTuLogInfoData.Add(xianTuLogInfoData1);

Assets/StreamingAssets/assetBundle.zip.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: DSxJ43uoUH8kT0YwMiNbOE+4J0BQp6l+fEMrKmhKdWq4r0S/FEZZQeH4/d3n
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: