Merge branch 'main' of http://www.chatgpt918.top:3000/wartheking/WaterFlush

Assets/Prefabs/UI/Item/ZhaMenIcon.prefab

@@ -0,0 +1,484 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &6184866820830610
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2407755667622512913}
+  - component: {fileID: 8493831160867747707}
+  - component: {fileID: 3763220324958550309}
+  - component: {fileID: 9223057206584702714}
+  m_Layer: 5
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2407755667622512913
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6184866820830610}
+  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: 8693264001334891580}
+  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: 10, y: -13.805}
+  m_SizeDelta: {x: 32, y: 27.61}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &8493831160867747707
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6184866820830610}
+  m_CullTransparentMesh: 1
+--- !u!114 &3763220324958550309
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6184866820830610}
+  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.16037738, g: 0.16037738, b: 0.16037738, 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_FontData:
+    m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
+    m_FontSize: 16
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u5957\u53E3"
+--- !u!114 &9223057206584702714
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6184866820830610}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
+--- !u!1 &4283438596719758962
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4631781281010837161}
+  - component: {fileID: 4800018450555107949}
+  - component: {fileID: 2800487816664198739}
+  m_Layer: 5
+  m_Name: ZhaMenIcon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4631781281010837161
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4283438596719758962}
+  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: 2027052951324185546}
+  - {fileID: 8693264001334891580}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4800018450555107949
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4283438596719758962}
+  m_CullTransparentMesh: 1
+--- !u!114 &2800487816664198739
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4283438596719758962}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 093903a42f5f2044a81eaf36bb579134, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _data:
+    sensor_id: 0
+    gate_open: 0
+    opening_degree: 0
+    gate_breakdown: 0
+    record_ts: 0
+    station_name: 
+  targetTransForm: {fileID: 0}
+  tint: {fileID: 5515461222174838467}
+  tintName: {fileID: 3763220324958550309}
+--- !u!1 &5515461222174838467
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8693264001334891580}
+  - component: {fileID: 8685014295002963449}
+  - component: {fileID: 3405379800184817410}
+  - component: {fileID: 9076946353492734133}
+  - component: {fileID: 1123870414268019485}
+  m_Layer: 5
+  m_Name: Tint
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &8693264001334891580
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5515461222174838467}
+  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: 2407755667622512913}
+  m_Father: {fileID: 4631781281010837161}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 80.002, y: 144.71664}
+  m_SizeDelta: {x: 52, y: 23.5957}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &8685014295002963449
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5515461222174838467}
+  m_CullTransparentMesh: 1
+--- !u!114 &3405379800184817410
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5515461222174838467}
+  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: 0}
+  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!114 &9076946353492734133
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5515461222174838467}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
+--- !u!114 &1123870414268019485
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5515461222174838467}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 10
+    m_Right: 10
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 1
+  m_ChildScaleHeight: 1
+  m_ReverseArrangement: 0
+--- !u!1 &8445803138219866511
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2027052951324185546}
+  - component: {fileID: 2690938772664444896}
+  - component: {fileID: 8361798586317234177}
+  - component: {fileID: 8828567451223740973}
+  m_Layer: 5
+  m_Name: Icon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2027052951324185546
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8445803138219866511}
+  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: 4742984429411117486}
+  m_Father: {fileID: 4631781281010837161}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 50}
+  m_SizeDelta: {x: 60, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2690938772664444896
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8445803138219866511}
+  m_CullTransparentMesh: 1
+--- !u!114 &8361798586317234177
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8445803138219866511}
+  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: d2d0a157101c938438fc7532370a958a, 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!114 &8828567451223740973
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8445803138219866511}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 8361798586317234177}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &8657152715024557955
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4742984429411117486}
+  - component: {fileID: 5593926440167467510}
+  - component: {fileID: 6046516671655322401}
+  m_Layer: 5
+  m_Name: Image (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4742984429411117486
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8657152715024557955}
+  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: 2027052951324185546}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 16}
+  m_SizeDelta: {x: 48, y: 48}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5593926440167467510
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8657152715024557955}
+  m_CullTransparentMesh: 1
+--- !u!114 &6046516671655322401
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8657152715024557955}
+  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: b82302b0c71448541af765c53f77e05b, 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/Item/ZhaMenIcon.prefab.meta

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

Assets/Prefabs/UI/Item/shuiwei.prefab

@@ -0,0 +1,345 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &356826476647937106
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8067516134358027354}
+  - component: {fileID: 6435655373959187051}
+  - component: {fileID: 5657721880994797509}
+  - component: {fileID: 6029062455339253923}
+  m_Layer: 5
+  m_Name: bg
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8067516134358027354
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 356826476647937106}
+  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: 8885034799045031888}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 40}
+  m_SizeDelta: {x: 60, y: 60}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6435655373959187051
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 356826476647937106}
+  m_CullTransparentMesh: 1
+--- !u!114 &5657721880994797509
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 356826476647937106}
+  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: cb22a60876273164d82088ddd85b6c55, 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!114 &6029062455339253923
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 356826476647937106}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 0
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 0
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 5657721880994797509}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &1295938256603995126
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8885034799045031888}
+  - component: {fileID: 6115124443955723734}
+  - component: {fileID: 759299040552133786}
+  m_Layer: 5
+  m_Name: shuiwei
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8885034799045031888
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1295938256603995126}
+  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: 8067516134358027354}
+  - {fileID: 2649154504829047601}
+  - {fileID: 6914115035585864523}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -137, y: 29}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6115124443955723734
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1295938256603995126}
+  m_CullTransparentMesh: 1
+--- !u!114 &759299040552133786
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1295938256603995126}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5adca38dcd8fb3c459c34069d51cf437, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  targetTransForm: {fileID: 0}
+--- !u!1 &5134439721193033152
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6914115035585864523}
+  - component: {fileID: 5029920908095785670}
+  - component: {fileID: 5593110738217335374}
+  m_Layer: 5
+  m_Name: valueText
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6914115035585864523
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5134439721193033152}
+  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: 8885034799045031888}
+  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: -25.9, y: -20}
+  m_SizeDelta: {x: 82, y: 24}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5029920908095785670
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5134439721193033152}
+  m_CullTransparentMesh: 1
+--- !u!114 &5593110738217335374
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5134439721193033152}
+  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: 0.7372549, b: 0.11372549, 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: 18
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 2
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 1
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 2342.93 <size=12><color=FFFFFF>m</color></size>
+--- !u!1 &8109446757646552142
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2649154504829047601}
+  - component: {fileID: 6379668836802503546}
+  - component: {fileID: 2935304509792323651}
+  m_Layer: 5
+  m_Name: nameText
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2649154504829047601
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8109446757646552142}
+  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: 8885034799045031888}
+  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: -32.900024, y: 6}
+  m_SizeDelta: {x: 96, y: 16}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6379668836802503546
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8109446757646552142}
+  m_CullTransparentMesh: 1
+--- !u!114 &2935304509792323651
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8109446757646552142}
+  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: 12
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 2
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u76EE\u524D\u6C34\u4F4D\u9884\u8B66\u9AD8\u5EA6"

Assets/Prefabs/UI/Item/shuiwei.prefab.meta

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

Assets/Prefabs/UI/Item/shuiwei_Icon.prefab

@@ -189,7 +189,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: cb22a60876273164d82088ddd85b6c55, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 9e54f1213fa727c48bd56de718e9f41f, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

Assets/Prefabs/UI/SWFZ/ZMJK.prefab

@@ -5631,7 +5631,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 4461453780397662635}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -6413,7 +6413,7 @@ RectTransform:
   - {fileID: 4637094724067973422}
   - {fileID: 1182882711783925293}
   m_Father: {fileID: 4461453780397662635}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -11079,7 +11079,7 @@ RectTransform:
   m_Children:
   - {fileID: 1830885361818529920}
   m_Father: {fileID: 4461453780397662635}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -11635,6 +11635,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 3218409779109884448}
   - {fileID: 8645906836657441524}
   - {fileID: 2238635893081267527}
   - {fileID: 5645430487816504761}
