瀏覽代碼

场景大美化

wartheking2024 2 周之前
父節點
當前提交
ba23cd16eb

+ 12 - 0
Assets/Art/Textrue/Buildings/FenQu3.png.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 9 - 7
Assets/Prefabs/UI/3D/GCZL.prefab

@@ -1354,8 +1354,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: 140, y: -27.2}
-  m_SizeDelta: {x: 119.8855, y: 34.2055}
+  m_AnchoredPosition: {x: 140, y: -24}
+  m_SizeDelta: {x: 160, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4452380873205082318
 CanvasRenderer:
@@ -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: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: -4.2, 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: 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}
@@ -1960,6 +1960,7 @@ Canvas:
   m_OverrideSorting: 0
   m_OverridePixelPerfect: 1
   m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
   m_AdditionalShaderChannelsFlag: 0
   m_SortingLayerID: 0
   m_SortingOrder: 0
@@ -2618,6 +2619,7 @@ MonoBehaviour:
   - {fileID: 2800000, guid: 5e68cfd1c6602934bb238a5c941d9a6a, type: 3}
   - {fileID: 2800000, guid: 7c6feb5e1ee862d499276d1dffea0ea0, type: 3}
   - {fileID: 2800000, guid: 8bf2406dfeaab2b4b86e076f2e50a709, type: 3}
+  - {fileID: 2800000, guid: 811b11394a87a5949b6eb77427e92fbd, type: 3}
   currentObj: {fileID: 0}
 --- !u!1 &4452380874908355294
 GameObject:
@@ -5092,8 +5094,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: 236.50156, y: -29.371002}
-  m_SizeDelta: {x: 435.2031, y: 58.7377}
+  m_AnchoredPosition: {x: 219.87, y: -29.371002}
+  m_SizeDelta: {x: 401.94, y: 58.7377}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5383266633740080381
 CanvasRenderer:

+ 9 - 7
Assets/Prefabs/UI/SWFZ/SPJK.prefab

@@ -1096,8 +1096,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: 196.91357, y: -21}
-  m_SizeDelta: {x: 273.8271, y: 42.5}
+  m_AnchoredPosition: {x: 140, y: -24}
+  m_SizeDelta: {x: 160, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7401262981848749726
 CanvasRenderer:
@@ -1134,7 +1134,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
-    m_Alignment: 3
+    m_Alignment: 0
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
@@ -1175,7 +1175,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}
@@ -2005,7 +2005,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: 200, y: -28.432}
+  m_AnchoredPosition: {x: 200, y: -28.432007}
   m_SizeDelta: {x: 400, y: 56.8637}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5463180013000179933
@@ -2346,6 +2346,7 @@ Canvas:
   m_OverrideSorting: 0
   m_OverridePixelPerfect: 1
   m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
   m_AdditionalShaderChannelsFlag: 0
   m_SortingLayerID: 0
   m_SortingOrder: 0
@@ -2605,9 +2606,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:
@@ -3836,6 +3837,7 @@ Canvas:
   m_OverrideSorting: 0
   m_OverridePixelPerfect: 1
   m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
   m_AdditionalShaderChannelsFlag: 0
   m_SortingLayerID: 0
   m_SortingOrder: 0

+ 11 - 9
Assets/Prefabs/UI/SWFZ/ZMJK.prefab

@@ -8013,8 +8013,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: 196.91357, y: -21}
-  m_SizeDelta: {x: 273.8271, y: 38.82}
+  m_AnchoredPosition: {x: 140, y: -24}
+  m_SizeDelta: {x: 160, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7401262981848749726
 CanvasRenderer:
@@ -8051,7 +8051,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
-    m_Alignment: 3
+    m_Alignment: 0
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
@@ -8092,7 +8092,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}
@@ -13401,6 +13401,7 @@ Canvas:
   m_OverrideSorting: 0
   m_OverridePixelPerfect: 1
   m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
   m_AdditionalShaderChannelsFlag: 0
   m_SortingLayerID: 0
   m_SortingOrder: 0
@@ -14343,9 +14344,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:
@@ -15295,9 +15296,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:
@@ -21611,6 +21612,7 @@ Canvas:
   m_OverrideSorting: 0
   m_OverridePixelPerfect: 1
   m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
   m_AdditionalShaderChannelsFlag: 0
   m_SortingLayerID: 0
   m_SortingOrder: 0
@@ -22892,7 +22894,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: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}

+ 54 - 88
Assets/Prefabs/UI/XHYZT/FHXS.prefab

@@ -5934,7 +5934,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1348375229416113158}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
@@ -9296,8 +9296,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: 92.2, y: -16}
-  m_SizeDelta: {x: 112, y: 19}
+  m_AnchoredPosition: {x: 140, y: -24}
+  m_SizeDelta: {x: 160, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5375026145841437816
 CanvasRenderer:
@@ -9329,7 +9329,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
-    m_FontSize: 14
+    m_FontSize: 20
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 1
@@ -12702,8 +12702,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: 147.45662, y: -21.987915}
-  m_SizeDelta: {x: 294.9076, y: 43.9768}
+  m_AnchoredPosition: {x: 211.44214, y: -30.6772}
+  m_SizeDelta: {x: 422.8842, y: 61.3552}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4863677209538698609
 CanvasRenderer:
@@ -16957,6 +16957,8 @@ GameObject:
   - component: {fileID: 1370636126443803509}
   - component: {fileID: 5931466998694055733}
   - component: {fileID: 2806720719539494287}
+  - component: {fileID: 8890640846608905790}
+  - component: {fileID: 7618637104815036019}
   m_Layer: 5
   m_Name: ScrollView
   m_TagString: Untagged
@@ -17054,6 +17056,45 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+--- !u!223 &8890640846608905790
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3768085061928920234}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 2
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 1
+  m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!114 &7618637104815036019
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3768085061928920234}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
 --- !u!1 &3769165617047719515
 GameObject:
   m_ObjectHideFlags: 0
@@ -21345,7 +21386,7 @@ GameObject:
   m_Component:
   - component: {fileID: 8464576177194405839}
   - component: {fileID: 4849159851634203635}
-  - component: {fileID: 6578519238318387893}
+  - component: {fileID: 4792484938877930352}
   m_Layer: 5
   m_Name: SunShiGaiKuang
   m_TagString: Untagged
@@ -21389,7 +21430,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4597444339405363036}
   m_CullTransparentMesh: 1
