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

Assets/Res/UI/MainHeroPanel/FaBaoAttributeWidget.prefab

@@ -42,7 +42,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 233, y: 88}
+  m_SizeDelta: {x: 233, y: 35}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5451924722642203252
 CanvasRenderer:
@@ -59,7 +59,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1536137278090661796}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
@@ -90,6 +90,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\fabao.txt
     packgSpritePath: Assets/Res/UIAtlas/fabao.spriteatlasv2
     lasetJsonGUID: 3dd43d8a4094ef4ef1bab558df91180e
+  imageH: 88
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -166,10 +167,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 7749405585876328868}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 0.5}
-  m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -22.5, y: 6.5156}
-  m_SizeDelta: {x: 29, y: 25}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 66, y: -17.767}
+  m_SizeDelta: {x: 23.267303, y: 20.057999}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &6171417124027095956
 CanvasRenderer:
@@ -217,6 +218,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\fabao.txt
     packgSpritePath: Assets/Res/UIAtlas/fabao.spriteatlasv2
     lasetJsonGUID: 3dd43d8a4094ef4ef1bab558df91180e
+  imageH: 20.058
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -239,7 +241,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &8526466749311363744
 RectTransform:
   m_ObjectHideFlags: 0
@@ -305,6 +307,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\fabao.txt
     packgSpritePath: Assets/Res/UIAtlas/fabao.spriteatlasv2
     lasetJsonGUID: 3dd43d8a4094ef4ef1bab558df91180e
+  imageH: 44
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -342,11 +345,11 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 7749405585876328868}
   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: 88.736, y: -22.033}
-  m_SizeDelta: {x: 61.3275, y: 34.73}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 30.5, y: 25.369003}
+  m_SizeDelta: {x: 61.3275, y: 34.729996}
+  m_Pivot: {x: -0.12784432, y: 1.9532585}
 --- !u!222 &4400891513561527877
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -377,7 +380,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 30
+    m_FontSize: 22
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 1
@@ -422,10 +425,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 7749405585876328868}
   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.336102, y: -22.033}
-  m_SizeDelta: {x: 92.0722, y: 34.73}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 35.897, y: -25.103}
+  m_SizeDelta: {x: 92.0722, y: 34.729996}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2682902642707814625
 CanvasRenderer:
@@ -448,7 +451,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.7254902, g: 0.8078432, b: 0.7411765, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -457,7 +460,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 30
+    m_FontSize: 22
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 1
@@ -502,10 +505,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 7749405585876328868}
   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: 39.4, y: 12}
-  m_SizeDelta: {x: 160, y: 33.3358}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: -58.9195, y: -25.8}
+  m_SizeDelta: {x: 97.5609, y: 33.3358}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7266792496980045858
 CanvasRenderer:
@@ -528,7 +531,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.7254902, g: 0.8078432, b: 0.7411765, a: 1}
+  m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -537,11 +540,11 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 30
+    m_FontSize: 22
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 1
-    m_MaxSize: 40
+    m_MaxSize: 222
     m_Alignment: 0
     m_AlignByGeometry: 0
     m_RichText: 1

Assets/Res/UI/MainHeroPanel/SelectFaBaoPanel.prefab

@@ -209,6 +209,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\fabao.txt
     packgSpritePath: Assets/Res/UIAtlas/fabao.spriteatlasv2
     lasetJsonGUID: 3dd43d8a4094ef4ef1bab558df91180e
+  imageH: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -298,6 +299,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 8924b78c393d2a2d8f9dd44d02a397a9
+  imageH: 84
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -551,7 +553,7 @@ 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: 97, y: -530.9}
+  m_AnchoredPosition: {x: 5.4, y: -531.3}
   m_SizeDelta: {x: 514.76996, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6326345466183093196
@@ -639,8 +641,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: 101.26538, y: 70.29089}
-  m_SizeDelta: {x: 516.3287, y: 240.8118}
+  m_AnchoredPosition: {x: 13.6895, y: -29}
+  m_SizeDelta: {x: 691.4804, y: 160.0778}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6929743905255865244
 CanvasRenderer:
@@ -688,6 +690,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: d4e5a262b3976e33870ab7190f3a5bdb
+  imageH: 240.8118
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -727,7 +730,7 @@ 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: -272, y: 197.92}
+  m_AnchoredPosition: {x: -246, y: 313.21997}
   m_SizeDelta: {x: 164.0966, y: 204.2354}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4755960994092275630