@@ -11677,6 +11678,9 @@ MonoBehaviour:
   currentZMDataList: []
   targetObj: {fileID: 0}
   showGongPanel: 0
+  zhaMenIconOri: {fileID: 4283438596719758962, guid: fcf859d795d57314b8ee45fbf4015949, type: 3}
+  zhaMenContent: {fileID: 3218409779109884448}
+  zhaMenIconList: []
 --- !u!1 &4463901847923660319
 GameObject:
   m_ObjectHideFlags: 0
@@ -16408,7 +16412,7 @@ RectTransform:
   - {fileID: 1393834271580688366}
   - {fileID: 6374276066563140182}
   m_Father: {fileID: 4461453780397662635}
-  m_RootOrder: 4
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -18713,7 +18717,7 @@ RectTransform:
   m_Children:
   - {fileID: 4238809901531860493}
   m_Father: {fileID: 4461453780397662635}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -19404,6 +19408,42 @@ MonoBehaviour:
     m_VerticalOverflow: 1
     m_LineSpacing: 1
   m_Text: 8
+--- !u!1 &7762756203306636676
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3218409779109884448}
+  m_Layer: 5
+  m_Name: ZhaMenContent
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3218409779109884448
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7762756203306636676}
+  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: 4461453780397662635}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &7779776250927800271
 GameObject:
   m_ObjectHideFlags: 0

Assets/Prefabs/UI/XHYZT/GCJK.prefab

@@ -10881,6 +10881,8 @@ RectTransform:
   - {fileID: 9029168628236234279}
   - {fileID: 1979923686941381033}
   - {fileID: 8062901893780694846}
+  - {fileID: 8757336094675718186}
+  - {fileID: 4513584130216526266}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -10956,6 +10958,8 @@ MonoBehaviour:
   buyuanBtn: {fileID: 1830753044289672754}
   taokouBtn: {fileID: 2739425641835766322}
   _DeviceTrendPanelOri: {fileID: 8227991986466155613, guid: fce9963f73e34414db36fd47211421dd, type: 3}
+  swSY: {fileID: 597888726087877472}
+  swXY: {fileID: 5721566853828055792}
 --- !u!1 &6205949641887129071
 GameObject:
   m_ObjectHideFlags: 0
@@ -17036,6 +17040,119 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1001 &199762385241270266
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 7289340260209060652}
+    m_Modifications:
+    - target: {fileID: 1295938256603995126, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_Name
+      value: shuiwei_SY
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_RootOrder
+      value: 7
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -137
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 29
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+--- !u!114 &597888726087877472 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 759299040552133786, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+  m_PrefabInstance: {fileID: 199762385241270266}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5adca38dcd8fb3c459c34069d51cf437, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!224 &8757336094675718186 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+  m_PrefabInstance: {fileID: 199762385241270266}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &2987415345701273617
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -17351,3 +17468,116 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 94c91f5757d9d3842991eedc4ca6e9e6, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!1001 &5039111032425264746
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 7289340260209060652}
+    m_Modifications:
+    - target: {fileID: 1295938256603995126, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_Name
+      value: shuiwei_XY
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_RootOrder
+      value: 8
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -137
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 29
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+--- !u!224 &4513584130216526266 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+  m_PrefabInstance: {fileID: 5039111032425264746}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &5721566853828055792 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 759299040552133786, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+  m_PrefabInstance: {fileID: 5039111032425264746}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5adca38dcd8fb3c459c34069d51cf437, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 

Assets/Prefabs/UI/XHYZT/SWYJ.prefab

@@ -14814,6 +14814,8 @@ RectTransform:
   - {fileID: 3055591070522261930}
   - {fileID: 1131407422490970219}
   - {fileID: 8601019591330787923}
+  - {fileID: 5613448560832391166}
+  - {fileID: 138019657336343232}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -14908,9 +14910,10 @@ MonoBehaviour:
   sWHeightUnits: []
   sWHeightUnitPrefab: {fileID: 1479493484440468058, guid: 1604d7403b5021741aa0c96854811b33, type: 3}
   runtimePointObj: {fileID: 5029940434980741371, guid: f7351d99134429b4280ee00172298cf5, type: 3}
-  shuiweiIconPrefab: {fileID: 1295938256603995126, guid: 7c2764f01ad9eb445a4c3d2aa47f4a14, type: 3}
   zdpmParent: {fileID: 8164022845319533604}
   zdpmPrefab: {fileID: 5666608153428404762, guid: 4a2b54fe3fb7dc3448def41df2eefcfc, type: 3}
+  swSY: {fileID: 4333192775402009780}
+  swXY: {fileID: 8083458041895868810}
 --- !u!1 &6148527700689888400
 GameObject:
   m_ObjectHideFlags: 0
@@ -25771,3 +25774,229 @@ MonoBehaviour:
     m_VerticalOverflow: 1
     m_LineSpacing: 1
   m_Text: 8
+--- !u!1001 &3939248529708912686
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 7289340260209060652}
+    m_Modifications:
+    - target: {fileID: 1295938256603995126, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_Name
+      value: shuiwei_SY
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_RootOrder
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -137
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 29
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+--- !u!114 &4333192775402009780 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 759299040552133786, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+  m_PrefabInstance: {fileID: 3939248529708912686}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5adca38dcd8fb3c459c34069d51cf437, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!224 &5613448560832391166 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+  m_PrefabInstance: {fileID: 3939248529708912686}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &8838213347747691792
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 7289340260209060652}
+    m_Modifications:
+    - target: {fileID: 1295938256603995126, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_Name
+      value: shuiwei_XY
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_RootOrder
+      value: 6
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -137
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 29
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+--- !u!224 &138019657336343232 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+  m_PrefabInstance: {fileID: 8838213347747691792}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &8083458041895868810 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 759299040552133786, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
+  m_PrefabInstance: {fileID: 8838213347747691792}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5adca38dcd8fb3c459c34069d51cf437, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 

Assets/Scripts/HttpGetData.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Newtonsoft.Json.Linq;
+using UnityEngine.Serialization;
 
 
 public class HttpGetData
@@ -334,34 +335,55 @@ public class CharData_water
 [Serializable]
 public class B08_TaskListInfoData
 {
-    public B08_TaskListInfo data;
-}
-[Serializable]
-public class B08_TaskListInfo
-{
-    public B08_TaskInfoData[] list;
-    public int type;
+    public B08_TaskInfoData[] data;
 }
+
 [Serializable]
 public class B08_TaskInfoData
 {
-    public string task_id;
-    public string type;
+    public string xjId;
+    public string fanganId;
+    public string projectId;
+    public string xunjianScope;
+    public int taskExecutor;
+    [FormerlySerializedAs("type")] public string fanganName;
     public string xunjian_scope;
     public string status;
     public string start_time;
-    public B08_TaskItems[] task_items;
+    public string finishedTime;
+    [FormerlySerializedAs("task_items")] public B08_TaskItems[] items;
 }
 [Serializable]
 public class B08_TaskItems
 {
-    public string elevation;//高度
-    public string item_id;
-    public string img_path;
+    [FormerlySerializedAs("item_id")] public string xjItemId;
+    public string xjId;
+    public string faItemId;
+    
+    public B08_TaskItemFiles[] files;
+    
     public string latitude;//维度
-    public string item_name;
     public string longitude;//经度
+
+    public string status;
+
+    public string startTime;
+    public string finishedTime;
+
+    [FormerlySerializedAs("item_name")] public string faItemName;
+}
+
+[Serializable]
+public class B08_TaskItemFiles
+{
+    public string fileId;
+    public int fileCategoryId;
+    public string fileName;
+    public string mimeType;
+    public string filePath;
+    public int folderId;
 }
 
 
+
 #endregion

Assets/Scripts/HttpHelper.cs

@@ -2179,13 +2179,38 @@ public class HttpHelper : MonoBehaviour
             }
             else
             {
+                Debug.Log($"设备列表json :{www.downloadHandler.text}");
                 SensorListResult tempData = JsonUtility.FromJson<SensorListResult>(www.downloadHandler.text);
                 _devicesIdDatas = new Dictionary<string, DevicesId_Data>();
+                
+                
+                Dictionary<string, string> tempMap_BY = new Dictionary<string, string>();
+                Dictionary<string, string> tempMap_TK = new Dictionary<string, string>();
+
+                
                 for (int i = 0; i < tempData.rows.Count; i++)
                 {
+                    if (tempData.rows[i].stationName.Equals("套口"))
+                    {
+                        tempMap_TK.TryAdd(tempData.rows[i].sensorType, tempData.rows[i].sensorName);
+                    }
+                    else
+                    {
+                        tempMap_BY.TryAdd(tempData.rows[i].sensorType, tempData.rows[i].sensorName);
+                    }
+                    
                     _devicesIdDatas.Add(tempData.rows[i].sensorName, tempData.rows[i]);
                 }
 
+                foreach (var tempKey in tempMap_BY.Keys)
+                {
+                    Debug.Log("补元 设备类型:"+tempKey);
+                }
+                foreach (var tempKey in tempMap_TK.Keys)
+                {
+                    Debug.Log("套口 设备类型:"+tempKey);
+                }
+               
                 Debug.Log($"初始化设备列表成功！！！ count:{tempData.total}");
             }
         }

