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

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
+    - _Alpha: 0.7307105
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: 0.64
+    - _MainTexOffsetU: -0.3421861
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingV: 1

Assets/Res/UI/ItemDetailsPanel/GongFaDetailsPanel.prefab

@@ -33,9 +33,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 7325077240780456121}
   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: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 190, y: -36}
   m_SizeDelta: {x: 38, y: 36}
   m_Pivot: {x: 1, y: 0}
 --- !u!222 &315075413461184646
@@ -202,9 +202,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 7325077240780456121}
   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: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 152, y: -36}
   m_SizeDelta: {x: 38, y: 36}
   m_Pivot: {x: 1, y: 0}
 --- !u!222 &6928551091372705930
@@ -291,9 +291,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 7325077240780456121}
   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: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 114, y: -36}
   m_SizeDelta: {x: 38, y: 36}
   m_Pivot: {x: 1, y: 0}
 --- !u!222 &1257988679810492640
@@ -383,8 +383,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: -69, y: 4.9}
-  m_SizeDelta: {x: 65, y: 66}
+  m_AnchoredPosition: {x: -47.199997, y: 0.000045776367}
+  m_SizeDelta: {x: 42.2426, y: 42.2426}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &8716127586724495292
 CanvasRenderer:
@@ -444,7 +444,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_huo
+  _icon_name: dec_huo2
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -492,8 +492,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: 3.5163116, y: -0.00008583069}
-  m_SizeDelta: {x: 39.474, y: 32.743}
+  m_AnchoredPosition: {x: 0, y: -1.4}
+  m_SizeDelta: {x: 39.474, y: 42.0244}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &2511360786993024581
 CanvasRenderer:
@@ -516,7 +516,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.41960788, g: 0.40784317, b: 0.3529412, a: 1}
+  m_Color: {r: 0.3529412, g: 0.34901962, b: 0.30588236, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -525,7 +525,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 26
+    m_FontSize: 32
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
@@ -570,9 +570,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 7325077240780456121}
   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: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 38, y: -36}
   m_SizeDelta: {x: 38, y: 36}
   m_Pivot: {x: 1, y: 0}
 --- !u!222 &897066948721621111
@@ -664,8 +664,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 19, y: -689}
-  m_SizeDelta: {x: 487.0498, y: 32.742203}
+  m_AnchoredPosition: {x: 32.402, y: -634.2}
+  m_SizeDelta: {x: 503.39, y: 48.0128}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &7125100710810636405
 CanvasRenderer:
@@ -688,7 +688,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.854902, g: 0.8352942, b: 0.7803922, a: 1}
+  m_Color: {r: 0.8235295, g: 0.7960785, b: 0.73333335, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -769,13 +769,14 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 974955702589908185}
+  - {fileID: 3939004012186415674}
   - {fileID: 5473342035507285947}
   - {fileID: 2153909580538796158}
   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: 177.5}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 750, y: 1624}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &3038665444609316863
@@ -879,6 +880,42 @@ MonoBehaviour:
     - gameObject: {fileID: 4649527201698735611}
     - gameObject: {fileID: 6899362910355405383}
     - gameObject: {fileID: 2266735464070336714}
+  - key: GongFaUpgradeInfoWidgetGam
+    gameObject: {fileID: 684042977984444321}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 8243822813260717961}
+    - gameObject: {fileID: 4649527201698735611}
+    - gameObject: {fileID: 6899362910355405383}
+    - gameObject: {fileID: 2266735464070336714}
+  - key: Text_Level
+    gameObject: {fileID: 845067475513583887}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 8243822813260717961}
+    - gameObject: {fileID: 4649527201698735611}
+    - gameObject: {fileID: 6899362910355405383}
+    - gameObject: {fileID: 2266735464070336714}
+  - key: Icon_Di
+    gameObject: {fileID: 5767460528244155415}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 8243822813260717961}
+    - gameObject: {fileID: 4649527201698735611}
+    - gameObject: {fileID: 6899362910355405383}
+    - gameObject: {fileID: 2266735464070336714}
+  - key: csc
+    gameObject: {fileID: 2753918720130881084}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 8243822813260717961}
+    - gameObject: {fileID: 4649527201698735611}
+    - gameObject: {fileID: 6899362910355405383}
+    - gameObject: {fileID: 2266735464070336714}
   isAssetBundle: 1
 --- !u!1 &3062519244349796745
 GameObject:
