From d667798bc1553c168a8615cd109c963ae0ab3333 Mon Sep 17 00:00:00 2001 From: chenxiangxue <910695411@qq.com> Date: Tue, 27 Aug 2024 16:17:00 +0800 Subject: [PATCH 1/3] ooo --- Assets/Scripts/CXX/StepState/1002/StepState_1002.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Assets/Scripts/CXX/StepState/1002/StepState_1002.cs b/Assets/Scripts/CXX/StepState/1002/StepState_1002.cs index 4106dfe..a600d8e 100644 --- a/Assets/Scripts/CXX/StepState/1002/StepState_1002.cs +++ b/Assets/Scripts/CXX/StepState/1002/StepState_1002.cs @@ -135,6 +135,8 @@ public class StepState_1002 : StepState //盖子拆下来 SiteManager.instance.measuringCabinet.meteringDevice.CoverUnstallState(); + //封印拆掉 + SiteManager.instance.measuringCabinet.meteringDevice.CoverSealUninstallState(); //接线已检查 SiteManager.instance.measuringCabinet.check_JieXian.isChecked = true; @@ -162,6 +164,8 @@ public class StepState_1002 : StepState SiteManager.instance.measuringCabinet.meteringDevice.Init(false); SiteManager.instance.measuringCabinet.meteringDevice.gameObject.SetActive(false); SiteManager.instance.measuringCabinet.meteringDevice = null; + //杂物显示 + SiteManager.instance.measuringCabinet.sundries.gameObject.SetActive(true); //电能表接线取下了 SiteManager.instance.measuringCabinet.jieXian_lines.ForEach(screw => From a521bf20e69b324bf1baba8283116276a648490d Mon Sep 17 00:00:00 2001 From: chenxiangxue <910695411@qq.com> Date: Tue, 27 Aug 2024 16:29:40 +0800 Subject: [PATCH 2/3] aa --- Assets/Scripts/CXX/StepState/1002/StepState_1002.cs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Assets/Scripts/CXX/StepState/1002/StepState_1002.cs b/Assets/Scripts/CXX/StepState/1002/StepState_1002.cs index a600d8e..74c7a02 100644 --- a/Assets/Scripts/CXX/StepState/1002/StepState_1002.cs +++ b/Assets/Scripts/CXX/StepState/1002/StepState_1002.cs @@ -93,6 +93,16 @@ public class StepState_1002 : StepState //场景首个步骤 //与客户沟通 + //完成第一步点击去工具间 + E_SceneType curret = GameManager.RunModelMgr.SceneType; + GameManager.RunModelMgr.SceneType = E_SceneType.ToolRoom; + if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID("现场按钮", true) == 0) + { + Debug.Log("现场按钮已点击"); + } + GameManager.RunModelMgr.SceneType = curret; + + #region 背包重置并带上正确装备 //清空背包数据 From 311bdcfb64e0d101457387384aa1eb05ea79e40f Mon Sep 17 00:00:00 2001 From: chenxiangxue <910695411@qq.com> Date: Tue, 27 Aug 2024 17:12:04 +0800 Subject: [PATCH 3/3] aaa --- .../CXX/StepState/1002/StepState_1002.cs | 29 ++++++++++++------- Assets/Scripts/CXX/StepState/StepState.cs | 9 ++++-- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/Assets/Scripts/CXX/StepState/1002/StepState_1002.cs b/Assets/Scripts/CXX/StepState/1002/StepState_1002.cs index 74c7a02..36755a6 100644 --- a/Assets/Scripts/CXX/StepState/1002/StepState_1002.cs +++ b/Assets/Scripts/CXX/StepState/1002/StepState_1002.cs @@ -35,7 +35,7 @@ public class StepState_1002 : StepState /// 从场景第一步会依次往下执行，直到指定步骤 /// /// - public override void SetStepState(int num) + public override void SetStepState(int num, int lastNum) { Debug.Log("切换步骤"+num); if (num == 3001) @@ -64,14 +64,18 @@ public class StepState_1002 : StepState //清空背包 PacksackBagMgr.Instance.ClearAllToolAndDiveceAndMaterial(); + //完成第一步点击去工具间 - E_SceneType curret=GameManager.RunModelMgr.SceneType; - GameManager.RunModelMgr.SceneType = E_SceneType.Office; - if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID("工具间按钮", true)==0) + if (num == lastNum) { - Debug.Log("工具间按钮已点击"); + E_SceneType curret = GameManager.RunModelMgr.SceneType; + GameManager.RunModelMgr.SceneType = E_SceneType.Office; + if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID("工具间按钮", true) == 0) + { + Debug.Log("工具间按钮已自动点击"); + } + GameManager.RunModelMgr.SceneType = curret; } - GameManager.RunModelMgr.SceneType = curret; } else if (num == 3006) { @@ -94,13 +98,16 @@ public class StepState_1002 : StepState //与客户沟通 //完成第一步点击去工具间 - E_SceneType curret = GameManager.RunModelMgr.SceneType; - GameManager.RunModelMgr.SceneType = E_SceneType.ToolRoom; - if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID("现场按钮", true) == 0) + if (num == lastNum) { - Debug.Log("现场按钮已点击"); + E_SceneType curret = GameManager.RunModelMgr.SceneType; + GameManager.RunModelMgr.SceneType = E_SceneType.ToolRoom; + if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID("现场按钮", true) == 0) + { + Debug.Log("现场按钮已自动点击"); + } + GameManager.RunModelMgr.SceneType = curret; } - GameManager.RunModelMgr.SceneType = curret; #region 背包重置并带上正确装备 diff --git a/Assets/Scripts/CXX/StepState/StepState.cs b/Assets/Scripts/CXX/StepState/StepState.cs index b3d1364..3fa43ff 100644 --- a/Assets/Scripts/CXX/StepState/StepState.cs +++ b/Assets/Scripts/CXX/StepState/StepState.cs @@ -40,7 +40,7 @@ public abstract class StepState : MonoBehaviour { if(item.Key>=first && item.Key<=num) { - SetStepState(item.Key); + SetStepState(item.Key,num); } } }); @@ -91,6 +91,11 @@ public abstract class StepState : MonoBehaviour } } - public abstract void SetStepState(int num); +/// +/// 执行步骤还原 +/// +/// 要执行的步骤 +/// 目标步骤 + public abstract void SetStepState(int num,int lastNum); }