修复诸多bug

Assets/Prefabs/UI/3D/GCZL.prefab

@@ -1354,7 +1354,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 139.1, y: -28.6}
+  m_AnchoredPosition: {x: 140, y: -27.2}
   m_SizeDelta: {x: 119.8855, y: 34.2055}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4452380873205082318
@@ -1435,9 +1435,9 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: -4.2, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &4452380873706791393
 CanvasRenderer:
@@ -1524,7 +1524,7 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}

Assets/Prefabs/UI/SWFZ/ZMJK.prefab

@@ -112,7 +112,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 15}
-  m_SizeDelta: {x: 12, y: 24}
+  m_SizeDelta: {x: 12, y: 52.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4335404858836944740
 CanvasRenderer:
@@ -2993,7 +2993,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 15}
-  m_SizeDelta: {x: 12, y: 24}
+  m_SizeDelta: {x: 12, y: 52.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7151153334670200800
 CanvasRenderer:
@@ -4572,7 +4572,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: -15}
-  m_SizeDelta: {x: 36, y: 24}
+  m_SizeDelta: {x: 36, y: 48.6}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5065957785521474050
 CanvasRenderer:
@@ -7038,7 +7038,7 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {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}
@@ -10187,7 +10187,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 68, y: -15.5}
-  m_SizeDelta: {x: 56, y: 19}
+  m_SizeDelta: {x: 56, y: 52.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1387609370884774173
 CanvasRenderer:
@@ -11360,7 +11360,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &4461453780397662635
 RectTransform:
   m_ObjectHideFlags: 0
@@ -13757,9 +13757,9 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: -17, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &1044064058101103901
 CanvasRenderer:
@@ -14240,7 +14240,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: -15}
-  m_SizeDelta: {x: 36, y: 24}
+  m_SizeDelta: {x: 36, y: 48.6}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &185462439993631784
 CanvasRenderer:
@@ -14396,9 +14396,9 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: -3, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &2904706457155480049
 CanvasRenderer:
@@ -14713,7 +14713,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: -15}
-  m_SizeDelta: {x: 36, y: 24}
+  m_SizeDelta: {x: 36, y: 48.6}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &215212367886205271
 CanvasRenderer:
@@ -16994,7 +16994,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: -15}
-  m_SizeDelta: {x: 36, y: 24}
+  m_SizeDelta: {x: 36, y: 48.6}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6811742665992888834
 CanvasRenderer:
@@ -18746,8 +18746,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: 114, y: -27}
-  m_SizeDelta: {x: 108, y: 24}
+  m_AnchoredPosition: {x: 123.7572, y: -27}
+  m_SizeDelta: {x: 127.5145, y: 29.76}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7415341264967988894
 CanvasRenderer:
@@ -18784,7 +18784,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
-    m_Alignment: 0
+    m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
@@ -19849,7 +19849,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 15}
-  m_SizeDelta: {x: 12, y: 24}
+  m_SizeDelta: {x: 12, y: 52.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4558088893120689274
 CanvasRenderer:
@@ -20071,7 +20071,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 15}
-  m_SizeDelta: {x: 12, y: 24}
+  m_SizeDelta: {x: 12, y: 52.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5844178368890064945
 CanvasRenderer:
@@ -20237,7 +20237,7 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 0.81333333}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}

Assets/Prefabs/UI/Thing1Title.prefab

@@ -215,12 +215,12 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Padding:
-    m_Left: 9
+    m_Left: 17
     m_Right: 0
     m_Top: 2
     m_Bottom: 0
   m_ChildAlignment: 0
-  m_Spacing: 22
+  m_Spacing: 17.1
   m_ChildForceExpandWidth: 0
   m_ChildForceExpandHeight: 0
   m_ChildControlWidth: 0
@@ -301,7 +301,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
-    m_Alignment: 4
+    m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
@@ -381,7 +381,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
-    m_Alignment: 4
+    m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0

Assets/Prefabs/UI/Thing2.prefab

@@ -69,7 +69,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
     m_FontSize: 14
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
@@ -149,7 +149,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
     m_FontSize: 14
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
@@ -376,7 +376,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
     m_FontSize: 14
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40

