瀏覽代碼

提交摄像头位置定位,优化场景效果

wartheking 1 周之前
父節點
當前提交
d2ce8fb15f

+ 82 - 0
Assets/Editor/LayerUnitDataGenerator.cs

@@ -0,0 +1,82 @@
+using UnityEngine;
+using System.Collections.Generic;
+using UnityEditor;
+using Newtonsoft.Json;
+
+public class LayerUnitDataEditor
+{
+    public string special = "0"; // special 都是 0
+    public int type = 5; // type 都是 5 (监控)
+    public float longitude = 113.909721f; // 固定经度
+    public float latitude = 30.1763515f; // 固定纬度
+    public string name;
+    public string namePri;
+    public string text1 = "套口进洪闸"; // 固定 text1
+    public string text2;
+
+   
+}
+
+
+
+
+
+public class LayerUnitDataGenerator : EditorWindow
+{
+    [MenuItem("Tools/Layer Unit Data Generator")]
+    public static void ShowWindow()
+    {
+        // 打开窗口
+        LayerUnitDataGenerator window = GetWindow<LayerUnitDataGenerator>("Layer Unit Data Generator");
+        window.Show();
+    }
+
+    private void OnGUI()
+    {
+        // 窗口的 GUI 布局
+        GUILayout.Label("Layer Unit Data Generator", EditorStyles.boldLabel);
+
+        if (GUILayout.Button("Generate JSON"))
+        {
+            GenerateLayerUnitDataJson();
+        }
+    }
+    public void GenerateLayerUnitDataJson()
+    {
+        // 获取所有选中的物体
+        GameObject[] selectedObjects = Selection.gameObjects;
+        List<LayerUnitDataEditor> dataList = new List<LayerUnitDataEditor>();
+
+        foreach (var obj in selectedObjects)
+        {
+            LayerUnitDataEditor unitData = new LayerUnitDataEditor();
+            unitData.name = obj.name.Replace("号","孔");
+            unitData.namePri = obj.name;
+            unitData.text2 = obj.name.Replace("TK_", "");
+
+            var temp = UnityToGeo(obj.transform.position);
+            // 在此设置经纬度
+            unitData.longitude = (float)temp.Longitude;
+            unitData.latitude = (float)temp.Latitude;
+
+            dataList.Add(unitData);
+        }
+
+        // 将数据转为 JSON 格式
+        string json = JsonConvert.SerializeObject(dataList, Formatting.Indented);
+        Debug.Log(json);
+    }
+
+    public (double Longitude, double Latitude) UnityToGeo(Vector3 unityCoord)
+    {
+
+        double longitude = (unityCoord.x + 10938527.4823) / 96151.617;
+
+        double latitude = (unityCoord.z + 3339986.2697) / 111468.3949;
+
+        // 这里我们忽略了截距,因为我们假设Unity坐标的原点对应于经纬度的截距
+        // 如果需要考虑截距,可以在这里添加相应的计算
+
+        return (longitude, latitude);
+    }
+}

+ 11 - 0
Assets/Editor/LayerUnitDataGenerator.cs.meta

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

+ 220 - 1
Assets/Prefabs/UI/Item/obsIcon.prefab

@@ -1,5 +1,100 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &6184866820830610
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2407755667622512913}
+  - component: {fileID: 8493831160867747707}
+  - component: {fileID: 3763220324958550309}
+  - component: {fileID: 9223057206584702714}
+  m_Layer: 5
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2407755667622512913
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6184866820830610}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8693264001334891580}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 10, y: -13.805}
+  m_SizeDelta: {x: 32, y: 27.61}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &8493831160867747707
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6184866820830610}
+  m_CullTransparentMesh: 1
+--- !u!114 &3763220324958550309
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6184866820830610}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.16037738, g: 0.16037738, b: 0.16037738, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
+    m_FontSize: 16
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u5957\u53E3"
+--- !u!114 &9223057206584702714
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6184866820830610}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
 --- !u!1 &4283438596719758962
 GameObject:
   m_ObjectHideFlags: 0
@@ -31,6 +126,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2027052951324185546}
+  - {fileID: 8693264001334891580}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -61,11 +157,134 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _data:
     name: 
-    url: 
     targetName: 
     type: 0
     targetTransform: {fileID: 0}
+    deviceId: 
+    channelId: 
+    status: 0
   targetTransForm: {fileID: 0}
+  tint: {fileID: 5515461222174838467}
+  tintName: {fileID: 3763220324958550309}
+--- !u!1 &5515461222174838467
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8693264001334891580}
+  - component: {fileID: 8685014295002963449}
+  - component: {fileID: 3405379800184817410}
+  - component: {fileID: 9076946353492734133}
+  - component: {fileID: 1123870414268019485}
+  m_Layer: 5
+  m_Name: Tint
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &8693264001334891580
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5515461222174838467}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 2407755667622512913}
+  m_Father: {fileID: 4631781281010837161}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 80.002, y: 94.716644}
+  m_SizeDelta: {x: 52, y: 23.5957}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &8685014295002963449
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5515461222174838467}
+  m_CullTransparentMesh: 1
+--- !u!114 &3405379800184817410
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5515461222174838467}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &9076946353492734133
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5515461222174838467}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
+--- !u!114 &1123870414268019485
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5515461222174838467}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 10
+    m_Right: 10
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 1
+  m_ChildScaleHeight: 1
+  m_ReverseArrangement: 0
 --- !u!1 &8445803138219866511
 GameObject:
   m_ObjectHideFlags: 0

文件差異過大導致無法顯示
+ 212 - 103
Assets/Scene 1.unity


+ 3 - 3
Assets/Scripts/HttpHelper.cs

