Pārlūkot izejas kodu

提交首页修改

wartheking 9 mēneši atpakaļ
vecāks
revīzija
f87edb1031

+ 1 - 1
Assets/Art/Material/Buildings/WaterPlane 3.mat

@@ -67,7 +67,7 @@ Material:
     m_Ints: []
     m_Floats:
     - _BumpScale: 1
-    - _ClipLength: 0.09
+    - _ClipLength: 0.891
     - _ClipOffset: -0.01
     - _Cutoff: 0.5
     - _Depth: 25

+ 38 - 6
Assets/Prefabs/MiniMap.prefab

@@ -63,7 +63,7 @@ Transform:
   - {fileID: 1060248767511300627}
   - {fileID: 970675355}
   m_Father: {fileID: 7069582396450853087}
-  m_RootOrder: 5
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &788774413769781883
 GameObject:
@@ -94,7 +94,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7069582396450853087}
-  m_RootOrder: 4
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &4444992682839687692
 GameObject:
@@ -125,6 +125,37 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7069582396450853087}
+  m_RootOrder: 8
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &5076499884380538670
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7761969530541602814}
+  m_Layer: 0
+  m_Name: HotPoint
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7761969530541602814
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5076499884380538670}
+  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: 7069582396450853087}
   m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &5608233843928584891
@@ -137,7 +168,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1829979977482383576}
   m_Layer: 0
-  m_Name: SWPoint
+  m_Name: SWHPoint
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -156,7 +187,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7069582396450853087}
-  m_RootOrder: 8
+  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &6012870164663179780
 GameObject:
@@ -270,10 +301,11 @@ Transform:
   - {fileID: 7069582396136518861}
   - {fileID: 7069582397022505400}
   - {fileID: 7069582396837082649}
-  - {fileID: 5026639989605541792}
   - {fileID: 1644283074}
-  - {fileID: 7963525554212561013}
+  - {fileID: 5026639989605541792}
+  - {fileID: 7761969530541602814}
   - {fileID: 4541662238408593204}
+  - {fileID: 7963525554212561013}
   - {fileID: 1829979977482383576}
   m_Father: {fileID: 0}
   m_RootOrder: 0

+ 24 - 25
Assets/Prefabs/UI/RuntimePoint.prefab

@@ -33,10 +33,10 @@ RectTransform:
   m_Father: {fileID: 5500973439967830541}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 82.2, y: 16.2}
-  m_SizeDelta: {x: 192, y: 44}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0.000011444092}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5129149198430233966
 CanvasRenderer:
@@ -85,7 +85,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 325, y: -657.3}
-  m_SizeDelta: {x: 100, y: 100}
+  m_SizeDelta: {x: 100, y: 20}
   m_Pivot: {x: 0.5, y: 0.02}
 --- !u!222 &2742062590507750192
 CanvasRenderer:
@@ -108,7 +108,6 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   btn: {fileID: 7400851106940013810}
-  textBase: {fileID: 0}
   text: {fileID: 7010783671127523822}
   icon: {fileID: 2538998181460178410}
   staticImp: {fileID: 0}
@@ -149,10 +148,10 @@ RectTransform:
   m_Father: {fileID: 5500973439967830541}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 74.100006, y: 16.199997}
-  m_SizeDelta: {x: 208.2, y: 44}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &12618646476312084
 CanvasRenderer:
@@ -175,7 +174,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0.003921569}
+  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
@@ -232,7 +231,7 @@ MonoBehaviour:
     m_SelectedTrigger: Selected
     m_DisabledTrigger: Disabled
   m_Interactable: 1
-  m_TargetGraphic: {fileID: 0}
+  m_TargetGraphic: {fileID: 2194890910764625470}
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
@@ -269,10 +268,10 @@ RectTransform:
   m_Father: {fileID: 4440589227558712183}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 16.0408, y: -0.000015259}
-  m_SizeDelta: {x: 159.9185, y: 44}
+  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_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7260287978442146811
 CanvasRenderer:
@@ -304,12 +303,12 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: 85c13d115126ca04ca985ec0156f4c61, type: 3}
-    m_FontSize: 19
-    m_FontStyle: 1
+    m_FontSize: 12
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 1
     m_MaxSize: 40
-    m_Alignment: 4
+    m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
@@ -349,11 +348,11 @@ RectTransform:
   m_Father: {fileID: 5500973439967830541}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 14.7}
-  m_SizeDelta: {x: 50, y: 50}
-  m_Pivot: {x: 0.5, y: 0.5}
+  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_Pivot: {x: 0, y: 0.5}
 --- !u!222 &91661355561190510
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -382,7 +381,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 57b1506dec17a6649940295c591fc72d, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 746e27e955023874cb7cbdbd302cb234, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

+ 7 - 7
Assets/Prefabs/UI/XHYZT/YZT.prefab

