提交一版再说

AssetBundles/WebGL/l10_7.manifest

@@ -0,0 +1,29 @@
+ManifestFileVersion: 0
+CRC: 3604963342
+Hashes:
+  AssetFileHash:
+    serializedVersion: 2
+    Hash: 82102ae789920df3ff1eca486916b568
+  TypeTreeHash:
+    serializedVersion: 2
+    Hash: ff414f606ea1972259b080d7bcf51689
+HashAppended: 0
+ClassTypes:
+- Class: 28
+  Script: {instanceID: 0}
+SerializeReferenceClassIdentifiers: []
+Assets:
+- Assets/Art/Map/L10/L10_13x97_8.jpg
+- Assets/Art/Map/L10/L10_13x97_6.jpg
+- Assets/Art/Map/L10/L10_13x97_4.jpg
+- Assets/Art/Map/L10/L10_13x97_7.jpg
+- Assets/Art/Map/L10/L10_13x97_10.jpg
+- Assets/Art/Map/L10/L10_13x97_1.jpg
+- Assets/Art/Map/L10/L10_13x97_0.jpg
+- Assets/Art/Map/L10/L10_13x97_3.jpg
+- Assets/Art/Map/L10/L10_13x97_9.jpg
+- Assets/Art/Map/L10/L10_13x97_2.jpg
+- Assets/Art/Map/L10/L10_13x97_12.jpg
+- Assets/Art/Map/L10/L10_13x97_5.jpg
+- Assets/Art/Map/L10/L10_13x97_11.jpg
+Dependencies: []

AssetBundles/WebGL/l10_8.manifest

@@ -0,0 +1,29 @@
+ManifestFileVersion: 0
+CRC: 51788666
+Hashes:
+  AssetFileHash:
+    serializedVersion: 2
+    Hash: 7a66fecafb74f055573039eaae0974e3
+  TypeTreeHash:
+    serializedVersion: 2
+    Hash: ff414f606ea1972259b080d7bcf51689
+HashAppended: 0
+ClassTypes:
+- Class: 28
+  Script: {instanceID: 0}
+SerializeReferenceClassIdentifiers: []
+Assets:
+- Assets/Art/Map/L10/L10_13x98_3.jpg
+- Assets/Art/Map/L10/L10_13x98_5.jpg
+- Assets/Art/Map/L10/L10_13x98_12.jpg
+- Assets/Art/Map/L10/L10_13x98_7.jpg
+- Assets/Art/Map/L10/L10_13x98_2.jpg
+- Assets/Art/Map/L10/L10_13x98_6.jpg
+- Assets/Art/Map/L10/L10_13x98_11.jpg
+- Assets/Art/Map/L10/L10_13x98_4.jpg
+- Assets/Art/Map/L10/L10_13x98_8.jpg
+- Assets/Art/Map/L10/L10_13x98_1.jpg
+- Assets/Art/Map/L10/L10_13x98_9.jpg
+- Assets/Art/Map/L10/L10_13x98_0.jpg
+- Assets/Art/Map/L10/L10_13x98_10.jpg
+Dependencies: []

AssetBundles/Window/l10_7.manifest

@@ -0,0 +1,29 @@
+ManifestFileVersion: 0
+CRC: 211355836
+Hashes:
+  AssetFileHash:
+    serializedVersion: 2
+    Hash: df3c4377d9b84fb4e86fdfb068600773
+  TypeTreeHash:
+    serializedVersion: 2
+    Hash: ff414f606ea1972259b080d7bcf51689
+HashAppended: 0
+ClassTypes:
+- Class: 28
+  Script: {instanceID: 0}
+SerializeReferenceClassIdentifiers: []
+Assets:
+- Assets/Art/Map/L10/L10_13x97_8.jpg
+- Assets/Art/Map/L10/L10_13x97_6.jpg
+- Assets/Art/Map/L10/L10_13x97_4.jpg
+- Assets/Art/Map/L10/L10_13x97_7.jpg
+- Assets/Art/Map/L10/L10_13x97_10.jpg
+- Assets/Art/Map/L10/L10_13x97_1.jpg
+- Assets/Art/Map/L10/L10_13x97_0.jpg
+- Assets/Art/Map/L10/L10_13x97_3.jpg
+- Assets/Art/Map/L10/L10_13x97_9.jpg
+- Assets/Art/Map/L10/L10_13x97_2.jpg
+- Assets/Art/Map/L10/L10_13x97_12.jpg
+- Assets/Art/Map/L10/L10_13x97_5.jpg
+- Assets/Art/Map/L10/L10_13x97_11.jpg
+Dependencies: []

AssetBundles/Window/l10_8.manifest

@@ -0,0 +1,29 @@
+ManifestFileVersion: 0
+CRC: 3951461442
+Hashes:
+  AssetFileHash:
+    serializedVersion: 2
+    Hash: c31aa51c031b025b38c2de68f73fe95f
+  TypeTreeHash:
+    serializedVersion: 2
+    Hash: ff414f606ea1972259b080d7bcf51689
+HashAppended: 0
+ClassTypes:
+- Class: 28
+  Script: {instanceID: 0}
+SerializeReferenceClassIdentifiers: []
+Assets:
+- Assets/Art/Map/L10/L10_13x98_3.jpg
+- Assets/Art/Map/L10/L10_13x98_5.jpg
+- Assets/Art/Map/L10/L10_13x98_12.jpg
+- Assets/Art/Map/L10/L10_13x98_7.jpg
+- Assets/Art/Map/L10/L10_13x98_2.jpg
+- Assets/Art/Map/L10/L10_13x98_6.jpg
+- Assets/Art/Map/L10/L10_13x98_11.jpg
+- Assets/Art/Map/L10/L10_13x98_4.jpg
+- Assets/Art/Map/L10/L10_13x98_8.jpg
+- Assets/Art/Map/L10/L10_13x98_1.jpg
+- Assets/Art/Map/L10/L10_13x98_9.jpg
+- Assets/Art/Map/L10/L10_13x98_0.jpg
+- Assets/Art/Map/L10/L10_13x98_10.jpg
+Dependencies: []