@@ -776,6 +779,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\fabao.txt
     packgSpritePath: Assets/Res/UIAtlas/fabao.spriteatlasv2
     lasetJsonGUID: 3dd43d8a4094ef4ef1bab558df91180e
+  imageH: 204.23534
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -865,6 +869,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\fabao.txt
     packgSpritePath: Assets/Res/UIAtlas/fabao.spriteatlasv2
     lasetJsonGUID: 3dd43d8a4094ef4ef1bab558df91180e
+  imageH: 35
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1126,7 +1131,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: 60.8, y: 0.7}
+  m_AnchoredPosition: {x: 268, y: 54}
   m_SizeDelta: {x: 0, y: 75.668}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &7359437752171597100
@@ -1461,7 +1466,7 @@ 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: 143.6, y: -518.2}
+  m_AnchoredPosition: {x: 0, y: -518.2}
   m_SizeDelta: {x: 543.1503, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6922482407468544096
@@ -1552,6 +1557,86 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u57F9\u517B"
+--- !u!1 &3210136915528964078
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1618446015633265560}
+  - component: {fileID: 4658420417724510445}
+  - component: {fileID: 9054897281558856292}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy) (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1618446015633265560
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3210136915528964078}
+  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: 7222205424052035792}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 271, y: -35}
+  m_SizeDelta: {x: 488.9567, y: 51.467896}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4658420417724510445
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3210136915528964078}
+  m_CullTransparentMesh: 1
+--- !u!114 &9054897281558856292
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3210136915528964078}
+  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.30980393, g: 0.19607845, b: 0.08627451, 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: 42
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 42
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u57FA\u7840\u5C5E\u6027"
 --- !u!1 &3314419697092224364
 GameObject:
   m_ObjectHideFlags: 0
@@ -1642,8 +1727,8 @@ GameObject:
   m_Component:
   - component: {fileID: 5788500819222458158}
   - component: {fileID: 6752312888180738513}
-  - component: {fileID: 8767632309005001914}
   - component: {fileID: 2323203369421012427}
+  - component: {fileID: 5265302759862248076}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: FaBaoAttributeWidgetRoot
@@ -1664,13 +1749,13 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 6108060668469187376}
+  m_Father: {fileID: 7222205424052035792}
   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: 218.1, y: 270}
-  m_SizeDelta: {x: 0, y: 60.0699}
-  m_Pivot: {x: 0, y: 0.5}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 0, y: -55.1}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 1}
 --- !u!222 &6752312888180738513
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1679,7 +1764,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3341266077164049528}
   m_CullTransparentMesh: 1
---- !u!114 &8767632309005001914
+--- !u!114 &2323203369421012427
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1688,16 +1773,30 @@ MonoBehaviour:
   m_GameObject: {fileID: 3341266077164049528}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 0
+  m_VerticalFit: 2
+--- !u!114 &5265302759862248076
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3341266077164049528}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Padding:
-    m_Left: 0
+    m_Left: 21
     m_Right: 0
     m_Top: 0
     m_Bottom: 0
   m_ChildAlignment: 0
-  m_Spacing: 45.18
+  m_Spacing: 0
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 0
@@ -1705,20 +1804,6 @@ MonoBehaviour:
   m_ChildScaleWidth: 0
   m_ChildScaleHeight: 0
   m_ReverseArrangement: 0
---- !u!114 &2323203369421012427
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3341266077164049528}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_HorizontalFit: 2
-  m_VerticalFit: 0
 --- !u!1 &3346857730111124697
 GameObject:
   m_ObjectHideFlags: 0
@@ -1991,7 +2076,7 @@ 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: 85.5, y: -3.2299805}
+  m_AnchoredPosition: {x: 132.5, y: -3.2299805}
   m_SizeDelta: {x: 253, y: 80}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8390928313110045558
@@ -2040,6 +2125,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: d4e5a262b3976e33870ab7190f3a5bdb
+  imageH: 80
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -2175,6 +2261,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\fabao.txt
     packgSpritePath: Assets/Res/UIAtlas/fabao.spriteatlasv2
     lasetJsonGUID: 3dd43d8a4094ef4ef1bab558df91180e