---- !u!114 &6578519238318387893
+--- !u!114 &4792484938877930352
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -21398,19 +21439,19 @@ MonoBehaviour:
   m_GameObject: {fileID: 4597444339405363036}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 141109fb25f0083469e71ce8cb3e75c8, type: 3}
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.03137255, g: 0.28235295, b: 0.45490196, a: 0.8}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
-  m_Type: 0
+  m_Sprite: {fileID: 21300000, guid: 2e07baada5bc940458d45b408039f686, type: 3}
+  m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -21419,81 +21460,6 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  m_DrawShape: 3
-  m_ImageType: 0
-  m_MaterialMode: 0
-  m_StrokeWidth: 0
-  m_OutlineWidth: 1
-  m_OutlineColor: {r: 0.17254902, g: 0.61960787, b: 0.8352941, a: 1}
-  m_FalloffDistance: 0.5
-  m_ConstrainRotation: 1
-  m_ShapeRotation: 0
-  m_FlipHorizontal: 0
-  m_FlipVertical: 0
-  m_Triangle:
-    m_CornerRadius: {x: 0, y: 0, z: 0}
-    m_UniformCornerRadius: 0
-  m_Rectangle:
-    m_CornerRadius: {x: 0, y: 0, z: 0, w: 16}
-    m_UniformCornerRadius: 0
-  m_Circle:
-    m_Radius: 0
-    m_FitRadius: 0
-  m_Pentagon:
-    m_CornerRadius: {x: 0, y: 0, z: 0, w: 0}
-    m_UniformCornerRadius: 0
-    m_TipRadius: 0.001
-    m_TipSize: 1
-  m_Hexagon:
-    m_CornerRadius: {x: 1, y: 1, z: 1, w: 1}
-    m_UniformCornerRadius: 0
-    m_TipSize: {x: 1, y: 1}
-    m_UniformTipSize: 0
-    m_TipRadius: {x: 1, y: 1}
-    m_UniformTipRadius: 0
-  m_NStarPolygon:
-    m_SideCount: 3
-    m_Inset: 2
-    m_CornerRadius: 0
-    m_Offset: {x: 0, y: 0}
-  m_GradientEffect:
-    m_Enabled: 0
-    m_GradientType: 0
-    m_Gradient:
-      serializedVersion: 2
-      key0: {r: 0.03137255, g: 0.28235295, b: 0.45490196, a: 1}
-      key1: {r: 0.05882353, g: 0.4117647, b: 0.65882355, a: 1}
-      key2: {r: 0, g: 0, b: 0, a: 0}
-      key3: {r: 0, g: 0, b: 0, a: 0}
-      key4: {r: 0, g: 0, b: 0, a: 0}
-      key5: {r: 0, g: 0, b: 0, a: 0}
-      key6: {r: 0, g: 0, b: 0, a: 0}
-      key7: {r: 0, g: 0, b: 0, a: 0}
-      ctime0: 0
-      ctime1: 65535
-      ctime2: 0
-      ctime3: 0
-      ctime4: 0
-      ctime5: 0
-      ctime6: 0
-      ctime7: 0
-      atime0: 0
-      atime1: 65535
-      atime2: 0
-      atime3: 0
-      atime4: 0
-      atime5: 0
-      atime6: 0
-      atime7: 0
-      m_Mode: 0
-      m_NumColorKeys: 2
-      m_NumAlphaKeys: 2
-    m_CornerGradientColors:
-    - {r: 0, g: 0, b: 0, a: 0}
-    - {r: 0, g: 0, b: 0, a: 0}
-    - {r: 0, g: 0, b: 0, a: 0}
-    - {r: 0, g: 0, b: 0, a: 0}
-    m_Rotation: 90
 --- !u!1 &4622137160437856456
 GameObject:
   m_ObjectHideFlags: 0
@@ -33755,7 +33721,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: 34.5, y: -12}
+  m_AnchoredPosition: {x: 49.04, y: -12}
   m_SizeDelta: {x: 50.1491, y: 16}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2718283531319180218

+ 52 - 8
Assets/Prefabs/UI/XHYZT/GCJK.prefab

@@ -2660,8 +2660,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: 146.53525, y: -23.37}
-  m_SizeDelta: {x: 173.0705, y: 30}
+  m_AnchoredPosition: {x: 140, y: -24}
+  m_SizeDelta: {x: 160, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6441597925442507820
 CanvasRenderer:
@@ -3811,8 +3811,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: 113.01074, y: -19}
-  m_SizeDelta: {x: 106.0215, y: 30}
+  m_AnchoredPosition: {x: 140, y: -24}
+  m_SizeDelta: {x: 160, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &168816555323040788
 CanvasRenderer:
@@ -5457,6 +5457,7 @@ Canvas:
   m_OverrideSorting: 0
   m_OverridePixelPerfect: 1
   m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
   m_AdditionalShaderChannelsFlag: 0
   m_SortingLayerID: 0
   m_SortingOrder: 0
@@ -5674,8 +5675,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: 200.33, y: -29.366913}
-  m_SizeDelta: {x: 399.34, y: 58.733}
+  m_AnchoredPosition: {x: 199.99992, y: -28.709686}
+  m_SizeDelta: {x: 400, y: 57.4185}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3715666559955877437
 CanvasRenderer:
@@ -8361,8 +8362,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: 147.63501, y: -21}
-  m_SizeDelta: {x: 175.2701, y: 30}
+  m_AnchoredPosition: {x: 140, y: -24}
+  m_SizeDelta: {x: 160, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2098951715089284182
 CanvasRenderer:
@@ -20861,6 +20862,7 @@ Canvas:
   m_OverrideSorting: 0
   m_OverridePixelPerfect: 1
   m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
   m_AdditionalShaderChannelsFlag: 0
   m_SortingLayerID: 0
   m_SortingOrder: 0
@@ -39905,6 +39907,8 @@ GameObject:
   - component: {fileID: 7895701215950852365}
   - component: {fileID: 336256172764381243}
   - component: {fileID: 6310614524454415167}
+  - component: {fileID: 556628716558966082}
+  - component: {fileID: 5367820496895163642}
   m_Layer: 5
   m_Name: ScrollView
   m_TagString: Untagged
@@ -40002,6 +40006,45 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+--- !u!223 &556628716558966082
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7459292048043864864}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 2
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 1
+  m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!114 &5367820496895163642
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7459292048043864864}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
 --- !u!1 &7483440012250354910
 GameObject:
   m_ObjectHideFlags: 0
@@ -42431,6 +42474,7 @@ Canvas:
   m_OverrideSorting: 0
   m_OverridePixelPerfect: 1
   m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
   m_AdditionalShaderChannelsFlag: 3
   m_SortingLayerID: 0
   m_SortingOrder: 0

+ 100 - 134
Assets/Prefabs/UI/XHYZT/GCYW.prefab

@@ -1318,8 +1318,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: 148.00488, y: -19}
-  m_SizeDelta: {x: 176.0099, y: 24}
+  m_AnchoredPosition: {x: 148.00488, y: -24}
+  m_SizeDelta: {x: 174.7, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8415369441815378017
 CanvasRenderer:
@@ -1351,7 +1351,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
-    m_FontSize: 18
+    m_FontSize: 20
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 1
@@ -4576,8 +4576,8 @@ GameObject:
   m_Component:
   - component: {fileID: 3974836821683349703}
   - component: {fileID: 6875934662893550125}
-  - component: {fileID: 3777815803081177903}
   - component: {fileID: 1035629439663650038}
+  - component: {fileID: 4394675531054370166}
   m_Layer: 5
   m_Name: TaskListPanel
   m_TagString: Untagged
@@ -4614,8 +4614,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: 740, y: -202}
-  m_SizeDelta: {x: 400, y: 588}
+  m_AnchoredPosition: {x: 740, y: -194.00003}
+  m_SizeDelta: {x: 400, y: 604}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6875934662893550125
 CanvasRenderer:
@@ -4625,7 +4625,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 606132492758370437}
   m_CullTransparentMesh: 1
---- !u!114 &3777815803081177903
+--- !u!114 &1035629439663650038
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -4634,19 +4634,43 @@ MonoBehaviour:
   m_GameObject: {fileID: 606132492758370437}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 141109fb25f0083469e71ce8cb3e75c8, type: 3}
