修复更新

Assets/AIPagedLod/Scripts/WebGL/CameraBird.cs

@@ -83,6 +83,7 @@ public class CameraBird : MonoBehaviour
         {
             rotateXAngle -= Input.GetAxis("Mouse Y") * rotateSpeed;
             rotateYAngle += Input.GetAxis("Mouse X") * rotateSpeed;
+            rotateXAngle = Math.Clamp(rotateXAngle, 2, 1000);
             isRotate = true;
         }
         else {

Assets/Prefabs/UI/RuntimePoint.prefab

@@ -11,14 +11,13 @@ GameObject:
   - component: {fileID: 6373583967368211387}
   - component: {fileID: 2344977866963614916}
   - component: {fileID: 6527376676677556443}
-  - component: {fileID: 8700194308481281455}
   m_Layer: 5
   m_Name: ButtonPrefab
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &6373583967368211387
 RectTransform:
   m_ObjectHideFlags: 0
@@ -32,13 +31,15 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7962267433962748926}
+  - {fileID: 127692533927003633}
+  - {fileID: 2193285654393249771}
   m_Father: {fileID: 5500973439967830541}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 69.33457, y: 31.859406}
-  m_SizeDelta: {x: 138.67, y: 21.2396}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 77.335, y: 41.000008}
+  m_SizeDelta: {x: 122.67, y: 42}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2344977866963614916
 CanvasRenderer:
@@ -61,7 +62,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.597088, b: 0, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -78,50 +79,6 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!114 &8700194308481281455
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 406593526210158966}
-  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: 0}
-    m_HighlightedColor: {r: 0.26788884, g: 0.990566, b: 0.4092683, 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: 6527376676677556443}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
 --- !u!1 &1489490345929393985
 GameObject:
   m_ObjectHideFlags: 0
@@ -168,6 +125,82 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1489490345929393985}
   m_CullTransparentMesh: 1
+--- !u!1 &2251204613568167966
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2193285654393249771}
+  - component: {fileID: 5857311576256299167}
+  - component: {fileID: 9190083694458096368}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2193285654393249771
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2251204613568167966}
+  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: 6373583967368211387}
+  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}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 122.67, y: 1}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5857311576256299167
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2251204613568167966}
+  m_CullTransparentMesh: 1
+--- !u!114 &9190083694458096368
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2251204613568167966}
+  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: 0.41147497, g: 0.6538507, b: 0.8962264, 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!1 &3276763291743061506
 GameObject:
   m_ObjectHideFlags: 0
@@ -242,7 +275,7 @@ MonoBehaviour:
   - "\u4F4D\u79FB\u76D1\u6D4B"
   - "\u6CF5\u7AD9"
   - "\u95F8\u7AD9"
-  childBtnPrefab: {fileID: 8700194308481281455}
+  childBtnPrefab: {fileID: 0}
   btn: {fileID: 7400851106940013810}
   listBtns: []
   childBtnParent: {fileID: 8112106460005740722}
@@ -254,6 +287,7 @@ MonoBehaviour:
   bingObj: {fileID: 0}
   lastTime: 0
   addContent: {fileID: 8112106460005740722}
+  lgltObj: {fileID: 406593526210158966}
 --- !u!114 &2238104553685385063
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -362,9 +396,9 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0.000061035156, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 61.335022, y: 10.5}
+  m_SizeDelta: {x: 122.67, y: 21}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4163181313726940586
 CanvasRenderer:
@@ -396,7 +430,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
@@ -407,7 +441,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u95F8\u7AD9"
+  m_Text: "\u7ECF\u5EA6:42.575"
 --- !u!1 &4884575910827390704
 GameObject:
   m_ObjectHideFlags: 0
@@ -772,6 +806,86 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 0
   m_VerticalFit: 2
+--- !u!1 &6497170462958696523
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 127692533927003633}
+  - component: {fileID: 6027138178604259938}
+  - component: {fileID: 3437061698076422829}
+  m_Layer: 5
+  m_Name: Text (Legacy) (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &127692533927003633
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6497170462958696523}
+  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: 6373583967368211387}
+  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: 61.335022, y: 31.5}
+  m_SizeDelta: {x: 122.67, y: 21}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6027138178604259938
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6497170462958696523}
+  m_CullTransparentMesh: 1
+--- !u!114 &3437061698076422829
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6497170462958696523}
+  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: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u7ECF\u5EA6:42.575"
 --- !u!1 &6989383943229996949
 GameObject:
   m_ObjectHideFlags: 0

Assets/Prefabs/UI/XHYZT/GCJK.prefab

@@ -1654,7 +1654,7 @@ RectTransform:
   - {fileID: 5097783785475022968}
   - {fileID: 715179445626271726}
   m_Father: {fileID: 2332442566715947249}
