Ver Fonte

在提交一版免得被冲掉

wartheking há 2 dias atrás
pai
commit
21c595a1ed

+ 112 - 112
Assets/Prefabs/UI/WaterTrendPanel.prefab

@@ -36,7 +36,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
   m_AnchoredPosition: {x: 22, y: 0}
-  m_SizeDelta: {x: 24, y: 23}
+  m_SizeDelta: {x: 35.5, y: 23}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8625521681930447596
 CanvasRenderer:
@@ -73,7 +73,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
-    m_Alignment: 0
+    m_Alignment: 1
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
@@ -116,7 +116,7 @@ RectTransform:
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
   m_AnchoredPosition: {x: -2, y: 0}
-  m_SizeDelta: {x: 7, y: 16}
+  m_SizeDelta: {x: 14, y: 16}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &6407558616709564455
 CanvasRenderer:
@@ -159,7 +159,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: 0
+  m_Text: 26
 --- !u!1 &116990067285702906
 GameObject:
   m_ObjectHideFlags: 0
@@ -261,7 +261,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: -17, y: 0}
+  m_AnchoredPosition: {x: -13.5, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1128402693920519290
@@ -340,7 +340,7 @@ RectTransform:
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
   m_AnchoredPosition: {x: -920, y: -243.6}
-  m_SizeDelta: {x: 16, y: 16}
+  m_SizeDelta: {x: 18, y: 16}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &4264945609072641071
 CanvasRenderer:
@@ -715,7 +715,7 @@ RectTransform:
   m_GameObject: {fileID: 324733500937495745}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0, y: 0, z: 0}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6655439896406785453}
@@ -725,8 +725,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -920, y: 29.707306}
-  m_SizeDelta: {x: 18, y: 16}
+  m_AnchoredPosition: {x: -920, y: 243.6}
+  m_SizeDelta: {x: 11, y: 16}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &6269179173911385459
 CanvasRenderer:
@@ -1229,7 +1229,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: 10
+  m_Text: 31
 --- !u!1 &705215866094232627
 GameObject:
   m_ObjectHideFlags: 0
@@ -1343,7 +1343,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -13.5, y: 0}
+  m_AnchoredPosition: {x: -17, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4500994092106655031
@@ -1419,7 +1419,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -13.5, y: 0}
+  m_AnchoredPosition: {x: -17, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3152377188552891881
@@ -2105,7 +2105,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: 30
+  m_Text: 40
 --- !u!1 &1022176098656717688
 GameObject:
   m_ObjectHideFlags: 0
@@ -2185,7 +2185,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: 34
+  m_Text: 40
 --- !u!1 &1023074404473574758
 GameObject:
   m_ObjectHideFlags: 0
@@ -2298,7 +2298,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
   m_AnchoredPosition: {x: 119, y: -0.5}
-  m_SizeDelta: {x: 48, y: 23}
+  m_SizeDelta: {x: 80.5, y: 23}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &730325243134362567
 CanvasRenderer:
@@ -2335,7 +2335,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
-    m_Alignment: 0
+    m_Alignment: 1
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
@@ -2449,7 +2449,7 @@ RectTransform:
   m_GameObject: {fileID: 1171581222819097413}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0, y: 0, z: 0}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7400282391594016073}
@@ -2459,7 +2459,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -920, y: 148.53659}
+  m_AnchoredPosition: {x: -920, y: 243.6}
   m_SizeDelta: {x: 18, y: 16}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &2379678365947460603
@@ -3388,8 +3388,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 69.8, y: 33.9}
-  m_SizeDelta: {x: 870.4, y: 2}
+  m_AnchoredPosition: {x: 69.8, y: -146.9}
+  m_SizeDelta: {x: 870.4, y: 1}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &7534034091272499084
 CanvasRenderer:
@@ -3464,7 +3464,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: 407.2, y: 24.8}
+  m_AnchoredPosition: {x: 407.2, y: 16.8}
   m_SizeDelta: {x: 160, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4305472184433807073
@@ -3588,7 +3588,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: 36
+  m_Text: 40
 --- !u!1 &1712860872418343510
 GameObject:
   m_ObjectHideFlags: 0
@@ -3625,8 +3625,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 69.8, y: 43}
-  m_SizeDelta: {x: 870.4, y: 2}
+  m_AnchoredPosition: {x: 69.8, y: -96.3}
+  m_SizeDelta: {x: 870.4, y: 1}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &4085646007238084527
 CanvasRenderer:
@@ -4433,8 +4433,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 69.8, y: 43.9}
-  m_SizeDelta: {x: 870.4, y: 2}
+  m_AnchoredPosition: {x: 69.8, y: -50.3}
+  m_SizeDelta: {x: 870.4, y: 1}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &5077751307637559809
 CanvasRenderer:
@@ -4589,7 +4589,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: -17, y: 0}
+  m_AnchoredPosition: {x: -13.5, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7214895190482229120
@@ -4884,8 +4884,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 69.8, y: 58.3}
-  m_SizeDelta: {x: 870.4, y: 2}
+  m_AnchoredPosition: {x: 69.8, y: 0.1}
+  m_SizeDelta: {x: 870.4, y: 1}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &5812097702650287270
 CanvasRenderer:
@@ -5195,7 +5195,7 @@ RectTransform:
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
   m_AnchoredPosition: {x: -2, y: 0}