Assets/Scripts/UI/Data/TuYaLiData.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public enum tuYaLiType
+{
+    BuYuanTuYaLi,
+    TaoKouTuYaLi
+}
+
+[Serializable]
+public class TuYaLiData
+{
+    public string name;
+    public string targetName;
+    public tuYaLiType type;
+    public Transform targetTransform;
+    public float value;
+
+    public string sid;
+    public string gid;
+}

Assets/Scripts/UI/Data/TuYaLiData.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: de906742cf318134c9e2c75d3a9af22c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/UI/Item/B08_TaskListItem.cs

@@ -59,7 +59,7 @@ public class B08_TaskListItem : MonoBehaviour
             ctrlText.text = "<color=#00FF3F>收起</color>";
             rect.sizeDelta = new Vector2(360,354);
             more.SetActive(true);
-            gcywLayer.SetTaskImgPanelData(InfoData.task_items);
+            gcywLayer.SetTaskImgPanelData(InfoData.items);
         }
 
         moreMessage = !moreMessage;
@@ -89,7 +89,7 @@ public class B08_TaskListItem : MonoBehaviour
                 break;
         }
         typeText.text = typeStr;
-        titleText.text = data.type;
+        titleText.text = data.fanganName;
         stateText.text = data.status;
         dateText.text = data.start_time;
         for (int i = 0; i < PointItems.Count; i++)
@@ -97,10 +97,10 @@ public class B08_TaskListItem : MonoBehaviour
             Destroy(PointItems[i].gameObject);
         }
         PointItems.Clear();
-        for (int i = 0; i < data.task_items.Length; i++)
+        for (int i = 0; i < data.items.Length; i++)
         {
             B08_TaskPointItem tempItem = Instantiate(pointItemPrefab,itemContent).GetComponent<B08_TaskPointItem>();
-            tempItem.SetData(baseLayer,data.task_items[i],i,data.start_time);
+            tempItem.SetData(baseLayer,data.items[i],i,data.start_time);
             var button = tempItem.GetComponent<ExtendedButton_PointItem>();
             button.index = i;
             button.onPointerEnter += baseLayer.SetTaskPointIconHeightLight;

Assets/Scripts/UI/Item/ShuiWeiCtrl.cs

@@ -0,0 +1,61 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class ShuiWeiCtrl : MonoBehaviour
+{
+    private RectTransform rect;
+    private Camera _camera;
+    
+    private Text valueText;
+    private Text nameText;
+    
+    public Transform targetTransForm;
+    
+    public void Init()
+    {
+        _camera = CameraManager.instance.mainCamera;
+        rect = this.GetComponent<RectTransform>();
+        rect.anchoredPosition = new Vector2(2000, 0);
+        valueText = this.transform.Find("valueText").GetComponent<Text>();
+        nameText = this.transform.Find("nameText").GetComponent<Text>();
+    }
+
+    public void SetData(string name,float? swValue,Transform target)
+    {
+        nameText.text = name;
+        string swStr = swValue.ToString();
+        if (swStr.Equals(""))
+        {
+            swStr = "-";
+        }
+        valueText.text = $"{swStr} <size=12><color=FFFFFF>m</color></size>";
+        targetTransForm = target;
+    }
+    
+    void Update()
+    {
+        if (targetTransForm != null)
+        {
+            if (IsObjectInCameraView(targetTransForm, _camera))
+            {
+                rect.transform.position=_camera.WorldToScreenPoint(targetTransForm.position);
+            }
+            else
+            {
+                rect.transform.position = new Vector3(2000, 0, 0);
+            }
+        }
+    }
+    
+    bool IsObjectInCameraView(Transform objectTransform, Camera camera)
+    {
+        Vector3 objectScreenPosition = camera.WorldToScreenPoint(objectTransform.position);
+        return objectScreenPosition.z > 0 &&
+               objectScreenPosition.x > 0 &&
+               objectScreenPosition.x < Screen.width &&
+               objectScreenPosition.y > 0 &&
+               objectScreenPosition.y < Screen.height;
+    }
+}

Assets/Scripts/UI/Item/ShuiWeiCtrl.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 5adca38dcd8fb3c459c34069d51cf437
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/UI/Item/ZhaMenIconCtrl.cs

@@ -0,0 +1,80 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.EventSystems;
+using UnityEngine.UI;
+using UnityEngine.UIElements;
+
+public class ZhaMenIconCtrl : MonoBehaviour, IPointerEnterHandler, IPointerExitHandler
+{
+    private RectTransform rect;
+    private Camera _camera;
+
+    private UnityEngine.UI.Button _button;
+    public FloodGate _data;
+    public Transform targetTransForm;
+
+    public GameObject tint;
+
+    public Text tintName;
+
+    public void Init(FloodGate data,string name,GameObject targetObj)
+    {
+        _data = data;
+        tintName.text = name;
+
+
+        rect = this.GetComponent<RectTransform>();
+        _button = this.transform.Find("Icon").GetComponent<UnityEngine.UI.Button>();
+
+
+        _button.onClick.AddListener(() =>
+        {
+            
+        });
+
+
+        rect.anchoredPosition = new Vector2(2000, 0);
+        _camera = CameraManager.instance.mainCamera;
+
+        targetTransForm = targetObj.transform;
+    }
+
+    void Update()
+    {
+        if (targetTransForm != null)
+        {
+            if (IsObjectInCameraView(targetTransForm, _camera))
+            {
+                rect.transform.position = _camera.WorldToScreenPoint(targetTransForm.position);
+            }
+            else
+            {
+                rect.transform.position = new Vector3(2000, 0, 0);
+            }
+        }
+    }
+
+    bool IsObjectInCameraView(Transform objectTransform, Camera camera)
+    {
+        Vector3 objectScreenPosition = camera.WorldToScreenPoint(objectTransform.position);
+        return objectScreenPosition.z > 0 &&
+               objectScreenPosition.x > 0 &&
+               objectScreenPosition.x < Screen.width &&
+               objectScreenPosition.y > 0 &&
+               objectScreenPosition.y < Screen.height;
+    }
+
+    public void OnPointerEnter(PointerEventData eventData)
+    {
+        tint.gameObject.SetActive(true);
+        LayoutRebuilder.ForceRebuildLayoutImmediate(tintName.GetComponent<RectTransform>()); // 强制重新计算布局
+        LayoutRebuilder.ForceRebuildLayoutImmediate(tint.GetComponent<RectTransform>()); // 强制重新计算布局
+    }
+
+    public void OnPointerExit(PointerEventData eventData)
+    {
+        tint.gameObject.SetActive(false);
+    }
+}

Assets/Scripts/UI/Item/ZhaMenIconCtrl.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 093903a42f5f2044a81eaf36bb579134
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -37,6 +37,10 @@ public class ZMJKLayer : MonoBehaviour
     public bool showGongPanel = false;
     private Camera _camera;
 
+    public GameObject zhaMenIconOri;
+    public Transform zhaMenContent;
+    public List<ZhaMenIconCtrl> zhaMenIconList = new List<ZhaMenIconCtrl>();
+
     private void Awake()
     {
         closeButton.onClick.AddListener(() =>
@@ -76,11 +80,9 @@ public class ZMJKLayer : MonoBehaviour
         });
     }
 
