Browse Source

修复诸多bug

wartheking 12 hours ago
parent
commit
c1c1e3b535

+ 2 - 2
Assets/Prefabs/UI/Thing1Title.prefab

@@ -215,12 +215,12 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Padding:
-    m_Left: 22
+    m_Left: 19
     m_Right: 0
     m_Top: 2
     m_Bottom: 0
   m_ChildAlignment: 0
-  m_Spacing: 19
+  m_Spacing: 18
   m_ChildForceExpandWidth: 0
   m_ChildForceExpandHeight: 0
   m_ChildControlWidth: 0

+ 50 - 10
Assets/Prefabs/UI/WaterTrendPanel.prefab

@@ -7988,7 +7988,7 @@ RectTransform:
   m_GameObject: {fileID: 1884876626226038780}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2657697681184236664}
@@ -14774,7 +14774,7 @@ RectTransform:
   m_GameObject: {fileID: 2034501008142644078}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2034501007576326614}
@@ -15556,7 +15556,7 @@ RectTransform:
   m_GameObject: {fileID: 2034501008273103086}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2034501009243304164}
@@ -16728,7 +16728,7 @@ RectTransform:
   m_GameObject: {fileID: 2034501008475670655}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2034501007153561317}
@@ -18596,7 +18596,7 @@ RectTransform:
   m_GameObject: {fileID: 2034501008914180638}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2034501008621006390}
@@ -32117,7 +32117,7 @@ RectTransform:
   m_GameObject: {fileID: 4544996608059761212}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1913709242357377468}
@@ -40777,7 +40777,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   isOpen: 1
-  text: "\u516B\u6708, 2025"
+  text: "\u5341\u4E00\u6708, 2025"
   color: {r: 1, g: 1, b: 1, a: 1}
   textSize: 14
   fontStyle: 1
@@ -44794,7 +44794,7 @@ RectTransform:
   m_GameObject: {fileID: 7043820139416451179}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8670710784005932134}
@@ -45256,7 +45256,7 @@ RectTransform:
   m_GameObject: {fileID: 7204469873957513120}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7491185687818382323}
@@ -49435,7 +49435,7 @@ RectTransform:
   m_GameObject: {fileID: 8003399528438951295}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 3202674770744282122}
@@ -52030,6 +52030,8 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1615489195783937459}
+  - component: {fileID: 5318978629287343536}
+  - component: {fileID: 5656003948702417887}
   m_Layer: 5
   m_Name: linePanel
   m_TagString: Untagged
@@ -52069,6 +52071,44 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 1416, y: 768}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!223 &5318978629287343536
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8663283847993886079}
+  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_AdditionalShaderChannelsFlag: 25
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!114 &5656003948702417887
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8663283847993886079}
+  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 &8671850854489670818
 GameObject:
   m_ObjectHideFlags: 0

+ 32 - 32
Assets/Prefabs/UI/XHYZT/GCYW.prefab

@@ -655,11 +655,11 @@ RectTransform:
   m_Father: {fileID: 5219339768649132530}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 180, y: -93.5}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0, y: 1}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4971575188941486933
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -3090,8 +3090,8 @@ RectTransform:
   - {fileID: 5590066728364755925}
   - {fileID: 8232805760281192270}
   - {fileID: 8539482720767388806}
-  - {fileID: 1513224520451530854}
   - {fileID: 7475487326544543041}
+  - {fileID: 1513224520451530854}
   m_Father: {fileID: 1131407422490970219}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -13522,7 +13522,7 @@ RectTransform:
   m_GameObject: {fileID: 2625165898377360695}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 5875007194187688233}
@@ -13604,7 +13604,7 @@ RectTransform:
   - {fileID: 8306062395376806498}
   - {fileID: 8911062823814085872}
   m_Father: {fileID: 8193071675008267381}
-  m_RootOrder: 18
+  m_RootOrder: 19
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -14664,8 +14664,8 @@ RectTransform:
   - {fileID: 2332465871339193063}
   - {fileID: 1086933484509706370}
   - {fileID: 5536252487757897675}
-  - {fileID: 4062620573605030190}
   - {fileID: 5338303949814302118}
