Merge branch 'master' of http://fort23.cn:3000/ck/XiuXianGame

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.0073602796
+    - _Alpha: 0
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0

Assets/Art/VFX/Materials/UIMat/ui_renwu_lg.mat

@@ -57,13 +57,13 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.14950955
+    - _Alpha: 0.27183676
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: 0.27650046
+    - _MainTexOffsetU: 0.12937427
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingV: 1

Assets/Res/Config/EventConditionConfig.json

@@ -667,6 +667,45 @@
       "SkiptoIds": [
         5
       ]
+    },
+    {
+      "ID": 49,
+      "message": 9048,
+      "Operation": 0,
+      "ConditionType": 1,
+      "ConditionPara": [
+        1401
+      ],
+      "finishCount": 2,
+      "SkiptoIds": [
+        5
+      ]
+    },
+    {
+      "ID": 50,
+      "message": 9049,
+      "Operation": 0,
+      "ConditionType": 1,
+      "ConditionPara": [
+        1401
+      ],
+      "finishCount": 1,
+      "SkiptoIds": [
+        5
+      ]
+    },
+    {
+      "ID": 51,
+      "message": 9050,
+      "Operation": 0,
+      "ConditionType": 1,
+      "ConditionPara": [
+        1001
+      ],
+      "finishCount": 1,
+      "SkiptoIds": [
+        5
+      ]
     }
   ]
 }

Assets/Res/Config/EventConfig.json

@@ -1643,7 +1643,6 @@
         1000603,
         1000604,
         1000605,
-        1000606,
         102,
         103
       ],
@@ -1829,7 +1828,6 @@
         1001109,
         1001110,
         1001111,
-        1001112,
         102,
         103
       ],
@@ -1862,6 +1860,8 @@
         1001201,
         1001202,
         1001203,
+        1001204,
+        1001205,
         102,
         103
       ],
@@ -6439,6 +6439,7 @@
         915004,
         915005,
         915006,
+        915007,
         102,
         103
       ],
@@ -6477,6 +6478,7 @@
         915107,
         915108,
         915109,
+        915110,
         102,
         103
       ],
@@ -6515,6 +6517,7 @@
         915207,
         915208,
         915209,
+        915210,
         102,
         103
       ],
@@ -6561,6 +6564,7 @@
         915309,
         915310,
         915311,
+        915312,
         102,
         103
       ],
@@ -6685,6 +6689,9 @@
         915608,
         915609,
         915610,
+        915611,
+        915612,
+        915613,
         102,
         103
       ],

Assets/Res/Config/HeroPowerUpConfig.json

@@ -291,10 +291,10 @@
         247
       ],
       "levelUpExp": 540,
-      "DujieLevelbattleID": 100004,
-      "DujieRateviaBattle": 90,
+      "DujieLevelbattleID": -1,
+      "DujieRateviaBattle": -1,
       "DujieMustItemIDs": [
-        1201
+        1301
       ],
       "DujieMustItemValues": [
         1
@@ -619,10 +619,10 @@
         247
       ],
       "levelUpExp": 710,
-      "DujieLevelbattleID": 100004,
-      "DujieRateviaBattle": 85,
+      "DujieLevelbattleID": -1,
+      "DujieRateviaBattle": -1,
       "DujieMustItemIDs": [
-        1201
+        1301
       ],
       "DujieMustItemValues": [
         1
@@ -948,9 +948,9 @@
       ],
       "levelUpExp": 900,
       "DujieLevelbattleID": 100004,
-      "DujieRateviaBattle": 45,
+      "DujieRateviaBattle": -1,
       "DujieMustItemIDs": [
-        1301
+        1302
       ],
       "DujieMustItemValues": [
         1
@@ -1278,9 +1278,9 @@
       ],
       "levelUpExp": 1190,
       "DujieLevelbattleID": 100004,
-      "DujieRateviaBattle": 70,
+      "DujieRateviaBattle": -1,
       "DujieMustItemIDs": [
-        1202
+        1303
       ],
       "DujieMustItemValues": [
         1
@@ -1606,9 +1606,9 @@
       ],
       "levelUpExp": 1420,
       "DujieLevelbattleID": 100004,
-      "DujieRateviaBattle": 65,
+      "DujieRateviaBattle": -1,
       "DujieMustItemIDs": [
-        1202
+        1304
       ],
       "DujieMustItemValues": [
         1
@@ -1934,9 +1934,9 @@
       ],
       "levelUpExp": 1780,
       "DujieLevelbattleID": 100004,
-      "DujieRateviaBattle": 35,
+      "DujieRateviaBattle": -1,
       "DujieMustItemIDs": [
-        1302
+        1304
       ],
       "DujieMustItemValues": [
         1
@@ -2264,9 +2264,9 @@
       ],
       "levelUpExp": 2180,
       "DujieLevelbattleID": 100004,
-      "DujieRateviaBattle": 55,
+      "DujieRateviaBattle": -1,
       "DujieMustItemIDs": [
-        1202
+        1306
       ],
       "DujieMustItemValues": [
         1
@@ -2592,9 +2592,9 @@
       ],
       "levelUpExp": 2620,
       "DujieLevelbattleID": 100004,
-      "DujieRateviaBattle": 50,
+      "DujieRateviaBattle": -1,
       "DujieMustItemIDs": [
-        1202
+        1307
       ],
       "DujieMustItemValues": [
         1
@@ -2920,9 +2920,9 @@
       ],
       "levelUpExp": 3100,
       "DujieLevelbattleID": 100004,
-      "DujieRateviaBattle": 25,
+      "DujieRateviaBattle": -1,
       "DujieMustItemIDs": [
-        1303
+        1308
       ],
       "DujieMustItemValues": [
         1
@@ -3250,9 +3250,9 @@
       ],
       "levelUpExp": 3750,
       "DujieLevelbattleID": 100004,
-      "DujieRateviaBattle": 30,
+      "DujieRateviaBattle": -1,
       "DujieMustItemIDs": [
-        1202
+        1309
       ],
       "DujieMustItemValues": [
         2
@@ -3578,9 +3578,9 @@
       ],
       "levelUpExp": 4470,
       "DujieLevelbattleID": 100004,
-      "DujieRateviaBattle": 30,
+      "DujieRateviaBattle": -1,
       "DujieMustItemIDs": [
-        1202
+        1310
       ],
       "DujieMustItemValues": [
         2
@@ -3906,9 +3906,9 @@
       ],
       "levelUpExp": 4950,
       "DujieLevelbattleID": 100004,
-      "DujieRateviaBattle": 30,
+      "DujieRateviaBattle": -1,
       "DujieMustItemIDs": [
-        1304
+        1311
       ],
       "DujieMustItemValues": [
         1
@@ -4236,9 +4236,9 @@
       ],
       "levelUpExp": 5400,
       "DujieLevelbattleID": 100004,
-      "DujieRateviaBattle": 30,
+      "DujieRateviaBattle": -1,
       "DujieMustItemIDs": [
-        1202
+        1312
       ],
       "DujieMustItemValues": [
         2
@@ -4564,9 +4564,9 @@
       ],
       "levelUpExp": 6000,
       "DujieLevelbattleID": 100004,
-      "DujieRateviaBattle": 30,
+      "DujieRateviaBattle": -1,
       "DujieMustItemIDs": [
-        1202
+        1313
       ],
       "DujieMustItemValues": [
         2
@@ -4892,9 +4892,9 @@
       ],
       "levelUpExp": 6600,
       "DujieLevelbattleID": 100004,
-      "DujieRateviaBattle": 35,
+      "DujieRateviaBattle": -1,
       "DujieMustItemIDs": [
-        1305
+        1314
       ],
       "DujieMustItemValues": [
         1
@@ -5222,9 +5222,9 @@
       ],
       "levelUpExp": 7350,
       "DujieLevelbattleID": 100004,
-      "DujieRateviaBattle": 15,
+      "DujieRateviaBattle": -1,
       "DujieMustItemIDs": [
-        1202
+        1315
       ],
       "DujieMustItemValues": [
         3
@@ -5550,9 +5550,9 @@
       ],
       "levelUpExp": 8100,
       "DujieLevelbattleID": 100004,
-      "DujieRateviaBattle": 15,
+      "DujieRateviaBattle": -1,
       "DujieMustItemIDs": [
-        1202
+        1316
       ],
       "DujieMustItemValues": [
         3
@@ -5878,9 +5878,9 @@
       ],
       "levelUpExp": 9000,
       "DujieLevelbattleID": 100004,
-      "DujieRateviaBattle": 15,
+      "DujieRateviaBattle": -1,
       "DujieMustItemIDs": [
-        1306
+        1317
       ],
       "DujieMustItemValues": [
         1
@@ -6208,9 +6208,9 @@
       ],
       "levelUpExp": 9900,
       "DujieLevelbattleID": 100004,
-      "DujieRateviaBattle": 15,
+      "DujieRateviaBattle": -1,
       "DujieMustItemIDs": [
-        1202
+        1318
       ],
       "DujieMustItemValues": [
         3
@@ -6536,9 +6536,9 @@
       ],
       "levelUpExp": 10950,
       "DujieLevelbattleID": 100004,
-      "DujieRateviaBattle": 15,
+      "DujieRateviaBattle": -1,
       "DujieMustItemIDs": [
-        1202
+        1319
       ],
       "DujieMustItemValues": [
         3
@@ -6864,9 +6864,9 @@
       ],
       "levelUpExp": 12150,
       "DujieLevelbattleID": 100004,
-      "DujieRateviaBattle": 15,
+      "DujieRateviaBattle": -1,
       "DujieMustItemIDs": [
-        1307
+        1320
       ],
       "DujieMustItemValues": [
         1
@@ -7194,9 +7194,9 @@
       ],
       "levelUpExp": 13500,
       "DujieLevelbattleID": 100004,
-      "DujieRateviaBattle": 10,
+      "DujieRateviaBattle": -1,
       "DujieMustItemIDs": [
-        1202
+        1321
       ],
       "DujieMustItemValues": [
         3
@@ -7522,9 +7522,9 @@
       ],
       "levelUpExp": 14850,
       "DujieLevelbattleID": 100004,
-      "DujieRateviaBattle": 10,
+      "DujieRateviaBattle": -1,
       "DujieMustItemIDs": [
-        1202
+        1322
       ],
       "DujieMustItemValues": [
         3
@@ -7850,9 +7850,9 @@
       ],
       "levelUpExp": 16500,
       "DujieLevelbattleID": 100004,
-      "DujieRateviaBattle": 10,
+      "DujieRateviaBattle": -1,
       "DujieMustItemIDs": [
-        1308
+        1323
       ],
       "DujieMustItemValues": [
         1
@@ -8180,9 +8180,9 @@
       ],
       "levelUpExp": 18150,
       "DujieLevelbattleID": 100004,
-      "DujieRateviaBattle": 5,
+      "DujieRateviaBattle": -1,
       "DujieMustItemIDs": [
-        1202
+        1324
       ],
       "DujieMustItemValues": [
         3
@@ -8508,9 +8508,9 @@
       ],
       "levelUpExp": 20100,
       "DujieLevelbattleID": 100004,
-      "DujieRateviaBattle": 5,
+      "DujieRateviaBattle": -1,
       "DujieMustItemIDs": [
-        1202
+        1325
       ],
       "DujieMustItemValues": [
         3
@@ -8836,9 +8836,9 @@
       ],
       "levelUpExp": 22200,
       "DujieLevelbattleID": 100004,
-      "DujieRateviaBattle": 5,
+      "DujieRateviaBattle": -1,
       "DujieMustItemIDs": [
-        1309
+        1326
       ],
       "DujieMustItemValues": [
         1
@@ -9166,7 +9166,7 @@
       ],
       "levelUpExp": 24600,
       "DujieLevelbattleID": 100004,
-      "DujieRateviaBattle": 5,
+      "DujieRateviaBattle": -1,
       "DujieMustItemIDs": [
         1203
       ],
@@ -9494,7 +9494,7 @@
       ],
       "levelUpExp": 27150,
       "DujieLevelbattleID": 100004,
