提交告警

Assets/Prefabs/UI/Item/YiChangJingGaoItem.prefab

@@ -35,8 +35,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 257.5, y: -12}
-  m_SizeDelta: {x: 72, y: 16}
+  m_AnchoredPosition: {x: 202.92, y: -42.582}
+  m_SizeDelta: {x: 314.16, y: 26.4839}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6959533955177922383
 CanvasRenderer:
@@ -59,7 +59,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 1, g: 0, b: 0, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -68,12 +68,12 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
-    m_FontSize: 12
+    m_FontSize: 14
     m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
     m_MinSize: 1
-    m_MaxSize: 40
-    m_Alignment: 4
+    m_MaxSize: 14
+    m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
@@ -113,10 +113,10 @@ RectTransform:
   m_Father: {fileID: 2220258450520632649}
   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.5, y: 0}
-  m_SizeDelta: {x: 66, y: 16}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 42.669, y: -15}
+  m_SizeDelta: {x: 85.3389, y: 26.483902}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9061236678725872518
 CanvasRenderer:
@@ -148,12 +148,12 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
-    m_FontSize: 12
+    m_FontSize: 14
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
-    m_Alignment: 4
+    m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
@@ -195,8 +195,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 327.5, y: -12}
-  m_SizeDelta: {x: 48, y: 16}
+  m_AnchoredPosition: {x: 291.8, y: -15}
+  m_SizeDelta: {x: 64.5658, y: 26.484}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2797651129224667077
 CanvasRenderer:
@@ -228,7 +228,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
-    m_FontSize: 12
+    m_FontSize: 14
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 1
@@ -276,13 +276,14 @@ RectTransform:
   - {fileID: 6858193984697350569}
   - {fileID: 1295084678491509369}
   - {fileID: 7743358018547652835}
+  - {fileID: 6018012733762116425}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 360, y: 24}
+  m_AnchoredPosition: {x: 0, y: -15.911926}
+  m_SizeDelta: {x: 360, y: 55.8239}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7823451865510450120
 CanvasRenderer:
@@ -334,6 +335,16 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 42ad4a1bfb30cab438e46f2f68dcaf68, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  currentData:
+    time: 
+    pos: 
+    type: 
+    info: 
+    state: 
+  currentSWAlertData:
+    alertType: 
+    alertMessage: 
+    projectName: 
 --- !u!1 &6175987105978240184
 GameObject:
   m_ObjectHideFlags: 0
@@ -369,8 +380,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 119.5, y: -12}
-  m_SizeDelta: {x: 48, y: 16}
+  m_AnchoredPosition: {x: 111.42, y: -15}
+  m_SizeDelta: {x: 62.0647, y: 26.4839}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3508268000042985879
 CanvasRenderer:
@@ -402,7 +413,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
-    m_FontSize: 12
+    m_FontSize: 14
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 1
@@ -449,8 +460,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 187.5, y: -12}
-  m_SizeDelta: {x: 48, y: 16}
+  m_AnchoredPosition: {x: 204.4, y: -15}
+  m_SizeDelta: {x: 69.99, y: 26.4839}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6989101465698841038
 CanvasRenderer:
@@ -482,11 +493,11 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
-    m_FontSize: 12
+    m_FontSize: 14
     m_FontStyle: 0
-    m_BestFit: 0
+    m_BestFit: 1
     m_MinSize: 1
-    m_MaxSize: 40
+    m_MaxSize: 14
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -494,3 +505,83 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u6240\u5C5E\u5DE5\u7A0B"
+--- !u!1 &7101057941826847281
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6018012733762116425}
+  - component: {fileID: 6021655137821718776}
+  - component: {fileID: 7531299114516784046}
+  m_Layer: 5
+  m_Name: infoC
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6018012733762116425
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7101057941826847281}
+  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: 2220258450520632649}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 22.919, y: -42.582}
+  m_SizeDelta: {x: 45.8371, y: 26.4839}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6021655137821718776
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7101057941826847281}
+  m_CullTransparentMesh: 1
+--- !u!114 &7531299114516784046
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7101057941826847281}
+  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.41194963, g: 0.63751805, 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_FontData:
+    m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 14
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u5185\u5BB9\uFF1A"