+  m_Script: {fileID: 11500000, guid: 68d9388f61e17f047966124315e51255, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  taskTpye_allButton: {fileID: 3576212366703430437}
+  taskTpye_dianQiButton: {fileID: 6227507922577432503}
+  taskTpye_zhaZhanButton: {fileID: 825610804393710493}
+  taskTpye_diFangButton: {fileID: 7710401499482457847}
+  taskTpye_jianZhuButton: {fileID: 4512943782696283477}
+  taskTpye_zhuanXiangButton: {fileID: 836466720067733596}
+  inputField: {fileID: 8844670680132909736}
+  taskItemPrefab: {fileID: 3399567085900872481, guid: 83879d5dd735d35419b810abc60d8842, type: 3}
+  itemContent: {fileID: 2985704268949981555}
+  taskItemList: []
+  gcywLayer: {fileID: 0}
+  taskInfoList: []
+--- !u!114 &4394675531054370166
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 606132492758370437}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.03137255, g: 0.28235295, b: 0.45490196, a: 0.8}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 0}
-  m_Type: 0
+  m_Sprite: {fileID: 21300000, guid: 2e07baada5bc940458d45b408039f686, type: 3}
+  m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -4655,105 +4679,6 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  m_DrawShape: 3
-  m_ImageType: 0
-  m_MaterialMode: 0
-  m_StrokeWidth: 0
-  m_OutlineWidth: 1
-  m_OutlineColor: {r: 0.17254902, g: 0.61960787, b: 0.8352941, a: 1}
-  m_FalloffDistance: 0.5
-  m_ConstrainRotation: 1
-  m_ShapeRotation: 0
-  m_FlipHorizontal: 0
-  m_FlipVertical: 0
-  m_Triangle:
-    m_CornerRadius: {x: 0, y: 0, z: 0}
-    m_UniformCornerRadius: 0
-  m_Rectangle:
-    m_CornerRadius: {x: 0, y: 0, z: 0, w: 16}
-    m_UniformCornerRadius: 0
-  m_Circle:
-    m_Radius: 0
-    m_FitRadius: 0
-  m_Pentagon:
-    m_CornerRadius: {x: 0, y: 0, z: 0, w: 0}
-    m_UniformCornerRadius: 0
-    m_TipRadius: 0.001
-    m_TipSize: 1
-  m_Hexagon:
-    m_CornerRadius: {x: 1, y: 1, z: 1, w: 1}
-    m_UniformCornerRadius: 0
-    m_TipSize: {x: 1, y: 1}
-    m_UniformTipSize: 0
-    m_TipRadius: {x: 1, y: 1}
-    m_UniformTipRadius: 0
-  m_NStarPolygon:
-    m_SideCount: 3
-    m_Inset: 2
-    m_CornerRadius: 0
-    m_Offset: {x: 0, y: 0}
-  m_GradientEffect:
-    m_Enabled: 0
-    m_GradientType: 0
-    m_Gradient:
-      serializedVersion: 2
-      key0: {r: 0.03137255, g: 0.28235295, b: 0.45490196, a: 1}
-      key1: {r: 0.05882353, g: 0.4117647, b: 0.65882355, a: 1}
-      key2: {r: 0, g: 0, b: 0, a: 0}
-      key3: {r: 0, g: 0, b: 0, a: 0}
-      key4: {r: 0, g: 0, b: 0, a: 0}
-      key5: {r: 0, g: 0, b: 0, a: 0}
-      key6: {r: 0, g: 0, b: 0, a: 0}
-      key7: {r: 0, g: 0, b: 0, a: 0}
-      ctime0: 0
-      ctime1: 65535
-      ctime2: 0
-      ctime3: 0
-      ctime4: 0
-      ctime5: 0
-      ctime6: 0
-      ctime7: 0
-      atime0: 0
-      atime1: 65535
-      atime2: 0
-      atime3: 0
-      atime4: 0
-      atime5: 0
-      atime6: 0
-      atime7: 0
-      m_Mode: 0
-      m_NumColorKeys: 2
-      m_NumAlphaKeys: 2
-    m_CornerGradientColors:
-    - {r: 0, g: 0, b: 0, a: 0}
-    - {r: 0, g: 0, b: 0, a: 0}
-    - {r: 0, g: 0, b: 0, a: 0}
-    - {r: 0, g: 0, b: 0, a: 0}
-    m_Rotation: 90
---- !u!114 &1035629439663650038
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 606132492758370437}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 68d9388f61e17f047966124315e51255, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  taskTpye_allButton: {fileID: 3576212366703430437}
-  taskTpye_dianQiButton: {fileID: 6227507922577432503}
-  taskTpye_zhaZhanButton: {fileID: 825610804393710493}
-  taskTpye_diFangButton: {fileID: 7710401499482457847}
-  taskTpye_jianZhuButton: {fileID: 4512943782696283477}
-  taskTpye_zhuanXiangButton: {fileID: 836466720067733596}
-  inputField: {fileID: 8844670680132909736}
-  taskItemPrefab: {fileID: 3399567085900872481, guid: 83879d5dd735d35419b810abc60d8842, type: 3}
-  itemContent: {fileID: 2985704268949981555}
-  taskItemList: []
-  gcywLayer: {fileID: 0}
-  taskInfoList: []
 --- !u!1 &614991500497924390
 GameObject:
   m_ObjectHideFlags: 0
@@ -4867,7 +4792,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: 230, y: -80}
+  m_AnchoredPosition: {x: 230, y: -94}
   m_SizeDelta: {x: 60, y: 24}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7422186985985109967
@@ -5058,7 +4983,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: 200, y: -112}
+  m_AnchoredPosition: {x: 200, y: -125.7}
   m_SizeDelta: {x: 360, y: 24}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8390109443813693614
@@ -5210,8 +5135,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: 96, y: -19}
-  m_SizeDelta: {x: 72, y: 24}
+  m_AnchoredPosition: {x: 140, y: -24}
+  m_SizeDelta: {x: 160, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &168816555323040788
 CanvasRenderer:
@@ -5243,7 +5168,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
-    m_FontSize: 18
+    m_FontSize: 20
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 1
@@ -6552,6 +6477,8 @@ GameObject:
   - component: {fileID: 5929286935601914745}
   - component: {fileID: 5819139529113055975}
   - component: {fileID: 656653545955098074}
+  - component: {fileID: 127500266}
+  - component: {fileID: 127500265}
   m_Layer: 5
   m_Name: ScrollView
   m_TagString: Untagged
@@ -6578,8 +6505,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -350.57}
-  m_SizeDelta: {x: 374, y: 453.14}
+  m_AnchoredPosition: {x: 0, y: -368.0903}
+  m_SizeDelta: {x: 374, y: 446.9591}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5929286935601914745
 CanvasRenderer:
@@ -6649,6 +6576,45 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+--- !u!223 &127500266
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 953852942378164469}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 2
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 1
+  m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!114 &127500265
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 953852942378164469}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
 --- !u!1 &966303449545783848
 GameObject:
   m_ObjectHideFlags: 0
@@ -10787,7 +10753,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: 50, y: -80}
+  m_AnchoredPosition: {x: 50, y: -94}
   m_SizeDelta: {x: 60, y: 24}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3542712389411464932
@@ -11062,8 +11028,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: 92.2, y: -16}
-  m_SizeDelta: {x: 112, y: 19}
+  m_AnchoredPosition: {x: 140, y: -24}
+  m_SizeDelta: {x: 160, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6992043855475514471
 CanvasRenderer:
@@ -11095,12 +11061,12 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
-    m_FontSize: 14
+    m_FontSize: 20
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
-    m_Alignment: 3
+    m_Alignment: 0
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
@@ -15965,7 +15931,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: 170, y: -80}
+  m_AnchoredPosition: {x: 170, y: -94}
   m_SizeDelta: {x: 60, y: 24}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3451486952336604915
@@ -24127,8 +24093,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: 139.85208, y: -20.5}
-  m_SizeDelta: {x: 279.702, y: 41}
+  m_AnchoredPosition: {x: 217.76651, y: -30.15}
+  m_SizeDelta: {x: 435.5308, y: 60.3}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8571697690772298855
 CanvasRenderer:
@@ -27044,7 +27010,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: 290, y: -80}
+  m_AnchoredPosition: {x: 290, y: -94}
   m_SizeDelta: {x: 60, y: 24}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3653112825539321594
@@ -27166,7 +27132,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: 350, y: -80}
+  m_AnchoredPosition: {x: 350, y: -94}
   m_SizeDelta: {x: 60, y: 24}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6004017182831154438
@@ -33820,7 +33786,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: 110, y: -80}
+  m_AnchoredPosition: {x: 110, y: -94}
   m_SizeDelta: {x: 60, y: 24}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1274173220520727548