+  - {fileID: 4062620573605030190}
   m_Father: {fileID: 1131407422490970219}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -23283,7 +23283,7 @@ RectTransform:
   m_Children:
   - {fileID: 9145493744779721301}
   m_Father: {fileID: 8193071675008267381}
-  m_RootOrder: 19
+  m_RootOrder: 18
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -26550,7 +26550,7 @@ RectTransform:
   m_GameObject: {fileID: 4415139308132651878}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 9002836013477540878}
@@ -28728,11 +28728,11 @@ RectTransform:
   m_Father: {fileID: 2406891624107462701}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 2, y: -0}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: -2, y: 0}
   m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0, y: 1}
+  m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &462495582803770510
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -28768,7 +28768,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
-    m_Alignment: 0
+    m_Alignment: 5
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 1
@@ -33091,7 +33091,7 @@ RectTransform:
   m_GameObject: {fileID: 5622591493188517451}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 3686270420644609119}
@@ -34383,7 +34383,7 @@ RectTransform:
   - {fileID: 7484165628857777137}
   - {fileID: 7876542488355133141}
   m_Father: {fileID: 4075118985097272875}
-  m_RootOrder: 17
+  m_RootOrder: 18
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -36789,7 +36789,7 @@ RectTransform:
   m_GameObject: {fileID: 6134032527081308747}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 223464400572846703}
@@ -37488,7 +37488,7 @@ RectTransform:
   m_Children:
   - {fileID: 4632089747577714024}
   m_Father: {fileID: 4075118985097272875}
-  m_RootOrder: 18
+  m_RootOrder: 17
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -38589,7 +38589,7 @@ RectTransform:
   m_GameObject: {fileID: 6400291158125582272}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2214229858172814563}
@@ -39384,11 +39384,11 @@ RectTransform:
   m_Father: {fileID: 7677010379907413470}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 2, y: -0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 2, y: 0}
   m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0, y: 1}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8048114927606444971
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -39424,7 +39424,7 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
-    m_Alignment: 0
+    m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 1
@@ -46241,7 +46241,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 8254527217348241512}
   m_Direction: 2
   m_Value: 0
-  m_Size: 1
+  m_Size: 0.9328047
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -46281,11 +46281,11 @@ RectTransform:
   m_Father: {fileID: 5219339768649132530}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 180, y: -93.5}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: -180, y: 0}
   m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0, y: 1}
+  m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &674957784718869988
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -47177,7 +47177,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &1131407422490970219
 RectTransform:
   m_ObjectHideFlags: 0
@@ -51563,7 +51563,7 @@ RectTransform:
   m_GameObject: {fileID: 8745713779739119116}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4975920815388312253}

+ 103 - 76
Assets/Prefabs/UI/XHYZT/RKZY.prefab

@@ -1884,6 +1884,8 @@ GameObject:
   - component: {fileID: 2088139758722139091}
   - component: {fileID: 3253581746488378782}
   - component: {fileID: 9191857314512524284}
+  - component: {fileID: 7854975422370212821}
+  - component: {fileID: 4021397882153897475}
   m_Layer: 5
   m_Name: InputField
   m_TagString: Untagged
@@ -2095,6 +2097,31 @@ MonoBehaviour:
   m_CaretWidth: 1
   m_ReadOnly: 0
   m_ShouldActivateOnSelect: 1
+--- !u!114 &7854975422370212821
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3376885197164353254}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cc33a39070010f94fb1c2dd721c1286d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  showHtmlElement: 0
+--- !u!114 &4021397882153897475
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3376885197164353254}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 56393f797a0f7e94e95547f5052052a4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &3887546505821531569
 GameObject:
   m_ObjectHideFlags: 0
@@ -6115,10 +6142,10 @@ RectTransform:
   m_Father: {fileID: 9093061655153645155}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 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_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061653251029749
 CanvasRenderer:
@@ -6921,8 +6948,8 @@ RectTransform:
   - {fileID: 9093061654171932179}
   - {fileID: 9093061653790504663}
   - {fileID: 9093061654966100337}
-  - {fileID: 9093061653547392614}
   - {fileID: 9093061653291335120}
