wartheking 7 місяців тому
батько
коміт
70d54a886e

+ 1 - 1
Assets/PathSign.cs

@@ -18,7 +18,7 @@ public class PathSign : MonoBehaviour
             float dyScale = 72 / CameraManager.instance.secondCamera.GetComponent<CameraBirdSec>().currentDistance;
             dyScale = math.clamp(dyScale, 1, 6);
             this.transform.localScale = new Vector3(dyScale, dyScale, dyScale);
-            if (!bindObj.activeSelf || !bindObj.transform.parent.gameObject.activeSelf)
+            if (!bindObj.activeSelf || !bindObj.transform.parent.gameObject.activeSelf || !bindObj.transform.parent.parent.gameObject.activeSelf)
             {
                 this.GetComponent<Image>().enabled = false;
             }

+ 1 - 1
Assets/Scripts/UI/UIView/RKZY/LinePath.cs

@@ -73,7 +73,7 @@ public class LinePath : MonoBehaviour
             if (!RKZYLayer.lineInfoStatic.linePaths.Contains(this))
             {
                 RKZYLayer.lineInfoStatic.SetData(this);
-                RKZYLayer.lineInfoStatic.GetComponent<RectTransform>().anchoredPosition = Input.mousePosition;
+                RKZYLayer.lineInfoStatic.GetComponent<RectTransform>().anchoredPosition = Input.mousePosition * 1920 / Screen.width;
                 RKZYLayer.lineInfoStatic.linePaths.Add(this);
                 //this.lineRenderer.GetComponent<MeshRenderer>().material = secMat;
             }

+ 3 - 3
Assets/Scripts/UI/UIView/RKZY/LinePathUnit.cs

@@ -41,7 +41,7 @@ public class LinePathUnit : MonoBehaviour
             angle = 360 - angle;
         }
         //print(angle);
-        float distance = Vector3.Distance(end, start);
+        float distance = Vector3.Distance(end, start) * 1.02f;
         this.transform.localScale = new Vector3(1, distance / 2, 1);
         this.transform.eulerAngles = new Vector3(1, 1, -angle);
 
@@ -58,8 +58,8 @@ public class LinePathUnit : MonoBehaviour
     {
         if (CameraManager.instance.secondCamera != null)
         {
-            float dyScale = CameraManager.instance.secondCamera.GetComponent<CameraBirdSec>().currentDistance / 12;
-            dyScale = math.clamp(dyScale, 1, 6);
+            float dyScale = CameraManager.instance.secondCamera.GetComponent<CameraBirdSec>().currentDistance / 14;
+            dyScale = math.clamp(dyScale, 0.5f, 5f);
             this.transform.localScale = new Vector3(dyScale, this.transform.localScale.y, dyScale);
             this.lineRenderer.GetComponent<MeshRenderer>().material.SetTextureScale("_MainTex", new Vector2(1, this.transform.localScale.y * 10 / this.transform.localScale.x));
         }

+ 0 - 2
Assets/Scripts/UI/UIView/YZT/YZTLayer.cs

@@ -10,8 +10,6 @@ using UnityEngine.Networking;
 using UnityEngine.UI;
 using UnityAsync;
 using WaitUntil = UnityAsync.WaitUntil;
-using Best.HTTP.Caching;
-using UnityEditor.Build;
 
 [System.Serializable]
 public class YZTLayerData