-  m_RootOrder: 11
+  m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -9636,7 +9636,6 @@ RectTransform:
   - {fileID: 4918900963093814639}
   - {fileID: 4213635490338061964}
   - {fileID: 1132827219479338585}
-  - {fileID: 4335852582844205576}
   - {fileID: 6959599233088997238}
   m_Father: {fileID: 7289340260209060652}
   m_RootOrder: 1
@@ -15052,6 +15051,7 @@ RectTransform:
   - {fileID: 9029168628236234279}
   - {fileID: 1979923686941381033}
   - {fileID: 8062901893780694846}
+  - {fileID: 4335852582844205576}
   - {fileID: 8757336094675718186}
   - {fileID: 4513584130216526266}
   m_Father: {fileID: 0}
@@ -22634,7 +22634,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
       propertyPath: m_RootOrder
-      value: 7
+      value: 8
       objectReference: {fileID: 0}
     - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
       propertyPath: m_AnchorMax.x
@@ -22897,7 +22897,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    m_TransformParent: {fileID: 2332442566715947249}
+    m_TransformParent: {fileID: 7289340260209060652}
     m_Modifications:
     - target: {fileID: 35900861217302368, guid: 470a65354eb810545be61c741e36b13c, type: 3}
       propertyPath: m_FontData.m_FontSize
@@ -22929,7 +22929,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8676194456186192790, guid: 470a65354eb810545be61c741e36b13c, type: 3}
       propertyPath: m_RootOrder
-      value: 10
+      value: 7
       objectReference: {fileID: 0}
     - target: {fileID: 8676194456186192790, guid: 470a65354eb810545be61c741e36b13c, type: 3}
       propertyPath: m_AnchorMax.x
@@ -23062,7 +23062,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
       propertyPath: m_RootOrder
-      value: 8
+      value: 9
       objectReference: {fileID: 0}
     - target: {fileID: 8885034799045031888, guid: 62298864aab77514e800bf7cf1f9bab6, type: 3}
       propertyPath: m_AnchorMax.x

Assets/Prefabs/UI/XHYZT/RKZY.prefab

@@ -5723,10 +5723,10 @@ RectTransform:
   m_Father: {fileID: 9093061655153645155}
   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: 65, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 65, y: -12.607}
+  m_SizeDelta: {x: 130, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061653251029749
 CanvasRenderer:
@@ -9647,10 +9647,10 @@ RectTransform:
   m_Father: {fileID: 9093061653224198802}
   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: 16, y: 0}
-  m_SizeDelta: {x: 0, y: 30.5551}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 16, y: -15.27755}
+  m_SizeDelta: {x: 32, y: 30.5551}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061653390156198
 CanvasRenderer:
@@ -12672,10 +12672,10 @@ RectTransform:
   m_Father: {fileID: 9093061654972545255}
   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: 61, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 61, y: -11.8005}
+  m_SizeDelta: {x: 90, y: 20}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &9093061653439058966
 CanvasRenderer:
@@ -18225,10 +18225,10 @@ RectTransform:
   m_Father: {fileID: 9093061653594052294}
   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: 13, y: 0}
-  m_SizeDelta: {x: 0, y: 30.5551}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 13, y: -15.27755}
+  m_SizeDelta: {x: 26, y: 30.5551}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061653670084901
 CanvasRenderer:
@@ -20927,10 +20927,10 @@ RectTransform:
   m_Father: {fileID: 9093061653762445161}
   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: 76, y: 0}
-  m_SizeDelta: {x: 0, y: 30.5551}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 76, y: -15.27755}
+  m_SizeDelta: {x: 30, y: 30.5551}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061653826032820
 CanvasRenderer:
@@ -23882,8 +23882,8 @@ RectTransform:
   m_Father: {fileID: 9093061655007520458}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 180.735, y: 0}
   m_SizeDelta: {x: 361.47, y: 0}
   m_Pivot: {x: 0.5, y: 1}
@@ -26129,10 +26129,10 @@ RectTransform:
   m_Father: {fileID: 9093061655153645155}
   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: 151, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 151, y: -12.607}
+  m_SizeDelta: {x: 42, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061654075877072
 CanvasRenderer:
@@ -26444,10 +26444,10 @@ RectTransform:
   m_Father: {fileID: 9093061655109922683}
   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: 13, y: 0}
-  m_SizeDelta: {x: 0, y: 30.5551}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 13, y: -15.27755}
+  m_SizeDelta: {x: 26, y: 30.5551}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061654081961281
 CanvasRenderer:
@@ -26913,10 +26913,10 @@ RectTransform:
   m_Father: {fileID: 9093061655153645155}
   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: 237, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 237, y: -12.607}