-    async Task InitFloorGateData() {
-        await new WaitUntil(() =>
-        {
-            return GlobalData.floorGateData.success;
-        });
+    async Task InitFloorGateData()
+    {
+        await new WaitUntil(() => { return GlobalData.floorGateData.success; });
         float[] byV3 = new float[GlobalData.floorGateData.buYuan.Length];
         for (int i = 0; i < GlobalData.floorGateData.buYuan.Length; i++)
         {
@@ -88,54 +90,63 @@ public class ZMJKLayer : MonoBehaviour
             ZhaZhanItem tempItem = Instantiate(ZhaZhanItemOri, itemContent).GetComponent<ZhaZhanItem>();
             tempItem.SetData(GlobalData.floorGateData.buYuan[tempIndex], $"补元闸门-{tempIndex + 1}");
             byV3[tempIndex] = GlobalData.floorGateData.buYuan[tempIndex].opening_degree * 0.01f;
-            Debug.Log($"补元闸门-{tempIndex + 1}:{byV3[tempIndex]}");
+            //Debug.Log($"补元闸门-{tempIndex + 1}:{byV3[tempIndex]}");
             tempItem.gameObject.GetComponent<Button>().onClick.AddListener(() =>
             {
-                StaticLod.instance.OnFoucusStatic($"BY_ZM_{tempIndex+1:00}");
-                targetObj = StaticLod.instance.GetStaticObj($"BY_ZM_{tempIndex + 1:00}");
-                gongChengPanel.SetActive(true);
-                showGongPanel = true;
-                zhaZhanMingCheng.text = tempItem._name;
-                zhaMenKaiDu.text = $"{GlobalData.floorGateData.buYuan[tempIndex].opening_degree:0.00}<size=14><color=#A5BFE2>%</color></size>";
-                //guoZhaLiuLiang.text = $"{GlobalData.floorGateData.buYuan[tempIndex].CurrentFlow}<size=14><color=#A5BFE2>m\u00b3/s</color></size>";
-                guoZhaLiuLiang.text = $"-<size=14><color=#A5BFE2>m\u00b3/s</color></size>";
-                
-                //zhaQianShuiWei.text = $"{GlobalData.floorGateData.BuYuan.FloodGates[tempIndex]} <size=14><color=#A5BFE2>m</color></size>";
-                zhaQianShuiWei.text = $"- <size=14><color=#A5BFE2>m</color></size>";
-                //zhaHouShuiWei.text = $"{GlobalData.floorGateData.BuYuan.FloodGates[tempIndex]} <size=14><color=#A5BFE2>m</color></size>";
-                zhaHouShuiWei.text = $"{GlobalData.floorGateData.buYuanSW} <size=14><color=#A5BFE2>m</color></size>";
-                //shuiweiChart todo
-
-                var shuiweiData = GlobalData.floorGateData.swzxtBY;
-                
-                XAxis tempXaxis = shuiweiChart.GetChartComponent<XAxis>();
-                tempXaxis.data.Clear();
-                for (int i = 0; i < shuiweiData.Length; i++)
-                {
-                    tempXaxis.AddData(shuiweiData[i].key);
-                }
-
-                var tempSeries = shuiweiChart.series;
-                tempSeries[0].serieName = "水位";
-                tempSeries[1].serieName = "水位";
-                SerieData[] tempDatas = new SerieData[shuiweiData.Length];
-                for (int i = 0; i < tempDatas.Length; i++)
-                {
-                    tempDatas[i] = new SerieData();
-                    tempDatas[i].data = new List<double>();
-                    tempDatas[i].data.Add(i);
-                    tempDatas[i].data.Add(shuiweiData[i].value);
-                }
-
-                tempSeries[0].data.Clear();
-                tempSeries[0].data.AddRange(tempDatas);
-                tempSeries[1].data.Clear();
-                tempSeries[1].data.AddRange(tempDatas);
+                OpenZhaMenInfoPanel(0, tempIndex, tempItem);
+                //
+                // StaticLod.instance.OnFoucusStatic($"BY_ZM_{tempIndex + 1:00}");
+                // targetObj = StaticLod.instance.GetStaticObj($"BY_ZM_{tempIndex + 1:00}");
+                // gongChengPanel.SetActive(true);
+                // showGongPanel = true;
+                // zhaZhanMingCheng.text = tempItem._name;
+                // zhaMenKaiDu.text =
+                //     $"{GlobalData.floorGateData.buYuan[tempIndex].opening_degree:0.00}<size=14><color=#A5BFE2>%</color></size>";
+                // //guoZhaLiuLiang.text = $"{GlobalData.floorGateData.buYuan[tempIndex].CurrentFlow}<size=14><color=#A5BFE2>m\u00b3/s</color></size>";
+                // guoZhaLiuLiang.text = $"-<size=14><color=#A5BFE2>m\u00b3/s</color></size>";
+                //
+                // //zhaQianShuiWei.text = $"{GlobalData.floorGateData.BuYuan.FloodGates[tempIndex]} <size=14><color=#A5BFE2>m</color></size>";
+                // zhaQianShuiWei.text = $"- <size=14><color=#A5BFE2>m</color></size>";
+                // //zhaHouShuiWei.text = $"{GlobalData.floorGateData.BuYuan.FloodGates[tempIndex]} <size=14><color=#A5BFE2>m</color></size>";
+                // zhaHouShuiWei.text = $"{GlobalData.floorGateData.buYuanSW} <size=14><color=#A5BFE2>m</color></size>";
+                //
+                // var shuiweiData = GlobalData.floorGateData.swzxtBY;
+                //
+                // XAxis tempXaxis = shuiweiChart.GetChartComponent<XAxis>();
+                // tempXaxis.data.Clear();
+                // for (int i = 0; i < shuiweiData.Length; i++)
+                // {
+                //     tempXaxis.AddData(shuiweiData[i].key);
+                // }
+                //
+                // var tempSeries = shuiweiChart.series;
+                // tempSeries[0].serieName = "水位";
+                // tempSeries[1].serieName = "水位";
+                // SerieData[] tempDatas = new SerieData[shuiweiData.Length];
+                // for (int i = 0; i < tempDatas.Length; i++)
+                // {
+                //     tempDatas[i] = new SerieData();
+                //     tempDatas[i].data = new List<double>();
+                //     tempDatas[i].data.Add(i);
+                //     tempDatas[i].data.Add(shuiweiData[i].value);
+                // }
+                //
+                // tempSeries[0].data.Clear();
+                // tempSeries[0].data.AddRange(tempDatas);
+                // tempSeries[1].data.Clear();
+                // tempSeries[1].data.AddRange(tempDatas);
             });
             currentZMDataList.Add(tempItem);
+
+
+            ZhaMenIconCtrl tempIcon = Instantiate(zhaMenIconOri, zhaMenContent).GetComponent<ZhaMenIconCtrl>();
+            tempIcon.Init(GlobalData.floorGateData.buYuan[tempIndex], $"补元闸门-{tempIndex + 1}",
+                StaticLod.instance.GetStaticObj($"BY_ZM_{tempIndex + 1:00}"));
+            zhaMenIconList.Add(tempIcon);
         }
-        ActionInstance._Instance.ModelAni_On?.Invoke(AniType.buYuan,byV3);
-        
+
+        ActionInstance._Instance.ModelAni_On?.Invoke(AniType.buYuan, byV3);
+
         float[] tkV3 = new float[GlobalData.floorGateData.taoKou.Length];
         for (int i = 0; i < GlobalData.floorGateData.taoKou.Length; i++)
         {
@@ -145,52 +156,107 @@ public class ZMJKLayer : MonoBehaviour
             tkV3[tempIndex] = GlobalData.floorGateData.taoKou[tempIndex].opening_degree * 0.01f;
             tempItem.gameObject.GetComponent<Button>().onClick.AddListener(() =>
             {
-                StaticLod.instance.OnFoucusStatic($"TK_ZM_{tempIndex+1:00}");
-                targetObj = StaticLod.instance.GetStaticObj($"TK_ZM_{tempIndex+1:00}");
-                gongChengPanel.SetActive(true);
-                showGongPanel = true;
-                zhaZhanMingCheng.text = tempItem._name;
-                zhaMenKaiDu.text = $"{GlobalData.floorGateData.taoKou[tempIndex].opening_degree:0.00}<size=14><color=#A5BFE2>%</color></size>";
-                //guoZhaLiuLiang.text = $"{GlobalData.floorGateData.taoKou[tempIndex].CurrentFlow}<size=14><color=#A5BFE2>m\u00b3/s</color></size>";
-                guoZhaLiuLiang.text = $"-<size=14><color=#A5BFE2>m\u00b3/s</color></size>";
-                
-                //zhaQianShuiWei.text = $"{GlobalData.floorGateData.BuYuan.FloodGates[tempIndex]} <size=14><color=#A5BFE2>m</color></size>";
-                zhaQianShuiWei.text = $"{GlobalData.floorGateData.taoKouSW} <size=14><color=#A5BFE2>m</color></size>";
-                //zhaHouShuiWei.text = $"{GlobalData.floorGateData.BuYuan.FloodGates[tempIndex]} <size=14><color=#A5BFE2>m</color></size>";
-                zhaHouShuiWei.text = $"-<size=14><color=#A5BFE2>m</color></size>";
-                
-                var shuiweiData = GlobalData.floorGateData.swzxtTK;
-                XAxis tempXaxis = shuiweiChart.GetChartComponent<XAxis>();
-                tempXaxis.data.Clear();
-                for (int i = 0; i < shuiweiData.Length; i++)
-                {
-                    tempXaxis.AddData(shuiweiData[i].key);
-                }
-
-                var tempSeries = shuiweiChart.series;
-                tempSeries[0].serieName = "水位";
-                tempSeries[1].serieName = "水位";
-                SerieData[] tempDatas = new SerieData[shuiweiData.Length];
-                for (int i = 0; i < tempDatas.Length; i++)
-                {
-                    tempDatas[i] = new SerieData();
-                    tempDatas[i].data = new List<double>();
-                    tempDatas[i].data.Add(i);
-                    tempDatas[i].data.Add(float.Parse(shuiweiData[i].value.ToString("F2")));
-                }
+                OpenZhaMenInfoPanel(1, tempIndex, tempItem);
 
-                tempSeries[0].data.Clear();
-                tempSeries[0].data.AddRange(tempDatas);
-                tempSeries[1].data.Clear();
-                tempSeries[1].data.AddRange(tempDatas);
+                // StaticLod.instance.OnFoucusStatic($"TK_ZM_{tempIndex + 1:00}");
+                // targetObj = StaticLod.instance.GetStaticObj($"TK_ZM_{tempIndex + 1:00}");
+                // gongChengPanel.SetActive(true);
+                // showGongPanel = true;
+                // zhaZhanMingCheng.text = tempItem._name;
+                // zhaMenKaiDu.text =
+                //     $"{GlobalData.floorGateData.taoKou[tempIndex].opening_degree:0.00}<size=14><color=#A5BFE2>%</color></size>";
+                // //guoZhaLiuLiang.text = $"{GlobalData.floorGateData.taoKou[tempIndex].CurrentFlow}<size=14><color=#A5BFE2>m\u00b3/s</color></size>";
+                // guoZhaLiuLiang.text = $"-<size=14><color=#A5BFE2>m\u00b3/s</color></size>";
+                //
+                // //zhaQianShuiWei.text = $"{GlobalData.floorGateData.BuYuan.FloodGates[tempIndex]} <size=14><color=#A5BFE2>m</color></size>";
+                // zhaQianShuiWei.text = $"{GlobalData.floorGateData.taoKouSW} <size=14><color=#A5BFE2>m</color></size>";
+                // //zhaHouShuiWei.text = $"{GlobalData.floorGateData.BuYuan.FloodGates[tempIndex]} <size=14><color=#A5BFE2>m</color></size>";
+                // zhaHouShuiWei.text = $"-<size=14><color=#A5BFE2>m</color></size>";
+                //
+                // var shuiweiData = GlobalData.floorGateData.swzxtTK;
+                // XAxis tempXaxis = shuiweiChart.GetChartComponent<XAxis>();
+                // tempXaxis.data.Clear();
+                // for (int i = 0; i < shuiweiData.Length; i++)
+                // {
+                //     tempXaxis.AddData(shuiweiData[i].key);
+                // }
+                //
+                // var tempSeries = shuiweiChart.series;
+                // tempSeries[0].serieName = "水位";
+                // tempSeries[1].serieName = "水位";
+                // SerieData[] tempDatas = new SerieData[shuiweiData.Length];
+                // for (int i = 0; i < tempDatas.Length; i++)
+                // {
+                //     tempDatas[i] = new SerieData();
+                //     tempDatas[i].data = new List<double>();
+                //     tempDatas[i].data.Add(i);
+                //     tempDatas[i].data.Add(float.Parse(shuiweiData[i].value.ToString("F2")));
+                // }
+                //
+                // tempSeries[0].data.Clear();
+                // tempSeries[0].data.AddRange(tempDatas);
+                // tempSeries[1].data.Clear();
+                // tempSeries[1].data.AddRange(tempDatas);
             });
             currentZMDataList.Add(tempItem);
+            
+            ZhaMenIconCtrl tempIcon = Instantiate(zhaMenIconOri, zhaMenContent).GetComponent<ZhaMenIconCtrl>();
+            tempIcon.Init(GlobalData.floorGateData.taoKou[tempIndex], $"套口闸门-{tempIndex + 1}",
+                StaticLod.instance.GetStaticObj($"TK_ZM_{tempIndex + 1:00}"));
+            zhaMenIconList.Add(tempIcon);
         }
-        ActionInstance._Instance.ModelAni_On?.Invoke(AniType.taoKou,tkV3);
+
+        ActionInstance._Instance.ModelAni_On?.Invoke(AniType.taoKou, tkV3);
         int totalCount = GlobalData.floorGateData.BuYuanTotalGates + GlobalData.floorGateData.TaoKouTotalGates;
         zhaZhanCount.text = $"闸门列表 （<color=#FFFFFF>{totalCount}</color>）";
+        
     }
 
+    public void OpenZhaMenInfoPanel(int type, int _index, ZhaZhanItem itemData)
+    {
+        string staticNameHead = type == 0 ? "BY_ZM_" : "TK_ZM_";
+        StaticLod.instance.OnFoucusStatic($"{staticNameHead}{_index + 1:00}");
+        targetObj = StaticLod.instance.GetStaticObj($"{staticNameHead}{_index + 1:00}");
+        gongChengPanel.SetActive(true);
+        showGongPanel = true;
+        zhaZhanMingCheng.text = itemData._name;
+        var floorGateData = type == 0 ? GlobalData.floorGateData.buYuan : GlobalData.floorGateData.taoKou;
+        zhaMenKaiDu.text = $"{floorGateData[_index].opening_degree:0.00}<size=14><color=#A5BFE2>%</color></size>";
+
+        guoZhaLiuLiang.text = $"-<size=14><color=#A5BFE2>m\u00b3/s</color></size>";
+        zhaQianShuiWei.text = $"- <size=14><color=#A5BFE2>m</color></size>";
+
+        var floorGateData_sw = type == 0 ? GlobalData.floorGateData.buYuanSW : GlobalData.floorGateData.taoKouSW;
+        zhaHouShuiWei.text = $"{floorGateData_sw} <size=14><color=#A5BFE2>m</color></size>";
+
+        var shuiweiData = type == 0 ? GlobalData.floorGateData.swzxtBY : GlobalData.floorGateData.swzxtTK;
+
+        XAxis tempXaxis = shuiweiChart.GetChartComponent<XAxis>();
+        tempXaxis.data.Clear();
+        for (int i = 0; i < shuiweiData.Length; i++)
+        {
+            tempXaxis.AddData(shuiweiData[i].key);
+        }
+
+        var tempSeries = shuiweiChart.series;
+        tempSeries[0].serieName = "水位";
+        tempSeries[1].serieName = "水位";
+        SerieData[] tempDatas = new SerieData[shuiweiData.Length];
+        for (int i = 0; i < tempDatas.Length; i++)
+        {
+            tempDatas[i] = new SerieData();
+            tempDatas[i].data = new List<double>();
+            tempDatas[i].data.Add(i);
+            tempDatas[i].data.Add(shuiweiData[i].value);
+        }
+
+        tempSeries[0].data.Clear();
+        tempSeries[0].data.AddRange(tempDatas);
+        tempSeries[1].data.Clear();
+        tempSeries[1].data.AddRange(tempDatas);
+    }
+
+
     public void SearchObsItem(string s_name)
     {
         if (s_name.Equals(""))
@@ -208,6 +274,7 @@ public class ZMJKLayer : MonoBehaviour
             }
         }
     }