@@ -35561,7 +35527,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: 200, y: -48.300003}
+  m_AnchoredPosition: {x: 200, y: -64.3}
   m_SizeDelta: {x: 360, y: 24}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7331815782834182826
@@ -39316,8 +39282,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: 142.3, y: -21.3}
-  m_SizeDelta: {x: 160, y: 35.8}
+  m_AnchoredPosition: {x: 140, y: -24}
+  m_SizeDelta: {x: 160, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5142719510346395846
 CanvasRenderer:
@@ -39354,7 +39320,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 40
-    m_Alignment: 3
+    m_Alignment: 0
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
@@ -43870,7 +43836,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 2e07baada5bc940458d45b408039f686, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 1fcfa6489a7331c42a89e73a0ca477ff, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -46251,7 +46217,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 8254527217348241512}
   m_Direction: 2
   m_Value: 0
-  m_Size: 0.9328047
+  m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:

+ 153 - 71
Assets/Prefabs/UI/XHYZT/RKZY.prefab

@@ -6142,10 +6142,10 @@ RectTransform:
   m_Father: {fileID: 9093061655153645155}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 57.5, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 57.5, y: -12.607}
+  m_SizeDelta: {x: 115, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061653251029749
 CanvasRenderer:
@@ -10066,10 +10066,10 @@ RectTransform:
   m_Father: {fileID: 9093061653224198802}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 14.5, y: 0}
-  m_SizeDelta: {x: 0, y: 30.5551}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 14.5, y: -15.27755}
+  m_SizeDelta: {x: 29, y: 30.5551}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061653390156198
 CanvasRenderer:
@@ -13091,10 +13091,10 @@ RectTransform:
   m_Father: {fileID: 9093061654972545255}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 61, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 61, y: -11.8005}
+  m_SizeDelta: {x: 90, y: 20}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &9093061653439058966
 CanvasRenderer:
@@ -15200,8 +15200,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: 140.5, y: -23.2}
-  m_SizeDelta: {x: 160, y: 34}
+  m_AnchoredPosition: {x: 140, y: -24}
+  m_SizeDelta: {x: 160, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061653536945249
 CanvasRenderer:
@@ -15238,7 +15238,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
-    m_Alignment: 3
+    m_Alignment: 0
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
@@ -15741,8 +15741,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: 149.38889, y: -24.199997}
-  m_SizeDelta: {x: 174.7778, y: 48.2}
+  m_AnchoredPosition: {x: 140, y: -24}
+  m_SizeDelta: {x: 160, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061653562347671
 CanvasRenderer:
@@ -15779,7 +15779,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
-    m_Alignment: 3
+    m_Alignment: 0
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
@@ -18645,10 +18645,10 @@ RectTransform:
   m_Father: {fileID: 9093061653594052294}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 12, y: 0}
-  m_SizeDelta: {x: 0, y: 30.5551}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 12, y: -15.27755}
+  m_SizeDelta: {x: 24, y: 30.5551}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061653670084901
 CanvasRenderer:
@@ -21348,10 +21348,10 @@ RectTransform:
   m_Father: {fileID: 9093061653762445161}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 71, y: 0}
-  m_SizeDelta: {x: 0, y: 30.5551}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 71, y: -15.27755}
+  m_SizeDelta: {x: 30, y: 30.5551}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061653826032820
 CanvasRenderer:
@@ -23675,8 +23675,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: 140.8, y: -21.9}
-  m_SizeDelta: {x: 160, y: 30.8443}
+  m_AnchoredPosition: {x: 140, y: -24}
+  m_SizeDelta: {x: 160, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061653916628154
 CanvasRenderer:
@@ -23713,7 +23713,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
-    m_Alignment: 3
+    m_Alignment: 0
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
@@ -24303,8 +24303,8 @@ RectTransform:
   m_Father: {fileID: 9093061655007520458}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 180.735, y: 0}
   m_SizeDelta: {x: 361.47, y: 0}
   m_Pivot: {x: 0.5, y: 1}
@@ -26550,10 +26550,10 @@ RectTransform:
   m_Father: {fileID: 9093061655153645155}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 136, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 136, y: -12.607}
+  m_SizeDelta: {x: 42, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061654075877072
 CanvasRenderer:
@@ -26865,10 +26865,10 @@ RectTransform:
   m_Father: {fileID: 9093061655109922683}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 12, y: 0}
-  m_SizeDelta: {x: 0, y: 30.5551}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 12, y: -15.27755}
+  m_SizeDelta: {x: 24, y: 30.5551}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061654081961281
 CanvasRenderer:
@@ -27334,10 +27334,10 @@ RectTransform:
   m_Father: {fileID: 9093061655153645155}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 214.5, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 214.5, y: -12.607}
+  m_SizeDelta: {x: 115, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061654110165202
 CanvasRenderer:
@@ -30797,8 +30797,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: 147.2, y: -22.099976}
-  m_SizeDelta: {x: 169.0626, y: 39.0626}
+  m_AnchoredPosition: {x: 140, y: -24}
+  m_SizeDelta: {x: 160, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061654270601221
 CanvasRenderer:
@@ -30835,7 +30835,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
-    m_Alignment: 3
+    m_Alignment: 0
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
@@ -31679,7 +31679,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, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0.000033218592}
   m_SizeDelta: {x: 0, y: 255.21}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &9093061654337873843
@@ -38726,10 +38726,10 @@ RectTransform:
   m_Father: {fileID: 9093061654972545255}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 53, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 53, y: -11.8005}
+  m_SizeDelta: {x: 16, y: 23.601}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061654650731069
 CanvasRenderer:
@@ -39894,10 +39894,10 @@ RectTransform:
   m_Father: {fileID: 9093061654972545255}
   m_RootOrder: 0
   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_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 0, y: -11.8005}
+  m_SizeDelta: {x: 45, y: 20}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &9093061654711297927
 CanvasRenderer:
@@ -40518,10 +40518,10 @@ RectTransform:
   m_Father: {fileID: 9093061653762445161}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 26.5, y: 0}
-  m_SizeDelta: {x: 0, y: 30.5551}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 26.5, y: -15.27755}
+  m_SizeDelta: {x: 53, y: 30.5551}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061654753997887
 CanvasRenderer:
@@ -47335,6 +47335,8 @@ GameObject:
   - component: {fileID: 9093061655050548737}
   - component: {fileID: 9093061655050548736}
   - component: {fileID: 9093061655050548739}
+  - component: {fileID: 7921295161262098685}
+  - component: {fileID: 2141325959358541812}
   m_Layer: 5
   m_Name: ZYYA
   m_TagString: Untagged
@@ -47432,6 +47434,45 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+--- !u!223 &7921295161262098685
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9093061655050548749}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 2
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 1
+  m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!114 &2141325959358541812
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9093061655050548749}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
 --- !u!1 &9093061655051604403
 GameObject:
   m_ObjectHideFlags: 0
@@ -51680,10 +51721,10 @@ RectTransform:
   m_Father: {fileID: 9093061655109922683}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 34.5, y: 0}
-  m_SizeDelta: {x: 0, y: 30.5551}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 34.5, y: -15.27755}
+  m_SizeDelta: {x: 15, y: 30.5551}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061655252027404
 CanvasRenderer:
@@ -52502,6 +52543,8 @@ GameObject:
   - component: {fileID: 9093061655276192395}
   - component: {fileID: 9093061655276192394}
   - component: {fileID: 9093061655276192405}
+  - component: {fileID: 9092756332116574509}
+  - component: {fileID: 5029661256616294849}
   m_Layer: 5
   m_Name: YJSJ
   m_TagString: Untagged