+  m_SizeDelta: {x: 130, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061654110165202
 CanvasRenderer:
@@ -38318,10 +38318,10 @@ RectTransform:
   m_Father: {fileID: 9093061654972545255}
   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: 53, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 53, y: -11.8005}
+  m_SizeDelta: {x: 16, y: 21}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061654650731069
 CanvasRenderer:
@@ -39486,10 +39486,10 @@ RectTransform:
   m_Father: {fileID: 9093061654972545255}
   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: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 0, y: -11.8005}
+  m_SizeDelta: {x: 45, y: 20}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &9093061654711297927
 CanvasRenderer:
@@ -40110,10 +40110,10 @@ RectTransform:
   m_Father: {fileID: 9093061653762445161}
   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: 29, y: 0}
-  m_SizeDelta: {x: 0, y: 30.5551}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 29, y: -15.27755}
+  m_SizeDelta: {x: 58, y: 30.5551}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061654753997887
 CanvasRenderer:
@@ -45068,14 +45068,14 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.084905684, g: 0.084905684, b: 0.084905684, a: 0.98039216}
   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: 21300000, guid: 6b1febc00a98d0f44865f319e957f5e8, type: 3}
+  m_Sprite: {fileID: 0}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -51272,10 +51272,10 @@ RectTransform:
   m_Father: {fileID: 9093061655109922683}
   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: 36.5, y: 0}
-  m_SizeDelta: {x: 0, y: 30.5551}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 36.5, y: -15.27755}
+  m_SizeDelta: {x: 15, y: 30.5551}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061655252027404
 CanvasRenderer:
@@ -52460,10 +52460,10 @@ RectTransform:
   m_Father: {fileID: 9093061653224198802}
   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: 50, y: 0}
-  m_SizeDelta: {x: 0, y: 30.5551}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 50, y: -15.27755}
+  m_SizeDelta: {x: 30, y: 30.5551}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061655287619152
 CanvasRenderer:
@@ -53867,10 +53867,10 @@ RectTransform:
   m_Father: {fileID: 9093061653594052294}
   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: 36.5, y: 0}
-  m_SizeDelta: {x: 0, y: 30.5551}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 36.5, y: -15.27755}
+  m_SizeDelta: {x: 15, y: 30.5551}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9093061655308691109
 CanvasRenderer:

Assets/Prefabs/UI/XHYZT/SWYJ.prefab

@@ -21293,8 +21293,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: 68, y: -15.5}
-  m_SizeDelta: {x: 56, y: 25}
+  m_AnchoredPosition: {x: 87.55539, y: -15.5}
+  m_SizeDelta: {x: 95.1108, y: 34.1}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6880474638112977745
 CanvasRenderer:

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

@@ -445,7 +445,7 @@ public class GCJKLayer : YZTRootLayer
         GClist_weiYiJiButton.onClick.AddListener(() => { SeachGongChengList(GongChengType.weiYiJi); });
         
         //监控
-        obsPanel = this.transform.Find("Main/ObsPlayerPanel").GetComponent<ObsPlayerPanel>();
+        //obsPanel = this.transform.Find("Main/ObsPlayerPanel").GetComponent<ObsPlayerPanel>();
         obsPanel.gameObject.SetActive(false);
         obsItemContent = this.transform.Find("ShiPinJianKong/ScrollView/Viewport/Content").transform;
 

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

@@ -128,7 +128,9 @@ public class SWYJLayer : YZTRootLayer
     private bool creatShuiWeiIcon = false;
 
     public GameObject zdpmParent;
+    
     public GameObject zdpmPrefab;
+    public List<GameObject> zdpmObjs = new List<GameObject>();
     //public GameObject[] zdpmObjs;
 
     //上下游水位
@@ -612,22 +614,42 @@ public class SWYJLayer : YZTRootLayer
         List<StationData> stationDatas = new List<StationData>(GlobalData.swDatas);
         stationDatas.Sort();
 
