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.20774812
+    - _Alpha: 0.22028178
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: 0.20282054
+    - _MainTexOffsetU: 0.18795288
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingV: 1

Assets/Res/UI/BoxPanel/GachaPanel.prefab

@@ -352,7 +352,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: 750, y: 1624}
+  m_SizeDelta: {x: 750, y: 1334}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!225 &855192496587546533
 CanvasGroup:
@@ -3398,7 +3398,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 3529386165245114290, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 82.91
+      value: 95
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_Pivot.x
@@ -3498,15 +3498,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 49
+      value: 48
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 58.41
+      value: 71
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -21.027552
+      value: -19.35
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchorMax.y
@@ -3518,11 +3518,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 13.5
+      value: 22.5
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -22.7
+      value: -19.35
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -3549,7 +3549,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 3529386165245114290, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 82.91
+      value: 95
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_Pivot.x
@@ -3649,15 +3649,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 49
+      value: 48
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 58.41
+      value: 71
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -21.027552
+      value: -19.35
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchorMax.y
@@ -3669,11 +3669,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 13.5
+      value: 22.5
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -22.7
+      value: -19.35
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -3700,7 +3700,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 3529386165245114290, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 82.91
+      value: 95
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_Pivot.x
@@ -3800,15 +3800,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 49
+      value: 48
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 58.41
+      value: 71
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -21.027552
+      value: -19.35
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchorMax.y
@@ -3820,11 +3820,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 13.5
+      value: 22.5
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -22.7
+      value: -19.35
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -3851,7 +3851,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 3529386165245114290, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 82.91
+      value: 95
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_Pivot.x
@@ -3951,15 +3951,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 49
+      value: 48
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 58.41
+      value: 71
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -21.027552
+      value: -19.35
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchorMax.y
@@ -3971,11 +3971,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 13.5
+      value: 22.5
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -22.7
+      value: -19.35
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -4002,7 +4002,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 3529386165245114290, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 82.91
+      value: 95
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_Pivot.x
@@ -4102,15 +4102,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 49
+      value: 48
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 58.41
+      value: 71
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -21.027552
+      value: -19.35
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchorMax.y
@@ -4122,11 +4122,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 13.5
+      value: 22.5
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -22.7
+      value: -19.35
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -4153,7 +4153,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 3529386165245114290, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 82.91
+      value: 95
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_Pivot.x
@@ -4253,15 +4253,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 49
+      value: 48
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 58.41
+      value: 71
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -21.027552
+      value: -19.35
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchorMax.y
@@ -4273,11 +4273,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 13.5
+      value: 22.5
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -22.7
+      value: -19.35
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -4304,7 +4304,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 3529386165245114290, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 82.91
+      value: 95
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_Pivot.x
@@ -4404,15 +4404,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 49
+      value: 48
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 58.41
+      value: 71
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -21.027552
+      value: -19.35
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchorMax.y
@@ -4424,11 +4424,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 13.5
+      value: 22.5
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -22.7
+      value: -19.35
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -4455,7 +4455,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 3529386165245114290, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 82.91
+      value: 95
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_Pivot.x
@@ -4555,15 +4555,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 49
+      value: 48
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 58.41
+      value: 71
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -21.027552
+      value: -19.35
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchorMax.y
@@ -4575,11 +4575,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 13.5
+      value: 22.5
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -22.7
+      value: -19.35
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -4606,7 +4606,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 3529386165245114290, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 82.91
+      value: 95
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_Pivot.x
@@ -4706,15 +4706,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 49
+      value: 48
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 58.41
+      value: 71
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -21.027552
+      value: -19.35
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchorMax.y
@@ -4726,11 +4726,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 13.5
+      value: 22.5
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -22.7
+      value: -19.35
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -4757,7 +4757,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 3529386165245114290, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 82.91
+      value: 95
       objectReference: {fileID: 0}
     - target: {fileID: 3555197382594190730, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_Pivot.x
@@ -4857,15 +4857,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 49
+      value: 48
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 58.41
+      value: 71
       objectReference: {fileID: 0}
     - target: {fileID: 7166492067245868842, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -21.027552
+      value: -19.35
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchorMax.y
@@ -4877,11 +4877,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 13.5
+      value: 22.5
       objectReference: {fileID: 0}
     - target: {fileID: 7957917780475828645, guid: 3663406c61e79e84291f2a7eeb96d796, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -22.7
+      value: -19.35
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []

Assets/Res/UI/HeroInformainPanel/HeroInformationPanel.prefab

@@ -273,11 +273,11 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1772753141541214691}
-  m_Father: {fileID: 2859865283014944201}
+  m_Father: {fileID: 8034867944299354957}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 43.04831, y: -946.8596}
+  m_AnchoredPosition: {x: -351.30603, y: 81.694824}
   m_SizeDelta: {x: 563, y: 63.071}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &3703191467005982840
@@ -405,9 +405,9 @@ RectTransform:
   - {fileID: 7919928200524859861}
   m_Father: {fileID: 3296466721338208283}
   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: 561.5101, y: -23}
   m_SizeDelta: {x: 36, y: 46}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &577437548784921467