Assets/Prefabs/UI/Item/shuiwei.prefab

@@ -242,7 +242,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 0.7372549, b: 0.11372549, a: 1}
+  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

Assets/Prefabs/UI/RuntimePoint.prefab

@@ -36,9 +36,9 @@ RectTransform:
   m_Father: {fileID: 5500973439967830541}
   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: 77.335, y: 41.000008}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 77.335, y: 21.000008}
   m_SizeDelta: {x: 122.67, y: 42}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2344977866963614916
@@ -243,8 +243,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 280.54688, y: -657.30005}
-  m_SizeDelta: {x: 138.6713, y: 20}
+  m_AnchoredPosition: {x: 280.54688, y: -664.0022}
+  m_SizeDelta: {x: 138.6713, y: 26.8389}
   m_Pivot: {x: 0.04, y: 0.02}
 --- !u!222 &2742062590507750192
 CanvasRenderer:
@@ -599,7 +599,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
   m_AnchoredPosition: {x: 60.3897, y: 0.000061507}
-  m_SizeDelta: {x: 79.2207, y: 19.064}
+  m_SizeDelta: {x: 79.2207, y: 26.6}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7260287978442146811
 CanvasRenderer:
@@ -631,7 +631,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
-    m_FontSize: 13
+    m_FontSize: 15
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 1
@@ -922,7 +922,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
   m_AnchoredPosition: {x: 0, y: -0.00015258789}
-  m_SizeDelta: {x: 16, y: 16}
+  m_SizeDelta: {x: 18, y: 18}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &91661355561190510
 CanvasRenderer:

Assets/Prefabs/UI/XHYZT/GCJK.prefab

@@ -27903,7 +27903,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u5168\u5C40\u5929\u6C14"
+  m_Text: "\u6C34\u6587\u76D1\u6D4B"
 --- !u!1 &5647837314209532490
 GameObject:
   m_ObjectHideFlags: 0
@@ -34985,7 +34985,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u9000\u51FA\u5168\u5C40\u5929\u6C14"
+  m_Text: "\u9000\u51FA\u6C34\u6587\u76D1\u6D4B"
 --- !u!1 &7105199190727822030
 GameObject:
   m_ObjectHideFlags: 0

Assets/Prefabs/UI/XHYZT/YZT.prefab

@@ -14576,7 +14576,6 @@ Canvas:
   m_OverrideSorting: 0
   m_OverridePixelPerfect: 0
   m_SortingBucketNormalizedSize: 0
-  m_VertexColorAlwaysGammaSpace: 0
   m_AdditionalShaderChannelsFlag: 0
   m_SortingLayerID: 0
   m_SortingOrder: 0
@@ -14594,7 +14593,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_UiScaleMode: 0
-  m_ReferencePixelsPerUnit: 100
+  m_ReferencePixelsPerUnit: 120
   m_ScaleFactor: 1
   m_ReferenceResolution: {x: 800, y: 600}
   m_ScreenMatchMode: 0
@@ -23506,7 +23505,6 @@ Canvas:
   m_OverrideSorting: 0
   m_OverridePixelPerfect: 0
   m_SortingBucketNormalizedSize: 0
-  m_VertexColorAlwaysGammaSpace: 0
   m_AdditionalShaderChannelsFlag: 0
   m_SortingLayerID: 0
   m_SortingOrder: 0
@@ -23524,7 +23522,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_UiScaleMode: 0
-  m_ReferencePixelsPerUnit: 100
+  m_ReferencePixelsPerUnit: 120
   m_ScaleFactor: 1
   m_ReferenceResolution: {x: 800, y: 600}
   m_ScreenMatchMode: 0
@@ -26843,8 +26841,8 @@ RectTransform:
   m_Father: {fileID: 46367777035501093}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 2, y: 0}
   m_SizeDelta: {x: 359.3262, y: 0}
   m_Pivot: {x: 0, y: 1}
@@ -29281,9 +29279,9 @@ RectTransform:
   m_Father: {fileID: 46367777035501093}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 2, y: -386}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 2, y: 0}
   m_SizeDelta: {x: 359.3262, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &46367776433284835
@@ -41239,6 +41237,86 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 0
   m_VerticalFit: 2
+--- !u!1 &676515896930791764
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7465473500071081203}
+  - component: {fileID: 2421074686900951983}
+  - component: {fileID: 2145860401871879245}
+  m_Layer: 5
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7465473500071081203
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 676515896930791764}
+  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: 792486593788829995}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: 12.131155, y: 0}
+  m_SizeDelta: {x: -24.26231, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2421074686900951983
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 676515896930791764}
+  m_CullTransparentMesh: 1
+--- !u!114 &2145860401871879245
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 676515896930791764}
+  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: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u519C\u573A"
 --- !u!1 &685826472799306808
 GameObject:
   m_ObjectHideFlags: 0
@@ -43944,7 +44022,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: -45.45263, y: 66.822}
+  m_AnchoredPosition: {x: 45.878372, y: 96.48399}
   m_SizeDelta: {x: 80.566895, y: 27.077896}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8459548935811813087
@@ -46240,7 +46318,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5761950834214704942}
-  m_RootOrder: 18
+  m_RootOrder: 19
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
@@ -54886,7 +54964,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 45.878197, y: 66.822}
+  m_AnchoredPosition: {x: -45.45263, y: 66.822}
   m_SizeDelta: {x: 80.566895, y: 27.077896}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2449784639014682826
@@ -55533,7 +55611,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: -45.45263, y: 36.100006}
+  m_AnchoredPosition: {x: 45.878197, y: 66.822}
   m_SizeDelta: {x: 80.566895, y: 27.077896}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5215286825542147594
@@ -56093,7 +56171,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &5410768465953825147
 RectTransform:
   m_ObjectHideFlags: 0
@@ -59653,6 +59731,7 @@ RectTransform:
   - {fileID: 4591828172968153036}
   - {fileID: 5911367126512327796}
   - {fileID: 8961748112586758846}