-      "DujieRateviaBattle": 5,
+      "DujieRateviaBattle": -1,
       "DujieMustItemIDs": [
         1203
       ],
@@ -9822,7 +9822,10 @@
       ],
       "levelUpExp": 30000,
       "DujieLevelbattleID": 100004,
-      "DujieRateviaBattle": 5,
+      "DujieRateviaBattle": -1,
+      "DujieMustItemIDs": [
+        1203
+      ],
       "DujieMustItemValues": [
         1
       ],

Assets/Res/UI/DialoguePanel/DialoguePanel.prefab

@@ -495,16 +495,13 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 2563421227056249499}
-  - {fileID: 5595262446980668160}
-  - {fileID: 589604893561469813}
+  m_Children: []
   m_Father: {fileID: 8657432734085162108}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 436.3}
-  m_SizeDelta: {x: 131, y: 312.24}
+  m_AnchoredPosition: {x: 752, y: 436.3}
+  m_SizeDelta: {x: 131, y: 14}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &3941290691031440729
 CanvasRenderer:
@@ -521,7 +518,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1631362662767161543}
-  m_Enabled: 0
+  m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
   m_Name: 
@@ -535,7 +532,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1631362662767161543}
-  m_Enabled: 0
+  m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
   m_Name: 
@@ -1128,51 +1125,6 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
---- !u!1 &2917372404834608202
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 5595262446980668160}
-  - component: {fileID: 1884391634831059489}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: pos2
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &5595262446980668160
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2917372404834608202}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 1
-  m_Children: []
-  m_Father: {fileID: 608461590454648113}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 65.5, y: -163.12}
-  m_SizeDelta: {x: 640.5879, y: 40}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &1884391634831059489
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2917372404834608202}
-  m_CullTransparentMesh: 1
 --- !u!1 &2996157684196886011
 GameObject:
   m_ObjectHideFlags: 0
@@ -1983,51 +1935,6 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
---- !u!1 &5064809279279465937
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 2563421227056249499}
-  - component: {fileID: 8364296936952236986}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: pos1
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &2563421227056249499
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5064809279279465937}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 1
-  m_Children: []
-  m_Father: {fileID: 608461590454648113}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 65.5, y: -52}
-  m_SizeDelta: {x: 640.5879, y: 40}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &8364296936952236986
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5064809279279465937}
-  m_CullTransparentMesh: 1
 --- !u!1 &5411678273692701274
 GameObject:
   m_ObjectHideFlags: 0
@@ -2290,11 +2197,8 @@ MonoBehaviour:
   - key: OptionPos
     gameObject: {fileID: 608461590454648113}
     isAssetBundle: 0
-    isList: 1
-    ListCollectorDatas:
-    - gameObject: {fileID: 589604893561469813}
-    - gameObject: {fileID: 5595262446980668160}
-    - gameObject: {fileID: 2563421227056249499}
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!1 &5501269362975452296
 GameObject:
@@ -3419,51 +3323,6 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1.73
   m_Text: "\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60\u4F60"
---- !u!1 &7923091462285952063
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 589604893561469813}
-  - component: {fileID: 6894548406029453908}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: pos3
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &589604893561469813
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7923091462285952063}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 1
-  m_Children: []
-  m_Father: {fileID: 608461590454648113}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 65.5, y: -274.24}
-  m_SizeDelta: {x: 640.5879, y: 40}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &6894548406029453908
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7923091462285952063}
-  m_CullTransparentMesh: 1
 --- !u!1 &8459987454782038077
 GameObject:
   m_ObjectHideFlags: 0
@@ -3521,7 +3380,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &3275273584098972649
 RectTransform:
   m_ObjectHideFlags: 0

Assets/Res/UI/HeroInformainPanel/HerYuanManSuccessPanel.prefab

@@ -1,5 +1,174 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &59261779062998827
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 456328025436860059}
+  - component: {fileID: 8479161272255151681}
+  - component: {fileID: 387813698951802944}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &456328025436860059
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 59261779062998827}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 9037135992368401232}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -387}
+  m_SizeDelta: {x: 688.6495, y: 75.9051}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8479161272255151681
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 59261779062998827}
+  m_CullTransparentMesh: 1
+--- !u!114 &387813698951802944
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 59261779062998827}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 35
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 43
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u7075\u6D77\u6F84\u660E,\u9053\u57FA\u7A33\u56FA.\u552F\u6E21\u5929\u52AB\u53EF\u95EE\u66F4\u9AD8\u5927\u9053"
+--- !u!1 &1294179803499213353
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2289476759082914232}
+  - component: {fileID: 5557968576639934990}
+  - component: {fileID: 3083612911296356074}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2289476759082914232
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1294179803499213353}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 9037135992368401232}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 335, y: 662}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5557968576639934990
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1294179803499213353}
+  m_CullTransparentMesh: 1
+--- !u!114 &3083612911296356074
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1294179803499213353}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_zi_jjym
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 192194a01f8a35742b246abac6b340ca, type: 3}
+  packInfo:
+    packName: jingjie
+    packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
+    packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
+    lasetJsonGUID: e9a4a4348976c04ad9208fad61f1d734
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &6015582386914595975
 GameObject:
   m_ObjectHideFlags: 0
@@ -19,7 +188,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &8212670971040085124
 RectTransform:
   m_ObjectHideFlags: 0
@@ -60,7 +229,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 0.84313726}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.003921569}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -121,107 +290,6 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
---- !u!1 &7371325538380333896
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 543116040436373444}
-  - component: {fileID: 4747113537948573547}
-  - component: {fileID: 4779532759236090049}
-  - component: {fileID: 2381540517331302103}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: 'Text_NextJIngjie '
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &543116040436373444
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7371325538380333896}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 9037135992368401232}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 170.4965, y: 901.433}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &4747113537948573547
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7371325538380333896}
-  m_CullTransparentMesh: 1
---- !u!114 &4779532759236090049
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7371325538380333896}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.95294124, g: 0.81568635, b: 0.47450984, a: 1}
-  m_RaycastTarget: 0
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 98
-    m_FontStyle: 1
-    m_BestFit: 0
-    m_MinSize: 3
-    m_MaxSize: 100
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: "\u5706\u6EE1\u6210\u529F"
---- !u!114 &2381540517331302103
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7371325538380333896}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreLayout: 1
-  m_MinWidth: -1
-  m_MinHeight: -1
-  m_PreferredWidth: -1
-  m_PreferredHeight: -1
-  m_FlexibleWidth: -1
-  m_FlexibleHeight: -1
-  m_LayoutPriority: 1
 --- !u!1 &8994874510214016950
 GameObject:
   m_ObjectHideFlags: 0
@@ -253,7 +321,8 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8212670971040085124}
-  - {fileID: 543116040436373444}
+  - {fileID: 2289476759082914232}
+  - {fileID: 456328025436860059}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -279,9 +348,4 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
-  - key: 'Text_NextJIngjie '
-    gameObject: {fileID: 4779532759236090049}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
   isAssetBundle: 0

Assets/Res/UI/HeroInformainPanel/HeroAttributeWidget.prefab

@@ -35,7 +35,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 280.79, y: 3.5639}
+  m_AnchoredPosition: {x: 127.7, y: 3.5639}
   m_SizeDelta: {x: 111.28, y: 45.596}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &192917626739261170
@@ -68,7 +68,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 28
+    m_FontSize: 30
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
@@ -115,8 +115,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 457.4, y: 3.5639}
-  m_SizeDelta: {x: 81.3883, y: 30}
+  m_AnchoredPosition: {x: 419, y: -0.33512}
+  m_SizeDelta: {x: 81.3883, y: 37.798}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &6075765814148249060
 CanvasRenderer:
@@ -148,7 +148,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 26
+    m_FontSize: 30
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
@@ -193,11 +193,11 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 3905833519111515299}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 10.9}
-  m_SizeDelta: {x: 555.4452, y: 1.3502007}
-  m_Pivot: {x: 0, y: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: -2.063, y: 3.1873}
+  m_SizeDelta: {x: 574.5274, y: 2.1629}
+  m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &3660400957717239018
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -219,7 +219,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.5764706, g: 0.8470589, b: 0.7843138, a: 1}
+  m_Color: {r: 0.58431375, g: 0.82745105, b: 0.80392164, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -244,6 +244,7 @@ MonoBehaviour:
     packgJsonPath: 
     packgSpritePath: 
     lasetJsonGUID: 
+  imageH: 1.3502007
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -283,7 +284,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: -2.7000122, y: 1.6}
+  m_AnchoredPosition: {x: -12.9, y: 1.6}
   m_SizeDelta: {x: 81.3883, y: 41.6678}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &4879455564200798581
@@ -316,10 +317,10 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 28
+    m_FontSize: 30
     m_FontStyle: 1
     m_BestFit: 0
-    m_MinSize: 10
+    m_MinSize: 3
     m_MaxSize: 40
     m_Alignment: 3
     m_AlignByGeometry: 0
@@ -361,6 +362,7 @@ RectTransform:
   - {fileID: 5850466370090942673}
   - {fileID: 6949391239389172941}
   - {fileID: 7394528043978614730}
+  - {fileID: 3678271035040921611}
   m_Father: {fileID: 3905833519111515299}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -376,6 +378,95 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4549635221620230061}
   m_CullTransparentMesh: 1
+--- !u!1 &4733503334704012583
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3678271035040921611}
+  - component: {fileID: 6381163825326017891}
+  - component: {fileID: 6595354921559075712}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3678271035040921611
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4733503334704012583}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8803962581139407905}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 19, y: 1.6}
+  m_SizeDelta: {x: 28, y: 33}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6381163825326017891
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4733503334704012583}
+  m_CullTransparentMesh: 1
+--- !u!114 &6595354921559075712
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4733503334704012583}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.8431373, g: 0.8470589, b: 0.6392157, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_juqing_biaoshi1
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: e09f56329289dea619e61cb78606497c
+  imageH: 100
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &5575612326490483760
 GameObject:
   m_ObjectHideFlags: 0
@@ -402,7 +493,7 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5575612326490483760}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -414,7 +505,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 568.0161, y: 59.1605}
+  m_SizeDelta: {x: 589.25, y: 59.1605}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4935005292868148699
 CanvasRenderer:

Assets/Res/UI/HeroInformainPanel/HeroBreakthroughPanel.prefab

@@ -3387,7 +3387,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 148, y: -22.3432}
-  m_SizeDelta: {x: 210, y: 43.2862}
+  m_SizeDelta: {x: 0, y: 43.2862}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8334097589539832799
 CanvasRenderer:

Assets/Res/UI/HeroInformainPanel/HeroInformationPanel.prefab

@@ -2043,6 +2043,82 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &3227758174626508827
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6836626587993943182}
+  - component: {fileID: 1226378177889774439}
+  - component: {fileID: 6867591072674375690}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Image (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &6836626587993943182
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3227758174626508827}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 9037135992368401232}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 750, y: 1624}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1226378177889774439
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3227758174626508827}
+  m_CullTransparentMesh: 1
+--- !u!114 &6867591072674375690
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3227758174626508827}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 675768db88b777e4d9a869134b99ffcd, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &3424210249330591111
 GameObject:
   m_ObjectHideFlags: 0
@@ -2242,7 +2318,7 @@ GameObject:
   - component: {fileID: 5132719788074747933}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: myImage
+  m_Name: AttributeBg
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -2259,13 +2335,14 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 2859865283014944201}
+  m_Children:
+  - {fileID: 6341706220095682999}
+  m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 12, y: 323.30005}
-  m_SizeDelta: {x: 604.3209, y: 346}
+  m_AnchoredPosition: {x: 6.0298, y: 316.9}
+  m_SizeDelta: {x: 592.3805, y: 346.9185}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1123871190918833333
 CanvasRenderer:
@@ -2961,8 +3038,6 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 6341706220095682999}
-  - {fileID: 5668257681158111763}
   - {fileID: 3106622106931745522}
   - {fileID: 2663430401061570260}
   - {fileID: 5624694180497915839}