@@ -919,8 +956,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 19, y: -480}
-  m_SizeDelta: {x: 487.0498, y: 32.742203}
+  m_AnchoredPosition: {x: 32.402, y: -354.8}
+  m_SizeDelta: {x: 503.3928, y: 48.0009}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &5668636926297367333
 CanvasRenderer:
@@ -943,7 +980,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.854902, g: 0.8352942, b: 0.7803922, a: 1}
+  m_Color: {r: 0.8235295, g: 0.7960785, b: 0.73333335, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1028,8 +1065,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: 3.5163116, y: -0.00008583069}
-  m_SizeDelta: {x: 39.474, y: 32.743}
+  m_AnchoredPosition: {x: -0.7, y: 0.00005340576}
+  m_SizeDelta: {x: 39.474, y: 41.6923}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &4012193777205510440
 CanvasRenderer:
@@ -1052,7 +1089,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.41960788, g: 0.40784317, b: 0.3529412, a: 1}
+  m_Color: {r: 0.3529412, g: 0.34901962, b: 0.30588236, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1061,7 +1098,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 26
+    m_FontSize: 32
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
@@ -1108,8 +1145,8 @@ RectTransform:
   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.000015258789, y: 0.3184}
-  m_SizeDelta: {x: 114.1819, y: 114.8186}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 105.5081, y: 105.5081}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8958233860565030772
 CanvasRenderer:
@@ -1197,11 +1234,11 @@ RectTransform:
   - {fileID: 868834413672771607}
   m_Father: {fileID: 7374263567999719867}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 1}
-  m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 26.289635, y: -292.51782}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 178, y: 41}
   m_SizeDelta: {x: 0, y: 82.1818}
-  m_Pivot: {x: 0.5, y: 1}
+  m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &4678360464258838821
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1223,7 +1260,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.8117648, g: 0.5176471, b: 0.07450981, a: 1}
+  m_Color: {r: 0.33333334, g: 0.3254902, b: 0.2901961, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1232,10 +1269,10 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 40
+    m_FontSize: 30
     m_FontStyle: 1
     m_BestFit: 0
-    m_MinSize: 4
+    m_MinSize: 3
     m_MaxSize: 72
     m_Alignment: 3
     m_AlignByGeometry: 0
@@ -1243,7 +1280,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u70C8\u7130\u5251"
+  m_Text: "\u706B\u5200"
 --- !u!114 &6389940800036646202
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1288,7 +1325,8 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 3062720576619518346}
   m_Father: {fileID: 7772631278292454634}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
@@ -1314,7 +1352,7 @@ MonoBehaviour:
     m_Top: 12
     m_Bottom: 0
   m_ChildAlignment: 0
-  m_Spacing: 21.47
+  m_Spacing: -34.2
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 0
@@ -1346,6 +1384,7 @@ GameObject:
   m_Component:
   - component: {fileID: 7374263567999719867}
   - component: {fileID: 2109584501304235976}
+  - component: {fileID: 5862971031907447882}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Icon_GongFaIcon
@@ -1369,12 +1408,14 @@ RectTransform:
   - {fileID: 8835694497297248325}
   - {fileID: 8468219431132250151}
   - {fileID: 7325077240780456121}
+  - {fileID: 3594627985036366811}
+  - {fileID: 828777472710672821}
   m_Father: {fileID: 5473342035507285947}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 161.17606, y: 86.217896}
-  m_SizeDelta: {x: 217.6208, y: 184.8691}
+  m_AnchoredPosition: {x: 32.4, y: -104.6}
+  m_SizeDelta: {x: 559.9147, y: 135.7854}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &2109584501304235976
 CanvasRenderer:
@@ -1384,6 +1425,49 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5101211702717730642}
   m_CullTransparentMesh: 1
+--- !u!114 &5862971031907447882
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5101211702717730642}
+  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.86666673, g: 0.83921576, b: 0.77647066, 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_juxing_fang
+  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: b7e70ac04ee27849b323a2381a2216d0
+  imageH: 184.8691
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &5134635627656750439
 GameObject:
   m_ObjectHideFlags: 0
@@ -1419,8 +1503,8 @@ RectTransform:
   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: -13.751, y: -315}
-  m_SizeDelta: {x: 466.002, y: 136.3669}
+  m_AnchoredPosition: {x: -34.2, y: -340.6}
+  m_SizeDelta: {x: 503.4, y: 136.3669}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7319464873274103757
 CanvasRenderer:
@@ -1443,7 +1527,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.5058824, g: 0.5254902, b: 0.49411768, a: 1}
+  m_Color: {r: 0.3529412, g: 0.34901962, b: 0.30588236, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1453,11 +1537,11 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 26
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 40
-    m_Alignment: 0
+    m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
@@ -1508,7 +1592,7 @@ RectTransform:
   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: 552.5522, y: 965.4438}
+  m_SizeDelta: {x: 624.3355, y: 844.6124}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2958293768953992893
 CanvasRenderer:
@@ -1531,7 +1615,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.3019608, g: 0.42352945, b: 0.37254903, a: 1}
+  m_Color: {r: 0.9058824, g: 0.882353, b: 0.82745105, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1548,7 +1632,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_juxing_fang_hujiao
+  _icon_name: dec_juxing_fang
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
@@ -1598,8 +1682,8 @@ RectTransform:
   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: -32.8, y: -117.684654}
-  m_SizeDelta: {x: 800.0046, y: 319.4926}
+  m_AnchoredPosition: {x: 6.2214, y: -95.0002}
+  m_SizeDelta: {x: 1095.7, y: 433.8932}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4335290694010786724
 CanvasRenderer:
@@ -1793,9 +1877,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 7325077240780456121}
   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: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 76, y: -36}
   m_SizeDelta: {x: 38, y: 36}
   m_Pivot: {x: 1, y: 0}
 --- !u!222 &1716579542206058194
@@ -1867,7 +1951,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &5812057225866309631
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1929,6 +2013,86 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u529F\u6CD5\u8FD0\u4F5C\u5468\u671F\uFF1A1\u8F6C"
+--- !u!1 &6550552127601332548
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 828777472710672821}
+  - component: {fileID: 8202351269339673866}
+  - component: {fileID: 845067475513583887}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text_Level
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &828777472710672821
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6550552127601332548}
+  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: 7374263567999719867}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 143.7, y: 24.4}
+  m_SizeDelta: {x: 262.143, y: 32.5259}
+  m_Pivot: {x: 0, y: 0}
+--- !u!222 &8202351269339673866
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6550552127601332548}
+  m_CullTransparentMesh: 1
+--- !u!114 &845067475513583887
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6550552127601332548}
+  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.49803925, g: 0.48627454, b: 0.4431373, 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: 28
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "0\u7EA7"
 --- !u!1 &7297095596675777317
 GameObject:
   m_ObjectHideFlags: 0
@@ -1964,8 +2128,8 @@ RectTransform:
   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: -13.7511, y: 94.952576}
-  m_SizeDelta: {x: 476.0275, y: 141.7412}
+  m_AnchoredPosition: {x: 0.18892, y: 129.48128}
+  m_SizeDelta: {x: 559.91, y: 104.8786}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4779018838628891476
 CanvasRenderer:
@@ -1988,7 +2152,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.6117647, g: 0.5647059, b: 0.50980395, a: 1}
+  m_Color: {r: 0.33333334, g: 0.3254902, b: 0.2901961, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1997,10 +2161,10 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 29
-    m_FontStyle: 1
+    m_FontSize: 30
+    m_FontStyle: 0
     m_BestFit: 0
-    m_MinSize: 10
+    m_MinSize: 0
     m_MaxSize: 40
     m_Alignment: 4
     m_AlignByGeometry: 0
@@ -2020,9 +2184,10 @@ GameObject:
   - component: {fileID: 8835694497297248325}
   - component: {fileID: 1079158496623144060}
   - component: {fileID: 5767460528244155415}
+  - component: {fileID: 2753918720130881084}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: myImage
+  m_Name: Icon_Di
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -2045,8 +2210,8 @@ RectTransform:
   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: -141.4}
-  m_SizeDelta: {x: 128.7439, y: 128.7439}
+  m_AnchoredPosition: {x: -210.6, y: -0.000045776367}
+  m_SizeDelta: {x: 113.5842, y: 113.5842}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1079158496623144060
 CanvasRenderer:
@@ -2069,7 +2234,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.5803922, g: 0.68235296, b: 0.64705884, a: 1}
+  m_Color: {r: 0.68235296, g: 0.58431375, b: 0.49019608, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2086,19 +2251,71 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_yuanhuan_quse
+  _icon_name: dec_ty_yuan
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 08bcd577b76e3c94cacfc8e9783bd09a, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
-    packName: battle
-    packgJsonPath: /Art/UIAssets/TextrueJson\battle.txt
-    packgSpritePath: Assets/Res/UIAtlas/battle.spriteatlasv2
-    lasetJsonGUID: b30151c7ca91f3adc1fcb725072e1a9f
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: b7e70ac04ee27849b323a2381a2216d0
   imageH: 166.9464
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!114 &2753918720130881084
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7313999456231797816}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ef7878ea2dacc454894d556c1d97bca0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - StateInfos:
+    - Target: {fileID: 7313999456231797816}
+      UIStateV4Types: 40000000
+      UIStateV4Datas:
+      - {x: 0.9803922, y: 0.4666667, z: 0.454902, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+  - StateInfos:
+    - Target: {fileID: 7313999456231797816}
+      UIStateV4Types: 40000000
+      UIStateV4Datas:
+      - {x: 0.38039216, y: 0.84313726, z: 0.44313726, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+  - StateInfos:
+    - Target: {fileID: 7313999456231797816}
+      UIStateV4Types: 40000000
+      UIStateV4Datas:
+      - {x: 0.4745098, y: 0.78039217, z: 0.8745098, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+  - StateInfos:
+    - Target: {fileID: 7313999456231797816}
+      UIStateV4Types: 40000000
+      UIStateV4Datas:
+      - {x: 0.9803922, y: 0.4666667, z: 0.454902, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+  - StateInfos:
+    - Target: {fileID: 7313999456231797816}
+      UIStateV4Types: 40000000
+      UIStateV4Datas:
+      - {x: 0.68235296, y: 0.58431375, z: 0.49019608, w: 1}
+      UIStateStrTypes: 
+      UIStateStrDatas: []
+  AllComs:
+  - {fileID: 7313999456231797816}
+  AllComsStateTypes: 40000000
+  CurrIndex: 4
 --- !u!1 &7453280115962929466
 GameObject:
   m_ObjectHideFlags: 0
@@ -2135,7 +2352,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: -2.2806885, y: -10.682098}
+  m_AnchoredPosition: {x: -5.2, y: -7.799988}
   m_SizeDelta: {x: 0, y: 82.1818}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &1312911676552920954
@@ -2159,7 +2376,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.6392157, g: 0.6117647, b: 0.5058824, a: 1}
+  m_Color: {r: 0.33333334, g: 0.3254902, b: 0.2901961, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2213,7 +2430,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &7325077240780456121
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2235,8 +2452,8 @@ RectTransform:
   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: -212.7}
-  m_SizeDelta: {x: 0, y: 30.610802}
+  m_AnchoredPosition: {x: 88.2, y: -23.4}
+  m_SizeDelta: {x: 190, y: 30.610802}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &102925623945446190
 CanvasRenderer:
@@ -2286,6 +2503,95 @@ MonoBehaviour:
   m_ChildScaleWidth: 0
   m_ChildScaleHeight: 0
   m_ReverseArrangement: 0
+--- !u!1 &8217079417702286911
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3594627985036366811}
+  - component: {fileID: 5082667270432511076}
+  - component: {fileID: 2962445774377348559}
+  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 &3594627985036366811
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8217079417702286911}
+  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: 7374263567999719867}
+  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: 64.835266, y: 13.1794}
+  m_SizeDelta: {x: 418.4742, y: 1.1768}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5082667270432511076
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8217079417702286911}
+  m_CullTransparentMesh: 1
+--- !u!114 &2962445774377348559
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8217079417702286911}
+  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.33333334, g: 0.3254902, b: 0.2901961, 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: 
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 0}
+  packInfo:
+    packName: 
+    packgJsonPath: 
+    packgSpritePath: 
+    lasetJsonGUID: 
+  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 &8569910817748873859
 GameObject:
   m_ObjectHideFlags: 0
