From 8d88b6e7f4102767fcc8a4be898932ceb00f0bbe Mon Sep 17 00:00:00 2001 From: "DESKTOP-KFV16CV\\cyt" <2268162076@qq.com> Date: Fri, 18 Sep 2020 10:32:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=AB=98=E5=B1=82=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scripts/Common/Cars/AgentController.cs | 31 ++- .../Scripts/Common/Fireman/FireManControl.cs | 18 +- .../Associated/TruckBindWaterSource.cs | 28 +-- .../FiremanSkill/LayWaterHose/LayWaterHose.cs | 195 +++++++++++------- .../SkillPanel/FireManSkillPanelController.cs | 12 +- 5 files changed, 183 insertions(+), 101 deletions(-) diff --git a/Assets/Scripts/Common/Cars/AgentController.cs b/Assets/Scripts/Common/Cars/AgentController.cs index 06a9687..eea746d 100644 --- a/Assets/Scripts/Common/Cars/AgentController.cs +++ b/Assets/Scripts/Common/Cars/AgentController.cs @@ -31,7 +31,7 @@ public class AgentController : MonoBehaviour public bool pathFindEnable; private bool begionmove = false; private BaseGameObjInfo gameobjinfo; - // public bool FixedArmFlag; + // public bool FixedArmFlag; private void Awake() { @@ -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; } } @@ -91,7 +91,7 @@ public class AgentController : MonoBehaviour begionmove = false; } } - + } } void OnEnable() @@ -110,17 +110,17 @@ public class AgentController : MonoBehaviour } private void PathFinding(IMessage obj) { - if (SelectedObjs.selectedCharacters.Contains(gameObject) + if (SelectedObjs.selectedCharacters.Contains(gameObject) || SelectedObjs.selectedObj == gameObject || SelectedObjs.selectedRolePlay == gameObject //瑙掕壊 ) { if (pathFindEnable /*&& !FixedArmFlag*/) { - if (GetComponent()) + if (GetComponent()) { - if (GetComponent().WorkType== FireRobotSkill.出水|| - GetComponent().WorkType == FireRobotSkill.出泡沫) + if (GetComponent().WorkType == FireRobotSkill.出水 || + GetComponent().WorkType == FireRobotSkill.出泡沫) { if (GetComponent().remainlenght < 0.5f) { @@ -128,6 +128,19 @@ public class AgentController : MonoBehaviour } } } + if (GetComponent()) + { + if (GetComponent().WorkType == FireManSkills.SprayFoam || + GetComponent().WorkType == FireManSkills.SprayWater + ) + { + if (GetComponent().remainlenght < 0.5f) + { + return; + } + } + + } begionmove = true; var data = (PathFindingCmdArgs)obj.Data; pointhit = data.hitPoint; diff --git a/Assets/Scripts/Common/Fireman/FireManControl.cs b/Assets/Scripts/Common/Fireman/FireManControl.cs index dcee735..d12995e 100644 --- a/Assets/Scripts/Common/Fireman/FireManControl.cs +++ b/Assets/Scripts/Common/Fireman/FireManControl.cs @@ -742,13 +742,17 @@ public class FireManControl : MonoBehaviour } else { - float realewater = 0;//实际分到的水量=自己的流量/直接水源的总流量*直接水源总水量 - float dirTotalFlow = waterhosemanage.ConnentSource.GetComponent().TotalFlow; - realewater = (Flow / dirTotalFlow) * remainwater; - if (Flow != 0) - remaintime = Mathf.CeilToInt(realewater / Flow); - else - remaintime = 0; + if (waterhosemanage.ConnentSource) + { + float realewater = 0;//实际分到的水量=自己的流量/直接水源的总流量*直接水源总水量 + float dirTotalFlow = waterhosemanage.ConnentSource.GetComponent().TotalFlow; + realewater = (Flow / dirTotalFlow) * remainwater; + if (Flow != 0) + remaintime = Mathf.CeilToInt(realewater / Flow); + else + remaintime = 0; + } + } remain = new KeyValuePair(remaintime, remainwater); diff --git a/Assets/Scripts/DongYouLiQing/BaseCommander/FiremanSkill/Associated/TruckBindWaterSource.cs b/Assets/Scripts/DongYouLiQing/BaseCommander/FiremanSkill/Associated/TruckBindWaterSource.cs index 7d36148..6117f0f 100644 --- a/Assets/Scripts/DongYouLiQing/BaseCommander/FiremanSkill/Associated/TruckBindWaterSource.cs +++ b/Assets/Scripts/DongYouLiQing/BaseCommander/FiremanSkill/Associated/TruckBindWaterSource.cs @@ -2256,20 +2256,24 @@ public class TruckBindWaterSource : MonoBehaviour } for (int i = 0; i < allwatersource.Count; i++) { - WaterSource ws = EntitiesManager.Instance.GetEntityByID(allwatersource[i]).GetComponent(); - if (ws.TotalWater != -100) + if (EntitiesManager.Instance.GetEntityByID(allwatersource[i])) { - remainwater += (ws.TotalWater - ws.AllUserWater); - //if (ws.GetComponent()) - //{ - // allflow += ws.GetComponent().Flow; - //} - } - else - { - remainwater = -100; - break; + WaterSource ws = EntitiesManager.Instance.GetEntityByID(allwatersource[i]).GetComponent(); + if (ws.TotalWater != -100) + { + remainwater += (ws.TotalWater - ws.AllUserWater); + //if (ws.GetComponent()) + //{ + // allflow += ws.GetComponent().Flow; + //} + } + else + { + remainwater = -100; + break; + } } + } int remaintime = 0; //allflow += Flow; diff --git a/Assets/Scripts/DongYouLiQing/BaseCommander/FiremanSkill/LayWaterHose/LayWaterHose.cs b/Assets/Scripts/DongYouLiQing/BaseCommander/FiremanSkill/LayWaterHose/LayWaterHose.cs index b12bbb5..50493f7 100644 --- a/Assets/Scripts/DongYouLiQing/BaseCommander/FiremanSkill/LayWaterHose/LayWaterHose.cs +++ b/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().WaterHoseLenghtRemain; - + if (remainlenght <= 0) + { + return; + } endPoint = transform.position; //LayLenght= GetSelfConsumedLength(); if (remainlenght > 0 && remainlenght <= 0.5f) //临界带 @@ -335,72 +341,84 @@ public class LayWaterHose : MonoBehaviour //如果当前起始位置与上一次铺设的末点距离较近，则认为此次铺设是上一次铺设的继续 if (endPoint != Vector3.zero && Vector3.Distance(transform.position, endPoint) < 5) { - //如果放下期间已经被别人捡起,重新铺设 - if (ParentLayHose.GetComponent().ConnectFireman != null) + if (ParentLayHose) { - lengthDic.Clear(); - if (GetComponent().WaterHoseLenghtRemain <= 0) + //如果放下期间已经被别人捡起,重新铺设 + if (ParentLayHose.GetComponent().ConnectFireman != null) { - if (IsselfCurrent) + lengthDic.Clear(); + if (GetComponent().WaterHoseLenghtRemain <= 0) { - LoadPromptWin.Instance.LoadTextPromptWindow("未装备水带或水带已用完", 1f); + if (IsselfCurrent) + { + LoadPromptWin.Instance.LoadTextPromptWindow("未装备水带或水带已用完", 1f); + } + return; } - return; - } - //ParentLayHose = EntitiesManager.Instance.CreateObj(ParentLayHosePrefabs, Vector3.zero, - // WaterHoses.transform, EntitiesManager.Instance.CreateObjID(CurrentUserInfo.mySelf.Id)); // Instantiate(ParentLayHosePrefabs, WaterHoses.transform); - ParentLayHose = Instantiate(ParentLayHosePrefabs, WaterHoses.transform); - //ParentLayHose.GetComponent().gameObjID = EntitiesManager.Instance.CreateObjID(CurrentUserInfo.mySelf.Id); - ParentLayHose.name = "LayWaterHose" + creatnum; - creatnum++; - ParentLayHose.GetComponent().ConnectFireman = gameObject; - allInits.Clear(); - AddInit(); - endPoint = transform.position; - flag = true; - - } - //如果放下期间没有被别人捡起,继续铺设 - else - { - //更新消防员可用水带 - if (ParentLayHose.GetComponent().RemainLenght > 0) - { - //if((GetComponent().OverLenght==0)) + //ParentLayHose = EntitiesManager.Instance.CreateObj(ParentLayHosePrefabs, Vector3.zero, + // WaterHoses.transform, EntitiesManager.Instance.CreateObjID(CurrentUserInfo.mySelf.Id)); // Instantiate(ParentLayHosePrefabs, WaterHoses.transform); + ParentLayHose = Instantiate(ParentLayHosePrefabs, WaterHoses.transform); + //ParentLayHose.GetComponent().gameObjID = EntitiesManager.Instance.CreateObjID(CurrentUserInfo.mySelf.Id); + ParentLayHose.name = "LayWaterHose" + creatnum; + creatnum++; + ParentLayHose.GetComponent().ConnectFireman = gameObject; + allInits.Clear(); + AddInit(); + endPoint = transform.position; + if (!GetComponent().pathFindEnable) { - //GetComponent().WaterHoseLenghtRemain = - // GetComponent().NowRemainWaterHose * 20 + ParentLayHose.GetComponent().RemainLenght+GetComponent().OverLenght; - //GetComponent().NowRemainWaterHose = GetComponent().NowRemainWaterHose + ParentLayHose.GetComponent().UseNum; - GetComponent().CalculateBeforelay(ParentLayHose.GetComponent().RemainLenght, ParentLayHose.GetComponent().UseNum); + GetComponent().pathFindEnable = true; } + flag = true; + } - //更新消防员水源信息 - if (ParentLayHose.GetComponent().WaterSource != null) + //如果放下期间没有被别人捡起,继续铺设 + else { - if (issync == false) + //更新消防员可用水带 + if (ParentLayHose.GetComponent().RemainLenght > 0) { - gameObject.GetComponent().ResetWaterSourceConnectInfo - (true, ParentLayHose.GetComponent().ConnectWater, - ParentLayHose.GetComponent().ConnectFoam, ParentLayHose.GetComponent().WaterSource, - ParentLayHose.GetComponent().ConnectWaterHose); - if (/*FindObjectOfType()*/FireManSkillPanelController.Instance) + //if((GetComponent().OverLenght==0)) { - FireManSkillPanelController.Instance.SprayWater.GetComponent().interactable = true; + //GetComponent().WaterHoseLenghtRemain = + // GetComponent().NowRemainWaterHose * 20 + ParentLayHose.GetComponent().RemainLenght+GetComponent().OverLenght; + //GetComponent().NowRemainWaterHose = GetComponent().NowRemainWaterHose + ParentLayHose.GetComponent().UseNum; + GetComponent().CalculateBeforelay(ParentLayHose.GetComponent().RemainLenght, ParentLayHose.GetComponent().UseNum); } } + //更新消防员水源信息 + if (ParentLayHose.GetComponent().WaterSource != null) + { + if (issync == false) + { + gameObject.GetComponent().ResetWaterSourceConnectInfo + (true, ParentLayHose.GetComponent().ConnectWater, + ParentLayHose.GetComponent().ConnectFoam, ParentLayHose.GetComponent().WaterSource, + ParentLayHose.GetComponent().ConnectWaterHose); + if (/*FindObjectOfType()*/FireManSkillPanelController.Instance) + { + FireManSkillPanelController.Instance.SprayWater.GetComponent().interactable = true; + } + } - } - else - { - if (issync == false) + } + else + { + if (issync == false) + { + gameObject.GetComponent().ResetWaterSourceConnectInfo(false, false, false, null, null); + } + } + if (!GetComponent().pathFindEnable) { - gameObject.GetComponent().ResetWaterSourceConnectInfo(false, false, false, null, null); + GetComponent().pathFindEnable = true; } + flag = true; + ParentLayHose.GetComponent().ConnectFireman = gameObject; } - flag = true; - ParentLayHose.GetComponent().ConnectFireman = gameObject; + //AddInit(); } - //AddInit(); + } //如果当前起始位置与上一次铺设的末点距离较远，则认为开始一段新的铺设，不会收回上一次铺设的管线 @@ -413,25 +431,36 @@ public class LayWaterHose : MonoBehaviour { LoadPromptWin.Instance.LoadTextPromptWindow("未装备水带或水带已用完", 1f); } + GetComponent().pathFindEnable = false; + allInits.Clear(); + AddInit(); + endPoint = Vector3.zero; + flag = false; return; } - ParentLayHose = Instantiate(ParentLayHosePrefabs, WaterHoses.transform); - ParentLayHose.name = "LayWaterHose" + creatnum; - creatnum++; - ParentLayHose.GetComponent().ConnectFireman = gameObject; - //GetComponent().TackUpLenght = 0; - //如果铺设时消防员被管线连接，给该水带赋值水源信息 - if (GetComponent().IsConnentWaterLine) + else { - FireManWaterHoseManager thisFireman = GetComponent(); - ParentLayHose.GetComponent().BindWaterSource(thisFireman.hasWaterConnect, thisFireman.hasFoamConnect, thisFireman.ConnentSource, thisFireman.WaterLineConnent); - } - - allInits.Clear(); - AddInit(); - endPoint = transform.position; - flag = true; + ParentLayHose = Instantiate(ParentLayHosePrefabs, WaterHoses.transform); + ParentLayHose.name = "LayWaterHose" + creatnum; + creatnum++; + ParentLayHose.GetComponent().ConnectFireman = gameObject; + //GetComponent().TackUpLenght = 0; + //如果铺设时消防员被管线连接，给该水带赋值水源信息 + if (GetComponent().IsConnentWaterLine) + { + FireManWaterHoseManager thisFireman = GetComponent(); + ParentLayHose.GetComponent().BindWaterSource(thisFireman.hasWaterConnect, thisFireman.hasFoamConnect, thisFireman.ConnentSource, thisFireman.WaterLineConnent); + } + allInits.Clear(); + AddInit(); + endPoint = transform.position; + if (!GetComponent().pathFindEnable) + { + GetComponent().pathFindEnable = true; + } + flag = true; + } } } @@ -451,7 +480,7 @@ public class LayWaterHose : MonoBehaviour public void StartSprayingLay(bool issync = false) { agent.SetDestination(transform.position); - if (!GetComponent().pathFindEnable) + //if (!GetComponent().pathFindEnable) { GetComponent().pathFindEnable = true; } @@ -464,6 +493,16 @@ public class LayWaterHose : MonoBehaviour } if (endPoint != Vector3.zero && Vector3.Distance(transform.position, endPoint) < 5) { + if (ParentLayHose.GetComponent().RemainLenght > 0) + { + //if((GetComponent().OverLenght==0)) + { + //GetComponent().WaterHoseLenghtRemain = + // GetComponent().NowRemainWaterHose * 20 + ParentLayHose.GetComponent().RemainLenght+GetComponent().OverLenght; + //GetComponent().NowRemainWaterHose = GetComponent().NowRemainWaterHose + ParentLayHose.GetComponent().UseNum; + GetComponent().CalculateBeforelay(ParentLayHose.GetComponent().RemainLenght, ParentLayHose.GetComponent().UseNum); + } + } if (ParentLayHose.GetComponent().WaterSource != null) { if (issync == false) @@ -491,6 +530,7 @@ public class LayWaterHose : MonoBehaviour // GetComponent().NowRemainWaterHose = GetComponent().NowRemainWaterHose + ParentLayHose.GetComponent().UseNum; GetComponent().CalculateBeforelay(ParentLayHose.GetComponent().RemainLenght, ParentLayHose.GetComponent().UseNum); flag = true; + GetComponent().pathFindEnable = true; } else { @@ -502,8 +542,17 @@ public class LayWaterHose : MonoBehaviour AddInit(); //将当前位置作为起点 endPoint = transform.position; lengthDic.Clear(); - + remainlenght = GetComponent().WaterHoseLenghtRemain; + if (remainlenght <= 0) + { + GetComponent().pathFindEnable = false; + } + else + { + GetComponent().pathFindEnable = true; + } } + // GetComponent().pathFindEnable = true; canreinit = false; flag = true; spraying = true; @@ -564,6 +613,14 @@ public class LayWaterHose : MonoBehaviour GetComponent().workType == FireManSkills.SprayWater) { GetComponent().pathFindEnable = false; + remainlenght = GetComponent().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); } } diff --git a/Assets/Scripts/DongYouLiQing/BaseCommander/SkillPanel/FireManSkillPanelController.cs b/Assets/Scripts/DongYouLiQing/BaseCommander/SkillPanel/FireManSkillPanelController.cs index dccebcb..e11fbd0 100644 --- a/Assets/Scripts/DongYouLiQing/BaseCommander/SkillPanel/FireManSkillPanelController.cs +++ b/Assets/Scripts/DongYouLiQing/BaseCommander/SkillPanel/FireManSkillPanelController.cs @@ -915,10 +915,14 @@ public class FireManSkillPanelController : MonoBehaviour //InputManager.skill = true; SelectFireMan.GetComponent().workType = FireManSkills.LayWaterHose; - if (!SelectFireMan.GetComponent().pathFindEnable) - { - SelectFireMan.GetComponent().pathFindEnable = true; - } + + //if (SelectFireMan.GetComponent().WaterHoseLenghtRemain <= 0) + //{ + // LoadPromptWin.Instance.LoadTextPromptWindow("未装备水带或水带已用完", 1f); + // LayWaterHoseToggle.transform.Find("Label").GetComponent().text = "放下水带"; + // return; + //} + SelectFireMan.GetComponent().StartLay(); LayWaterHoseToggle.transform.Find("Label").GetComponent().text = "放下水带";