+
     // Update is called once per frame
     void Update()
     {
@@ -217,12 +284,12 @@ public class ZMJKLayer : MonoBehaviour
             {
                 if (IsObjectInCameraView(targetObj.transform, _camera))
                 {
-                    gongChengPanel.transform.position=_camera.WorldToScreenPoint(targetObj.transform.position);
+                    gongChengPanel.transform.position = _camera.WorldToScreenPoint(targetObj.transform.position);
                 }
             }
         }
     }
-    
+
     bool IsObjectInCameraView(Transform objectTransform, Camera camera)
     {
         Vector3 objectScreenPosition = camera.WorldToScreenPoint(objectTransform.position);

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

@@ -260,6 +260,10 @@ public class GCJKLayer : YZTRootLayer
     private Dictionary<string, DeviceTrendPanel> openDeviceTrendPanelList = new Dictionary<string, DeviceTrendPanel>();
     //public GongChengLieBiaoItem currentSelectItem;
 
+    //上下游水位
+    public ShuiWeiCtrl swSY;
+    public ShuiWeiCtrl swXY;
+
     private void Awake()
     {
         _Instance = this;
@@ -310,6 +314,9 @@ public class GCJKLayer : YZTRootLayer
 
     public void Init()
     {
+        swSY.Init();
+        swXY.Init();
+        
         //泵站监控面板
         _bengZhanJianKongPanel = this.transform.Find("BengZhanJianKong").GetComponent<RectTransform>();
         _bengZhanJianKongContent =
@@ -596,6 +603,74 @@ public class GCJKLayer : YZTRootLayer
 
         currentDataType = type;
 
+        if (currentDataType == 0)
+        {
+            float? swUp = null;
+            float? swDown=null;
+            string swUpName="";
+            string swDownName="";
+            for (int i = 0; i < GlobalData.swDatas.Count; i++)
+            {
+                if (GlobalData.swDatas[i].stnm == "补元(上)")
+                {
+                    swUp = GlobalData.swDatas[i].upz;
+                    swUpName = GlobalData.swDatas[i].stnm;
+                }
+                if (GlobalData.swDatas[i].stnm == "补元(下)")
+                {
+                     swDown = GlobalData.swDatas[i].dwz;
+                     swDownName = GlobalData.swDatas[i].stnm;
+                }
+            }
+            var swTargets = GameObject.FindGameObjectsWithTag("BY_SW");
+            for (int i = 0; i < swTargets.Length; i++)
+            {
+                if (swTargets[i].name.Equals("BY_ZhaQian"))
+                {
+                    swSY.SetData(swUpName,swUp,swTargets[i].transform);
+                }
+                if (swTargets[i].name.Equals("BY_ZhaHou"))
+                {
+                    swXY.SetData(swDownName,swDown,swTargets[i].transform);
+                }
+            }
+            
+        }
+        else
+        {
+            float? swUp = null;
+            float? swDown=null;
+            string swUpName="";
+            string swDownName="";
+            for (int i = 0; i < GlobalData.swDatas.Count; i++)
+            {
+                if (GlobalData.swDatas[i].stnm == "套口(上)")
+                {
+                    swUp = GlobalData.swDatas[i].upz;
+                    swUpName = GlobalData.swDatas[i].stnm;
+                }
+                if (GlobalData.swDatas[i].stnm == "套口(下)")
+                {
+                    swDown = GlobalData.swDatas[i].dwz;
+                    swDownName = GlobalData.swDatas[i].stnm;
+                }
+            }
+            var swTargets = GameObject.FindGameObjectsWithTag("TK_SW");
+            for (int i = 0; i < swTargets.Length; i++)
+            {
+                if (swTargets[i].name.Equals("TK_ZhaQian"))
+                {
+                    swSY.SetData(swUpName,swUp,swTargets[i].transform);
+                }
+                if (swTargets[i].name.Equals("TK_ZhaHou"))
+                {
+                    swXY.SetData(swDownName,swDown,swTargets[i].transform);
+                }
+            }
+        }
+            
+        
+
         //水位图标
         CreatShuiWeiIcon();
         FindShuiWeiTargetObje();

Assets/Scripts/UI/UIView/GCYW/B08_TaskPointItem.cs

@@ -26,6 +26,6 @@ public class B08_TaskPointItem : MonoBehaviour
         gcywLayer = baseLayer;
         itemIndex = index;
         posAndtimeText.text = $"{(index==0?"起点":"")}  <color=#A5BFE2>{time}</color>";
-        messageText.text = $"{data.item_name}";
+        messageText.text = $"{data.faItemName}";
     }
 }

Assets/Scripts/UI/UIView/GCYW/GCYWLayer.cs

@@ -378,7 +378,7 @@ public class GCYWLayer : YZTRootLayer
         for (int i = 0; i < itemsArray.Length; i++)
         {
             GameObject tempObj = Instantiate(taskPointIconPrefab, taskPointIconContent);
-            tempObj.name = itemsArray[i].item_id;
+            tempObj.name = itemsArray[i].xjItemId;
             tempObj.transform.position = CoordinateConverter.GeoToUnity(double.Parse(itemsArray[i].longitude),
                 double.Parse(itemsArray[i].latitude));
             taskPointIcons.Add(tempObj.GetComponent<TaskPointIcon>());

Assets/Scripts/UI/UIView/GCYW/TaskListPanel.cs

@@ -37,7 +37,7 @@ public class TaskListPanel : MonoBehaviour
         taskItemList.Clear();
         for (int i = 0; i < GlobalData.B08TaskListInfos.Length; i++)
         {
-            var taskInfoList = GlobalData.B08TaskListInfos[i].data.list;
+            var taskInfoList = GlobalData.B08TaskListInfos[i].data;
             if (taskInfoList != null)
             {
                 for (int j = 0; j < taskInfoList.Length; j++)

Assets/Scripts/UI/UIView/GCYW/TaskPhotoPanel.cs

@@ -50,10 +50,10 @@ public class TaskPhotoPanel : MonoBehaviour
     public void ChangePage(int pageIndex)
     {
         var currentData = task_items[pageIndex];
-        string path = currentData.img_path.Replace("10.123.10.11", "58.19.230.46");
+        string path ="http://58.19.230.46:9180/prod-api/uploads/"+currentData.files[0].filePath;
         TextureLoadHelp._Instance.LoadTexFromUrl(path, img);
-        posText.text = currentData.item_name;
-        messageText.text = currentData.item_name;
+        posText.text = currentData.faItemName;
+        messageText.text = currentData.faItemName;
         pageText.text = $"{pageIndex + 1}/{task_items.Length}";
     }
 }

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

@@ -22,15 +22,15 @@ public enum shuiWeiYuJingDataType
 [System.Serializable]
 public class StationData : IComparable
 {
-    public string stnm;      // 站名
-    public string lgtd;      // 经度
-    public string lttd;      // 纬度
-    public string stcd;      // 站码
+    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 float? upz; // 上水位
+    public float? dwz; // 下水位
+    public float? tgtq; // 流量
+    public string tm; // 时间
 
     public string swchrcd;
     public string msqmt;
@@ -92,8 +92,7 @@ public class SWYJLayer : YZTRootLayer
     //水位变化与统计
     private BarChart shuiWeiBianHua;
 
-    [Header("工程安全监测-水位变化与统计数据")]
-    public ShuiWeiBianHuaData ShuiWeiBianHuaData_TK_Month;
+    [Header("工程安全监测-水位变化与统计数据")] public ShuiWeiBianHuaData ShuiWeiBianHuaData_TK_Month;
     public ShuiWeiBianHuaData ShuiWeiBianHuaData_TK_Day;
     public ShuiWeiBianHuaData ShuiWeiBianHuaData_TK_Hour;
 
@@ -112,7 +111,6 @@ public class SWYJLayer : YZTRootLayer
     public UnityEngine.UI.Button exitGlobalSWBtn;
 
 
-
     public Sprite highLightBtn;
     public Sprite normalBtn;
 
@@ -124,7 +122,7 @@ public class SWYJLayer : YZTRootLayer
 
     public GameObject runtimePointObj;
 
-    public GameObject shuiweiIconPrefab;
+    //public GameObject shuiweiIconPrefab;
     private List<ShuiWeiIconCtrl> _shuiWeiIconCtrls = new List<ShuiWeiIconCtrl>();
     private Transform _shuiWeiIconContent;
     private bool creatShuiWeiIcon = false;
@@ -133,6 +131,10 @@ public class SWYJLayer : YZTRootLayer
     public GameObject zdpmPrefab;
     //public GameObject[] zdpmObjs;
 
+    //上下游水位
+    public ShuiWeiCtrl swSY;
+    public ShuiWeiCtrl swXY;
+
     private void Awake()
     {
         Init();
@@ -143,6 +145,7 @@ public class SWYJLayer : YZTRootLayer
             TaoKouDataButton.GetComponent<UnityEngine.UI.Image>().sprite = normalBtn;
             StaticLod.instance.OnFoucusStatic(0);
             ChangeDataType(shuiWeiYuJingDataType.BuYuan);
+            CreateOrRefreshShuiWeiIcon();
         });
         TaoKouDataButton = this.transform.Find("Main/TaoKouButton").GetComponent<Button>();
         TaoKouDataButton.onClick.AddListener(() =>
@@ -151,6 +154,7 @@ public class SWYJLayer : YZTRootLayer
             TaoKouDataButton.GetComponent<UnityEngine.UI.Image>().sprite = highLightBtn;
             StaticLod.instance.OnFoucusStatic(1);
             ChangeDataType(shuiWeiYuJingDataType.TaoKou);
+            CreateOrRefreshShuiWeiIcon();
         });
 
         //水位
@@ -171,7 +175,6 @@ public class SWYJLayer : YZTRootLayer
 
     void InitSWZData()
     {
-
         if (GlobalData.qXZDatas.Count < 1 || GlobalData.qXZDatas1h.Count < 1)
             return;
 
@@ -185,9 +188,11 @@ public class SWYJLayer : YZTRootLayer
             {
                 xtValue = GlobalData.qXZDatas[i].dropSum6;
             }
+
             total24Value += GlobalData.qXZDatas[i].dropSum6;
             max24Value = MathF.Max(max24Value, GlobalData.qXZDatas[i].dropSum6);
         }
+
         avg24Value = total24Value / GlobalData.qXZDatas.Count;
 
         float total1Value = 0;
@@ -196,15 +201,15 @@ public class SWYJLayer : YZTRootLayer
 
         for (int i = 0; i < GlobalData.qXZDatas1h.Count; i++)
         {
-
             total1Value += GlobalData.qXZDatas[i].dropSum6;
             max1Value = MathF.Max(max24Value, GlobalData.qXZDatas[i].dropSum6);
         }
+
         avg1Value = total24Value / GlobalData.qXZDatas.Count;
 
 
         _dangQianYuLiangText.text =
-                $"{max1Value.ToString("0.00")} <size=14><color=#A5BBE2>mm</color></size>";
+            $"{max1Value.ToString("0.00")} <size=14><color=#A5BBE2>mm</color></size>";
         _zuiDaYuLiangText.text =
             $"{max24Value.ToString("0.00")} <size=14><color=#A5BBE2>mm</color></size>";
         _pingJunYuLiangText.text =
@@ -252,10 +257,12 @@ public class SWYJLayer : YZTRootLayer
             {
                 value1 = value1 / 100.0f;
             }
+
             if (value2 > 1000)
             {
                 value2 = value2 / 100.0f;
             }
+
             _pingJunShuiWeiText.text = $"{((value1 + value2) / 2).ToString("0.00")} <color=#A5BBE2>m</color>";
             _sheFangShuiWeiText.text = $"{GlobalData.threeLevelShuiWeiDatas[0].floodProtectionLevel} m";
             _jingJieShuiWeiText.text = $"{GlobalData.threeLevelShuiWeiDatas[0].warningLevel} m";
@@ -272,16 +279,17 @@ public class SWYJLayer : YZTRootLayer
             {
                 value1 = value1 / 100.0f;
             }
+
             if (value2 > 1000)
             {
                 value2 = value2 / 100.0f;
             }
+
             _pingJunShuiWeiText.text = $"{((value1 + value2) / 2).ToString("0.00")} <color=#A5BBE2>m</color>";
             _sheFangShuiWeiText.text = $"{GlobalData.threeLevelShuiWeiDatas[1].floodProtectionLevel} m";
             _jingJieShuiWeiText.text = $"{GlobalData.threeLevelShuiWeiDatas[1].warningLevel} m";
             _baoZhengShuiWeiText.text = $"{GlobalData.threeLevelShuiWeiDatas[1].guaranteeLevel} m";
             _shuiWeiText.text = $"{value1.ToString("0.00")}";
-
         }
     }
 