+  - {fileID: 792486593788829995}
   - {fileID: 115281600852185297}
   m_Father: {fileID: 396067363}
   m_RootOrder: 4
@@ -62197,7 +62276,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u96E8\u91CF\u76D1\u6D4B"
+  m_Text: "\u6C14\u8C61\u7AD9"
 --- !u!1 &6020099958543490256
 GameObject:
   m_ObjectHideFlags: 0
@@ -66307,6 +66386,82 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &7332223693965640494
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3775269813016634673}
+  - component: {fileID: 7450848458058963907}
+  - component: {fileID: 6211514260047767957}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3775269813016634673
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7332223693965640494}
+  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: 792486593788829995}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 10.6341, y: -1.2141}
+  m_SizeDelta: {x: 16.5, y: 16.5}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7450848458058963907
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7332223693965640494}
+  m_CullTransparentMesh: 1
+--- !u!114 &6211514260047767957
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7332223693965640494}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: f30f883a2062cc4419a1157f03e6b51a, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &7343014802571548831
 GameObject:
   m_ObjectHideFlags: 0
@@ -67305,6 +67460,142 @@ MonoBehaviour:
     m_VerticalOverflow: 1
     m_LineSpacing: 1
   m_Text: 80
+--- !u!1 &7713992772775941414
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 792486593788829995}
+  - component: {fileID: 4565748765113842215}
+  - component: {fileID: 5734597554142302583}
+  - component: {fileID: 8763529351266769493}
+  - component: {fileID: 7824534337139425802}
+  m_Layer: 5
+  m_Name: NCLayer
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &792486593788829995
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7713992772775941414}
+  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: 7465473500071081203}
+  - {fileID: 3775269813016634673}
+  m_Father: {fileID: 5761950834214704942}
+  m_RootOrder: 18
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 45.8782, y: 36.100006}
+  m_SizeDelta: {x: 80.566895, y: 27.077896}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4565748765113842215
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7713992772775941414}
+  m_CullTransparentMesh: 1
+--- !u!114 &5734597554142302583
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7713992772775941414}
+  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: 0}
+  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: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &8763529351266769493
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7713992772775941414}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 5734597554142302583}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!225 &7824534337139425802
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7713992772775941414}
+  m_Enabled: 1
+  m_Alpha: 1
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!1 &7740860857786539815
 GameObject:
   m_ObjectHideFlags: 0
@@ -68601,6 +68892,86 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!1 &8036682052181980405
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5641749963157383479}
+  - component: {fileID: 7965719049142443453}
+  - component: {fileID: 8270555076109675899}
+  m_Layer: 5
+  m_Name: nameText
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5641749963157383479
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8036682052181980405}
+  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: 1686690605450790000}
+  m_RootOrder: 8
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 412.52386, y: -218.66}
+  m_SizeDelta: {x: 247.0477, y: 37.3146}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7965719049142443453
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8036682052181980405}
+  m_CullTransparentMesh: 1
+--- !u!114 &8270555076109675899
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8036682052181980405}
+  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: 20
+    m_FontStyle: 1
+    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: 
 --- !u!1 &8045016558101662316
 GameObject:
   m_ObjectHideFlags: 0
@@ -68796,7 +69167,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 45.878418, y: 36.100006}
+  m_AnchoredPosition: {x: -45.45263, y: 36.100006}
   m_SizeDelta: {x: 80.566895, y: 27.077896}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1708943795475481903
@@ -71721,6 +72092,10 @@ PrefabInstance:
       propertyPath: m_RootOrder
       value: 12
       objectReference: {fileID: 0}