-  m_SizeDelta: {x: 7, y: 16}
+  m_SizeDelta: {x: 14, y: 16}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &3302755556678592446
 CanvasRenderer:
@@ -5238,7 +5238,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: 2
+  m_Text: 27
 --- !u!1 &2358119989601871022
 GameObject:
   m_ObjectHideFlags: 0
@@ -5274,7 +5274,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: 407, y: -21.8}
+  m_AnchoredPosition: {x: 407, y: 14.8}
   m_SizeDelta: {x: 160, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3396262693461811570
@@ -5355,7 +5355,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
   m_AnchoredPosition: {x: 328, y: 0}
-  m_SizeDelta: {x: 24, y: 23}
+  m_SizeDelta: {x: 59.3, y: 23}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3589420665200790460
 CanvasRenderer:
@@ -5593,7 +5593,7 @@ RectTransform:
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
   m_AnchoredPosition: {x: -2, y: 0}
-  m_SizeDelta: {x: 14, y: 16}
+  m_SizeDelta: {x: 7, y: 16}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &6897615718169994192
 CanvasRenderer:
@@ -5636,7 +5636,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: 24
+  m_Text: 3
 --- !u!1 &2431804222632833387
 GameObject:
   m_ObjectHideFlags: 0
@@ -5976,7 +5976,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -920, y: -17.824387}
+  m_AnchoredPosition: {x: -920, y: 243.6}
   m_SizeDelta: {x: 18, y: 16}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &883897914676410407
@@ -6405,7 +6405,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -920, y: -41.590256}
+  m_AnchoredPosition: {x: -920, y: 194.88}
   m_SizeDelta: {x: 18, y: 16}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &6084650829562890880
@@ -6687,8 +6687,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -920, y: -160.41953}
-  m_SizeDelta: {x: 11, y: 16}
+  m_AnchoredPosition: {x: -920, y: -48.72}
+  m_SizeDelta: {x: 18, y: 16}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &6193686472827417717
 CanvasRenderer:
@@ -7040,8 +7040,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -920, y: -136.65366}
-  m_SizeDelta: {x: 11, y: 16}
+  m_AnchoredPosition: {x: -920, y: 0}
+  m_SizeDelta: {x: 18, y: 16}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &8701970717668702778
 CanvasRenderer:
@@ -7116,7 +7116,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -13.5, y: 0}
+  m_AnchoredPosition: {x: -17, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7716369595885881298
@@ -7268,7 +7268,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -13.5, y: 0}
+  m_AnchoredPosition: {x: -17, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5784481930316057015
@@ -7530,7 +7530,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: 18
+  m_Text: 35
 --- !u!1 &3121817429517396775
 GameObject:
   m_ObjectHideFlags: 0
@@ -8199,7 +8199,7 @@ RectTransform:
   m_GameObject: {fileID: 3447538311136678823}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0, y: 0, z: 0}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6772667131659049263}
@@ -8507,7 +8507,7 @@ RectTransform:
   m_GameObject: {fileID: 3566092275716521313}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0, y: 0, z: 0}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7924730735439730007}
@@ -8517,8 +8517,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -920, y: 53.473175}
-  m_SizeDelta: {x: 18, y: 16}
+  m_AnchoredPosition: {x: -920, y: 243.6}
+  m_SizeDelta: {x: 11, y: 16}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &8508999379271565708
 CanvasRenderer:
@@ -8585,7 +8585,7 @@ RectTransform:
   m_GameObject: {fileID: 3582270322955264974}
   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: []
   m_Father: {fileID: 3352105003607594484}
@@ -8594,7 +8594,7 @@ RectTransform:
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
   m_AnchoredPosition: {x: -2, y: 0}
-  m_SizeDelta: {x: 12, y: 16}
+  m_SizeDelta: {x: 14, y: 16}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &8186850766494399105
 CanvasRenderer:
@@ -8637,7 +8637,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: -1
+  m_Text: 25
 --- !u!1 &3594473704847026116
 GameObject:
   m_ObjectHideFlags: 0
@@ -8717,7 +8717,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: 14
+  m_Text: 33
 --- !u!1 &3690074113506209506
 GameObject:
   m_ObjectHideFlags: 0
@@ -8745,7 +8745,7 @@ RectTransform:
   m_GameObject: {fileID: 3690074113506209506}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0, y: 0, z: 0}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 670916211517203341}
@@ -8755,8 +8755,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -920, y: 101.00488}
-  m_SizeDelta: {x: 18, y: 16}
+  m_AnchoredPosition: {x: -920, y: 243.6}
+  m_SizeDelta: {x: 11, y: 16}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &4774154647845589775
 CanvasRenderer:
@@ -8898,7 +8898,7 @@ RectTransform:
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
   m_AnchoredPosition: {x: -2, y: 0}
-  m_SizeDelta: {x: 7, y: 16}
+  m_SizeDelta: {x: 14, y: 16}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &9073456830384172698
 CanvasRenderer:
@@ -8941,7 +8941,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: 8
+  m_Text: 30
 --- !u!1 &3810990132192121680
 GameObject:
   m_ObjectHideFlags: 0
@@ -9205,7 +9205,7 @@ RectTransform:
   m_GameObject: {fileID: 3997653830122628994}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0, y: 0, z: 0}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7415862892838310775}
