修改一波

Assets/Prefabs/UI/Item/ZhaZhanJianKongItem.prefab

@@ -252,6 +252,7 @@ GameObject:
   - component: {fileID: 3407944164186005309}
   - component: {fileID: 7035896204191946262}
   - component: {fileID: 6878479112458636355}
+  - component: {fileID: 4512884767872729269}
   m_Layer: 5
   m_Name: ZhaZhanJianKongItem
   m_TagString: Untagged
@@ -336,3 +337,47 @@ MonoBehaviour:
     name: 
     openValue: 0
     state: 0
+--- !u!114 &4512884767872729269
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6215439490742429027}
+  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: 7035896204191946262}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []

Assets/Prefabs/UI/SWFZ/ZMJK.prefab

@@ -1677,14 +1677,14 @@ MonoBehaviour:
           serializedVersion: 2
           rgba: 0
     m_AxisName:
-      m_Show: 0
-      m_Name: axisName
+      m_Show: 1
+      m_Name: "\u6C34\u4F4D/m"
       m_OnZero: 0
       m_LabelStyle:
         m_Show: 1
         m_Position: 10
         m_AutoOffset: 0
-        m_Offset: {x: 0, y: 0, z: 0}
+        m_Offset: {x: 0, y: 30, z: 0}
         m_Rotate: 0
         m_AutoRotate: 0
         m_Distance: 0
@@ -1719,13 +1719,13 @@ MonoBehaviour:
           m_Bottom: 0
         m_TextStyle:
           m_Show: 1
-          m_Font: {fileID: 0}
+          m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
           m_AutoWrap: 0
           m_AutoAlign: 1
           m_Rotate: 0
           m_AutoColor: 0
-          m_Color: {r: 0, g: 0, b: 0, a: 0}
-          m_FontSize: 0
+          m_Color: {r: 0.64705884, g: 0.7490196, b: 0.8862745, a: 1}
+          m_FontSize: 14
           m_FontStyle: 0
           m_LineSpacing: 1
           m_Alignment: 4
@@ -6142,6 +6142,84 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &1662904181019734885
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5463335332846543111}
+  - component: {fileID: 154993115177567248}
+  - component: {fileID: 182716813529291318}
+  m_Layer: 5
+  m_Name: name
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5463335332846543111
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1662904181019734885}
+  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: 2809166706213794559}
+  - {fileID: 4935175835205344724}
+  m_Father: {fileID: 216340364386063818}
+  m_RootOrder: 5
+  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: -156, y: 102.799995}
+  m_SizeDelta: {x: 51, y: 19}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &154993115177567248
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1662904181019734885}
+  m_CullTransparentMesh: 1
+--- !u!114 &182716813529291318
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1662904181019734885}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 61287841bdc4142caba8e77985cd8715, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 0}
+  m_RaycastTarget: 0
+  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!1 &1665698815881258323
 GameObject:
   m_ObjectHideFlags: 0
@@ -15019,6 +15097,82 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 36.23 <size=14><color=#A5BFE2>m</color></size>
+--- !u!1 &5809013823702884739
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4935175835205344724}
+  - component: {fileID: 9203256696190158777}
+  - component: {fileID: 7446532311886412716}
+  m_Layer: 5
+  m_Name: Icon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4935175835205344724
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5809013823702884739}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5463335332846543111}
+  m_RootOrder: 1
+  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: -33.5, y: 0}
+  m_SizeDelta: {x: 20, y: 20}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &9203256696190158777
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5809013823702884739}
+  m_CullTransparentMesh: 1
+--- !u!114 &7446532311886412716
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5809013823702884739}
+  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: 0
+  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!1 &5813541830667691774
 GameObject:
   m_ObjectHideFlags: 0
@@ -15210,6 +15364,7 @@ RectTransform:
   - {fileID: 2616201899794825932}
   - {fileID: 1856202418600994794}
   - {fileID: 8722744475963055825}
+  - {fileID: 5463335332846543111}
   m_Father: {fileID: 7649492946615949557}
   m_RootOrder: 16
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -19285,7 +19440,7 @@ MonoBehaviour:
   m_HandleRect: {fileID: 7625981591886958950}
   m_Direction: 2
   m_Value: 0
-  m_Size: 0.81333333
+  m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -22660,6 +22815,86 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &8889379116707568266
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2809166706213794559}
+  - component: {fileID: 5093289558108014731}
+  - component: {fileID: 7374199475800936613}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2809166706213794559
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8889379116707568266}
+  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: 5463335332846543111}
+  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: 47, y: 19}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5093289558108014731
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8889379116707568266}
+  m_CullTransparentMesh: 1
+--- !u!114 &7374199475800936613
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8889379116707568266}
+  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.7490196, b: 0.8862745, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 1
+    m_VerticalOverflow: 1
+    m_LineSpacing: 1
+  m_Text: "\u6C34\u4F4D/m"
 --- !u!1 &8920832543377202431
 GameObject:
   m_ObjectHideFlags: 0