@@ -52599,6 +52642,45 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+--- !u!223 &9092756332116574509
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9093061655276192407}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 2
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 1
+  m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!114 &5029661256616294849
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9093061655276192407}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
 --- !u!1 &9093061655278786904
 GameObject:
   m_ObjectHideFlags: 0
@@ -52868,10 +52950,10 @@ RectTransform:
   m_Father: {fileID: 9093061653224198802}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 39.5, y: 0}
-  m_SizeDelta: {x: 0, y: 30.5551}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 39.5, y: -15.27755}
+  m_SizeDelta: {x: 15, y: 30.5551}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061655287619152
 CanvasRenderer:
@@ -54275,10 +54357,10 @@ RectTransform:
   m_Father: {fileID: 9093061653594052294}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 34.5, y: 0}
-  m_SizeDelta: {x: 0, y: 30.5551}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 34.5, y: -15.27755}
+  m_SizeDelta: {x: 15, y: 30.5551}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061655308691109
 CanvasRenderer:

+ 110 - 13
Assets/Prefabs/UI/XHYZT/SWYJ.prefab

@@ -2251,6 +2251,7 @@ GameObject:
   m_Component:
   - component: {fileID: 2174387876988070014}
   - component: {fileID: 6187985138365754763}
+  - component: {fileID: 1044114643}
   m_Layer: 5
   m_Name: Content
   m_TagString: Untagged
@@ -2277,7 +2278,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 300}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &6187985138365754763
 MonoBehaviour:
@@ -2305,6 +2306,20 @@ MonoBehaviour:
   m_ChildScaleWidth: 0
   m_ChildScaleHeight: 0
   m_ReverseArrangement: 0
+--- !u!114 &1044114643
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 668214087850316276}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 0
+  m_VerticalFit: 2
 --- !u!1 &672141055542552095
 GameObject:
   m_ObjectHideFlags: 0
@@ -2494,8 +2509,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: 105.93164, y: -19}
-  m_SizeDelta: {x: 91.8632, y: 30}
+  m_AnchoredPosition: {x: 140, y: -24}
+  m_SizeDelta: {x: 160, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &168816555323040788
 CanvasRenderer:
@@ -5235,8 +5250,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: 171.72778, y: -21}
-  m_SizeDelta: {x: 223.4557, y: 36}
+  m_AnchoredPosition: {x: 140, y: -24}
+  m_SizeDelta: {x: 160, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2098951715089284182
 CanvasRenderer:
@@ -5273,7 +5288,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
-    m_Alignment: 3
+    m_Alignment: 0
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
@@ -9235,7 +9250,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 2060663034614906384}
   m_Direction: 2
   m_Value: 0
-  m_Size: 0.81333333
+  m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -18162,6 +18177,8 @@ GameObject:
   - component: {fileID: 2871743470717604703}
   - component: {fileID: 5830915412245595890}
   - component: {fileID: 8235514672889309323}
+  - component: {fileID: 6156663566593416581}
+  - component: {fileID: 9068201807546942501}
   m_Layer: 5
   m_Name: ScrollView
   m_TagString: Untagged
@@ -18259,6 +18276,45 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+--- !u!223 &6156663566593416581
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6477226744509249732}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 2
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 1
+  m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!114 &9068201807546942501
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6477226744509249732}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
 --- !u!1 &6484845954498121462
 GameObject:
   m_ObjectHideFlags: 0
@@ -18294,8 +18350,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: 140.3, y: -22.6}
-  m_SizeDelta: {x: 157.8, y: 54.5}
+  m_AnchoredPosition: {x: 140, y: -24}
+  m_SizeDelta: {x: 160, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5142719510346395846
 CanvasRenderer:
@@ -18327,12 +18383,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: 2
     m_MaxSize: 40
-    m_Alignment: 3
+    m_Alignment: 0
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
@@ -23816,6 +23872,8 @@ GameObject:
   - component: {fileID: 4738803650182183727}
   - component: {fileID: 4570008198066310969}
   - component: {fileID: 2280438513568618982}
+  - component: {fileID: 7167310268258936186}
+  - component: {fileID: 2005190022359830832}
   m_Layer: 5
   m_Name: ScrollView
   m_TagString: Untagged
@@ -23913,6 +23971,45 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+--- !u!223 &7167310268258936186
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7645917729230134993}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 2
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 1
+  m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!114 &2005190022359830832
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7645917729230134993}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
 --- !u!1 &7667463326899416168
 GameObject:
   m_ObjectHideFlags: 0
@@ -28359,8 +28456,8 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 6898621861369777800}
   m_HandleRect: {fileID: 3552794397478782123}
   m_Direction: 2
-  m_Value: 1
-  m_Size: 0.6666667
+  m_Value: 0
+  m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:

+ 306 - 101
Assets/Prefabs/UI/XHYZT/XHDD.prefab

@@ -677,10 +677,10 @@ RectTransform:
   m_Father: {fileID: 4762581910069805521}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 182.715, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 182.715, y: -132.9157}
+  m_SizeDelta: {x: 364.32, y: 58.47}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2624236850288727061
 MonoBehaviour:
@@ -832,6 +832,8 @@ GameObject:
   - component: {fileID: 6661585836445651455}
   - component: {fileID: 6232988646349801852}
   - component: {fileID: 2533938520739341339}
+  - component: {fileID: 950874867}
+  - component: {fileID: 950874866}
   m_Layer: 5
   m_Name: ScrollView
   m_TagString: Untagged
@@ -929,6 +931,45 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+--- !u!223 &950874867
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 426129572177144501}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 2
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 1
+  m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!114 &950874866
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 426129572177144501}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
 --- !u!1 &440179260507593377
 GameObject:
   m_ObjectHideFlags: 0
@@ -1358,7 +1399,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}
@@ -1801,10 +1842,10 @@ RectTransform:
   m_Father: {fileID: 4329735151433843559}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 180.7129, y: 0}
-  m_SizeDelta: {x: 361.4258, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 180.7129, y: -84.2807}
+  m_SizeDelta: {x: 361.4258, y: 79}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &871225604220818552
 CanvasRenderer:
@@ -2332,10 +2373,10 @@ RectTransform:
   m_Father: {fileID: 667936596614700886}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 174.541, y: 0}
-  m_SizeDelta: {x: 347.082, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 174.541, y: -18.5}
+  m_SizeDelta: {x: 347.082, y: 19}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4279722393403395470
 CanvasRenderer:
@@ -2506,9 +2547,9 @@ RectTransform:
   m_Father: {fileID: 3410779449152461703}
   m_RootOrder: 0
   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: 182.16, y: -30.235}
   m_SizeDelta: {x: 364.32, y: 56.47}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &962925233496985382
@@ -2546,10 +2587,10 @@ RectTransform:
   m_Father: {fileID: 4762581910069805521}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 182.715, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 182.715, y: -51.340347}
+  m_SizeDelta: {x: 364.32, y: 102.680695}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4747824165408222779
 MonoBehaviour:
@@ -3638,6 +3679,8 @@ GameObject:
   - component: {fileID: 8680640170147434285}
   - component: {fileID: 7758407301468924939}
   - component: {fileID: 8992220928464553817}
+  - component: {fileID: 3343061979984813956}
+  - component: {fileID: 3418344908533437947}
   m_Layer: 5
   m_Name: ScrollView
   m_TagString: Untagged
@@ -3735,6 +3778,45 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+--- !u!223 &3343061979984813956
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1308845047444228285}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 2
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 1
+  m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!114 &3418344908533437947
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1308845047444228285}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
 --- !u!1 &1328718590409728153
 GameObject:
   m_ObjectHideFlags: 0
@@ -3859,9 +3941,9 @@ RectTransform:
   m_Father: {fileID: 4776836499108970185}
   m_RootOrder: 0
   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: 182.16, y: -21.84035}
   m_SizeDelta: {x: 364.32, y: 43.6807}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1419212282588059565