+  imageH: 385.6781
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -2357,8 +2444,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.00071645, y: 408.73486}
-  m_SizeDelta: {x: 750, y: 78.1416}
+  m_AnchoredPosition: {x: 12.524, y: 319.21933}
+  m_SizeDelta: {x: 693.81, y: 213.3123}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8870171658625692314
 CanvasRenderer:
@@ -2406,6 +2493,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\fabao.txt
     packgSpritePath: Assets/Res/UIAtlas/fabao.spriteatlasv2
     lasetJsonGUID: 3dd43d8a4094ef4ef1bab558df91180e
+  imageH: 78.1416
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -2494,6 +2582,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\fabao.txt
     packgSpritePath: Assets/Res/UIAtlas/fabao.spriteatlasv2
     lasetJsonGUID: 3dd43d8a4094ef4ef1bab558df91180e
+  imageH: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -2584,6 +2673,7 @@ MonoBehaviour:
     packgJsonPath: 
     packgSpritePath: 
     lasetJsonGUID: 
+  imageH: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -2663,8 +2753,8 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4961536466157608292}
-  - {fileID: 5788500819222458158}
   - {fileID: 8695863786727674304}
+  - {fileID: 7222205424052035792}
   - {fileID: 3562230635030506916}
   - {fileID: 6136655831423186836}
   - {fileID: 7897417943919571100}
@@ -2720,8 +2810,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: 101.26, y: -268.95367}
-  m_SizeDelta: {x: 516.33, y: 417}
+  m_AnchoredPosition: {x: 10.299, y: -303.2641}
+  m_SizeDelta: {x: 684.93, y: 359.5283}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6680631196129598971
 CanvasRenderer:
@@ -2769,6 +2859,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\fabao.txt
     packgSpritePath: Assets/Res/UIAtlas/fabao.spriteatlasv2
     lasetJsonGUID: 3dd43d8a4094ef4ef1bab558df91180e
+  imageH: 417
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -2808,7 +2899,7 @@ 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: -272, y: 207.7}
+  m_AnchoredPosition: {x: -246, y: 323}
   m_SizeDelta: {x: 110, y: 120}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7714047007213359072
@@ -2857,6 +2948,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/skillIcon.txt
     packgSpritePath: Assets/Res/UIAtlas/skillIcon.spriteatlasv2
     lasetJsonGUID: 7fb091d8ea8692b1350a9fd8f408874a
+  imageH: 99.84776
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -2972,7 +3064,7 @@ 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.686, y: 81.2}
+  m_AnchoredPosition: {x: -75, y: 45}
   m_SizeDelta: {x: 488.9567, y: 51.4679}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9160311939306131453
@@ -3101,6 +3193,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\fabao.txt
     packgSpritePath: Assets/Res/UIAtlas/fabao.spriteatlasv2
     lasetJsonGUID: 3dd43d8a4094ef4ef1bab558df91180e
+  imageH: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -3189,6 +3282,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
     packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
     lasetJsonGUID: d888d6e73899265a3799225e04fd014b
+  imageH: 1624
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -3310,8 +3404,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: 4.8672, y: -24.7863}
-  m_SizeDelta: {x: 473.8917, y: 323.5725}
+  m_AnchoredPosition: {x: 7.267, y: -32.2116}
+  m_SizeDelta: {x: 635.3597, y: 261.9957}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2646367918689829722
 CanvasRenderer:
@@ -3467,6 +3561,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: d4e5a262b3976e33870ab7190f3a5bdb
+  imageH: 80
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -3550,8 +3645,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: 4.3, y: -23.6509}
-  m_SizeDelta: {x: 464.8343, y: 153.9226}
+  m_AnchoredPosition: {x: 15.9969, y: -31.696}
+  m_SizeDelta: {x: 646.8281, y: 101.9244}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8091370797186559976
 CanvasRenderer:
@@ -3630,7 +3725,7 @@ 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: 12.4, y: 167.79465}
+  m_AnchoredPosition: {x: -81, y: 139}
   m_SizeDelta: {x: 488.9567, y: 43.4929}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9184616767057802106
@@ -3711,7 +3806,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -678.4, y: 0.1}
+  m_AnchoredPosition: {x: -455, y: 54}
   m_SizeDelta: {x: 65, y: 66}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &7965205304804970307