+  - {fileID: 9093061653547392614}
   m_Father: {fileID: 9093061653547399692}
   m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -8498,7 +8525,7 @@ RectTransform:
   - {fileID: 9093061654250234089}
   - {fileID: 9093061654520656945}
   m_Father: {fileID: 9093061653288701945}
-  m_RootOrder: 20
+  m_RootOrder: 19
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -10039,10 +10066,10 @@ RectTransform:
   m_Father: {fileID: 9093061653224198802}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  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_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 30.5551}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061653390156198
 CanvasRenderer:
@@ -11175,8 +11202,8 @@ RectTransform:
   - {fileID: 9093061654473964874}
   - {fileID: 9093061654439686107}
   - {fileID: 9093061654508591210}
-  - {fileID: 9093061655173667199}
   - {fileID: 9093061654094578440}
+  - {fileID: 9093061655173667199}
   m_Father: {fileID: 9093061653547399692}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -13064,10 +13091,10 @@ RectTransform:
   m_Father: {fileID: 9093061654972545255}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 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_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &9093061653439058966
 CanvasRenderer:
@@ -15404,7 +15431,7 @@ RectTransform:
   m_Children:
   - {fileID: 9093061654502916386}
   m_Father: {fileID: 9093061653288701945}
-  m_RootOrder: 19
+  m_RootOrder: 20
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -17173,8 +17200,8 @@ RectTransform:
   - {fileID: 9093061653470972603}
   - {fileID: 9093061654687722099}
   - {fileID: 9093061653243042817}
-  - {fileID: 9093061654484229631}
   - {fileID: 9093061653995338931}
+  - {fileID: 9093061654484229631}
   m_Father: {fileID: 9093061654363556753}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -18618,10 +18645,10 @@ RectTransform:
   m_Father: {fileID: 9093061653594052294}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  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_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 30.5551}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061653670084901
 CanvasRenderer:
@@ -21321,10 +21348,10 @@ RectTransform:
   m_Father: {fileID: 9093061653762445161}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  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_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 30.5551}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061653826032820
 CanvasRenderer:
@@ -22674,8 +22701,8 @@ RectTransform:
   - {fileID: 9093061654072247880}
   - {fileID: 9093061654206497080}
   - {fileID: 9093061653641891623}
-  - {fileID: 9093061654333608751}
   - {fileID: 9093061654922658960}
+  - {fileID: 9093061654333608751}
   m_Father: {fileID: 9093061654363556753}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -24276,8 +24303,8 @@ RectTransform:
   m_Father: {fileID: 9093061655007520458}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 180.735, y: 0}
   m_SizeDelta: {x: 361.47, y: 0}
   m_Pivot: {x: 0.5, y: 1}
@@ -25418,7 +25445,7 @@ RectTransform:
   - {fileID: 9093061654420124646}
   - {fileID: 9093061654101750909}
   m_Father: {fileID: 9093061653632941889}
-  m_RootOrder: 27
+  m_RootOrder: 26
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -26523,10 +26550,10 @@ RectTransform:
   m_Father: {fileID: 9093061655153645155}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 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_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061654075877072
 CanvasRenderer:
@@ -26838,10 +26865,10 @@ RectTransform:
   m_Father: {fileID: 9093061655109922683}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  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_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 30.5551}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061654081961281
 CanvasRenderer:
@@ -27072,7 +27099,7 @@ RectTransform:
   - {fileID: 9093061654638090311}
   - {fileID: 9093061653249892629}
   m_Father: {fileID: 9093061653428426712}
-  m_RootOrder: 19
+  m_RootOrder: 18
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -27307,10 +27334,10 @@ RectTransform:
   m_Father: {fileID: 9093061655153645155}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 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_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061654110165202
 CanvasRenderer:
@@ -27765,7 +27792,7 @@ RectTransform:
   - {fileID: 9093061654616157509}
   - {fileID: 9093061654729128352}
   m_Father: {fileID: 9093061655308519380}
-  m_RootOrder: 27
+  m_RootOrder: 26
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -31611,7 +31638,7 @@ RectTransform:
   m_Children:
   - {fileID: 9093061653234529556}
   m_Father: {fileID: 9093061653915434462}