Assets/Prefabs/UI/XHYZT/GCYW.prefab

@@ -38321,8 +38321,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: 145.6, y: -22.400024}
-  m_SizeDelta: {x: 160, y: 30}
+  m_AnchoredPosition: {x: 142.3, y: -21.3}
+  m_SizeDelta: {x: 160, y: 35.8}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5142719510346395846
 CanvasRenderer:
@@ -38359,7 +38359,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 40
-    m_Alignment: 0
+    m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0

Assets/Prefabs/UI/XHYZT/RKZY.prefab

@@ -1254,7 +1254,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: -20, y: -8}
+  m_SizeDelta: {x: -20, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &920656450782320158
 CanvasRenderer:
@@ -4389,7 +4389,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: -20, y: -8}
+  m_SizeDelta: {x: -20, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8150345461326426105
 CanvasRenderer:
@@ -6529,8 +6529,8 @@ RectTransform:
   - {fileID: 9093061654171932179}
   - {fileID: 9093061653790504663}
   - {fileID: 9093061654966100337}
-  - {fileID: 9093061653291335120}
   - {fileID: 9093061653547392614}
+  - {fileID: 9093061653291335120}
   m_Father: {fileID: 9093061653547399692}
   m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -8106,7 +8106,7 @@ RectTransform:
   - {fileID: 9093061654250234089}
   - {fileID: 9093061654520656945}
   m_Father: {fileID: 9093061653288701945}
-  m_RootOrder: 19
+  m_RootOrder: 20
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -10783,8 +10783,8 @@ RectTransform:
   - {fileID: 9093061654473964874}
   - {fileID: 9093061654439686107}
   - {fileID: 9093061654508591210}
-  - {fileID: 9093061654094578440}
   - {fileID: 9093061655173667199}
+  - {fileID: 9093061654094578440}
   m_Father: {fileID: 9093061653547399692}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -12674,7 +12674,7 @@ RectTransform:
   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_AnchoredPosition: {x: 61, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &9093061653439058966
@@ -15011,7 +15011,7 @@ RectTransform:
   m_Children:
   - {fileID: 9093061654502916386}
   m_Father: {fileID: 9093061653288701945}
-  m_RootOrder: 20
+  m_RootOrder: 19
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -15322,7 +15322,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 149.38889, y: -24.199997}
-  m_SizeDelta: {x: 174.7778, y: 40}
+  m_SizeDelta: {x: 174.7778, y: 48.2}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061653562347671
 CanvasRenderer:
@@ -16780,8 +16780,8 @@ RectTransform:
   - {fileID: 9093061653470972603}
   - {fileID: 9093061654687722099}
   - {fileID: 9093061653243042817}
-  - {fileID: 9093061653995338931}
   - {fileID: 9093061654484229631}
+  - {fileID: 9093061653995338931}
   m_Father: {fileID: 9093061654363556753}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -22280,8 +22280,8 @@ RectTransform:
   - {fileID: 9093061654072247880}
   - {fileID: 9093061654206497080}
   - {fileID: 9093061653641891623}
-  - {fileID: 9093061654922658960}
   - {fileID: 9093061654333608751}
+  - {fileID: 9093061654922658960}
   m_Father: {fileID: 9093061654363556753}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -25024,7 +25024,7 @@ RectTransform:
   - {fileID: 9093061654420124646}
   - {fileID: 9093061654101750909}
   m_Father: {fileID: 9093061653632941889}
-  m_RootOrder: 26
+  m_RootOrder: 27
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -26678,7 +26678,7 @@ RectTransform:
   - {fileID: 9093061654638090311}
   - {fileID: 9093061653249892629}
   m_Father: {fileID: 9093061653428426712}
-  m_RootOrder: 18
+  m_RootOrder: 19
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -27371,7 +27371,7 @@ RectTransform:
   - {fileID: 9093061654616157509}
   - {fileID: 9093061654729128352}
   m_Father: {fileID: 9093061655308519380}
-  m_RootOrder: 26
+  m_RootOrder: 27
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -31216,7 +31216,7 @@ RectTransform:
   m_Children:
   - {fileID: 9093061653234529556}
   m_Father: {fileID: 9093061653915434462}
-  m_RootOrder: 27
+  m_RootOrder: 26
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -32250,7 +32250,7 @@ RectTransform:
   - {fileID: 9093061653434614468}
   - {fileID: 9093061654382310616}
   m_Father: {fileID: 9093061654506419288}
-  m_RootOrder: 26
+  m_RootOrder: 27
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -33970,7 +33970,7 @@ RectTransform:
   m_Children:
   - {fileID: 9093061653476887218}
   m_Father: {fileID: 9093061653632941889}
-  m_RootOrder: 27
+  m_RootOrder: 26
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -34703,8 +34703,8 @@ RectTransform:
   - {fileID: 9093061654547690391}
   - {fileID: 9093061654503076447}
   - {fileID: 9093061654759647064}
-  - {fileID: 9093061654399081119}
   - {fileID: 9093061655340129781}
+  - {fileID: 9093061654399081119}
   m_Father: {fileID: 9093061654363556753}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -35974,7 +35974,7 @@ RectTransform:
   m_Children:
   - {fileID: 9093061653333981062}
   m_Father: {fileID: 9093061655308519380}
-  m_RootOrder: 27
+  m_RootOrder: 26
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -38320,7 +38320,7 @@ RectTransform:
   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_AnchoredPosition: {x: 53, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061654650731069
@@ -43280,7 +43280,7 @@ RectTransform:
   - {fileID: 9093061654642475065}
   - {fileID: 9093061655299507566}
   m_Father: {fileID: 9093061653915434462}
-  m_RootOrder: 26
+  m_RootOrder: 27
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -49740,7 +49740,7 @@ RectTransform:
   m_Children:
   - {fileID: 9093061655282686621}
   m_Father: {fileID: 9093061653428426712}
-  m_RootOrder: 19
+  m_RootOrder: 18
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -52974,8 +52974,8 @@ RectTransform:
   - {fileID: 9093061654029534039}
   - {fileID: 9093061654993506973}
   - {fileID: 9093061655336903256}
-  - {fileID: 9093061654135754304}
   - {fileID: 9093061654518704622}
+  - {fileID: 9093061654135754304}
   m_Father: {fileID: 9093061654363556753}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -54151,7 +54151,7 @@ RectTransform:
   m_Children:
   - {fileID: 9093061654544985612}
   m_Father: {fileID: 9093061654506419288}
-  m_RootOrder: 27
+  m_RootOrder: 26
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}

Assets/Prefabs/UI/XHYZT/SWYJ.prefab

@@ -113,7 +113,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
   m_AnchoredPosition: {x: 44.898926, y: -12.1}
-  m_SizeDelta: {x: 323.2, y: 1}
+  m_SizeDelta: {x: 323.2, y: 1.5}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &1203346247
 CanvasRenderer:
@@ -228,7 +228,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
   m_AnchoredPosition: {x: 44.898926, y: 8.9}
-  m_SizeDelta: {x: 323.2, y: 1}
+  m_SizeDelta: {x: 323.2, y: 1.5}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &1862346266
 CanvasRenderer:
@@ -304,7 +304,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
   m_AnchoredPosition: {x: 44.898926, y: -20.5}
-  m_SizeDelta: {x: 323.2, y: 1}
+  m_SizeDelta: {x: 323.2, y: 1.5}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &1892269557
 CanvasRenderer:
@@ -927,11 +927,11 @@ RectTransform:
   m_Father: {fileID: 457126604481821303}
   m_RootOrder: 1
   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: -200, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 200, y: -130}
   m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 1, y: 0.5}