Assets/Prefabs/UI/Thing5.prefab

@@ -0,0 +1,389 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &8262524950816216656
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8262524950816216657}
+  - component: {fileID: 8262524950816216655}
+  - component: {fileID: 8262524950816216654}
+  m_Layer: 5
+  m_Name: Title
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8262524950816216657
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8262524950816216656}
+  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: 8262524951720080470}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 159.1918, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8262524950816216655
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8262524950816216656}
+  m_CullTransparentMesh: 1
+--- !u!114 &8262524950816216654
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8262524950816216656}
+  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: 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: 15
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u4E8B\u4EF6\u6807\u9898"
+--- !u!1 &8262524951334062313
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8262524951334062310}
+  - component: {fileID: 8262524951334062308}
+  - component: {fileID: 8262524951334062311}
+  m_Layer: 5
+  m_Name: Time
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8262524951334062310
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8262524951334062313}
+  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: 8262524951720080470}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 90.696, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8262524951334062308
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8262524951334062313}
+  m_CullTransparentMesh: 1
+--- !u!114 &8262524951334062311
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8262524951334062313}
+  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: 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: 15
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 2024
+--- !u!1 &8262524951720080473
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8262524951720080470}
+  - component: {fileID: 8262524951720080471}
+  m_Layer: 5
+  m_Name: Thing5
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8262524951720080470
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8262524951720080473}
+  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: 8262524951762010964}
+  - {fileID: 8262524950816216657}
+  - {fileID: 8262524952304635383}
+  - {fileID: 8262524951334062310}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 360, y: 25}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &8262524951720080471
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8262524951720080473}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 19
+    m_Right: 0
+    m_Top: 2
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_Spacing: -1.31
+  m_ChildForceExpandWidth: 0
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 1
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!1 &8262524951762010967
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8262524951762010964}
+  - component: {fileID: 8262524951762010962}
+  - component: {fileID: 8262524951762010965}
+  m_Layer: 5
+  m_Name: No
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8262524951762010964
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8262524951762010967}
+  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: 8262524951720080470}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 26.0697, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8262524951762010962
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8262524951762010967}
+  m_CullTransparentMesh: 1
+--- !u!114 &8262524951762010965
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8262524951762010967}
+  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: 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: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 1
+--- !u!1 &8262524952304635382
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8262524952304635383}
+  - component: {fileID: 8262524952304635381}
+  - component: {fileID: 8262524952304635380}
+  m_Layer: 5
+  m_Name: Pos
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8262524952304635383
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8262524952304635382}
+  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: 8262524951720080470}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 68.9722, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8262524952304635381
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8262524952304635382}
+  m_CullTransparentMesh: 1
+--- !u!114 &8262524952304635380
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8262524952304635382}
+  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: 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: 15
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u5730\u70B9\u540D\u79F0"

Assets/Prefabs/UI/Thing5.prefab.meta

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

Assets/Prefabs/UI/WaterTrendPanel.prefab

@@ -7988,7 +7988,7 @@ RectTransform:
   m_GameObject: {fileID: 1884876626226038780}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0, y: 0, z: 0}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2657697681184236664}
@@ -14774,7 +14774,7 @@ RectTransform:
   m_GameObject: {fileID: 2034501008142644078}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0, y: 0, z: 0}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2034501007576326614}
@@ -15556,7 +15556,7 @@ RectTransform:
   m_GameObject: {fileID: 2034501008273103086}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0, y: 0, z: 0}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2034501009243304164}
@@ -16728,7 +16728,7 @@ RectTransform:
   m_GameObject: {fileID: 2034501008475670655}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0, y: 0, z: 0}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2034501007153561317}
@@ -18596,7 +18596,7 @@ RectTransform:
   m_GameObject: {fileID: 2034501008914180638}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0, y: 0, z: 0}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2034501008621006390}