-  m_RootOrder: 26
+  m_RootOrder: 27
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -32646,7 +32673,7 @@ RectTransform:
   - {fileID: 9093061653434614468}
   - {fileID: 9093061654382310616}
   m_Father: {fileID: 9093061654506419288}
-  m_RootOrder: 27
+  m_RootOrder: 26
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -34366,7 +34393,7 @@ RectTransform:
   m_Children:
   - {fileID: 9093061653476887218}
   m_Father: {fileID: 9093061653632941889}
-  m_RootOrder: 26
+  m_RootOrder: 27
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -35099,8 +35126,8 @@ RectTransform:
   - {fileID: 9093061654547690391}
   - {fileID: 9093061654503076447}
   - {fileID: 9093061654759647064}
-  - {fileID: 9093061655340129781}
   - {fileID: 9093061654399081119}
+  - {fileID: 9093061655340129781}
   m_Father: {fileID: 9093061654363556753}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -36370,7 +36397,7 @@ RectTransform:
   m_Children:
   - {fileID: 9093061653333981062}
   m_Father: {fileID: 9093061655308519380}
-  m_RootOrder: 26
+  m_RootOrder: 27
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -38714,10 +38741,10 @@ RectTransform:
   m_Father: {fileID: 9093061654972545255}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 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: 21}
+  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_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061654650731069
 CanvasRenderer:
@@ -39882,10 +39909,10 @@ RectTransform:
   m_Father: {fileID: 9093061654972545255}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 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_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &9093061654711297927
 CanvasRenderer:
@@ -40506,10 +40533,10 @@ RectTransform:
   m_Father: {fileID: 9093061653762445161}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  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_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 30.5551}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061654753997887
 CanvasRenderer:
@@ -43676,7 +43703,7 @@ RectTransform:
   - {fileID: 9093061654642475065}
   - {fileID: 9093061655299507566}
   m_Father: {fileID: 9093061653915434462}
-  m_RootOrder: 27
+  m_RootOrder: 26
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -50136,7 +50163,7 @@ RectTransform:
   m_Children:
   - {fileID: 9093061655282686621}
   m_Father: {fileID: 9093061653428426712}
-  m_RootOrder: 18
+  m_RootOrder: 19
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -51668,10 +51695,10 @@ RectTransform:
   m_Father: {fileID: 9093061655109922683}
   m_RootOrder: 1
   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: -15.27755}
-  m_SizeDelta: {x: 15, y: 30.5551}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 30.5551}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061655252027404
 CanvasRenderer:
@@ -52856,10 +52883,10 @@ RectTransform:
   m_Father: {fileID: 9093061653224198802}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  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_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 30.5551}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061655287619152
 CanvasRenderer:
@@ -53370,8 +53397,8 @@ RectTransform:
   - {fileID: 9093061654029534039}
   - {fileID: 9093061654993506973}
   - {fileID: 9093061655336903256}
-  - {fileID: 9093061654518704622}
   - {fileID: 9093061654135754304}
+  - {fileID: 9093061654518704622}
   m_Father: {fileID: 9093061654363556753}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -54263,10 +54290,10 @@ RectTransform:
   m_Father: {fileID: 9093061653594052294}
   m_RootOrder: 1
   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: -15.27755}
-  m_SizeDelta: {x: 15, y: 30.5551}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 30.5551}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061655308691109
 CanvasRenderer:
@@ -54547,7 +54574,7 @@ RectTransform:
   m_Children:
   - {fileID: 9093061654544985612}
   m_Father: {fileID: 9093061654506419288}
-  m_RootOrder: 26
+  m_RootOrder: 27
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}

File diff suppressed because it is too large
+ 840 - 35
Assets/Prefabs/UI/XHYZT/XHDD.prefab


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


+ 8 - 2
Assets/Scripts/UI/UIView/BigScreen/BigScreenLayer.cs

@@ -491,6 +491,8 @@ public class BigScreenLayer : MonoBehaviour
         }
 
         string swH = "-";