@@ -15413,7 +15413,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &2009567783
 RectTransform:
   m_ObjectHideFlags: 0
@@ -30831,11 +30831,11 @@ RectTransform:
   - {fileID: 6128444265799189017}
   - {fileID: 2219529295966211585}
   m_Father: {fileID: 5761950834214704942}
-  m_RootOrder: 6
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 52.969, y: -117.9}
+  m_AnchoredPosition: {x: 52.969, y: -88.6}
   m_SizeDelta: {x: 80.5669, y: 27.077896}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8459548935811813087
@@ -35874,11 +35874,11 @@ RectTransform:
   - {fileID: 1241217872688458724}
   - {fileID: 5849789725576661015}
   m_Father: {fileID: 5761950834214704942}
-  m_RootOrder: 4
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 52.969017, y: -88.6}
+  m_AnchoredPosition: {x: 52.969017, y: -117.9}
   m_SizeDelta: {x: 80.5669, y: 27.077896}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2449784639014682826
@@ -37838,9 +37838,9 @@ RectTransform:
   - {fileID: 3574674953337552790}
   - {fileID: 3778334192029318784}
   - {fileID: 5410768465953825147}
-  - {fileID: 1817780416810868843}
-  - {fileID: 6914675354388108639}
   - {fileID: 3858303917006026590}
+  - {fileID: 6914675354388108639}
+  - {fileID: 1817780416810868843}
   - {fileID: 4591828172968153036}
   - {fileID: 5911367126512327796}
   - {fileID: 8961748112586758846}

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 10 - 107
Assets/Scene 1.unity


+ 50 - 0
Assets/Scripts/HttpHelper.cs

@@ -59,6 +59,7 @@ public class HttpHelper : MonoBehaviour
     public async Task InitYZTData() {
         await InitYZTData1();
         InitYZTData2();
+        InitYZTData3();
 
     }
     public async Task InitYZTData1()
@@ -179,6 +180,55 @@ public class HttpHelper : MonoBehaviour
 
     }
 
