提交

Assets/Art/UI/YZT/B03/B03.spriteatlas

@@ -0,0 +1,112 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!687078895 &4343727234628468602
+SpriteAtlas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: B03
+  serializedVersion: 2
+  m_EditorData:
+    serializedVersion: 2
+    textureSettings:
+      serializedVersion: 2
+      anisoLevel: 1
+      compressionQuality: 50
+      maxTextureSize: 2048
+      textureCompression: 0
+      filterMode: 1
+      generateMipMaps: 0
+      readable: 0
+      crunchedCompression: 0
+      sRGB: 1
+    platformSettings:
+    - serializedVersion: 3
+      m_BuildTarget: DefaultTexturePlatform
+      m_MaxTextureSize: 1024
+      m_ResizeAlgorithm: 0
+      m_TextureFormat: -1
+      m_TextureCompression: 1
+      m_CompressionQuality: 80
+      m_CrunchedCompression: 1
+      m_AllowsAlphaSplitting: 0
+      m_Overridden: 0
+      m_AndroidETC2FallbackOverride: 0
+      m_ForceMaximumCompressionQuality_BC6H_BC7: 0
+    packingSettings:
+      serializedVersion: 2
+      padding: 8
+      blockOffset: 1
+      allowAlphaSplitting: 0
+      enableRotation: 0
+      enableTightPacking: 1
+      enableAlphaDilation: 0
+    secondaryTextureSettings: {}
+    variantMultiplier: 1
+    packables:
+    - {fileID: 102900000, guid: a6aa12c542a8b6c45acb132778a342bf, type: 3}
+    bindAsDefault: 1
+    isAtlasV2: 0
+    cachedData: {fileID: 0}
+  m_MasterAtlas: {fileID: 0}
+  m_PackedSprites:
+  - {fileID: 21300000, guid: 33496310ce233d24f9170dc58b6c3351, type: 3}
+  - {fileID: 21300000, guid: e629fea0096f1484c9a566a089871059, type: 3}
+  - {fileID: 21300000, guid: 8efb22418ae29e046b71e2467a40063e, type: 3}
+  - {fileID: 21300000, guid: f885acd2b0666b54298d1010764ee337, type: 3}
+  - {fileID: 21300000, guid: 6fe3b223680970d40b866e026e410e4a, type: 3}
+  - {fileID: 21300000, guid: d0d9eb832951a734c821e6d68ae8e476, type: 3}
+  - {fileID: 21300000, guid: cd97b0938952e2f48b8e32adec9886c5, type: 3}
+  - {fileID: 21300000, guid: 0ddd806491d940c4a9f2d160414d7308, type: 3}
+  - {fileID: 21300000, guid: 19e48e25b6f8bd246bfd056a807d7dba, type: 3}
+  - {fileID: 21300000, guid: 94e0e396963e1404da9b15aec51a2930, type: 3}
+  - {fileID: 21300000, guid: 55f825a690344984e9be093dfa00bed5, type: 3}
+  - {fileID: 21300000, guid: d2d0a157101c938438fc7532370a958a, type: 3}
+  - {fileID: 21300000, guid: 24ce4367e029eb94eadb9d73caa4a56b, type: 3}
+  - {fileID: 21300000, guid: 4555e9089b04b854bb074b4176fca4d5, type: 3}
+  - {fileID: 21300000, guid: 300343385e60c9c45b89e7e2bb346097, type: 3}
+  - {fileID: 21300000, guid: f7c9c2887de53cd4f90929a0b0c9e422, type: 3}
+  - {fileID: 21300000, guid: 8543fa985243ed44cb05929f5b7116c0, type: 3}
+  - {fileID: 21300000, guid: 510f0f69dfd836c45af30c789d5f836d, type: 3}
+  - {fileID: 21300000, guid: 3e9bd81ca4a29834bbc0afd525451e5c, type: 3}
+  - {fileID: 21300000, guid: 42e4243c26c2738489da870263ba50a7, type: 3}
+  - {fileID: 21300000, guid: 2d73a88c2ed06f2408964c4cbdb8b9ff, type: 3}
+  - {fileID: 21300000, guid: abacb12dc9f612443a3ad605507839b0, type: 3}
+  - {fileID: 21300000, guid: 140e315d0b9bcea4c9e811fadb1deeac, type: 3}
+  - {fileID: 21300000, guid: 2688ec8d789687047ba943349cd3deb5, type: 3}
+  - {fileID: 21300000, guid: 84c9e7dd79e6b994585274231e3e7367, type: 3}
+  - {fileID: 21300000, guid: 4cb67aed8f7ab5d40962e13e00c21f95, type: 3}
+  - {fileID: 21300000, guid: a92cccfe1543d834da24f37b4a10b336, type: 3}
+  m_PackedSpriteNamesToIndex:
+  - img_t_wp
+  - icon_geyl@2x
+  - img_cctv_default@2x
+  - icon_monitor01@2x
+  - btn_layer2f@2x
+  - icon_monitor03@2x
+  - img_dot_tq@2x
+  - img_t_bd (1)
+  - img_t_tq@2x
+  - img_t_jyl@2x
+  - icon_ge04@2x
+  - img_hotdot01@2x
+  - img_t_bd
+  - "icon_reduce\u200C\u200C@2x"
+  - icon_monitor02@2x
+  - "\u53D6\u6D88\u5168\u5C4F"
+  - img_dot_bd
+  - btn_layer2@2x
+  - img_card01_bg@2x
+  - img_dot_wp
+  - icon_monitor05@2x
+  - "icon_e\u200Cnlarge\u200C@2x"
+  - img_t_cctv
+  - icon_search
+  - icon_monitor04@2x
+  - icon_monitor06@2x
+  - "\u5168\u5C4F"
+  m_RenderDataMap: {}
+  m_Tag: B03
+  m_IsVariant: 0
+  m_IsPlaceholder: 0

Assets/Art/UI/YZT/B03/B03.spriteatlas.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e2433bff0de3fdd45a0cf1baf0f3f808
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 4343727234628468602
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/UI/YZT/B06/B06.spriteatlas

@@ -36,10 +36,10 @@ SpriteAtlas:
       m_ForceMaximumCompressionQuality_BC6H_BC7: 0
     packingSettings:
       serializedVersion: 2
-      padding: 4
+      padding: 8
       blockOffset: 1
       allowAlphaSplitting: 0
-      enableRotation: 1
+      enableRotation: 0
       enableTightPacking: 1
       enableAlphaDilation: 0
     secondaryTextureSettings: {}

Assets/Prefabs/UI/Thing3.prefab

@@ -116,7 +116,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 72.4284, y: 21}
+  m_SizeDelta: {x: 96.78, y: 21}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4637747037617293179
 CanvasRenderer:
@@ -303,7 +303,7 @@ MonoBehaviour:
     m_Top: 4
     m_Bottom: 0
   m_ChildAlignment: 0
-  m_Spacing: 17.2
+  m_Spacing: 7.3
   m_ChildForceExpandWidth: 0
   m_ChildForceExpandHeight: 0
   m_ChildControlWidth: 0

Assets/Prefabs/UI/XHYZT/GCJK.prefab

@@ -3031,9 +3031,9 @@ RectTransform:
   m_Father: {fileID: 3354133862894986270}
   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: 24, y: 15}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 25}
   m_SizeDelta: {x: 42, y: 28}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3982356792818984929
@@ -3581,9 +3581,9 @@ RectTransform:
   m_Father: {fileID: 2146876931257834186}
   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: 24, y: 15}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 25}
   m_SizeDelta: {x: 42, y: 28}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4599362671811950347
@@ -4487,9 +4487,9 @@ RectTransform:
   m_Father: {fileID: 4120629752531717880}
   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: 24, y: 15}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 25}
   m_SizeDelta: {x: 42, y: 28}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5791299962539647223
@@ -12974,9 +12974,9 @@ RectTransform:
   m_Father: {fileID: 3670116889200827555}
   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: 24, y: 15}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 25}
   m_SizeDelta: {x: 42, y: 28}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2617964526128221878

Assets/Prefabs/UI/XHYZT/YZT.prefab

@@ -832,7 +832,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u6570\u636E"
+  m_Text: '-'
 --- !u!1 &111373237
 GameObject:
   m_ObjectHideFlags: 0
@@ -2956,7 +2956,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u6570\u636E"
+  m_Text: '-'
 --- !u!1 &267820602
 GameObject:
   m_ObjectHideFlags: 0
@@ -3195,8 +3195,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 11.8, y: 15.689}
-  m_SizeDelta: {x: 55.5679, y: 17.8849}
+  m_AnchoredPosition: {x: 20.019, y: 12.788976}
+  m_SizeDelta: {x: 71.108, y: 25}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &279696818
 CanvasRenderer:
@@ -3319,7 +3319,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u6570\u636E"
+  m_Text: '-'
 --- !u!1 &287181995
 GameObject:
   m_ObjectHideFlags: 0
@@ -4281,8 +4281,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 8.6512, y: 14.8}
-  m_SizeDelta: {x: 69.0677, y: 17.8849}
+  m_AnchoredPosition: {x: 15.07, y: 11.9}
+  m_SizeDelta: {x: 81.007, y: 25}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &366584628
 CanvasRenderer:
@@ -8818,8 +8818,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 12.1499, y: 14.6}
-  m_SizeDelta: {x: 69.0677, y: 17.8849}
+  m_AnchoredPosition: {x: 16.819, y: 11.699976}
+  m_SizeDelta: {x: 77.508, y: 25}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &790210337
 CanvasRenderer:
@@ -9605,7 +9605,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u6570\u636E"
+  m_Text: '-'
 --- !u!1 &860708591
 GameObject:
   m_ObjectHideFlags: 0
@@ -11928,8 +11928,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 16.5, y: 14.8}
-  m_SizeDelta: {x: 69.0677, y: 17.8849}
+  m_AnchoredPosition: {x: 16.948792, y: 11.899976}
+  m_SizeDelta: {x: 69.0677, y: 25}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &997833192
 CanvasRenderer:
@@ -15518,8 +15518,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 7.9, y: 14.4}
-  m_SizeDelta: {x: 55.5679, y: 17.8849}
+  m_AnchoredPosition: {x: 18.069, y: 11.499975}
+  m_SizeDelta: {x: 75.008, y: 25}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1285888504
 CanvasRenderer:
@@ -16162,7 +16162,7 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: -1.75, y: 0}
   m_SizeDelta: {x: 3.5, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -16552,7 +16552,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u6570\u636E"
+  m_Text: '-'
 --- !u!1 &1398231329
 GameObject:
   m_ObjectHideFlags: 0
@@ -18578,8 +18578,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 7.9, y: 14.4}
-  m_SizeDelta: {x: 55.5679, y: 17.8849}
+  m_AnchoredPosition: {x: 18.069, y: 11.499975}
+  m_SizeDelta: {x: 75.008, y: 25}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1530098271
 CanvasRenderer:
@@ -18782,7 +18782,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u4E0A\u4E0B\u6E38\u5E73\u5747\u6C34\u4F4D/m"
+  m_Text: "\u5957\u53E3\u95F8\u4E0A\u6C34\u4F4D/m"
 --- !u!1 &1541978817
 GameObject:
   m_ObjectHideFlags: 0
@@ -22848,7 +22848,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u5957\u53E3\u6C34\u4F4D\u9884\u8B66"
+  m_Text: "\u6C34\u4F4D\u9884\u8B66"
 --- !u!1 &1869693590
 GameObject:
   m_ObjectHideFlags: 0
@@ -24878,7 +24878,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u6570\u636E"
+  m_Text: '-'
 --- !u!1 &1999391588
 GameObject:
   m_ObjectHideFlags: 0
@@ -25144,9 +25144,9 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 3, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &2024640554
 CanvasRenderer:
@@ -25552,7 +25552,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -0.00072289, y: 2.9}
-  m_SizeDelta: {x: 78.964, y: 30}
+  m_SizeDelta: {x: 122.3, y: 30}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2047151648
 CanvasRenderer:
@@ -25595,7 +25595,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u5F53\u524D\u6C34\u4F4D/m"
+  m_Text: "\u5957\u53E3\u95F8\u4E0A\u6C34\u4F4D/m"
 --- !u!1 &2064555531
 GameObject:
   m_ObjectHideFlags: 0

Assets/Prefabs/UI/ZhanDian.prefab

@@ -0,0 +1,398 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1525479508429665687
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1629275062327970966}
+  - component: {fileID: 5077393164671107454}
+  - component: {fileID: 1569833494337859433}
+  m_Layer: 5
+  m_Name: numText
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1629275062327970966
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1525479508429665687}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8821829153516425849}
+  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: 19, y: -31}
+  m_SizeDelta: {x: 40, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5077393164671107454
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1525479508429665687}
+  m_CullTransparentMesh: 1
+--- !u!114 &1569833494337859433
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1525479508429665687}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
+    m_FontSize: 20
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 1
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: '- <size=14><color=#A5BBE2>m</color></size>'
+--- !u!1 &4089601786532735096
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4903605270187530682}
+  - component: {fileID: 402433400722566893}
+  - component: {fileID: 7454955921097678960}
+  m_Layer: 5
+  m_Name: title (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4903605270187530682
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4089601786532735096}
+  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_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7072228678429717004}
+  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: 28, y: -28}
+  m_SizeDelta: {x: 56, y: 56}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &402433400722566893
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4089601786532735096}
+  m_CullTransparentMesh: 1
+--- !u!114 &7454955921097678960
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4089601786532735096}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.08235294, g: 0.8627451, b: 0.9882353, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
+    m_FontSize: 26
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 224
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 1
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 1st
+--- !u!1 &5666608153428404762
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8828487746713744763}
+  - component: {fileID: 2512767955150462427}
+  - component: {fileID: 8576383593606618370}
+  m_Layer: 5
+  m_Name: ZhanDian
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8828487746713744763
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5666608153428404762}
+  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_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 7072228678429717004}
+  - {fileID: 8821829153516425849}
+  m_Father: {fileID: 0}
+  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: 86, y: -94}
+  m_SizeDelta: {x: 172, y: 84}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2512767955150462427
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5666608153428404762}
+  m_CullTransparentMesh: 1
+--- !u!114 &8576383593606618370
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5666608153428404762}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 0b9eb8aa7943cc24785c67192fe66728, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &5837758863966483342
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8821829153516425849}
+  - component: {fileID: 3930887372748340453}
+  - component: {fileID: 5579520695054729288}
+  m_Layer: 5
+  m_Name: nameText
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8821829153516425849
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5837758863966483342}
+  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_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1629275062327970966}
+  m_Father: {fileID: 8828487746713744763}
+  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: 110, y: -30.5}
+  m_SizeDelta: {x: 70, y: 25}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3930887372748340453
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5837758863966483342}
+  m_CullTransparentMesh: 1
+--- !u!114 &5579520695054729288
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5837758863966483342}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.64705884, g: 0.73333335, b: 0.8862745, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
+    m_FontSize: 16
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u7AD9\u70B9\u540D\u79F0"
+--- !u!1 &8438154228443758505
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7072228678429717004}
+  - component: {fileID: 2235333794585569348}
+  - component: {fileID: 2221156622047705453}
+  m_Layer: 5
+  m_Name: bg
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7072228678429717004
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8438154228443758505}
+  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_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 4903605270187530682}
+  m_Father: {fileID: 8828487746713744763}
+  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: 44, y: -42}
+  m_SizeDelta: {x: 56, y: 56}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2235333794585569348
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8438154228443758505}
+  m_CullTransparentMesh: 1
+--- !u!114 &2221156622047705453
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8438154228443758505}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: efcad6ea20ff4ca4fbbf434f54dbb1e0, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1

Assets/Prefabs/UI/ZhanDian.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 4a2b54fe3fb7dc3448def41df2eefcfc
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/HttpHelper.cs

@@ -1421,9 +1421,15 @@ public class HttpHelper : MonoBehaviour
                 // 提取data字段的值
                 JToken dataToken = jsonObject["data"];
                 JToken codeToken = jsonObject["code"];
+                //Debug.LogError(dataToken);
                 if (codeToken.ToString() == "200")
                 {
+                    //Debug.LogError(200);
                     GlobalData.swDatas = JsonConvert.DeserializeObject<List<StationData>>(dataToken.ToString());
+                    //Debug.LogError(GlobalData.swDatas.Count);
+                    for (int i = 0; i < GlobalData.swDatas.Count; i++) {
+                        GlobalData.swDatas[i].stnm = GlobalData.swDatas[i].stnm.Replace("（闸下）","(下)").Replace("（闸上）", "(上)").Replace("(闸上)","上").Replace("(闸下)", "下");
+                    }
                 }
                 else
                 {
@@ -1431,20 +1437,20 @@ public class HttpHelper : MonoBehaviour
                     successInternet = false;
                 }
 
-                for (int i = 0; i < GlobalData.BuYuanShuiWeiDataList.Count; i++)
-                {
-                    StationData stationData = new StationData();
-                    stationData.LGTD = 113.910187f;
-                    stationData.LTTD = 30.1765823f;
-                    stationData.STNM = GlobalData.BuYuanShuiWeiDataList[i].name;
-                    stationData.upz = GlobalData.BuYuanShuiWeiDataList[i].name.Contains("上")
-                        ? GlobalData.BuYuanShuiWeiDataList[i].value
-                        : -1;
-                    stationData.dwz = GlobalData.BuYuanShuiWeiDataList[i].name.Contains("下")
-                        ? GlobalData.BuYuanShuiWeiDataList[i].value
-                        : -1;
-                    GlobalData.swDatas.Add(stationData);
-                }
+                //for (int i = 0; i < GlobalData.BuYuanShuiWeiDataList.Count; i++)
+                //{
+                //    StationData stationData = new StationData();
+                //    stationData.LGTD = 113.910187f;
+                //    stationData.LTTD = 30.1765823f;
+                //    stationData.STNM = GlobalData.BuYuanShuiWeiDataList[i].name;
+                //    stationData.upz = GlobalData.BuYuanShuiWeiDataList[i].name.Contains("上")
+                //        ? GlobalData.BuYuanShuiWeiDataList[i].value
+                //        : -1;
+                //    stationData.dwz = GlobalData.BuYuanShuiWeiDataList[i].name.Contains("下")
+                //        ? GlobalData.BuYuanShuiWeiDataList[i].value
+                //        : -1;
+                //    GlobalData.swDatas.Add(stationData);
+                //}
             }
         }
         catch (Exception e)

Assets/Scripts/UI/Tools/ServerAddress.cs

@@ -62,7 +62,7 @@ public class ServerAddress
     /// <summary>
     /// 获取重点地区水位检测数据
     /// </summary>
-    public static string APIGetGeSWData = YZTServerPYAddress + "/get-sw-height-data";
+    public static string APIGetGeSWData = YZTServerAddress + "/open/open-share-data/get-sw-height-data";
 
     /// <summary>
     /// 获取三线水位数据

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

@@ -15,8 +15,10 @@ public class SWHeightUnit : MonoBehaviour
     {
         
     }
-    public void Init(double lgtd, double lttd, string na, string we)
+    public void Init(string slgtd, string slttd, string na, string we)
     {
+        double lgtd = double.Parse(slgtd);
+        double lttd = double.Parse(slttd);
         Vector3 temp = CoordinateConverter.GeoToUGUI(lgtd, lttd);
         
         nameText.text = na;

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

@@ -21,51 +21,37 @@ public enum shuiWeiYuJingDataType
 [System.Serializable]
 public class StationData:IComparable
 {
-    public string ADDVCD = "421083";
-    public string ADMAUTH = "荆州水文";
-    public string ATCUNIT = "荆州市水文局";
-    public string BGFRYM = "201404";
-    public string BSNM = "长江";
-    public string COMMENTS = "中小河流";
-    public string DRNA; // null, 用string表示
-    public string DTMNM = "吴淞";
-    public string ESSTYM = "201404";
-    public string FRGRD = "3";
-    public string HNNM = "内荆河";
-    public float LGTD = 113.209264f;
-    public string LOCALITY = "湖北水文";
-    public float LTTD = 29.960969f;
-    public string MODITIME = "2022-02-23";
-    public string PHCD = "ZBYZS";
-    public int ROWNUM_ = 185;
-    public string RVNM = "子贝渊河";
-    public string STAZT; // null, 用string表示
-    public string STBK = "0";
-    public string STCD = "61016161";
-    public string STLC = "荆州市洪湖市瞿家湾镇月池村一组";
-    public string STNM = "子贝渊（闸上）";
-    public string STTP = "DD";
-    public string USFL = "1";
-    public float dwz; // null, 用string表示
-    public float tgtq; // null, 用string表示
-    public float upz = 25.5f;
+    public string stnm;      // 站名
+    public string lgtd;      // 经度
+    public string lttd;      // 纬度
+    public string stcd;      // 站码
+
+    public float? upz;       // 上水位
+    public float? dwz;       // 下水位
+    public float? tgtq;      // 流量
+    public string tm;        // 时间
+
+    public string swchrcd;
+    public string msqmt;
+    public string sdwwptn;
+    public string supwptn;
+    public string rownum_;
 
     public int CompareTo(object obj)
     {
-        StationData other = (StationData)obj;
-        float max = MathF.Max(dwz, upz);
-        float max1 = MathF.Max(other.dwz, other.upz);
-        if (max > max1)
-        {
+        if (obj is not StationData other)
+            return 1; // 或抛异常 throw new ArgumentException("Invalid comparison");
+
+        float thisMax = MathF.Max(dwz ?? 0, upz ?? 0);
+        float otherMax = MathF.Max(other.dwz ?? 0, other.upz ?? 0);
+
+        // 降序：最大值排前面
+        if (thisMax > otherMax)
             return -1;
-        }
-        else if (max < max1)
-        {
+        else if (thisMax < otherMax)
             return 1;
-        }
-        else {
+        else
             return 0;
-        }
     }
 }
 
@@ -142,7 +128,9 @@ public class StationData:IComparable
     private Transform _shuiWeiIconContent;
     private bool creatShuiWeiIcon = false;
 
-    public GameObject[] zdpmObjs;
+    public GameObject zdpmParent;
+    public GameObject zdpmPrefab;
+    //public GameObject[] zdpmObjs;
 
     private void Awake()
     {
@@ -195,12 +183,16 @@ public class StationData:IComparable
     }
 
     public void RefreshThreeLevel() {
-        if (GlobalData.threeLevelShuiWeiDatas.Count < 1 || GlobalData.BuYuanShuiWeiDataList.Count < 1)
+        //if (GlobalData.threeLevelShuiWeiDatas.Count < 1 || GlobalData.BuYuanShuiWeiDataList.Count < 1)
+        //    return;
+        if (GlobalData.swDatas.Count < 1)
             return;
-        if (currentDataType == shuiWeiYuJingDataType.BuYuan) {
 
-            float value1 = GlobalData.BuYuanShuiWeiDataList[0].value;
-            float value2 = GlobalData.BuYuanShuiWeiDataList[1].value;
+        if (currentDataType == shuiWeiYuJingDataType.BuYuan) {
+            int index1 = YZTLayer.FindIndexByHotPointName("套口(上)");
+            int index2 = YZTLayer.FindIndexByHotPointName("套口(下)");
+            float value1 = GlobalData.swDatas[index1].upz ?? 0;
+            float value2 = GlobalData.swDatas[index1].dwz ?? 0;
             if (value1 > 1000) {
                 value1 = value1 / 100.0f;
             }
@@ -216,8 +208,10 @@ public class StationData:IComparable
         }
         else
         {
-            float value1 = GlobalData.TaoKouShuiWeiDataList[0].value;
-            float value2 = GlobalData.TaoKouShuiWeiDataList[1].value;
+            int index1 = YZTLayer.FindIndexByHotPointName("套口(上)");
+            int index2 = YZTLayer.FindIndexByHotPointName("套口(下)");
+            float value1 = GlobalData.swDatas[index1].upz ?? 0;
+            float value2 = GlobalData.swDatas[index1].dwz ?? 0;
             if (value1 > 1000)
             {
                 value1 = value1 / 100.0f;
@@ -373,24 +367,26 @@ public class StationData:IComparable
                 GameObject gameObject = Instantiate(sWHeightUnitPrefab);
                 SWHeightUnit swHUnit = gameObject.GetComponent<SWHeightUnit>();
                 swHUnit.transform.SetParent(miniMapSWContent.transform);
-                float max = math.max(GlobalData.swDatas[i].upz, GlobalData.swDatas[i].dwz);
-                swHUnit.Init(GlobalData.swDatas[i].LGTD, GlobalData.swDatas[i].LTTD, GlobalData.swDatas[i].STNM, max.ToString());
+                float max = math.max(GlobalData.swDatas[i].upz??0, GlobalData.swDatas[i].dwz ?? 0);
+                swHUnit.Init(GlobalData.swDatas[i].lgtd, GlobalData.swDatas[i].lttd, GlobalData.swDatas[i].stnm, max.ToString());
                 sWHeightUnits.Add(swHUnit);
 
                 swHUnit.bingObj = Instantiate(runtimePointObj).gameObject;
                 swHUnit.bingObj.transform.SetParent(shaPan.transform.GetChild(11));
                 swHUnit.bingObj.transform.localEulerAngles = Vector3.zero;
                 swHUnit.bingObj.transform.localScale = Vector3.one;
-                swHUnit.bingObj.transform.localPosition = CoordinateConverter.GeoToUGUISmall(GlobalData.swDatas[i].LGTD, GlobalData.swDatas[i].LTTD);
-                swHUnit.bingObj.name = GlobalData.swDatas[i].STNM;
+                double lgtd = double.Parse(GlobalData.swDatas[i].lgtd);
+                double lttd = double.Parse(GlobalData.swDatas[i].lttd);
+                swHUnit.bingObj.transform.localPosition = CoordinateConverter.GeoToUGUISmall(lgtd, lttd);
+                swHUnit.bingObj.name = GlobalData.swDatas[i].stnm;
             }
         }
         else
         {
             for (int i = 0; i < GlobalData.swDatas.Count; i++)
             {
-                float max = math.max(GlobalData.swDatas[i].upz, GlobalData.swDatas[i].dwz);
-                sWHeightUnits[i].Init(GlobalData.swDatas[i].LGTD, GlobalData.swDatas[i].LTTD, GlobalData.swDatas[i].STNM, max.ToString());
+                float max = math.max(GlobalData.swDatas[i].upz??0, GlobalData.swDatas[i].dwz ??0);
+                sWHeightUnits[i].Init(GlobalData.swDatas[i].lgtd, GlobalData.swDatas[i].lttd, GlobalData.swDatas[i].stnm, max.ToString());
             }
         }
         miniMap.gameObject.SetActive(true);
@@ -464,27 +460,25 @@ public class StationData:IComparable
     {
         if (GlobalData.swDatas.Count < 1)
             return;
-        if (currentDataType == shuiWeiYuJingDataType.BuYuan)
-        {
-            List<StationData> stationDatas = new List<StationData>(GlobalData.swDatas);
-            stationDatas.Sort();
 
-            for (int i = 0; i < zdpmObjs.Length; i++) {
-                zdpmObjs[i].transform.GetChild(1).GetComponent<Text>().text = stationDatas[i].STNM;
-                float max = MathF.Max(stationDatas[i].upz, stationDatas[i].dwz);
-                zdpmObjs[i].transform.GetChild(1).GetChild(0).GetComponent<Text>().text = $"{max} <size=14><color=#A5BBE2>m</color></size>";
-            }
-        }
-        else
+        List<StationData> stationDatas = new List<StationData>(GlobalData.swDatas);
+        //stationDatas.Sort();
+
+        for (int i = 0; i < stationDatas.Count; i++)
         {
-            //_paiMing_1_Text.text = $"未知 <size=14><color=#A5BBE2>mm</color></size>";
-            //_paiMing_1_Name_Text.text = $"套口水闸";
-            //_paiMing_6_Text.text = $"未知 <size=14><color=#A5BBE2>mm</color></size>";
-            //_paiMing_6_Name_Text.text = $"套口水闸";
-            //_paiMing_12_Text.text = $"未知 <size=14><color=#A5BBE2>mm</color></size>";
-            //_paiMing_12_Name_Text.text = $"套口水闸";
-            //_paiMing_24_Text.text = $"未知 <size=14><color=#A5BBE2>mm</color></size>";
-            //_paiMing_24_Name_Text.text = $"套口水闸";
+            GameObject obj = Instantiate(zdpmPrefab);
+            obj.transform.SetParent(zdpmParent.transform);
+            obj.transform.localScale = Vector3.one;
+            string name = stationDatas[i].stnm;
+            obj.transform.GetChild(1).GetComponent<Text>().text = stationDatas[i].stnm;
+            float max = MathF.Max(stationDatas[i].upz ?? 0, stationDatas[i].dwz ?? 0);
+            if (i == 0)
+                obj.transform.GetChild(0).GetChild(0).GetComponent<Text>().text = "1st";
+            else if (i == 1)
+                obj.transform.GetChild(0).GetChild(0).GetComponent<Text>().text = "2nd";
+            else
+                obj.transform.GetChild(0).GetChild(0).GetComponent<Text>().text = i + "rd";
+            obj.transform.GetChild(1).GetChild(0).GetComponent<Text>().text = $"{max} <size=14><color=#A5BBE2>m</color></size>";
         }
     }
 

Assets/Scripts/UI/UIView/YZT/YZTLayer.cs

@@ -283,20 +283,25 @@ public class YZTLayer : YZTRootLayer
         //Debug.Log("555");
         await new WaitUntil(() =>
         {
-            return GlobalData.TaoKouShuiWeiDataList.Count > 1;
+            return GlobalData.swDatas.Count > 1;
+            //return GlobalData.TaoKouShuiWeiDataList.Count > 1;
         });
         //Debug.Log("666");
-        float value1 = GlobalData.TaoKouShuiWeiDataList[0].value;
-        float value2 = GlobalData.TaoKouShuiWeiDataList[1].value;
-        if (value1 > 1000)
-        {
-            value1 = value1 / 100.0f;
-        }
-        if (value2 > 1000)
-        {
-            value2 = value2 / 100.0f;
-        }
-
+        //float value1 = GlobalData.TaoKouShuiWeiDataList[0].value;
+        //float value2 = GlobalData.TaoKouShuiWeiDataList[1].value;
+        //if (value1 > 1000)
+        //{
+        //    value1 = value1 / 100.0f;
+        //}
+        //if (value2 > 1000)
+        //{
+        //    value2 = value2 / 100.0f;
+        //}
+
+        int index1 = FindIndexByHotPointName("套口(上)");
+        int index2 = FindIndexByHotPointName("套口(下)");
+        float value1 = GlobalData.swDatas[index1].upz ?? 0;
+        float value2 = GlobalData.swDatas[index1].dwz ?? 0;
         //Debug.Log("777");
         avgSWText.text = $"{((value1 + value2) / 2).ToString("0.00")}";
         sfSWText.text = $"{GlobalData.threeLevelShuiWeiDatas[1].floodProtectionLevel}";
@@ -361,10 +366,16 @@ public class YZTLayer : YZTRootLayer
             {
                 SWStationRecordData sWStationRecordData = new SWStationRecordData();
                 sWStationRecordData.dir = 0;
-                sWStationRecordData.name = GlobalData.swDatas[i].STNM;
-                sWStationRecordData.value = (GlobalData.swDatas[i].upz > GlobalData.swDatas[i].dwz) ? GlobalData.swDatas[i].upz : GlobalData.swDatas[i].dwz;
+                sWStationRecordData.name = GlobalData.swDatas[i].stnm;
+                sWStationRecordData.value = ((GlobalData.swDatas[i].upz ?? 0) > (GlobalData.swDatas[i].dwz ?? 0)) ? GlobalData.swDatas[i].upz ?? 0 : GlobalData.swDatas[i].dwz ?? 0;
+                //Debug.Log(sWStationRecordData.name);
+                //Debug.Log(sWStationRecordData.value);
+                //Debug.Log(GlobalData.swDatas[i].upz);
+                //Debug.Log(GlobalData.swDatas[i].dwz);
+                //Debug.Log(GlobalData.swDatas[i].upz ?? 0);
+                //Debug.Log(GlobalData.swDatas[i].dwz ?? 0);
                 sWStationRecordData.time = DateTime.Now.ToString("MM/dd HH:mm");
-                sWStationRecordData.stcd = GlobalData.swDatas[i].STCD;
+                sWStationRecordData.stcd = GlobalData.swDatas[i].stcd;
                 rescordSWStationData.Add(sWStationRecordData);
             }
 
@@ -402,9 +413,9 @@ public class YZTLayer : YZTRootLayer
         {
             for (int i = 0; i < GlobalData.swDatas.Count; i++)
             {
-                rescordSWStationData[i].name = GlobalData.swDatas[i].STNM;
+                rescordSWStationData[i].name = GlobalData.swDatas[i].stnm;
                 float lastValue = rescordSWStationData[i].value;
-                rescordSWStationData[i].value = (GlobalData.swDatas[i].upz > GlobalData.swDatas[i].dwz) ? GlobalData.swDatas[i].upz : GlobalData.swDatas[i].dwz;
+                rescordSWStationData[i].value = ((GlobalData.swDatas[i].upz ?? 0) > (GlobalData.swDatas[i].dwz ?? 0)) ? GlobalData.swDatas[i].upz ?? 0 : GlobalData.swDatas[i].dwz ?? 0;
                 rescordSWStationData[i].time = DateTime.Now.ToString("MM/dd HH:mm");
                 if (rescordSWStationData[i].value > lastValue)
                 {
@@ -837,13 +848,13 @@ public class YZTLayer : YZTRootLayer
         return -1;
     }
 
-    int FindIndexByHotPointName(string name)
+    public static int FindIndexByHotPointName(string name)
     {
         Debug.Log(name);
         for (int i = 0; i < GlobalData.swDatas.Count; i++)
         {
-            Debug.Log(GlobalData.swDatas[i].STNM);
-            if (GlobalData.swDatas[i].STNM.Trim() == name.Trim())
+            //Debug.Log(GlobalData.swDatas[i].stnm);
+            if (GlobalData.swDatas[i].stnm.Trim() == name.Trim())
             {
                 return i;
             }
@@ -859,7 +870,7 @@ public class YZTLayer : YZTRootLayer
         {
             int index = FindIndexByHotPointName(temp.name);
             Debug.Log(index);
-            _waterTrendPanel.Show(GlobalData.swDatas[index].STCD, GlobalData.swDatas[index].STNM);
+            _waterTrendPanel.Show(GlobalData.swDatas[index].stcd, GlobalData.swDatas[index].stnm);
         }
         else if ((int)temp.type >= 6 || newPoint.layerIDs.Count > 4)
         {