Assets/Prefabs/UI/XHYZT/SWYJ.prefab

@@ -11345,6 +11345,86 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &4600714185347638038
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7945132244199067340}
+  - component: {fileID: 2592763949974780393}
+  - component: {fileID: 2929798152419580562}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7945132244199067340
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4600714185347638038}
+  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: 2130937222406431436}
+  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: 36, y: 20}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2592763949974780393
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4600714185347638038}
+  m_CullTransparentMesh: 1
+--- !u!114 &2929798152419580562
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4600714185347638038}
+  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: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 18
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 1
+    m_VerticalOverflow: 1
+    m_LineSpacing: 1
+  m_Text: "\u5355\u4F4D"
 --- !u!1 &4605638633781669104
 GameObject:
   m_ObjectHideFlags: 0
@@ -12841,6 +12921,84 @@ MonoBehaviour:
     m_VerticalOverflow: 1
     m_LineSpacing: 1
   m_Text: 
+--- !u!1 &5137793784327682131
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2130937222406431436}
+  - component: {fileID: 4265498902650086066}
+  - component: {fileID: 846083625362772010}
+  m_Layer: 5
+  m_Name: name
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2130937222406431436
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5137793784327682131}
+  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: 7945132244199067340}
+  - {fileID: 2705480120005661180}
+  m_Father: {fileID: 381679628052462637}
+  m_RootOrder: 5
+  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: -156, y: 112.799995}
+  m_SizeDelta: {x: 40, y: 20}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4265498902650086066
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5137793784327682131}
+  m_CullTransparentMesh: 1
+--- !u!114 &846083625362772010
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5137793784327682131}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 61287841bdc4142caba8e77985cd8715, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 0}
+  m_RaycastTarget: 0
+  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!1 &5139466870478592671
 GameObject:
   m_ObjectHideFlags: 0
@@ -14912,6 +15070,7 @@ MonoBehaviour:
   runtimePointObj: {fileID: 5029940434980741371, guid: f7351d99134429b4280ee00172298cf5, type: 3}
   zdpmParent: {fileID: 8164022845319533604}
   zdpmPrefab: {fileID: 5666608153428404762, guid: 4a2b54fe3fb7dc3448def41df2eefcfc, type: 3}
+  zdpmObjs: []
   swSY: {fileID: 4333192775402009780}
   swXY: {fileID: 8083458041895868810}
 --- !u!1 &6148527700689888400
@@ -16632,6 +16791,7 @@ RectTransform:
   - {fileID: 4781112201231443456}
   - {fileID: 8249639018172977838}
   - {fileID: 3897147183927966599}
+  - {fileID: 2130937222406431436}
   m_Father: {fileID: 8890573625015614200}
   m_RootOrder: 16
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -17767,6 +17927,82 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &7195198675282376369
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2705480120005661180}
+  - component: {fileID: 856650948779893772}
+  - component: {fileID: 3578193372453626450}
+  m_Layer: 5
+  m_Name: Icon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2705480120005661180
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7195198675282376369}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2130937222406431436}
+  m_RootOrder: 1
+  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: -28, y: 0}
+  m_SizeDelta: {x: 20, y: 20}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &856650948779893772
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7195198675282376369}
+  m_CullTransparentMesh: 1
+--- !u!114 &3578193372453626450
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7195198675282376369}
+  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: 0
+  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!1 &7221547551144949579
 GameObject:
   m_ObjectHideFlags: 0
@@ -19473,14 +19709,14 @@ MonoBehaviour:
           serializedVersion: 2
           rgba: 0
     m_AxisName:
-      m_Show: 0
-      m_Name: axisName
+      m_Show: 1
+      m_Name: "\u5355\u4F4D"
       m_OnZero: 0
       m_LabelStyle:
         m_Show: 1
         m_Position: 10
         m_AutoOffset: 0
-        m_Offset: {x: 0, y: 0, z: 0}
+        m_Offset: {x: 0, y: 40, z: 0}
         m_Rotate: 0
         m_AutoRotate: 0
         m_Distance: 0
@@ -19520,7 +19756,7 @@ MonoBehaviour:
           m_AutoAlign: 1
           m_Rotate: 0
           m_AutoColor: 0
-          m_Color: {r: 0, g: 0, b: 0, a: 0}
+          m_Color: {r: 1, g: 1, b: 1, a: 1}
           m_FontSize: 0
           m_FontStyle: 0
           m_LineSpacing: 1

Assets/Scripts/UI/Item/ObsIconCtrl.cs