@@ -5089,12 +5164,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 2859865283014944201}
+  m_Father: {fileID: 5668257681158111763}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 2.1600037, y: 477}
-  m_SizeDelta: {x: 531.9177, y: 0}
+  m_AnchoredPosition: {x: -5.1293, y: 327.2}
+  m_SizeDelta: {x: 578.0841, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &5547915736192466516
 CanvasRenderer:
@@ -5122,7 +5197,7 @@ MonoBehaviour:
     m_Top: 0
     m_Bottom: 0
   m_ChildAlignment: 0
-  m_Spacing: 10
+  m_Spacing: 5.34
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 0
@@ -5267,7 +5342,9 @@ RectTransform:
   - {fileID: 5280865914155831809}
   - {fileID: 8212670971040085124}
   - {fileID: 307469801909214118}
+  - {fileID: 6836626587993943182}
   - {fileID: 2859865283014944201}
+  - {fileID: 5668257681158111763}
   - {fileID: 8089210650133897920}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -5609,6 +5686,66 @@ MonoBehaviour:
     - gameObject: {fileID: 7376704574898062582}
     - gameObject: {fileID: 5361362261105901452}
     - gameObject: {fileID: 3729610520836463702}
+  - key: fx_ui_pojing_loop
+    gameObject: {fileID: 7906287161833097796}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 1880288565177214262}
+    - gameObject: {fileID: 2042267790315149397}
+    - gameObject: {fileID: 4679966127718740453}
+    - gameObject: {fileID: 4142095966250220239}
+    - gameObject: {fileID: 7592152688635164121}
+    - gameObject: {fileID: 5851220315569675395}
+    - gameObject: {fileID: 4774715494878346207}
+    - gameObject: {fileID: 7376704574898062582}
+    - gameObject: {fileID: 5361362261105901452}
+    - gameObject: {fileID: 3729610520836463702}
+  - key: fx_ui_pojing_loop2
+    gameObject: {fileID: 7541718378471365227}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 1880288565177214262}
+    - gameObject: {fileID: 2042267790315149397}
+    - gameObject: {fileID: 4679966127718740453}
+    - gameObject: {fileID: 4142095966250220239}
+    - gameObject: {fileID: 7592152688635164121}
+    - gameObject: {fileID: 5851220315569675395}
+    - gameObject: {fileID: 4774715494878346207}
+    - gameObject: {fileID: 7376704574898062582}
+    - gameObject: {fileID: 5361362261105901452}
+    - gameObject: {fileID: 3729610520836463702}
+  - key: fx_ui_dujie_loop
+    gameObject: {fileID: 7299160934564795596}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 1880288565177214262}
+    - gameObject: {fileID: 2042267790315149397}
+    - gameObject: {fileID: 4679966127718740453}
+    - gameObject: {fileID: 4142095966250220239}
+    - gameObject: {fileID: 7592152688635164121}
+    - gameObject: {fileID: 5851220315569675395}
+    - gameObject: {fileID: 4774715494878346207}
+    - gameObject: {fileID: 7376704574898062582}
+    - gameObject: {fileID: 5361362261105901452}
+    - gameObject: {fileID: 3729610520836463702}
+  - key: AttributeBg
+    gameObject: {fileID: 3458075374136346509}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 1880288565177214262}
+    - gameObject: {fileID: 2042267790315149397}
+    - gameObject: {fileID: 4679966127718740453}
+    - gameObject: {fileID: 4142095966250220239}
+    - gameObject: {fileID: 7592152688635164121}
+    - gameObject: {fileID: 5851220315569675395}
+    - gameObject: {fileID: 4774715494878346207}
+    - gameObject: {fileID: 7376704574898062582}
+    - gameObject: {fileID: 5361362261105901452}
+    - gameObject: {fileID: 3729610520836463702}
   isAssetBundle: 1
 --- !u!1001 &508761963476317887
 PrefabInstance:
@@ -5764,10 +5901,18 @@ PrefabInstance:
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 332869841568630783, guid: c68c161e644c3f04ca6ec1bad4423743, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 989068646213000240, guid: c68c161e644c3f04ca6ec1bad4423743, type: 3}
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 989068646213000240, guid: c68c161e644c3f04ca6ec1bad4423743, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 1018189641606377850, guid: c68c161e644c3f04ca6ec1bad4423743, type: 3}
       propertyPath: m_Name
       value: fx_ui_pojing_loop
@@ -5780,10 +5925,18 @@ PrefabInstance:
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 2579013666380289392, guid: c68c161e644c3f04ca6ec1bad4423743, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7678339462657113129, guid: c68c161e644c3f04ca6ec1bad4423743, type: 3}
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 7678339462657113129, guid: c68c161e644c3f04ca6ec1bad4423743, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 8441461819353252959, guid: c68c161e644c3f04ca6ec1bad4423743, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -5818,15 +5971,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8441461819353252959, guid: c68c161e644c3f04ca6ec1bad4423743, type: 3}
       propertyPath: m_LocalScale.x
-      value: 216.53334
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8441461819353252959, guid: c68c161e644c3f04ca6ec1bad4423743, type: 3}
       propertyPath: m_LocalScale.y
-      value: 216.53334
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8441461819353252959, guid: c68c161e644c3f04ca6ec1bad4423743, type: 3}
       propertyPath: m_LocalScale.z
-      value: 216.53334
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8441461819353252959, guid: c68c161e644c3f04ca6ec1bad4423743, type: 3}
       propertyPath: m_LocalPosition.x
@@ -5881,6 +6034,17 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: c68c161e644c3f04ca6ec1bad4423743, type: 3}
+--- !u!114 &7906287161833097796 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 7686433970401715150, guid: c68c161e644c3f04ca6ec1bad4423743, type: 3}
+  m_PrefabInstance: {fileID: 509879484065851786}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 16f0b0b6d0b7542bfbd20a3e05b04ff1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!224 &8229603176900455893 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 8441461819353252959, guid: c68c161e644c3f04ca6ec1bad4423743, type: 3}
@@ -6188,15 +6352,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1833723887958715827, guid: 102afa8162f5e4e49a46a6e552ee7cd8, type: 3}
       propertyPath: m_LocalScale.x
-      value: 216.53334
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 1833723887958715827, guid: 102afa8162f5e4e49a46a6e552ee7cd8, type: 3}
       propertyPath: m_LocalScale.y
-      value: 216.53334
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 1833723887958715827, guid: 102afa8162f5e4e49a46a6e552ee7cd8, type: 3}
       propertyPath: m_LocalScale.z
-      value: 216.53334
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 1833723887958715827, guid: 102afa8162f5e4e49a46a6e552ee7cd8, type: 3}
       propertyPath: m_LocalPosition.x
@@ -6803,6 +6967,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: DujiePanel
       objectReference: {fileID: 0}
+    - target: {fileID: 5203073339430596382, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 5535801099866804413, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_SortingLayer
       value: 0
@@ -7297,6 +7465,10 @@ PrefabInstance:
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 327590613993563087, guid: 2e4c3b1f5e4a6664aaf70f89ab15ae8f, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3562328547312358851, guid: 2e4c3b1f5e4a6664aaf70f89ab15ae8f, type: 3}
       propertyPath: m_Name
       value: fx_ui_pojing_loop2
@@ -7309,18 +7481,34 @@ PrefabInstance:
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 6290195225587416253, guid: 2e4c3b1f5e4a6664aaf70f89ab15ae8f, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 6901419240082761364, guid: 2e4c3b1f5e4a6664aaf70f89ab15ae8f, type: 3}
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 6901419240082761364, guid: 2e4c3b1f5e4a6664aaf70f89ab15ae8f, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7014306529886958695, guid: 2e4c3b1f5e4a6664aaf70f89ab15ae8f, type: 3}
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 7014306529886958695, guid: 2e4c3b1f5e4a6664aaf70f89ab15ae8f, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7294759689159795221, guid: 2e4c3b1f5e4a6664aaf70f89ab15ae8f, type: 3}
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 7294759689159795221, guid: 2e4c3b1f5e4a6664aaf70f89ab15ae8f, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 8081526226586147832, guid: 2e4c3b1f5e4a6664aaf70f89ab15ae8f, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -7355,15 +7543,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8081526226586147832, guid: 2e4c3b1f5e4a6664aaf70f89ab15ae8f, type: 3}
       propertyPath: m_LocalScale.x
-      value: 216.53334
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8081526226586147832, guid: 2e4c3b1f5e4a6664aaf70f89ab15ae8f, type: 3}
       propertyPath: m_LocalScale.y
-      value: 216.53334
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8081526226586147832, guid: 2e4c3b1f5e4a6664aaf70f89ab15ae8f, type: 3}
       propertyPath: m_LocalScale.z
-      value: 216.53334
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8081526226586147832, guid: 2e4c3b1f5e4a6664aaf70f89ab15ae8f, type: 3}
       propertyPath: m_LocalPosition.x
@@ -7423,6 +7611,17 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 8081526226586147832, guid: 2e4c3b1f5e4a6664aaf70f89ab15ae8f, type: 3}
   m_PrefabInstance: {fileID: 4561496863770152678}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &7541718378471365227 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 6333224163993851021, guid: 2e4c3b1f5e4a6664aaf70f89ab15ae8f, type: 3}
+  m_PrefabInstance: {fileID: 4561496863770152678}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 16f0b0b6d0b7542bfbd20a3e05b04ff1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &4810030704107047755
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -7435,26 +7634,50 @@ PrefabInstance:
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 363762230357092613, guid: 7417f94f35afcc84bbdb00635fa1c6f0, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 1885293269846349291, guid: 7417f94f35afcc84bbdb00635fa1c6f0, type: 3}
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 1885293269846349291, guid: 7417f94f35afcc84bbdb00635fa1c6f0, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4245232238392766855, guid: 7417f94f35afcc84bbdb00635fa1c6f0, type: 3}
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 4245232238392766855, guid: 7417f94f35afcc84bbdb00635fa1c6f0, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4256680491009822893, guid: 7417f94f35afcc84bbdb00635fa1c6f0, type: 3}
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 4256680491009822893, guid: 7417f94f35afcc84bbdb00635fa1c6f0, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4545691466786201691, guid: 7417f94f35afcc84bbdb00635fa1c6f0, type: 3}
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 4545691466786201691, guid: 7417f94f35afcc84bbdb00635fa1c6f0, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 5106116416986984493, guid: 7417f94f35afcc84bbdb00635fa1c6f0, type: 3}
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 5106116416986984493, guid: 7417f94f35afcc84bbdb00635fa1c6f0, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7687566245080699341, guid: 7417f94f35afcc84bbdb00635fa1c6f0, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -7489,15 +7712,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7687566245080699341, guid: 7417f94f35afcc84bbdb00635fa1c6f0, type: 3}
       propertyPath: m_LocalScale.x
-      value: 216.53334
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 7687566245080699341, guid: 7417f94f35afcc84bbdb00635fa1c6f0, type: 3}
       propertyPath: m_LocalScale.y
-      value: 216.53334
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 7687566245080699341, guid: 7417f94f35afcc84bbdb00635fa1c6f0, type: 3}
       propertyPath: m_LocalScale.z
-      value: 216.53334
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 7687566245080699341, guid: 7417f94f35afcc84bbdb00635fa1c6f0, type: 3}
       propertyPath: m_LocalPosition.x
@@ -7565,6 +7788,17 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 7687566245080699341, guid: 7417f94f35afcc84bbdb00635fa1c6f0, type: 3}
   m_PrefabInstance: {fileID: 4810030704107047755}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &7299160934564795596 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 2849508913041203079, guid: 7417f94f35afcc84bbdb00635fa1c6f0, type: 3}
