Browse Source

改一下B08工程运维 获取补元和套口的巡逻任务

Void_F 4 months ago
parent
commit
b2fff56f79

+ 2 - 132
Assets/Art/Prefab/Buildings/BuYuan_ShiNei.prefab

@@ -30,8 +30,7 @@ Transform:
   m_LocalPosition: {x: 14121, y: 20, z: 23749}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 5923163603117100730}
+  m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: -90, y: 0, z: 180}
@@ -96,134 +95,5 @@ MonoBehaviour:
   moveModelName: ZhaMen
   objectCount: 14
   speed: 1
+  targetObjs: []
   aniType: 0
---- !u!1001 &2891401018980975994
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 8404428449182255607}
-    m_Modifications:
-    - target: {fileID: 906460733905944895, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 329.45
-      objectReference: {fileID: 0}
-    - target: {fileID: 906460733905944895, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -10.45
-      objectReference: {fileID: 0}
-    - target: {fileID: 906460733905944895, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -2.97
-      objectReference: {fileID: 0}
-    - target: {fileID: 1502535993475158920, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_Enabled
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2104638354118742436, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 329.45
-      objectReference: {fileID: 0}
-    - target: {fileID: 2104638354118742436, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -1.54
-      objectReference: {fileID: 0}
-    - target: {fileID: 2104638354118742436, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -2.97
-      objectReference: {fileID: 0}
-    - target: {fileID: 4354287880637744367, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_Enabled
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4496899257497986419, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_Parameters.textureMode
-      value: 3
-      objectReference: {fileID: 0}
-    - target: {fileID: 4556425160177927787, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_Enabled
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5824030983035300970, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_Enabled
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6479114625718222780, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 315.7
-      objectReference: {fileID: 0}
-    - target: {fileID: 6479114625718222780, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0.01
-      objectReference: {fileID: 0}
-    - target: {fileID: 6479114625718222780, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -2.97
-      objectReference: {fileID: 0}
-    - target: {fileID: 6646519964417813596, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_Name
-      value: CheckPathTool
-      objectReference: {fileID: 0}
-    - target: {fileID: 8520383457342634186, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -343.1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8520383457342634186, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -10.45
-      objectReference: {fileID: 0}
-    - target: {fileID: 8520383457342634186, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -2.97
-      objectReference: {fileID: 0}
-    - target: {fileID: 8796405293740264384, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_RootOrder
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8796405293740264384, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8796405293740264384, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8796405293740264384, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8796405293740264384, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8796405293740264384, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8796405293740264384, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8796405293740264384, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8796405293740264384, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8796405293740264384, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8796405293740264384, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
---- !u!4 &5923163603117100730 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 8796405293740264384, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-  m_PrefabInstance: {fileID: 2891401018980975994}
-  m_PrefabAsset: {fileID: 0}

+ 2 - 132
Assets/Art/Prefab/Buildings/TaoKou_ShiNei.prefab

@@ -30,8 +30,7 @@ Transform:
   m_LocalPosition: {x: 2508, y: 41, z: -3186}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 2198484890367278696}
+  m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: -90, y: 0, z: 180}
@@ -96,134 +95,5 @@ MonoBehaviour:
   moveModelName: ZhaMen
   objectCount: 24
   speed: 1
+  targetObjs: []
   aniType: 1
---- !u!1001 &7246725413754811816
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 9077537536325611499}
-    m_Modifications:
-    - target: {fileID: 906460733905944895, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 329.45
-      objectReference: {fileID: 0}
-    - target: {fileID: 906460733905944895, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -10.45
-      objectReference: {fileID: 0}
-    - target: {fileID: 906460733905944895, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -2.97
-      objectReference: {fileID: 0}
-    - target: {fileID: 1502535993475158920, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_Enabled
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2104638354118742436, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 329.45
-      objectReference: {fileID: 0}
-    - target: {fileID: 2104638354118742436, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -1.54
-      objectReference: {fileID: 0}
-    - target: {fileID: 2104638354118742436, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -2.97
-      objectReference: {fileID: 0}
-    - target: {fileID: 4354287880637744367, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_Enabled
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4496899257497986419, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_Parameters.textureMode
-      value: 3
-      objectReference: {fileID: 0}
-    - target: {fileID: 4556425160177927787, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_Enabled
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5824030983035300970, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_Enabled
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6479114625718222780, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 315.7
-      objectReference: {fileID: 0}
-    - target: {fileID: 6479114625718222780, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0.01
-      objectReference: {fileID: 0}
-    - target: {fileID: 6479114625718222780, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -2.97
-      objectReference: {fileID: 0}
-    - target: {fileID: 6646519964417813596, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_Name
-      value: CheckPathTool
-      objectReference: {fileID: 0}
-    - target: {fileID: 8520383457342634186, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -343.1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8520383457342634186, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -10.45
-      objectReference: {fileID: 0}
-    - target: {fileID: 8520383457342634186, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -2.97
-      objectReference: {fileID: 0}
-    - target: {fileID: 8796405293740264384, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_RootOrder
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8796405293740264384, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8796405293740264384, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8796405293740264384, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8796405293740264384, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8796405293740264384, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8796405293740264384, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8796405293740264384, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8796405293740264384, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8796405293740264384, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8796405293740264384, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
---- !u!4 &2198484890367278696 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 8796405293740264384, guid: 72a7ce1ede15b3a43bca6e61ff2dafea, type: 3}
-  m_PrefabInstance: {fileID: 7246725413754811816}
-  m_PrefabAsset: {fileID: 0}

+ 3 - 3
Assets/Art/UI/YZT/B08/icon_pathpt.png.meta

@@ -38,7 +38,7 @@ TextureImporter:
     mipBias: 0
     wrapU: 1
     wrapV: 1
-    wrapW: 0
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -51,9 +51,9 @@ TextureImporter:
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
-  alphaIsTransparency: 0
+  alphaIsTransparency: 1
   spriteTessellationDetail: -1
-  textureType: 8
+  textureType: 0
   textureShape: 1
   singleChannelComponent: 0
   flipbookRows: 1

+ 97 - 0
Assets/CheckPathPoint.mat

@@ -0,0 +1,97 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: CheckPathPoint
+  m_Shader: {fileID: 10760, guid: 0000000000000000f000000000000000, type: 0}
+  m_ValidKeywords: []
+  m_InvalidKeywords:
+  - _ALPHAPREMULTIPLY_ON
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _FlowTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 9a2c109e7774ed74d9747e9fb659c143, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _ColorMask: 15
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 10
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 3
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _Stencil: 0
+    - _StencilComp: 8
+    - _StencilOp: 0
+    - _StencilReadMask: 255
+    - _StencilWriteMask: 255
+    - _UVSec: 0
+    - _UseUIAlphaClip: 0
+    - _ZWrite: 0
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _FlowCol: {r: 1, g: 1, b: 1, a: 1}
+    - _FlowSpeed: {r: 0, g: 0, b: 0, a: 0}
+    - _MainCol: {r: 1, g: 1, b: 1, a: 1}
+    - _MainColor: {r: 0.7746352, g: 1, b: 0.759434, a: 1}
+    - _MoveSpeed: {r: 0, g: 0, b: 0, a: 0}
+  m_BuildTextureStacks: []

+ 3 - 2
Assets/Prefabs/CheckPathTool.prefab.meta → Assets/CheckPathPoint.mat.meta

@@ -1,7 +1,8 @@
 fileFormatVersion: 2
-guid: 72a7ce1ede15b3a43bca6e61ff2dafea
-PrefabImporter:
+guid: 853b2ffb200adc84482fc1a2a336244f
+NativeFormatImporter:
   externalObjects: {}
+  mainObjectFileID: 2100000
   userData: 
   assetBundleName: 
   assetBundleVariant: 

+ 0 - 488
Assets/Prefabs/CheckPathTool.prefab

@@ -1,488 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!1 &1811674803958029715
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2104638354118742436}
-  - component: {fileID: 2203255237692625843}
-  - component: {fileID: 1502535993475158920}
-  m_Layer: 9
-  m_Name: P1
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &2104638354118742436
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1811674803958029715}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -103.48, y: 57.91, z: 18.33}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 8796405293740264384}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!33 &2203255237692625843
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1811674803958029715}
-  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
---- !u!23 &1502535993475158920
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1811674803958029715}
-  m_Enabled: 0
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}
---- !u!1 &5083501722880567615
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 906460733905944895}
-  - component: {fileID: 4046950582947780150}
-  - component: {fileID: 4556425160177927787}
-  m_Layer: 9
-  m_Name: P2
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &906460733905944895
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5083501722880567615}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -87.3, y: 75.53, z: 16}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 8796405293740264384}
-  m_RootOrder: 2
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!33 &4046950582947780150
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5083501722880567615}
-  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
---- !u!23 &4556425160177927787
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5083501722880567615}
-  m_Enabled: 0
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}
---- !u!1 &6347065583983538015
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 8520383457342634186}
-  - component: {fileID: 9157698797176123107}
-  - component: {fileID: 5824030983035300970}
-  m_Layer: 9
-  m_Name: P3
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &8520383457342634186
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6347065583983538015}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -65.31, y: 59.39, z: 15.86}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 8796405293740264384}
-  m_RootOrder: 3
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!33 &9157698797176123107
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6347065583983538015}
-  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
---- !u!23 &5824030983035300970
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6347065583983538015}
-  m_Enabled: 0
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}
---- !u!1 &6646519964417813596
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 8796405293740264384}
-  - component: {fileID: 457643491526293496}
-  - component: {fileID: 4496899257497986419}
-  m_Layer: 9
-  m_Name: CheckPathTool
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &8796405293740264384
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6646519964417813596}
-  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:
-  - {fileID: 6479114625718222780}
-  - {fileID: 2104638354118742436}
-  - {fileID: 906460733905944895}
-  - {fileID: 8520383457342634186}
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &457643491526293496
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6646519964417813596}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: da84dd66b456fe64db833b1ba9789d45, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _LineRenderer: {fileID: 0}
-  posList:
-  - {fileID: 6765044336374140673}
-  - {fileID: 1811674803958029715}
-  - {fileID: 5083501722880567615}
-  - {fileID: 6347065583983538015}
---- !u!120 &4496899257497986419
-LineRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6646519964417813596}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 0
-  m_LightProbeUsage: 0
-  m_ReflectionProbeUsage: 0
-  m_RayTracingMode: 0
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 5231e201cdef057419ed5180c22a9f6a, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_Positions:
-  - {x: 0, y: 0, z: 0}
-  - {x: 0, y: 0, z: 1}
-  m_Parameters:
-    serializedVersion: 3
-    widthMultiplier: 1
-    widthCurve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    colorGradient:
-      serializedVersion: 2
-      key0: {r: 1, g: 1, b: 1, a: 1}
-      key1: {r: 1, g: 1, b: 1, a: 1}
-      key2: {r: 0, g: 0, b: 0, a: 0}
-      key3: {r: 0, g: 0, b: 0, a: 0}
-      key4: {r: 0, g: 0, b: 0, a: 0}
-      key5: {r: 0, g: 0, b: 0, a: 0}
-      key6: {r: 0, g: 0, b: 0, a: 0}
-      key7: {r: 0, g: 0, b: 0, a: 0}
-      ctime0: 0
-      ctime1: 65535
-      ctime2: 0
-      ctime3: 0
-      ctime4: 0
-      ctime5: 0
-      ctime6: 0
-      ctime7: 0
-      atime0: 0
-      atime1: 65535
-      atime2: 0
-      atime3: 0
-      atime4: 0
-      atime5: 0
-      atime6: 0
-      atime7: 0
-      m_Mode: 0
-      m_NumColorKeys: 2
-      m_NumAlphaKeys: 2
-    numCornerVertices: 0
-    numCapVertices: 0
-    alignment: 0
-    textureMode: 0
-    shadowBias: 0.5
-    generateLightingData: 0
-  m_UseWorldSpace: 1
-  m_Loop: 0
---- !u!1 &6765044336374140673
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 6479114625718222780}
-  - component: {fileID: 6037790273865442940}
-  - component: {fileID: 4354287880637744367}
-  m_Layer: 9
-  m_Name: P0
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &6479114625718222780
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6765044336374140673}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 104.48, y: -95.12, z: 18.54}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 8796405293740264384}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!33 &6037790273865442940
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6765044336374140673}
-  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
---- !u!23 &4354287880637744367
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 6765044336374140673}
-  m_Enabled: 0
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}

