Browse Source

修复补元摄像头点位的问题

wartheking 1 month ago
parent
commit
3da4d85eae
2 changed files with 133 additions and 18 deletions
  1. 1 6
      Assets/Scripts/HttpHelper.cs
  2. 132 12
      Assets/StreamingAssets/layerUnitDatas.json

+ 1 - 6
Assets/Scripts/HttpHelper.cs

@@ -479,13 +479,8 @@ public class HttpHelper : MonoBehaviour
         {
             if (GlobalData.layerUnitDatas[i].type == LayerUnitType.JK)
             {
-                try
-                {
+                if(!GlobalData.obsCameraLib.ContainsKey(GlobalData.layerUnitDatas[i].name))
                     GlobalData.obsCameraLib.Add(GlobalData.layerUnitDatas[i].name, GlobalData.layerUnitDatas[i].namePri);
-                }
-                catch (Exception e) {
-                    GlobalData.obsCameraLib.Add(GlobalData.layerUnitDatas[i].name + "_Plus", GlobalData.layerUnitDatas[i].namePri);
-                }
             }
         }
     }

+ 132 - 12
Assets/StreamingAssets/layerUnitDatas.json

@@ -444,7 +444,17 @@
         "type": 5,
         "longitude": 113.909279,
         "latitude": 30.1759586,
-        "name": "8号闸",
+        "name": "8号闸(球)",
+        "namePri": "BY_D6",
+        "text1": "补元退洪闸",
+        "text2": "8号闸"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.909279,
+        "latitude": 30.1759586,
+        "name": "8号闸(固定)",
         "namePri": "BY_D6",
         "text1": "补元退洪闸",
         "text2": "8号闸"
@@ -454,17 +464,37 @@
         "type": 5,
         "longitude": 113.909515,
         "latitude": 30.17622,
-        "name": "14号闸",
+        "name": "14号闸(球)",
         "namePri": "BY_D7",
         "text1": "补元退洪闸",
         "text2": "14号闸"
     },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.909515,
+        "latitude": 30.17622,
+        "name": "14号闸(固定)",
+        "namePri": "BY_D7",
+        "text1": "补元退洪闸",
+        "text2": "14号闸"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.909615,
+        "latitude": 30.176281,
+        "name": "10号闸(球)",
+        "namePri": "BY_D8",
+        "text1": "补元退洪闸",
+        "text2": "10号闸"
+    },
     {
         "special": "0",
         "type": 5,
         "longitude": 113.909615,
         "latitude": 30.176281,
-        "name": "10号闸",
+        "name": "10号闸(固定)",
         "namePri": "BY_D8",
         "text1": "补元退洪闸",
         "text2": "10号闸"
@@ -474,7 +504,17 @@
         "type": 5,
         "longitude": 113.909721,
         "latitude": 30.1763515,
-        "name": "3号闸",
+        "name": "3号闸(球)",
+        "namePri": "BY_D9",
+        "text1": "补元退洪闸",
+        "text2": "3号闸"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.909721,
+        "latitude": 30.1763515,
+        "name": "3号闸(固定)",
         "namePri": "BY_D9",
         "text1": "补元退洪闸",
         "text2": "3号闸"
@@ -484,17 +524,37 @@
         "type": 5,
         "longitude": 113.909828,
         "latitude": 30.1764164,
-        "name": "11号闸",
+        "name": "11号闸(球)",
         "namePri": "BY_D10",
         "text1": "补元退洪闸",
         "text2": "11号闸"
     },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.909828,
+        "latitude": 30.1764164,
+        "name": "11号闸(固定)",
+        "namePri": "BY_D10",
+        "text1": "补元退洪闸",
+        "text2": "11号闸"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.909935,
+        "latitude": 30.1764832,
+        "name": "9号闸(球)",
+        "namePri": "BY_D11",
+        "text1": "补元退洪闸",
+        "text2": "9号闸"
+    },
     {
         "special": "0",
         "type": 5,
         "longitude": 113.909935,
         "latitude": 30.1764832,
-        "name": "9号闸",
+        "name": "9号闸(固定)",
         "namePri": "BY_D11",
         "text1": "补元退洪闸",
         "text2": "9号闸"
@@ -504,7 +564,17 @@
         "type": 5,
         "longitude": 113.910042,
         "latitude": 30.1765461,
-        "name": "12号闸",
+        "name": "12号闸(球)",
+        "namePri": "BY_D12",
+        "text1": "补元退洪闸",
+        "text2": "12号闸"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.910042,
+        "latitude": 30.1765461,
+        "name": "12号闸(固定)",
         "namePri": "BY_D12",
         "text1": "补元退洪闸",
         "text2": "12号闸"
@@ -554,7 +624,17 @@
         "type": 5,
         "longitude": 113.910561,
         "latitude": 30.1768761,
-        "name": "7号闸",
+        "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号闸"
@@ -574,7 +654,17 @@
         "type": 5,
         "longitude": 113.910767,
         "latitude": 30.1770077,
-        "name": "6号闸",
+        "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号闸"
@@ -584,7 +674,17 @@
         "type": 5,
         "longitude": 113.910858,
         "latitude": 30.177063,
-        "name": "5号闸",
+        "name": "5号闸(球)",
+        "namePri": "BY_D20",
+        "text1": "补元退洪闸",
+        "text2": "5号闸"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.910858,
+        "latitude": 30.177063,
+        "name": "5号闸(固定)",
         "namePri": "BY_D20",
         "text1": "补元退洪闸",
         "text2": "5号闸"
@@ -624,17 +724,37 @@
         "type": 5,
         "longitude": 113.910919,
         "latitude": 30.17703,
-        "name": "13号闸",
+        "name": "13号闸(球)",
         "namePri": "BY_D24",
         "text1": "补元退洪闸",
         "text2": "13号闸"
     },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.910919,
+        "latitude": 30.17703,
+        "name": "13号闸(固定)",
+        "namePri": "BY_D24",
+        "text1": "补元退洪闸",
+        "text2": "13号闸"
+    },
+    {
+        "special": "0",
+        "type": 5,
+        "longitude": 113.909454,
+        "latitude": 30.1761265,
+        "name": "1号闸(球)",
+        "namePri": "BY_D25",
+        "text1": "补元退洪闸",
+        "text2": "1号闸"
+    },
     {
         "special": "0",
         "type": 5,
         "longitude": 113.909454,
         "latitude": 30.1761265,
-        "name": "1号闸",
+        "name": "1号闸(固定)",
         "namePri": "BY_D25",
         "text1": "补元退洪闸",
         "text2": "1号闸"