@@ -32117,7 +32117,7 @@ RectTransform:
   m_GameObject: {fileID: 4544996608059761212}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0, y: 0, z: 0}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1913709242357377468}
@@ -40777,7 +40777,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   isOpen: 1
-  text: "\u4E03\u6708, 2025"
+  text: "\u516B\u6708, 2025"
   color: {r: 1, g: 1, b: 1, a: 1}
   textSize: 14
   fontStyle: 1
@@ -44794,7 +44794,7 @@ RectTransform:
   m_GameObject: {fileID: 7043820139416451179}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0, y: 0, z: 0}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8670710784005932134}
@@ -45256,7 +45256,7 @@ RectTransform:
   m_GameObject: {fileID: 7204469873957513120}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0, y: 0, z: 0}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7491185687818382323}
@@ -49435,7 +49435,7 @@ RectTransform:
   m_GameObject: {fileID: 8003399528438951295}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0, y: 0, z: 0}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 3202674770744282122}

Assets/Prefabs/UI/XHYZT/SWYJ.prefab

@@ -5593,86 +5593,6 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 1 <size=14><color=#A5BBE2>mm</color></size>
---- !u!1 &1758555593681745192
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 8735447532097238970}
-  - component: {fileID: 2689479136928859889}
-  - component: {fileID: 2789425618155155097}
-  m_Layer: 5
-  m_Name: Text (Legacy) (4)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &8735447532097238970
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1758555593681745192}
-  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: 2353965501874013453}
-  m_RootOrder: 4
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 327.5, y: -12}
-  m_SizeDelta: {x: 40, y: 25}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &2689479136928859889
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1758555593681745192}
-  m_CullTransparentMesh: 1
---- !u!114 &2789425618155155097
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1758555593681745192}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.64705884, g: 0.73333335, b: 0.8862745, a: 1}
-  m_RaycastTarget: 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: 14
-    m_FontStyle: 0
-    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: "\u5904\u7406\u72B6\u6001"
 --- !u!1 &1776740913917160233
 GameObject:
   m_ObjectHideFlags: 0
@@ -9314,7 +9234,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 2060663034614906384}
   m_Direction: 2
   m_Value: 0
-  m_Size: 0.81333333
+  m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -10046,7 +9966,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 257.5, y: -12}
+  m_AnchoredPosition: {x: 301, y: -12}
   m_SizeDelta: {x: 40, y: 25}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9140850945258684237
@@ -10090,7 +10010,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u5185\u5BB9"
+  m_Text: "\u72B6\u6001\n"
 --- !u!1 &3525405420777444385
 GameObject:
   m_ObjectHideFlags: 0
@@ -13302,7 +13222,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 119.5, y: -12}
+  m_AnchoredPosition: {x: 119.63, y: -12}
   m_SizeDelta: {x: 40, y: 25}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5458887080622337709
@@ -17221,14 +17141,13 @@ RectTransform:
   - {fileID: 1193326079845187840}
   - {fileID: 7042026124491522017}
   - {fileID: 1402665543971555205}
-  - {fileID: 8735447532097238970}
   m_Father: {fileID: 2174387876988070014}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 360, y: 24}
+  m_SizeDelta: {x: 370.1334, y: 24}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7054476508142875670
 CanvasRenderer:
@@ -26724,7 +26643,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 187.5, y: -12}
+  m_AnchoredPosition: {x: 214.3, y: -12}
   m_SizeDelta: {x: 40, y: 25}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4282850172252757078

Assets/Scripts/HttpHelper.cs

@@ -14,6 +14,7 @@ using UnityEngine;
 using UnityEngine.Networking;
 using Unity.VisualScripting;
 using static System.Net.WebRequestMethods;
+using System.Linq;
 
 public class HttpHelper : MonoBehaviour
 {
@@ -101,6 +102,7 @@ public class HttpHelper : MonoBehaviour
             Debug.Log("HttpInitGCJKData");
             //可以并行，无需等待
             InitGCJKData();
+            InitGCJKData2();
             InitGCJKData1h();
         }
 
@@ -1187,6 +1189,49 @@ public class HttpHelper : MonoBehaviour
 
     }
 