@@ -3760,6 +3855,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: 8de890b954c861b7d182629dcafc0d3a
+  imageH: 66
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -3864,6 +3960,97 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u53D6\u6D88"
+--- !u!1 &6891933565934835835
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7222205424052035792}
+  - component: {fileID: 927692187906011649}
+  - component: {fileID: 1075030266377417913}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: JichuShuXingRoot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7222205424052035792
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6891933565934835835}
+  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: 1618446015633265560}
+  - {fileID: 5788500819222458158}
+  m_Father: {fileID: 6108060668469187376}
+  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.6895, y: 130.7}
+  m_SizeDelta: {x: 691.4804, y: 140.954}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &927692187906011649
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6891933565934835835}
+  m_CullTransparentMesh: 1
+--- !u!114 &1075030266377417913
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6891933565934835835}
+  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.9294118, g: 0.9568628, b: 0.9960785, 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: 1
+  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_xiadiban
+  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: d4e5a262b3976e33870ab7190f3a5bdb
+  imageH: 240.8118
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &7007869723404515456
 GameObject:
   m_ObjectHideFlags: 0
@@ -4030,6 +4217,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: d4e5a262b3976e33870ab7190f3a5bdb
+  imageH: 80
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -4403,7 +4591,7 @@ 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: -173, y: -3.2299805}
+  m_AnchoredPosition: {x: -126, y: -3.2299805}
   m_SizeDelta: {x: 253, y: 80}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5534412852682778287
@@ -4452,6 +4640,7 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
     packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
     lasetJsonGUID: d4e5a262b3976e33870ab7190f3a5bdb
+  imageH: 80
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -4538,7 +4727,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: 519.5, y: 2}
+  m_AnchoredPosition: {x: 186.76, y: -42}
   m_SizeDelta: {x: 0, y: 75.668}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &7271376927170581440

Assets/Res/UI/SkillSelectPanel/GongFaUpgradePanel.prefab

@@ -411,7 +411,6 @@ GameObject:
   m_Component:
   - component: {fileID: 868834413672771607}
   - component: {fileID: 8716127586724495292}
-  - component: {fileID: 4822715704095626536}
   - component: {fileID: 494562200636583715}
   m_Layer: 0
   m_HasEditorInfo: 1
@@ -433,13 +432,13 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 8468219431132250151}
+  m_Father: {fileID: 5142448662693722814}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 1, y: 0.5}
-  m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: 63.1, y: -2.6}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 65, y: 66}
-  m_Pivot: {x: 1, y: 0.5}
+  m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &8716127586724495292
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -448,26 +447,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1087223624327040953}
   m_CullTransparentMesh: 1
---- !u!114 &4822715704095626536
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1087223624327040953}
-  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!114 &494562200636583715
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -542,11 +521,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 1896441137542441893}
+  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: -177.4202, y: 225.87369}
+  m_AnchoredPosition: {x: -183.19, y: 338}
   m_SizeDelta: {x: 257.0179, y: 56.6005}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5543201938969055767
@@ -790,9 +769,6 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 1977479323307174205}
-  - {fileID: 5964692562241983256}
-  - {fileID: 2507585154746067127}
   - {fileID: 1617875011636537765}
   - {fileID: 1450357347166671142}
   m_Father: {fileID: 6694772361877173011}
@@ -923,6 +899,9 @@ RectTransform:
   - {fileID: 5473342035507285947}
   - {fileID: 4962336735051820175}
   - {fileID: 1062516556747891371}
+  - {fileID: 1977479323307174205}
+  - {fileID: 5964692562241983256}
+  - {fileID: 2507585154746067127}
   - {fileID: 1219834969852229682}
   - {fileID: 753562404598425228}
   - {fileID: 1896441137542441893}
@@ -1151,6 +1130,7 @@ GameObject:
   - component: {fileID: 1028954343504435061}
   - component: {fileID: 5014666907463259958}
   - component: {fileID: 8363264617899274196}
+  - component: {fileID: 8328474867077985396}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text_Level1
@@ -1166,18 +1146,18 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3256041832133504665}
-  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
   m_Children: []
-  m_Father: {fileID: 6754618905932910559}
+  m_Father: {fileID: 5142448662693722814}
   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}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 315, y: -35.1352}