-        for (int i = 0; i < stationDatas.Count; i++)
+        if (zdpmObjs.Count <= 0)
         {
-            GameObject obj = Instantiate(zdpmPrefab);
-            obj.transform.SetParent(zdpmParent.transform);
-            obj.transform.localScale = Vector3.one;
-            string name = stationDatas[i].stnm;
-            obj.transform.GetChild(1).GetComponent<Text>().text = stationDatas[i].stnm;
-            float max = MathF.Max(stationDatas[i].upz ?? 0, stationDatas[i].dwz ?? 0);
-            if (i == 0)
-                obj.transform.GetChild(0).GetChild(0).GetComponent<Text>().text = "1";
-            else if (i == 1)
-                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>";
+            for (int i = 0; i < stationDatas.Count; i++)
+            {
+                GameObject obj = Instantiate(zdpmPrefab);
+                zdpmObjs.Add(obj);
+                obj.transform.SetParent(zdpmParent.transform);
+                obj.transform.localScale = Vector3.one;
+                string name = stationDatas[i].stnm;
+                obj.transform.GetChild(1).GetComponent<Text>().text = stationDatas[i].stnm;
+                float max = MathF.Max(stationDatas[i].upz ?? 0, stationDatas[i].dwz ?? 0);
+                if (i == 0)
+                    obj.transform.GetChild(0).GetChild(0).GetComponent<Text>().text = "1";
+                else if (i == 1)
+                    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>";
+            }
+        }
+        else{
+            for (int i = 0; i < stationDatas.Count; i++)
+            {
+                string name = stationDatas[i].stnm;
+                zdpmObjs[i].transform.GetChild(1).GetComponent<Text>().text = stationDatas[i].stnm;
+                float max = MathF.Max(stationDatas[i].upz ?? 0, stationDatas[i].dwz ?? 0);
+                if (i == 0)
+                    zdpmObjs[i].transform.GetChild(0).GetChild(0).GetComponent<Text>().text = "1";
+                else if (i == 1)
+                    zdpmObjs[i].transform.GetChild(0).GetChild(0).GetComponent<Text>().text = "2";
+                else
+                    zdpmObjs[i].transform.GetChild(0).GetChild(0).GetComponent<Text>().text = i + "";
+                zdpmObjs[i].transform.GetChild(1).GetChild(0).GetComponent<Text>().text =
+                    $"{max} <size=14><color=#A5BBE2>m</color></size>";
+            }
         }
     }
 

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

@@ -48,6 +48,12 @@ public class RuntimePoint : MonoBehaviour, IPointerDownHandler, IPointerUpHandle
     public RectTransform addContent;
 
     bool isOver;
+
+    float lgtd;
+
+    float lttd;
+
+    public GameObject lgltObj;
     void Awake() {
        
       //  arrow.DOLocalMoveY(-40, 1.0f).SetLoops(-1, LoopType.Yoyo);
@@ -90,12 +96,15 @@ public class RuntimePoint : MonoBehaviour, IPointerDownHandler, IPointerUpHandle
     public void Refresh(Sprite newIcon) {
         icon.sprite = newIcon;
     }
-    public void InitPoint(Sprite newIcon, string name_pri, string newText) {
+    public void InitPoint(Sprite newIcon, string name_pri, string newText,float mlgtd,float mlttd) {
         text.text = newText;
-        if(name_pri.Trim().Length > 0)
+        lgltObj.transform.GetChild(1).GetComponent<Text>().text = "¾­¶È:" + mlgtd.ToString("0.000");
+        lgltObj.transform.GetChild(0).GetComponent<Text>().text = "γ¶È:" + mlttd.ToString("0.000");
+        if (name_pri.Trim().Length > 0)
             staticImp = StaticLod.instance.staticImportantsDic[name_pri];
         icon.sprite = newIcon;
-
+        mlgtd = lgtd;
+        mlttd = lttd;
     }
 
     // Update is called once per frame
@@ -110,12 +119,26 @@ public class RuntimePoint : MonoBehaviour, IPointerDownHandler, IPointerUpHandle
             if (CameraManager.instance.secondCamera.transform.position.z > -625)
             {
                 text.gameObject.SetActive(true);
+                if (isOver)
+                {
+                    lgltObj.SetActive(true);
+                }
+                else
+                {
+                    lgltObj.SetActive(false);
+                }
             }
             else {
-                if(isOver)
+                if (isOver)
+                {
                     text.gameObject.SetActive(true);
+                    lgltObj.SetActive(true);
+                }
                 else
+                {
                     text.gameObject.SetActive(false);
+                    lgltObj.SetActive(false);
+                }
             }
         }
     }

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

@@ -364,6 +364,8 @@ public class YZTLayer : YZTRootLayer
             }
 
         });
+        for (int i = 0; i < leftButtons.Length; i++)
+            leftButtons[i].gameObject.SetActive(false);
     }
 
     async void InitSWHeightInfo()
@@ -793,7 +795,7 @@ public class YZTLayer : YZTRootLayer
 
             int tempI = i;
             newPoint.GetComponent<RectTransform>().SetParent(pointParent);
-            newPoint.InitPoint(hotPointSprite[(int)(temp.type)], temp.namePri, temp.name);
+            newPoint.InitPoint(hotPointSprite[(int)(temp.type)], temp.namePri, temp.name, temp.longitude, temp.latitude);
             newPoint.layerIDs.Add((int)(temp.type));
             newPoint.bingObj = Instantiate(runtimePointObj).gameObject;
             newPoint.bingObj.transform.SetParent(shaPan.transform.GetChild(8));