+  m_PrefabInstance: {fileID: 4810030704107047755}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 16f0b0b6d0b7542bfbd20a3e05b04ff1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &4876959473941794782
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -7719,6 +7953,10 @@ PrefabInstance:
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 71316726147915019, guid: f074590ddce798040891e78f488f0d8c, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4338634034337119778, guid: f074590ddce798040891e78f488f0d8c, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -7815,14 +8053,26 @@ PrefabInstance:
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 5257712521978220578, guid: f074590ddce798040891e78f488f0d8c, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 5260037861480216364, guid: f074590ddce798040891e78f488f0d8c, type: 3}
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 5260037861480216364, guid: f074590ddce798040891e78f488f0d8c, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 5828870007802736777, guid: f074590ddce798040891e78f488f0d8c, type: 3}
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 5828870007802736777, guid: f074590ddce798040891e78f488f0d8c, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7967601135237590799, guid: f074590ddce798040891e78f488f0d8c, type: 3}
       propertyPath: m_Name
       value: fx_ui_tupo1
@@ -7835,6 +8085,10 @@ PrefabInstance:
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 8547481310642698206, guid: f074590ddce798040891e78f488f0d8c, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []

Assets/Res/UI/HeroInformainPanel/HeroTuPoSuccessPanel.prefab

@@ -0,0 +1,1063 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &908498901687786849
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4363201749955246993}
+  - component: {fileID: 300703156522098652}
+  - component: {fileID: 3362068676485299346}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_Tu
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4363201749955246993
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 908498901687786849}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 9037135992368401232}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 11.2, y: 114.8}
+  m_SizeDelta: {x: 335, y: 662}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &300703156522098652
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 908498901687786849}
+  m_CullTransparentMesh: 1
+--- !u!114 &3362068676485299346
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 908498901687786849}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_zi_djcg
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 192194a01f8a35742b246abac6b340ca, type: 3}
+  packInfo:
+    packName: jingjie
+    packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
+    packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
+    lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+  imageH: 189
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &1944986462689415960
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1871334959253546311}
+  - component: {fileID: 8884516353508125679}
+  - component: {fileID: 9199402534891039922}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &1871334959253546311
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1944986462689415960}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 9037135992368401232}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8884516353508125679
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1944986462689415960}
+  m_CullTransparentMesh: 1
+--- !u!114 &9199402534891039922
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1944986462689415960}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: b10fe3c1a9c5440458371368504f7b13, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &3432082845929337746
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2583264031236995806}
+  - component: {fileID: 4054036037674919989}
+  - component: {fileID: 7156210191863548860}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2583264031236995806
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3432082845929337746}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3479442316472032070}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 20.5, y: 0}
+  m_SizeDelta: {x: 28, y: 33}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4054036037674919989
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3432082845929337746}
+  m_CullTransparentMesh: 1
+--- !u!114 &7156210191863548860
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3432082845929337746}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.9960785, g: 0.86666673, b: 0.50980395, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_juqing_biaoshi1
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 009d01eadc79b5b12c19322b6a4cd057
+  imageH: 32
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &4913753158075829455
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3479442316472032070}
+  - component: {fileID: 6122910395234630388}
+  - component: {fileID: 2306384484351467029}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3479442316472032070
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4913753158075829455}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 543116040436373444}
+  - {fileID: 2583264031236995806}
+  - {fileID: 4092484107647895613}
+  - {fileID: 472811775746804830}
+  - {fileID: 1085220640693048462}
+  m_Father: {fileID: 9037135992368401232}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -174}
+  m_SizeDelta: {x: 676, y: 111}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &6122910395234630388
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4913753158075829455}
+  m_CullTransparentMesh: 1
+--- !u!114 &2306384484351467029
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4913753158075829455}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_tp_jj_db
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 192194a01f8a35742b246abac6b340ca, type: 3}
+  packInfo:
+    packName: jingjie
+    packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
+    packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
+    lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+  imageH: 200
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &5294230650080845847
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4092484107647895613}
+  - component: {fileID: 7145965794220890925}
+  - component: {fileID: 499042528739118409}
+  - component: {fileID: 2922447034894237163}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_CurretnJIngjie
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4092484107647895613
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5294230650080845847}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3479442316472032070}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -83.7, y: 0}
+  m_SizeDelta: {x: 308.2119, y: 48.487}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7145965794220890925
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5294230650080845847}
+  m_CullTransparentMesh: 1
+--- !u!114 &499042528739118409
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5294230650080845847}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.90196085, g: 0.9607844, b: 0.9333334, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 46
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 3
+    m_MaxSize: 46
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u7B51\u57FA\u524D\u671F \u7B2C\u56DB\u91CD"
+--- !u!114 &2922447034894237163
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5294230650080845847}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 1
+  m_MinWidth: -1
+  m_MinHeight: -1
+  m_PreferredWidth: -1
+  m_PreferredHeight: -1
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
+--- !u!1 &6015582386914595975
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8212670971040085124}
+  - component: {fileID: 4635955364539374710}
+  - component: {fileID: 4794340547222225426}
+  - component: {fileID: 7717169312912944238}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Btn_Close
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8212670971040085124
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6015582386914595975}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 9037135992368401232}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4635955364539374710
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6015582386914595975}
+  m_CullTransparentMesh: 1
+--- !u!114 &4794340547222225426
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6015582386914595975}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.003921569}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &7717169312912944238
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6015582386914595975}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 4794340547222225426}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &6059519925302326691
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8489357731499039436}
+  - component: {fileID: 4369372019103071337}
+  - component: {fileID: 7278925911318931419}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_Dj
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &8489357731499039436
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6059519925302326691}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 9037135992368401232}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 21, y: 346}
+  m_SizeDelta: {x: 571, y: 230}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4369372019103071337
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6059519925302326691}
+  m_CullTransparentMesh: 1
+--- !u!114 &7278925911318931419
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6059519925302326691}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_dujiechenggong
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 192194a01f8a35742b246abac6b340ca, type: 3}
+  packInfo:
+    packName: jingjie
+    packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
+    packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
+    lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+  imageH: 230
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &6328008475876290341
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 472811775746804830}
+  - component: {fileID: 5249337868127242115}
+  - component: {fileID: 8021534401990309569}
+  - component: {fileID: 7766564801190356076}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &472811775746804830
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6328008475876290341}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3479442316472032070}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 2}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &5249337868127242115
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6328008475876290341}
+  m_CullTransparentMesh: 1
+--- !u!114 &8021534401990309569
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6328008475876290341}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.4666667, g: 0.36078432, b: 0.24705884, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_TupoFenGeXian
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 192194a01f8a35742b246abac6b340ca, type: 3}
+  packInfo:
+    packName: jingjie
+    packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
+    packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
+    lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+  imageH: 2
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!114 &7766564801190356076
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6328008475876290341}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 1
+  m_MinWidth: -1
+  m_MinHeight: -1
+  m_PreferredWidth: -1
+  m_PreferredHeight: -1
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
+--- !u!1 &7371325538380333896
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 543116040436373444}
+  - component: {fileID: 4747113537948573547}
+  - component: {fileID: 4779532759236090049}
+  - component: {fileID: 2381540517331302103}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: 'Text_NextJIngjie '
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &543116040436373444
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7371325538380333896}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3479442316472032070}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 241, y: 0}
+  m_SizeDelta: {x: 308.2119, y: 48.487}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4747113537948573547
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7371325538380333896}
+  m_CullTransparentMesh: 1
+--- !u!114 &4779532759236090049
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7371325538380333896}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.95294124, g: 0.81568635, b: 0.47450984, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 46
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 3
+    m_MaxSize: 46
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u7B51\u57FA\u524D\u671F \u7B2C\u56DB\u91CD"
+--- !u!114 &2381540517331302103
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7371325538380333896}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 1
+  m_MinWidth: -1
+  m_MinHeight: -1
+  m_PreferredWidth: -1
+  m_PreferredHeight: -1
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
+--- !u!1 &8761311858942247224
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1085220640693048462}
+  - component: {fileID: 956848905564691411}
+  - component: {fileID: 8921433333291855242}
+  - component: {fileID: 4479323012423221125}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &1085220640693048462
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8761311858942247224}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3479442316472032070}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 2}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!222 &956848905564691411
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8761311858942247224}
+  m_CullTransparentMesh: 1
+--- !u!114 &8921433333291855242
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8761311858942247224}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.4666667, g: 0.36078432, b: 0.24705884, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_TupoFenGeXian
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 192194a01f8a35742b246abac6b340ca, type: 3}
+  packInfo:
+    packName: jingjie
+    packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
+    packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
+    lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+  imageH: 2
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!114 &4479323012423221125
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8761311858942247224}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 1
+  m_MinWidth: -1
+  m_MinHeight: -1
+  m_PreferredWidth: -1
+  m_PreferredHeight: -1
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
+--- !u!1 &8994874510214016950
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 9037135992368401232}
+  - component: {fileID: 4159330424245520485}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: HeroTuPoSuccessPanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &9037135992368401232
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8994874510214016950}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 8212670971040085124}
+  - {fileID: 1871334959253546311}
+  - {fileID: 3479442316472032070}
+  - {fileID: 4363201749955246993}
+  - {fileID: 8489357731499039436}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 750, y: 1624}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &4159330424245520485
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8994874510214016950}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: Btn_Close
+    gameObject: {fileID: 7717169312912944238}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_CurretnJIngjie
+    gameObject: {fileID: 499042528739118409}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: 'Text_NextJIngjie '
+    gameObject: {fileID: 4779532759236090049}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Icon_Tu
+    gameObject: {fileID: 3362068676485299346}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Icon_Dj
+    gameObject: {fileID: 7278925911318931419}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 0

Assets/Res/UI/HeroInformainPanel/HeroTuPoSuccessPanel.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: XXMc5nikVHMYC4UBQxdgsvnc3Wf8pFGUooVP3jPJ6EsSaj4azqoZzUFoEPRo
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: herobreakthroughsuccesspanel
+  assetBundleVariant: 

Assets/Res/UI/HeroInformainPanel/道侣.png.meta → Assets/Res/UI/HeroInformainPanel/修炼-渡劫成功.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: XnJJsn+kUXsxhIdAjzkZ4/0SJfwyHqKHoul7G+Z6ODzOl6spv9aVBmPOiNHt
+guid: CX0asiylBynkya1VbEAFmvcpf4+FUP0bjeEWGBwsmh/+LsAXHSsL00SgL1Or
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -199,5 +199,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: "\u9053\u4FA3"
+  assetBundleName: 
   assetBundleVariant: 

Assets/Res/UI/HeroInformainPanel/洞府-修炼.png.meta

@@ -1,203 +0,0 @@
-fileFormatVersion: 2
-guid: DShO4yOlVip1EL7ueoSulSR+as0pxx5H/xIt2oOFbuv4J/E2WkYtBPnFi3Ns
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 13
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-    flipGreenChannel: 0
-  isReadable: 0
-  webStreaming: 0
-  priorityLevel: 0
-  uploadedMode: 2
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WeixinMiniGame
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: HMIAndroid
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: OpenHarmony
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: "\u6D1E\u5E9C-\u4FEE\u70BC"
-  assetBundleVariant: 

Assets/Res/UI/HeroInformainPanel/道侣邀请未选择.png.meta

@@ -1,203 +0,0 @@
-fileFormatVersion: 2
-guid: Ci8d5y/4B3xpwPP0yi0NW7eNsyXQoeA0jYz2CoiPfOFigw7jSXCGhkKha/cP
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 13
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 0
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-    flipGreenChannel: 0
-  isReadable: 0
-  webStreaming: 0
-  priorityLevel: 0
-  uploadedMode: 2
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 1
-    wrapV: 1
-    wrapW: 0
-  nPOTScale: 0
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 1
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 1
-  spriteTessellationDetail: -1
-  textureType: 8
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Server
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WeixinMiniGame
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: HMIAndroid
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: OpenHarmony
-    maxTextureSize: 2048
-    maxPlaceholderSize: 32
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: "\u9053\u4FA3\u9080\u8BF7\u672A\u9009\u62E9"
-  assetBundleVariant: 

Assets/Res/UI/MainHeroPanel/MainHeroPanel.prefab

@@ -2305,6 +2305,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4733503334704012583, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 5575612326490483760, guid: 7b3817d41d862244c92d181cc8325cd1, type: 3}
       propertyPath: m_Name
       value: HeroAttributeWidgetGam