+
+
         for (int i = 0; i < GlobalData.swDatas.Count; i++) {
             if (GlobalData.swDatas[i].stnm == swkey) {
                 swH = GlobalData.swDatas[i].upz;
@@ -503,6 +505,7 @@ public class BigScreenLayer : MonoBehaviour
         {
             if (GlobalData.qXZDatas[i].STNM.Contains(qxKey))
             {
+                
                 qxIndex = i;
                 break;
             }
@@ -511,7 +514,7 @@ public class BigScreenLayer : MonoBehaviour
         int swIndex = 0;
         for (int i = 0; i < GlobalData.sWZDatas.Count; i++)
         {
-            if (GlobalData.sWZDatas[i].STNM.Contains(swkey))
+            if (GlobalData.sWZDatas[i].STNM.Contains(swKey))
             {
                 swIndex = i;
                 break;
@@ -519,7 +522,10 @@ public class BigScreenLayer : MonoBehaviour
         }
 
         swValue1.text = swH.ToString();
-        swValue2.text = GlobalData.qXZDatas[qxIndex].dropSum6.ToString();
+
+
+        swValue2.text = GlobalData.sWZDatas[qxIndex].dropSum6.ToString();
+        
         string we = GlobalData.sWZDatas[swIndex].wth.ToString();
         string weatherText = "";
         switch (we)

+ 1 - 1
Assets/Scripts/UI/UIView/XHDD/XHDDLayer.cs

@@ -339,7 +339,7 @@ public class XHDDLayer : YZTRootLayer
     private void InitUpLeft()
     {
         yanmomianjiText.text = $"{GlobalData.schedulingData.data.risk_information.submerged_area} <size=14><color=#A5BFE2>k㎡</color></size>";
-        yanmogengdiText.text = $"{GlobalData.schedulingData.data.risk_information.submerged_farmland_area} <size=14><color=#A5BFE2>h㎡</color></size>";
+        yanmogengdiText.text = $"{GlobalData.schedulingData.data.risk_information.submerged_farmland_area} <size=14><color=#A5BFE2>k㎡</color></size>";
         yingxiangrenkouText.text = $"{GlobalData.schedulingData.data.risk_information.affected_population} <size=14><color=#A5BFE2>万人</color></size>";
         gDPText.text = $"{GlobalData.schedulingData.data.risk_information.submerged_area_gdp} <size=14><color=#A5BFE2>亿元</color></size>";
         hongshuisunshiText.text = $"{GlobalData.schedulingData.data.risk_information.flood_loss} <size=14><color=#A5BFE2>亿元</color></size>";

+ 129 - 31
Assets/Scripts/UI/UIView/YZT/WaterTrendPanel.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Best.HTTP.JSON;
 using Bitsplash.DatePicker;
@@ -11,6 +12,7 @@ using XCharts.Runtime;
 
 public class WaterTrendPanel : MonoBehaviour
 {
+
     public LineChart _LineChart;
     public Text nameText;
     public GameObject listItemOri;
@@ -65,9 +67,10 @@ public class WaterTrendPanel : MonoBehaviour
         listRoot = this.transform.Find("linePanel/ScrollView/Viewport/Content").transform;
         closeButton = this.transform.Find("CloseButton").GetComponent<Button>();
         nameText = this.transform.Find("nameText").GetComponent<Text>();
-        closeButton.onClick.AddListener(() => {
+        closeButton.onClick.AddListener(() =>
+        {
             print(111);
-            Hide(); 
+            Hide();
         });
     }
 
@@ -93,7 +96,7 @@ public class WaterTrendPanel : MonoBehaviour
             if (lineChartBtn.GetComponent<CanvasGroup>().alpha < 1)
             {
                 ChangePanel(0);
-                ShowTrend(currentStcd, currentName,currentType);
+                ShowTrend(currentStcd, currentName, currentType);
             }
         });
         infoBtn.onClick.AddListener(() =>
@@ -107,7 +110,7 @@ public class WaterTrendPanel : MonoBehaviour
 
         searchButton.onClick.AddListener(() =>
         {
-            ShowTrend(currentStcd, currentName, currentType);
+            ShowTrend(currentStcd, currentName, currentType, false);
         });
     }
 
@@ -197,7 +200,9 @@ public class WaterTrendPanel : MonoBehaviour
         }
     }
 
-    public async Task ShowTrend(string stcd, string name,int type)
+
+
+    public async Task ShowTrend(string stcd, string name, int type, bool useDefault = true)
     {
         var tempSeries = _LineChart.series;
         tempSeries[0].data.Clear();
@@ -210,22 +215,35 @@ public class WaterTrendPanel : MonoBehaviour
             }
         }
         listObj.Clear();
-        
+
+
         string endTime = DateTime.Now.ToString("yyyy-MM-dd");
         string startTime = DateTime.Now.AddMonths(-3).ToString("yyyy-MM-dd");
 
-        startDateStr = startTime;
-        endDateStr = endTime;
-        DatePicker_Start.SetLabelText(startTime);
-        DatePicker_End.SetLabelText(endTime);
-        
+        if (useDefault)
+        {
+            startDateStr = startTime;
+            endDateStr = endTime;
+            DatePicker_Start.SetLabelText(startTime);
+            DatePicker_End.SetLabelText(endTime);
+        }
+        else
+        {
+
+            startDateStr = DatePicker_Start.Label.text;
+            endDateStr = DatePicker_End.Label.text;
+        }
+
+        Debug.Log(startDateStr);
+        Debug.Log(endDateStr);
         currentType = type;
         if (type == 0)
         {
             threePanel.gameObject.SetActive(true);
             typeTitle.text = "站点水位趋势";
         }
-        else {
+        else
+        {
             threePanel.gameObject.SetActive(false);
             typeTitle.text = "站点降雨趋势";
         }
@@ -237,11 +255,13 @@ public class WaterTrendPanel : MonoBehaviour
         nameText.text = $"站点:{name}";
         this.gameObject.SetActive(true);
         string chartJsonStr = "";
-        if (type == 0) {
+        if (type == 0)
+        {
             _LineChart.GetChartComponent<YAxis>().axisName.name = "水位(m)";
             chartJsonStr = await HttpHelper._Instance.GetWaterTrend_Chart(stcd, startDateStr, endDateStr);
         }
-        else{
+        else
+        {
             _LineChart.GetChartComponent<YAxis>().axisName.name = "降雨量(mm)";
             chartJsonStr = await HttpHelper._Instance.GetDropTrend_Chart(stcd, startDateStr, endDateStr);
         }
@@ -250,7 +270,8 @@ public class WaterTrendPanel : MonoBehaviour
             bythreePanel.gameObject.SetActive(true);
             taokouthreePanel.gameObject.SetActive(false);
         }
-        else {
+        else
+        {
             bythreePanel.gameObject.SetActive(false);
             taokouthreePanel.gameObject.SetActive(true);
         }
@@ -326,7 +347,8 @@ public class WaterTrendPanel : MonoBehaviour
             tempDatas[i].data = new List<double>();
             tempDatas[i].data.Add(i);
             string valueTex = tempData.data[i].value;
-            if (valueTex == "-") {
+            if (valueTex == "-")
+            {
                 valueTex = "-1";
             }
             double tempValue = double.Parse(float.Parse(valueTex).ToString("0.00"));
@@ -339,44 +361,120 @@ public class WaterTrendPanel : MonoBehaviour
         tempSeries[0].data.Clear();
         tempSeries[0].data.AddRange(tempDatas);
     }
+    private float? TryParseFloat(string s)
+    {
+        if (string.IsNullOrWhiteSpace(s))
+            return null;
 
+        s = s.Trim();
+
+        // 常见无效值直接忽略
+        if (s == "-" || s == "--" || s == "—" || s.ToLower() == "nan")
+            return null;
+
+        // 抽取字符串中的数字字符(比如 "26.5米")
+        string num = "";
+        foreach (char c in s)
+        {
+            if ((c >= '0' && c <= '9') || c == '.' || c == '-')
+                num += c;
+        }
+
+        if (float.TryParse(num, out float result))
+            return result;
+
+        return null;
+    }
     IEnumerator CreatList(string jsonData)
     {
         var wait = new WaitForEndOfFrame();
         WaterTrendData_Chart tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<WaterTrendData_Chart>(jsonData);
 
+        //=========================
+        // 1. 按天分组
+        //=========================
+        var groups = tempData.data
+            .GroupBy(x => DateTime.Parse(x.time).ToString("yyyy-MM-dd"))
+            .OrderByDescending(g => g.Key)   // 日期降序
+            .ToList();
+
+        //=========================
+        // 2. 生成每天的数据(平均值)
+        //=========================
+        List<(string date, float avgValue, int trend)> dayList =
+            new List<(string, float, int)>();
+
+        foreach (var g in groups)
+        {
+            var validValues = g
+    .Select(v => TryParseFloat(v.value))
+    .Where(v => v.HasValue)      // 只保留有效数字
+    .Select(v => v.Value)
+    .ToList();
+
+            float avg = validValues.Count > 0 ? validValues.Average() : 0f;
+            dayList.Add((g.Key, avg, 0)); // trend 后面再算
+        }
+
+        //=========================
+        // 3. 计算趋势 trend(与下一天比较)
+        //=========================
+        for (int i = 0; i < dayList.Count - 1; i++)
+        {
+            float today = dayList[i].avgValue;
+            float yesterday = dayList[i + 1].avgValue;
+
+            int t = 0;
+            if (today > yesterday) t = 1;  // 上升
+            else if (today < yesterday) t = 3; // 下降(你原来下降用 3)
+            else t = 2; // 持平(你原来持平是 2 → →)
 
+            dayList[i] = (dayList[i].date, dayList[i].avgValue, t);
+        }
+
+        // 最后一条没有下一天,趋势设为 -
+        dayList[dayList.Count - 1] = (dayList.Last().date, dayList.Last().avgValue, 2);
+
+        //=========================
+        // 4. 生成 UI
+        //=========================
         int creatCount = 0;
-        for (int i = 0; i < tempData.data.Count; i++)
+        listObj.Clear();
+
+        for (int i = 0; i < dayList.Count; i++)
         {
             GameObject tempObj = Instantiate(listItemOri, listRoot);
+
             tempObj.transform.Find("id").GetComponent<Text>().text = $"{i + 1}";
-            tempObj.transform.Find("time").GetComponent<Text>().text = $"{tempData.data[i].time}";
-            tempObj.transform.Find("value").GetComponent<Text>().text = $"{tempData.data[i].value}";
+            tempObj.transform.Find("time").GetComponent<Text>().text = dayList[i].date;
+            tempObj.transform.Find("value").GetComponent<Text>().text = dayList[i].avgValue.ToString("0.00");
+
+            // 设置趋势字符和颜色
             string dirStr = "-";
-            if (tempData.data[i].trend == 1)
+            var trendTxt = tempObj.transform.Find("trend").GetComponent<Text>();
+
+            if (dayList[i].trend == 1)
             {
-                dirStr = "↑";
-                tempObj.transform.Find("trend").GetComponent<Text>().color = Color.red;
+                dirStr = "↑"; trendTxt.color = Color.red;
             }
-            else if (tempData.data[i].trend == 2)
+            else if (dayList[i].trend == 2)
             {
-                dirStr = "→";
-                tempObj.transform.Find("trend").GetComponent<Text>().color = Color.blue;
+                dirStr = "→"; trendTxt.color = Color.blue;
             }
-            else if (tempData.data[i].trend == 3)
+            else if (dayList[i].trend == 3)
             {
-                dirStr = "↓";
-                tempObj.transform.Find("trend").GetComponent<Text>().color = Color.green;
+                dirStr = "↓"; trendTxt.color = Color.green;
             }
             else
             {
-                dirStr = "-";
-                tempObj.transform.Find("trend").GetComponent<Text>().color = Color.white;
+                trendTxt.color = Color.white;
             }
 
-            tempObj.transform.Find("trend").GetComponent<Text>().text = $"{dirStr}";
+            trendTxt.text = dirStr;
+
             listObj.Add(tempObj);
+
+            // 分帧生成
             creatCount++;
             if (creatCount >= 10)
             {

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