diff --git a/Assets/SenSorSystem/MianQian_SenSor.cs b/Assets/SenSorSystem/MianQian_SenSor.cs index aa2f60c..fda5dd6 100644 --- a/Assets/SenSorSystem/MianQian_SenSor.cs +++ b/Assets/SenSorSystem/MianQian_SenSor.cs @@ -30,7 +30,10 @@ public class MianQian_SenSor : Sensor [SerializeField] Text txt; - + [HideInInspector] + public bool isOpen; + float time; + float lastTime; private void Start() { GameManager.Instance.senSor.SendFunction("+++"); @@ -42,12 +45,27 @@ public class MianQian_SenSor : Sensor if (!datas.Split("OK")[0].Split("ID:")[1].Split(',')[0].Equals("MQ")) return; //if (!datas.Split("OK")[0].Split("ID:")[1].Split(',')[0].Equals("ZSQ20")) return; //this.Error(datas); + lastTime = time; X = float.Parse(datas.Split("OK")[0].Split("PIT:")[1].Split(',')[0]); Y = float.Parse(datas.Split("OK")[0].Split("YAW:")[1].Split(',')[0]); Z = float.Parse(datas.Split("OK")[0].Split("ROL:")[1].Split(',')[0]); //this.Error($"当前旋转角度为:{X},{Y},{Z}"); } + private void Update() + { + time += Time.deltaTime; + if (time - lastTime < 1.0f) + { + isOpen = true; + } + else + { + isOpen = false; + //progressValue = 0; + } + } + public override void Display(string datas) { base.Display(datas); diff --git a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/QingJieBaoPiKouState.cs b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/QingJieBaoPiKouState.cs index 16edaf7..367edb2 100644 --- a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/QingJieBaoPiKouState.cs +++ b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/QingJieBaoPiKouState.cs @@ -16,7 +16,7 @@ namespace DongWuYiXue.DaoNiaoShu xiaoDu = GameManager.Instance.transform.parent.FindFirst("pasted__pasted__SM_MianQiu7"); nieZi = GameManager.Instance.transform.parent.FindFirst("手拿镊子消毒"); - //nieZi.transform.localEulerAngles = Vector3.zero; + nieZi.transform.localEulerAngles = Vector3.zero; mianQian = GameManager.Instance.senSor.GetSensor(); fsm.ShowCamera("清洁包皮口1_Camera"); fsm.Light_EnableInteraction("氯己定棉球"); @@ -63,7 +63,10 @@ namespace DongWuYiXue.DaoNiaoShu { base.OnStateStay(); //nieZi.transform.localEulerAngles = new Vector3(0, mianQian.Y, -mianQian.X); - nieZi.transform.rotation = Quaternion.Euler(new Vector3(mianQian.Z, mianQian.Y, -mianQian.X)); + if (mianQian.isOpen) + { + nieZi.transform.rotation = Quaternion.Euler(new Vector3(mianQian.Z, mianQian.Y, -mianQian.X)); + } if (xiaoDu.colliderNum >= 4) { xiaoDu.ExitCollider(); diff --git a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/QingJieNiaoDaoKouState.cs b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/QingJieNiaoDaoKouState.cs index 619c694..da911d2 100644 --- a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/QingJieNiaoDaoKouState.cs +++ b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/QingJieNiaoDaoKouState.cs @@ -16,7 +16,7 @@ namespace DongWuYiXue.DaoNiaoShu xiaoDu = GameManager.Instance.transform.parent.FindFirst("pasted__pasted__SM_MianQiu7"); nieZi = GameManager.Instance.transform.parent.FindFirst("手拿镊子消毒"); - //nieZi.transform.localEulerAngles = Vector3.zero; + nieZi.transform.localEulerAngles = Vector3.zero; mianQian = GameManager.Instance.senSor.GetSensor(); fsm.ShowCamera("清洁尿道口1_Camera"); fsm.Light_EnableInteraction("氯己定棉球"); @@ -63,7 +63,10 @@ namespace DongWuYiXue.DaoNiaoShu { base.OnStateStay(); //nieZi.transform.localEulerAngles = new Vector3(0, mianQian.Y, -mianQian.X); - nieZi.transform.rotation = Quaternion.Euler(new Vector3(mianQian.Z, mianQian.Y, -mianQian.X)); + if (mianQian.isOpen) + { + nieZi.transform.rotation = Quaternion.Euler(new Vector3(mianQian.Z, mianQian.Y, -mianQian.X)); + } if (xiaoDu.colliderNum >= 4) { xiaoDu.ExitCollider();