Assets/Scripts/GameLogic/Bag/BagController.cs

@@ -385,9 +385,10 @@ namespace GameLogic.Bag
             //这里要设成0是因为，随机掉落的东西，第一次进背包时，先把数量去掉（否则会掉会多加1个）
             //该方法结束后，有统一加数量的代码，看后续代码。
             // itemInfo.count.Value = 0l;
-            m_allBagDic.Add(itemInfo.guid, new ItemInfo(itemInfo.itemID,0));
+            ItemInfo newIteminfo = new ItemInfo(itemInfo.itemID, 0);
+            m_allBagDic.Add(itemInfo.guid, newIteminfo);
 
-            return itemInfo;
+            return newIteminfo;
         }
 
         public long GetItemCount(int itemId)

Assets/Scripts/GameLogic/Combat/Hero/CombatHeroInfo.cs

@@ -25,7 +25,7 @@ public class CombatHeroInfo
     public EncryptionLong hp = new EncryptionLong();
     public EncryptionLong defense = new EncryptionLong();
     public EncryptionLong attack = new EncryptionLong();
-
+    protected Map<HeroAttributeType, float> attributeValue = new Map<HeroAttributeType, float>();
 
     // public long 
     public EncryptionFloat attSpeed
@@ -171,10 +171,12 @@ public class CombatHeroInfo
     /// 最后伤害减少
     /// </summary>
     public float finallyHarmReduce;
+
     /// <summary>
     /// 最终伤害增加 buff伤害除外
     /// </summary>
     public float finallyHarmAdd;
+
     /// <summary>
     /// 1=英雄 2=小怪 3=精英怪 4=boss
     /// </summary>
@@ -204,7 +206,6 @@ public class CombatHeroInfo
     /// </summary>
     public int TaoismSkillId;
 
-   
 
     public float GetAttSpeed
     {
@@ -395,17 +396,25 @@ public class CombatHeroInfo
                     switch (VARIABLE.Key)
                     {
                         case 1:
-                            hp += VARIABLE.Value;
+                            ComputeHeroAttributeType((int)HeroAttributeType.HP, VARIABLE.Value);
+                            // hp += VARIABLE.Value;
                             break;
                         case 2:
-                            defense += VARIABLE.Value;
+                            ComputeHeroAttributeType((int)HeroAttributeType.DEF, VARIABLE.Value);
+                            // defense += VARIABLE.Value;
                             break;
                         case 3:
-                            attack += VARIABLE.Value;
+                            ComputeHeroAttributeType((int)HeroAttributeType.ATT, VARIABLE.Value);
+                            // attack += VARIABLE.Value;
                             break;
                     }
                 }
             }
+
+            if (isMonster)
+            {
+                AddAttributeValue();
+            }
         }
     }
 
@@ -431,12 +440,9 @@ public class CombatHeroInfo
     protected void CalAttribute()
     {
         CalBasicAttribute();
-
-
         // skillId = modelConfig.skillID;
         modelName = modelConfig.model;
         isGpu = modelConfig.isUseGpu;
-
         heroType = modelConfig.heroType;
     }
 
@@ -476,4 +482,82 @@ public class CombatHeroInfo
         CombatHeroInfo combatHeroInfo = (CombatHeroInfo)MemberwiseClone();
         return combatHeroInfo;
     }
+
+    protected void ComputeHeroAttributeType(int shuxingID, float value)
+    {
+        HeroAttributeType heroAttributeType = (HeroAttributeType)shuxingID;
+        if (attributeValue.TryGetValue(heroAttributeType, out float oldValue))
+        {
+            attributeValue[heroAttributeType] = oldValue + value;
+        }
+        else
+        {
+            attributeValue.Add(heroAttributeType, value);
+        }
+
+        // attributeValue.Add((HeroAttributeType)shuxingID,);
+    }
+
+    protected void AddAttributeValue()
+    {
+      
+
+        for (attributeValue.Begin(); attributeValue.Next();)
+        {
+            HeroAttributeType heroAttributeType = attributeValue.Key;
+            float value = attributeValue.Value;
+            switch (heroAttributeType)
+            {
+                case HeroAttributeType.HP:
+                    hp.Value += (int)value;
+                    break;
+                case HeroAttributeType.ATT:
+                    attack.Value += (int)value;
+                    break;
+                case HeroAttributeType.DEF:
+                    defense.Value += (int)value;
+                    break;
+
+                case HeroAttributeType.Gold:
+                    Metal += value;
+                    break;
+                case HeroAttributeType.Wood:
+                    Wood += value;
+                    break;
+                case HeroAttributeType.Fire:
+                    Fire += value;
+                    break;
+                case HeroAttributeType.Water:
+                    Water += value;
+                    break;
+                case HeroAttributeType.Earth:
+                    Earth += value;
+                    break;
+                case HeroAttributeType.Shields:
+                    Shield.Value += (int)value;
+                    break;
+            }
+        }
+        for (attributeValue.Begin(); attributeValue.Next();)
+        {
+            HeroAttributeType heroAttributeType = attributeValue.Key;
+            float value = attributeValue.Value;
+            switch (heroAttributeType)
+            {
+                case HeroAttributeType.HP_BL:
+                    hp.Value += (long)(hp.Value * (value / 100f));
+                    break;
+                case HeroAttributeType.ATT_BL:
+                    attack.Value += (long)(attack.Value * (value / 100f));
+                    break;
+                case HeroAttributeType.DEF_BL:
+                    defense.Value += (long)(defense.Value * (value / 100f));
+                    break;
+                case HeroAttributeType.ShengShi_BL:
+                    shenshi.Value += (long)(shenshi.Value * (value / 100f));
+                    break;
+            }
+        }
+        attributeValue.Clear();
+    }
 }

Assets/Scripts/GameLogic/Hero/HeroInfo.cs

@@ -30,6 +30,7 @@ namespace GameLogic.Hero
 
         // public List<int> ImmortalBond = new List<int>();
 
+      
 
         public HeroInfo()
         {
@@ -150,6 +151,7 @@ namespace GameLogic.Hero
 
         public void ComputeHeroInfo()
         {
+            attributeValue.Clear();
             attributeBlValue.Clear();
             Metal = 100;
             Wood = 100;
@@ -205,56 +207,64 @@ namespace GameLogic.Hero
                 daolvSkill daolvSkill = ConfigComponent.Instance.Get<daolvSkill>(keyValuePair.Key);
                 ComputeHeroAttributeType(daolvSkill.AttrID, keyValuePair.Value);
             }
+
             //心境带来的加成
             AddSentimentData();
-           
+
             if (CombatController.currActiveCombat != null && CombatController.currActiveCombat.playerHeroEntity != null)
             {
                 CombatController.currActiveCombat.playerHeroEntity.CurrCombatHeroInfo = this.Copy();
                 CombatController.currActiveCombat.playerHeroEntity.MaxCombatHeroInfo = this.Copy();
             }
+
+            AddAttributeValue();
         }
 
         private void AddSentimentData()
         {
-            SentimentEffectConfig[] allSentimentEffectConfigs =   ConfigComponent.Instance.GetAll<SentimentEffectConfig>();
-            List<AccountFileInfo.SentimentData> SentimentDatas =  AccountFileInfo.Instance.playerData.SentimentDatas;
+            SentimentEffectConfig[] allSentimentEffectConfigs =
+                ConfigComponent.Instance.GetAll<SentimentEffectConfig>();
+            List<AccountFileInfo.SentimentData> SentimentDatas = AccountFileInfo.Instance.playerData.SentimentDatas;
             for (int i = 0; i < SentimentDatas.Count; i++)
             {
-                AccountFileInfo.SentimentData sentimentData=   SentimentDatas[i];
+                AccountFileInfo.SentimentData sentimentData = SentimentDatas[i];
                 for (int j = 0; j < sentimentData.sentimentProperties.Count; j++)
                 {
-                    AddSentimentProperty( sentimentData.sentimentProperties[i],allSentimentEffectConfigs);
+                    AddSentimentProperty(sentimentData.sentimentProperties[i], allSentimentEffectConfigs);
                 }
-              
             }
         }
 
-        private void AddSentimentProperty(AccountFileInfo.SentimentProperty sentimentProperty,SentimentEffectConfig[] allSentimentEffectConfigs)
+        private void AddSentimentProperty(AccountFileInfo.SentimentProperty sentimentProperty,
+            SentimentEffectConfig[] allSentimentEffectConfigs)
         {
             SentimentEffectConfig currSentimentEffectConfig = default;
             for (int i = 0; i < allSentimentEffectConfigs.Length; i++)
             {
-                SentimentEffectConfig sentimentEffectConfig=   allSentimentEffectConfigs[i];
-                if(sentimentEffectConfig.groupId==sentimentProperty.groupId&& sentimentEffectConfig.level==sentimentProperty.level)
+                SentimentEffectConfig sentimentEffectConfig = allSentimentEffectConfigs[i];
+                if (sentimentEffectConfig.groupId == sentimentProperty.groupId &&
+                    sentimentEffectConfig.level == sentimentProperty.level)
                 {
-                    currSentimentEffectConfig= sentimentEffectConfig;
+                    currSentimentEffectConfig = sentimentEffectConfig;
                 }
             }
-           
+
             switch (currSentimentEffectConfig.effectType)
             {
                 case 1:
-                    attack += (EncryptionLong)(attack.Value * currSentimentEffectConfig.effectVale[0] * 0.01f);
+                    ComputeHeroAttributeType((int)HeroAttributeType.ATT_BL, currSentimentEffectConfig.effectVale[0]);
+                    // attack += (EncryptionLong)(attack.Value * currSentimentEffectConfig.effectVale[0] * 0.01f);
                     break;
                 case 2:
                     gongFaStrength += currSentimentEffectConfig.effectVale[0];
                     break;
                 case 3:
-                    hp += (EncryptionLong)(hp.Value * currSentimentEffectConfig.effectVale[0] * 0.01f);
+                    ComputeHeroAttributeType((int)HeroAttributeType.HP_BL, currSentimentEffectConfig.effectVale[0]);
+                    // hp += (EncryptionLong)(hp.Value * currSentimentEffectConfig.effectVale[0] * 0.01f);
                     break;
                 case 4:
-                    defense += (EncryptionLong)(defense.Value * currSentimentEffectConfig.effectVale[0] * 0.01f);
+                    ComputeHeroAttributeType((int)HeroAttributeType.DEF_BL, currSentimentEffectConfig.effectVale[0]);
+                    // defense += (EncryptionLong)(defense.Value * currSentimentEffectConfig.effectVale[0] * 0.01f);
                     break;
                 case 5:
                     int type = currSentimentEffectConfig.effectVale[0];
@@ -276,92 +286,36 @@ namespace GameLogic.Hero
                             Earth += currSentimentEffectConfig.effectVale[1];
                             break;
                     }
+
                     break;
-                case 6: 
-                    finallyHarmReduce= currSentimentEffectConfig.effectVale[0];
+                case 6:
+                    finallyHarmReduce = currSentimentEffectConfig.effectVale[0];
                     break;
                 case 7:
-                    abnormalHarmAdd= currSentimentEffectConfig.effectVale[0];
+                    abnormalHarmAdd = currSentimentEffectConfig.effectVale[0];
                     break;
                 case 8:
-                    Fire_Proficient= currSentimentEffectConfig.effectVale[0];
+                    Fire_Proficient = currSentimentEffectConfig.effectVale[0];
                     break;
                 case 9:
-                    Wood_Proficient= currSentimentEffectConfig.effectVale[0];
+                    Wood_Proficient = currSentimentEffectConfig.effectVale[0];
                     break;
                 case 10:
-                    Metal_Proficient= currSentimentEffectConfig.effectVale[0];
+                    Metal_Proficient = currSentimentEffectConfig.effectVale[0];
                     break;
                 case 11:
-                    Water_Proficient= currSentimentEffectConfig.effectVale[0];
+                    Water_Proficient = currSentimentEffectConfig.effectVale[0];
                     break;
                 case 12:
-                    Earth_Proficient= currSentimentEffectConfig.effectVale[0];
+                    Earth_Proficient = currSentimentEffectConfig.effectVale[0];
                     break;
                 case 99:
                     // Fire_HarmAdd= currSentimentEffectConfig.effectVale[0];
                     break;
-                
             }
         }
 