+  m_Pivot: {x: 0, y: 1}
 --- !u!222 &2022701576237530132
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -1889,7 +1889,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
   m_AnchoredPosition: {x: 2, y: 0}
-  m_SizeDelta: {x: 84, y: 24}
+  m_SizeDelta: {x: 32, y: 19}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &1736026609202306682
 CanvasRenderer:
@@ -1912,7 +1912,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.43137255, g: 0.4392157, b: 0.4745098, a: 1}
+  m_Color: {r: 0.7735849, g: 0.7735849, b: 0.7735849, a: 1}
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1921,7 +1921,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
-    m_FontSize: 18
+    m_FontSize: 14
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 10
@@ -1932,7 +1932,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: axisName
+  m_Text: 2025
 --- !u!1 &571305739176514681
 GameObject:
   m_ObjectHideFlags: 0
@@ -4849,7 +4849,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: -52, y: 0}
+  m_AnchoredPosition: {x: -26, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &151248769427721688
@@ -6055,7 +6055,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
   m_AnchoredPosition: {x: 44.898926, y: -12.8}
-  m_SizeDelta: {x: 323.2, y: 1}
+  m_SizeDelta: {x: 323.2, y: 1.5}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &6256071574260282413
 CanvasRenderer:
@@ -7034,7 +7034,7 @@ RectTransform:
   m_GameObject: {fileID: 2300679869464258242}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 498209178527190446}
