合并代码

Assets/Res/Config/LanguageChineseConfig.json

@@ -0,0 +1,120 @@
+{
+  "configList": [
+    {
+      "ID": 1,
+      "txt": "亚瑟·龙焰"
+    },
+    {
+      "ID": 2,
+      "txt": "莱恩·天戟"
+    },
+    {
+      "ID": 3,
+      "txt": "达米安·虎啸"
+    },
+    {
+      "ID": 4,
+      "txt": "维克多·铁拳"
+    },
+    {
+      "ID": 5,
+      "txt": "加雷斯·风暴"
+    },
+    {
+      "ID": 6,
+      "txt": "伊丽莎白·月影"
+    },
+    {
+      "ID": 7,
+      "txt": "马修·星辰"
+    },
+    {
+      "ID": 8,
+      "txt": "卡特琳娜·霜语"
+    },
+    {
+      "ID": 9,
+      "txt": "西蒙·玄光"
+    },
+    {
+      "ID": 10,
+      "txt": "艾琳娜·灵风"
+    },
+    {
+      "ID": 11,
+      "txt": "加百利·圣心"
+    },
+    {
+      "ID": 12,
+      "txt": "索菲亚·慈恩"
+    },
+    {
+      "ID": 13,
+      "txt": "卢克·净魂"
+    },
+    {
+      "ID": 14,
+      "txt": "安娜贝尔·光耀"
+    },
+    {
+      "ID": 15,
+      "txt": "伊莎贝拉·恩典"
+    },
+    {
+      "ID": 16,
+      "txt": "莱恩·影踪"
+    },
+    {
+      "ID": 17,
+      "txt": "艾米丽·翠羽"
+    },
+    {
+      "ID": 18,
+      "txt": "德里克·疾风"
+    },
+    {
+      "ID": 19,
+      "txt": "维多利亚·夜刃"
+    },
+    {
+      "ID": 20,
+      "txt": "诺亚·林踪"
+    },
+    {
+      "ID": 21,
+      "txt": "生命值"
+    },
+    {
+      "ID": 22,
+      "txt": "攻击力"
+    },
+    {
+      "ID": 23,
+      "txt": "防御力"
+    },
+    {
+      "ID": 24,
+      "txt": "攻击速度"
+    },
+    {
+      "ID": 25,
+      "txt": "暴击几率"
+    },
+    {
+      "ID": 26,
+      "txt": "暴击伤害"
+    },
+    {
+      "ID": 27,
+      "txt": "闪避几率"
+    },
+    {
+      "ID": 28,
+      "txt": "命中"
+    },
+    {
+      "ID": 29,
+      "txt": "吸血"
+    }
+  ]
+}

Assets/Res/Config/LanguageChineseConfig.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: DnkY5Hj4Uy+v7sk29J2OMRTt+NXRw+mJfHyg/bJSQzv/s+K1UbY9AvY=
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res/Config/LanguageDEConfig.json

@@ -2,7 +2,63 @@
   "configList": [
     {
       "ID": 1,
-      "txt": ""
+      "txt": "0"
+    },
+    {
+      "ID": 2,
+      "txt": "0"
+    },
+    {
+      "ID": 3,
+      "txt": "0"
+    },
+    {
+      "ID": 4,
+      "txt": "0"
+    },
+    {
+      "ID": 5,
+      "txt": "0"
+    },
+    {
+      "ID": 6,
+      "txt": "0"
+    },
+    {
+      "ID": 7,
+      "txt": "0"
+    },
+    {
+      "ID": 8,
+      "txt": "0"
+    },
+    {
+      "ID": 9,
+      "txt": "0"
+    },
+    {
+      "ID": 10,
+      "txt": "0"
+    },
+    {
+      "ID": 11,
+      "txt": "0"
+    },
+    {
+      "ID": 12,
+      "txt": "0"
+    },
+    {
+      "ID": 13,
+      "txt": "0"
+    },
+    {
+      "ID": 14,
+      "txt": "0"
+    },
+    {
+      "ID": 15,
+      "txt": "0"
     }
   ]
 }

Assets/Res/Config/LanguageEnglishConfig.json