@@ -289,64 +297,84 @@ public class SWYJLayer : YZTRootLayer
     //水位图标
     public void CreateOrRefreshShuiWeiIcon()
     {
-        if (_shuiWeiIconCtrls.Count < 1)
+        if (currentDataType == 0)
         {
-            for (int i = 0; i < GlobalData.BuYuanShuiWeiDataList.Count; i++)
+            float? swUp = null;
+            float? swDown = null;
+            string swUpName = "";
+            string swDownName = "";
+            for (int i = 0; i < GlobalData.swDatas.Count; i++)
             {
-                ShuiWeiIconCtrl tempIcon =
-                    Instantiate(shuiweiIconPrefab, _shuiWeiIconContent).GetComponent<ShuiWeiIconCtrl>();
-                tempIcon.Init(GlobalData.BuYuanShuiWeiDataList[i]);
-                _shuiWeiIconCtrls.Add(tempIcon);
-            }
+                if (GlobalData.swDatas[i].stnm == "补元(上)")
+                {
+                    swUp = GlobalData.swDatas[i].upz;
+                    swUpName = GlobalData.swDatas[i].stnm;
+                }
 
-            if (_shuiWeiIconCtrls.Count < 1)
-            {
-                return;
+                if (GlobalData.swDatas[i].stnm == "补元(下)")
+                {
+                    swDown = GlobalData.swDatas[i].dwz;
+                    swDownName = GlobalData.swDatas[i].stnm;
+                }
             }
 
-            GameObject[] BY_targs = GameObject.FindGameObjectsWithTag(shuiWeiType.BuYuanShuiWei.ToString());
-            GameObject[] TK_targs = GameObject.FindGameObjectsWithTag(shuiWeiType.TaoKouShuiWei.ToString());
-            for (int i = 0; i < _shuiWeiIconCtrls.Count; i++)
+            var swTargets = GameObject.FindGameObjectsWithTag("BY_SW");
+            for (int i = 0; i < swTargets.Length; i++)
             {
-                string objName = _shuiWeiIconCtrls[i]._data.targetName;
-                if (_shuiWeiIconCtrls[i]._data.type == shuiWeiType.BuYuanShuiWei)
+                if (swTargets[i].name.Equals("BY_ZhaQian"))
                 {
-                    for (int j = 0; j < BY_targs.Length; j++)
-                    {
-                        if (BY_targs[j].gameObject.name == objName)
-                        {
-                            _shuiWeiIconCtrls[i].targetTransForm = BY_targs[j].transform;
-                            break;
-                        }
-                    }
+                    swSY.SetData(swUpName, swUp, swTargets[i].transform);
                 }
-                else
+
+                if (swTargets[i].name.Equals("BY_ZhaHou"))
                 {
-                    for (int j = 0; j < TK_targs.Length; j++)
-                    {
-                        if (TK_targs[j].gameObject.name == objName)
-                        {
-                            _shuiWeiIconCtrls[i].targetTransForm = TK_targs[j].transform;
-                            break;
-                        }
-                    }
+                    swXY.SetData(swDownName, swDown, swTargets[i].transform);
                 }
             }
         }
         else
         {
-            for (int i = 0; i < GlobalData.BuYuanShuiWeiDataList.Count; i++)
+            float? swUp = null;
+            float? swDown = null;
+            string swUpName = "";
+            string swDownName = "";
+            for (int i = 0; i < GlobalData.swDatas.Count; i++)
+            {
+                if (GlobalData.swDatas[i].stnm == "套口(上)")
+                {
+                    swUp = GlobalData.swDatas[i].upz;
+                    swUpName = GlobalData.swDatas[i].stnm;
+                }
+
+                if (GlobalData.swDatas[i].stnm == "套口(下)")
+                {
+                    swDown = GlobalData.swDatas[i].dwz;
+                    swDownName = GlobalData.swDatas[i].stnm;
+                }
+            }
+
+            var swTargets = GameObject.FindGameObjectsWithTag("TK_SW");
+            for (int i = 0; i < swTargets.Length; i++)
             {
-                _shuiWeiIconCtrls[i].Init(GlobalData.BuYuanShuiWeiDataList[i]);
+                if (swTargets[i].name.Equals("TK_ZhaQian"))
+                {
+                    swSY.SetData(swUpName, swUp, swTargets[i].transform);
+                }
+
+                if (swTargets[i].name.Equals("TK_ZhaHou"))
+                {
+                    swXY.SetData(swDownName, swDown, swTargets[i].transform);
+                }
             }
         }
     }
 
 
