合成

Assets/Data/11.meta

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

Assets/Data/11/11.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Files />

Assets/Data/11/11.xml.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: a99b25dc7d35d9a40858e76158082399
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Data/11/File.meta

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

Assets/Data/11/File/NodeList.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<NodeList>
-  <FirstNode>
-    <NextID>1</NextID>
-    <Nodes>
-      <Node ID="0" Name="1" />
-    </Nodes>
-  </FirstNode>
-  <SecondNode>
-    <NextID>0</NextID>
-    <Nodes />
-  </SecondNode>
-</NodeList>

Assets/Data/11/File/NodeList.xml.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 64e2b34f2d3092045b558b2e239edb99
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Data/19.meta

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

Assets/Data/19/19.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Files />

Assets/Data/19/19.xml.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 36ec21c045b943942917fd0eecd8180b
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Data/19/File.meta

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

Assets/Data/19/File/NodeList.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<NodeList>
-  <FirstNode>
-    <NextID>0</NextID>
-    <Nodes />
-  </FirstNode>
-  <SecondNode>
-    <NextID>0</NextID>
-    <Nodes />
-  </SecondNode>
-</NodeList>

Assets/Data/19/File/NodeList.xml.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 7258a81b32ee2e74f9dd5df933990daf
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scene/MainScene_New/NavMesh-Nav 1.asset.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 6bb1d4b8709fac84bb83e2c2941d0c36
-timeCreated: 1574410529
-licenseType: Free
-NativeFormatImporter:
-  mainObjectFileID: 23800000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scene/MainScene_New/NavMesh-Nav 2.asset.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 7e6dfa31305ed2644bc54e2fcd40f993
-timeCreated: 1575347969
-licenseType: Pro
-NativeFormatImporter:
-  mainObjectFileID: 23800000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scene/MainScene_New/NavMesh-Nav 3.asset.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 135b00b66e43076498af1f5a6556e430
-timeCreated: 1575353251
-licenseType: Pro
-NativeFormatImporter:
-  mainObjectFileID: 23800000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scene/MainScene_New/NavMesh-Nav.asset.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: c2776ed852cdcee49887d26904585f8f
-timeCreated: 1574409005
-licenseType: Free
-NativeFormatImporter:
-  mainObjectFileID: 23800000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scene/MainScene_New/NavMesh-NavCar.asset.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f47e61274e356a94ebe527e01ffaf261
+guid: 92a9c4a007251554392069054e7a6532
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 23800000

Assets/Scene/MainScene_New/NavMesh-NavManLoad.asset.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c2c3052f3fad6594c969eca734911f9f
+guid: 628b237d4ab1fcd41af2a60e1d0991ca
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 23800000

Assets/Scene/MainScene_New/NavMesh-NavManLou_15.asset.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 1dfe6b85d0ec0724fa24b9de94537648
+guid: d32ebaa23f359b4498c53a55d39d387a
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 23800000

Assets/Scene/MainScene_New/NavMesh-NavManLou_16_36.asset.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 057d2e80d34d38c4db5b68f9f52ace9c
+guid: 665e35f5e669b4a44b0ec9e01859f1ae
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 23800000

Assets/Scene/MainScene_New/NavMesh-NavMeshSuf 1.asset.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 24ebd76057b2e554996e06480fc9f921
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 23800000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scene/MainScene_New/NavMesh-NavMeshSuf.asset.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: bfa38ec10f205874f98cb7b56c5de2d3
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 23800000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scene/MainScene_New/NavMesh-NavMeshSufaceCar.asset.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: e3bc25e9da7c169478257d41a2e415bd
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 23800000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scene/MainScene_New/NavMesh-NavMeshSufaceMan.asset.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 47cb470a7f6303e4284f1aee87e49f1a
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 23800000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scene/MainScene_New/NavMesh-NavMeshSurface 1.asset.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 6b6fb256ead0ddb409ed175883fef26b
-timeCreated: 1570587658
-licenseType: Pro
-NativeFormatImporter:
-  mainObjectFileID: 23800000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scene/MainScene_New/NavMesh-NavMeshSurface 2.asset.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 8e43934fbef06664392db4288bac9803
-timeCreated: 1570592856
-licenseType: Free
-NativeFormatImporter:
-  mainObjectFileID: 23800000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scene/MainScene_New/NavMesh-NavMeshSurface.asset.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: c8568bfc2e29bed4c9d5f249da8ae9b1
-timeCreated: 1570588948
-licenseType: Pro
-NativeFormatImporter:
-  mainObjectFileID: 23800000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scene/MainScene_New/NavMesh-ZhongShaNavMeshSurface 1.asset.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 662b031662aaebf42acb26cbd1ccf044
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 23800000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scene/MainScene_New/NavMesh-ZhongShaNavMeshSurface.asset.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 1e2b7a87cfca735499f30d1252fbb9e4
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 23800000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Scripts/CameraControl/CameraManager.cs

@@ -91,11 +91,11 @@ public class CameraManager : MonoBehaviour
             //x = 180f,
             //y = 30f,
             //distance = 95f,
-            x = -12f,
+            x = -60f,
-            y = 38f,
+            y = 36f,
-            distance = 205f,
+            distance = 215f,
             // targetPos = new Vector3(-180.7f, 1.02f, -40f)
-            targetPos = new Vector3(-191f, 10f, 80f)
+            targetPos = new Vector3(-15f, 10f, -8.35f)
         };
         CameraSetting(cdata);
     }

Assets/Scripts/Power/AgentController.cs

@@ -24,6 +24,7 @@ public class AgentController : MonoBehaviour
     private float angularSpeed;
     public List<Vector3> TargetPoint = new List<Vector3>();
     private float oriStopDis;//初始停止距离
+   
     private void Awake()
     {
         pathFindEnable = true;
@@ -304,7 +305,52 @@ public class AgentController : MonoBehaviour
     public void AutoPathFinding(List<Vector3> TargetPoint)
     {
         if (pathFindEnable && !FixedArmFlag)
-            StartCoroutine(PathFinding(TargetPoint));
+        {
+            StopAllCoroutines();
+            corners.Clear();
+            var templeteCorners = new List<Vector3>();
+            for (int i = 0; i < TargetPoint.Count; i++)
+            {
+                if (i == 0)
+                {
+                    templeteCorners.Clear();
+                    bool flag = setPathCorners(transform.position, TargetPoint[i], templeteCorners);
+                    if (flag)
+                    {
+                        foreach (Vector3 point in templeteCorners)
+                        {
+                            corners.Add(point);
+                        }
+
+                    }
+                    else
+                    {
+                        ResourceLoadWindow.Instance.LoadTextHintWindow("不能抵达", 2f);
+                        return;
+                    }
+                }
+                else
+                {
+                    templeteCorners.Clear();
+                    bool flag = setPathCorners(TargetPoint[i - 1], TargetPoint[i], templeteCorners);
+                    if (flag)
+                    {
+                        foreach (Vector3 point in templeteCorners)
+                        {
+                            corners.Add(point);
+                        }
+
+                    }
+                    else
+                    {
+                        ResourceLoadWindow.Instance.LoadTextHintWindow("不能抵达", 2f);
+                        return;
+                    }
+                }
+            }
+            //removeNoMainCorners(corners);
+            StartCoroutine(GoToDestination());
+        }
     }
     IEnumerator PathFinding(List<Vector3> TargetPoint)
     {
@@ -333,15 +379,26 @@ public class AgentController : MonoBehaviour
             yield return true;
         }
     }
-
+    public static bool InNavMesh(Vector3 tagent)
+    {
+        NavMeshHit hit;
+        NavMeshQueryFilter filter = new NavMeshQueryFilter();
+        var agent = GameObject.Find("CarAgent").GetComponent<NavMeshAgent>();
+        filter.agentTypeID = agent.agentTypeID;
+        filter.areaMask = agent.areaMask;
+        var hasHit = NavMesh.SamplePosition(tagent, out hit, 1, filter);
+        return hasHit;
+    }
     public static List<Vector3> LiSan(Vector3 center, int count, Vector3 size)
     {
         List<Vector3> list = new List<Vector3>();
+        list.Add(center);//先加入目的地
+
         int num = 1;
         while (list.Count < count)
         {
             var tagent = new Vector3(center.x, center.y, center.z + size.z * num);
-            if (InNavMesh(center, tagent))
+            if (InNavMesh(tagent))
                 list.Add(tagent);
             else
             {
@@ -354,7 +411,7 @@ public class AgentController : MonoBehaviour
         while (list.Count < count)
         {
             var tagent = new Vector3(center.x, center.y, center.z - size.z * num);
-            if (InNavMesh(center, tagent))
+            if (InNavMesh(tagent))
                 list.Add(tagent);
             else
             {
@@ -367,7 +424,7 @@ public class AgentController : MonoBehaviour
         while (list.Count < count)
         {
             var tagent = new Vector3(center.x + size.x * num, center.y, center.z);
-            if (InNavMesh(center, tagent))
+            if (InNavMesh(tagent))
                 list.Add(tagent);
             else
             {
@@ -380,7 +437,7 @@ public class AgentController : MonoBehaviour
         while (list.Count < count)
         {
             var tagent = new Vector3(center.x - size.x * num, center.y, center.z);
-            if (InNavMesh(center, tagent))
+            if (InNavMesh(tagent))
                 list.Add(tagent);
             else
             {
@@ -389,6 +446,17 @@ public class AgentController : MonoBehaviour
             }
             num++;
         }
+
+        //找到的点不够，添加最后重复点
+        if (list.Count < count)
+        {
+            var point = list[list.Count - 1];
+            for (int i = list.Count; i < count; i++)
+            {
+                var tagent = point;
+                list.Add(tagent);
+            }
+        }
         return list;
     }
     public static bool InNavMesh(Vector3 center, Vector3 tagent)

Assets/Scripts/Power/MultiSelectNAV.cs

@@ -4,6 +4,7 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.AI;
 using UnityEngine.UI;
 
 /// <summary>
@@ -39,35 +40,33 @@ public class MultiSelectNAV : ResourceLoadPanel<MultiSelectNAV>
             MessageDispatcher.RemoveListener("PATH_FINDING_COMMAND", PathFinding);
         pathfindingFlag = Ison;
         InputManager.MutiSelectFind = Ison;
-        if (!Ison) 
+        //if (!Ison) 
-        {
-            if(!pathfindingFlag && TargetPoint.Count > 0)
-            {
-                //MultiSelectNavPath.instance.SetPathFind(TargetPoint, SelectCars);
-                for (int i = 0; i < SelectCars.Count; i++)
-                {
-                    SelectCars[i].GetComponent<AgentController>().MuitiNav(TargetPoint, i);
-                }
-            }
-        }
-        //if (!pathfindingFlag && TargetPoint.Count > 0)
         //{
-        //    var count = TargetPoint.Count;
+        //    if(!pathfindingFlag && TargetPoint.Count > 0)
-        //    var list = AgentController.LiSan(TargetPoint[count - 1], SelectCars.Count, new Vector3(9, 0, 9));
-        //    int indexer = 0;
-        //    if (SelectCars.Count>0&&list.Count>0) 
         //    {
-        //        //开始多选车辆的巡礼操作
+        //        //MultiSelectNavPath.instance.SetPathFind(TargetPoint, SelectCars);
-        //        SelectCars.ForEach((X) =>
+        //        for (int i = 0; i < SelectCars.Count; i++)
         //        {
-        //            TargetPoint[count - 1] = list[indexer];
+        //            SelectCars[i].GetComponent<AgentController>().MuitiNav(TargetPoint, i);
-        //            X.GetComponent<AgentController>().AutoPathFinding(TargetPoint);
+        //        }
-        //            indexer++;
-        //        });
-        //        //  TargetPoint.Clear();
         //    }
-
         //}
+        if (!pathfindingFlag && TargetPoint.Count > 0)
+        {
+            var count = TargetPoint.Count;
+            //最后目标点找到各车的停靠点
+            var list = AgentController.LiSan(TargetPoint[count - 1], SelectCars.Count, new Vector3(9, 0, 9));
+            int indexer = 0;
+            //开始多选车辆的巡礼操作
+            SelectCars.ForEach((X) =>
+            {
+                TargetPoint[count - 1] = list[indexer];
+                X.GetComponent<AgentController>().AutoPathFinding(TargetPoint);
+                indexer++;
+            });
+            //  TargetPoint.Clear();
+        }
+       
     }
 
     public void AddSelectCar(GameObject Car)
@@ -162,4 +161,12 @@ public class MultiSelectNAV : ResourceLoadPanel<MultiSelectNAV>
         
         }
     }
+    private void OnDestroy()
+    {
+        MessageDispatcher.RemoveListener("PATH_FINDING_COMMAND", PathFinding);
+        MessageDispatcher.RemoveListener("RADIO_SELECTED_COMMAND", RadioSelect);
+        SelectCars.Clear();
+        TargetPoint.Clear();
+        NAVSelectCarItem.SelectCarItem.Clear();
+    }
 }

Assets/Scripts/Power/NAVSelectCarItem.cs

@@ -60,4 +60,14 @@ public class NAVSelectCarItem : MonoBehaviour
         SelectCarItem.Remove(this);
         Destroy(gameObject);
     }
+    private void OnDestroy()
+    {
+        if (SelectCarItem.Contains(this))
+        {
+            SelectCarItem.Remove(this);
+        }
+        MultiSelectNAV.GetInstance.RemoveSelectCar(SelectCar);
+        MessageDispatcher.RemoveListener("RemoveSelectCar", RemoveSelectCar);
+        MessageDispatcher.RemoveListener("DeleteObj", DeleteObj);
+    }
 }

Assets/Scripts/UIScripts/AreaNameDic.cs

@@ -10,12 +10,10 @@ public class AreaNameDic
         if (NameDic==null)
         {
             NameDic = new Dictionary<string, string>();
-            NameDic.Add("A", "厂房");
+            NameDic.Add("A", "东方渔人码头");
-            NameDic.Add("B", "信息灾备楼");
+          
-            NameDic.Add("C", "行管楼");
-            NameDic.Add("D", "中央化验室");
         }
         return NameDic[area];
     }
-    public static SceneType type=SceneType.chemicalBuilding;
+    public static SceneType type=SceneType.highRiseBuilding;
 }

Assets/StreamingAssets/Data.meta

@@ -1,9 +1,8 @@
 fileFormatVersion: 2
 guid: e7b34b97845d54d468a1a17dd81ef955
 folderAsset: yes
-timeCreated: 1570866228
-licenseType: Free
 DefaultImporter:
+  externalObjects: {}
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/StreamingAssets/Data/7.meta

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

Assets/StreamingAssets/Data/7/7.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Files />

Assets/StreamingAssets/Data/7/7.xml.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 570913ec0d195d34484dbfe401d113ab
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/Data/7/File.meta

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

Assets/StreamingAssets/Data/7/File/NodeList.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<NodeList>
-  <FirstNode>
-    <NextID>1</NextID>
-    <Nodes>
-      <Node ID="0" Name="1" />
-    </Nodes>
-  </FirstNode>
-  <SecondNode>
-    <NextID>3</NextID>
-    <Nodes>
-      <Node ID="0" ParentID="0" Name="1.1" Detail="" />
-      <Node ID="1" ParentID="0" Name="1.2" Detail="" />
-      <Node ID="2" ParentID="0" Name="1.3" Detail="" />
-    </Nodes>
-  </SecondNode>
-</NodeList>

Assets/StreamingAssets/Data/7/File/NodeList.xml.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: da1039b4724adc44b97483988ff268ad
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/Data/7/File/XmlData.meta

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

Assets/StreamingAssets/Data/7/File/XmlData/1.3.xml.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: c0ee7819507b0b848a01c478f46fb71f
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/Data/DisasterInfos.xml

@@ -1,8 +1,3 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <DisasterInfoList>
-  <DisasterInfo>
-    <Id>19</Id>
-    <LastTime>2021/11/25 14:07:14</LastTime>
-    <Name>1</Name>
-  </DisasterInfo>
 </DisasterInfoList>