+    public async Task InitGCJKData2()
+    {
+        GlobalData.sensorAlertDone = false;
+        UnityWebRequest requestData = UnityWebRequest.Get(ServerAddress.APIGetSensorAlerts);
+        requestData.timeout = 2;
+        await requestData.SendWebRequest();
+        try
+        {
+            if (requestData.result != UnityWebRequest.Result.Success)
+            {
+                Debug.LogWarning("工程告警联网不成功,原因:返request不成功");
+            }
+            else
+            {
+                string postResult = requestData.downloadHandler.text;
+                if (useAes)
+                {
+                    postResult = AESCrypto.Decrypt(postResult);
+
+                }
+                JObject jsonObject = JObject.Parse(postResult);
+                Debug.LogError(postResult.ToString());
+                // 提取data字段的值
+                JToken dataToken = jsonObject["data"];
+                JToken codeToken = jsonObject["code"];
+                if (codeToken.ToString() == "200")
+                {
+                    
+                    GlobalData.sensorAlert = JsonConvert.DeserializeObject<SensorAlert>(dataToken.ToString());
+                    GlobalData.sensorAlertDone = true;
+                }
+                else
+                {
+                    Debug.LogWarning("工程告警联网不成功,原因:返序列化失败");
+                }
+            }
+        }
+        catch (Exception e)
+        {
+            Debug.LogWarning("工程告警联网不成功,原因:" + e.ToString());
+        }
+    }
+
 
     public async Task InitXHDDData()
     {
@@ -1257,6 +1302,7 @@ public class HttpHelper : MonoBehaviour
         await InitSWYJData1();
         await InitSWYJData2();
         await InitSWYJData3();
+        await InitSWYJData4();
         OnSWYJRefresh?.Invoke();
     }
 
@@ -1605,6 +1651,42 @@ public class HttpHelper : MonoBehaviour
         }
     }
 