@@ -4696,9 +4778,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 &3309517626344719090
 CanvasRenderer:
@@ -5006,9 +5088,9 @@ RectTransform:
   m_Father: {fileID: 667936596614700886}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 183.16, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 183.16, y: -40}
   m_SizeDelta: {x: 364.32, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &4008628953698768284
@@ -5616,8 +5698,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: 199.67, y: -31.334717}
-  m_SizeDelta: {x: 399.34, y: 62.6758}
+  m_AnchoredPosition: {x: 199.67, y: -28.058594}
+  m_SizeDelta: {x: 399.34, y: 56.1236}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7670241562848487320
 CanvasRenderer:
@@ -6116,8 +6198,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: 128.7943, y: -21}
-  m_SizeDelta: {x: 137.5886, y: 41.4}
+  m_AnchoredPosition: {x: 140, y: -24}
+  m_SizeDelta: {x: 160, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7401262981848749726
 CanvasRenderer:
@@ -6154,7 +6236,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
-    m_Alignment: 3
+    m_Alignment: 0
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
@@ -6284,8 +6366,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: 214.00354, y: -19}
-  m_SizeDelta: {x: 308.0071, y: 28}
+  m_AnchoredPosition: {x: 140, y: -24}
+  m_SizeDelta: {x: 160, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8616694303627603905
 CanvasRenderer:
@@ -6438,9 +6520,9 @@ RectTransform:
   m_Father: {fileID: 3410779449152461703}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 182.16, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 182.16, y: -58.47}
   m_SizeDelta: {x: 364.32, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2514661037145665424
@@ -6675,8 +6757,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: 199.67, y: -28.09}
-  m_SizeDelta: {x: 399.34, y: 56.1792}
+  m_AnchoredPosition: {x: 218.53102, y: -30.7572}
+  m_SizeDelta: {x: 437.062, y: 61.5137}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8431838725012415116
 CanvasRenderer:
@@ -7069,10 +7151,10 @@ RectTransform:
   m_Father: {fileID: 4762581910069805521}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 182.715, y: 0}
-  m_SizeDelta: {x: 361.4258, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 182.715, y: -277.9607}
+  m_SizeDelta: {x: 361.4258, y: 49}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6422609211599387317
 CanvasRenderer:
@@ -7722,6 +7804,8 @@ GameObject:
   - component: {fileID: 6609789793014176422}
   - component: {fileID: 6943782938512002791}
   - component: {fileID: 8745924685828225102}
+  - component: {fileID: 1907315774}
+  - component: {fileID: 1907315773}
   m_Layer: 5
   m_Name: ScrollView
   m_TagString: Untagged
@@ -7819,6 +7903,45 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+--- !u!223 &1907315774
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3408576771427315834}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 2
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 1
+  m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!114 &1907315773
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3408576771427315834}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
 --- !u!1 &3419663710334262662
 GameObject:
   m_ObjectHideFlags: 0
@@ -7911,6 +8034,8 @@ GameObject:
   - component: {fileID: 1962250104521025767}
   - component: {fileID: 5606171162475210482}
   - component: {fileID: 8081105949888028728}
+  - component: {fileID: 8474354609659519956}
+  - component: {fileID: 4499600112514633264}
   m_Layer: 5
   m_Name: Scroll View
   m_TagString: Untagged
@@ -7935,9 +8060,9 @@ RectTransform:
   m_Father: {fileID: 4329735151433843559}
   m_RootOrder: 4
   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: 182.16, y: -298.1279}
   m_SizeDelta: {x: 364.32, y: 273}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1962250104521025767
@@ -8008,6 +8133,45 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+--- !u!223 &8474354609659519956
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3543204713233590691}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 2
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 1
+  m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!114 &4499600112514633264
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3543204713233590691}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
 --- !u!1 &3598436231191646225
 GameObject:
   m_ObjectHideFlags: 0
@@ -8892,10 +9056,10 @@ RectTransform:
   m_Father: {fileID: 4421565497620080229}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 185.541, y: 0}
-  m_SizeDelta: {x: 347.082, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 185.541, y: -39.5}
+  m_SizeDelta: {x: 347.082, y: 63}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &524149609069120946
 CanvasRenderer:
@@ -8988,8 +9152,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: 155, y: -18.8}
-  m_SizeDelta: {x: 191.3866, y: 35.4407}
+  m_AnchoredPosition: {x: 140, y: -24}
+  m_SizeDelta: {x: 160, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3345702816200914200
 CanvasRenderer:
@@ -9026,7 +9190,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
-    m_Alignment: 3
+    m_Alignment: 0
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
@@ -10635,10 +10799,10 @@ RectTransform:
   m_Father: {fileID: 4762581910069805521}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 182.715, y: 0}
-  m_SizeDelta: {x: 361.4258, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 182.715, y: -207.8057}
+  m_SizeDelta: {x: 361.4258, y: 64.310005}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7275861441988097258
 CanvasRenderer:
@@ -10830,10 +10994,10 @@ RectTransform:
   m_Father: {fileID: 7571207670040887423}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 183.54099, y: 0}
-  m_SizeDelta: {x: 347.082, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 183.54099, y: -45.81}
+  m_SizeDelta: {x: 347.082, y: 19}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &655287851369976739
 CanvasRenderer:
@@ -10924,9 +11088,9 @@ RectTransform:
   m_Father: {fileID: 4329735151433843559}
   m_RootOrder: 0
   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: 182.16, y: -21.84035}
   m_SizeDelta: {x: 364.32, y: 43.6807}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &5366503011162485599
@@ -11043,9 +11207,9 @@ RectTransform:
   m_Father: {fileID: 4329735151433843559}
   m_RootOrder: 2
   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: 180.05, y: -130.6307}
   m_SizeDelta: {x: 360.1, y: 11.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &5631969952418944367
@@ -11083,8 +11247,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: 155, y: -18.8}
-  m_SizeDelta: {x: 191.3866, y: 35.4407}
+  m_AnchoredPosition: {x: 178.03564, y: -24}
+  m_SizeDelta: {x: 236.0714, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6896673291476234469
 CanvasRenderer:
@@ -11121,7 +11285,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
-    m_Alignment: 3
+    m_Alignment: 0
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
@@ -12100,10 +12264,10 @@ RectTransform:
   m_Father: {fileID: 7571207670040887423}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 183.54099, y: 0}
-  m_SizeDelta: {x: 347.082, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 183.54099, y: -18.5}
+  m_SizeDelta: {x: 347.082, y: 19}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7809447945604689710
 CanvasRenderer:
@@ -12515,7 +12679,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 302.4607}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &2847396356453860476
 MonoBehaviour:
@@ -13478,9 +13642,9 @@ RectTransform:
   m_Father: {fileID: 4762581910069805521}
   m_RootOrder: 4
   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: 182.715, y: -246.7107}
   m_SizeDelta: {x: 360.1, y: 11.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &7372571721441605601
@@ -14142,9 +14306,9 @@ RectTransform:
   m_Father: {fileID: 4329735151433843559}
   m_RootOrder: 3
   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: 180.715, y: -149.0043}
   m_SizeDelta: {x: 361.43, y: 23.0472}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7882507622470272683
@@ -14569,8 +14733,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: -21}
-  m_SizeDelta: {x: 108, y: 28}
+  m_AnchoredPosition: {x: 140, y: -24}
+  m_SizeDelta: {x: 160, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4405607790698594673
 CanvasRenderer:
@@ -14873,9 +15037,9 @@ RectTransform:
   m_Father: {fileID: 4762581910069805521}
   m_RootOrder: 2
   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: 182.715, y: -168.9007}
   m_SizeDelta: {x: 360.1, y: 11.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &8183880101979204737
@@ -15070,9 +15234,9 @@ RectTransform:
   m_Father: {fileID: 667936596614700886}
   m_RootOrder: 1
   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: 51, y: -34}
   m_SizeDelta: {x: 100, y: 12}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &8306967686717289533