@@ -7044,8 +7044,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: 19.649994, y: 101.65}
-  m_SizeDelta: {x: 88, y: 24}
+  m_AnchoredPosition: {x: 19.649994, y: 92.200005}
+  m_SizeDelta: {x: 36, y: 19}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &2215591281921753259
 CanvasRenderer:
@@ -14332,11 +14332,11 @@ RectTransform:
   m_Father: {fileID: 7190523625310373323}
   m_RootOrder: 0
   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: -2, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 2, y: -0}
   m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 1, y: 0.5}
+  m_Pivot: {x: 0, y: 1}
 --- !u!222 &7645527596378063316
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -14372,7 +14372,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
-    m_Alignment: 5
+    m_Alignment: 0
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 1
@@ -15318,7 +15318,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
   m_AnchoredPosition: {x: 44.898926, y: 19.9}
-  m_SizeDelta: {x: 323.2, y: 1}
+  m_SizeDelta: {x: 323.2, y: 1.5}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &5430665887898628991
 CanvasRenderer:
@@ -17792,8 +17792,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: 145.6, y: -22.4}
-  m_SizeDelta: {x: 160, y: 35}
+  m_AnchoredPosition: {x: 140.3, y: -22.6}
+  m_SizeDelta: {x: 157.8, y: 54.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5142719510346395846
 CanvasRenderer:
@@ -17830,7 +17830,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 40
-    m_Alignment: 0
+    m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
@@ -19379,11 +19379,11 @@ RectTransform:
   m_Father: {fileID: 457126604481821303}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 200, y: -130}
   m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 0, y: 1}
 --- !u!222 &1450566454031537692
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -21070,14 +21070,14 @@ MonoBehaviour:
           serializedVersion: 2
           rgba: 0
     m_AxisName:
-      m_Show: 0
-      m_Name: axisName
+      m_Show: 1
+      m_Name: 2025
       m_OnZero: 0
       m_LabelStyle:
         m_Show: 1
         m_Position: 10
         m_AutoOffset: 0
-        m_Offset: {x: -348.35, y: 195.25, z: 0}
+        m_Offset: {x: -348.35, y: 185.8, z: 0}
         m_Rotate: 0
         m_AutoRotate: 0
         m_Distance: 0
@@ -21116,9 +21116,9 @@ MonoBehaviour:
           m_AutoWrap: 0
           m_AutoAlign: 1
           m_Rotate: 0
-          m_AutoColor: 1
-          m_Color: {r: 1, g: 1, b: 1, a: 0}
-          m_FontSize: 0
+          m_AutoColor: 0
+          m_Color: {r: 0.7735849, g: 0.7735849, b: 0.7735849, a: 1}
+          m_FontSize: 14
           m_FontStyle: 0
           m_LineSpacing: 1
           m_Alignment: 4
@@ -25569,7 +25569,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
   m_AnchoredPosition: {x: 44.898926, y: 3.28}
-  m_SizeDelta: {x: 323.2, y: 1}
+  m_SizeDelta: {x: 323.2, y: 1.5}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &501453093762515474
 CanvasRenderer:
@@ -26885,11 +26885,11 @@ RectTransform:
   m_Father: {fileID: 3419506745448961951}
   m_RootOrder: 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: 2, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 2, y: -0}
   m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 0, y: 1}
 --- !u!222 &1677288779772173434
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -26925,7 +26925,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
-    m_Alignment: 4
+    m_Alignment: 0
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 1

Assets/Prefabs/UI/XHYZT/XHGK.prefab

@@ -2736,8 +2736,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: -69.94999, y: 436.63}
-  m_SizeDelta: {x: 139.9, y: 30.882}
+  m_AnchoredPosition: {x: -62.5, y: 436.3}
+  m_SizeDelta: {x: 139.9, y: 36.57}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6862619223851276872
 CanvasRenderer:
@@ -2769,12 +2769,12 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
-    m_FontSize: 22
+    m_FontSize: 20
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 1
-    m_MaxSize: 40
-    m_Alignment: 0
+    m_MaxSize: 300
+    m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
@@ -3201,7 +3201,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 6219495180201940521}
   m_Direction: 2
   m_Value: 0
-  m_Size: 1
+  m_Size: 0.99999785
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -3580,7 +3580,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0.000015258789, y: -386.48035}
+  m_AnchoredPosition: {x: 0.000015258789, y: -386.47995}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &6219495181246091879

Assets/Scripts/UI/UIView/3D/GCZLLayer.cs

@@ -282,7 +282,7 @@ public class GCZLLayer : MonoBehaviour
         {
             for (int i = 0; i < GlobalData.layerUnitDatas.Count; i++)
             {
-                if (GlobalData.layerUnitDatas[i].type == (LayerUnitType)currentClass)
+                if (GlobalData.layerUnitDatas[i].type == (LayerUnitType)zTLayer.layerDatas[currentClass].layerID)
                 {
                     GameObject obj = Instantiate(informationPrefab);
                     string realName = GlobalData.layerUnitDatas[i].name;

Assets/Scripts/UI/UIView/GCJK/GCJKLayer.cs

@@ -677,6 +677,7 @@ public class GCJKLayer : YZTRootLayer
             {
                 if (swTargets[i].name.Equals("BY_ZhaQian"))
                 {
+
                     swSY.SetData(swUpName,swUp,swTargets[i].transform);
                 }
                 if (swTargets[i].name.Equals("BY_ZhaHou"))

Assets/Scripts/UI/UIView/SWYJ/SWYJLayer.cs

@@ -319,8 +319,12 @@ public class SWYJLayer : YZTRootLayer
 
 
     //水位图标
-    public void CreateOrRefreshShuiWeiIcon()
+    public async void CreateOrRefreshShuiWeiIcon()
     {
+        await new UnityAsync.WaitUntil(() =>
+        {
+            return GlobalData.swDatas.Count > 10;
+        });
         if (currentDataType == 0)
         {
             string swUp = null;
@@ -616,11 +620,30 @@ public class SWYJLayer : YZTRootLayer
             tempData.data.Reverse();
             XAxis tempXaxis = shuiWeiBianHua.GetChartComponent<XAxis>();
             tempXaxis.data.Clear();
+            List<string> years = new List<string>();
             for (int i = 0; i < tempData.data.Count; i++)
             {
-                tempXaxis.AddData(tempData.data[i].time);
+                // 获取年份
+                string year = tempData.data[i].time.Substring(0, 4);
+
+                // 如果年份不在列表中，添加
+                if (!years.Contains(year))
+                {
+                    years.Add(year);
+                }
+                string dateWithoutYear = tempData.data[i].time.Substring(5);  // 从第五位开始提取，去掉年份部分
+                tempXaxis.AddData(dateWithoutYear);  // 添加到 X 轴数据中
             }
 
+            if (years.Count > 0) {
+                string yearsRange = years[0];
+                if(years.Count > 1)
+                {
+                    yearsRange += "-" + years[1];
+                }
+                tempXaxis.axisName.name = yearsRange;
+            }
+            
             var tempSeries = shuiWeiBianHua.series;
             tempSeries[1].serieName = "水位(m)";
             SerieData[] tempDatas = new SerieData[tempData.data.Count];