@@ -534,9 +534,9 @@ public class HttpHelper : MonoBehaviour
                     {
                         ObsData obsData = new ObsData();
                         string originName = serverObsDatas.list[i].name;
-                        obsData.name = "补元-" + serverObsDatas.list[i].name;
+                        obsData.name = "BY_" + serverObsDatas.list[i].name;
                         //Debug.Log("111" + obsData.name);
-                        if (GlobalData.obsCameraLib.TryGetValue(originName, out var value))
+                        if (GlobalData.obsCameraLib.TryGetValue(obsData.name, out var value))
                         {
                             obsData.targetName = value;
                         }
@@ -626,7 +626,7 @@ public class HttpHelper : MonoBehaviour
                         ObsData obsData = new ObsData();
                         string originName = serverObsDatas.list[i].name;
                         //Debug.Log("111111111111111:" + originName);
-                        obsData.name = "套口-" + serverObsDatas.list[i].name;
+                        obsData.name = "TK_" + serverObsDatas.list[i].name;
                         if (GlobalData.obsCameraLib.TryGetValue(obsData.name, out var value))
                         {
                             obsData.targetName = value;

+ 40 - 7
Assets/Scripts/UI/Item/ObsIconCtrl.cs

@@ -2,33 +2,51 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.EventSystems;
 using UnityEngine.UI;
+using UnityEngine.UIElements;
 
-public class ObsIconCtrl : MonoBehaviour
+public class ObsIconCtrl : MonoBehaviour,IPointerEnterHandler,IPointerExitHandler
 {
     private RectTransform rect;
     private Camera _camera;
 
-    private Button _button;
+    private UnityEngine.UI.Button _button;
     public ObsData _data;
     public Transform targetTransForm;
-    
+
+    public GameObject tint;
+
+    public Text tintName;
     public void Init(ObsData data)
     {
         _data = data;
+        tintName.text = data.name;
+
         
+
         rect = this.GetComponent<RectTransform>();
-        _button = this.transform.Find("Icon").GetComponent<Button>();
-        _button.onClick.AddListener(()=>
+        _button = this.transform.Find("Icon").GetComponent<UnityEngine.UI.Button>();
+
+        if (!data.status)
+        {
+            this.transform.Find("Icon").GetComponent<UnityEngine.UI.Image>().color = Color.red;
+            this.transform.Find("Icon").GetChild(0).GetComponent<UnityEngine.UI.Image>().color = Color.red;
+        }
+        else
         {
-            GCJKLayer._Instance.ShowObsPlayerPanel(_data);
-        });
+            _button.onClick.AddListener(() =>
+            {
+                GCJKLayer._Instance.ShowObsPlayerPanel(_data);
+            });
+        }
         
         rect.anchoredPosition = new Vector2(2000, 0);
         _camera = CameraManager.instance.mainCamera;
         
         targetTransForm=StaticLod.instance.GetStaticObj(_data.targetName).transform;
 
+        
     }
     
     void Update()
@@ -55,4 +73,19 @@ public class ObsIconCtrl : MonoBehaviour
                objectScreenPosition.y > 0 &&
                objectScreenPosition.y < Screen.height;
     }
+
+    public void OnPointerEnter(PointerEventData eventData)
+    {
+        
+
+        tint.gameObject.SetActive(true);
+        LayoutRebuilder.ForceRebuildLayoutImmediate(tintName.GetComponent<RectTransform>()); // 强制重新计算布局
+        LayoutRebuilder.ForceRebuildLayoutImmediate(tint.GetComponent<RectTransform>()); // 强制重新计算布局
+
+    }
+
+    public void OnPointerExit(PointerEventData eventData)
+    {
+        tint.gameObject.SetActive(false);
+    }
 }

+ 49 - 2
Assets/Scripts/UI/UIView/GCJK/GCJKLayer.cs

@@ -828,6 +828,9 @@ public class GCJKLayer : YZTRootLayer
         }
     }
 
+    Dictionary<string, bool> BYObsUseLib = new Dictionary<string, bool>();
+    Dictionary<string, bool> TKObsUseLib = new Dictionary<string, bool>();
+
     //监控列表
     public async void CreatObsItem()
     {
@@ -842,9 +845,22 @@ public class GCJKLayer : YZTRootLayer
         {
             Destroy(_obsIconCtrls[i].gameObject);
         }
-        
+
+        for (int i = 0; i < GlobalData.layerUnitDatas.Count; i++) {
+            if (GlobalData.layerUnitDatas[i].type == LayerUnitType.JK) {
+                if (GlobalData.layerUnitDatas[i].text1 == "补元退洪闸") {
+                    BYObsUseLib.Add(GlobalData.layerUnitDatas[i].namePri, false);
+                } else if (GlobalData.layerUnitDatas[i].text1 == "套口进洪闸") {
+                    TKObsUseLib.Add(GlobalData.layerUnitDatas[i].namePri, false);
+                }
+            }
+        }
+
         for (int i = 0; i < GlobalData.obsDatas_by.Count; i++)
         {
+            if (BYObsUseLib.ContainsKey(GlobalData.obsDatas_by[i].targetName)) {
+                BYObsUseLib[GlobalData.obsDatas_by[i].targetName] = true;
+            }
             //Debug.Log(GlobalData.obsDatas_by[i].name + ":000:" + GlobalData.obsDatas_by[i].targetName);
             ObsItem tempItem = Instantiate(obsItemPrefab, obsItemContent).GetComponent<ObsItem>();
             tempItem.SetData(GlobalData.obsDatas_by[i]);
@@ -861,9 +877,25 @@ public class GCJKLayer : YZTRootLayer
             //Debug.Log(StaticLod.instance.GetStaticObj(GlobalData.obsDatas[i].name).gameObject.name);
         }
 
+        foreach (string keyName in BYObsUseLib.Keys) {
+            if (!BYObsUseLib[keyName]) {
+                ObsIconCtrl tempIcon = Instantiate(obsIconPrefab, _obsIconContent).GetComponent<ObsIconCtrl>();
+                ObsData errorObs = new ObsData();
+                errorObs.name = keyName + "(丢失)";
+                errorObs.targetName = keyName;
+                errorObs.type = obsType.BuYuanObs;
+                errorObs.status = false;
+                tempIcon.Init(errorObs);
+                _obsIconCtrls.Add(tempIcon);
+            }
+        }
+
         for (int i = 0; i < GlobalData.obsDatas_tk.Count; i++)
         {
-            //Debug.LogError(GlobalData.obsDatas_tk[i].targetName);
+            if (TKObsUseLib.ContainsKey(GlobalData.obsDatas_tk[i].targetName))
+            {
+                TKObsUseLib[GlobalData.obsDatas_tk[i].targetName] = true;
+            }
             ObsItem tempItem = Instantiate(obsItemPrefab, obsItemContent).GetComponent<ObsItem>();
             tempItem.SetData(GlobalData.obsDatas_tk[i]);
             int tempi = i;
@@ -877,6 +909,21 @@ public class GCJKLayer : YZTRootLayer
             _obsIconCtrls.Add(tempIcon);
             //Debug.Log(StaticLod.instance.GetStaticObj(GlobalData.obsDatas[i].name).gameObject.name);
         }
+
+        foreach (string keyName in TKObsUseLib.Keys)
+        {
+            if (!TKObsUseLib[keyName])
+            {
+                ObsIconCtrl tempIcon = Instantiate(obsIconPrefab, _obsIconContent).GetComponent<ObsIconCtrl>();
+                ObsData errorObs = new ObsData();
+                errorObs.name = keyName + "(丢失)";
+                errorObs.targetName = keyName;
+                errorObs.type = obsType.TaoKouObs;
+                errorObs.status = false;
+                tempIcon.Init(errorObs);
+                _obsIconCtrls.Add(tempIcon);
+            }
+        }
         SetObsIconActive(obsToggle.isOn);
     }
 