@@ -15269,10 +15433,10 @@ RectTransform:
   m_Father: {fileID: 6702307410008714585}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 183.541, y: 0}
-  m_SizeDelta: {x: 347.082, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 183.541, y: -29.5}
+  m_SizeDelta: {x: 347.082, y: 41}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7981821390692726905
 CanvasRenderer:
@@ -15442,10 +15606,10 @@ RectTransform:
   m_Father: {fileID: 4776836499108970185}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 180.7129, y: 0}
-  m_SizeDelta: {x: 361.4258, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 180.7129, y: -73.180695}
+  m_SizeDelta: {x: 361.4258, y: 59}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &591826212065115921
 CanvasRenderer:
@@ -16260,6 +16424,8 @@ GameObject:
   - component: {fileID: 4184167370829834559}
   - component: {fileID: 8543526647684966826}
   - component: {fileID: 5137147546865686526}
+  - component: {fileID: 1669428720}
+  - component: {fileID: 1669428719}
   m_Layer: 5
   m_Name: ScrollView
   m_TagString: Untagged
@@ -16357,6 +16523,45 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+--- !u!223 &1669428720
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8930187473026113356}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 2
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 1
+  m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!114 &1669428719
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8930187473026113356}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
 --- !u!1 &8991153270987905877
 GameObject:
   m_ObjectHideFlags: 0
@@ -16469,8 +16674,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: 199.67, y: -31.334717}
-  m_SizeDelta: {x: 399.34, y: 62.6758}
+  m_AnchoredPosition: {x: 199.67, y: -27.46}
+  m_SizeDelta: {x: 399.34, y: 54.9264}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &860832618559021354
 CanvasRenderer:
@@ -16643,7 +16848,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: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}

+ 31 - 31
Assets/Prefabs/UI/XHYZT/XHGK.prefab

@@ -394,7 +394,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7690069329040521624}
-  m_RootOrder: 6
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1891,8 +1891,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: 196.03583, y: -27.992432}
-  m_SizeDelta: {x: 392.07, y: 55.9933}
+  m_AnchoredPosition: {x: 202.03, y: -27.711517}
+  m_SizeDelta: {x: 404.07, y: 55.4313}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7811789556171312196
 CanvasRenderer:
@@ -3134,10 +3134,10 @@ RectTransform:
   m_Father: {fileID: 6219495180967607244}
   m_RootOrder: 1
   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: -62.5, y: 436.3}
-  m_SizeDelta: {x: 139.9, y: 36.57}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 140, y: -24}
+  m_SizeDelta: {x: 160, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6862619223851276872
 CanvasRenderer:
@@ -3174,7 +3174,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 300
-    m_Alignment: 3
+    m_Alignment: 0
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
@@ -3601,7 +3601,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 6219495180201940521}
   m_Direction: 2
   m_Value: 0
-  m_Size: 0.9941432
+  m_Size: 0.99999833
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -3687,12 +3687,12 @@ RectTransform:
   - {fileID: 6219495181362800467}
   - {fileID: 6453958623150191756}
   m_Father: {fileID: 7690069329040521624}
-  m_RootOrder: 4
+  m_RootOrder: 2
   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: 214.51959, y: -37.851}
-  m_SizeDelta: {x: 392.0708, y: 915.48}
+  m_AnchoredPosition: {x: 220.51843, y: -37.851}
+  m_SizeDelta: {x: 404.0685, y: 915.48}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3480238369619382951
 CanvasRenderer:
@@ -3982,7 +3982,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: -385.40793}
+  m_AnchoredPosition: {x: 0.000015258789, y: -386.4803}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &6219495181246091879
@@ -4494,8 +4494,8 @@ RectTransform:
   m_Father: {fileID: 7298729790221269523}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 211.3655, y: 0}
   m_SizeDelta: {x: 382.731, y: 0}
   m_Pivot: {x: 0.5, y: 1}
@@ -4592,7 +4592,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 2, y: -223}
-  m_SizeDelta: {x: 369.37, y: 26}
+  m_SizeDelta: {x: 369.37, y: 29}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &7298729788575072517
 CanvasRenderer:
@@ -5629,7 +5629,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 2, y: -264}
-  m_SizeDelta: {x: 369.37, y: 274}
+  m_SizeDelta: {x: 369.37, y: 362}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &7298729788856641814
 CanvasRenderer:
@@ -6502,7 +6502,7 @@ RectTransform:
   - {fileID: 7298729789477652466}
   - {fileID: 7298729789517260342}
   m_Father: {fileID: 7690069329040521624}
-  m_RootOrder: 5
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -7722,7 +7722,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 2, y: -553}
-  m_SizeDelta: {x: 369.37, y: 90}
+  m_SizeDelta: {x: 369.37, y: 154}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &7298729790141692930
 CanvasRenderer:
@@ -8559,12 +8559,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 7690069329040521624}
-  m_RootOrder: 1
+  m_Father: {fileID: 7690069329202716728}
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 1699.4, y: -147.96}
+  m_AnchoredPosition: {x: 199.66626, y: -27.850998}
   m_SizeDelta: {x: 399.32, y: 55.688}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2776142648812848992
@@ -8755,8 +8755,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7690069329202716728}
-  - {fileID: 6055498899380994232}
-  - {fileID: 7690069330614563812}
   - {fileID: 7690069330519247234}
   - {fileID: 6219495180967607244}
   - {fileID: 7298729789502172461}
@@ -8803,6 +8801,8 @@ RectTransform:
   - {fileID: 7298729788825341092}
   - {fileID: 7298729788820912820}
   - {fileID: 7298729789062109970}
+  - {fileID: 6055498899380994232}
+  - {fileID: 7690069330614563812}
   m_Father: {fileID: 7690069329040521624}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -8881,7 +8881,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7690069329040521624}
-  m_RootOrder: 3
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -9000,12 +9000,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 7690069329040521624}
-  m_RootOrder: 2
+  m_Father: {fileID: 7690069329202716728}
+  m_RootOrder: 5
   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: -274.66602, y: 397.49326}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 140, y: -24}
   m_SizeDelta: {x: 160, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7690069330614563814
@@ -9038,7 +9038,7 @@ 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: 2

+ 58 - 15
Assets/Prefabs/UI/XHYZT/YZT.prefab

@@ -3754,6 +3754,8 @@ GameObject:
   - component: {fileID: 437822774}
   - component: {fileID: 437822773}
   - component: {fileID: 437822772}
+  - component: {fileID: 1553519036}
+  - component: {fileID: 1553519035}
   m_Layer: 5
   m_Name: Scroll View
   m_TagString: Untagged
@@ -3851,6 +3853,45 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+--- !u!223 &1553519036
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 437822770}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 2
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 1
+  m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!114 &1553519035
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 437822770}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
 --- !u!1 &474432199
 GameObject:
   m_ObjectHideFlags: 0
@@ -8974,6 +9015,7 @@ Canvas:
   m_OverrideSorting: 0
   m_OverridePixelPerfect: 0
   m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
   m_AdditionalShaderChannelsFlag: 0
   m_SortingLayerID: 0
   m_SortingOrder: 0
@@ -14127,6 +14169,7 @@ Canvas:
   m_OverrideSorting: 0
   m_OverridePixelPerfect: 0
   m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
   m_AdditionalShaderChannelsFlag: 0
   m_SortingLayerID: 0
   m_SortingOrder: 0
@@ -15583,8 +15626,8 @@ RectTransform:
   m_Father: {fileID: 46367777035501093}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 2, y: 0}
   m_SizeDelta: {x: 359.3262, y: 0}
   m_Pivot: {x: 0, y: 1}
