1

Assets/Art/UI/YZT/B01/B01Work.spriteatlas

@@ -58,6 +58,7 @@ SpriteAtlas:
   - {fileID: 21300000, guid: 789c3b795df4fd444a61f54278f5e2ec, type: 3}
   - {fileID: 21300000, guid: 6658116ae762d2c4db44e4bd76d918cc, type: 3}
   - {fileID: 21300000, guid: be314b6acae6d9d40abc09c87d4d8497, type: 3}
+  - {fileID: 21300000, guid: aad28d7ab76ec294786ef7c28b089cde, type: 3}
   - {fileID: 21300000, guid: 0142685deda27be4086f47bcbb600cdb, type: 3}
   - {fileID: 21300000, guid: d2d56d2e6dc8c34418df4d8878f9572a, type: 3}
   - {fileID: 21300000, guid: 5417d0dea0272d447b8bcc5b13d8c3d8, type: 3}
@@ -69,6 +70,7 @@ SpriteAtlas:
   - by
   - xtk
   - ntg
+  - yaokougedi
   - aqq
   - njh
   - dsh

Assets/Art/UI/YZT/B01/work/yaokougedi.jpg.meta

@@ -0,0 +1,159 @@
+fileFormatVersion: 2
+guid: aad28d7ab76ec294786ef7c28b089cde
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 512
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 80
+    crunchedCompression: 1
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Windows Store Apps
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/UI/Item0.prefab

@@ -142,6 +142,8 @@ MonoBehaviour:
   - {fileID: 21300000, guid: e85de0e72e3d91d45b19bc164d147b49, type: 3}
   - {fileID: 21300000, guid: 739e5508daecc0c4ca1d9aa79b9b9e2b, type: 3}
   - {fileID: 21300000, guid: cc0b7462632e25348bc7c20ddc2ae8f9, type: 3}
+  - {fileID: 21300000, guid: aad28d7ab76ec294786ef7c28b089cde, type: 3}
+  mSpecial: 
 --- !u!1 &2155801003145367756
 GameObject:
   m_ObjectHideFlags: 0

Assets/Prefabs/UI/XHYZT/GCJK.prefab

@@ -3668,7 +3668,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: -503.63, y: 64}
+  m_AnchoredPosition: {x: -503.63, y: 114.9}
   m_SizeDelta: {x: 127.0559, y: 39.4166}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3842554512023480712
@@ -10191,7 +10191,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &1132827219479338585
 RectTransform:
   m_ObjectHideFlags: 0

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

@@ -51,9 +51,12 @@ public class Item0 : MonoBehaviour, IPointerDownHandler, IPointerUpHandler
                 case "YaoKou":
                     pic.GetComponent<Image>().sprite = images[2];
                     break;
-                case "GeTi":
+                case "ZhuGeDi":
                     pic.GetComponent<Image>().sprite = images[3];
                     break;
+                case "YaoKouGeDi":
+                    pic.GetComponent<Image>().sprite = images[4];
+                    break;
             }
 
         }

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