@@ -630,9 +630,9 @@ RectTransform:
   - {fileID: 3175515234904838256}
   m_Father: {fileID: 3296466721338208283}
   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: 18, y: -23}
   m_SizeDelta: {x: 36, y: 46}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &404717448016885080
@@ -959,9 +959,9 @@ RectTransform:
   - {fileID: 6349527074189271333}
   m_Father: {fileID: 3296466721338208283}
   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: 319.95, y: -23}
   m_SizeDelta: {x: 36, y: 46}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2045175675939122853
@@ -1636,7 +1636,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 0, y: -281.5}
-  m_SizeDelta: {x: 0, y: 75.23102}
+  m_SizeDelta: {x: 579.5101, y: 75.23102}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7270342452893677775
 CanvasRenderer:
@@ -1720,9 +1720,9 @@ RectTransform:
   - {fileID: 1342635920967882127}
   m_Father: {fileID: 3296466721338208283}
   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: 440.73004, y: -23}
   m_SizeDelta: {x: 36, y: 46}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3935559908781618714
@@ -2154,9 +2154,9 @@ RectTransform:
   - {fileID: 4783036684135195832}
   m_Father: {fileID: 3296466721338208283}
   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: 380.34003, y: -23}
   m_SizeDelta: {x: 36, y: 46}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1103223725134899825
@@ -3039,7 +3039,6 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 3106622106931745522}
   - {fileID: 2663430401061570260}
   - {fileID: 5624694180497915839}
   - {fileID: 7058732367293901820}
@@ -3188,9 +3187,9 @@ RectTransform:
   - {fileID: 8003730315462188263}
   m_Father: {fileID: 3296466721338208283}
   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: 138.78, y: -23}
   m_SizeDelta: {x: 36, y: 46}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1434731699087089794
@@ -3387,6 +3386,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2510253786452685598}
+  - {fileID: 3106622106931745522}
   m_Father: {fileID: 2859865283014944201}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
@@ -4122,9 +4122,9 @@ RectTransform:
   - {fileID: 8747249840944031461}
   m_Father: {fileID: 3296466721338208283}
   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: 199.17, y: -23}
   m_SizeDelta: {x: 36, y: 46}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8487238967615647820
@@ -4212,9 +4212,9 @@ RectTransform:
   - {fileID: 4272035499011951705}
   m_Father: {fileID: 3296466721338208283}
   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: 78.39, y: -23}
   m_SizeDelta: {x: 36, y: 46}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3120351680176860633
@@ -4418,9 +4418,9 @@ RectTransform:
   - {fileID: 2071376250323884100}
   m_Father: {fileID: 3296466721338208283}
   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: 501.12006, y: -23}
   m_SizeDelta: {x: 36, y: 46}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7125985836412029960
@@ -4943,9 +4943,9 @@ RectTransform:
   - {fileID: 2351084085639383589}
   m_Father: {fileID: 3296466721338208283}
   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: 259.56, y: -23}
   m_SizeDelta: {x: 36, y: 46}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2379505165480288718
@@ -5353,7 +5353,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: 1200, y: 2670}
+  m_SizeDelta: {x: 750, y: 1334}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4159330424245520485
 MonoBehaviour:

Assets/Res/UI/ItemDetailsPanel/GongFaDetailsPanel.prefab

@@ -122,10 +122,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 6694772361877173011}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: 0, y: 240}
-  m_SizeDelta: {x: 0, y: 60.1647}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -507}
+  m_SizeDelta: {x: 750, y: 60.164673}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &8477265740368799667
 CanvasRenderer:
@@ -777,7 +777,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: 750, y: 1624}
+  m_SizeDelta: {x: 750, y: 1334}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &3038665444609316863
 MonoBehaviour:
@@ -3342,7 +3342,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 9076459003287357443, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 99.084
+      value: 420.226
       objectReference: {fileID: 0}
     - target: {fileID: 9076459003287357443, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
       propertyPath: m_SizeDelta.y
@@ -3350,7 +3350,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 9076459003287357443, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 70.107
+      value: 230.678
       objectReference: {fileID: 0}
     - target: {fileID: 9076459003287357443, guid: 165554e4de54e90439a54cfc054e1ca4, type: 3}
       propertyPath: m_AnchoredPosition.y

Assets/Res/UI/ItemDetailsPanel/ItemDetailsPanel.prefab

@@ -378,10 +378,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 8, y: 369}
-  m_SizeDelta: {x: 399.8914, y: 69.9819}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 8, y: -443}
+  m_SizeDelta: {x: 399.8914, y: 69.98193}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &7485414286195926253
 CanvasRenderer:

Assets/Res/UI/QiankundaiPanel/QiankundaiInfoPanel.prefab

@@ -1561,10 +1561,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 364}
-  m_SizeDelta: {x: 399.8914, y: 69.9819}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -448}
+  m_SizeDelta: {x: 399.8914, y: 69.98193}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &2597693103234350293
 CanvasRenderer:

Assets/Res/UI/QiankundaiPanel/QiankundaiPanel.prefab