+    - target: {fileID: 174204185831751377, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_FontData.m_MinSize
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 326188567858121770, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_FontData.m_FontSize
       value: 20
@@ -71761,6 +72136,46 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 467263678939216536, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 219.375
+      objectReference: {fileID: 0}
+    - target: {fileID: 467263678939216536, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 31.193
+      objectReference: {fileID: 0}
+    - target: {fileID: 467263678939216536, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -450.9735
+      objectReference: {fileID: 0}
+    - target: {fileID: 467263678939216536, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 250.4
+      objectReference: {fileID: 0}
+    - target: {fileID: 467263679509200175, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_fontSize
+      value: 18
+      objectReference: {fileID: 0}
+    - target: {fileID: 467263679509200175, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_fontSizeBase
+      value: 18
+      objectReference: {fileID: 0}
+    - target: {fileID: 467263680040401449, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 467263680040401449, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 467263680040401449, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: -18.807
+      objectReference: {fileID: 0}
+    - target: {fileID: 499685754693853157, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_FontData.m_FontSize
+      value: 18
+      objectReference: {fileID: 0}
     - target: {fileID: 892565031233234769, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_SizeDelta.x
       value: 31
@@ -72441,6 +72856,14 @@ PrefabInstance:
       propertyPath: m_LocalScale.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 3229528322425801448, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 89.4243
+      objectReference: {fileID: 0}
+    - target: {fileID: 3229528322425801448, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -4.7122
+      objectReference: {fileID: 0}
     - target: {fileID: 3352105003607594484, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_LocalScale.x
       value: 1
@@ -72469,6 +72892,54 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 283.6
       objectReference: {fileID: 0}
+    - target: {fileID: 3730270236216951427, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 219.375
+      objectReference: {fileID: 0}
+    - target: {fileID: 3730270236216951427, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 31.193
+      objectReference: {fileID: 0}
+    - target: {fileID: 3730270236216951427, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 250.4
+      objectReference: {fileID: 0}
+    - target: {fileID: 3730270236988392756, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_fontSize
+      value: 18
+      objectReference: {fileID: 0}
+    - target: {fileID: 3730270236988392756, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_fontSizeBase
+      value: 18
+      objectReference: {fileID: 0}
+    - target: {fileID: 3730270237515203122, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3730270237515203122, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3730270237515203122, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: -18.807
+      objectReference: {fileID: 0}
+    - target: {fileID: 3810294204129436098, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 106.5616
+      objectReference: {fileID: 0}
+    - target: {fileID: 3810294204129436098, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 31.191
+      objectReference: {fileID: 0}
+    - target: {fileID: 3810294204129436098, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 73.2815
+      objectReference: {fileID: 0}
+    - target: {fileID: 3810294204129436098, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -133.6
+      objectReference: {fileID: 0}
     - target: {fileID: 3849734796666704938, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_FontData.m_FontSize
       value: 12
@@ -72741,6 +73212,10 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6922223749267854230, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 7022941898941240310, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: -235.44
@@ -72761,6 +73236,10 @@ PrefabInstance:
       propertyPath: m_SizeDelta.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 7450707626856223049, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7748069699087661519, guid: e2abfe8df67439f41be97aa082f6176e, type: 3}
       propertyPath: m_FontData.m_FontSize
       value: 12

Assets/Scripts/HttpHelper.cs

@@ -286,7 +286,7 @@ public class HttpHelper : MonoBehaviour
             else
             {
                 string postResult = requestData.downloadHandler.text;
-                Debug.Log("大屏闸口数据:"+postResult);
+                Debug.Log("大屏闸口数据:" + postResult);
                 if (useAes)
                 {
                     postResult = AESCrypto.Decrypt(postResult);
@@ -327,10 +327,11 @@ public class HttpHelper : MonoBehaviour
         }
     }
 
-    public async Task InitDPXHQData() {
+    public async Task InitDPXHQData()
+    {
         GlobalData.floodStorageArea = new FloodStorageArea();
         bool successInternet = true;
-        UnityWebRequest requestData = UnityWebRequest.Get(ServerAddress.APIGetDPXHQData );
+        UnityWebRequest requestData = UnityWebRequest.Get(ServerAddress.APIGetDPXHQData);
         requestData.timeout = timeOut;
         await requestData.SendWebRequest();
         try
@@ -372,10 +373,11 @@ public class HttpHelper : MonoBehaviour
             Debug.LogWarning("大屏蓄洪区数据联网不成功，读本地缓存数据,原因:" + e.ToString());
         }
 
-        if (!successInternet) {
+        if (!successInternet)
+        {
             WWW www = new WWW(Application.streamingAssetsPath + "/xhq.json");
             await new UnityAsync.WaitUntil(() => { return www.isDone; });
-           // Debug.Log(www.text);
+            // Debug.Log(www.text);
             GlobalData.floodStorageArea =
                 JsonConvert.DeserializeObject<FloodStorageArea>(www.text.ToString());
             GlobalData.floodStorageArea.done = true;
@@ -767,8 +769,10 @@ public class HttpHelper : MonoBehaviour
         requestData.timeout = timeOut;
         await requestData.SendWebRequest();
         try
+
         {
-            if (requestData.result != UnityWebRequest.Result.Success)
+            if (true)
+            //if (requestData.result != UnityWebRequest.Result.Success)
             {
                 Debug.LogWarning("YZTLayer联网不成功，读本地缓存数据,原因:返request不成功");
                 successInternet = false;
@@ -1533,8 +1537,9 @@ public class HttpHelper : MonoBehaviour
                     //Debug.LogError(200);
                     GlobalData.swDatas = JsonConvert.DeserializeObject<List<StationData>>(dataToken.ToString());
                     //Debug.LogError(GlobalData.swDatas.Count);
-                    for (int i = 0; i < GlobalData.swDatas.Count; i++) {
-                        GlobalData.swDatas[i].stnm = GlobalData.swDatas[i].stnm.Replace("（闸下）","(下)").Replace("（闸上）", "(上)").Replace("(闸上)","上").Replace("(闸下)", "下");
+                    for (int i = 0; i < GlobalData.swDatas.Count; i++)
+                    {
+                        GlobalData.swDatas[i].stnm = GlobalData.swDatas[i].stnm.Replace("（闸下）", "(下)").Replace("（闸上）", "(上)").Replace("(闸上)", "上").Replace("(闸下)", "下");
                     }
                 }
                 else
@@ -1609,7 +1614,7 @@ public class HttpHelper : MonoBehaviour
             successInternet = false;
             Debug.LogWarning("三线水位联网不成功,原因:" + e.ToString());
         }
-     
+
     }
 
     public async Task SendBuYuan_GetSensorData()
@@ -1743,7 +1748,7 @@ public class HttpHelper : MonoBehaviour
 
         www.Dispose();
     }
-    
+
     /// <summary>
     /// 获取设备趋势数据
     /// </summary>
@@ -1756,11 +1761,11 @@ public class HttpHelper : MonoBehaviour
     public async Task<string> GetDeviceTrend(int type, string gid, string sid, string beginTime, string endTime)
     {
         string cmdUrl = ServerAddress.APIGetDeviceTrend;
-        cmdUrl += $"/{(type==0?"buyuan":"taokou")}/{gid}/{sid}?beginTime={beginTime}&endTime={endTime}";
+        cmdUrl += $"/{(type == 0 ? "buyuan" : "taokou")}/{gid}/{sid}?beginTime={beginTime}&endTime={endTime}";
         UnityWebRequest www = new UnityWebRequest(cmdUrl, "Get");
         www.downloadHandler = new DownloadHandlerBuffer();
         www.SetRequestHeader("Content-Type", "application/json");
-        Debug.Log("send:"+cmdUrl);
+        Debug.Log("send:" + cmdUrl);
         await www.SendWebRequest();
         if (www.result != UnityWebRequest.Result.Success)
         {
@@ -2181,7 +2186,7 @@ public class HttpHelper : MonoBehaviour
                 Debug.Log($"设备列表json :{www.downloadHandler.text}");
                 SensorListResult tempData = JsonUtility.FromJson<SensorListResult>(www.downloadHandler.text);
                 GlobalData._devicesIdDatas = new Dictionary<string, DevicesId_Data>();
-                
+
                 for (int i = 0; i < tempData.rows.Count; i++)
                 {
                     GlobalData._devicesIdDatas.Add(tempData.rows[i].sensorName, tempData.rows[i]);

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

@@ -110,7 +110,7 @@ public class WaterTrendPanel : MonoBehaviour
     {
         currentStcd = stcd;
         name = name.Replace(" ", "");
-        nameText.text = $"{name}站点水位趋势";
+        nameText.text = $"站点：{name}";
         this.gameObject.SetActive(true);
         string chartJsonStr = await HttpHelper._Instance.GetWaterTrend_Chart(stcd);
         SetChartLine(chartJsonStr);

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

@@ -848,7 +848,7 @@ public class YZTLayer : YZTRootLayer
         RunTimeLayerClick(4);
         RunTimeLayerClick(5);
         RunTimeLayerClick(6);
-
+        RunTimeLayerClick(8);
         BaseLayer0BtnOnClick(true);
     }
 

Assets/StreamingAssets/OldhotPoints.json

@@ -0,0 +1,632 @@
+[
+    {
+        "latitude": "30.176582",
+        "longitude": "113.910187",
+        "name": "补元退洪闸",
+        "namePri": "BuYuan",
+        "type": 0
+    },
+    {
+        "latitude": "29.934944",
+        "longitude": "113.789406",
+        "name": "套口进洪闸",
+        "namePri": "TaoKou",
+        "type": 0
+    },
+    {
+        "latitude": "30.176582",
+        "longitude": "113.910187",
+        "name": "补元退洪闸",
+        "namePri": "BuYuan",
+        "type": 3
+    },
+    {
+        "latitude": "29.934944",
+        "longitude": "113.789406",
+        "name": "套口进洪闸",
+        "namePri": "TaoKou",
+        "type": 3
+    },
+    {
+        "latitude": "30.176582",
+        "longitude": "113.910187",
+        "name": "补元退洪闸",
+        "namePri": "BuYuan",
+        "type": 5
+    },
+    {
+        "latitude": "29.934944",
+        "longitude": "113.789406",
+        "name": "套口进洪闸",
+        "namePri": "TaoKou",
+        "type": 5
+    },
+    {
+        "latitude": "30.176582",
+        "longitude": "113.910187",
+        "name": "补元退洪闸",
+        "namePri": "BuYuan",
+        "type": 7
+    },
+    {
+        "latitude": "29.934944",
+        "longitude": "113.789406",
+        "name": "套口进洪闸",
+        "namePri": "TaoKou",
+        "type": 7
+    },
+    {
+        "latitude": "30.070965",
+        "longitude": "113.515671",
+        "name": "高潭口二站",
+        "namePri": "GaoTanKou",
+        "type": 6
+    },
+    {
+        "latitude": "29.918080",
+        "longitude": "113.618912",
+        "name": "腰口泵站",
+        "namePri": "YaoKou",
+        "type": 6
+    },
+    {
+        "latitude": "29.967120",
+        "longitude": "113.519547",
+        "name": "南套沟闸",
+        "namePri": "NanTaoGou",
+        "type": 7
+    },
+    {
+        "latitude": "29.937618",
+        "longitude": "113.597916",
+        "name": "内荆河闸",
+        "namePri": "NeiJingHe",
+        "type": 7
+    },
+    {
+        "latitude": "30.148602",
+        "longitude": "113.886948",
+        "name": "新滩口电排站",
+        "namePri": "XinTanKou",
+        "type": 6
+    },
+    {
+        "latitude": "30.006860",
+        "longitude": "113.864532",
+        "name": "大沙湖农场泵站",
+        "namePri": "DaShaHuNongChangBZ",
+        "type": 6
+    },
+    {
+        "latitude": "30.107962",
+        "longitude": "113.840858",
+        "name": "幸福沟排涝泵站",
+        "namePri": "XinFuGouPaiNaoBZ",
+        "type": 6
+    },
+    {
+        "latitude": "30.157780",
+        "longitude": "113.889046",
+        "name": "七一沟排涝泵站",
+        "namePri": "QiYiGouPaiNaoBZ",
+        "type": 6
+    },
+    {
+        "latitude": "30.087162",
+        "longitude": "114.051529",
+        "name": "燕窝镇泵站",
+        "namePri": "YanWoZhenBZ",
+        "type": 6
+    },
+    {
+        "latitude": "29.958965",
+        "longitude": "113.833100",
+        "name": "高桥泵站",
+        "namePri": "GaoQiaoBZ",
+        "type": 6
+    },
+    {
+        "latitude": "30.101696",
+        "longitude": "113.705338",
+        "name": "鸭耳河泵站",
+        "namePri": "YaErHeBZ",
+        "type": 6
+    },
+    {
+        "latitude": "29.935717",
+        "longitude": "113.748672",
+        "name": "龙口泵站",
+        "namePri": "LongKouBZ",
+        "type": 6
+    },
+    {
+        "latitude": "29.950754",
+        "longitude": "113.537155",
+        "name": "丰盈河排水闸",
+        "namePri": "FengYingHePaiSZ",
+        "type": 7
+    },
+    {
+        "latitude": "29.973421",
+        "longitude": "113.512700",
+        "name": "沙咀河排水闸",
+        "namePri": "ShaZuiHePaiSZ",
+        "type": 7
+    },
+    {
+        "latitude": "29.988550",
+        "longitude": "113.496124",
+        "name": "沿湖村排水闸",
+        "namePri": "YanCunHePaiSZ",
+        "type": 7
+    },
+    {
+        "latitude": "29.945440",
+        "longitude": "113.542870",
+        "name": "港北中心河排水闸",
+        "namePri": "GangBeiZhongXinHePaiSZ",
+        "type": 7
+    },
+    {
+        "latitude": "29.956736",
+        "longitude": "113.530693",
+        "name": "港龙河排水闸",
+        "namePri": "GangLongHePaiSZ",
+        "type": 7
+    },
+    {
+        "latitude": "30.014490",
+        "longitude": "113.455200",
+        "name": "白杨湾排水闸",
+        "namePri": "BaiYangWanPaiSZ",
+        "type": 7
+    },
+    {
+        "latitude": "30.034828",
+        "longitude": "113.427544",
+        "name": "红三村排水闸",
+        "namePri": "HongSanCunPaiSZ",
+        "type": 7
+    },
+    {
+        "latitude": "30.043745",
+        "longitude": "113.412407",
+        "name": "黄丝南闸",
+        "namePri": "HuangSiLanSZ",
+        "type": 7
+    },
+    {
+        "latitude": "30.021738",
+        "longitude": "113.438141",
+        "name": "荆石河进水闸",
+        "namePri": "JingShiHeJinSZ",
+        "type": 7
+    },
+    {
+        "latitude": "29.940159",
+        "longitude": "113.576100",
+        "name": "草塌河穿堤闸",
+        "namePri": "CaoTaHeCTZ",
+        "type": 7
+    },
+    {
+        "latitude": "30.007603",
+        "longitude": "113.471863",
+        "name": "高汊河排水闸",
+        "namePri": "GaoChaHePSZ",
+        "type": 7
+    },
+    {
+        "latitude": "29.817800",
+        "longitude": "113.466400",
+        "name": "新堤",
+        "namePri": "",
+        "type": 1
+    },
+    {
+        "latitude": "30.038600",
+        "longitude": "113.710800",
+        "name": "大同湖",
+        "namePri": "",
+        "type": 1
+    },
+    {
+        "latitude": "30.016700",
+        "longitude": "113.858600",
+        "name": "大沙",
+        "namePri": "",
+        "type": 1
+    },
+    {
+        "latitude": "29.883600",
+        "longitude": "113.467500",
+        "name": "滨湖",
+        "namePri": "",
+        "type": 1
+    },
+    {
+        "latitude": "29.913300",
+        "longitude": "113.605000",
+        "name": "乌林",
+        "namePri": "",
+        "type": 1
+    },
+    {
+        "latitude": "29.812200",
+        "longitude": "113.442200",
+        "name": "洪湖",
+        "namePri": "",
+        "type": 1
+    },
+    {
+        "latitude": "30.069200",
+        "longitude": "113.549400",
+        "name": "黄家口",
+        "namePri": "",
+        "type": 1
+    },
+    {
+        "latitude": "29.922500",
+        "longitude": "113.491900",
+        "name": "小港",
+        "namePri": "",
+        "type": 1
+    },
+    {
+        "latitude": "30.168600",
+        "longitude": "113.889400",
+        "name": "新滩",
+        "namePri": "",
+        "type": 1
+    },
+    {
+        "latitude": "29.973300",
+        "longitude": "113.670600",
+        "name": "老湾",
+        "namePri": "",
+        "type": 1
+    },
+    {
+        "latitude": "30.088300",
+        "longitude": "113.983600",
+        "name": "燕窝",
+        "namePri": "",
+        "type": 1
+    },
+    {
+        "latitude": "30.001900",
+        "longitude": "113.481400",
+        "name": "汊河",
+        "namePri": "",
+        "type": 1
+    },
+    {
+        "latitude": "29.876317",
+        "longitude": "113.467442",
+        "name": "张大口（闸下）                                    ",
+        "namePri": "",
+        "type": 2
+    },
+    {
+        "latitude": "30.094500",
+        "longitude": "113.695444",
+        "name": "唐咀                                              ",
+        "namePri": "",
+        "type": 2
+    },
+    {
+        "latitude": "29.926667",
+        "longitude": "113.501389",
+        "name": "小港                                              ",
+        "namePri": "",
+        "type": 2
+    },
+    {
+        "latitude": "29.972222",
+        "longitude": "113.666944",
+        "name": "老湾                                              ",
+        "namePri": "",
+        "type": 2
+    },
+    {
+        "latitude": "30.047222",
+        "longitude": "113.713889",
+        "name": "大同湖                                            ",
+        "namePri": "",
+        "type": 2
+    },
+    {
+        "latitude": "30.006944",
+        "longitude": "113.863611",
+        "name": "大沙湖                                            ",
+        "namePri": "",
+        "type": 2
+    },
+    {
+        "latitude": "29.929956",
+        "longitude": "113.485347",
+        "name": "小港湖闸                                          ",
+        "namePri": "",
+        "type": 2
+    },
+    {
+        "latitude": "30.146139",
+        "longitude": "113.890028",
+        "name": "新滩口                                            ",
+        "namePri": "",
+        "type": 2
+    },
+    {
+        "latitude": "30.190000",
+        "longitude": "113.920000",
+        "name": "新滩口(泵下)                                      ",
+        "namePri": "",
+        "type": 2
+    },
+    {
+        "latitude": "29.881400",
+        "longitude": "113.518000",
+        "name": "黄牛湖排水（闸上）                                ",
+        "namePri": "",
+        "type": 2
+    },
+    {
+        "latitude": "29.830700",
+        "longitude": "113.512000",
+        "name": "石码头泵站（外）                                  ",
+        "namePri": "",
+        "type": 2
+    },
+    {
+        "latitude": "30.010800",
+        "longitude": "113.640000",
+        "name": "长河口（闸上）                                    ",
+        "namePri": "",
+        "type": 2
+    },
+    {
+        "latitude": "30.088099",
+        "longitude": "114.050796",
+        "name": "燕窝子电排站（内）                                ",
+        "namePri": "",
+        "type": 2
+    },
+    {
+        "latitude": "30.088800",
+        "longitude": "113.635000",
+        "name": "南套沟泵站（外）                                  ",
+        "namePri": "",
+        "type": 2
+    },
+    {
+        "latitude": "30.138528",
+        "longitude": "113.935654",
+        "name": "沙套湖                                            ",
+        "namePri": "",
+        "type": 2
+    },
+    {
+        "latitude": "29.927556",
+        "longitude": "113.561861",
+        "name": "乌林                                              ",
+        "namePri": "",
+        "type": 2
+    },
+    {
+        "latitude": "30.072194",
+        "longitude": "113.513472",
+        "name": "高潭口泵站上                                      ",
+        "namePri": "",
+        "type": 2
+    },
+    {
+        "latitude": "30.087500",
+        "longitude": "113.633611",
+        "name": "黄家口                                            ",
+        "namePri": "",
+        "type": 2
+    },
+    {
+        "latitude": "30.080278",
+        "longitude": "114.008611",
+        "name": "燕窝                                              ",
+        "namePri": "",
+        "type": 2
+    },
+    {
+        "latitude": "29.876000",
+        "longitude": "113.470000",
+        "name": "南套沟泵外                                        ",
+        "namePri": "",
+        "type": 2
+    },
+    {
+        "latitude": "29.876278",
+        "longitude": "113.469167",
+        "name": "南套沟                                            ",
+        "namePri": "",
+        "type": 2
+    },
+    {
+        "latitude": "29.867417",
+        "longitude": "113.426250",
+        "name": "挖沟咀                                            ",
+        "namePri": "",
+        "type": 2
+    },
+    {
+        "latitude": "30.071656",
+        "longitude": "113.548081",
+        "name": "黄家口                                            ",
+        "namePri": "",
+        "type": 2
+    },
+    {
+        "latitude": "30.050000",
+        "longitude": "113.416111",
+        "name": "万全                                              ",
+        "namePri": "",
+        "type": 2
+    },
+    {
+        "latitude": "29.937778",
+        "longitude": "113.753889",
+        "name": "龙口                                              ",
+        "namePri": "",
+        "type": 2
+    },
+    {
+        "latitude": "29.934600",
+        "longitude": "113.484000",
+        "name": "下万全垸泵站                                      ",
+        "namePri": "",
+        "type": 2
+    },
+    {
+        "latitude": "29.929869",
+        "longitude": "113.486103",
+        "name": "小港湖（闸下）                                    ",
+        "namePri": "",
+        "type": 2
+    },
+    {
+        "latitude": "29.876650",
+        "longitude": "113.466217",
+        "name": "张大口（闸上）                                    ",
+        "namePri": "",
+        "type": 2
+    },
+    {
+        "latitude": "30.180000",
+        "longitude": "113.910000",
+        "name": "新滩口(泵上)                                      ",
+        "namePri": "",
+        "type": 2
+    },
+    {
+        "latitude": "29.995139",
+        "longitude": "113.469583",
+        "name": "汊河                                              ",
+        "namePri": "",
+        "type": 2
+    },
+    {
+        "latitude": "29.929983",
+        "longitude": "113.484622",
+        "name": "小港湖（闸上）                                    ",
+        "namePri": "",
+        "type": 2
+    },
+    {
+        "latitude": "29.890920",
+        "longitude": "113.609173",
+        "name": "腰口泵站                                          ",
+        "namePri": "",
+        "type": 2
+    },
+    {
+        "latitude": "29.960969",
+        "longitude": "113.209264",
+        "name": "子贝渊（闸上）                                    ",
+        "namePri": "",
+        "type": 4
+    },
+    {
+        "latitude": "29.961569",
+        "longitude": "113.208961",
+        "name": "子贝渊（闸下）                                    ",
+        "namePri": "",
+        "type": 4
+    },
+    {
+        "latitude": "29.901531",
+        "longitude": "113.073272",
+        "name": "福田寺节(闸下)                                    ",
+        "namePri": "",
+        "type": 4
+    },
+    {
+        "latitude": "29.871600",
+        "longitude": "113.027000",
+        "name": "沙螺（闸上）                                      ",
+        "namePri": "",
+        "type": 4
+    },
+    {
+        "latitude": "29.900000",
+        "longitude": "113.100000",
+        "name": "福田寺地下水                                      ",
+        "namePri": "",
+        "type": 4
+    },
+    {
+        "latitude": "29.899022",
+        "longitude": "113.073147",
+        "name": "福田寺防(闸下)                                    ",
+        "namePri": "",
+        "type": 4
+    },
+    {
+        "latitude": "29.901531",
+        "longitude": "113.073272",
+        "name": "福田寺节(闸上)                                    ",
+        "namePri": "",
+        "type": 4
+    },
+    {
+        "latitude": "29.981275",
+        "longitude": "113.350347",
+        "name": "下新河（闸下）                                    ",
+        "namePri": "",
+        "type": 4
+    },
+    {
+        "latitude": "29.980972",
+        "longitude": "113.352114",
+        "name": "下新河（闸上）                                    ",
+        "namePri": "",
+        "type": 4
+    },
+    {
+        "latitude": "29.871600",
+        "longitude": "113.027000",
+        "name": "沙螺（闸下）                                      ",
+        "namePri": "",
+        "type": 4
+    },
+    {
+        "latitude": "29.899022",
+        "longitude": "113.073147",
+        "name": "福田寺防（闸上）                                  ",
+        "namePri": "",
+        "type": 4
+    },
+    {
+        "latitude": "29.961651",
+        "longitude": "113.209299",
+        "name": "子贝渊闸                                          ",
+        "namePri": "",
+        "type": 4
+    },
+    {
+        "latitude": "30.029260",
+        "longitude": "113.396125",
+        "name": "黄丝南闸                                          ",
+        "namePri": "",
+        "type": 4
+    },
+    {
+        "latitude": "30.176582",
+        "longitude": "113.910187",
+        "name": "补元退洪闸",
+        "namePri": "",
+        "type": 4
+    },
+    {
+        "latitude": "29.934944",
+        "longitude": "113.789406",
+        "name": "套口进洪闸",
+        "namePri": "",
+        "type": 4
+    }
+]

Assets/StreamingAssets/hotPoints.json

@@ -301,51 +301,9 @@
         "type": 1
     },
     {
-        "latitude": "29.876317",
-        "longitude": "113.467442",
-        "name": "张大口（闸下）                                    ",
-        "namePri": "",
-        "type": 2
-    },
-    {
-        "latitude": "30.094500",
-        "longitude": "113.695444",
-        "name": "唐咀                                              ",
-        "namePri": "",
-        "type": 2
-    },
-    {
-        "latitude": "29.926667",
-        "longitude": "113.501389",
-        "name": "小港                                              ",
-        "namePri": "",
-        "type": 2
-    },
-    {
-        "latitude": "29.972222",
-        "longitude": "113.666944",
-        "name": "老湾                                              ",
-        "namePri": "",
-        "type": 2
-    },
-    {
-        "latitude": "30.047222",
-        "longitude": "113.713889",
-        "name": "大同湖                                            ",
-        "namePri": "",
-        "type": 2
-    },
-    {
-        "latitude": "30.006944",
-        "longitude": "113.863611",
-        "name": "大沙湖                                            ",
-        "namePri": "",
-        "type": 2
-    },
-    {
-        "latitude": "29.929956",
-        "longitude": "113.485347",
-        "name": "小港湖闸                                          ",
+        "latitude": "30.080278",
+        "longitude": "114.008611",
+        "name": "燕窝                                              ",
         "namePri": "",
         "type": 2
     },
@@ -357,65 +315,30 @@
         "type": 2
     },
     {
-        "latitude": "30.190000",
-        "longitude": "113.920000",
-        "name": "新滩口(泵下)                                      ",
-        "namePri": "",
-        "type": 2
-    },
-    {
-        "latitude": "29.881400",
-        "longitude": "113.518000",
-        "name": "黄牛湖排水（闸上）                                ",
-        "namePri": "",
-        "type": 2
-    },
-    {
-        "latitude": "29.830700",
-        "longitude": "113.512000",
-        "name": "石码头泵站（外）                                  ",
-        "namePri": "",
-        "type": 2
-    },
-    {
-        "latitude": "30.010800",
-        "longitude": "113.640000",
-        "name": "长河口（闸上）                                    ",
-        "namePri": "",
-        "type": 2
-    },
-    {
-        "latitude": "30.088099",
-        "longitude": "114.050796",
-        "name": "燕窝子电排站（内）                                ",
-        "namePri": "",
-        "type": 2
-    },
-    {
-        "latitude": "30.088800",
-        "longitude": "113.635000",
-        "name": "南套沟泵站（外）                                  ",
+        "latitude": "30.006944",
+        "longitude": "113.863611",
+        "name": "大沙湖                                            ",
         "namePri": "",
         "type": 2
     },
     {
-        "latitude": "30.138528",
-        "longitude": "113.935654",
-        "name": "沙套湖                                            ",
+        "latitude": "30.047222",
+        "longitude": "113.713889",
+        "name": "大同湖                                            ",
         "namePri": "",
         "type": 2
     },
     {
-        "latitude": "29.927556",
-        "longitude": "113.561861",
-        "name": "乌林                                              ",
+        "latitude": "29.937778",
+        "longitude": "113.753889",
+        "name": "龙口                                              ",
         "namePri": "",
         "type": 2
     },
     {
-        "latitude": "30.072194",
-        "longitude": "113.513472",
-        "name": "高潭口泵站上                                      ",
+        "latitude": "29.972222",
+        "longitude": "113.666944",
+        "name": "老湾                                              ",
         "namePri": "",
         "type": 2
     },
@@ -427,37 +350,16 @@
         "type": 2
     },
     {
-        "latitude": "30.080278",
-        "longitude": "114.008611",
-        "name": "燕窝                                              ",
-        "namePri": "",
-        "type": 2
-    },
-    {
-        "latitude": "29.876000",
-        "longitude": "113.470000",
-        "name": "南套沟泵外                                        ",
-        "namePri": "",
-        "type": 2
-    },
-    {
-        "latitude": "29.876278",
-        "longitude": "113.469167",
-        "name": "南套沟                                            ",
-        "namePri": "",
-        "type": 2
-    },
-    {
-        "latitude": "29.867417",
-        "longitude": "113.426250",
-        "name": "挖沟咀                                            ",
+        "latitude": "29.927556",
+        "longitude": "113.561861",
+        "name": "乌林                                              ",
         "namePri": "",
         "type": 2
     },
     {
-        "latitude": "30.071656",
-        "longitude": "113.548081",
-        "name": "黄家口                                            ",
+        "latitude": "29.926667",
+        "longitude": "113.501389",
+        "name": "小港                                              ",
         "namePri": "",
         "type": 2
     },
@@ -468,41 +370,6 @@
         "namePri": "",
         "type": 2
     },
-    {
-        "latitude": "29.937778",
-        "longitude": "113.753889",
-        "name": "龙口                                              ",
-        "namePri": "",
-        "type": 2
-    },
-    {
-        "latitude": "29.934600",
-        "longitude": "113.484000",
-        "name": "下万全垸泵站                                      ",
-        "namePri": "",
-        "type": 2
-    },
-    {
-        "latitude": "29.929869",
-        "longitude": "113.486103",
-        "name": "小港湖（闸下）                                    ",
-        "namePri": "",
-        "type": 2
-    },
-    {
-        "latitude": "29.876650",
-        "longitude": "113.466217",
-        "name": "张大口（闸上）                                    ",
-        "namePri": "",
-        "type": 2
-    },
-    {
-        "latitude": "30.180000",
-        "longitude": "113.910000",
-        "name": "新滩口(泵上)                                      ",
-        "namePri": "",
-        "type": 2
-    },
     {
         "latitude": "29.995139",
         "longitude": "113.469583",
@@ -510,20 +377,6 @@
         "namePri": "",
         "type": 2
     },
-    {
-        "latitude": "29.929983",
-        "longitude": "113.484622",
-        "name": "小港湖（闸上）                                    ",
-        "namePri": "",
-        "type": 2
-    },
-    {
-        "latitude": "29.890920",
-        "longitude": "113.609173",
-        "name": "腰口泵站                                          ",
-        "namePri": "",
-        "type": 2
-    },
     {
         "latitude": "29.960969",
         "longitude": "113.209264",
@@ -628,5 +481,20 @@
         "name": "套口进洪闸",
         "namePri": "",
         "type": 4
+    },
+    {
+
+        "type": 8,
+        "longitude": 113.854523,
+        "latitude": 30.01226,
+        "name": "大沙湖农场",
+        "namePri": "DaShaHuNC"
+    },
+    {
+        "type": 8,
+        "longitude": 113.717522,
+        "latitude": 30.0465374,
+        "name": "大同湖农场",
+        "namePri": "DaTongHuNC"
     }
 ]