+ 160 - 53
Assets/Prefabs/UI/Item/PointItem.prefab

@@ -11,9 +11,8 @@ GameObject:
   - component: {fileID: 2705851486148901935}
   - component: {fileID: 1072744203365346891}
   - component: {fileID: 554696549515057973}
-  - component: {fileID: 2511432421060659303}
   m_Layer: 0
-  m_Name: ImgButton
+  m_Name: ImgIcon
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -61,7 +60,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -77,50 +76,6 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!114 &2511432421060659303
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2154094752096044242}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 3
-    m_WrapAround: 0
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_SelectedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_SelectedTrigger: Selected
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 554696549515057973}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
 --- !u!1 &5031127884736356578
 GameObject:
   m_ObjectHideFlags: 0
@@ -132,6 +87,8 @@ GameObject:
   - component: {fileID: 6380794509415626336}
   - component: {fileID: 6940519253357956703}
   - component: {fileID: 1542081016859774888}
+  - component: {fileID: 6744424570579938383}
+  - component: {fileID: 4938550875790890169}
   m_Layer: 5
   m_Name: PointItem
   m_TagString: Untagged
@@ -187,7 +144,157 @@ MonoBehaviour:
   itemIndex: 0
   posAndtimeText: {fileID: 4566918355548952672}
   messageText: {fileID: 4208668523066118826}