+  m_SizeDelta: {x: 100, y: 82.181}
+  m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &5014666907463259958
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1199,7 +1179,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.3647059, g: 0.35686275, b: 0.24705884, a: 1}
+  m_Color: {r: 0.9607844, g: 0.9333334, b: 0.8313726, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1207,19 +1187,33 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 26
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 50
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
-    m_MaxSize: 40
-    m_Alignment: 4
+    m_MaxSize: 50
+    m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: LV18
+--- !u!114 &8328474867077985396
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3256041832133504665}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
 --- !u!1 &3978450814364350242
 GameObject:
   m_ObjectHideFlags: 0
@@ -1336,19 +1330,18 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4731082921620160257}
-  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
-  m_Children:
-  - {fileID: 868834413672771607}
-  m_Father: {fileID: 1062516556747891371}
+  m_Children: []
+  m_Father: {fileID: 5142448662693722814}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 10.920685, y: -23.199997}
-  m_SizeDelta: {x: 0, y: 82.1818}
-  m_Pivot: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 140, y: -35.1352}
+  m_SizeDelta: {x: 150, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4678360464258838821
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1443,7 +1436,7 @@ 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: -2.4597, y: 1.2}
+  m_AnchoredPosition: {x: -2.4597, y: -371}
   m_SizeDelta: {x: 655.84, y: 542}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8956727549716453988
@@ -2412,6 +2405,96 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u529F\u6CD5\u8FD0\u4F5C\u5468\u671F\uFF1A1\u8F6C"
+--- !u!1 &6293138216003236845
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 5142448662693722814}
+  - component: {fileID: 7897920450247940872}
+  - component: {fileID: 3100931331409758646}
+  - component: {fileID: 7950843913956157427}
+  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 &5142448662693722814
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6293138216003236845}
+  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: 868834413672771607}
+  - {fileID: 8468219431132250151}
+  - {fileID: 1028954343504435061}
+  m_Father: {fileID: 1062516556747891371}
+  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: 0, y: -38.1}
+  m_SizeDelta: {x: 0, y: 70.2704}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &7897920450247940872
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6293138216003236845}
+  m_CullTransparentMesh: 1
+--- !u!114 &3100931331409758646
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6293138216003236845}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 4
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!114 &7950843913956157427
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6293138216003236845}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
 --- !u!1 &6394406755354776696
 GameObject:
   m_ObjectHideFlags: 0
@@ -2430,7 +2513,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &6754618905932910559
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2442,8 +2525,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 1028954343504435061}
+  m_Children: []
   m_Father: {fileID: 7374263567999719867}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
@@ -2610,7 +2692,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &5964692562241983256
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2624,11 +2706,11 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 5154046706560764311}
-  m_Father: {fileID: 1896441137542441893}
+  m_Father: {fileID: 6694772361877173011}
   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: -34.330193, y: 467.52502}
+  m_AnchoredPosition: {x: -40.099968, y: 1131.4963}
   m_SizeDelta: {x: 117, y: 37}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &2416628555568723737
@@ -2805,7 +2887,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 8468219431132250151}
+  - {fileID: 5142448662693722814}
   - {fileID: 7374263567999719867}
   - {fileID: 7957023652684022640}
   m_Father: {fileID: 6694772361877173011}
@@ -2898,11 +2980,11 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 3289851963449376272}
-  m_Father: {fileID: 1896441137542441893}
+  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: 3.3101058, y: 41.57431}
+  m_AnchoredPosition: {x: -2.4597, y: 153.70065}
   m_SizeDelta: {x: 655.8428, y: 284.9714}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4415456503076877641

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

@@ -170,7 +170,10 @@ namespace Fort23.Mono
 
 
             Text_GongFaDesc.text = UtilTools.GetString(LanguageManager.Instance.Text(skillConfig.dec), _skillInfo.effectValue);
-            Text_GongFaName.text = LanguageManager.Instance.Text(skillConfig.name);
+            Text_GongFaName.text = LanguageManager.Instance.Text(skillConfig.name) + " ";
+            LayoutRebuilder.ForceRebuildLayoutImmediate(Text_GongFaName.GetComponent<RectTransform>());
+            LayoutRebuilder.ForceRebuildLayoutImmediate(Text_Level.GetComponent<RectTransform>());
+            LayoutRebuilder.ForceRebuildLayoutImmediate(Text_GongFaName.transform.parent.GetComponent<RectTransform>());
 
             switch (skillConfig.attribute)
             {