@@ -9215,8 +9215,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -920, y: 77.239044}
-  m_SizeDelta: {x: 18, y: 16}
+  m_AnchoredPosition: {x: -920, y: 243.6}
+  m_SizeDelta: {x: 11, y: 16}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &2569301117795549761
 CanvasRenderer:
@@ -10209,7 +10209,7 @@ RectTransform:
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
   m_AnchoredPosition: {x: -2, y: 0}
-  m_SizeDelta: {x: 7, y: 16}
+  m_SizeDelta: {x: 14, y: 16}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &6869308389225398268
 CanvasRenderer:
@@ -10252,7 +10252,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: 6
+  m_Text: 29
 --- !u!1 &4278538055865652343
 GameObject:
   m_ObjectHideFlags: 0
@@ -10289,8 +10289,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 69.8, y: 65.6}
-  m_SizeDelta: {x: 870.4, y: 2}
+  m_AnchoredPosition: {x: 69.8, y: 8.7}
+  m_SizeDelta: {x: 870.4, y: 1}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &7006761351780830063
 CanvasRenderer:
@@ -10675,7 +10675,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: 407, y: -21.8}
+  m_AnchoredPosition: {x: 407, y: 15.4}
   m_SizeDelta: {x: 160, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5472821186523232721
@@ -10799,7 +10799,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: 32
+  m_Text: 40
 --- !u!1 &4354862989509306445
 GameObject:
   m_ObjectHideFlags: 0
@@ -10874,7 +10874,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: -16, y: 0}
+  m_AnchoredPosition: {x: -17, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4214403242040728713
@@ -10950,7 +10950,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: 407.2, y: 24.8}
+  m_AnchoredPosition: {x: 407.2, y: 15.6}
   m_SizeDelta: {x: 160, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7952009682913786193
@@ -11217,7 +11217,7 @@ RectTransform:
   m_GameObject: {fileID: 4560265547657673340}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0, y: 0, z: 0}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4087498845453399496}
@@ -11227,8 +11227,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -920, y: 5.941452}
-  m_SizeDelta: {x: 18, y: 16}
+  m_AnchoredPosition: {x: -920, y: 243.6}
+  m_SizeDelta: {x: 11, y: 16}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &4407896351794017827
 CanvasRenderer:
@@ -11739,7 +11739,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: 38
+  m_Text: 40
 --- !u!1 &4950384272966290872
 GameObject:
   m_ObjectHideFlags: 0
@@ -11935,7 +11935,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: -17, y: 0}
+  m_AnchoredPosition: {x: -13.5, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3885755126643843960
@@ -12088,7 +12088,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
   m_AnchoredPosition: {x: 240, y: 0}
-  m_SizeDelta: {x: 44, y: 23}
+  m_SizeDelta: {x: 85.41, y: 23}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8417331266730460878
 CanvasRenderer:
@@ -12751,7 +12751,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: 12
+  m_Text: 32
 --- !u!1 &5491435663575878941
 GameObject:
   m_ObjectHideFlags: 0
@@ -12868,7 +12868,7 @@ RectTransform:
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
   m_AnchoredPosition: {x: -2, y: 0}
-  m_SizeDelta: {x: 14, y: 16}
+  m_SizeDelta: {x: 7, y: 16}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &150437225737310841
 CanvasRenderer:
@@ -12911,7 +12911,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: 28
+  m_Text: 3
 --- !u!1 &5534452257567714625
 GameObject:
   m_ObjectHideFlags: 0
@@ -13168,7 +13168,7 @@ RectTransform:
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
   m_AnchoredPosition: {x: -2, y: 0}
-  m_SizeDelta: {x: 14, y: 16}
+  m_SizeDelta: {x: 7, y: 16}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &804107702187186237
 CanvasRenderer:
@@ -13211,7 +13211,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: 20
+  m_Text: 3
 --- !u!1 &5694657604403990480
 GameObject:
   m_ObjectHideFlags: 0
@@ -13239,7 +13239,7 @@ RectTransform:
   m_GameObject: {fileID: 5694657604403990480}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0, y: 0, z: 0}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4036665735847653151}
@@ -13249,7 +13249,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -920, y: 124.77072}
+  m_AnchoredPosition: {x: -920, y: 243.6}
   m_SizeDelta: {x: 18, y: 16}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &1095877650377497683
@@ -13589,7 +13589,7 @@ RectTransform:
   m_GameObject: {fileID: 5796555475539168110}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0, y: 0, z: 0}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6540736765003161194}
@@ -13599,7 +13599,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -920, y: 172.30246}
+  m_AnchoredPosition: {x: -920, y: 243.6}
   m_SizeDelta: {x: 18, y: 16}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &1268004979711156841
@@ -14293,7 +14293,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -920, y: -65.356094}
+  m_AnchoredPosition: {x: -920, y: 146.16}
   m_SizeDelta: {x: 18, y: 16}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &8485981559747094730
@@ -14732,7 +14732,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -920, y: -112.8878}
+  m_AnchoredPosition: {x: -920, y: 48.72}
   m_SizeDelta: {x: 18, y: 16}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &3713130013764763434
@@ -14889,7 +14889,7 @@ RectTransform:
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
   m_AnchoredPosition: {x: -2, y: 0}
-  m_SizeDelta: {x: 14, y: 16}
+  m_SizeDelta: {x: 7, y: 16}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &6540982387954350906
 CanvasRenderer:
@@ -14932,7 +14932,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: 22
+  m_Text: 3
 --- !u!1 &6313455621635995262
 GameObject:
   m_ObjectHideFlags: 0
@@ -16150,10 +16150,10 @@ MonoBehaviour:
     m_ParallelIndex: 0
     m_Position: 0
     m_Offset: 0
-    m_Min: -1
-    m_Max: 40
+    m_Min: 25
+    m_Max: 35
     m_SplitNumber: 0
-    m_Interval: 2
+    m_Interval: 1
     m_BoundaryGap: 0
     m_MaxCache: 0
     m_LogBase: 10
@@ -17253,7 +17253,7 @@ RectTransform:
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
   m_AnchoredPosition: {x: -2, y: 0}
-  m_SizeDelta: {x: 7, y: 16}
+  m_SizeDelta: {x: 14, y: 16}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &5116105267860913507
 CanvasRenderer:
@@ -17296,7 +17296,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: 4
+  m_Text: 28
 --- !u!1 &6657912622692919967
 GameObject:
   m_ObjectHideFlags: 0
@@ -19956,7 +19956,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: 407.9, y: 14}
+  m_AnchoredPosition: {x: 407.9, y: 14.7}
   m_SizeDelta: {x: 160, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3154219151132322639
@@ -20668,7 +20668,7 @@ RectTransform:
   m_GameObject: {fileID: 8137079874175471906}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0, y: 0, z: 0}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4592243784736422268}
@@ -20678,7 +20678,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -920, y: 219.83414}
+  m_AnchoredPosition: {x: -920, y: 243.6}
   m_SizeDelta: {x: 18, y: 16}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &6243485479856273281
@@ -21147,7 +21147,7 @@ RectTransform:
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
   m_AnchoredPosition: {x: -2, y: 0}
-  m_SizeDelta: {x: 14, y: 16}
+  m_SizeDelta: {x: 7, y: 16}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &6287153507655846153
 CanvasRenderer:
@@ -21190,7 +21190,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: 26
+  m_Text: 3
 --- !u!1 &8373870430852378816
 GameObject:
   m_ObjectHideFlags: 0
@@ -21226,7 +21226,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -13.5, y: 0}
+  m_AnchoredPosition: {x: -17, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3027445508462985244
@@ -21302,7 +21302,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: -17, y: 0}
+  m_AnchoredPosition: {x: -13.5, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5197063340454879471
@@ -21532,8 +21532,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -920, y: -231.71707}
-  m_SizeDelta: {x: 11, y: 16}
+  m_AnchoredPosition: {x: -920, y: -194.88}
+  m_SizeDelta: {x: 18, y: 16}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &63867032659111985
 CanvasRenderer:
@@ -21805,7 +21805,7 @@ RectTransform:
   m_GameObject: {fileID: 8684737515165143466}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0, y: 0, z: 0}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1185458522085571693}
@@ -21815,7 +21815,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -920, y: 196.0683}
+  m_AnchoredPosition: {x: -920, y: 243.6}
   m_SizeDelta: {x: 18, y: 16}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &4841775137611389208
@@ -22158,8 +22158,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -920, y: -207.95123}
-  m_SizeDelta: {x: 11, y: 16}
+  m_AnchoredPosition: {x: -920, y: -146.16}
+  m_SizeDelta: {x: 18, y: 16}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &1280457859019594157
 CanvasRenderer:
@@ -22393,8 +22393,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 69.8, y: 87.4}
-  m_SizeDelta: {x: 870.4, y: 2}
+  m_AnchoredPosition: {x: 69.8, y: 48.2}
+  m_SizeDelta: {x: 870.4, y: 1}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &6476866206301188312
 CanvasRenderer:
@@ -22469,7 +22469,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: -17, y: 0}
+  m_AnchoredPosition: {x: -13.5, y: 0}
   m_SizeDelta: {x: 20, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1262469919768445850
@@ -22547,8 +22547,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -920, y: -184.18536}
-  m_SizeDelta: {x: 11, y: 16}
+  m_AnchoredPosition: {x: -920, y: -97.44}
+  m_SizeDelta: {x: 18, y: 16}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &5896436996641877749
 CanvasRenderer:
@@ -22780,7 +22780,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: 16
+  m_Text: 34
 --- !u!1 &9063295751018251503
 GameObject:
   m_ObjectHideFlags: 0
@@ -22818,7 +22818,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -920, y: -89.12195}
+  m_AnchoredPosition: {x: -920, y: 97.44}
   m_SizeDelta: {x: 18, y: 16}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &2469300867987548117

+ 225 - 39
Assets/Prefabs/UI/XHYZT/YZT.prefab

@@ -1322,7 +1322,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
-    m_FontSize: 14
+    m_FontSize: 12
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 10
@@ -1333,7 +1333,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: 80
+  m_Text: 35
 --- !u!1 &138474124
 GameObject:
   m_ObjectHideFlags: 0
@@ -1908,7 +1908,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
-    m_FontSize: 14
+    m_FontSize: 12
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 10
@@ -1919,7 +1919,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: 80
+  m_Text: 35
 --- !u!1 &178542966
 GameObject:
   m_ObjectHideFlags: 0