+ 398 - 498
Assets/StreamingAssets/layerUnitDatas.json

@@ -392,981 +392,881 @@
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.910927,
-        "latitude": 30.1770363,
-        "name": "右岸钢缆层",
-        "namePri": "BY_D1",
+        "longitude": 113.910561,
+        "latitude": 30.1768761,
+        "name": "BY_11号闸(球)",
+        "namePri": "BY_11号",
         "text1": "补元退洪闸",
-        "text2": "右岸钢缆层"
+        "text2": "11号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.909088,
-        "latitude": 30.1757183,
-        "name": "左岸闸机",
-        "namePri": "BY_D2",
+        "longitude": 113.909935,
+        "latitude": 30.1764832,
+        "name": "BY_5号闸(固定)",
+        "namePri": "BY_5号",
         "text1": "补元退洪闸",
-        "text2": "左岸闸机"
+        "text2": "5号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.909554,
-        "latitude": 30.1759872,
-        "name": "内滩",
-        "namePri": "BY_D3",
+        "longitude": 113.909409,
+        "latitude": 30.1761646,
+        "name": "BY_左岸管理房",
+        "namePri": "BY_左岸管理房",
         "text1": "补元退洪闸",
-        "text2": "内滩"
+        "text2": "左岸管理房"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.90947,
-        "latitude": 30.1760979,
-        "name": "左岸钢缆层",
-        "namePri": "BY_D4",
+        "longitude": 113.9109,
+        "latitude": 30.1770878,
+        "name": "BY_右岸管理房",
+        "namePri": "BY_右岸管理房",
         "text1": "补元退洪闸",
-        "text2": "左岸钢缆层"
+        "text2": "右岸管理房"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.9114,
-        "latitude": 30.1771641,
-        "name": "右岸闸机",
-        "namePri": "BY_D5",
+        "longitude": 113.910141,
+        "latitude": 30.1766129,
+        "name": "BY_7号闸(球)",
+        "namePri": "BY_7号",
         "text1": "补元退洪闸",
-        "text2": "右岸闸机"
+        "text2": "7号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.909279,
-        "latitude": 30.1759586,
-        "name": "8号闸(球)",
-        "namePri": "BY_D6",
+        "longitude": 113.910858,
+        "latitude": 30.177063,
+        "name": "BY_14号闸(球)",
+        "namePri": "BY_14号",
         "text1": "补元退洪闸",
-        "text2": "8号闸"
+        "text2": "14号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.909279,
-        "latitude": 30.1759586,
-        "name": "8号闸(固定)",
-        "namePri": "BY_D6",
+        "longitude": 113.910667,
+        "latitude": 30.1769428,
+        "name": "BY_12号闸(球)",
+        "namePri": "BY_12号",
         "text1": "补元退洪闸",
-        "text2": "8号闸"
+        "text2": "12号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.909515,
-        "latitude": 30.17622,
-        "name": "14号闸(球)",
-        "namePri": "BY_D7",
+        "longitude": 113.9114,
+        "latitude": 30.1771641,
+        "name": "BY_右岸闸机",
+        "namePri": "BY_右岸闸机",
         "text1": "补元退洪闸",
-        "text2": "14号闸"
+        "text2": "右岸闸机"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.909515,
-        "latitude": 30.17622,
-        "name": "14号闸(固定)",
-        "namePri": "BY_D7",
+        "longitude": 113.909554,
+        "latitude": 30.1759872,
+        "name": "BY_内滩",
+        "namePri": "BY_内滩",
         "text1": "补元退洪闸",
-        "text2": "14号闸"
+        "text2": "内滩"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.909615,
-        "latitude": 30.176281,
-        "name": "10号闸(球)",
-        "namePri": "BY_D8",
+        "longitude": 113.909454,
+        "latitude": 30.1761265,
+        "name": "BY_启闭机房左1",
+        "namePri": "BY_启闭机房左1",
         "text1": "补元退洪闸",