-  imgButton: {fileID: 2511432421060659303}
+  imgButton: {fileID: 4938550875790890169}
+--- !u!114 &6744424570579938383
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5031127884736356578}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 141109fb25f0083469e71ce8cb3e75c8, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0.48828685, b: 0.8207547, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  m_DrawShape: 0
+  m_ImageType: 0
+  m_MaterialMode: 0
+  m_StrokeWidth: 0
+  m_OutlineWidth: 0
+  m_OutlineColor: {r: 0, g: 0, b: 0, a: 1}
+  m_FalloffDistance: 0.5
+  m_ConstrainRotation: 1
+  m_ShapeRotation: 0
+  m_FlipHorizontal: 0
+  m_FlipVertical: 0
+  m_Triangle:
+    m_CornerRadius: {x: 0, y: 0, z: 0}
+    m_UniformCornerRadius: 0
+  m_Rectangle:
+    m_CornerRadius: {x: 0, y: 0, z: 0, w: 0}
+    m_UniformCornerRadius: 0
+  m_Circle:
+    m_Radius: 0
+    m_FitRadius: 0
+  m_Pentagon:
+    m_CornerRadius: {x: 0, y: 0, z: 0, w: 0}
+    m_UniformCornerRadius: 0
+    m_TipRadius: 0.001
+    m_TipSize: 1
+  m_Hexagon:
+    m_CornerRadius: {x: 1, y: 1, z: 1, w: 1}
+    m_UniformCornerRadius: 0
+    m_TipSize: {x: 1, y: 1}
+    m_UniformTipSize: 0
+    m_TipRadius: {x: 1, y: 1}
+    m_UniformTipRadius: 0
+  m_NStarPolygon:
+    m_SideCount: 3
+    m_Inset: 2
+    m_CornerRadius: 0
+    m_Offset: {x: 0, y: 0}
+  m_GradientEffect:
+    m_Enabled: 0
+    m_GradientType: 0
+    m_Gradient:
+      serializedVersion: 2
+      key0: {r: 1, g: 1, b: 1, a: 1}
+      key1: {r: 1, g: 1, b: 1, a: 1}
+      key2: {r: 0, g: 0, b: 0, a: 0}
+      key3: {r: 0, g: 0, b: 0, a: 0}
+      key4: {r: 0, g: 0, b: 0, a: 0}
+      key5: {r: 0, g: 0, b: 0, a: 0}
+      key6: {r: 0, g: 0, b: 0, a: 0}
+      key7: {r: 0, g: 0, b: 0, a: 0}
+      ctime0: 0
+      ctime1: 65535
+      ctime2: 0
+      ctime3: 0
+      ctime4: 0
+      ctime5: 0
+      ctime6: 0
+      ctime7: 0
+      atime0: 0
+      atime1: 65535
+      atime2: 0
+      atime3: 0
+      atime4: 0
+      atime5: 0
+      atime6: 0
+      atime7: 0
+      m_Mode: 0
+      m_NumColorKeys: 2
+      m_NumAlphaKeys: 2
+    m_CornerGradientColors:
+    - {r: 0, g: 0, b: 0, a: 0}
+    - {r: 0, g: 0, b: 0, a: 0}
+    - {r: 0, g: 0, b: 0, a: 0}
+    - {r: 0, g: 0, b: 0, a: 0}
+    m_Rotation: 0
+--- !u!114 &4938550875790890169
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5031127884736356578}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 06ee7bcf15156e04ab59b61c53f5211f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 0
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 0, g: 0.49019608, b: 0.81960785, a: 0}
+    m_HighlightedColor: {r: 0, g: 0.49019608, b: 0.81960785, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 6744424570579938383}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+  index: 0
 --- !u!1 &7191653453359174962
 GameObject:
   m_ObjectHideFlags: 0
@@ -399,7 +506,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0.64705884, g: 0.7490196, b: 0.8862745, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -550,7 +657,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0.64705884, g: 0.7490196, b: 0.8862745, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -630,7 +737,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0.08235294, g: 0.8627451, b: 0.9882353, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -712,7 +819,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0.64705884, g: 0.7490196, b: 0.8862745, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -863,7 +970,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 0.64705884, g: 0.7490196, b: 0.8862745, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:

+ 60 - 162
Assets/Prefabs/UI/Item/taskPoint.prefab

@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &2883859142690490700
+--- !u!1 &6218954533803156374
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -8,119 +8,81 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 3630880510138777843}
-  - component: {fileID: 3495727483210785002}
-  - component: {fileID: 6721344533049778686}
-  - component: {fileID: 6380261996587021725}
+  - component: {fileID: 7577620859615457835}
+  - component: {fileID: 8336812975673063944}
+  - component: {fileID: 3691615999078120468}
   m_Layer: 5
-  m_Name: taskPointIcon
+  m_Name: Quad
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &3630880510138777843
-RectTransform:
+--- !u!4 &7577620859615457835
+Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2883859142690490700}
+  m_GameObject: {fileID: 6218954533803156374}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.5, y: 0.5, z: 1}
+  m_LocalPosition: {x: 0, y: 63.75, z: 0}
+  m_LocalScale: {x: 24, y: 27.5, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7653964312536426446}
-  m_RootOrder: 0
+  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: 0, y: 0}
-  m_SizeDelta: {x: 48, y: 55}
-  m_Pivot: {x: 0.5, y: 0}
---- !u!222 &3495727483210785002
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2883859142690490700}
-  m_CullTransparentMesh: 1
---- !u!114 &6721344533049778686
-MonoBehaviour:
+--- !u!33 &8336812975673063944
+MeshFilter:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2883859142690490700}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 9a2c109e7774ed74d9747e9fb659c143, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
---- !u!114 &6380261996587021725
-MonoBehaviour:
+  m_GameObject: {fileID: 6218954533803156374}
+  m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &3691615999078120468
+MeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2883859142690490700}
+  m_GameObject: {fileID: 6218954533803156374}
   m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Navigation:
-    m_Mode: 0
-    m_WrapAround: 0
-    m_SelectOnUp: {fileID: 0}
-    m_SelectOnDown: {fileID: 0}
-    m_SelectOnLeft: {fileID: 0}
-    m_SelectOnRight: {fileID: 0}
-  m_Transition: 1
-  m_Colors:
-    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
-    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
-    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
-    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
-    m_ColorMultiplier: 1
-    m_FadeDuration: 0.1
-  m_SpriteState:
-    m_HighlightedSprite: {fileID: 0}
-    m_PressedSprite: {fileID: 0}
-    m_SelectedSprite: {fileID: 0}
-    m_DisabledSprite: {fileID: 0}
-  m_AnimationTriggers:
-    m_NormalTrigger: Normal
-    m_HighlightedTrigger: Highlighted
-    m_PressedTrigger: Pressed
-    m_SelectedTrigger: Selected
-    m_DisabledTrigger: Disabled
-  m_Interactable: 1
-  m_TargetGraphic: {fileID: 6721344533049778686}
-  m_OnClick:
-    m_PersistentCalls:
-      m_Calls: []
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 853b2ffb200adc84482fc1a2a336244f, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
 --- !u!1 &8311284152418102358
 GameObject:
   m_ObjectHideFlags: 0
@@ -152,7 +114,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7653964312536426446}
-  m_RootOrder: 1
+  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}
@@ -218,9 +180,6 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 7653964312536426446}
-  - component: {fileID: 671094971801270747}
-  - component: {fileID: 1507797686919101701}
-  - component: {fileID: 8720583841492471574}
   - component: {fileID: 4870179674319167154}
   m_Layer: 5
   m_Name: taskPoint
@@ -241,77 +200,16 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 3630880510138777843}
   - {fileID: 2958090928544872712}
+  - {fileID: 7577620859615457835}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 960, y: 540}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 1, y: 1}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!223 &671094971801270747
-Canvas:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9160985709865876312}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_RenderMode: 2
-  m_Camera: {fileID: 0}
-  m_PlaneDistance: 100
-  m_PixelPerfect: 0
-  m_ReceivesEvents: 1
-  m_OverrideSorting: 0
-  m_OverridePixelPerfect: 0
-  m_SortingBucketNormalizedSize: 0
-  m_AdditionalShaderChannelsFlag: 0
-  m_SortingLayerID: 0
-  m_SortingOrder: 0
-  m_TargetDisplay: 0
---- !u!114 &1507797686919101701
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9160985709865876312}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_UiScaleMode: 0
-  m_ReferencePixelsPerUnit: 100
-  m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 800, y: 600}
-  m_ScreenMatchMode: 0
-  m_MatchWidthOrHeight: 0
-  m_PhysicalUnit: 3
-  m_FallbackScreenDPI: 96
-  m_DefaultSpriteDPI: 96
-  m_DynamicPixelsPerUnit: 1
-  m_PresetInfoIsWorld: 0
---- !u!114 &8720583841492471574
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9160985709865876312}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreReversedGraphics: 1
-  m_BlockingObjects: 0
-  m_BlockingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
 --- !u!114 &4870179674319167154
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -324,7 +222,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 271d35a4f07e1ca489eb820258b47573, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  targetPoint: {fileID: 2883859142690490700}
+  targetPoint: {fileID: 0}
   rect: {fileID: 7653964312536426446}
-  button: {fileID: 6380261996587021725}
-  canvas: {fileID: 671094971801270747}
+  button: {fileID: 0}
+  canvas: {fileID: 0}

+ 8 - 0
Assets/Prefabs/UI/Item/xunJianRenWuItem.prefab

@@ -267,6 +267,14 @@ MonoBehaviour:
   pointItemPrefab: {fileID: 5031127884736356578, guid: c1d384ff4ac793947969fffc3e358847, type: 3}
   PointItems: []
   itemContent: {fileID: 2753270198851302937}
+  InfoData:
+    task_id: 
+    type: 
+    xunjian_scope: 
+    status: 
+    start_time: 
+    task_items: []
+  gcywLayer: {fileID: 0}
 --- !u!1 &3468084397990988624
 GameObject:
   m_ObjectHideFlags: 0

+ 101 - 0
Assets/Prefabs/UI/XHYZT/GCYW.prefab

@@ -5201,6 +5201,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 7813683317312756564}
+  - component: {fileID: 2184664091310860110}
   m_Layer: 5
   m_Name: TaskPointIconContent
   m_TagString: Untagged
@@ -5223,6 +5224,105 @@ Transform:
   m_Father: {fileID: 7289340260209060652}
   m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!120 &2184664091310860110
+LineRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 719888452988900508}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 0
+  m_LightProbeUsage: 0
+  m_ReflectionProbeUsage: 0
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 5231e201cdef057419ed5180c22a9f6a, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_Positions:
+  - {x: 0, y: 0, z: 0}
+  - {x: 0, y: 0, z: 1}
+  m_Parameters:
+    serializedVersion: 3
+    widthMultiplier: 1
+    widthCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    colorGradient:
+      serializedVersion: 2
+      key0: {r: 1, g: 1, b: 1, a: 1}
+      key1: {r: 1, g: 1, b: 1, a: 1}
+      key2: {r: 0, g: 0, b: 0, a: 0}
+      key3: {r: 0, g: 0, b: 0, a: 0}
+      key4: {r: 0, g: 0, b: 0, a: 0}
+      key5: {r: 0, g: 0, b: 0, a: 0}
+      key6: {r: 0, g: 0, b: 0, a: 0}
+      key7: {r: 0, g: 0, b: 0, a: 0}
+      ctime0: 0
+      ctime1: 65535
+      ctime2: 0
+      ctime3: 0
+      ctime4: 0
+      ctime5: 0
+      ctime6: 0
+      ctime7: 0
+      atime0: 0
+      atime1: 65535
+      atime2: 0
+      atime3: 0
+      atime4: 0
+      atime5: 0
+      atime6: 0
+      atime7: 0
+      m_Mode: 0
+      m_NumColorKeys: 2
+      m_NumAlphaKeys: 2
+    numCornerVertices: 0
+    numCapVertices: 0
+    alignment: 0
+    textureMode: 0
+    shadowBias: 0.5
+    generateLightingData: 0
+  m_UseWorldSpace: 1
+  m_Loop: 0
 --- !u!1 &723528197704464924
 GameObject:
   m_ObjectHideFlags: 0
@@ -35629,6 +35729,7 @@ MonoBehaviour:
   taskPointIconPrefab: {fileID: 9160985709865876312, guid: 584993b872c11484788bbf22515b9e32, type: 3}
   taskPointIconContent: {fileID: 7813683317312756564}
   taskPointIcons: []
+  taskPointLineRenderer: {fileID: 2184664091310860110}
 --- !u!1 &6125915536224638305
 GameObject:
   m_ObjectHideFlags: 0

File diff suppressed because it is too large
+ 1 - 98
Assets/Scene 1.unity


+ 1 - 1
Assets/Scripts/ActionInstance.cs

@@ -12,7 +12,7 @@ public class ActionInstance : MonoBehaviour
     public Action<AniType,float[]> ModelAni_On;
     public Action ModelAni_Off;
 
-    public Action<bool> SetCheckPathActive;
+    //public Action<bool> SetCheckPathActive;
     
     private void Awake()
     {

+ 0 - 2
Assets/Scripts/CheckPathTool.cs

@@ -17,12 +17,10 @@ public class CheckPathTool : MonoBehaviour
 
     private void Start()
     {
-        ActionInstance._Instance.SetCheckPathActive += SetPathActive;
     }
 
     private void OnDestroy()
     {
-        ActionInstance._Instance.SetCheckPathActive -= SetPathActive;
     }
 
     private void Update()

+ 16 - 0
Assets/Scripts/ExtendedButton_PointItem.cs

@@ -0,0 +1,16 @@
+using System;
+using UnityEngine;
+using UnityEngine.UI;
+using UnityEngine.EventSystems;
+ 
+public class ExtendedButton_PointItem : Button
+{
+    public int index = 0;
+    public Action<int> onPointerEnter;
+
+    public override void OnPointerEnter(PointerEventData eventData)
+    {
+        base.OnPointerEnter(eventData);
+        onPointerEnter?.Invoke(index);
+    }
+}

+ 11 - 0
Assets/Scripts/ExtendedButton_PointItem.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 06ee7bcf15156e04ab59b61c53f5211f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 17 - 7
Assets/Scripts/HttpHelper.cs

@@ -1458,6 +1458,7 @@ public class HttpHelper : MonoBehaviour
     /// <param name="type"></param>
     public async Task InitGCYWData1(int type)
     {
+        Debug.Log($"获取B08GCYW 数据:{(type==0?"补元":"套口")}");
         GlobalData.B08_Type = type;
         string jsonStr;
         try
@@ -1517,15 +1518,13 @@ public class HttpHelper : MonoBehaviour
 
         try
         {
-            //jsonStr = await B08_API_data(ServerAddress.API_B08_inspectType, type);
-            //todo 特殊操作一下只有补元的
-            jsonStr = await B08_API_data(ServerAddress.API_B08_inspectType, 2);
+            jsonStr = await B08_API_data(ServerAddress.API_B08_inspectType, type);
             Debug.Log("API_B08_inspectType" + jsonStr);
             GlobalData.B08InspectType = JsonConvert.DeserializeObject<B08_inspectType>(jsonStr);
             GlobalData.B08TaskListInfos = new B08_TaskListInfoData[GlobalData.B08InspectType.data.Length];
             for (int i = 0; i < GlobalData.B08InspectType.data.Length; i++)
             {
-                string tempResult = await B08_API_TaskInfo(i);
+                string tempResult = await B08_API_TaskInfo(type,i);
                 Debug.Log($"B08_API_TaskInfo type={i}:" + tempResult);
                 GlobalData.B08TaskListInfos[i]= JsonConvert.DeserializeObject<B08_TaskListInfoData>(tempResult);
             }
@@ -1560,10 +1559,21 @@ public class HttpHelper : MonoBehaviour
         www.Dispose();
         return result;
     }
-    public async Task<string> B08_API_TaskInfo(int type)
+    public async Task<string> B08_API_TaskInfo(int type,int xunjian_type)
     {
-        Debug.Log("!!!:"+ServerAddress.API_B08_taskInfo+type);
-        UnityWebRequest www = new UnityWebRequest(ServerAddress.API_B08_taskInfo+type, "Get");
+        string cmdUrl = ServerAddress.API_B08_taskInfo;
+        if (type == 0)
+        {
+            cmdUrl += "1794245918999351298";
+        }
+        else if(type==1)
+        {
+            cmdUrl += "1798366756789653505";
+        }
+
+        cmdUrl += "&xunjian_type=" + xunjian_type;
+        Debug.Log("!!!:"+cmdUrl);
+        UnityWebRequest www = new UnityWebRequest(cmdUrl, "Get");
         www.downloadHandler = new DownloadHandlerBuffer();
         www.SetRequestHeader("Content-Type", "application/json");
         await www.SendWebRequest();

+ 6 - 3
Assets/Scripts/UI/Item/B08_TaskListItem.cs

@@ -41,7 +41,7 @@ public class B08_TaskListItem : MonoBehaviour
         moreButton.onClick.AddListener(ChangeMoreMessage);
 
         moreMessage = false;
-        ctrlText.text = "详情";
+        ctrlText.text = "<color=#00EFFF>详情</color>";
         rect.sizeDelta = new Vector2(360,38);
         more.SetActive(false);
     }
@@ -50,13 +50,13 @@ public class B08_TaskListItem : MonoBehaviour
     {
         if (moreMessage)
         {
-            ctrlText.text = "详情";
+            ctrlText.text = "<color=#00EFFF>详情</color>";
             rect.sizeDelta = new Vector2(360,38);
             more.SetActive(false);
         }
         else
         {
-            ctrlText.text = "收起";
+            ctrlText.text = "<color=#00FF3F>收起</color>";
             rect.sizeDelta = new Vector2(360,354);
             more.SetActive(true);
             gcywLayer.SetTaskImgPanelData(InfoData.task_items);
@@ -101,6 +101,9 @@ public class B08_TaskListItem : MonoBehaviour
         {
             B08_TaskPointItem tempItem = Instantiate(pointItemPrefab,itemContent).GetComponent<B08_TaskPointItem>();
             tempItem.SetData(baseLayer,data.task_items[i],i,data.start_time);
+            var button = tempItem.GetComponent<ExtendedButton_PointItem>();
+            button.index = i;
+            button.onPointerEnter += baseLayer.SetTaskPointIconHeightLight;
             PointItems.Add(tempItem);
         }
     }

+ 2 - 2
Assets/Scripts/UI/Tools/ServerAddress.cs

@@ -107,10 +107,10 @@ public class ServerAddress
     public static string API_B08_questionStatis = YZTServerAddress + "/open/questionStatis?projectId=";
     //public static string API_B08_inspectType = YZTServerAddress + "/open/inspectType?projectId=";
     //只有补元的 先写死了
-    public static string API_B08_inspectType = YZTServerAddress + "/open/xunjianType";
+    public static string API_B08_inspectType = YZTServerAddress + "/open/xunjianType?projectId=";
     
     //拿任务详细信息 (看起来是乱嗨写的)
-    public static string API_B08_taskInfo = YZTServerAddress + "/open/xunjianrenwu?xunjian_type=";
+    public static string API_B08_taskInfo = YZTServerAddress + "/open/xunjianrenwu?projectId=";
   
     /// <summary>
     /// 获取站点水位信息(折线图和信息列表)

+ 53 - 31
Assets/Scripts/UI/UIView/GCYW/GCYWLayer.cs

@@ -75,7 +75,9 @@ public class GCYWLayer : YZTRootLayer
     private CanvasGroup button_CG1;
     private CanvasGroup button_CG2;
 
-    [FormerlySerializedAs("TaskListPanel")] public GameObject TaskListPanelObj;
+    [FormerlySerializedAs("TaskListPanel")]
+    public GameObject TaskListPanelObj;
+
     public TaskListPanel taskListPanel;
 
     public GameObject taskPhotoPanelObj;
@@ -83,8 +85,9 @@ public class GCYWLayer : YZTRootLayer
 
     public GameObject taskPointIconPrefab;
     public Transform taskPointIconContent;
-    public List<TaskPointIcon> taskPointIcons = new List<TaskPointIcon>(); 
-    
+    public List<TaskPointIcon> taskPointIcons = new List<TaskPointIcon>();
+    public LineRenderer taskPointLineRenderer;
+
     private void Awake()
     {
         Init();
@@ -96,7 +99,8 @@ public class GCYWLayer : YZTRootLayer
         _xunJianRenCiText = this.transform.Find("ShuJuTongJi/XunJianRenCi/title/numText").GetComponent<Text>();
         _quanBuGongChengText = this.transform.Find("ShuJuTongJi/QuanBuGongCheng/title/numText").GetComponent<Text>();
         _dangRiGongChengText = this.transform.Find("ShuJuTongJi/DangRiJingGao/title/numText").GetComponent<Text>();
-        _zhengChangYunXingText = this.transform.Find("ShuJuTongJi/ZhengChangGongCheng/title/numText").GetComponent<Text>();
+        _zhengChangYunXingText =
+            this.transform.Find("ShuJuTongJi/ZhengChangGongCheng/title/numText").GetComponent<Text>();
 
         _zhengGaiWenTi_Count_Text = this.transform.Find("ShuJuTongJi/ZhengGaiWenTi/count/numText").GetComponent<Text>();
         _zhengGaiWenTi_Vlaue_Text = this.transform.Find("ShuJuTongJi/ZhengGaiWenTi/value/numText").GetComponent<Text>();
@@ -109,7 +113,8 @@ public class GCYWLayer : YZTRootLayer
         wenTiTongJiBarChart = this.transform.Find("ShuJuTongJi/XunJianTongJi/BarChart").GetComponent<BarChart>();
 
         gongChengGuanLiChart = this.transform.Find("GongChengGuanLi/GuanLiJianCha").GetComponent<PieChart>();
-        gongChengGuanLiChartCount = this.transform.Find("GongChengGuanLi/GuanLiJianCha/count/numText").GetComponent<Text>();
+        gongChengGuanLiChartCount =
+            this.transform.Find("GongChengGuanLi/GuanLiJianCha/count/numText").GetComponent<Text>();
         fenJiKaoPingChart = this.transform.Find("GongChengGuanLi/FenJiKaoPing").GetComponent<PieChart>();
 
         TFSJ_DaiChuLiNumTex = this.transform.Find("TuFaShiJian/DaiChuLi/count").GetComponent<Text>();
@@ -130,17 +135,18 @@ public class GCYWLayer : YZTRootLayer
         zhaZhanCountText = this.transform.Find("XunJianLeiXingZongJi/ZhaZhan/count").GetComponent<Text>();
         diFangCountText = this.transform.Find("XunJianLeiXingZongJi/DiFang/count").GetComponent<Text>();
         jiaoChaJianZhuCountText = this.transform.Find("XunJianLeiXingZongJi/JiaoChaJianZhu/count").GetComponent<Text>();
-        dingQiZhuanXiangCountText = this.transform.Find("XunJianLeiXingZongJi/DingQiZhuanXiang/count").GetComponent<Text>();
+        dingQiZhuanXiangCountText =
+            this.transform.Find("XunJianLeiXingZongJi/DingQiZhuanXiang/count").GetComponent<Text>();
         dianQiButton = dianQiCountText.transform.parent.GetComponent<Button>();
         zhaZhanButton = zhaZhanCountText.transform.parent.GetComponent<Button>();
         diFangButton = diFangCountText.transform.parent.GetComponent<Button>();
         jianChaJianZhuButton = jiaoChaJianZhuCountText.transform.parent.GetComponent<Button>();
         diQiZhuanXiangButton = dingQiZhuanXiangCountText.transform.parent.GetComponent<Button>();
-        dianQiButton.onClick.AddListener(()=>OpenTaskListPanel(0));
-        zhaZhanButton.onClick.AddListener(()=>OpenTaskListPanel(1));
-        diFangButton.onClick.AddListener(()=>OpenTaskListPanel(2));
-        jianChaJianZhuButton.onClick.AddListener(()=>OpenTaskListPanel(3));
-        diQiZhuanXiangButton.onClick.AddListener(()=>OpenTaskListPanel(4));
+        dianQiButton.onClick.AddListener(() => OpenTaskListPanel(0));
+        zhaZhanButton.onClick.AddListener(() => OpenTaskListPanel(1));
+        diFangButton.onClick.AddListener(() => OpenTaskListPanel(2));
+        jianChaJianZhuButton.onClick.AddListener(() => OpenTaskListPanel(3));
+        diQiZhuanXiangButton.onClick.AddListener(() => OpenTaskListPanel(4));
 
         checkPathButton = this.transform.Find("CheckPathButton").GetComponent<Button>();
         checkPathButtonText = checkPathButton.GetComponentInChildren<Text>();
@@ -161,7 +167,6 @@ public class GCYWLayer : YZTRootLayer
         button_CG1.alpha = type == 0 ? 1.0f : 0.4f;
         button_CG2.alpha = type == 1 ? 1.0f : 0.4f;
         showCheckPath = false;
-        ActionInstance._Instance.SetCheckPathActive(showCheckPath);
         string textStr = showCheckPath ? "隐藏" : "显示";
         checkPathButtonText.text = $"巡检路线({textStr})";
 
@@ -286,7 +291,8 @@ public class GCYWLayer : YZTRootLayer
             TFSJ_eventItems.Add(tempObj.gameObject);
         }
 
-        _tuFaShiJian_Count_Text.text = $"{tempData.data.waitHandle + tempData.data.waitAccept + tempData.data.hasHandle}";
+        _tuFaShiJian_Count_Text.text =
+            $"{tempData.data.waitHandle + tempData.data.waitAccept + tempData.data.hasHandle}";
         _tuFaShiJian_Vlaue_Text.text = $"{float.Parse(tempData.data.completeRate) * 100.0f:0}%";
         _tuFaShiJian_Slider.fillAmount = float.Parse(tempData.data.completeRate);
     }
@@ -313,7 +319,8 @@ public class GCYWLayer : YZTRootLayer
             WTZG_eventItems.Add(tempObj.gameObject);
         }
 
-        _zhengGaiWenTi_Count_Text.text = $"{tempData.data.waitHandle + tempData.data.waitAccept + tempData.data.hasHandle}";
+        _zhengGaiWenTi_Count_Text.text =
+            $"{tempData.data.waitHandle + tempData.data.waitAccept + tempData.data.hasHandle}";
         _zhengGaiWenTi_Vlaue_Text.text = $"{float.Parse(tempData.data.completeRate) * 100.0f:0}%";
         _zhengGaiWenTi_Slider.fillAmount = float.Parse(tempData.data.completeRate);
     }
@@ -332,7 +339,7 @@ public class GCYWLayer : YZTRootLayer
     public void CheckPathChange()
     {
         showCheckPath = !showCheckPath;
-        ActionInstance._Instance.SetCheckPathActive(showCheckPath);
+        //ActionInstance._Instance.SetCheckPathActive(showCheckPath);
         string textStr = showCheckPath ? "隐藏" : "显示";
         checkPathButtonText.text = $"巡检路线({textStr})";
     }
@@ -345,23 +352,38 @@ public class GCYWLayer : YZTRootLayer
 
     public void SetTaskImgPanelData(B08_TaskItems[] itemsArray)
     {
-       taskPhotoPanel.SetData(itemsArray);
-
-       for (int i = 0; i < taskPointIcons.Count; i++)
-       {
-           Destroy(taskPointIcons[i].gameObject);
-       }
-       taskPointIcons.Clear();
-       for (int i = 0; i < itemsArray.Length; i++)
-       {
-          GameObject tempObj=Instantiate(taskPointIconPrefab, taskPointIconContent);
-          tempObj.name = itemsArray[i].item_id;
-          tempObj.transform.position = CoordinateConverter.GeoToUnity(double.Parse(itemsArray[i].longitude),
-              double.Parse(itemsArray[i].latitude));
-          taskPointIcons.Add(tempObj.GetComponent<TaskPointIcon>());
-       }
+        taskPhotoPanel.SetData(itemsArray);
+        taskPointLineRenderer.positionCount = 0;
+        for (int i = 0; i < taskPointIcons.Count; i++)
+        {
+            Destroy(taskPointIcons[i].gameObject);
+        }
+
+        taskPointIcons.Clear();
+        for (int i = 0; i < itemsArray.Length; i++)
+        {
+            GameObject tempObj = Instantiate(taskPointIconPrefab, taskPointIconContent);
+            tempObj.name = itemsArray[i].item_id;
+            tempObj.transform.position = CoordinateConverter.GeoToUnity(double.Parse(itemsArray[i].longitude),
+                double.Parse(itemsArray[i].latitude));
+            taskPointIcons.Add(tempObj.GetComponent<TaskPointIcon>());
+        }
+
+        taskPointLineRenderer.positionCount = itemsArray.Length;
+        for (int i = 0; i < taskPointIcons.Count; i++)
+        {
+            taskPointLineRenderer.SetPosition(i, taskPointIcons[i].transform.position += Vector3.up * 50);
+        }
+    }
+
+    public void SetTaskPointIconHeightLight(int index)
+    {
+        for (int i = 0; i < taskPointIcons.Count; i++)
+        {
+            taskPointIcons[i].SetHeightLight(i == index);
+        }
     }
-    
+
     public void OpenTaskImgPanel()
     {
         taskPhotoPanelObj.SetActive(true);

+ 16 - 8
Assets/Scripts/UI/UIView/GCYW/TaskPointIcon.cs

@@ -6,15 +6,23 @@ using UnityEngine.UI;
 
 public class TaskPointIcon : MonoBehaviour
 {
-    public GameObject targetPoint;
-
-    public RectTransform rect;
-    public Button button;
-    public Canvas canvas;
+    public Material mat;
+    public Camera _Camera;
+    public Transform quadT;
     private void Awake()
     {
-        rect = this.GetComponent<RectTransform>();
-        button = this.transform.GetComponent<Button>();
-        canvas.worldCamera=Camera.main;
+        quadT = this.transform.Find("Quad");
+        mat = quadT.GetComponent<MeshRenderer>().material;
+        _Camera=Camera.main;
+    }
+
+    private void Update()
+    {
+        quadT.LookAt(_Camera.transform);
+    }
+
+    public void SetHeightLight(bool isHeightLight)
+    {
+        mat.SetColor("_Color",isHeightLight?new Color(1,1,1,1):new Color(1,1,1,0.5f));
     }
 }

Some files were not shown because too many files changed in this diff