@@ -4707,7 +4707,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
-    m_FontSize: 14
+    m_FontSize: 12
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 10
@@ -4718,7 +4718,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: 80
+  m_Text: 35
 --- !u!1 &386775201
 GameObject:
   m_ObjectHideFlags: 0
@@ -7328,7 +7328,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -920, y: 174}
+  m_AnchoredPosition: {x: -920, y: 243.6}
   m_SizeDelta: {x: 18, y: 16}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &617089500
@@ -9005,7 +9005,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
-    m_FontSize: 14
+    m_FontSize: 12
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 10
@@ -9016,7 +9016,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: 80
+  m_Text: 35
 --- !u!1 &817574574
 GameObject:
   m_ObjectHideFlags: 0
@@ -9122,7 +9122,7 @@ RectTransform:
   m_GameObject: {fileID: 819927368}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0, y: 0, z: 0}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 176894274}
@@ -9674,7 +9674,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
-    m_FontSize: 14
+    m_FontSize: 12
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 10
@@ -9685,7 +9685,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: 80
+  m_Text: 35
 --- !u!1 &861315040
 GameObject:
   m_ObjectHideFlags: 0
@@ -14862,7 +14862,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
-    m_FontSize: 14
+    m_FontSize: 12
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 10
@@ -14873,7 +14873,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: 80
+  m_Text: 35
 --- !u!1 &1209135816
 GameObject:
   m_ObjectHideFlags: 0
@@ -14911,7 +14911,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -920, y: 104.400024}
+  m_AnchoredPosition: {x: -920, y: 194.88}
   m_SizeDelta: {x: 18, y: 16}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &1209135819
@@ -15917,7 +15917,7 @@ RectTransform:
   m_GameObject: {fileID: 1337074515}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0, y: 0, z: 0}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 495588575}
@@ -15958,7 +15958,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
-    m_FontSize: 14
+    m_FontSize: 12
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 10
@@ -15969,7 +15969,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: 80
+  m_Text: 35
 --- !u!1 &1337402823
 GameObject:
   m_ObjectHideFlags: 0
@@ -18490,7 +18490,7 @@ RectTransform:
   m_GameObject: {fileID: 1507498023}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0, y: 0, z: 0}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1888877155}
@@ -18531,7 +18531,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
-    m_FontSize: 14
+    m_FontSize: 12
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 10
@@ -18542,7 +18542,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: 80
+  m_Text: 35
 --- !u!1 &1530098268
 GameObject:
   m_ObjectHideFlags: 0
@@ -19214,7 +19214,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
-    m_FontSize: 14
+    m_FontSize: 12
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 10
@@ -19225,7 +19225,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: 80
+  m_Text: 35
 --- !u!1 &1573233151
 GameObject:
   m_ObjectHideFlags: 0
@@ -20437,7 +20437,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
-    m_FontSize: 14
+    m_FontSize: 12
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 10
@@ -20448,7 +20448,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: 80
+  m_Text: 35
 --- !u!1 &1702148347
 GameObject:
   m_ObjectHideFlags: 0
@@ -22601,7 +22601,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
-    m_FontSize: 14
+    m_FontSize: 12
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 10
@@ -22612,7 +22612,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: 80
+  m_Text: 34
 --- !u!1 &1860077822
 GameObject:
   m_ObjectHideFlags: 0
@@ -23892,7 +23892,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
-    m_FontSize: 14
+    m_FontSize: 12
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 10
@@ -23903,7 +23903,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: 80
+  m_Text: 35
 --- !u!1 &1966872603
 GameObject:
   m_ObjectHideFlags: 0
@@ -24787,7 +24787,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
-    m_FontSize: 14
+    m_FontSize: 12
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 10
@@ -24798,7 +24798,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: 80
+  m_Text: 35
 --- !u!1 &1998676184
 GameObject:
   m_ObjectHideFlags: 0
@@ -26052,7 +26052,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
-    m_FontSize: 14
+    m_FontSize: 12
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 10
@@ -26063,7 +26063,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: 80
+  m_Text: 35
 --- !u!1 &2089565444
 GameObject:
   m_ObjectHideFlags: 0
@@ -26620,7 +26620,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
-    m_FontSize: 14
+    m_FontSize: 12
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 10
@@ -26631,7 +26631,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 1
     m_LineSpacing: 1
-  m_Text: 80
+  m_Text: 35
 --- !u!1 &34775238154464265
 GameObject:
   m_ObjectHideFlags: 0
@@ -72103,7 +72103,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 326188567858121770, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_FontData.m_Alignment
-      value: 5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 460911096415139328, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_Pivot.x
@@ -72201,6 +72201,10 @@ PrefabInstance:
       propertyPath: m_LocalScale.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1356902149164166005, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_RootOrder