@@ -2,127 +2,119 @@
   "configList": [
     {
       "ID": 1,
-      "txt": ""
+      "txt": "Arthur Longyan"
     },
     {
       "ID": 2,
-      "txt": ""
+      "txt": "Ryan Tianji"
     },
     {
       "ID": 3,
-      "txt": ""
+      "txt": "Damian Huxiao"
     },
     {
       "ID": 4,
-      "txt": ""
+      "txt": "Victor Tiequan"
     },
     {
       "ID": 5,
-      "txt": ""
+      "txt": "Gareth Fengbao"
     },
     {
       "ID": 6,
-      "txt": ""
+      "txt": "Elizabeth Yueying"
     },
     {
       "ID": 7,
-      "txt": ""
+      "txt": "Matthew Xingchen"
     },
     {
       "ID": 8,
-      "txt": ""
+      "txt": "Katrina Shuangyu"
     },
     {
       "ID": 9,
-      "txt": ""
+      "txt": "Simon Xuanguang"
     },
     {
       "ID": 10,
-      "txt": ""
+      "txt": "Elena Lingfeng"
     },
     {
       "ID": 11,
-      "txt": ""
+      "txt": "Gabriel Shengxin"
     },
     {
       "ID": 12,
-      "txt": ""
+      "txt": "Sophia Cien"
     },
     {
       "ID": 13,
-      "txt": ""
+      "txt": "Luke Jinghun"
     },
     {
       "ID": 14,
-      "txt": ""
+      "txt": "Annabelle Guangyao"
     },
     {
       "ID": 15,
-      "txt": ""
+      "txt": "Isabella Endian"
     },
     {
       "ID": 16,
-      "txt": ""
+      "txt": "Liam Yingzong"
     },
     {
       "ID": 17,
-      "txt": ""
+      "txt": "Emily Cuiyu"
     },
     {
       "ID": 18,
-      "txt": ""
+      "txt": "Derek Jifeng"
     },
     {
       "ID": 19,
-      "txt": ""
+      "txt": "Victoria Yeren"
     },
     {
       "ID": 20,
-      "txt": ""
+      "txt": "Noah Linzong"
     },
     {
       "ID": 21,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 22,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 23,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 24,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 25,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 26,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 27,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 28,
-      "txt": ""
+      "txt": "0"
     },
     {
       "ID": 29,
-      "txt": ""
-    },
-    {
-      "ID": 30,
-      "txt": ""
-    },
-    {
-      "ID": 31,
-      "txt": ""
+      "txt": "0"
     }
   ]
 }

Assets/Res/Config/LanguageFRConfig.json

@@ -2,7 +2,7 @@
   "configList": [
     {
       "ID": 1,
-      "txt": ""
+      "txt": "0"
     }
   ]
 }

Assets/Res/Config/LanguageRUConfig.json

@@ -2,7 +2,7 @@
   "configList": [
     {
       "ID": 1,
-      "txt": ""
+      "txt": "0"
     }
   ]
 }

Assets/Res/Config/LanguageTHConfig.json

@@ -2,7 +2,7 @@
   "configList": [
     {
       "ID": 1,
-      "txt": ""
+      "txt": "0"
     }
   ]
 }

Assets/Scenes/UITest.scene

