修改若干bug

Assets/Art/UI/YZT/buliding.png.meta

@@ -0,0 +1,123 @@
+fileFormatVersion: 2
+guid: 961a6178a8634e8469a91626d2ec3d2a
+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: 256
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 80
+    crunchedCompression: 1
+    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: WebGL
+    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/XHYZT/SWYJ.prefab

@@ -8038,7 +8038,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: '- <size=14><color=#A5BBE2>mm</color></size>'
+  m_Text: '- <size=14><color=#A5BBE2>m</color></size>'
 --- !u!1 &3003835271752930421
 GameObject:
   m_ObjectHideFlags: 0
@@ -9709,7 +9709,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: '- <size=14><color=#A5BBE2>mm</color></size>'
+  m_Text: '- <size=14><color=#A5BBE2>m</color></size>'
 --- !u!1 &3678014219504541650
 GameObject:
   m_ObjectHideFlags: 0
@@ -10957,7 +10957,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: '- <size=14><color=#A5BBE2>mm</color></size>'
+  m_Text: '- <size=14><color=#A5BBE2>m</color></size>'
 --- !u!1 &4205337505787412431
 GameObject:
   m_ObjectHideFlags: 0
@@ -14358,7 +14358,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: '- <size=14><color=#A5BBE2>mm</color></size>'
+  m_Text: '- <size=14><color=#A5BBE2>m</color></size>'
 --- !u!1 &5342896170822683227
 GameObject:
   m_ObjectHideFlags: 0
@@ -24514,7 +24514,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: '- <size=14><color=#A5BBE2>mm</color></size>'
+  m_Text: '- <size=14><color=#A5BBE2>m</color></size>'
 --- !u!1 &8394886352278913305
 GameObject:
   m_ObjectHideFlags: 0
@@ -25942,7 +25942,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 1
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: '- <size=14><color=#A5BBE2>mm</color></size>'
+  m_Text: '- <size=14><color=#A5BBE2>m</color></size>'
 --- !u!1 &8780719615516837624
 GameObject:
   m_ObjectHideFlags: 0

Assets/Prefabs/UI/XHYZT/XHDD.prefab

@@ -13021,8 +13021,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 76, y: 0}
-  m_SizeDelta: {x: 56, y: 19}
+  m_AnchoredPosition: {x: 77.76896, y: 0}
+  m_SizeDelta: {x: 75.538, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2010706027771433926
 CanvasRenderer:

Assets/Scripts/UI/Item/ShuiWeiIconCtrl.cs

@@ -23,7 +23,11 @@ public class ShuiWeiIconCtrl : MonoBehaviour
         rect.anchoredPosition = new Vector2(2000, 0);
         
         valueText = this.transform.Find("valueText").GetComponent<Text>();
-        valueText.text = $"{data.value} <size=12><color=FFFFFF>mm</color></size>";
+        float fixValue = data.value;
+        if (fixValue > 1000) {
+            fixValue = fixValue / 100.0f;
+        }
+        valueText.text = $"{fixValue.ToString("0.00")} <size=12><color=FFFFFF>m</color></size>";
         histroyButton = this.transform.Find("histroyButton").GetComponent<Button>();
         histroyButton.onClick.RemoveAllListeners();
         histroyButton.onClick.AddListener(() =>

Assets/Scripts/UI/UIView/SWYJ/SWYJLayer.cs

@@ -472,7 +472,7 @@ public class StationData:IComparable
             for (int i = 0; i < zdpmObjs.Length; i++) {
                 zdpmObjs[i].transform.GetChild(1).GetComponent<Text>().text = stationDatas[i].STNM;
                 float max = MathF.Max(stationDatas[i].upz, stationDatas[i].dwz);
-                zdpmObjs[i].transform.GetChild(1).GetChild(0).GetComponent<Text>().text = $"{max} <size=14><color=#A5BBE2>mm</color></size>";
+                zdpmObjs[i].transform.GetChild(1).GetChild(0).GetComponent<Text>().text = $"{max} <size=14><color=#A5BBE2>m</color></size>";
             }
         }
         else

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

@@ -34,8 +34,12 @@ public class OnePicNav : MonoBehaviour
     public GameObject bingMapItemCol;
 
     public int lastIndex = -99;
+
+    public Toggle pointToggle;
     // Start is called before the first frame update
 
+    public bool showMapItem = true;
+
     void Start()
     {
         instance = this;
@@ -54,7 +58,11 @@ public class OnePicNav : MonoBehaviour
         for (int i = 0; i < bts.Length; i++) {
             btns.Add(bts[i]);
         }
+        pointToggle.onValueChanged.AddListener((bool active) =>
+        {
 
+            showMapItem = active;
+        });
         layers = new List<RectTransform>();
         for (int i = 0; i < content.transform.childCount; i++) {
             layers.Add(content.transform.GetChild(i).GetComponent<RectTransform>());
@@ -141,16 +149,25 @@ public class OnePicNav : MonoBehaviour
         {
             if (CameraManager.instance.mainCamera.enabled)
             {
-                bingMapItemCol.gameObject.SetActive(true);
-                bingMapItemCol.GetComponent<CanvasGroup>().alpha = Mathf.Lerp(0, 1, Mathf.Abs(CameraManager.instance.mainCamera.transform.position.y - 3200)/600.0f);
+                pointToggle.gameObject.SetActive(true);
+                if (showMapItem)
+                {
+                    bingMapItemCol.gameObject.SetActive(true);
+                    bingMapItemCol.GetComponent<CanvasGroup>().alpha = Mathf.Lerp(0, 1, Mathf.Abs(CameraManager.instance.mainCamera.transform.position.y - 3200) / 600.0f);
+                }
+                else {
+                    bingMapItemCol.gameObject.SetActive(false);
+                }
             }
             else {
                 bingMapItemCol.gameObject.SetActive(false);
+                pointToggle.gameObject.SetActive(false);
             }
 
         }
         else {
             bingMapItemCol.gameObject.SetActive(false);
+            pointToggle.gameObject.SetActive(false);
         }
         
     }

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

@@ -7,7 +7,7 @@ using UnityEngine.EventSystems;
 using UnityEngine.UI;
 
 
-public class RuntimePoint : MonoBehaviour, IPointerDownHandler, IPointerUpHandler
+public class RuntimePoint : MonoBehaviour, IPointerDownHandler, IPointerUpHandler,IPointerEnterHandler,IPointerExitHandler
 {
     public string[] childBtnNames = new string[] {
         "ÊÓƵ¼à¿Ø",
@@ -46,6 +46,8 @@ public class RuntimePoint : MonoBehaviour, IPointerDownHandler, IPointerUpHandle
     public float lastTime;
 
     public RectTransform addContent;
+
+    bool isOver;
     void Awake() {
        
       //  arrow.DOLocalMoveY(-40, 1.0f).SetLoops(-1, LoopType.Yoyo);
@@ -86,8 +88,6 @@ public class RuntimePoint : MonoBehaviour, IPointerDownHandler, IPointerUpHandle
         //});
     }
     public void Refresh(Sprite newIcon) {
-        Debug.Log(newIcon);
-        Debug.Log(bingObj.name);
         icon.sprite = newIcon;
     }
     public void InitPoint(Sprite newIcon, string name_pri, string newText) {
@@ -101,15 +101,28 @@ public class RuntimePoint : MonoBehaviour, IPointerDownHandler, IPointerUpHandle
     // Update is called once per frame
     void LateUpdate()
     {
-        this.GetComponent<RectTransform>().anchoredPosition = CameraManager.instance.secondCamera.WorldToScreenPoint(bingObj.transform.position) * 1920.0f / Screen.width;
-
-        float bi = CameraManager.instance.secondCamera.GetComponent<CameraBirdSec>().currentDistance / 20;
-        bi = (float)Math.Clamp(bi, 0.3, 1);
-        this.GetComponent<RectTransform>().localScale = Vector3.one / bi;
+        if (CameraManager.instance.secondCamera.enabled)
+        {
+            this.GetComponent<RectTransform>().anchoredPosition = CameraManager.instance.secondCamera.WorldToScreenPoint(bingObj.transform.position) * 1920.0f / Screen.width;
+            float bi = CameraManager.instance.secondCamera.GetComponent<CameraBirdSec>().currentDistance / 20;
+            bi = (float)Math.Clamp(bi, 0.3, 1);
+            this.GetComponent<RectTransform>().localScale = Vector3.one / bi;
+            if (CameraManager.instance.secondCamera.transform.position.z > -625)
+            {
+                text.gameObject.SetActive(true);
+            }
+            else {
+                if(isOver)
+                    text.gameObject.SetActive(true);
+                else
+                    text.gameObject.SetActive(false);
+            }
+        }
     }
 
     public void OnPointerDown(PointerEventData eventData)
     {
+
         if (eventData.button == PointerEventData.InputButton.Left)
         {
             lastTime = Time.time;
@@ -118,6 +131,7 @@ public class RuntimePoint : MonoBehaviour, IPointerDownHandler, IPointerUpHandle
 
     public void OnPointerUp(PointerEventData eventData)
     {
+
         if (eventData.button == PointerEventData.InputButton.Left)
         {
             if (Time.time - lastTime < 0.5f)
@@ -128,7 +142,15 @@ public class RuntimePoint : MonoBehaviour, IPointerDownHandler, IPointerUpHandle
         }
     }
 
-    
+    public void OnPointerEnter(UnityEngine.EventSystems.PointerEventData eventData)
+    {
+        isOver = true;
+    }
+
+    public void OnPointerExit(UnityEngine.EventSystems.PointerEventData eventData)
+    {
+        isOver = false;
+    }
+
 
-   
 }

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

@@ -762,7 +762,7 @@ public class YZTLayer : YZTRootLayer
         List<Item0> item0s = new List<Item0>();
         for (int i = 0; i < GlobalData.hotPointDatas.Count; i++)
         {
-
+            //if()
             HotPointData temp = GlobalData.hotPointDatas[i];
             Vector3 tempLocalPosition = CoordinateConverter.GeoToUGUISmall(temp.longitude, temp.latitude);
 

Assets/StreamingAssets/layerUnitDatas.json

@@ -30,7 +30,7 @@
         "text2": ""
     },
     {
-        "special": "1",
+        "special": "0",
         "type": 2,
         "longitude": 113.618912,
         "latitude": 29.91808,

Assets/WaterRangeCtrlTool.cs

@@ -32,7 +32,7 @@ public class WaterRangeCtrlTool : MonoBehaviour
             //FxObjects[i].SetActive(true);
         }
         waterRangeMat = this.transform.Find("NeiHe_FenQu").GetComponent<MeshRenderer>().material;
-        //hemian = this.transform.Find("HeMianTrans"); 
+        hemian = this.transform.Find("HeMianTrans"); 
         ChangeWaterCurve(0);
     }
 

Assets/WaterRangeCtrl_UI.cs

@@ -54,7 +54,7 @@ public class WaterRangeCtrl_UI : MonoBehaviour
     {
         rangeSlider.UseLerping = false;
         rangeSlider.value = 0;
-        playT = rangeSlider.DOValue(1.0f, 4.0f);
+        playT = rangeSlider.DOValue(1.0f, 16.0f);
     }
 
     public void CanCelTween()