+      value: 115
+      objectReference: {fileID: 0}
     - target: {fileID: 1383460009076738757, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_FontData.m_FontSize
       value: 14
@@ -72299,16 +72303,36 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1559715956713332183, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_YAxes.Array.data[0].m_Min
-      value: -1
+      value: 25
+      objectReference: {fileID: 0}
+    - target: {fileID: 1559715956713332183, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_Grids.Array.data[0].m_Show
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 1559715956713332183, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_YAxes.Array.data[0].m_Interval
       value: 2
       objectReference: {fileID: 0}
+    - target: {fileID: 1559715956713332183, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_SerieLines.Array.data[0].m_Ignore
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1559715956713332183, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_SerieLines.Array.data[0].m_MaxShow
+      value: 35
+      objectReference: {fileID: 0}
+    - target: {fileID: 1559715956713332183, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_SerieLines.Array.data[0].m_MinShow
+      value: 25
+      objectReference: {fileID: 0}
     - target: {fileID: 1559715956713332183, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_XAxes.Array.data[0].m_Data.Array.size
       value: 20
       objectReference: {fileID: 0}
+    - target: {fileID: 1559715956713332183, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_SerieLines.Array.data[0].m_IgnoreValue
+      value: -1
+      objectReference: {fileID: 0}
     - target: {fileID: 1559715956713332183, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_XAxes.Array.data[0].m_Data.Array.data[3]
       value: 06:00
@@ -72377,6 +72401,14 @@ PrefabInstance:
       propertyPath: m_SerieLines.Array.data[0].m_Data.Array.size
       value: 20
       objectReference: {fileID: 0}
+    - target: {fileID: 1559715956713332183, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_SerieLines.Array.data[0].m_IgnoreLineBreak
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1559715956713332183, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_SerieLines.Array.data[0].m_LineStyle.m_Width
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 1559715956713332183, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_SerieLines.Array.data[0].m_Data.Array.data[2].m_Name
       value: 213
@@ -72793,9 +72825,33 @@ PrefabInstance:
       propertyPath: m_LocalScale.z
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 1735804110791191164, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_RootOrder
+      value: 110
+      objectReference: {fileID: 0}
+    - target: {fileID: 1839117768527888487, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_RootOrder
+      value: 113
+      objectReference: {fileID: 0}
+    - target: {fileID: 1998236394312297793, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_RootOrder
+      value: 103
+      objectReference: {fileID: 0}
+    - target: {fileID: 1998236394312297793, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1998236394312297793, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1998236394312297793, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 2066964053770644601, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_RootOrder
-      value: 10
+      value: 9
       objectReference: {fileID: 0}
     - target: {fileID: 2135825325739122964, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_FontData.m_FontSize
@@ -72803,16 +72859,40 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2135825325739122964, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_FontData.m_Alignment
-      value: 4
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2318319632933925219, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_RootOrder
+      value: 104
+      objectReference: {fileID: 0}
+    - target: {fileID: 2318319632933925219, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2318319632933925219, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2318319632933925219, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2525328614039315907, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_FontData.m_FontSize
       value: 14
       objectReference: {fileID: 0}
+    - target: {fileID: 2566612413710843487, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_Text
+      value: 32
+      objectReference: {fileID: 0}
     - target: {fileID: 2566612413710843487, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_FontData.m_FontSize
       value: 12
       objectReference: {fileID: 0}
+    - target: {fileID: 2615164947690551326, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_Text
+      value: 30
+      objectReference: {fileID: 0}
     - target: {fileID: 2615164947690551326, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_FontData.m_FontSize
       value: 12
@@ -72865,6 +72945,10 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3083110233464325692, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_RootOrder
+      value: 116
+      objectReference: {fileID: 0}
     - target: {fileID: 3089475157870730069, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_IsActive
       value: 1
@@ -73037,6 +73121,10 @@ PrefabInstance:
       propertyPath: m_FontData.m_FontSize
       value: 24
       objectReference: {fileID: 0}
+    - target: {fileID: 4386093845087736489, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_Text
+      value: 28
+      objectReference: {fileID: 0}
     - target: {fileID: 4386093845087736489, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_FontData.m_FontSize
       value: 12
@@ -73061,6 +73149,22 @@ PrefabInstance:
       propertyPath: m_RootOrder
       value: 15
       objectReference: {fileID: 0}
+    - target: {fileID: 4488658325850135625, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_RootOrder
+      value: 105
+      objectReference: {fileID: 0}
+    - target: {fileID: 4488658325850135625, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4488658325850135625, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4488658325850135625, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4498040699218706390, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_RootOrder
       value: 19
@@ -73113,14 +73217,34 @@ PrefabInstance:
       propertyPath: typeTitle
       value: 
       objectReference: {fileID: 387498243553135059}
+    - target: {fileID: 4967739173987375842, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: threePanel
+      value: 
+      objectReference: {fileID: 5436012740032923524}
+    - target: {fileID: 4967739173987375842, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: bythreePanel
+      value: 
+      objectReference: {fileID: 4152565144608193780}
     - target: {fileID: 4967739173987375842, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: lineChartBtn
       value: 
       objectReference: {fileID: 6523913072739403562}
+    - target: {fileID: 4967739173987375842, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: searchButton
+      value: 
+      objectReference: {fileID: 5798906579252919784}
     - target: {fileID: 4967739173987375842, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: lineChartPanel
       value: 
       objectReference: {fileID: 743271226993744917}
+    - target: {fileID: 4967739173987375842, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: taokouthreePanel
+      value: 
+      objectReference: {fileID: 2367653261638004063}
+    - target: {fileID: 5029981617342028659, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_RootOrder
+      value: 114
+      objectReference: {fileID: 0}
     - target: {fileID: 5033510405257207482, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_SizeDelta.x
       value: 35
@@ -73133,10 +73257,26 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: -257.6
       objectReference: {fileID: 0}
+    - target: {fileID: 5128197734261193853, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_RootOrder
+      value: 109
+      objectReference: {fileID: 0}
+    - target: {fileID: 5158181451700739409, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_RootOrder
+      value: 111
+      objectReference: {fileID: 0}
     - target: {fileID: 5282194405771002524, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_RootOrder
       value: 13
       objectReference: {fileID: 0}
+    - target: {fileID: 5357609400552945411, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_RootOrder
+      value: 108
+      objectReference: {fileID: 0}
+    - target: {fileID: 5399165790254619487, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_RootOrder
+      value: 112
+      objectReference: {fileID: 0}
     - target: {fileID: 5423189391984170462, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_RootOrder
       value: 14
@@ -73169,10 +73309,18 @@ PrefabInstance:
       propertyPath: m_LocalScale.z
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 5550335983870972351, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 5641167676696964605, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_FontData.m_FontSize
       value: 20
       objectReference: {fileID: 0}
+    - target: {fileID: 5766131479947241225, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_RootOrder
+      value: 107
+      objectReference: {fileID: 0}
     - target: {fileID: 5781059839288312397, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_FontData.m_FontSize
       value: 20
@@ -73189,6 +73337,10 @@ PrefabInstance:
       propertyPath: m_LocalScale.z
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 5975994242751112698, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -97.44
+      objectReference: {fileID: 0}
     - target: {fileID: 5990173856125302576, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_LocalScale.x
       value: 1
@@ -73201,6 +73353,10 @@ PrefabInstance:
       propertyPath: m_LocalScale.z
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 5990173856125302576, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 97.44
+      objectReference: {fileID: 0}
     - target: {fileID: 6354638661296059220, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: -60.72
@@ -73325,6 +73481,10 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 7609931789810640296, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_RootOrder
+      value: 106
+      objectReference: {fileID: 0}
     - target: {fileID: 7748069699087661519, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_FontData.m_FontSize
       value: 12
@@ -73500,16 +73660,42 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 1403202070640317247, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
   m_PrefabInstance: {fileID: 293148431658637135}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &2367653261638004063 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 2651178629983353360, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+  m_PrefabInstance: {fileID: 293148431658637135}
+  m_PrefabAsset: {fileID: 0}
 --- !u!224 &4139765459907667409 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 4423130986750128798, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
   m_PrefabInstance: {fileID: 293148431658637135}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &4152565144608193780 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 4445517983220231099, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+  m_PrefabInstance: {fileID: 293148431658637135}
+  m_PrefabAsset: {fileID: 0}
 --- !u!224 &5064063574032810279 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 4780098280845563496, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
   m_PrefabInstance: {fileID: 293148431658637135}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &5436012740032923524 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5720099546471649483, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+  m_PrefabInstance: {fileID: 293148431658637135}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &5798906579252919784 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 6082289681007012519, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+  m_PrefabInstance: {fileID: 293148431658637135}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!114 &6523913072739403562 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 6816445073305178213, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}

+ 1 - 1
Assets/Scripts/UI/Tools/ServerAddress.cs

@@ -132,7 +132,7 @@ public class ServerAddress
     /// </summary>
     public static string API_GetWaterTrend_chart = YZTServerAddress + "/open/waterByDateRange?stcd=";
     public static string API_GetDropTrend_chart = YZTServerAddress + "/open/rainfallByDateRange?stcd=";
-    public static string API_GetWaterTrend_info = YZTServerAddress + "/open/water2?stcd=";
+    public static string API_GetWaterTrend_info = YZTServerAddress + "/open/station/detail?stcd=";
     public static string API_GetWaterData = YZTServerAddress + "/open/water3";
 
     //  http://111.4.141.191:9081/open/dataStatis 

+ 46 - 37
Assets/Scripts/UI/UIView/YZT/WaterTrendPanel.cs

@@ -56,6 +56,10 @@ public class WaterTrendPanel : MonoBehaviour
     public Text frgrdText;
     public Text usflText;
 
+    public Button searchButton;
+    public GameObject threePanel;
+    public GameObject bythreePanel;
+    public GameObject taokouthreePanel;
     public void Init()
     {
         _LineChart = this.transform.Find("linePanel/LineChart").GetComponent<LineChart>();
@@ -98,6 +102,11 @@ public class WaterTrendPanel : MonoBehaviour
                 ShowInfo();
             }
         });
+
+        searchButton.onClick.AddListener(() =>
+        {
+            ShowTrend(currentStcd, currentName, currentType);
+        });
     }
 
     private void Start()
@@ -191,9 +200,11 @@ public class WaterTrendPanel : MonoBehaviour
         currentType = type;
         if (type == 0)
         {
+            threePanel.gameObject.SetActive(true);
             typeTitle.text = "站点水位趋势";
         }
         else {
+            threePanel.gameObject.SetActive(false);
             typeTitle.text = "站点降雨趋势";
         }
         currentStcd = stcd;
@@ -205,11 +216,23 @@ public class WaterTrendPanel : MonoBehaviour
 
         string chartJsonStr = "";
         if (type == 0) {
+            _LineChart.GetChartComponent<YAxis>().axisName.name = "水位(m)";
             chartJsonStr = await HttpHelper._Instance.GetWaterTrend_Chart(stcd, startDateStr, endDateStr);
         }
         else{
+            _LineChart.GetChartComponent<YAxis>().axisName.name = "降雨量(mm)";
             chartJsonStr = await HttpHelper._Instance.GetDropTrend_Chart(stcd, startDateStr, endDateStr);
         }
+        if (stcd == "61017810")
+        {
+            bythreePanel.gameObject.SetActive(true);
+            taokouthreePanel.gameObject.SetActive(false);
+        }
+        else {
+            bythreePanel.gameObject.SetActive(false);
+            taokouthreePanel.gameObject.SetActive(true);
+        }
+        //Debug.Log(chartJsonStr);
         SetChartLine(chartJsonStr);
         StartCoroutine(CreatList(chartJsonStr));
     }
@@ -235,24 +258,26 @@ public class WaterTrendPanel : MonoBehaviour
         usflText.text = "-";
 
         string infoJsonStr = await HttpHelper._Instance.GetWaterTrend_Info(currentStcd);
+        Debug.Log(infoJsonStr);
         WaterTrendData_Info waterTrendData_Info = JsonConvert.DeserializeObject<WaterTrendData_Info>(infoJsonStr);
-        idText.text = waterTrendData_Info.data[0].id;
-        stnmText.text = waterTrendData_Info.data[0].stnm;
-        stcdText.text = waterTrendData_Info.data[0].stcd;
-        stlcText.text = waterTrendData_Info.data[0].stlc;
-        sttpText.text = waterTrendData_Info.data[0].sttp;
-        addvcdText.text = waterTrendData_Info.data[0].addvcd;
-        bsnmText.text = waterTrendData_Info.data[0].bsnm;
-        hnnmText.text = waterTrendData_Info.data[0].hnnm;
-        rvnmText.text = waterTrendData_Info.data[0].rvnm;
-        lgtdText.text = waterTrendData_Info.data[0].lgtd;
-        lttdText.text = waterTrendData_Info.data[0].lttd;
-        dtmnmText.text = waterTrendData_Info.data[0].dtmnm;
-        dtmelText.text = waterTrendData_Info.data[0].dtmel;
-        atcunitText.text = waterTrendData_Info.data[0].atcunit;
-        localityText.text = waterTrendData_Info.data[0].locality;
-        frgrdText.text = waterTrendData_Info.data[0].frgrd;
-        usflText.text = waterTrendData_Info.data[0].usfl;
+        Debug.Log(waterTrendData_Info);
+        idText.text = waterTrendData_Info.data.id;
+        stnmText.text = waterTrendData_Info.data.stnm;
+        stcdText.text = waterTrendData_Info.data.stcd;
+        stlcText.text = waterTrendData_Info.data.stlc;
+        sttpText.text = waterTrendData_Info.data.sttp;
+        addvcdText.text = waterTrendData_Info.data.addvcd;
+        bsnmText.text = waterTrendData_Info.data.bsnm;
+        hnnmText.text = waterTrendData_Info.data.hnnm;
+        rvnmText.text = waterTrendData_Info.data.rvnm;
+        lgtdText.text = waterTrendData_Info.data.lgtd;
+        lttdText.text = waterTrendData_Info.data.lttd;
+        dtmnmText.text = waterTrendData_Info.data.dtmnm;
+        dtmelText.text = waterTrendData_Info.data.dtmel;
+        atcunitText.text = waterTrendData_Info.data.atcunit;
+        localityText.text = waterTrendData_Info.data.locality;
+        frgrdText.text = waterTrendData_Info.data.frgrd;
+        usflText.text = waterTrendData_Info.data.usfl;
     }
 
     public void Hide()
@@ -280,6 +305,9 @@ public class WaterTrendPanel : MonoBehaviour
             tempDatas[i].data = new List<double>();
             tempDatas[i].data.Add(i);
             double tempValue = double.Parse(float.Parse(tempData.data[i].value).ToString("0.00"));
+            //if (tempValue < 0) {
+            //    tempValue = 24.99f;
+            //}
             tempDatas[i].data.Add(tempValue);
         }
 
@@ -364,46 +392,27 @@ public class WaterTrendData_Info
 {
     public int code;
     public string msg;
-    public List<WaterInfoData> data;
+    public WaterInfoData data;
 }
 
 [Serializable]
 public class WaterInfoData
 {
-    public string createBy { get; set; }
-    public string createTime { get; set; }
-    public string updateBy { get; set; }
-    public string updateTime { get; set; }
     public string id { get; set; }
     public string addvcd { get; set; }
-    public string admauth { get; set; }
     public string atcunit { get; set; }
-    public string bgfrym { get; set; }
     public string bsnm { get; set; }
-    public object comments { get; set; }
-    public object drna { get; set; }
-    public int dstrvm { get; set; }
     public string dtmel { get; set; }
     public string dtmnm { get; set; }
-    public int dtpr { get; set; }
-    public string esstym { get; set; }
     public string frgrd { get; set; }
     public string hnnm { get; set; }
     public string lgtd { get; set; }
     public string locality { get; set; }
     public string lttd { get; set; }
-    public string phcd { get; set; }
     public string rvnm { get; set; }
-    public object stazt { get; set; }
-    public string stbk { get; set; }
     public string stcd { get; set; }
     public string stlc { get; set; }
     public string stnm { get; set; }
     public string sttp { get; set; }
     public string usfl { get; set; }
-    public string delFlag { get; set; }
-    public string dwz { get; set; }
-    public string upz { get; set; }
-    public string tgtq { get; set; }
-    public string measureTime { get; set; }
 }