-        private void ComputeHeroAttributeType(int shuxingID, float value)
-        {
-            switch ((HeroAttributeType)shuxingID)
-            {
-                case HeroAttributeType.HP:
-                    hp.Value += (int)value;
-                    break;
-                case HeroAttributeType.ATT:
-                    attack.Value += (int)value;
-                    break;
-                case HeroAttributeType.DEF:
-                    defense.Value += (int)value;
-                    break;
-                case HeroAttributeType.HP_BL:
-                    hp.Value += (long)(hp.Value * (value / 100f));
-                    break;
-                case HeroAttributeType.ATT_BL:
-                    attack.Value += (long)(attack.Value * (value / 100f));
-                    break;
-                case HeroAttributeType.DEF_BL:
-                    defense.Value += (long)(defense.Value * (value / 100f));
-                    break;
-                case HeroAttributeType.ShengShi_BL:
-                    shenshi.Value += (long)(shenshi.Value * (value / 100f));
-                    break;
-                case HeroAttributeType.Gold:
-                    Metal += value;
-                    break;
-                case HeroAttributeType.Wood:
-                    Wood += value;
-                    break;
-                case HeroAttributeType.Fire:
-                    Fire += value;
-                    break;
-                case HeroAttributeType.Water:
-                    Water += value;
-                    break;
-                case HeroAttributeType.Earth:
-                    Earth += value;
-                    break;
-                case HeroAttributeType.Shields:
-                    Shield.Value += (int)value;
-                    break;
-                default:
-                    if (attributeBlValue.TryGetValue((HeroAttributeType)shuxingID, out var value1)
-                       )
-                    {
-                        attributeBlValue[(HeroAttributeType)shuxingID] = value1 + value;
-                    }
-                    else
-                    {
-                        attributeBlValue.Add((HeroAttributeType)shuxingID, value);
-                    }
-
+       
 
-                    break;
-            }
-        }
     }
 }

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

@@ -400,10 +400,12 @@ namespace Fort23.Mono
                 case ShowDialogueEventData.MessageShowType.Verbatim:
                     _sb.Clear();
                     _currShowMessage = m.ToCharArray();
-                    if (eventConditionConfig.DialogueType == 2 && eventConditionConfig.NPCID == 100 && PlayerManager.Instance.PlayerName != String.Empty)
+                    if (eventConditionConfig.DialogueType == 2 && eventConditionConfig.NPCID == 100 &&
+                        PlayerManager.Instance.PlayerName != String.Empty)
                     {
                         _sb.Append(PlayerManager.Instance.PlayerName + ":");
                     }
+
                     _sb.Append(_currShowMessage[0]);
                     showText.text = _sb.ToString();
                     _isUpdate = true;
@@ -415,28 +417,59 @@ namespace Fort23.Mono
             LayoutRebuilder.ForceRebuildLayoutImmediate(Dialgue);
         }
 
+        List<DialogueOptionWidget> dialogueOptionWidgets = new List<DialogueOptionWidget>();
+
         private async void ShowOptions()
         {
             await MarskPanel.OpenPanel();
             UIManager.Instance.DormancyAllGComponent<DialogueOptionWidget>();
+            dialogueOptionWidgets.Clear();
             _isShowingOptions = true;
 
             if (eventConditionConfig.optionType == 1 && eventConditionConfig.optionPara1 != null)
             {
                 OptionMarsk.SetActive(true);
+                using (CTaskAwaitBuffer<DialogueOptionWidget> cts = new CTaskAwaitBuffer<DialogueOptionWidget>())
+                {
+                    for (var i = 0; i < eventConditionConfig.optionPara1.Length; i++)
+                    {
+                        cts.AddTask(UIManager.Instance.CreateGComponent<DialogueOptionWidget>(null, OptionPos));
+                    }
+
+                    dialogueOptionWidgets = await cts.WaitAll();
+                }
+
                 for (var i = 0; i < eventConditionConfig.optionPara1.Length; i++)
                 {
-                    int index = eventConditionConfig.optionPara1.Length - 1 - i;
-                    DialogueOptionWidget dialogueOptionWidget =
-                        await UIManager.Instance.CreateGComponent<DialogueOptionWidget>(null, OptionRoot);
-                    dialogueOptionWidget.CustomInit(i, CurrentEventList, eventConditionConfig.optionPara1[i],
+                    dialogueOptionWidgets[i].CustomInit(i, CurrentEventList, eventConditionConfig.optionPara1[i],
                         eventConditionConfig.ID, SelectOption);
-                    dialogueOptionWidget.transform.position = OptionPos[index].position;
-                    await TimerComponent.Instance.WaitAsync(200);
                 }
 
 
-                LayoutRebuilder.ForceRebuildLayoutImmediate(Dialgue);
+                LayoutRebuilder.ForceRebuildLayoutImmediate(OptionPos);
+                OptionRoot.sizeDelta = OptionPos.sizeDelta;
+                List<Vector2> pos = new List<Vector2>();
+                for (var i = 0; i < dialogueOptionWidgets.Count; i++)
+                {
+                    pos.Add(dialogueOptionWidgets[i].transform.anchoredPosition);
+                }
+
+                for (var i = 0; i < dialogueOptionWidgets.Count; i++)
+                {
+                    dialogueOptionWidgets[i].transform.parent = OptionRoot;
+                    dialogueOptionWidgets[i].transform.anchoredPosition = pos[i];
+                    dialogueOptionWidgets[i].Animator.Play("DialogueOptionWidgetopen");
+                    await TimerComponent.Instance.WaitAsync(200);
+                }
+
+                // for (var i = dialogueOptionWidgets.Count - 1; i >= 0; i--)
+                // {
+                //     Vector2 p = dialogueOptionWidgets[i].transform.anchoredPosition;
+                //     dialogueOptionWidgets[i].transform.SetParent(OptionRoot);
+                //     dialogueOptionWidgets[i].transform.anchoredPosition = p;
+                //     dialogueOptionWidgets[i].Animator.Play("DialogueOptionWidgetopen");
+                //     await TimerComponent.Instance.WaitAsync(200);
+                // }
             }
 
             await MarskPanel.ClosePanel();
@@ -507,8 +540,37 @@ namespace Fort23.Mono
                 if (_currShowTime > _showTime)
                 {
                     _currShowTime -= _showTime;
-                    _sb.Append(_currShowMessage[_currShowIndex]);
-                    _currShowIndex++;
+
+                    string v = _currShowMessage[_currShowIndex].ToString();
+                    if (v == "<")
+                    {
+                        int count = 0;
+                        int endIndex = 0;
+                        for (int i = _currShowIndex; i < _currShowMessage.Length - 1; i++)
+                        {
+                            count++;
+                            string ve = _currShowMessage[i].ToString();
+                            _sb.Append(ve);
+                            if (ve == ">")
+                            {
+                                string ve1 = _currShowMessage[i - 1].ToString();
+                                if (ve1 == "r")
+                                {
+                                    endIndex = i;
+                                    break;
+                                }
+                            }
+                        }
+
+                        _currShowIndex += count;
+                    }
+                    else
+                    {
+                        _sb.Append(_currShowMessage[_currShowIndex]);
+                        _currShowIndex++;
+                    }
+
+
                     showText.text = _sb.ToString();
                 }
             }
@@ -517,6 +579,7 @@ namespace Fort23.Mono
         public async override CTask Close()
         {
             UIManager.Instance.DormancyAllGComponent<DialogueOptionWidget>();
+            dialogueOptionWidgets.Clear();
             _isShowingOptions = false;
             _skipTyping = false;
             index = 0;

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

@@ -239,13 +239,13 @@ namespace Fort23.Mono
 	      return _DialgueType1Anim;
 	     }
 	   }
-	  private List<RectTransform> _OptionPos;
-	  public List<RectTransform> OptionPos
+	  private RectTransform _OptionPos;
+	  public RectTransform OptionPos
 	   {
 	   get{
 	      if (_OptionPos == null)
 	       {
-	         _OptionPos  = GetUIUnit<List<RectTransform>>("OptionPos"); 
+	         _OptionPos  = GetUIUnit<RectTransform>("OptionPos"); 
 	       }
 	      return _OptionPos;
 	     }

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

@@ -150,24 +150,25 @@ namespace Fort23.Mono
             count = count + EventSystemManager.Instance.GetShenShiCount() > maxCount
                 ? maxCount - EventSystemManager.Instance.GetShenShiCount()
                 : count;
+            int mincount = count > 2 ? 2 : count;
 
 
             if (count == 1 || count == 0)
             {
                 Slider_Count.minValue = 0;
                 Slider_Count.maxValue = count;
-                Slider_Count.value = count;
+                Slider_Count.value = mincount;
                 Slider_Count.interactable = false;
             }
             else
             {
                 Slider_Count.minValue = 1;
                 Slider_Count.maxValue = count;
-                Slider_Count.value = count;
+                Slider_Count.value = mincount;
                 Slider_Count.interactable = true;
             }
 
-            Slider_Count_OnValueChanged(count);
+            Slider_Count_OnValueChanged(mincount);
 
             List<float> probabilities = UtilTools.CalculateProbabilities(divineSenseConfig.QualityBonusChance.ToList());
 

Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase9.cs

@@ -83,7 +83,7 @@ namespace Fort23.Mono.Phases
             await ctask;
             pgm.SetOnClickMask(false);
             CombatController.currActiveCombat.isUpdate = false;
-            GameObject gameObject = UIManager.Instance.GetComponent<CombatPanel>().magicWeapons[0].own;
+            GameObject gameObject = UIManager.Instance.GetComponent<CombatPanel>().magicWeapons[0].bg_hui.gameObject;
             Vector3 localPos = pgm.WorldPosToLocalPos(gameObject.transform.position);
             Vector2 size = gameObject.GetComponent<RectTransform>().sizeDelta;
 

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

@@ -3,31 +3,31 @@ using Fort23.Core;
 
 namespace Fort23.Mono
 {
-	[UIBinding(prefab = "HerYuanManSuccessPanel"  )]
-	public partial class HerYuanManSuccessPanel : UIPanel
-	{
-		private void Init()
-		{
+    [UIBinding(prefab = "HerYuanManSuccessPanel")]
+    public partial class HerYuanManSuccessPanel : UIPanel
+    {
+        private void Init()
+        {
+        }
 
-		}
-		protected override void AddEvent()
-		{
+        protected override void AddEvent()
+        {
+        }
 
-		}
-		protected override void DelEvent()
-		{
+        protected override void DelEvent()
+        {
+        }
 
-		}
-		public override void AddButtonEvent()
-		{
+        public override void AddButtonEvent()
+        {
+            Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
+        }
 
-		}
-		
-		public async static CTask<HerYuanManSuccessPanel> OpenPanel()
-		{
-			HerYuanManSuccessPanel heroBreakthroughSuccessPanel = await UIManager.Instance.LoadAndOpenPanel<HerYuanManSuccessPanel>(null, UILayer.Top, isFocus: false,isShowBG:true);
-			return heroBreakthroughSuccessPanel;
-		}
-
-	}
-}
+        public async static CTask<HerYuanManSuccessPanel> OpenPanel()
+        {
+            HerYuanManSuccessPanel heroBreakthroughSuccessPanel =
+                await UIManager.Instance.LoadAndOpenPanel<HerYuanManSuccessPanel>(null, UILayer.Top);
+            return heroBreakthroughSuccessPanel;
+        }
+    }
+}

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

@@ -19,17 +19,6 @@ namespace Fort23.Mono
 	      return _Btn_Close;
 	     }
 	   }
-	  private Text _Text_NextJIngjie ;
-	  public Text Text_NextJIngjie 
-	   {
-	   get{
-	      if (_Text_NextJIngjie  == null)
-	       {
-	         _Text_NextJIngjie   = GetUIUnit<Text>("Text_NextJIngjie "); 
-	       }
-	      return _Text_NextJIngjie ;
-	     }
-	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

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

@@ -68,6 +68,8 @@ namespace Fort23.Mono
                     return;
                 }
 