@@ -792,15 +792,18 @@ public class YZTLayer : YZTRootLayer
                     if ((int)tempDatas[j].type == layerDatas[i].layerID)
                     {
                         int tempJ = j;
+                       
                         SecLayerBtn secLayerBtn = Instantiate(secLayerBtnPrefab);
                         secLayerBtn.SetLayerBtnData(tempDatas[j].name);
                         secLayerBtn.GetComponent<RectTransform>().SetParent(layerBtn.secContent.GetComponent<RectTransform>());
                         secLayerBtn.btn.onClick.AddListener(() =>
                         {
+
                             CameraManager.SwitchCamera(0);
                             viewMode = ViewMode.normal;
                             StaticLod.instance.OnFoucusStatic(tempDatas[tempJ].namePri);
                             yZT.gameObject.SetActive(true);
+                            
                             ChangeRightContent(tempJ);
                             pointParent.gameObject.SetActive(false);
                             clearBtn.gameObject.SetActive(false);
@@ -836,22 +839,28 @@ public class YZTLayer : YZTRootLayer
 
     void ChangeRightContent(int index)
     {
+        int newIndex = index;
+        if (newIndex > 120)
+        {
+            newIndex = newIndex - 58;
+        }
+
         for (int i = 0; i < infoRight.childCount; i++)
         {
             infoRight.GetChild(i).gameObject.SetActive(false);
         }
-        infoRight.GetChild(index).gameObject.SetActive(true);
+        infoRight.GetChild(newIndex).gameObject.SetActive(true);
 
         GameObject title;
         GameObject text1;
-        if (infoRight.GetChild(index).GetComponentInChildren<ScrollRect>() != null)
+        if (infoRight.GetChild(newIndex).GetComponentInChildren<ScrollRect>() != null)
         {
-            title = infoRight.GetChild(index).GetChild(0).GetChild(0).GetChild(0).GetChild(0).GetChild(1).gameObject;
-            text1 = infoRight.GetChild(index).GetChild(0).GetChild(0).GetChild(0).GetChild(0).GetChild(2).gameObject;
+            title = infoRight.GetChild(newIndex).GetChild(0).GetChild(0).GetChild(0).GetChild(0).GetChild(1).gameObject;
+            text1 = infoRight.GetChild(newIndex).GetChild(0).GetChild(0).GetChild(0).GetChild(0).GetChild(2).gameObject;
         }
         else {
-            title = infoRight.GetChild(index).GetChild(0).GetChild(1).gameObject;
-            text1 = infoRight.GetChild(index).GetChild(0).GetChild(2).gameObject;
+            title = infoRight.GetChild(newIndex).GetChild(0).GetChild(1).gameObject;
+            text1 = infoRight.GetChild(newIndex).GetChild(0).GetChild(2).gameObject;
         }
 
         
@@ -864,9 +873,9 @@ public class YZTLayer : YZTRootLayer
         {
             text1.GetComponent<Text>().text = GlobalData.layerUnitDatas[index].text1;
         }
-        if (infoRight.GetChild(index).GetChild(0).childCount > 3)
+        if (infoRight.GetChild(newIndex).GetChild(0).childCount > 3)
         {
-            GameObject text2 = infoRight.GetChild(index).GetChild(0).GetChild(3).gameObject;
+            GameObject text2 = infoRight.GetChild(newIndex).GetChild(0).GetChild(3).gameObject;
             if (text2 != null)
             {
                 text2.GetComponent<Text>().text = GlobalData.layerUnitDatas[index].text2;
@@ -897,7 +906,7 @@ public class YZTLayer : YZTRootLayer
             newPoint.bingObj.transform.localPosition = tempLocalPosition;
             newPoint.bingObj.name = temp.name;
 
-            if ((int)temp.type == 6 || (int)temp.type == 7)
+            if ((int)temp.type == 6 || (int)temp.type == 7 || (int)temp.type == 9)
             {
                 int index = FindIndexByLayerUnitName(temp.name);
 
@@ -928,9 +937,9 @@ public class YZTLayer : YZTRootLayer
                 item0s[i].GetComponent<RectTransform>().SetParent(item0Parent.transform);
         }
 
-        Item0 item1 = Instantiate(item0Prefab, Vector3.zero, Quaternion.identity);
-        item1.GetComponent<RectTransform>().SetParent(item0Parent.transform);
-        item1.InitPoint(hotPointSprite[7], "GeTi", "隔堤", "1");
+        //Item0 item1 = Instantiate(item0Prefab, Vector3.zero, Quaternion.identity);
+        //item1.GetComponent<RectTransform>().SetParent(item0Parent.transform);
+        //item1.InitPoint(hotPointSprite[7], "GeTi", "隔堤", "1");
 
         RunTimeLayerClick(0);
         RunTimeLayerClick(1);
@@ -940,6 +949,7 @@ public class YZTLayer : YZTRootLayer
         RunTimeLayerClick(5);
         RunTimeLayerClick(6);
         RunTimeLayerClick(8);
+        RunTimeLayerClick(9);
         BaseLayer0BtnOnClick(true);
     }
 
@@ -968,10 +978,10 @@ public class YZTLayer : YZTRootLayer
         {
             newName = "套口(闸上)";
         }
-        //Debug.Log(newName);
+        Debug.Log(newName);
         for (int i = 0; i < GlobalData.swDatas.Count; i++)
         {
-            //Debug.Log(GlobalData.swDatas[i].stnm);
+            Debug.Log(GlobalData.swDatas[i].stnm);
             if (GlobalData.swDatas[i].stnm.Trim() == newName.Trim())
             {
                 return i;

Assets/StreamingAssets/hotPoints.json

@@ -481,6 +481,34 @@
         "name": "套口进洪闸",
         "namePri": "",
         "type": 4
+    },
+     {
+        "latitude": "30.299167",
+        "longitude": "112.27111",
+        "name": "沙市",
+        "namePri": "",
+        "type": 4
+    },
+     {
+        "latitude": "30.578000",
+        "longitude": "114.29289",
+        "name": "汉口",
+        "namePri": "",
+        "type": 4
+    },
+     {
+        "latitude": "30.578000",
+        "longitude": "114.29289",
+        "name": "汉口",
+        "namePri": "",
+        "type": 4
+    },
+       {
+        "latitude": "29.414444",
+        "longitude": "113.124167",
+        "name": "城陵矶(七里山)",
+        "namePri": "",
+        "type": 4
     },
     {
 
@@ -496,5 +524,26 @@
         "latitude": 30.0465374,
         "name": "大同湖农场",
         "namePri": "DaTongHuNC"
+    },
+    {
+        "type": 9,
+        "longitude": 113.5989162,
+        "latitude": 30.08265,
+        "name": "主隔堤",
+        "namePri": "ZhuGeDi"
+    },
+    {
+        "type": 9,
+        "longitude": 113.490836,
+        "latitude": 29.991310,
+        "name": "腰口隔堤",
+        "namePri": "YaoKouGeDi"
+    },
+    {
+        "type": 9,
+        "longitude": 113.686790,
+        "latitude": 29.975433,
+        "name": "长江干堤",
+        "namePri": "ChangJiangGanDi"
     }
 ]

Assets/StreamingAssets/layerUnitDatas.json

@@ -1268,5 +1268,35 @@
         "namePri": "TK_8号",
         "text1": "套口进洪闸",
         "text2": "8号"
+    }, 
+    {
+        "special": "1",
+        "type": 6,
+        "longitude": 113.78727,
+        "latitude": 29.9350319,
+        "name": "主隔堤",
+        "namePri": "ZhuGeDi",
+        "text1": "洪湖主隔堤是长江中游防洪体系的核心工程，横跨洪湖市与监利市，全长64.82公里，按1级堤防标准建设，与东荆河堤、长江干堤共同构成洪湖分蓄洪区封闭圈，设计蓄洪容积61亿立方米。当前工程重点包括围堤达标加固（52.32公里未达标段，投资5000万元）和防汛道路建设（整体工程投资44.43亿元），2024年启动的沙螺闸拆除重建（EPC标段4200万元）预计2026年完工。",
+        "text2": "8号"
+    },
+    {
+        "special": "1",
+        "type": 6,
+        "longitude": 113.78727,
+        "latitude": 29.9350319,
+        "name": "腰口隔堤",
+        "namePri": "YaoKouGeDi",
+        "text1": "腰口隔堤位于洪湖市东部，是洪湖东分块蓄洪工程的控制性工程之一，全长约25.574公里，需填筑土方约1500万立方米，主要功能是与其他堤防（如洪湖长江干堤、东荆河堤）形成封闭蓄洪区。‌该堤单体投资约13亿元，所属工程总投资44.43亿元（或约48亿元），建成后将形成蓄洪区面积877平方公里、容积61亿立方米，作为保障荆江大堤、江汉平原及武汉市防洪安全的最后防线。‌",
+        "text2": "8号"
+    },
+    {
+        "special": "1",
+        "type": 6,
+        "longitude": 113.78727,
+        "latitude": 29.9350319,
+        "name": "长江干堤",
+        "namePri": "ChangJiangGanDi",
+        "text1": "长江干堤是长江防洪体系的核心工程，全线总长超41万公里，按1级或2级堤防标准建设，设计防洪标准为50-100年一遇，典型段如荆江大堤（230公里）、无为大堤（125公里）等。1998年特大洪水后，国家投入282亿元加固3576公里干堤，堤顶宽度增至5-14米，采用梯形断面（临水坡1:3，背水坡1:4）及混凝土护坡等技术，防洪能力提升至百年一遇。",
+        "text2": "8号"
     }
 ]