@@ -16385,7 +16428,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 46367775954135418}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
@@ -18038,9 +18081,9 @@ RectTransform:
   m_Father: {fileID: 46367777035501093}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 2, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 2, y: -386}
   m_SizeDelta: {x: 359.3262, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &46367776433284835
@@ -18445,7 +18488,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: 140.9, y: -23.6}
+  m_AnchoredPosition: {x: 140, y: -24}
   m_SizeDelta: {x: 160, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &46367776645936374
@@ -19434,7 +19477,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 46367777041217394}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
@@ -19447,8 +19490,8 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 2e07baada5bc940458d45b408039f686, type: 3}
-  m_Type: 1
+  m_Sprite: {fileID: 21300000, guid: 1fcfa6489a7331c42a89e73a0ca477ff, type: 3}
+  m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -20227,7 +20270,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: 140.4, y: -25.2}
+  m_AnchoredPosition: {x: 140, y: -24}
   m_SizeDelta: {x: 160, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &46367777490989165
@@ -32090,8 +32133,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: 202.15628, y: -31.337914}
-  m_SizeDelta: {x: 394.6603, y: 62.6758}
+  m_AnchoredPosition: {x: 199.74, y: -27.5169}
+  m_SizeDelta: {x: 399.49, y: 55.0338}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &254042233182016349
 CanvasRenderer:
@@ -50196,8 +50239,8 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 2e07baada5bc940458d45b408039f686, type: 3}
-  m_Type: 1
+  m_Sprite: {fileID: 21300000, guid: 1fcfa6489a7331c42a89e73a0ca477ff, type: 3}
+  m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4

File diff suppressed because it is too large
+ 107 - 66
Assets/Scene 1.unity


+ 73 - 0
Assets/Scripts/UI/UIView/3D/ThreeDNav.cs

@@ -3,6 +3,8 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
+using UnityAsync;
+using WaitUntil = UnityAsync.WaitUntil;
 public class ThreeDNav : MonoBehaviour
 {
     public Vector2[] targetPos;
@@ -31,6 +33,7 @@ public class ThreeDNav : MonoBehaviour
         CameraManager.SwitchCamera(0);
         InitButton();
         StaticLod.instance.OnFoucusStatic("TaoKou");
+        InitPoint();
     }
     void InitButton()
     {
@@ -84,6 +87,76 @@ public class ThreeDNav : MonoBehaviour
         }
     }
 
+    public Item0 item0Prefab;
+    public GameObject item0Parent;
+    public Sprite[] hotPointSprite;
+
+    void OnNewPointClick(HotPointData temp, Item0 item0)
+    {
+        CameraManager.SwitchCamera(0);
+        StaticLod.instance.OnFoucusStatic(item0.staticImp);
+    }
+
+
+    int FindIndexByLayerUnitName(string name)
+    {
+        for (int i = 0; i < GlobalData.layerUnitDatas.Count; i++)
+        {
+            if (GlobalData.layerUnitDatas[i].name == name.Trim())
+            {
+                return i;
+            }
+        }
+        return -1;
+    }
+    async void InitPoint()
+    {
+        await new WaitUntil(() =>
+        {
+            return GlobalData.hotPointDatas.Count > 0;
+        });
+        GameObject shaPan = GameObject.FindGameObjectWithTag("ShaPan");
+        List<Item0> item0s = new List<Item0>();
+        for (int i = 0; i < GlobalData.hotPointDatas.Count; i++)
+        {
+            //if()
+            HotPointData temp = GlobalData.hotPointDatas[i];
+
+            int tempI = i;
+
+            if ((int)temp.type == 6 || (int)temp.type == 7 || (int)temp.type == 9)
+            {
+                int index = FindIndexByLayerUnitName(temp.name);
+
+                Item0 item0 = Instantiate(item0Prefab, Vector3.zero, Quaternion.identity);
+                item0.InitPoint(hotPointSprite[(int)(temp.type)], temp.namePri, temp.name, GlobalData.layerUnitDatas[index].special);
+                item0s.Add(item0);
+                item0.onPointClick = () =>
+                {
+                    OnNewPointClick(temp, item0);
+                };
+
+
+            }
+
+        }
+
+        for (int i = 0; i < item0s.Count; i++)
+        {
+            if (item0s[i].mSpecial != "1")
+                item0s[i].GetComponent<RectTransform>().SetParent(item0Parent.transform);
+        }
+
+        for (int i = 0; i < item0s.Count; i++)
+        {
+            if (item0s[i].mSpecial == "1")
+                item0s[i].GetComponent<RectTransform>().SetParent(item0Parent.transform);
+        }
+
+
+    }
+
+
     public void ShowObsPanel(ObsData _data)
     {
         obsPlayerPanel.gameObject.SetActive(true);

+ 74 - 0
Assets/Scripts/UI/UIView/BigScreen/BigScreenLayer.cs

@@ -244,6 +244,9 @@ public class BigScreenLayer : MonoBehaviour
     {
         CameraManager.SwitchCamera(0);
         StaticLod.instance.OnFoucusStatic(0);
+
+        
+
         InitButton();
 
         obsPlayerPanel = this.transform.Find("ObsPlayerPanel").GetComponent<ObsPlayerPanel>();
@@ -268,6 +271,8 @@ public class BigScreenLayer : MonoBehaviour
         InitAlert();
 
         InitData();
+
+        InitPoint();
     }
 
 
@@ -380,7 +385,76 @@ public class BigScreenLayer : MonoBehaviour
         // public Button exit_ddysButton;
     }
 
+    
+
+    public Item0 item0Prefab;
+    public GameObject item0Parent;
+    public Sprite[] hotPointSprite;
+
+    void OnNewPointClick(HotPointData temp, Item0 item0)
+    {
+        CameraManager.SwitchCamera(0);
+        StaticLod.instance.OnFoucusStatic(item0.staticImp);
+    }
+
 
+    int FindIndexByLayerUnitName(string name)
+    {
+        for (int i = 0; i < GlobalData.layerUnitDatas.Count; i++)
+        {
+            if (GlobalData.layerUnitDatas[i].name == name.Trim())
+            {
+                return i;
+            }
+        }
+        return -1;
+    }
+    async void InitPoint()
+    {
+        await new WaitUntil(() =>
+        {
+            return GlobalData.hotPointDatas.Count > 0;
+        });
+        GameObject shaPan = GameObject.FindGameObjectWithTag("ShaPan");
+        List<Item0> item0s = new List<Item0>();
+        for (int i = 0; i < GlobalData.hotPointDatas.Count; i++)
+        {
+            //if()
+            HotPointData temp = GlobalData.hotPointDatas[i];
+
+            int tempI = i;
+
+            if ((int)temp.type == 6 || (int)temp.type == 7 || (int)temp.type == 9)
+            {
+                int index = FindIndexByLayerUnitName(temp.name);
+
+                Item0 item0 = Instantiate(item0Prefab, Vector3.zero, Quaternion.identity);
+                item0.InitPoint(hotPointSprite[(int)(temp.type)], temp.namePri, temp.name, GlobalData.layerUnitDatas[index].special);
+                item0s.Add(item0);
+                item0.onPointClick = () =>
+                {
+                    OnNewPointClick(temp, item0);
+                };
+
+              
+            }
+
+        }
+
+        for (int i = 0; i < item0s.Count; i++)
+        {
+            if (item0s[i].mSpecial != "1")
+                item0s[i].GetComponent<RectTransform>().SetParent(item0Parent.transform);
+        }
+
+        for (int i = 0; i < item0s.Count; i++)
+        {
+            if (item0s[i].mSpecial == "1")
+                item0s[i].GetComponent<RectTransform>().SetParent(item0Parent.transform);
+        }
+
+
+    }
 
     private async Task InitAlert()
     {

Some files were not shown because too many files changed in this diff