-
-
     public void Init()
     {
+        swSY.Init();
+        swXY.Init();
+
         //全域雨量
         _dangQianYuLiangText = this.transform.Find("Left/QuanYuYuLiang/DangQianYuLiang/numText").GetComponent<Text>();
         _zuiDaYuLiangText = this.transform.Find("Left/QuanYuYuLiang/ZuiDaYuLiang/numText").GetComponent<Text>();
@@ -356,8 +384,6 @@ public class SWYJLayer : YZTRootLayer
         _weatherTypeIcon = this.transform.Find("Left/QuanYuYuLiang/weatherIcon").GetComponent<Image>();
 
 
-
-
         //工程安全监测
         //检测数据
         _pingJunShuiWeiText = this.transform.Find("RightUp/JianKongShuJu/PingJunShuiWei/numText").GetComponent<Text>();
@@ -394,6 +420,8 @@ public class SWYJLayer : YZTRootLayer
 
         exitGlobalSWBtn.onClick.AddListener(() =>
         {
+            swXY.gameObject.SetActive(true);        
+            swSY.gameObject.SetActive(true);   
             CameraManager.SwitchCamera(0);
             viewMode = ViewMode.normal;
             miniMap.gameObject.SetActive(false);
@@ -416,6 +444,9 @@ public class SWYJLayer : YZTRootLayer
     Dictionary<string, StationDataFix> stationDataLib = new Dictionary<string, StationDataFix>();
     public async void OnGlobalSWBtnClick()
     {
+        swXY.gameObject.SetActive(false);        
+        swSY.gameObject.SetActive(false);        
+        
         CameraManager.SwitchCamera(1);
         viewMode = ViewMode.miniMap;
         GameObject shaPan = GameObject.FindGameObjectWithTag("ShaPan");
@@ -497,9 +528,11 @@ public class SWYJLayer : YZTRootLayer
                 i += 0;
             }
         }
+
         miniMap.gameObject.SetActive(true);
         main.gameObject.SetActive(false);
     }
+
     public void OnShuiWeiDropDownSelect(int value)
     {
         if (currentDataType == shuiWeiYuJingDataType.BuYuan)
@@ -536,7 +569,6 @@ public class SWYJLayer : YZTRootLayer
 
     public void SetShuiWeiTongJiBarChart(ShuiWeiBianHuaData shuiWeiBianHuaData)
     {
-
         shuiWeiBianHuaData.InverseAllData();
         string yearTitle = shuiWeiBianHuaData.GetYearRange();
         if (shuiWeiBianHuaData != null)
@@ -550,9 +582,10 @@ public class SWYJLayer : YZTRootLayer
                 string monthDay = date.ToString("MM-dd"); // 结果为"03-30"
                 x_chart.data.Add(monthDay);
             }
+
             x_chart.axisName.name = yearTitle;
             x_chart.refreshComponent?.Invoke();
-            
+
             var tempSeries = shuiWeiBianHua.series;
             tempSeries[0].ClearData();
             tempSeries[1].ClearData();
@@ -593,12 +626,12 @@ public class SWYJLayer : YZTRootLayer
                 obj.transform.GetChild(0).GetChild(0).GetComponent<Text>().text = "2";
             else
                 obj.transform.GetChild(0).GetChild(0).GetComponent<Text>().text = i + "";
-            obj.transform.GetChild(1).GetChild(0).GetComponent<Text>().text = $"{max} <size=14><color=#A5BBE2>m</color></size>";
+            obj.transform.GetChild(1).GetChild(0).GetComponent<Text>().text =
+                $"{max} <size=14><color=#A5BBE2>m</color></size>";
         }
     }
 
 
-
     public void ChangeDataType(shuiWeiYuJingDataType _type)
     {
         if (currentDataType != _type)

ProjectSettings/TagManager.asset

@@ -18,6 +18,8 @@ TagManager:
   - HeMianStatic
   - BuYuanZhaMen
   - TaoKouZhaMen
+  - BY_SW
+  - TK_SW
   layers:
   - Default
   - TransparentFX