+                HeroInformationPanel heroInformationPanel =
+                    UIManager.Instance.GetComponent<HeroInformationPanel>();
                 if (PlayerManager.Instance.myHero.powerUpConfig.jingjie1 == nextHeroInfo.powerUpConfig.jingjie1 ||
                     !PlayerManager.Instance.myHero.heroData.isYuanMan)
                 {
@@ -119,8 +121,6 @@ namespace Fort23.Mono
                             PlayerManager.Instance.myHero.powerUpConfig.DujieItemIDs[i], 1);
                     }
 
-                    HeroInformationPanel heroInformationPanel =
-                        UIManager.Instance.GetComponent<HeroInformationPanel>();
 
                     var list = GetBl();
 
@@ -141,11 +141,15 @@ namespace Fort23.Mono
 
                         if (PlayerManager.Instance.myHero.powerUpConfig.jingjie1 != nextHeroInfo.powerUpConfig.jingjie1)
                         {
+                            heroInformationPanel.root.SetActive(false);
+                            heroInformationPanel.AttributeBg.SetActive(false);
                             type1 = 4;
                         }
 
                         AudioManager.Instance.PlayAudio("ui_tupo.wav");
-                        await UpHero(type1);
+                        UIManager.Instance.HideUIUIPanel(this);
+                        TitlePanel.ClosePanel();
+                        heroInformationPanel.UpHero(type1, nextHeroInfo);
                     }
                     //失败
                     else
@@ -155,10 +159,9 @@ namespace Fort23.Mono
                         HeroBreakthroughFailPanel heroBreakthroughFailPanel =
                             await HeroBreakthroughFailPanel.OpenPanel(2, list[1]);
                         await heroBreakthroughFailPanel.UIClosed();
+                        heroInformationPanel.RecoverDujie();
+                        UIManager.Instance.HideUIUIPanel(this);
                     }
-
-                    heroInformationPanel.RecoverDujie();
-                    UIManager.Instance.HideUIUIPanel(this);
                 }
                 else
                 {
@@ -174,8 +177,7 @@ namespace Fort23.Mono
                         GObjectPoolInterface.SetActive(false);
                         BackgroundPanel backgroundPanel = UIManager.Instance.GetComponent<BackgroundPanel>();
                         backgroundPanel.GObjectPoolInterface.SetActive(false);
-                        HeroInformationPanel heroInformationPanel =
-                            UIManager.Instance.GetComponent<HeroInformationPanel>();
+
 
                         int ramdomValue = Random.Range(PlayerManager.Instance.myHero.powerUpConfig.LeijieDamages[0],
                             PlayerManager.Instance.myHero.powerUpConfig.LeijieDamages[1]);
@@ -189,16 +191,19 @@ namespace Fort23.Mono
                             HeroBreakthroughFailPanel heroBreakthroughFailPanel =
                                 await HeroBreakthroughFailPanel.OpenPanel(3, 100);
                             await heroBreakthroughFailPanel.UIClosed();
+                            heroInformationPanel.RecoverDujie();
+                            UIManager.Instance.HideUIUIPanel(this);
                         }
                         else
                         {
                             AudioManager.Instance.PlayAudio("ui_tupo.wav");
-                            await UpHero(3);
+                            heroInformationPanel.RecoverDujie();
+                            heroInformationPanel.root.SetActive(false);
+                            heroInformationPanel.AttributeBg.SetActive(true);
+                            UIManager.Instance.HideUIUIPanel(this);
+                            TitlePanel.ClosePanel();
+                            heroInformationPanel.UpHero(3, nextHeroInfo);
                         }
-
-
-                        heroInformationPanel.RecoverDujie();
-                        UIManager.Instance.HideUIUIPanel(this);
                     }
                 }
             });
@@ -249,48 +254,59 @@ namespace Fort23.Mono
             AccountFileInfo.Instance.SavePlayerData();
         }
 
-        private async CTask UpHero(int type)
-        {
-            List<HeroAttributeData> heroAttributData = null;
-            //小突破
-            if (type == 1)
-            {
-                heroAttributData =
-                    HeroHerlp.GetHeroChageHeroAttributeData1(PlayerManager.Instance.myHero, nextHeroInfo);
-                PlayerManager.Instance.myHero.Upgrade();
-            }
-            //大突破
-            else if (type == 2)
-            {
-                heroAttributData = HeroHerlp.GetHeroChageHeroAttributeData(PlayerManager.Instance.myHero, nextHeroInfo);
-                PlayerManager.Instance.myHero.Upgrade();
-            }
-            //渡劫
-            else if (type == 3)
-            {
-                heroAttributData = HeroHerlp.GetHeroChageHeroAttributeData(PlayerManager.Instance.myHero, nextHeroInfo);
-                PlayerManager.Instance.myHero.heroData.isYuanMan = false;
-                PlayerManager.Instance.myHero.Upgrade();
-            }
-            //圆满
-            else if (type == 4)
-            {
-            }
-
-
-            if (type != 4)
-            {
-                HeroBreakthroughSuccessPanel heroBreakthroughSuccessPanel =
-                    await HeroBreakthroughSuccessPanel.OpenPanel(type, heroAttributData);
-                await heroBreakthroughSuccessPanel.UIClosed();
-            }
-            else
-            {
-                PlayerManager.Instance.myHero.heroData.isYuanMan = true;
-                HerYuanManSuccessPanel herYuanManSuccessPanel = await HerYuanManSuccessPanel.OpenPanel();
-                await herYuanManSuccessPanel.UIClosed();
-            }
-        }
+        // private async CTask UpHero(int type,HeroInfo nextHeroInfo)
+        // {
+        //     List<HeroAttributeData> heroAttributData = null;
+        //     //小突破
+        //     if (type == 1)
+        //     {
+        //         heroAttributData =
+        //             HeroHerlp.GetHeroChageHeroAttributeData1(PlayerManager.Instance.myHero, nextHeroInfo);
+        //         PlayerManager.Instance.myHero.Upgrade();
+        //         HeroBreakthroughSuccessPanel heroBreakthroughSuccessPanel =
+        //             await HeroBreakthroughSuccessPanel.OpenPanel(type, heroAttributData);
+        //         await heroBreakthroughSuccessPanel.UIClosed();
+        //     }
+        //     //大突破
+        //     else if (type == 2)
+        //     {
+        //         heroAttributData = HeroHerlp.GetHeroChageHeroAttributeData(PlayerManager.Instance.myHero, nextHeroInfo);
+        //         PlayerManager.Instance.myHero.Upgrade();
+        //         HeroBreakthroughSuccessPanel heroBreakthroughSuccessPanel =
+        //             await HeroBreakthroughSuccessPanel.OpenPanel(type, heroAttributData);
+        //         await heroBreakthroughSuccessPanel.UIClosed();
+        //     }
+        //     //渡劫
+        //     else if (type == 3)
+        //     {
+        //         // heroAttributData = HeroHerlp.GetHeroChageHeroAttributeData(PlayerManager.Instance.myHero, nextHeroInfo);
+        //         PlayerManager.Instance.myHero.heroData.isYuanMan = false;
+        //         PlayerManager.Instance.myHero.Upgrade();
+        //         HeroTuPoSuccessPanel heroTuPoSuccessPanel = await HeroTuPoSuccessPanel.OpenPanel();
+        //         await heroTuPoSuccessPanel.UIClosed();
+        //     }
+        //     //圆满
+        //     else if (type == 4)
+        //     {
+        //         PlayerManager.Instance.myHero.heroData.isYuanMan = true;
+        //         HerYuanManSuccessPanel herYuanManSuccessPanel = await HerYuanManSuccessPanel.OpenPanel();
+        //         await herYuanManSuccessPanel.UIClosed();
+        //     }
+        //
+        //
+        //     // if (type != 4)
+        //     // {
+        //     //     HeroBreakthroughSuccessPanel heroBreakthroughSuccessPanel =
+        //     //         await HeroBreakthroughSuccessPanel.OpenPanel(type, heroAttributData);
+        //     //     await heroBreakthroughSuccessPanel.UIClosed();
+        //     // }
+        //     // else
+        //     // {
+        //     //     PlayerManager.Instance.myHero.heroData.isYuanMan = true;
+        //     //     HerYuanManSuccessPanel herYuanManSuccessPanel = await HerYuanManSuccessPanel.OpenPanel();
+        //     //     await herYuanManSuccessPanel.UIClosed();
+        //     // }
+        // }
 
 
         public async CTask CustomInit()
@@ -326,14 +342,14 @@ namespace Fort23.Mono
                 if (PlayerManager.Instance.myHero.heroData.isYuanMan)
                 {
                     Text_TitleName.text = LanguageManager.Instance.Text(10431);
-                    Text_Affirm.text =LanguageManager.Instance.Text(10432);
-                    Text_AffirmTips.text =LanguageManager.Instance.Text(10433);
+                    Text_Affirm.text = LanguageManager.Instance.Text(10432);
+                    Text_AffirmTips.text = LanguageManager.Instance.Text(10433);
                     Text_SucceedDesc.gameObject.SetActive(false);
                 }
                 else
                 {
                     Text_TitleName.text = LanguageManager.Instance.Text(10430);
-                    Text_Affirm.text = LanguageManager.Instance.Text(10432);
+                    Text_Affirm.text = LanguageManager.Instance.Text(10263);
                     Text_AffirmTips.text = LanguageManager.Instance.Text(10434);
                     Text_SucceedDesc.gameObject.SetActive(true);
                 }

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

@@ -11,6 +11,7 @@ using Fort23.UTool;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Hero;
 using UnityEngine;
+using UnityEngine.UI;
 using Utility.CTween;
 
 
@@ -126,7 +127,7 @@ namespace Fort23.Mono
                         fx_ui_tupo1.gameObject.SetActive(true);
                         fx_ui_tupo1.Play();
                         await TimerComponent.Instance.WaitAsync(500);
-                        CustomInit();
+
                         for (var i = 0; i < JingJieIcons.Count; i++)
                         {
                             if (PlayerManager.Instance.myHero.powerUpConfig.jingjie3 - 1 == i)
@@ -143,28 +144,32 @@ namespace Fort23.Mono
 
                         fx_ui_tupo1.gameObject.SetActive(false);
                         MarskPanel.ClosePanel();
-                        HeroBreakthroughSuccessPanel.OpenPanel(1, heroAttributData);
                         if (PlayerGuideManager.Instance.GuideIsCanDo(6, 3))
                         {
                             PlayerGuideManager.Instance.NextGuide();
                         }
 
+                        HeroBreakthroughSuccessPanel heroBreakthroughSuccessPanel =
+                            await HeroBreakthroughSuccessPanel.OpenPanel(1, heroAttributData);
+                        await heroBreakthroughSuccessPanel.UIClosed();
+                        CustomInit();
+
                         AudioManager.Instance.PlayAudio("ui_shengji.wav");
                     }
                     //大突破
                     else
                     {
                         HeroBreakthroughPanel heroBreakthroughPanel = await HeroBreakthroughPanel.OpenPanel();
-                        await heroBreakthroughPanel.UIClosed();
+                        // await heroBreakthroughPanel.UIClosed();
                         // PlayerManager.Instance.myHero.Upgrade();
-                        CustomInit();
+                        // CustomInit();
                     }
                 }
                 else
                 {
                     HeroBreakthroughPanel heroBreakthroughPanel = await HeroBreakthroughPanel.OpenPanel();
-                    await heroBreakthroughPanel.UIClosed();
-                    CustomInit();
+                    // await heroBreakthroughPanel.UIClosed();
+                    // CustomInit();
                     // TipMessagePanel.OpenTipMessagePanel("")
                 }
             });
@@ -323,30 +328,58 @@ namespace Fort23.Mono
                     PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei);
             }
 