+
+    public async Task InitSWYJData4()
+    {
+        GlobalData.sWAlertDone = false;
+        UnityWebRequest requestData = UnityWebRequest.Get(ServerAddress.APIGetAlerts);
+        requestData.timeout = 2;
+        await requestData.SendWebRequest();
+        try
+        {
+            if (requestData.result != UnityWebRequest.Result.Success)
+            {
+                Debug.LogWarning("水位告警联网不成功,原因:返request不成功");
+            }
+            else
+            {
+                string postResult = requestData.downloadHandler.text;
+                if (useAes)
+                {
+                    postResult = AESCrypto.Decrypt(postResult);
+
+                }
+                JObject jsonObject = JObject.Parse(postResult);
+
+                // 提取data字段的值
+                JToken dataToken = jsonObject["rows"];
+
+                GlobalData.sWAlerts = JsonConvert.DeserializeObject<List<SWAlert>>(dataToken.ToString());
+                GlobalData.sWAlertDone = true;
+            }
+        }
+        catch (Exception e)
+        {
+            Debug.LogWarning("水位告警联网不成功,原因:" + e.ToString());
+        }
+    }
+
     public async Task InitSWYJData0()
     {
         bool successInternet = true;

Assets/Scripts/UI/Data/GlobalData.cs

@@ -80,6 +80,16 @@ public class GlobalData
     public static List<ObsData> obsDatas_by = new List<ObsData>();
 
 
+    /// <summary>
+    /// 一张图第三页传感器告警数据读取完毕
+    /// </summary>
+    public static bool sensorAlertDone = false;
+
+    /// <summary>
+    /// 一张图第三页传感器告警数据
+    /// </summary>
+    public static SensorAlert sensorAlert = new SensorAlert();
+
     /// <summary>
     /// 一张图第三页补元监控数据
     /// </summary>
@@ -101,6 +111,17 @@ public class GlobalData
     public static List<ShuiWeiData> BuYuanShuiWeiDataList = new List<ShuiWeiData>();
     public static List<ShuiWeiData> TaoKouShuiWeiDataList = new List<ShuiWeiData>();
 
+
+    /// <summary>
+    /// 一张图第六页水位告警数据读取完毕
+    /// </summary>
+    public static bool sWAlertDone = false;
+
+    /// <summary>
+    /// 一张图第六页水位告警数据
+    /// </summary>
+    public static List<SWAlert> sWAlerts = new List<SWAlert>();
+
     /// <summary>
     /// 一张图第六页三线水位数据
     /// </summary>

Assets/Scripts/UI/Item/YiChangJingGaoItem.cs

@@ -1,10 +1,14 @@
+using System.Runtime.ConstrainedExecution;
 using UnityEngine;
+using UnityEngine.EventSystems;
 using UnityEngine.UI;
+using static SensorAlert;
 
-public class YiChangJingGaoItem : MonoBehaviour
+public class YiChangJingGaoItem : MonoBehaviour,IPointerEnterHandler,IPointerExitHandler
 {
     public YiChangJingGaoData currentData;
-
+    public SWAlert currentSWAlertData;
+    public SensorAlertData currentSensorData;
     private Text _timeText;
     private Text _posText;
     private Text _typeText;
@@ -20,6 +24,16 @@ public class YiChangJingGaoItem : MonoBehaviour
         _stateText = this.transform.Find("state").GetComponent<Text>();
     }
 
+    public void OnPointerEnter(PointerEventData eventData)
+    {
+        Debug.Log(11);
+    }
+
+    public void OnPointerExit(PointerEventData eventData)
+    {
+        Debug.Log(22);
+    }
+
     public void SetData(YiChangJingGaoData data)
     {
         currentData = data;
@@ -29,4 +43,31 @@ public class YiChangJingGaoItem : MonoBehaviour
         _infoText.text = currentData.info;
         _stateText.text = currentData.state;
     }
+
+    public void SetData(SWAlert data)
+    {
+        currentSWAlertData = data;
+        _timeText.text = data.triggerTime.ToString();
+        _posText.text = data.projectName.ToString().Substring(0,2);
+        _typeText.text = data.alertType.ToString();
+        if (data.alertMessage.Contains('£¬'))
+        {
+            string[] per = data.alertMessage.Split('£¬');
+
+            _infoText.text = per[per.Length - 1];
+        }
+        else{
+            _infoText.text = data.alertMessage;
+        }
+    }
+
+    public void SetData(SensorAlertData data)
+    {
+        currentSensorData = data;
+        _timeText.text = data.triggerTime.ToString();
+        _posText.text = data.projectName.ToString().Substring(0, 2);
+        if(data.alertType != null)
+            _typeText.text = data.alertType.ToString();
+        _infoText.text = data.alertMessage;
+    }
 }

Assets/Scripts/UI/Tools/ServerAddress.cs

@@ -33,6 +33,16 @@ public class ServerAddress
     /// </summary>
     public static string APIGetWaterHotPoint = YZTServerAddress + "/open/data/hotPoint";
 
+    /// <summary>
+    /// 获取一张图传感器告警信息
+    /// </summary>
+    public static string APIGetSensorAlerts = YZTServerAddress + "/open/sensorAlerts?pageSize=200";
+
+    /// <summary>
+    /// 获取一张图水位告警信息
+    /// </summary>
+    public static string APIGetAlerts = YZTServerAddress + "/open/alerts";
+
     /// <summary>
     /// 获取蓄洪概况大事件所有数据
     /// </summary>
@@ -64,6 +74,8 @@ public class ServerAddress
     /// </summary>
     public static string APIGetGeSWZData = YZTServerPYAddress + "/get-six-hour-sw-data?hours=24";
 
+
+
     /// <summary>
     /// 获取水文站检测数据6H
     /// </summary>

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

@@ -48,6 +48,22 @@ public class ServerObsDatas
     public List<ServerObsData> list;
 }
 
