提交提交

Assets/Arrow.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 534ee480e6eaf8e40903920f90a225b3
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/CheckPathLine.mat

@@ -41,8 +41,8 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 0}
-        m_Scale: {x: 100, y: 1}
+        m_Texture: {fileID: 2800000, guid: 414693b704610af458bee4eb63e98205, type: 3}
+        m_Scale: {x: 10, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:
         m_Texture: {fileID: 0}
@@ -78,6 +78,6 @@ Material:
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-    - _MainCol: {r: 0, g: 0.6836562, b: 1, a: 1}
+    - _MainCol: {r: 0, g: 10.917647, b: 16, a: 1}
     - _OffsetSpeed: {r: 1, g: 0, b: 0, a: 0}
   m_BuildTextureStacks: []

Assets/Prefabs/UI/Item/taskPoint.prefab

@@ -1,5 +1,37 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &960416120751514419
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6273976691009138138}
+  m_Layer: 5
+  m_Name: Root
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6273976691009138138
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 960416120751514419}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 1.82, z: 0}
+  m_LocalScale: {x: 4, y: 5, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 7577620859615457835}
+  m_Father: {fileID: 7653964312536426446}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &6218954533803156374
 GameObject:
   m_ObjectHideFlags: 0
@@ -26,12 +58,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6218954533803156374}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 3.8, z: 0}
-  m_LocalScale: {x: 4, y: 5, z: 1}
+  m_LocalPosition: {x: 0, y: 0.39600003, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 7653964312536426446}
-  m_RootOrder: 1
+  m_Father: {fileID: 6273976691009138138}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &8336812975673063944
 MeshFilter:
@@ -201,7 +233,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2958090928544872712}
-  - {fileID: 7577620859615457835}
+  - {fileID: 6273976691009138138}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -225,3 +257,4 @@ MonoBehaviour:
   mat: {fileID: 0}
   _Camera: {fileID: 0}
   quadT: {fileID: 0}
+  root: {fileID: 6273976691009138138}

Assets/Scripts/UI/UIView/GCYW/GCYWLayer.cs

@@ -387,16 +387,26 @@ public class GCYWLayer : YZTRootLayer
                 GameObject tempObj = Instantiate(taskPointIconPrefab, taskPointIconContent);
                 tempObj.name = itemsArray[i].xjItemId;
                 tempObj.transform.position = CoordinateConverter.GeoToUnity(double.Parse(itemsArray[i].longitude),
-                    double.Parse(itemsArray[i].latitude));
+                    double.Parse(itemsArray[i].latitude)) + Vector3.up * 41;
                 taskPointIcons.Add(tempObj.GetComponent<TaskPointIcon>());
             }
         }
 
         taskPointLineRenderer.positionCount = itemsArray.Length;
+        float allDistance = 0;
+        UnityEngine.Vector3 prePos = UnityEngine.Vector3.zero;
         for (int i = 0; i < taskPointIcons.Count; i++)
         {
-            taskPointLineRenderer.SetPosition(i, taskPointIcons[i].transform.position += Vector3.up * 41);
+            if (i != 0) {
+                allDistance += UnityEngine.Vector3.Distance(taskPointIcons[i].transform.position, prePos);
+            }
+            
+            taskPointLineRenderer.SetPosition(i, taskPointIcons[i].transform.position);
+            prePos = taskPointIcons[i].transform.position;
         }
+        taskPointLineRenderer.startWidth = allDistance / 10.0f;
+        taskPointLineRenderer.endWidth = allDistance / 10.0f;
+        taskPointLineRenderer.material.mainTextureScale = new Vector3(allDistance/2.0f,1);
     }
 
     public void SetTaskPointIconHeightLight(int index)

Assets/Scripts/UI/UIView/GCYW/TaskPointIcon.cs

@@ -9,9 +9,10 @@ public class TaskPointIcon : MonoBehaviour
     public Material mat;
     public Camera _Camera;
     public Transform quadT;
+    public Transform root;
     private void Awake()
     {
-        quadT = this.transform.Find("Quad");
+        quadT = root.transform.Find("Quad");
         mat = quadT.GetComponent<MeshRenderer>().material;
         _Camera=Camera.main;
     }
@@ -19,6 +20,8 @@ public class TaskPointIcon : MonoBehaviour
     private void Update()
     {
         quadT.LookAt(_Camera.transform);
+        float distance = Vector3.Distance(CameraManager.instance.mainCamera.transform.position, this.transform.position);
+        root.transform.localScale = Vector3.one * distance / 20;
     }
 
     public void SetHeightLight(bool isHeightLight)