+
+            //可以突破特效设置
+            fx_ui_tupo_loop.gameObject.SetActive(false);
+            fx_ui_pojing_loop.gameObject.SetActive(false);
+            fx_ui_pojing_loop2.gameObject.SetActive(false);
+            fx_ui_dujie_loop.gameObject.SetActive(false);
             if (PlayerManager.Instance.myHero.heroData.exp + allexp >=
                 PlayerManager.Instance.myHero.powerUpConfig.levelUpExp)
             {
-                fx_ui_tupo_loop.gameObject.SetActive(true);
-                fx_ui_tupo_loop.Play();
-            }
-            else
-            {
-                fx_ui_tupo_loop.gameObject.SetActive(false);
-                Btn_TuPo.transform.Gray();
+                if (PlayerManager.Instance.myHero.powerUpConfig.jingjie1 == heroInfo.powerUpConfig.jingjie1)
+                {
+                    //小突破
+                    if (PlayerManager.Instance.myHero.powerUpConfig.jingjie2 == heroInfo.powerUpConfig.jingjie2)
+                    {
+                        fx_ui_tupo_loop.gameObject.SetActive(true);
+                        fx_ui_tupo_loop.Play();
+                    }
+                    //破镜
+                    else
+                    {
+                        fx_ui_pojing_loop.Play();
+                        fx_ui_pojing_loop.gameObject.SetActive(true);
+                    }
+                }
+                //圆满
+                else if (!PlayerManager.Instance.myHero.heroData.isYuanMan)
+                {
+                    fx_ui_pojing_loop2.gameObject.SetActive(true);
+                    fx_ui_pojing_loop2.Play();
+                }
+                else if (PlayerManager.Instance.myHero.heroData.isYuanMan)
+                {
+                    fx_ui_dujie_loop.gameObject.SetActive(true);
+                    fx_ui_dujie_loop.Play();
+                }
             }
 
 
             Text_exp.text =
                 $"{(int)PlayerManager.Instance.myHero.exp.Value + allexp}/{PlayerManager.Instance.myHero.powerUpConfig.levelUpExp}";
 
+            //突破按钮图片和文字设置
             if (PlayerManager.Instance.myHero.powerUpConfig.jingjie1 == heroInfo.powerUpConfig.jingjie1 &&
                 PlayerManager.Instance.myHero.powerUpConfig.jingjie2 == heroInfo.powerUpConfig.jingjie2)
             {
+                Btn_TuPo.GetComponent<MyImage>().icon_name = "btn_xiulianTupo";
                 Text_TuPo.text = LanguageManager.Instance.Text(10228);
             }
             else if (PlayerManager.Instance.myHero.powerUpConfig.jingjie1 == heroInfo.powerUpConfig.jingjie1 &&
                      PlayerManager.Instance.myHero.powerUpConfig.jingjie2 != heroInfo.powerUpConfig.jingjie2)
             {
+                Btn_TuPo.GetComponent<MyImage>().icon_name = "btn_xiulianTupo";
                 Text_TuPo.text = "破镜";
             }
 
@@ -354,10 +387,12 @@ namespace Fort23.Mono
             {
                 if (PlayerManager.Instance.myHero.heroData.isYuanMan)
                 {
+                    Btn_TuPo.GetComponent<MyImage>().icon_name = "btn_xiulianDujie";
                     Text_TuPo.text = LanguageManager.Instance.Text(10229);
                 }
                 else
                 {
+                    Btn_TuPo.GetComponent<MyImage>().icon_name = "btn_xiulianTupo2";
                     Text_TuPo.text = LanguageManager.Instance.Text(10228);
                 }
             }
@@ -515,6 +550,7 @@ namespace Fort23.Mono
         public async CTask Dujie(int hart)
         {
             root.SetActive(false);
+            AttributeBg.SetActive(false);
             using (CTaskAwaitBuffer<ShowTextWidget> cTaskAwaitBuffer = new CTaskAwaitBuffer<ShowTextWidget>())
             {
                 for (int i = 0; i < PlayerManager.Instance.myHero.powerUpConfig.LeijieDamages[2]; i++)
@@ -571,6 +607,60 @@ namespace Fort23.Mono
         {
             DujiePanelAnim.Play("guodu_idle");
             root.SetActive(true);
+            AttributeBg.SetActive(true);
+        }
+
+
+        public async CTask UpHero(int type, HeroInfo nextHeroInfo)
+        {
+            HeroInformationPanel heroInformationPanel =
+                UIManager.Instance.GetComponent<HeroInformationPanel>();
+            List<HeroAttributeData> heroAttributData = null;
+            //小突破
+            if (type == 1)
+            {
+                heroAttributData =
+                    HeroHerlp.GetHeroChageHeroAttributeData1(PlayerManager.Instance.myHero, nextHeroInfo);
+                PlayerManager.Instance.myHero.Upgrade();
+                HeroBreakthroughSuccessPanel heroBreakthroughSuccessPanel =
+                    await HeroBreakthroughSuccessPanel.OpenPanel(type, heroAttributData);
+                await heroBreakthroughSuccessPanel.UIClosed();
+            }
+            //大突破
+            else if (type == 2)
+            {
+                heroAttributData = HeroHerlp.GetHeroChageHeroAttributeData(PlayerManager.Instance.myHero, nextHeroInfo);
+                PlayerManager.Instance.myHero.Upgrade();
+                HeroBreakthroughSuccessPanel heroBreakthroughSuccessPanel =
+                    await HeroBreakthroughSuccessPanel.OpenPanel(type, heroAttributData);
+                await heroBreakthroughSuccessPanel.UIClosed();
+                CustomInit();
+                TitlePanel.OpenPanel();
+            }
+            //渡劫
+            else if (type == 3)
+            {
+                // heroAttributData = HeroHerlp.GetHeroChageHeroAttributeData(PlayerManager.Instance.myHero, nextHeroInfo);
+                PlayerManager.Instance.myHero.heroData.isYuanMan = false;
+                PlayerManager.Instance.myHero.Upgrade();
+                HeroTuPoSuccessPanel heroTuPoSuccessPanel = await HeroTuPoSuccessPanel.OpenPanel();
+                await heroTuPoSuccessPanel.UIClosed();
+                heroInformationPanel.root.SetActive(true);
+                heroInformationPanel.AttributeBg.SetActive(true);
+                CustomInit();
+                TitlePanel.OpenPanel();
+            }
+            //圆满
+            else if (type == 4)
+            {
+                PlayerManager.Instance.myHero.heroData.isYuanMan = true;
+                HerYuanManSuccessPanel herYuanManSuccessPanel = await HerYuanManSuccessPanel.OpenPanel();
+                await herYuanManSuccessPanel.UIClosed();
+                heroInformationPanel.root.SetActive(true);
+                heroInformationPanel.AttributeBg.SetActive(true);
+                CustomInit();
+                TitlePanel.OpenPanel();
+            }
         }
     }
 }

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

@@ -362,6 +362,50 @@ namespace Fort23.Mono
 	      return _fx_ui_danyao_shi;
 	     }
 	   }
+	  private UIParticle _fx_ui_pojing_loop;
+	  public UIParticle fx_ui_pojing_loop
+	   {
+	   get{
+	      if (_fx_ui_pojing_loop == null)
+	       {
+	         _fx_ui_pojing_loop  = GetUIUnit<UIParticle>("fx_ui_pojing_loop"); 
+	       }
+	      return _fx_ui_pojing_loop;
+	     }
+	   }
+	  private UIParticle _fx_ui_pojing_loop2;
+	  public UIParticle fx_ui_pojing_loop2
+	   {
+	   get{
+	      if (_fx_ui_pojing_loop2 == null)
+	       {
+	         _fx_ui_pojing_loop2  = GetUIUnit<UIParticle>("fx_ui_pojing_loop2"); 
+	       }
+	      return _fx_ui_pojing_loop2;
+	     }
+	   }
+	  private UIParticle _fx_ui_dujie_loop;
+	  public UIParticle fx_ui_dujie_loop
+	   {
+	   get{
+	      if (_fx_ui_dujie_loop == null)
+	       {
+	         _fx_ui_dujie_loop  = GetUIUnit<UIParticle>("fx_ui_dujie_loop"); 
+	       }
+	      return _fx_ui_dujie_loop;
+	     }
+	   }
+	  private GameObject _AttributeBg;
+	  public GameObject AttributeBg
+	   {
+	   get{
+	      if (_AttributeBg == null)
+	       {
+	         _AttributeBg  = GetUIUnit<GameObject>("AttributeBg"); 
+	       }
+	      return _AttributeBg;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

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

@@ -0,0 +1,52 @@
+using System.Collections.Generic;
+using Core.Language;
+using Fort23.Core;
+using GameLogic.Hero;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace Fort23.Mono
+{
+    [UIBinding(prefab = "HeroTuPoSuccessPanel")]
+    public partial class HeroTuPoSuccessPanel : UIPanel
+    {
+        private void Init()
+        {
+        }
+
+        protected override void AddEvent()
+        {
+        }
+
+        protected override void DelEvent()
+        {
+        }
+
+        public override void AddButtonEvent()
+        {
+            Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
+        }
+
+        public async static CTask<HeroTuPoSuccessPanel> OpenPanel()
+        {
+            HeroTuPoSuccessPanel heroBreakthroughSuccessPanel =
+                await UIManager.Instance.LoadAndOpenPanel<HeroTuPoSuccessPanel>(null, UILayer.Top);
+            heroBreakthroughSuccessPanel.CustomInit();
+            return heroBreakthroughSuccessPanel;
+        }
+
+        public async void CustomInit()
+        {
+            // HeroInfo heroInfo = new HeroInfo();
+            HeroInfo heroInfo = PlayerManager.Instance.myHero.CopyHero();
+            heroInfo.InitHero(PlayerManager.Instance.myHero.heroData.heroModelId,
+                PlayerManager.Instance.myHero.heroData.heroPowerId - 1);
+            Text_NextJIngjie.text =
+                LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[0]) +
+                LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[1]);
+
+            Text_CurretnJIngjie.text = LanguageManager.Instance.Text(heroInfo.powerUpConfig.jingjieLanIDs[0]) +
+                                       LanguageManager.Instance.Text(heroInfo.powerUpConfig.jingjieLanIDs[1]);
+        }
+    }
+}

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

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

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

@@ -0,0 +1,73 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+namespace Fort23.Mono
+{
+	public partial class HeroTuPoSuccessPanel 
+	{
+	  #region 自定义数据 
+	  private Button _Btn_Close;
+	  public Button Btn_Close
+	   {
+	   get{
+	      if (_Btn_Close == null)
+	       {
+	         _Btn_Close  = GetUIUnit<Button>("Btn_Close"); 
+	       }
+	      return _Btn_Close;
+	     }
+	   }
+	  private Text _Text_CurretnJIngjie;
+	  public Text Text_CurretnJIngjie
+	   {
+	   get{
+	      if (_Text_CurretnJIngjie == null)
+	       {
+	         _Text_CurretnJIngjie  = GetUIUnit<Text>("Text_CurretnJIngjie"); 
+	       }
+	      return _Text_CurretnJIngjie;
+	     }
+	   }
+	  private Text _Text_NextJIngjie ;
+	  public Text Text_NextJIngjie 
+	   {
+	   get{
+	      if (_Text_NextJIngjie  == null)
+	       {
+	         _Text_NextJIngjie   = GetUIUnit<Text>("Text_NextJIngjie "); 
+	       }
+	      return _Text_NextJIngjie ;
+	     }
+	   }
+	  private MyImage _Icon_Tu;
+	  public MyImage Icon_Tu
+	   {
+	   get{
+	      if (_Icon_Tu == null)
+	       {
+	         _Icon_Tu  = GetUIUnit<MyImage>("Icon_Tu"); 
+	       }
+	      return _Icon_Tu;
+	     }
+	   }
+	  private MyImage _Icon_Dj;
+	  public MyImage Icon_Dj
+	   {
+	   get{
+	      if (_Icon_Dj == null)
+	       {
+	         _Icon_Dj  = GetUIUnit<MyImage>("Icon_Dj"); 
+	       }
+	      return _Icon_Dj;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

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

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