+[System.Serializable]
+public class SensorAlert
+{
+    public class SensorAlertData
+    {
+        public string projectName;
+        public DateTime triggerTime;
+        public string alertType;
+        public string alertMessage;
+    }
+    
+    public int total;
+    public DateTime queryTime;
+    public List<SensorAlertData> list;
+}
+
 [System.Serializable]
 public class SWZData
 {
@@ -149,10 +165,16 @@ public class GCJKLayer : YZTRootLayer
     public Button bjjkBtn;
     public Button bjxxBtn;
     public GameObject bjScrollView;
-
+    public GameObject bjxxScrollView;
     //泵站监控面板
     private RectTransform _bengZhanJianKongPanel;
     private RectTransform _bengZhanJianKongContent;
+    //告警监控
+    private RectTransform _gaoJingJianKongPanel;
+    private RectTransform gaoJingJianKongContent;
+    private List<YiChangJingGaoItem> currentYiChangJingGaoItems;
+    public YiChangJingGaoItem YiChangJingGaoItemOri;
+
     [Header("泵站监控数据预制体")] public GameObject BengZhanJianKongItemOri;
     [Header("泵站监控数据")] public List<BengZhanJianKongData> BengZhanJianKongDatas;
     private List<BengZhanJianKongItem> currentBengZhanJianKongItems;
@@ -424,9 +446,12 @@ public class GCJKLayer : YZTRootLayer
             }
         }
 
+        
+
         bjjkBtn.onClick.AddListener(() =>
         {
             bjScrollView.gameObject.SetActive(true);
+            bjxxScrollView.gameObject.SetActive(false);
             bjjkBtn.GetComponentInChildren<Text>().color = Color.white;
             bjxxBtn.GetComponentInChildren<Text>().color = Color.gray;
         });
@@ -434,6 +459,7 @@ public class GCJKLayer : YZTRootLayer
         bjxxBtn.onClick.AddListener(() =>
         {
             bjScrollView.gameObject.SetActive(false);
+            bjxxScrollView.gameObject.SetActive(true);
             bjjkBtn.GetComponentInChildren<Text>().color = Color.gray;
             bjxxBtn.GetComponentInChildren<Text>().color = Color.white;
         });
@@ -441,9 +467,16 @@ public class GCJKLayer : YZTRootLayer
         //闸站
         _zhaZhanJianKongPanel = this.transform.Find("ZhaZhanJianKong").GetComponent<RectTransform>();
         _zhaZhanJianKongContent =
-            _zhaZhanJianKongPanel.Find("ScrollView/Viewport/Content").GetComponent<RectTransform>();
+            _zhaZhanJianKongPanel.Find("ZhaMenScrollView/Viewport/Content").GetComponent<RectTransform>();
         currentZhaZhanJianKongItems = new List<ZhaZhanJianKongItem>();
 
+        //告警监控面板
+        _gaoJingJianKongPanel = this.transform.Find("ZhaZhanJianKong").GetComponent<RectTransform>();
+        gaoJingJianKongContent =
+            _gaoJingJianKongPanel.Find("BaoJingScrollView/Viewport/Content").GetComponent<RectTransform>();
+        currentYiChangJingGaoItems = new List<YiChangJingGaoItem>();
+
+
         //水文
         _shuiWenJianCePanel = this.transform.Find("ShuiWenJianCe").GetComponent<RectTransform>();
         _wenduText = _shuiWenJianCePanel.Find("WenDu/Text/numText").GetComponent<Text>();
@@ -984,6 +1017,34 @@ public class GCJKLayer : YZTRootLayer
             }
         }
 