@@ -945,10 +945,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 364}
-  m_SizeDelta: {x: 399.8914, y: 69.9819}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -448}
+  m_SizeDelta: {x: 399.8914, y: 69.98193}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &7485414286195926253
 CanvasRenderer:

Assets/Res/UI/SkillSelectPanel/GongFaUpgradePanel.prefab

@@ -947,7 +947,6 @@ RectTransform:
   - {fileID: 1062516556747891371}
   - {fileID: 5964692562241983256}
   - {fileID: 1219834969852229682}
-  - {fileID: 918016307754855288}
   - {fileID: 2507585154746067127}
   - {fileID: 1896441137542441893}
   m_Father: {fileID: 0}
@@ -2956,11 +2955,11 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 499061870556061026}
-  m_Father: {fileID: 6694772361877173011}
+  m_Father: {fileID: 2507585154746067127}
   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: 268.2, y: -318.1}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 220.95001, y: 51.5}
   m_SizeDelta: {x: 152, y: 44.253418}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &9009643693355444852
@@ -3994,6 +3993,7 @@ RectTransform:
   m_Children:
   - {fileID: 3289851963449376272}
   - {fileID: 3549792637730888341}
+  - {fileID: 918016307754855288}
   m_Father: {fileID: 6694772361877173011}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}

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

@@ -61,6 +61,12 @@ namespace Fort23.Mono
             TitlePanel.ClosePanel();
             // AppBarPanel.OpenPanel(this);
             await base.GetFocus();
+
+
+            if (PlayerGuideManager.Instance.GuideIsCanDo(4, 1))
+            {
+                PlayerGuideManager.Instance.NextGuide();
+            }
         }
 
         public override CTask LoseFocus()
@@ -86,11 +92,6 @@ namespace Fort23.Mono
 
         public override CTask<bool> AsyncInit(object[] uiData)
         {
-            if (PlayerGuideManager.Instance.GuideIsCanDo(4, 1))
-            {
-                PlayerGuideManager.Instance.NextGuide();
-            }
-
             allUseSkill = PlayerManager.Instance.GongFaControl.allUseSkill.ToArray();
             currenRoadSkilId = PlayerManager.Instance.myHero.TaoismSkillId;
             UpdateSkillWidget();
@@ -102,12 +103,8 @@ namespace Fort23.Mono
 
         public override void AddButtonEvent()
         {
-            
-            Btn_Help.onClick.AddListener(() =>
-            {
-                HelpTipPanel.OpenTipMessagePanel(10788);
-            });
-            
+            Btn_Help.onClick.AddListener(() => { HelpTipPanel.OpenTipMessagePanel(10788); });
+
             Btn_OneKyChange.onClick.AddListener(() =>
             {
                 for (var i = 0; i < allUseSkill.Length; i++)

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

@@ -128,7 +128,7 @@ namespace Fort23.Mono
                         fx_ui_tupo1.gameObject.SetActive(true);
                         fx_ui_tupo1.Play();
                         await TimerComponent.Instance.WaitAsync(500);
-
+                        CustomInit();
                         for (var i = 0; i < JingJieIcons.Count; i++)
                         {
                             if (PlayerManager.Instance.myHero.powerUpConfig.jingjie3 - 1 == i)
@@ -141,6 +141,7 @@ namespace Fort23.Mono
                             }
                         }
 
+
                         await TimerComponent.Instance.WaitAsync(500);
 
                         fx_ui_tupo1.gameObject.SetActive(false);
@@ -153,7 +154,7 @@ namespace Fort23.Mono
                         HeroBreakthroughSuccessPanel heroBreakthroughSuccessPanel =
                             await HeroBreakthroughSuccessPanel.OpenPanel(1, heroAttributData);
                         await heroBreakthroughSuccessPanel.UIClosed();
-                        CustomInit();
+
 
                         AudioManager.Instance.PlayAudio("ui_shengji.wav");
                     }

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

@@ -168,6 +168,7 @@ namespace Fort23.Mono
             {
                 if (placesItemPlacesWidget.placesConfig.ID == smallPlacesConfig.PlacesId)
                 {
+                    Rect_BiaoJi.SetParent(placesItemPlacesWidget.transform);
                     // Rect_BiaoJi.anchoredPosition = transform.worldToLocalMatrix * placesItemPlacesWidget.Pos.position;
                     Rect_BiaoJi.position = placesItemPlacesWidget.Pos.position;
                 }
@@ -186,6 +187,7 @@ namespace Fort23.Mono
             placesItem = null;
             _bigMapItem?.Dispose();
             _bigMapItem = null;
+            Rect_BiaoJi.SetParent(transform);
             await base.Close();
         }
     }

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

@@ -31,6 +31,8 @@ namespace Fort23.Mono
             if (data.ItemInfo.itemID == _itemConfig.ID)
             {
                 Text_Count.text = PlayerManager.Instance.BagController.GetItemCount(_itemConfig.ID).ToStringEx();
+                LayoutRebuilder.ForceRebuildLayoutImmediate(Text_Count.GetComponent<RectTransform>());
+                LayoutRebuilder.ForceRebuildLayoutImmediate(transform.GetComponent<RectTransform>());
             }
         }