@@ -2339,7 +2645,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8569910817748873859}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
@@ -2435,7 +2741,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 0.6901961}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.003921569}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2544,7 +2850,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 22.0475, y: 0}
+  m_AnchoredPosition: {x: 17.427, y: 0}
   m_SizeDelta: {x: -44.0949, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &738357066607316721
@@ -2578,7 +2884,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 28
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 40
@@ -2624,8 +2930,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 22.0475, y: 0}
-  m_SizeDelta: {x: -44.0949, y: 0}
+  m_AnchoredPosition: {x: 15.600113, y: -0.000076293945}
+  m_SizeDelta: {x: -44.0949, y: 0.000068665}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3985796455267302
 CanvasRenderer:
@@ -2658,7 +2964,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 28
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 40
@@ -2669,3 +2975,391 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u529F\u6CD5\u5883\u754C"
+--- !u!1 &9050326426006783466
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3939004012186415674}
+  - component: {fileID: 4010398278608535735}
+  - component: {fileID: 7150413726375581017}
+  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 &3939004012186415674
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9050326426006783466}
+  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: 6694772361877173011}
+  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 &4010398278608535735
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9050326426006783466}
+  m_CullTransparentMesh: 1
+--- !u!114 &7150413726375581017
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9050326426006783466}
+  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: 21300000, guid: 6bbacce25d50ca941b7636f71b3cd9e0, 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
+  _icon_name: 
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 0}
+  packInfo:
+    packName: 
+    packgJsonPath: 
+    packgSpritePath: 
+    lasetJsonGUID: 
+  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!1001 &1077441793244281861
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 8554840836415711052}
+    m_Modifications:
+    - target: {fileID: 15893702091055592, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_Color.a
+      value: 0.50980395
+      objectReference: {fileID: 0}
+    - target: {fileID: 15893702091055592, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_Color.b
+      value: 0.82745105
+      objectReference: {fileID: 0}
+    - target: {fileID: 15893702091055592, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_Color.g
+      value: 0.882353
+      objectReference: {fileID: 0}
+    - target: {fileID: 15893702091055592, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_Color.r
+      value: 0.9058824
+      objectReference: {fileID: 0}
+    - target: {fileID: 15893702091055592, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: _icon_name
+      value: dec_juxing_fang
+      objectReference: {fileID: 0}
+    - target: {fileID: 338933279804513873, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 338933279804513873, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 338933279804513873, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 38
+      objectReference: {fileID: 0}
+    - target: {fileID: 338933279804513873, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -36
+      objectReference: {fileID: 0}
+    - target: {fileID: 391061909760223855, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 391061909760223855, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 391061909760223855, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 190
+      objectReference: {fileID: 0}
+    - target: {fileID: 391061909760223855, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -36
+      objectReference: {fileID: 0}
+    - target: {fileID: 436368807920140684, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 190
+      objectReference: {fileID: 0}
+    - target: {fileID: 436368807920140684, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 436368807920140684, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 436368807920140684, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 436368807920140684, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 29
+      objectReference: {fileID: 0}
+    - target: {fileID: 436368807920140684, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 3.3
+      objectReference: {fileID: 0}
+    - target: {fileID: 436368807920140684, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 544340637007268772, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_Name
+      value: GongFaUpgradeInfoWidgetGam
+      objectReference: {fileID: 0}
+    - target: {fileID: 544340637007268772, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1398198344503143719, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1398198344503143719, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1398198344503143719, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 152
+      objectReference: {fileID: 0}
+    - target: {fileID: 1398198344503143719, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -36
+      objectReference: {fileID: 0}
+    - target: {fileID: 1997086601353049712, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 303.7
+      objectReference: {fileID: 0}
+    - target: {fileID: 2075704369294728403, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2075704369294728403, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2075704369294728403, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 114
+      objectReference: {fileID: 0}
+    - target: {fileID: 2075704369294728403, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -36
+      objectReference: {fileID: 0}
+    - target: {fileID: 2626495479702332815, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2626495479702332815, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2626495479702332815, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2626495479702332815, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2626495479702332815, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2626495479702332815, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2626495479702332815, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 605
+      objectReference: {fileID: 0}
+    - target: {fileID: 2626495479702332815, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 109.47
+      objectReference: {fileID: 0}
+    - target: {fileID: 2626495479702332815, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2626495479702332815, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2626495479702332815, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2626495479702332815, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2626495479702332815, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2626495479702332815, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2626495479702332815, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2626495479702332815, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 317.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2626495479702332815, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -66.735
+      objectReference: {fileID: 0}
+    - target: {fileID: 2626495479702332815, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2626495479702332815, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2626495479702332815, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2867061352453296888, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2867061352453296888, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2867061352453296888, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 76
+      objectReference: {fileID: 0}
+    - target: {fileID: 2867061352453296888, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -36
+      objectReference: {fileID: 0}
+    - target: {fileID: 3937650637442666922, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4542963733338172097, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4892693544837635802, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_Color.b
+      value: 0.30588236
+      objectReference: {fileID: 0}
+    - target: {fileID: 4892693544837635802, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_Color.g
+      value: 0.34901962
+      objectReference: {fileID: 0}
+    - target: {fileID: 4892693544837635802, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_Color.r
+      value: 0.3529412
+      objectReference: {fileID: 0}
+    - target: {fileID: 4892693544837635802, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_FontData.m_MaxSize
+      value: 46
+      objectReference: {fileID: 0}
+    - target: {fileID: 4892693544837635802, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_FontData.m_MinSize
+      value: 4
+      objectReference: {fileID: 0}
+    - target: {fileID: 4892693544837635802, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_FontData.m_FontSize
+      value: 46
+      objectReference: {fileID: 0}
+    - target: {fileID: 4892693544837635802, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_FontData.m_FontStyle
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8617353862802743019, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9076459003287357443, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 99.084
+      objectReference: {fileID: 0}
+    - target: {fileID: 9076459003287357443, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: -35.521
+      objectReference: {fileID: 0}
+    - target: {fileID: 9076459003287357443, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 70.107
+      objectReference: {fileID: 0}
+    - target: {fileID: 9076459003287357443, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -0.31200027
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+--- !u!1 &684042977984444321 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 544340637007268772, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+  m_PrefabInstance: {fileID: 1077441793244281861}
+  m_PrefabAsset: {fileID: 0}
+--- !u!224 &3062720576619518346 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 2626495479702332815, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
+  m_PrefabInstance: {fileID: 1077441793244281861}
+  m_PrefabAsset: {fileID: 0}

Assets/Res/UI/ItemDetailsPanel/物品详情.png.meta → Assets/Res/UI/ItemDetailsPanel/物品说明-功法详情.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: Xi9KtyP8UntM5IQaPiuskd7CKE/CeqlnzezbP0g2lJQ7dIXhayuisl+Wb84N
+guid: CShN5Hn+BnkzUJ/UEDJcu8Sn7IcoiEXvZkNzFI1v4nDEcUA/vmnKm1Ug2r2I
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -199,5 +199,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: "\u7269\u54C1\u8BE6\u60C5"
+  assetBundleName: 
   assetBundleVariant: 

Assets/Res/UI/ItemDetailsPanel/通用来源.png.meta

@@ -1,203 +0,0 @@
-fileFormatVersion: 2
-guid: DChO4CmuVC6zp3+XJqMZPsBOD/9lWu+SNsI82DoidnK7CXR1ANgCM/5V8g6o
-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: "\u901A\u7528\u6765\u6E90"
-  assetBundleVariant: 

Assets/Scripts/GameUI/EventManager/EventSystemManager.cs

@@ -785,6 +785,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
                 CombatDrive.Instance.CombatController.ChangeState(CombatController.update);
                 onCompleteCallback?.Invoke();
                 onCompleteCallback = null;
+                EventManager.Instance.Dispatch(CustomEventType.CompleteUpdate, null);
             }
 
             cTask.SetResult();

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

@@ -81,25 +81,32 @@ namespace Fort23.Mono
             UpdateStarBtn();
 
 
-            Text_GongFaDesc.text = UtilTools.GetString(LanguageManager.Instance.Text(skillConfig.dec), _skillInfo.effectValue);
-            Text_GongFaName.text = LanguageManager.Instance.Text(skillConfig.name) + " Lv." + _skillInfo.SkillPowerupConfig.ID.ToString();
-
+            Text_GongFaDesc.text =
+                UtilTools.GetString(LanguageManager.Instance.Text(skillConfig.dec), _skillInfo.effectValue);
+            Text_GongFaName.text = LanguageManager.Instance.Text(skillConfig.name) + " Lv." +
+                                   _skillInfo.SkillPowerupConfig.ID.ToString();
+            Text_Level.text = LanguageManager.Instance.Text(10222, _skillInfo.SkillPowerupConfig.ID.ToString());
             switch (skillConfig.attribute)
             {
                 case 1:
-                    Icon_Attribute.icon_name = "dec_jin";
+                    csc.ChangeState(0);
+                    Icon_Attribute.icon_name = "dec_jin2";
                     break;
                 case 2:
-                    Icon_Attribute.icon_name = "dec_mu";
+                    csc.ChangeState(1);
+                    Icon_Attribute.icon_name = "dec_mu2";
                     break;
                 case 4:
-                    Icon_Attribute.icon_name = "dec_shui";
+                    csc.ChangeState(2);
+                    Icon_Attribute.icon_name = "dec_shui2";
                     break;
                 case 8:
-                    Icon_Attribute.icon_name = "dec_huo";
+                    csc.ChangeState(3);
+                    Icon_Attribute.icon_name = "dec_huo2";
                     break;
                 case 16:
-                    Icon_Attribute.icon_name = "dec_tu";
+                    csc.ChangeState(4);
+                    Icon_Attribute.icon_name = "dec_tu2";
                     break;
             }
 
@@ -124,9 +131,11 @@ namespace Fort23.Mono
             {
                 if (configs[i].level == 1)
                     continue;
-                SkillInfo skillInfo1 = new SkillInfo(configs[i].IDGroup, _skillInfo.SkillPowerupConfig.ID, configs[i].level);
-                GongFaUpgradeInfoWidget gongFaUpgradeInfoWidget = await UIManager.Instance.CreateGComponent<GongFaUpgradeInfoWidget>(null, Content);
-                gongFaUpgradeInfoWidget.CustomInit(_skillInfo, skillInfo1,false);
+                SkillInfo skillInfo1 =
+                    new SkillInfo(configs[i].IDGroup, _skillInfo.SkillPowerupConfig.ID, configs[i].level);
+                GongFaUpgradeInfoWidget gongFaUpgradeInfoWidget =
+                    await UIManager.Instance.CreateGComponentForObject<GongFaUpgradeInfoWidget>(GongFaUpgradeInfoWidgetGam,null, Content,isInstance:true);
+                gongFaUpgradeInfoWidget.CustomInit(_skillInfo, skillInfo1, false);
                 _gongFaUpgradeInfoWidgets.Add(gongFaUpgradeInfoWidget);
             }
         }
@@ -150,7 +159,8 @@ namespace Fort23.Mono
 
         public async static CTask<GongFaDetailsPanel> Open(ItemInfo skillInfo)
         {
-            GongFaDetailsPanel gongFaUpgradePanel = await UIManager.Instance.LoadAndOpenPanel<GongFaDetailsPanel>(null, UILayer.Top);
+            GongFaDetailsPanel gongFaUpgradePanel =
+                await UIManager.Instance.LoadAndOpenPanel<GongFaDetailsPanel>(null, UILayer.Top,isShowBG:true);
             gongFaUpgradePanel.CustomInit(skillInfo);
             return gongFaUpgradePanel;
         }

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

@@ -107,6 +107,50 @@ namespace Fort23.Mono
 	      return _Text_Desc;
 	     }
 	   }
+	  private GameObject _GongFaUpgradeInfoWidgetGam;
+	  public GameObject GongFaUpgradeInfoWidgetGam
+	   {
+	   get{
+	      if (_GongFaUpgradeInfoWidgetGam == null)
+	       {
+	         _GongFaUpgradeInfoWidgetGam  = GetUIUnit<GameObject>("GongFaUpgradeInfoWidgetGam"); 
+	       }
+	      return _GongFaUpgradeInfoWidgetGam;
+	     }
+	   }
+	  private Text _Text_Level;
+	  public Text Text_Level
+	   {
+	   get{
+	      if (_Text_Level == null)
+	       {
+	         _Text_Level  = GetUIUnit<Text>("Text_Level"); 
+	       }
+	      return _Text_Level;
+	     }
+	   }
+	  private MyImage _Icon_Di;
+	  public MyImage Icon_Di
+	   {
+	   get{
+	      if (_Icon_Di == null)
+	       {
+	         _Icon_Di  = GetUIUnit<MyImage>("Icon_Di"); 
+	       }
+	      return _Icon_Di;
+	     }
+	   }
+	  private CustomStateController _csc;
+	  public CustomStateController csc
+	   {
+	   get{
+	      if (_csc == null)
+	       {
+	         _csc  = GetUIUnit<CustomStateController>("csc"); 
+	       }
+	      return _csc;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/MainPanel/MainPanel.cs

@@ -107,11 +107,17 @@ namespace Fort23.Mono
             PlayEventCompletedEfx();
         }
 
+        TimerEntity _timerEntity = null;
+
         private void CompleteEvent(IEventData e)
         {
+            _timerEntity?.Dispose();
+            _timerEntity = null;
             PlayEventCompletedEfx();
             fx_ui_renwu_chuxian.gameObject.SetActive(true);
             fx_ui_renwu_chuxian.Play();
+            _timerEntity =
+                TimerComponent.Instance.AddTimer(400, () => { fx_ui_renwu_chuxian.gameObject.SetActive(false); });
         }
 
         public void UpdateDaoYouCoun()
@@ -324,8 +330,20 @@ namespace Fort23.Mono
                         fx_ui_renwu_wancheng_loop.gameObject.SetActive(true);
                         fx_ui_renwu_wancheng_loop.Play();
                     }
+                    else
+                    {
+                        fx_ui_renwu_wancheng_loop.gameObject.SetActive(false);
+                    }
+                }
+                else
+                {
+                    fx_ui_renwu_wancheng_loop.gameObject.SetActive(false);
                 }
             }
+            else
+            {
+                fx_ui_renwu_wancheng_loop.gameObject.SetActive(false);
+            }
         }