@@ -37,7 +37,15 @@ public class ObsIconCtrl : MonoBehaviour,IPointerEnterHandler,IPointerExitHandle
         {
             _button.onClick.AddListener(() =>
             {
-                GCJKLayer._Instance.ShowObsPlayerPanel(_data);
+                if (GlobalData.pageIndex == PageIndex.Page1)
+                {
+                    GCJKLayer._Instance.ShowObsPlayerPanel(_data);
+                }
+
+                if (GlobalData.pageIndex == PageIndex.Page3)
+                {
+                    SPJKLayer._Instance.ShowObsPanel(_data);
+                }
             });
         }
         

Assets/Scripts/UI/Item/ZhaZhanJianKongItem.cs

@@ -11,15 +11,23 @@ public class ZhaZhanJianKongItem : MonoBehaviour
     private Text _openValueText;
     private Text _stateText;
 
+    private int _index;
+
     public void Init()
     {
         _nameText = this.transform.Find("name").GetComponent<Text>();
         _openValueText = this.transform.Find("KaiDu").GetComponent<Text>();
         _stateText = this.transform.Find("ZhuangTai").GetComponent<Text>();
+        
+        this.GetComponent<Button>().onClick.AddListener(() =>
+        {
+            GCJKLayer._Instance.OpenZhaMenInfoPanel(_index,_currentData);
+        });
     }
     
-    public void SetData(ZhaZhanJianKongData data)
+    public void SetData(int index ,ZhaZhanJianKongData data)
     {
+        _index = index;
         _currentData = data;
         _nameText.text = _currentData.name;
         _openValueText.text = $"开度：\t<color=#FFFFFF>{(float)(_currentData.openValue)}</color> m";

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

@@ -8,6 +8,8 @@ using UnityAsync;
 using WaitUntil = UnityAsync.WaitUntil;
 public class SPJKLayer : MonoBehaviour
 {
+    public static SPJKLayer _Instance;
+    
     public GameObject spjkItemOri;
 
     public Transform spjkItemContent;
@@ -34,6 +36,7 @@ public class SPJKLayer : MonoBehaviour
     
     private void Awake()
     {
+        _Instance = this;
         _obsIconContent = this.transform.Find("ObsIconContent").transform;
 
 

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

@@ -94,47 +94,6 @@ public class ZMJKLayer : MonoBehaviour
             tempItem.gameObject.GetComponent<Button>().onClick.AddListener(() =>
             {
                 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);
 
@@ -157,46 +116,6 @@ public class ZMJKLayer : MonoBehaviour
             tempItem.gameObject.GetComponent<Button>().onClick.AddListener(() =>
             {
                 OpenZhaMenInfoPanel(1, tempIndex, tempItem);
-
-                // 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);
             

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

@@ -13,6 +13,7 @@ using UnityAsync;
 using WaitUntil = UnityAsync.WaitUntil;
 using Unity.VisualScripting;
 using System.Threading.Tasks;
+using XCharts.Runtime;
 using Button = UnityEngine.UI.Button;
 
 
@@ -928,7 +929,7 @@ public class GCJKLayer : YZTRootLayer
                 ZhaZhanJianKongItem tempItem = Instantiate(ZhaZhanJianKongItemOri, _zhaZhanJianKongContent)
                     .GetComponent<ZhaZhanJianKongItem>();
                 tempItem.Init();
-                tempItem.SetData(datas[i]);
+                tempItem.SetData(i,datas[i]);
                 currentZhaZhanJianKongItems.Add(tempItem);
             }
         }
@@ -1672,4 +1673,53 @@ public class GCJKLayer : YZTRootLayer
             t.gameObject.SetActive(show);
         }
     }
+    
+    public GameObject gongChengPanel;
+    public Text zhaZhanMingCheng;
+    public Text zhaMenKaiDu;
+    public Text guoZhaLiuLiang;
+    public Text zhaQianShuiWei;
+    public Text zhaHouShuiWei;
+    public BarChart shuiweiChart;
+    
+    public void OpenZhaMenInfoPanel(int _index, ZhaZhanJianKongData itemData)
+    {
+        gongChengPanel.SetActive(true);
+        zhaZhanMingCheng.text = itemData.name;
+        var floorGateData = currentDataType == 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 = currentDataType == 0 ? GlobalData.floorGateData.buYuanSW : GlobalData.floorGateData.taoKouSW;
+        zhaHouShuiWei.text = $"{floorGateData_sw} <size=14><color=#A5BFE2>m</color></size>";
+
+        var shuiweiData = currentDataType == 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);
+    }
+    
 }

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

@@ -587,6 +587,9 @@ public class SWYJLayer : YZTRootLayer
 
             x_chart.axisName.name = yearTitle;
             x_chart.refreshComponent?.Invoke();
+            
+            var y_chart=shuiWeiBianHua.GetChartComponent<YAxis>();
+            y_chart.axisName.name = "水位/m";
 
             var tempSeries = shuiWeiBianHua.series;
             tempSeries[0].ClearData();