-        "text2": "10号闸"
+        "text2": "启闭机房左1"
     },
     {
         "special": "0",
         "type": 5,
         "longitude": 113.909615,
         "latitude": 30.176281,
-        "name": "10号闸(固定)",
-        "namePri": "BY_D8",
-        "text1": "补元退洪闸",
-        "text2": "10号闸"
-    },
-    {
-        "special": "0",
-        "type": 5,
-        "longitude": 113.909721,
-        "latitude": 30.1763515,
-        "name": "3号闸(球)",
-        "namePri": "BY_D9",
-        "text1": "补元退洪闸",
-        "text2": "3号闸"
-    },
-    {
-        "special": "0",
-        "type": 5,
-        "longitude": 113.909721,
-        "latitude": 30.1763515,
-        "name": "3号闸(固定)",
-        "namePri": "BY_D9",
+        "name": "BY_2号闸(球)",
+        "namePri": "BY_2号",
         "text1": "补元退洪闸",
-        "text2": "3号闸"
+        "text2": "2号"
     },
     {
         "special": "0",
         "type": 5,
         "longitude": 113.909828,
         "latitude": 30.1764164,
-        "name": "11号闸(球)",
-        "namePri": "BY_D10",
+        "name": "BY_4号闸(球)",
+        "namePri": "BY_4号",
         "text1": "补元退洪闸",
-        "text2": "11号闸"
+        "text2": "4号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.909828,
-        "latitude": 30.1764164,
-        "name": "11号闸(固定)",
-        "namePri": "BY_D10",
+        "longitude": 113.910919,
+        "latitude": 30.17703,
+        "name": "BY_启闭机房右1",
+        "namePri": "BY_启闭机房右1",
         "text1": "补元退洪闸",
-        "text2": "11号闸"
+        "text2": "启闭机房右1"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.909935,
-        "latitude": 30.1764832,
-        "name": "9号闸(球)",
-        "namePri": "BY_D11",
+        "longitude": 113.9102,
+        "latitude": 30.176527,
+        "name": "BY_启闭机房左2",
+        "namePri": "BY_启闭机房左2",
         "text1": "补元退洪闸",
-        "text2": "9号闸"
+        "text2": "启闭机房左2"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.909935,
-        "latitude": 30.1764832,
-        "name": "9号闸(固定)",
-        "namePri": "BY_D11",
+        "longitude": 113.90947,
+        "latitude": 30.1760979,
+        "name": "BY_左岸钢缆层",
+        "namePri": "BY_左岸钢缆层",
         "text1": "补元退洪闸",
-        "text2": "9号闸"
+        "text2": "左岸钢缆层"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.910042,
-        "latitude": 30.1765461,
-        "name": "12号闸(球)",
-        "namePri": "BY_D12",
+        "longitude": 113.910355,
+        "latitude": 30.1767464,
+        "name": "BY_9号闸(球)",
+        "namePri": "BY_9号",
         "text1": "补元退洪闸",
-        "text2": "12号闸"
+        "text2": "9号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.910042,
-        "latitude": 30.1765461,
-        "name": "12号闸(固定)",
-        "namePri": "BY_D12",
+        "longitude": 113.909279,
+        "latitude": 30.1759586,
+        "name": "BY_中控室",
+        "namePri": "BY_中控室",
         "text1": "补元退洪闸",
-        "text2": "12号闸"
+        "text2": "中控室"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.910141,
-        "latitude": 30.1766129,
-        "name": "中控室",
-        "namePri": "BY_D13",
+        "longitude": 113.909721,
+        "latitude": 30.1763515,
+        "name": "BY_3号闸(球)",
+        "namePri": "BY_3",
         "text1": "补元退洪闸",
-        "text2": "中控室"
+        "text2": "3号"
     },
     {
         "special": "0",
         "type": 5,
         "longitude": 113.910248,
         "latitude": 30.1766815,
-        "name": "启闭机房右1",
-        "namePri": "BY_D14",
+        "name": "BY_8号闸(球)",
+        "namePri": "BY_8号",
         "text1": "补元退洪闸",
-        "text2": "启闭机房右1"
+        "text2": "8号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.910355,
-        "latitude": 30.1767464,
-        "name": "低压配电房",
-        "namePri": "BY_D15",
+        "longitude": 113.909416,
+        "latitude": 30.1760426,
+        "name": "BY_低压配电房",
+        "namePri": "BY_低压配电房",
         "text1": "补元退洪闸",
         "text2": "低压配电房"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.910454,
-        "latitude": 30.1768131,
-        "name": "左岸管理房",
-        "namePri": "BY_D16",
-        "text1": "补元退洪闸",
-        "text2": "左岸管理房"
-    },
-    {
-        "special": "0",
-        "type": 5,
-        "longitude": 113.910561,
-        "latitude": 30.1768761,
-        "name": "7号闸(球)",
-        "namePri": "BY_D17",
-        "text1": "补元退洪闸",
-        "text2": "7号闸"
-    },
-    {
-        "special": "0",
-        "type": 5,
-        "longitude": 113.910561,
-        "latitude": 30.1768761,
-        "name": "7号闸(固定)",
-        "namePri": "BY_D17",
-        "text1": "补元退洪闸",
-        "text2": "7号闸"
-    },
-    {
-        "special": "0",
-        "type": 5,
-        "longitude": 113.910667,
-        "latitude": 30.1769428,
-        "name": "启闭机房左2",
-        "namePri": "BY_D18",
-        "text1": "补元退洪闸",
-        "text2": "启闭机房左2"
-    },
-    {
-        "special": "0",
-        "type": 5,
-        "longitude": 113.910767,
-        "latitude": 30.1770077,
-        "name": "6号闸(球)",
-        "namePri": "BY_D19",
-        "text1": "补元退洪闸",
-        "text2": "6号闸"
-    },
-    {
-        "special": "0",
-        "type": 5,
-        "longitude": 113.910767,
-        "latitude": 30.1770077,
-        "name": "6号闸(固定)",
-        "namePri": "BY_D19",
-        "text1": "补元退洪闸",
-        "text2": "6号闸"
-    },
-    {
-        "special": "0",
-        "type": 5,
-        "longitude": 113.910858,
-        "latitude": 30.177063,
-        "name": "5号闸(球)",
-        "namePri": "BY_D20",
+        "longitude": 113.909515,
+        "latitude": 30.17622,
+        "name": "BY_1号闸(固定)",
+        "namePri": "BY_1号",
         "text1": "补元退洪闸",
-        "text2": "5号闸"
+        "text2": "1号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.910858,
-        "latitude": 30.177063,
-        "name": "5号闸(固定)",
-        "namePri": "BY_D20",
+        "longitude": 113.909088,
+        "latitude": 30.1757183,
+        "name": "BY_左岸闸机",
+        "namePri": "BY_左岸闸机",
         "text1": "补元退洪闸",
-        "text2": "5号闸"
+        "text2": "左岸闸机"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.911072,
-        "latitude": 30.1770668,
-        "name": "右岸管理房",
-        "namePri": "BY_D21",
+        "longitude": 113.910042,
+        "latitude": 30.1765461,
+        "name": "BY_6号闸(球)",
+        "namePri": "BY_6号",
         "text1": "补元退洪闸",
-        "text2": "右岸管理房"
+        "text2": "6号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.909409,
-        "latitude": 30.1761646,
-        "name": "启闭机房左1",
-        "namePri": "BY_D22",
+        "longitude": 113.910927,
+        "latitude": 30.1770363,
+        "name": "BY_右岸钢缆层",
+        "namePri": "BY_右岸钢缆层",
         "text1": "补元退洪闸",
-        "text2": "启闭机房左1"
+        "text2": "右岸钢缆层"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.9109,
-        "latitude": 30.1770878,
-        "name": "启闭机房右2",
-        "namePri": "BY_D23",
+        "longitude": 113.910233,
+        "latitude": 30.1765518,
+        "name": "BY_启闭机房右2",
+        "namePri": "BY_启闭机房右2",
         "text1": "补元退洪闸",
         "text2": "启闭机房右2"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.910919,
-        "latitude": 30.17703,
-        "name": "13号闸(球)",
-        "namePri": "BY_D24",
-        "text1": "补元退洪闸",
-        "text2": "13号闸"
-    },
-    {
-        "special": "0",
-        "type": 5,
-        "longitude": 113.910919,
-        "latitude": 30.17703,
-        "name": "13号闸(固定)",
-        "namePri": "BY_D24",
+        "longitude": 113.910454,
+        "latitude": 30.1768131,
+        "name": "BY_10号闸(球)",
+        "namePri": "BY_10号",
         "text1": "补元退洪闸",
-        "text2": "13号闸"
+        "text2": "10号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.909454,
-        "latitude": 30.1761265,
-        "name": "1号闸(球)",
-        "namePri": "BY_D25",
+        "longitude": 113.910767,
+        "latitude": 30.1770077,
+        "name": "BY_13号闸(球)",
+        "namePri": "BY_13号",
         "text1": "补元退洪闸",
-        "text2": "1号"
+        "text2": "13号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.909454,
-        "latitude": 30.1761265,
-        "name": "1号闸(固定)",
-        "namePri": "BY_D25",
-        "text1": "补元退洪闸",
-        "text2": "1号"
+        "longitude": 113.78756,
+        "latitude": 29.9350319,
+        "name": "TK_10孔",
+        "namePri": "TK_10号",
+        "text1": "套口进洪闸",
+        "text2": "10号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.78997,
-        "latitude": 29.9348068,
-        "name": "套口-1号闸(固定)",
-        "namePri": "TK_D1",
+        "longitude": 113.788109,
+        "latitude": 29.9350319,
+        "name": "TK_13孔",
+        "namePri": "TK_13号",
         "text1": "套口进洪闸",
-        "text2": "套口-1号闸(固定)"
+        "text2": "13号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.786011,
-        "latitude": 29.9349136,
-        "name": "套口-7号闸(固定)",
-        "namePri": "TK_D2",
+        "longitude": 113.786263,
+        "latitude": 29.93495,
+        "name": "TK_启闭机房 西入口",
+        "namePri": "TK_启闭机房西入口",
         "text1": "套口进洪闸",
-        "text2": "套口-7号闸(固定)"
+        "text2": "启闭机房西入口"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.786011,
-        "latitude": 29.934988,
-        "name": "套口-8号闸(固定)",
-        "namePri": "TK_D3",
+        "longitude": 113.790115,
+        "latitude": 29.9350319,
+        "name": "TK_27孔",
+        "namePri": "TK_27号",
         "text1": "套口进洪闸",
-        "text2": "套口-8号闸(固定)"
+        "text2": "27号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.786263,
-        "latitude": 29.9349136,
-        "name": "套口-1号闸(球)",
-        "namePri": "TK_D4",
+        "longitude": 113.787842,
+        "latitude": 29.9350319,
+        "name": "TK_12孔",
+        "namePri": "TK_12号",
         "text1": "套口进洪闸",
-        "text2": "套口-1号闸(球)"
+        "text2": "12号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.792809,
-        "latitude": 29.9349136,
-        "name": "套口-9号闸(固定)",
-        "namePri": "TK_D5",
+        "longitude": 113.786545,
+        "latitude": 29.9348068,
+        "name": "TK_观看左上游翼墙水尺",
+        "namePri": "TK_观看左上游翼墙水尺",
         "text1": "套口进洪闸",
-        "text2": "套口-9号闸(固定)"
+        "text2": "观看左上游翼墙水尺"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.792809,
-        "latitude": 29.934988,
-        "name": "套口-11号闸(固定)",
-        "namePri": "TK_D6",
+        "longitude": 113.786415,
+        "latitude": 29.9350319,
+        "name": "TK_2孔",
+        "namePri": "TK_2号",
         "text1": "套口进洪闸",
-        "text2": "套口-11号闸(固定)"
+        "text2": "2号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.792557,
-        "latitude": 29.9349136,
-        "name": "套口-12号闸(固定)",
-        "namePri": "TK_D7",
+        "longitude": 113.788704,
+        "latitude": 29.9350319,
+        "name": "TK_18孔",
+        "namePri": "TK_18号",
         "text1": "套口进洪闸",
-        "text2": "套口-12号闸(固定)"
+        "text2": "18号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.792557,
-        "latitude": 29.93499,
-        "name": "套口-6号闸(固定)",
-        "namePri": "TK_D8",
+        "longitude": 113.789253,
+        "latitude": 29.9350319,
+        "name": "TK_21孔",
+        "namePri": "TK_21号",
         "text1": "套口进洪闸",
-        "text2": "套口-6号闸(固定)"
+        "text2": "21号"
     },
     {
         "special": "0",
         "type": 5,
         "longitude": 113.786263,
         "latitude": 29.9349861,
-        "name": "套口-1号闸(固定)",
-        "namePri": "TK_D9",
+        "name": "TK_左岸东北楼顶球机",
+        "namePri": "TK_左岸东北楼顶球机",
         "text1": "套口进洪闸",
-        "text2": "套口-1号闸(固定)"
+        "text2": "左岸东北楼顶球机"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.7864,
+        "longitude": 113.787827,
         "latitude": 29.9350319,
-        "name": "套口-7号闸(固定)",
-        "namePri": "TK_D10",
+        "name": "TK_11孔",
+        "namePri": "TK_11号",
         "text1": "套口进洪闸",
-        "text2": "套口-7号闸(固定)"
+        "text2": "11号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.786415,
+        "longitude": 113.791275,
         "latitude": 29.9350319,
-        "name": "套口-右岸1",
-        "namePri": "TK_D11",
+        "name": "TK_36孔",
+        "namePri": "TK_36号",
         "text1": "套口进洪闸",
-        "text2": "套口-右岸1"
+        "text2": "36号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.786682,
+        "longitude": 113.7924,
         "latitude": 29.9350319,
-        "name": "套口-启闭机房 西入口",
-        "namePri": "TK_D12",
+        "name": "TK_43孔",
+        "namePri": "TK_43号",
         "text1": "套口进洪闸",
-        "text2": "套口-启闭机房 西入口"
+        "text2": "43号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.7867,
-        "latitude": 29.9350319,
-        "name": "套口-左岸一楼大厅",
-        "namePri": "TK_D13",
+        "longitude": 113.790695,
+        "latitude": 29.9349213,
+        "name": "TK_启闭机房内33孔处",
+        "namePri": "TK_启闭机房内33孔处",
         "text1": "套口进洪闸",
-        "text2": "套口-左岸一楼大厅"
+        "text2": "启闭机房内33孔处"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.786972,
+        "longitude": 113.790413,
         "latitude": 29.9350319,
-        "name": "套口-启闭机房内22孔处",
-        "namePri": "TK_D14",
+        "name": "TK_30孔",
+        "namePri": "TK_30号",
         "text1": "套口进洪闸",
-        "text2": "套口-启闭机房内22孔处"
+        "text2": "30号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.786987,
+        "longitude": 113.788971,
         "latitude": 29.9350319,
-        "name": "套口-启闭机房内33孔处",
-        "namePri": "TK_D15",
+        "name": "TK_19孔",
+        "namePri": "TK_19号",
         "text1": "套口进洪闸",
-        "text2": "套口-启闭机房内33孔处"
+        "text2": "19号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.787254,
+        "longitude": 113.789543,
         "latitude": 29.9350319,
-        "name": "套口-8孔",
-        "namePri": "TK_D16",
+        "name": "TK_23孔",
+        "namePri": "TK_23号",
         "text1": "套口进洪闸",
-        "text2": "套口-8孔"
+        "text2": "23号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.78727,
-        "latitude": 29.9350319,
-        "name": "套口-6孔",
-        "namePri": "TK_D17",
+        "longitude": 113.792618,
+        "latitude": 29.9349861,
+        "name": "TK_右岸配电室1",
+        "namePri": "TK_右岸配电室1",
         "text1": "套口进洪闸",
-        "text2": "套口-6孔"
+        "text2": "右岸配电室1"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.787544,
+        "longitude": 113.791557,
         "latitude": 29.9350319,
-        "name": "套口-31孔",
-        "namePri": "TK_D18",
+        "name": "TK_38孔",
+        "namePri": "TK_38号",
         "text1": "套口进洪闸",
-        "text2": "套口-31孔"
+        "text2": "38号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.78756,
+        "longitude": 113.789558,
         "latitude": 29.9350319,
-        "name": "套口-42孔",
-        "namePri": "TK_D19",
+        "name": "TK_24孔",
+        "namePri": "TK_24号",
         "text1": "套口进洪闸",
-        "text2": "套口-42孔"
+        "text2": "24号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.787827,
+        "longitude": 113.787254,
         "latitude": 29.9350319,
-        "name": "套口-36孔",
-        "namePri": "TK_D20",
+        "name": "TK_7孔",
+        "namePri": "TK_7号",
         "text1": "套口进洪闸",
-        "text2": "套口-36孔"
+        "text2": "7号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.787842,
+        "longitude": 113.788132,
         "latitude": 29.9350319,
-        "name": "套口-19孔",
-        "namePri": "TK_D21",
+        "name": "TK_14孔",
+        "namePri": "TK_14号",
         "text1": "套口进洪闸",
-        "text2": "套口-19孔"
+        "text2": "14号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.788109,
+        "longitude": 113.791847,
         "latitude": 29.9350319,
-        "name": "套口-39孔",
-        "namePri": "TK_D22",
+        "name": "TK_40孔",
+        "namePri": "TK_40号",
         "text1": "套口进洪闸",
-        "text2": "套口-39孔"
+        "text2": "40号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.788132,
+        "longitude": 113.7867,
         "latitude": 29.9350319,
-        "name": "套口-25孔",
-        "namePri": "TK_D23",
+        "name": "TK_4孔",
+        "namePri": "TK_4号",
         "text1": "套口进洪闸",
-        "text2": "套口-25孔"
+        "text2": "4号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.7884,
-        "latitude": 29.9350319,
-        "name": "套口-32孔",
-        "namePri": "TK_D24",
+        "longitude": 113.792557,
+        "latitude": 29.93499,
+        "name": "TK_右岸西北楼顶球机",
+        "namePri": "TK_右岸西北楼顶球机",
         "text1": "套口进洪闸",
-        "text2": "套口-32孔"
+        "text2": "右岸西北楼顶球机"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.788414,
+        "longitude": 113.792114,
         "latitude": 29.9350319,
-        "name": "套口-22孔",
-        "namePri": "TK_D25",
+        "name": "TK_41孔",
+        "namePri": "TK_41号",
         "text1": "套口进洪闸",
-        "text2": "套口-22孔"
+        "text2": "41号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.788681,
-        "latitude": 29.9350319,
-        "name": "套口-7孔",
-        "namePri": "TK_D26",
+        "longitude": 113.792557,
+        "latitude": 29.93495,
+        "name": "TK_右岸楼梯间1.25楼",
+        "namePri": "TK_右岸楼梯间1.25楼",
         "text1": "套口进洪闸",
-        "text2": "套口-7孔"
+        "text2": "右岸楼梯间1.25楼"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.788704,
-        "latitude": 29.9350319,
-        "name": "套口-24孔",
-        "namePri": "TK_D27",
+        "longitude": 113.786263,
+        "latitude": 29.9349823,
+        "name": "TK_左岸一楼大厅",
+        "namePri": "TK_左岸一楼大厅",
         "text1": "套口进洪闸",
-        "text2": "套口-24孔"
+        "text2": "左岸一楼大厅"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.788971,
+        "longitude": 113.786972,
         "latitude": 29.9350319,
-        "name": "套口-20孔",
-        "namePri": "TK_D28",
+        "name": "TK_5孔",
+        "namePri": "TK_5号",
         "text1": "套口进洪闸",
-        "text2": "套口-20孔"
+        "text2": "5号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.788986,
-        "latitude": 29.9350319,
-        "name": "套口-23孔",
-        "namePri": "TK_D29",
+        "longitude": 113.792725,
+        "latitude": 29.9349861,
+        "name": "TK_右岸配电室2",
+        "namePri": "TK_右岸配电室2",
         "text1": "套口进洪闸",
-        "text2": "套口-23孔"
+        "text2": "右岸配电室2"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.789253,
+        "longitude": 113.79126,
         "latitude": 29.9350319,
-        "name": "套口-5孔",
-        "namePri": "TK_D30",
+        "name": "TK_35孔",
+        "namePri": "TK_35号",
         "text1": "套口进洪闸",
-        "text2": "套口-5孔"
+        "text2": "35号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.789268,
+        "longitude": 113.791824,
         "latitude": 29.9350319,
-        "name": "套口-43孔",
-        "namePri": "TK_D31",
+        "name": "TK_39孔",
+        "namePri": "TK_39号",
         "text1": "套口进洪闸",
-        "text2": "套口-43孔"
+        "text2": "39号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.789543,
+        "longitude": 113.789825,
         "latitude": 29.9350319,
-        "name": "套口-37孔",
-        "namePri": "TK_D32",
+        "name": "TK_25孔",
+        "namePri": "TK_25号",
         "text1": "套口进洪闸",
-        "text2": "套口-37孔"
+        "text2": "25号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.789558,
+        "longitude": 113.788414,
         "latitude": 29.9350319,
-        "name": "套口-29孔",
-        "namePri": "TK_D33",
+        "name": "TK_16孔",
+        "namePri": "TK_16号",
         "text1": "套口进洪闸",
-        "text2": "套口-29孔"
+        "text2": "16号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.789825,
+        "longitude": 113.79213,
         "latitude": 29.9350319,
-        "name": "套口-28孔",
-        "namePri": "TK_D34",
+        "name": "TK_42孔",
+        "namePri": "TK_42号",
         "text1": "套口进洪闸",
-        "text2": "套口-28孔"
+        "text2": "42号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.789841,
+        "longitude": 113.7904,
         "latitude": 29.9350319,
-        "name": "套口-16孔",
-        "namePri": "TK_D35",
+        "name": "TK_29孔",
+        "namePri": "TK_29号",
         "text1": "套口进洪闸",
-        "text2": "套口-16孔"
+        "text2": "29号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.790115,
+        "longitude": 113.791542,
         "latitude": 29.9350319,
-        "name": "套口-11孔",
-        "namePri": "TK_D36",
+        "name": "TK_37孔",
+        "namePri": "TK_37号",
         "text1": "套口进洪闸",
-        "text2": "套口-11孔"
+        "text2": "37号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.790131,
-        "latitude": 29.9350319,
-        "name": "套口-38孔",
-        "namePri": "TK_D37",
+        "longitude": 113.787689,
+        "latitude": 29.9349232,
+        "name": "TK_启闭机房11孔",
+        "namePri": "TK_启闭机房11孔",
         "text1": "套口进洪闸",
-        "text2": "套口-38孔"
+        "text2": "启闭机房11孔"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.7904,
+        "longitude": 113.789268,
         "latitude": 29.9350319,
-        "name": "套口-27孔",
-        "namePri": "TK_D38",
+        "name": "TK_22孔",
+        "namePri": "TK_22号",
         "text1": "套口进洪闸",
-        "text2": "套口-27孔"
+        "text2": "22号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.790413,
+        "longitude": 113.788986,
         "latitude": 29.9350319,
-        "name": "套口-18孔",
-        "namePri": "TK_D39",
+        "name": "TK_20孔",
+        "namePri": "TK_20号",
         "text1": "套口进洪闸",
-        "text2": "套口-18孔"
+        "text2": "20号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.790688,
-        "latitude": 29.9350319,
-        "name": "套口-4孔",
-        "namePri": "TK_D40",
+        "longitude": 113.792809,
+        "latitude": 29.934988,
+        "name": "TK_右岸东北楼顶球机",
+        "namePri": "TK_右岸东北楼顶球机",
         "text1": "套口进洪闸",
-        "text2": "套口-4孔"
+        "text2": "右岸东北楼顶球机"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.7907,
+        "longitude": 113.786987,
         "latitude": 29.9350319,
-        "name": "套口-35孔",
-        "namePri": "TK_D41",
+        "name": "TK_6孔",
+        "namePri": "TK_6号",
         "text1": "套口进洪闸",
-        "text2": "套口-35孔"
+        "text2": "6号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.79097,
-        "latitude": 29.9350319,
-        "name": "套口-44孔",
-        "namePri": "TK_D42",
+        "longitude": 113.786263,
+        "latitude": 29.9349136,
+        "name": "TK_左岸东南楼顶球机",
+        "namePri": "TK_左岸东南楼顶球机",
         "text1": "套口进洪闸",
-        "text2": "套口-44孔"
+        "text2": "左岸东南楼顶球机"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.790985,
-        "latitude": 29.9350319,
-        "name": "套口-9孔",
-        "namePri": "TK_D43",
+        "longitude": 113.792809,
+        "latitude": 29.9349136,
+        "name": "TK_右岸东南楼顶球机",
+        "namePri": "TK_右岸东南楼顶球机",
         "text1": "套口进洪闸",
-        "text2": "套口-9孔"
+        "text2": "右岸东南楼顶球机"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.79126,
-        "latitude": 29.9350319,
-        "name": "套口-3孔",
-        "namePri": "TK_D44",
+        "longitude": 113.786011,
+        "latitude": 29.9349136,
+        "name": "TK_左岸西南楼顶球机",
+        "namePri": "TK_左岸西南楼顶球机",
         "text1": "套口进洪闸",
-        "text2": "套口-3孔"
+        "text2": "左岸西南楼顶球机"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.791275,
+        "longitude": 113.786682,
         "latitude": 29.9350319,
-        "name": "套口-21孔",
-        "namePri": "TK_D45",
+        "name": "TK_3孔",
+        "namePri": "TK_3号",
         "text1": "套口进洪闸",
-        "text2": "套口-21孔"
+        "text2": "3号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.791542,
+        "longitude": 113.7907,
         "latitude": 29.9350319,
-        "name": "套口-40孔",
-        "namePri": "TK_D46",
+        "name": "TK_32孔",
+        "namePri": "TK_32号",
         "text1": "套口进洪闸",
-        "text2": "套口-40孔"
+        "text2": "32号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.791557,
+        "longitude": 113.789841,
         "latitude": 29.9350319,
-        "name": "套口-15孔",
-        "namePri": "TK_D47",
+        "name": "TK_26孔",
+        "namePri": "TK_26号",
         "text1": "套口进洪闸",
-        "text2": "套口-15孔"
+        "text2": "26号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.791824,
+        "longitude": 113.7864,
         "latitude": 29.9350319,
-        "name": "套口-30孔",
-        "namePri": "TK_D48",
+        "name": "TK_1孔",
+        "namePri": "TK_1号",
         "text1": "套口进洪闸",
-        "text2": "套口-30孔"
+        "text2": "1号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.791847,
-        "latitude": 29.9350319,
-        "name": "套口-33孔",
-        "namePri": "TK_D49",
+        "longitude": 113.789124,
+        "latitude": 29.9349232,
+        "name": "TK_启闭机房内22孔处",
+        "namePri": "TK_启闭机房内22孔处",
         "text1": "套口进洪闸",
-        "text2": "套口-33孔"
+        "text2": "启闭机房内22孔处"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.792114,
+        "longitude": 113.79097,
         "latitude": 29.9350319,
-        "name": "套口-26孔",
-        "namePri": "TK_D50",
+        "name": "TK_33孔",
+        "namePri": "TK_33号",
         "text1": "套口进洪闸",
-        "text2": "套口-26孔"
+        "text2": "33号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.79213,
+        "longitude": 113.788681,
         "latitude": 29.9350319,
-        "name": "套口-17孔",
-        "namePri": "TK_D51",
+        "name": "TK_17孔",
+        "namePri": "TK_17号",
         "text1": "套口进洪闸",
-        "text2": "套口-17孔"
+        "text2": "17号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.7924,
+        "longitude": 113.790131,
         "latitude": 29.9350319,
-        "name": "套口-10孔",
-        "namePri": "TK_D52",
+        "name": "TK_28孔",
+        "namePri": "TK_28号",
         "text1": "套口进洪闸",
-        "text2": "套口-10孔"
+        "text2": "28号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.792419,
+        "longitude": 113.7884,
         "latitude": 29.9350319,
-        "name": "套口-12孔",
-        "namePri": "TK_D53",
-        "text1": "套口进洪闸",
-        "text2": "套口-12孔"
-    },
-    {
-        "special": "0",
-        "type": 5,
-        "longitude": 113.792549,
-        "latitude": 29.93496,
-        "name": "套口-14孔",
-        "namePri": "TK_D54",
+        "name": "TK_15孔",
+        "namePri": "TK_15号",
         "text1": "套口进洪闸",
-        "text2": "套口-14孔"
+        "text2": "15号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.786263,
-        "latitude": 29.9349518,
-        "name": "套口-13孔",
-        "namePri": "TK_D55",
+        "longitude": 113.790688,
+        "latitude": 29.9350319,
+        "name": "TK_31孔",
+        "namePri": "TK_31号",
         "text1": "套口进洪闸",
-        "text2": "套口-13孔"
+        "text2": "31号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.786263,
-        "latitude": 29.9349823,
-        "name": "套口-41孔",
-        "namePri": "TK_D56",
+        "longitude": 113.786011,
+        "latitude": 29.934988,
+        "name": "TK_左岸西北楼顶球机",
+        "namePri": "TK_左岸西北楼顶球机",
         "text1": "套口进洪闸",
-        "text2": "套口-41孔"
+        "text2": "左岸西北楼顶球机"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.7928,
-        "latitude": 29.9349823,
-        "name": "套口-34孔",
-        "namePri": "TK_D57",
+        "longitude": 113.790985,
+        "latitude": 29.9350319,
+        "name": "TK_34孔",
+        "namePri": "TK_34号",
         "text1": "套口进洪闸",
-        "text2": "套口-34孔"
+        "text2": "34号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.792557,
-        "latitude": 29.93492,
-        "name": "套口-启闭机房11孔",
-        "namePri": "TK_D58",
+        "longitude": 113.787544,
+        "latitude": 29.9350319,
+        "name": "TK_9孔",
+        "namePri": "TK_9号",
         "text1": "套口进洪闸",
-        "text2": "套口-启闭机房11孔"
+        "text2": "9号"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.792557,
-        "latitude": 29.93492,
-        "name": "套口-1孔",
-        "namePri": "TK_D59",
+        "longitude": 113.792419,
+        "latitude": 29.9350319,
+        "name": "TK_44孔",
+        "namePri": "TK_44号",
         "text1": "套口进洪闸",
-        "text2": "套口-1孔"
+        "text2": "44号"
     },
     {
         "special": "0",
         "type": 5,
         "longitude": 113.792557,
-        "latitude": 29.93492,
-        "name": "套口-2孔",
-        "namePri": "TK_D60",
+        "latitude": 29.9349136,
+        "name": "TK_右岸西南楼顶",
+        "namePri": "TK_右岸西南楼顶",
         "text1": "套口进洪闸",
-        "text2": "套口-2孔"
+        "text2": "右岸西南楼顶"
     },
     {
         "special": "0",
         "type": 5,
-        "longitude": 113.792557,
-        "latitude": 29.93492,
-        "name": "套口-观看左上游翼墙水尺",
-        "namePri": "TK_D61",
+        "longitude": 113.78727,
+        "latitude": 29.9350319,
+        "name": "TK_8孔",
+        "namePri": "TK_8号",
         "text1": "套口进洪闸",
-        "text2": "套口-观看左上游翼墙水尺"
+        "text2": "8号"
     }
 ]

+ 6 - 6
ProjectSettings/QualitySettings.asset

@@ -4,7 +4,7 @@
 QualitySettings:
   m_ObjectHideFlags: 0
   serializedVersion: 5
-  m_CurrentQuality: 3
+  m_CurrentQuality: 1
   m_QualitySettings:
   - serializedVersion: 2
     name: Very Low
@@ -229,7 +229,7 @@ QualitySettings:
     customRenderPipeline: {fileID: 0}
     excludedTargetPlatforms: []
   m_PerPlatformDefaultQuality:
-    Android: 2
+    Android: 1
     EmbeddedLinux: 5
     GameCoreScarlett: 5
     GameCoreXboxOne: 5
@@ -238,11 +238,11 @@ QualitySettings:
     Nintendo Switch: 5
     PS4: 5
     PS5: 5
-    Server: 5
+    Server: 1
     Stadia: 5
-    Standalone: 5
-    WebGL: 3
-    Windows Store Apps: 5
+    Standalone: 1
+    WebGL: 1
+    Windows Store Apps: 1
     XboxOne: 5
     iPhone: 2
     tvOS: 2

部分文件因文件數量過多而無法顯示