+    public async Task InitYZTData3()
+    {
+        bool successInternet = true;
+        UnityWebRequest requestData = UnityWebRequest.Get(ServerAddress.APIGetWaterHotPoint);
+        await requestData.SendWebRequest();
+        try
+        {
+            if (requestData.result != UnityWebRequest.Result.Success)
+            {
+                Debug.LogWarning("YZTLayer联网不成功,读本地缓存数据,原因:返request不成功");
+                successInternet = false;
+            }
+            else
+            {
+                JObject jsonObject = JObject.Parse(requestData.downloadHandler.text);
+
+                // 提取data字段的值
+                JToken dataToken = jsonObject["data"];
+                JToken codeToken = jsonObject["code"];
+                if (codeToken.ToString() == "200")
+                {
+                    GlobalData.hotPointDatas = JsonConvert.DeserializeObject<List<HotPointData>>(dataToken.ToString());
+                }
+                else
+                {
+                    Debug.LogWarning("YZTLayer联网不成功,读本地缓存数据,原因:返序列化失败");
+                    successInternet = false;
+                }
+            }
+        }
+        catch (Exception e)
+        {
+            successInternet = false;
+            Debug.LogWarning("YZTLayer联网不成功,读本地缓存数据,原因:" + e.ToString());
+        }
+        requestData.Dispose();
+        if (!successInternet)
+        {
+            WWW www = new WWW(Application.streamingAssetsPath + "/hotPoints.json.json");
+            await new UnityAsync.WaitUntil(() =>
+            {
+                return www.isDone;
+            });
+            GlobalData.hotPointDatas = JsonConvert.DeserializeObject<List<HotPointData>>(www.text);
+            www.Dispose();
+        }
+
+    }
+
     public async Task InitXHGKData()
     {
         bool successInternet = true;

+ 6 - 0
Assets/Scripts/UI/Data/GlobalData.cs

@@ -15,6 +15,12 @@ public class GlobalData
     /// </summary>
     public static List<LayerUnitData> layerUnitDatas = new List<LayerUnitData>();
 
+
+    /// <summary>
+    /// 一张图第一页热点数据
+    /// </summary>
+    public static List<HotPointData> hotPointDatas = new List<HotPointData>();
+
     /// <summary>
     /// 一张图第一页监控位置字典
     /// </summary>

+ 6 - 1
Assets/Scripts/UI/Tools/ServerAddress.cs

@@ -10,10 +10,15 @@ public class ServerAddress
     public static string ObsSeverM3U8Address = "http://111.4.141.191:18088";
     
     /// <summary>
-    /// 获取一张图所有数据
+    /// 获取一张图所有工程数据
     /// </summary>
     public static string APIGetWaterManagerProject = YZTServerAddress + "/get-water-management-projects";
 
+    /// <summary>
+    /// 获取一张图所有热点数据
+    /// </summary>
+    public static string APIGetWaterHotPoint = YZTServerAddress + "/get-hot-point-data";
+
     /// <summary>
     /// 获取蓄洪概况大事件所有数据
     /// </summary>

+ 3 - 3
Assets/Scripts/UI/UIView/GCJK/GCJKLayer.cs

@@ -457,7 +457,7 @@ public class GCJKLayer : YZTRootLayer
                     dropUnits.Add(dropUnit);
 
                     dropUnit.bingObj = Instantiate(runtimePointObj).gameObject;
-                    dropUnit.bingObj.transform.SetParent(shaPan.transform.GetChild(6));
+                    dropUnit.bingObj.transform.SetParent(shaPan.transform.GetChild(7));
                     dropUnit.bingObj.transform.localEulerAngles = Vector3.zero;
                     dropUnit.bingObj.transform.localScale = Vector3.one;
                     dropUnit.bingObj.transform.localPosition = CoordinateConverter.GeoToUGUISmall(GlobalData.qXZDatas[i].LGTD, GlobalData.qXZDatas[i].LTTD);
@@ -473,7 +473,7 @@ public class GCJKLayer : YZTRootLayer
                     dropUnits.Add(dropUnit);
 
                     dropUnit.bingObj = Instantiate(runtimePointObj).gameObject;
-                    dropUnit.bingObj.transform.SetParent(shaPan.transform.GetChild(7));
+                    dropUnit.bingObj.transform.SetParent(shaPan.transform.GetChild(8));
                     dropUnit.bingObj.transform.localEulerAngles = Vector3.zero;
                     dropUnit.bingObj.transform.localScale = Vector3.one;
                     dropUnit.bingObj.transform.localPosition = CoordinateConverter.GeoToUGUISmall(GlobalData.sWZDatas[i].LGTD, GlobalData.sWZDatas[i].LTTD);
@@ -501,7 +501,7 @@ public class GCJKLayer : YZTRootLayer
                     weatherUnits.Add(weatherUnit);
 
                     weatherUnit.bingObj = Instantiate(runtimePointObj).gameObject;
-                    weatherUnit.bingObj.transform.SetParent(shaPan.transform.GetChild(7));
+                    weatherUnit.bingObj.transform.SetParent(shaPan.transform.GetChild(8));
                     weatherUnit.bingObj.transform.localEulerAngles = Vector3.zero;
                     weatherUnit.bingObj.transform.localScale = Vector3.one;
                     weatherUnit.bingObj.transform.localPosition = CoordinateConverter.GeoToUGUISmall(GlobalData.sWZDatas[i].LGTD, GlobalData.sWZDatas[i].LTTD);

+ 1 - 1
Assets/Scripts/UI/UIView/SWYJ/SWYJLayer.cs

@@ -352,7 +352,7 @@ public class StationData:IComparable
                     sWHeightUnits.Add(swHUnit);
 
                     swHUnit.bingObj = Instantiate(runtimePointObj).gameObject;
-                    swHUnit.bingObj.transform.SetParent(shaPan.transform.GetChild(8));
+                    swHUnit.bingObj.transform.SetParent(shaPan.transform.GetChild(9));
                     swHUnit.bingObj.transform.localEulerAngles = Vector3.zero;
                     swHUnit.bingObj.transform.localScale = Vector3.one;
                     swHUnit.bingObj.transform.localPosition = CoordinateConverter.GeoToUGUISmall(GlobalData.swDatas[i].LGTD, GlobalData.swDatas[i].LTTD);

+ 3 - 3
Assets/Scripts/UI/UIView/YZT/OnePicNav.cs

@@ -40,9 +40,9 @@ public class OnePicNav : MonoBehaviour
     void InitButton() {
         shaPan = GameObject.FindGameObjectWithTag("ShaPan");
         Debug.Log(shaPan);
-        runtimePointStaticBind.Add(shaPan.transform.GetChild(5).GetChild(0));
-        runtimePointStaticBind.Add(shaPan.transform.GetChild(5).GetChild(1));
-        runtimePointStaticBind.Add(shaPan.transform.GetChild(5).GetChild(2));
+        runtimePointStaticBind.Add(shaPan.transform.GetChild(4).GetChild(0));
+        runtimePointStaticBind.Add(shaPan.transform.GetChild(4).GetChild(1));
+        runtimePointStaticBind.Add(shaPan.transform.GetChild(4).GetChild(2));
         CameraManager.SwitchCamera(1);
         btns = new List<Button>();
         Button[] bts = this.GetComponentsInChildren<Button>();

+ 4 - 1
Assets/Scripts/UI/UIView/YZT/RuntimePoint.cs

@@ -31,7 +31,8 @@ public class RuntimePoint : MonoBehaviour
 
     public void InitPoint(Sprite newIcon, string name_pri, string newText) {
         text.text = newText;
-        staticImp = StaticLod.instance.staticImportantsDic[name_pri];
+        if(name_pri.Trim().Length > 0)
+            staticImp = StaticLod.instance.staticImportantsDic[name_pri];
         icon.sprite = newIcon;
 
     }
@@ -40,6 +41,8 @@ public class RuntimePoint : MonoBehaviour
     void Update()
     {
         this.GetComponent<RectTransform>().anchoredPosition = CameraManager.instance.secondCamera.WorldToScreenPoint(bingObj.transform.position) * 1920.0f / Screen.width;
+
+        this.GetComponent<RectTransform>().localScale = Vector3.one / CameraManager.instance.secondCamera.GetComponent<CameraBirdSec>().currentDistance * 20;
     }
 
   

+ 27 - 16
Assets/Scripts/UI/UIView/YZT/YZTLayer.cs

@@ -41,11 +41,21 @@ public class LayerUnitData
     public string text2;
 }
 
+[System.Serializable]
+public class HotPointData
+{
+    public LayerUnitType type;
+    public float longitude;
+    public float latitude;
+    public string name;
+    public string name_pri;
+}
 
 public class YZTLayer : YZTRootLayer
 {
     public VerticalLayoutGroup content;
     public Sprite[] layerSprite;
+    public Sprite[] hotPointSprite;
     public LayerBtn layerBtnPrefab;
     public SecLayerBtn secLayerBtnPrefab;
 
@@ -92,8 +102,10 @@ public class YZTLayer : YZTRootLayer
         InitLeftBtn();
         InitLayerInfo();
         InitLayerBtns();
-        InitPoint();
         InitReturnBtn();
+        await InitPointData();
+        InitPoint();
+        
     }
 
     void InitLeftBtn() {
@@ -245,26 +257,16 @@ public class YZTLayer : YZTRootLayer
     void InitPoint()
     {
         GameObject shaPan = GameObject.FindGameObjectWithTag("ShaPan");
-        for (int i = 0; i < GlobalData.layerUnitDatas.Count; i++)
+        for (int i = 0; i < GlobalData.hotPointDatas.Count; i++)
         {
-            LayerUnitData temp = GlobalData.layerUnitDatas[i];
+            HotPointData temp = GlobalData.hotPointDatas[i];
             RuntimePoint newPoint = Instantiate(pointPrefab, Vector3.zero, Quaternion.identity);
-            if (temp.special) {
-                newPoint.layerIDs.Add(0);
-                newPoint.gameObject.SetActive(true);
-                newPoint.transform.localScale = Vector3.one * 0.8f;
-            }
-            else
-            {
-                newPoint.gameObject.SetActive(false);
-                newPoint.transform.localScale = Vector3.one * 0.4f;
-            }
             int tempI = i;
             newPoint.GetComponent<RectTransform>().SetParent(pointParent);
-            newPoint.InitPoint(layerSprite[(int)(temp.type)], temp.name_pri, temp.name);;
+            newPoint.InitPoint(hotPointSprite[(int)(temp.type)], temp.name_pri, temp.name);;
             newPoint.layerIDs.Add((int)(temp.type));
             newPoint.bingObj = Instantiate(runtimePointObj).gameObject;
-            newPoint.bingObj.transform.SetParent(shaPan.transform.GetChild(4));
+            newPoint.bingObj.transform.SetParent(shaPan.transform.GetChild(6));
             newPoint.bingObj.transform.localEulerAngles = Vector3.zero;
             newPoint.bingObj.transform.localScale = Vector3.one;
             newPoint.bingObj.transform.localPosition = CoordinateConverter.GeoToUGUISmall(temp.longitude, temp.latitude);
@@ -273,7 +275,8 @@ public class YZTLayer : YZTRootLayer
             {
                 CameraManager.SwitchCamera(0);
                 viewMode = ViewMode.normal;
-                StaticLod.instance.OnFoucusStatic(newPoint.staticImp);
+                if((int)temp.type >= 6)
+                    StaticLod.instance.OnFoucusStatic(newPoint.staticImp);
                 yZT.gameObject.SetActive(true);
                 ChangeRightContent(tempI);
                 middleContent.gameObject.SetActive(false);
@@ -290,6 +293,14 @@ public class YZTLayer : YZTRootLayer
         });
     }
 
+    async Task InitPointData()
+    {
+        await new WaitUntil(() =>
+        {
+            return GlobalData.hotPointDatas.Count > 0;
+        });
+    }
+
     void Init() {
         yZT.gameObject.SetActive(false);
         middleContent.gameObject.SetActive(true);

+ 632 - 0
Assets/StreamingAssets/hotPoints.json

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

+ 7 - 0
Assets/StreamingAssets/hotPoints.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 40eaf3a1bd78000498a54b6b1e12360b
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels