同步高层修改

Assets/Scripts/Common/Cars/AgentController.cs

@@ -57,7 +57,7 @@ public class AgentController : MonoBehaviour
     //check for mouse input
     void Update()
     {
-        if (begionmove==true)
+        if (begionmove == true)
         {
             if (gameobjinfo.gameObjType == CloneObjType.fireman)
             {
@@ -67,11 +67,11 @@ public class AgentController : MonoBehaviour
                     {
                         SenderId = CurrentUserInfo.mySelf.Id,
                         GameObjId = gameobjinfo.gameObjID,
-                        Hitpoint=pointhit,
+                        Hitpoint = pointhit,
                         EndRotation = new Vector3(transform.rotation.eulerAngles.x,
                         transform.rotation.eulerAngles.y, transform.rotation.eulerAngles.z)
                     };
-                    NetworkManager.Default.SendAsync("ABJUST_ROTATION_SYNC",arg);
+                    NetworkManager.Default.SendAsync("ABJUST_ROTATION_SYNC", arg);
                     begionmove = false;
                 }
             }
@@ -119,7 +119,7 @@ public class AgentController : MonoBehaviour
             {
                 if (GetComponent<FireRobotController>())
                 {
-                    if (GetComponent<FireRobotController>().WorkType== FireRobotSkill.出水||
+                    if (GetComponent<FireRobotController>().WorkType == FireRobotSkill.出水 ||
                         GetComponent<FireRobotController>().WorkType == FireRobotSkill.出泡沫)
                     {
                         if (GetComponent<FireRobotLayWaterHose>().remainlenght < 0.5f)
@@ -128,6 +128,19 @@ public class AgentController : MonoBehaviour
                         }
                     }
                 }
+                if (GetComponent<FireManControl>())
+                {
+                    if (GetComponent<FireManControl>().WorkType == FireManSkills.SprayFoam ||
+                        GetComponent<FireManControl>().WorkType == FireManSkills.SprayWater
+                       )
+                    {
+                        if (GetComponent<LayWaterHose>().remainlenght < 0.5f)
+                        {
+                            return;
+                        }
+                    }
+
+                }
                 begionmove = true;
                 var data = (PathFindingCmdArgs)obj.Data;
                 pointhit = data.hitPoint;

Assets/Scripts/Common/Fireman/FireManControl.cs

@@ -741,6 +741,8 @@ public class FireManControl : MonoBehaviour
             remaintime = -100;
         }
         else
+        {
+            if (waterhosemanage.ConnentSource)
             {
                 float realewater = 0;//实际分到的水量=自己的流量/直接水源的总流量*直接水源总水量
                 float dirTotalFlow = waterhosemanage.ConnentSource.GetComponent<WaterSource>().TotalFlow;
@@ -750,6 +752,8 @@ public class FireManControl : MonoBehaviour
                 else
                     remaintime = 0;
             }
+
+        }
         remain = new KeyValuePair<int, float>(remaintime, remainwater);
 
 

Assets/Scripts/DongYouLiQing/BaseCommander/FiremanSkill/Associated/TruckBindWaterSource.cs

@@ -2255,6 +2255,8 @@ public class TruckBindWaterSource : MonoBehaviour
             allwatersource.Add(GetComponent<BaseGameObjInfo>().gameObjID);
         }
         for (int i = 0; i < allwatersource.Count; i++)
+        {
+            if (EntitiesManager.Instance.GetEntityByID(allwatersource[i]))
             {
                 WaterSource ws = EntitiesManager.Instance.GetEntityByID(allwatersource[i]).GetComponent<WaterSource>();
                 if (ws.TotalWater != -100)
@@ -2271,6 +2273,8 @@ public class TruckBindWaterSource : MonoBehaviour
                     break;
                 }
             }
+
+        }
         int remaintime = 0;
         //allflow += Flow;
         if (remainwater == -100)

Assets/Scripts/DongYouLiQing/BaseCommander/FiremanSkill/LayWaterHose/LayWaterHose.cs

@@ -156,12 +156,18 @@ public class LayWaterHose : MonoBehaviour
     // Update is called once per frame
     void Update()
     {
-
+        if (!flag)
+        {
+            return;
+        }
         //Debug.Log(flag+"//"+ agent.velocity.magnitude );
         if (flag && agent.velocity.magnitude > 0) //开启“铺设水带”，并且开始寻路时才会执行
         {
             remainlenght = GetComponent<FireManWaterHoseManager>().WaterHoseLenghtRemain;
-
+            if (remainlenght <= 0)
+            {
+                return;
+            }
             endPoint = transform.position;
             //LayLenght= GetSelfConsumedLength();
             if (remainlenght > 0 && remainlenght <= 0.5f) //临界带
@@ -334,6 +340,8 @@ public class LayWaterHose : MonoBehaviour
 
         //如果当前起始位置与上一次铺设的末点距离较近，则认为此次铺设是上一次铺设的继续
         if (endPoint != Vector3.zero && Vector3.Distance(transform.position, endPoint) < 5)
+        {
+            if (ParentLayHose)
             {
                 //如果放下期间已经被别人捡起,重新铺设
                 if (ParentLayHose.GetComponent<ParentLayWaterHoseMsg>().ConnectFireman != null)
@@ -357,6 +365,10 @@ public class LayWaterHose : MonoBehaviour
                     allInits.Clear();
                     AddInit();
                     endPoint = transform.position;
+                    if (!GetComponent<AgentController>().pathFindEnable)
+                    {
+                        GetComponent<AgentController>().pathFindEnable = true;
+                    }
                     flag = true;
 
                 }
@@ -397,10 +409,16 @@ public class LayWaterHose : MonoBehaviour
                             gameObject.GetComponent<FireManWaterHoseManager>().ResetWaterSourceConnectInfo(false, false, false, null, null);
                         }
                     }
+                    if (!GetComponent<AgentController>().pathFindEnable)
+                    {
+                        GetComponent<AgentController>().pathFindEnable = true;
+                    }
                     flag = true;
                     ParentLayHose.GetComponent<ParentLayWaterHoseMsg>().ConnectFireman = gameObject;
                 }
                 //AddInit();
+            }
+
 
         }
         //如果当前起始位置与上一次铺设的末点距离较远，则认为开始一段新的铺设，不会收回上一次铺设的管线
@@ -413,8 +431,15 @@ public class LayWaterHose : MonoBehaviour
                 {
                     LoadPromptWin.Instance.LoadTextPromptWindow("未装备水带或水带已用完", 1f);
                 }
+                GetComponent<AgentController>().pathFindEnable = false;
+                allInits.Clear();
+                AddInit();
+                endPoint = Vector3.zero;
+                flag = false;
                 return;
             }
+            else
+            {
                 ParentLayHose = Instantiate(ParentLayHosePrefabs, WaterHoses.transform);
                 ParentLayHose.name = "LayWaterHose" + creatnum;
                 creatnum++;
@@ -430,8 +455,12 @@ public class LayWaterHose : MonoBehaviour
                 allInits.Clear();
                 AddInit();
                 endPoint = transform.position;
+                if (!GetComponent<AgentController>().pathFindEnable)
+                {
+                    GetComponent<AgentController>().pathFindEnable = true;
+                }
                 flag = true;
-
+            }
         }
     }
 
@@ -451,7 +480,7 @@ public class LayWaterHose : MonoBehaviour
     public void StartSprayingLay(bool issync = false)
     {
         agent.SetDestination(transform.position);
-        if (!GetComponent<AgentController>().pathFindEnable)
+        //if (!GetComponent<AgentController>().pathFindEnable)
         {
             GetComponent<AgentController>().pathFindEnable = true;
         }
@@ -464,6 +493,16 @@ public class LayWaterHose : MonoBehaviour
         }
         if (endPoint != Vector3.zero && Vector3.Distance(transform.position, endPoint) < 5)
         {
+            if (ParentLayHose.GetComponent<ParentLayWaterHoseMsg>().RemainLenght > 0)
+            {
+                //if((GetComponent<FireManWaterHoseManager>().OverLenght==0))
+                {
+                    //GetComponent<FireManWaterHoseManager>().WaterHoseLenghtRemain =
+                    // GetComponent<FireManWaterHoseManager>().NowRemainWaterHose * 20 + ParentLayHose.GetComponent<ParentLayWaterHoseMsg>().RemainLenght+GetComponent<FireManWaterHoseManager>().OverLenght;
+                    //GetComponent<FireManWaterHoseManager>().NowRemainWaterHose = GetComponent<FireManWaterHoseManager>().NowRemainWaterHose + ParentLayHose.GetComponent<ParentLayWaterHoseMsg>().UseNum;
+                    GetComponent<FireManWaterHoseManager>().CalculateBeforelay(ParentLayHose.GetComponent<ParentLayWaterHoseMsg>().RemainLenght, ParentLayHose.GetComponent<ParentLayWaterHoseMsg>().UseNum);
+                }
+            }
             if (ParentLayHose.GetComponent<ParentLayWaterHoseMsg>().WaterSource != null)
             {
                 if (issync == false)
@@ -491,6 +530,7 @@ public class LayWaterHose : MonoBehaviour
             // GetComponent<FireManWaterHoseManager>().NowRemainWaterHose = GetComponent<FireManWaterHoseManager>().NowRemainWaterHose + ParentLayHose.GetComponent<ParentLayWaterHoseMsg>().UseNum;
             GetComponent<FireManWaterHoseManager>().CalculateBeforelay(ParentLayHose.GetComponent<ParentLayWaterHoseMsg>().RemainLenght, ParentLayHose.GetComponent<ParentLayWaterHoseMsg>().UseNum);
             flag = true;
+            GetComponent<AgentController>().pathFindEnable = true;
         }
         else
         {
@@ -502,8 +542,17 @@ public class LayWaterHose : MonoBehaviour
             AddInit(); //将当前位置作为起点 
             endPoint = transform.position;
             lengthDic.Clear();
-
+            remainlenght = GetComponent<FireManWaterHoseManager>().WaterHoseLenghtRemain;
+            if (remainlenght <= 0)
+            {
+                GetComponent<AgentController>().pathFindEnable = false;
+            }
+            else
+            {
+                GetComponent<AgentController>().pathFindEnable = true;
+            }
         }
+        // GetComponent<AgentController>().pathFindEnable = true;
         canreinit = false;
         flag = true;
         spraying = true;
@@ -564,6 +613,14 @@ public class LayWaterHose : MonoBehaviour
             GetComponent<FireManControl>().workType == FireManSkills.SprayWater)
         {
             GetComponent<AgentController>().pathFindEnable = false;
+            remainlenght = GetComponent<FireManWaterHoseManager>().WaterHoseLenghtRemain;
+            if (remainlenght <= 0 && GetSelfConsumedLength() < 1f)
+            {
+                allInits.Clear(); //与之前铺设的水带切断联系
+                AddInit(); //将当前位置作为起点 
+                endPoint = Vector3.zero;
+                lengthDic.Clear();
+            }
         }
         // StartCoroutine(closespraytoggle());
         //if (!(endPoint != Vector3.zero && Vector3.Distance(transform.position, endPoint) < 5)) 
@@ -950,7 +1007,7 @@ public class LayWaterHose : MonoBehaviour
                 }
                 else
                 {
-                    LoadPromptWin.Instance.LoadTextPromptWindow("距离太远，无法自动拿起管线", 1f);
+                    LoadPromptWin.Instance.LoadTextPromptWindow("距离放下水带太远，无法自动拿起管线，请靠近当前放下管线或者重新连接水源", 1f);
                 }
 
             }

Assets/Scripts/DongYouLiQing/BaseCommander/SkillPanel/FireManSkillPanelController.cs

@@ -915,10 +915,14 @@ public class FireManSkillPanelController : MonoBehaviour
             //InputManager.skill = true;
             SelectFireMan.GetComponent<FireManControl>().workType = FireManSkills.LayWaterHose;
 
-            if (!SelectFireMan.GetComponent<AgentController>().pathFindEnable)
+
-            {
+            //if (SelectFireMan.GetComponent<FireManWaterHoseManager>().WaterHoseLenghtRemain <= 0) 
-                SelectFireMan.GetComponent<AgentController>().pathFindEnable = true;
+            //{
-            }
+            //    LoadPromptWin.Instance.LoadTextPromptWindow("未装备水带或水带已用完", 1f);
+            //    LayWaterHoseToggle.transform.Find("Label").GetComponent<Text>().text = "放下水带";
+            //    return;
+            //}
+
             SelectFireMan.GetComponent<LayWaterHose>().StartLay();
             LayWaterHoseToggle.transform.Find("Label").GetComponent<Text>().text = "放下水带";