@@ -2131,6 +2131,34 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 95437761547748053, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 95437761547748053, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 95437761547748053, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 533.815
+      objectReference: {fileID: 0}
+    - target: {fileID: 95437761547748053, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -52.426
+      objectReference: {fileID: 0}
+    - target: {fileID: 207711551128351574, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_Name
+      value: StarsObj
+      objectReference: {fileID: 0}
+    - target: {fileID: 1152724787339482988, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1181932463234986561, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_Name
+      value: Star (4)
+      objectReference: {fileID: 0}
     - target: {fileID: 1265696420539956585, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
       propertyPath: m_AnchorMax.y
       value: 0
@@ -2171,6 +2199,10 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2983232722897563720, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_Name
+      value: Star (2)
+      objectReference: {fileID: 0}
     - target: {fileID: 3052677063158753528, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
       propertyPath: m_AnchorMax.y
       value: 0
@@ -2211,6 +2243,22 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3158233926214000975, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3158233926214000975, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3158233926214000975, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 173.655
+      objectReference: {fileID: 0}
+    - target: {fileID: 3158233926214000975, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -52.425
+      objectReference: {fileID: 0}
     - target: {fileID: 4009204296129428762, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
       propertyPath: m_AnchorMax.y
       value: 0
@@ -2243,6 +2291,90 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4720498086717842237, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4791137245841044094, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4791137245841044094, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4791137245841044094, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 413.90503
+      objectReference: {fileID: 0}
+    - target: {fileID: 4791137245841044094, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -52.426
+      objectReference: {fileID: 0}
+    - target: {fileID: 5422228824707887719, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: data.Array.size
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5422228824707887719, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: data.Array.data[1].key
+      value: heroGrade
+      objectReference: {fileID: 0}
+    - target: {fileID: 5422228824707887719, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: data.Array.data[2].key
+      value: iconZhiYe
+      objectReference: {fileID: 0}
+    - target: {fileID: 5422228824707887719, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: data.Array.data[3].key
+      value: heroName
+      objectReference: {fileID: 0}
+    - target: {fileID: 5422228824707887719, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: data.Array.data[4].key
+      value: stars
+      objectReference: {fileID: 0}
+    - target: {fileID: 5422228824707887719, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: data.Array.data[4].isList
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5422228824707887719, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: data.Array.data[1].gameObject
+      value: 
+      objectReference: {fileID: 2571395874166379839}
+    - target: {fileID: 5422228824707887719, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: data.Array.data[2].gameObject
+      value: 
+      objectReference: {fileID: 2571395874166379840}
+    - target: {fileID: 5422228824707887719, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: data.Array.data[3].gameObject
+      value: 
+      objectReference: {fileID: 2571395874166379841}
+    - target: {fileID: 5422228824707887719, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: data.Array.data[4].gameObject
+      value: 
+      objectReference: {fileID: 2571395874166379842}
+    - target: {fileID: 5422228824707887719, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: data.Array.data[4].ListCollectorDatas.Array.size
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 5422228824707887719, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: data.Array.data[4].ListCollectorDatas.Array.data[0].gameObject
+      value: 
+      objectReference: {fileID: 2571395874166379847}
+    - target: {fileID: 5422228824707887719, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: data.Array.data[4].ListCollectorDatas.Array.data[1].gameObject
+      value: 
+      objectReference: {fileID: 2571395874166379846}
+    - target: {fileID: 5422228824707887719, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: data.Array.data[4].ListCollectorDatas.Array.data[2].gameObject
+      value: 
+      objectReference: {fileID: 2571395874166379845}
+    - target: {fileID: 5422228824707887719, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: data.Array.data[4].ListCollectorDatas.Array.data[3].gameObject
+      value: 
+      objectReference: {fileID: 2571395874166379844}
+    - target: {fileID: 5422228824707887719, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: data.Array.data[4].ListCollectorDatas.Array.data[4].gameObject
+      value: 
+      objectReference: {fileID: 2571395874166379843}
     - target: {fileID: 6061781029632302041, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
       propertyPath: m_AnchorMax.y
       value: 0
@@ -2295,6 +2427,78 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6404690624462050643, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6404690624462050643, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6404690624462050643, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 293.995
+      objectReference: {fileID: 0}
+    - target: {fileID: 6404690624462050643, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -52.426
+      objectReference: {fileID: 0}
+    - target: {fileID: 6497396295839612975, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6497396295839612975, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6497396295839612975, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 653.72504
+      objectReference: {fileID: 0}
+    - target: {fileID: 6497396295839612975, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -52.426
+      objectReference: {fileID: 0}
+    - target: {fileID: 6705460728464269023, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6705460728464269023, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6705460728464269023, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 52.885
+      objectReference: {fileID: 0}
+    - target: {fileID: 6705460728464269023, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -52.425
+      objectReference: {fileID: 0}
+    - target: {fileID: 7169735523350563000, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7786295750093721047, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_Name
+      value: Star (1)
+      objectReference: {fileID: 0}
+    - target: {fileID: 7900421520403642917, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_Name
+      value: Star (3)
+      objectReference: {fileID: 0}
+    - target: {fileID: 8132557230822772550, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8132557230822772550, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8132557230822772550, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 8323024823130982353, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -2375,11 +2579,94 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8417828337138323031, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8417828337138323031, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8417828337138323031, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8417828337138323031, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9043530873077291103, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_Name
+      value: Star
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+--- !u!114 &2571395874166379839 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 19514213694833491, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+  m_PrefabInstance: {fileID: 2571395874166379838}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &2571395874166379840 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 8950263771661184576, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+  m_PrefabInstance: {fileID: 2571395874166379838}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &2571395874166379841 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 4298101951601180055, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+  m_PrefabInstance: {fileID: 2571395874166379838}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!1 &2571395874166379842 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 207711551128351574, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+  m_PrefabInstance: {fileID: 2571395874166379838}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &2571395874166379843 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 1181932463234986561, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+  m_PrefabInstance: {fileID: 2571395874166379838}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &2571395874166379844 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 7900421520403642917, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+  m_PrefabInstance: {fileID: 2571395874166379838}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &2571395874166379845 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 2983232722897563720, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+  m_PrefabInstance: {fileID: 2571395874166379838}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &2571395874166379846 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 7786295750093721047, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+  m_PrefabInstance: {fileID: 2571395874166379838}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &2571395874166379847 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 9043530873077291103, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+  m_PrefabInstance: {fileID: 2571395874166379838}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &5701571635417706881
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -2390,19 +2677,19 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 1722181438945693490, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 1722181438945693490, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 1722181438945693490, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 161.19998
       objectReference: {fileID: 0}
     - target: {fileID: 1722181438945693490, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -3.5
       objectReference: {fileID: 0}
     - target: {fileID: 2306360978136577391, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
       propertyPath: m_Pivot.x
@@ -2486,55 +2773,55 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3215950451646426847, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3215950451646426847, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3215950451646426847, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 588.8
       objectReference: {fileID: 0}
     - target: {fileID: 3215950451646426847, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -3.5
       objectReference: {fileID: 0}
     - target: {fileID: 4325603635048879701, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4325603635048879701, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 4325603635048879701, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 27.42
       objectReference: {fileID: 0}
     - target: {fileID: 4325603635048879701, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -29
       objectReference: {fileID: 0}
     - target: {fileID: 4391858190883622590, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 54.84
       objectReference: {fileID: 0}
     - target: {fileID: 6372682890431576924, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6372682890431576924, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6372682890431576924, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 375
       objectReference: {fileID: 0}
     - target: {fileID: 6372682890431576924, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -3.5
       objectReference: {fileID: 0}
     - target: {fileID: 6456987062960064067, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
       propertyPath: m_Name
@@ -2542,15 +2829,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6456987062960064067, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7503648074123454508, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
       propertyPath: m_AnchorMax.x
-      value: 0
+      value: 0.248
       objectReference: {fileID: 0}
     - target: {fileID: 7503648074123454508, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []

Assets/Scripts/GameData/ExcelConfig/LanguageChineseConfig.cs

@@ -0,0 +1,32 @@
+// Auto Generated Code By excel2json
+// Generate From Excel\MultiLanguage.xlsx. SheetName: LanguageChineseConfig
+
+using System;
+using Fort23.GameData;
+
+namespace Excel2Json
+{
+	[Config(prefab = "LanguageChineseConfig.json")]
+	public partial class LanguageChineseConfigHolder : ConfigHolder<LanguageChineseConfig>
	{
+	}
+
+
+	[Serializable]
+	public struct LanguageChineseConfig : IConfig
	{
+		public int GetID() {return ID;} 
+		/// <summary>
+		///ID
+		/// </summary>
+public int ID;
+
+
+		/// <summary>
+		///中文描述
+		/// </summary>
+public string txt;
+
+
+	}
+
+}
+// End of Auto Generated Code

Assets/Scripts/GameData/ExcelConfig/LanguageChineseConfig.cs.meta

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

Assets/Scripts/GameUI/UI/Hero/HeroDetailPanel.cs

@@ -1,5 +1,7 @@
+using Excel2Json;
 using Fort23.UTool;
 using GameLogic.Hero;
+using UnityEngine.UI;
 
 namespace Fort23.Mono
 {
@@ -28,6 +30,9 @@ namespace Fort23.Mono
 
         public void InitHeroDetailPanel(HeroInfo heroInfo)
         {
+            UGUITextTool.GetLanguageMassage(1);
+            // iconZhiYe.sprite.name = "";
+            
             LogTool.Log(heroInfo);
         }
 

Assets/Scripts/GameUI/UI/Hero/HeroDetailPanelData.cs

@@ -19,6 +19,39 @@ namespace Fort23.Mono
 	      return _btnBack;
 	     }
 	   }
+	  private Text _textGrade;
+	  public Text textGrade
+	   {
+	   get{
+	      if (_textGrade == null)
+	       {
+	         _textGrade  = GetUIUnit<Text>("textGrade"); 
+	       }
+	      return _textGrade;
+	     }
+	   }
+	  private Image _iconZhiYe;
+	  public Image iconZhiYe
+	   {
+	   get{
+	      if (_iconZhiYe == null)
+	       {
+	         _iconZhiYe  = GetUIUnit<Image>("iconZhiYe"); 
+	       }
+	      return _iconZhiYe;
+	     }
+	   }
+	  private Text _txtName;
+	  public Text txtName
+	   {
+	   get{
+	      if (_txtName == null)
+	       {
+	         _txtName  = GetUIUnit<Text>("txtName"); 
+	       }
+	      return _txtName;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

UserSettings/EditorUserSettings.asset

@@ -33,10 +33,10 @@ EditorUserSettings:
       value: 5a50500553530b595d0f597343770941474e4c722e2a20367e794861e1b86c68
       flags: 0
     RecentlyUsedSceneGuid-4:
-      value: 5a500c0357030b0f0858097a44770f40154f4f2e2a2c743229794b64e0b56c6a
+      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     RecentlyUsedSceneGuid-5:
-      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
+      value: 5a500c0357030b0f0858097a44770f40154f4f2e2a2c743229794b64e0b56c6a
       flags: 0
     Systems Window:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615