+        for (int i = 0; i < currentYiChangJingGaoItems.Count; i++)
+        {
+            Destroy(currentYiChangJingGaoItems[i].gameObject);
+        }
+        currentYiChangJingGaoItems.Clear();
+        if (GlobalData.sensorAlertDone) {
+            for (int i = 0; i < GlobalData.sensorAlert.list.Count; i++) {
+                YiChangJingGaoItem tempItem = Instantiate(YiChangJingGaoItemOri, gaoJingJianKongContent)
+                               .GetComponent<YiChangJingGaoItem>();
+                tempItem.Init();
+                tempItem.gameObject.SetActive(false);
+                if (currentDataType == 0)
+                {
+                    if (GlobalData.sensorAlert.list[i].projectName.Contains("补元")) {
+                        tempItem.gameObject.SetActive(true);
+                    }
+                }
+                else if(currentDataType == 1) {
+                    if (GlobalData.sensorAlert.list[i].projectName.Contains("套口"))
+                    {
+                        tempItem.gameObject.SetActive(true);
+                    }
+                }
+                tempItem.SetData(GlobalData.sensorAlert.list[i]);
+                currentYiChangJingGaoItems.Add(tempItem);
+            }
+        }
+
         float[] modelAniValues = new float[datas.Count];
         for (int i = 0; i < modelAniValues.Length; i++)
         {

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

@@ -56,6 +56,17 @@ public class StationData : IComparable
     }
 }
 
+
+[System.Serializable]
+public class SWAlert 
+{
+    public string alertType; 
+    public string alertMessage; 
+    public string projectName; 
+    public DateTime triggerTime;
+
+}
+
 public class SWYJLayer : YZTRootLayer
 {
     public shuiWeiYuJingDataType currentDataType = shuiWeiYuJingDataType.BuYuan;
@@ -185,9 +196,29 @@ public class SWYJLayer : YZTRootLayer
             RefreshThreeLevel();
 
             InitSWZData();
+
+            InitAlerts();
         };
     }
 
+    void InitAlerts() {
+        if (!GlobalData.sWAlertDone)
+            return;
+        if (GlobalData.sWAlerts.Count < 1)
+            return;
+
+        for (int i = currentYiChangJingGaoItems.Count - 1; i > 0; i--) {
+            Destroy(currentYiChangJingGaoItems[i].gameObject);
+        }
+        currentYiChangJingGaoItems.Clear();
+        for (int i = 0; i < GlobalData.sWAlerts.Count; i++) {
+            YiChangJingGaoItem tempItem = Instantiate(YiChangJingGaoItemOri, _yiChangJingGaoListContent)
+                        .GetComponent<YiChangJingGaoItem>();
+            tempItem.Init();
+            tempItem.SetData(GlobalData.sWAlerts[i]);
+            currentYiChangJingGaoItems.Add(tempItem);
+        }
+    }
 
     void InitSWZData()
     {
@@ -232,6 +263,8 @@ public class SWYJLayer : YZTRootLayer
         RefreshThreeLevel();
 
         InitSWZData();
+
+        InitAlerts();
     }
 
     private void OnDisable()
@@ -434,17 +467,17 @@ public class SWYJLayer : YZTRootLayer
         currentYiChangJingGaoItems = new List<YiChangJingGaoItem>();
         _yiChangJingGaoListContent = this.transform.Find("YiChangJingGao/ScrollView/Viewport/Content")
             .GetComponent<RectTransform>();
-        if (currentYiChangJingGaoDatas != null && currentYiChangJingGaoDatas.Count > 0)
-        {
-            for (int i = 0; i < currentYiChangJingGaoDatas.Count; i++)
-            {
-                YiChangJingGaoItem tempItem = Instantiate(YiChangJingGaoItemOri, _yiChangJingGaoListContent)
-                    .GetComponent<YiChangJingGaoItem>();
-                tempItem.Init();
-                tempItem.SetData(currentYiChangJingGaoDatas[i]);
-                currentYiChangJingGaoItems.Add(tempItem);
-            }
-        }
+        //if (currentYiChangJingGaoDatas != null && currentYiChangJingGaoDatas.Count > 0)
+        //{
+        //    for (int i = 0; i < currentYiChangJingGaoDatas.Count; i++)
+        //    {
+        //        YiChangJingGaoItem tempItem = Instantiate(YiChangJingGaoItemOri, _yiChangJingGaoListContent)
+        //            .GetComponent<YiChangJingGaoItem>();
+        //        tempItem.Init();
+        //        tempItem.SetData(currentYiChangJingGaoDatas[i]);
+        //        currentYiChangJingGaoItems.Add(tempItem);
+        //    }
+        //}
 
 
         globalSWBtn.onClick.AddListener(OnGlobalSWBtnClick);