From 250b113e08a83b367338735f9526242f57539bfd Mon Sep 17 00:00:00 2001 From: huqibin <762612145@qq.com> Date: Tue, 14 Jan 2025 10:17:53 +0800 Subject: [PATCH] bug 268 --- Assets/Scripts/Device_Control_9001.cs | 11 +++++++++++ Assets/Scripts/StepState_9001.cs | 22 ++++++++++++---------- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/Assets/Scripts/Device_Control_9001.cs b/Assets/Scripts/Device_Control_9001.cs index bcfc844..602b80b 100644 --- a/Assets/Scripts/Device_Control_9001.cs +++ b/Assets/Scripts/Device_Control_9001.cs @@ -69,6 +69,17 @@ public class Device_Control_9001 : Device_Control public static bool ewmOK = false; public static bool isSMOK = false; public static GameObject EWM_OBJ; + + + public void InitEWM() + { + EWM_OBJ = ewm; + ewm.SetActive(false); + ewmh.SetActive(true); + ewmOK = false; + isSMOK = false; + } + private void Awake() { EWM_OBJ = ewm; diff --git a/Assets/Scripts/StepState_9001.cs b/Assets/Scripts/StepState_9001.cs index 0069405..da62160 100644 --- a/Assets/Scripts/StepState_9001.cs +++ b/Assets/Scripts/StepState_9001.cs @@ -65,7 +65,7 @@ public class StepState_9001 : StepState { Score_9001.cdzIndex = 0; } - else if (num == 4) + else if (num == 4)//验电 { //清空背包数据 PacksackBagMgr.Instance.ClearAllData(); @@ -85,26 +85,28 @@ public class StepState_9001 : StepState PacksackBagMgr.Instance.AddOneToolOrMater(item); }); - Device_Control_9001.EWM_OBJ = device_Control.ewmh; - device_Control.ewm.SetActive(false); - device_Control.ewmh.SetActive(true); - Device_Control_9001.ewmOK = false; - Device_Control_9001.isSMOK = false; + device_Control.InitEWM(); + + //Device_Control_9001.EWM_OBJ = device_Control.ewmh; + //device_Control.ewm.SetActive(false); + //device_Control.ewmh.SetActive(true); + //Device_Control_9001.ewmOK = false; + //Device_Control_9001.isSMOK = false; //if (Device_Control_9001.EWM_OBJ != null && Device_Control_9001.EWM_OBJ.GetComponent() != null) - Device_Control_9001.EWM_OBJ.GetComponent().isInstall = true; + //Device_Control_9001.EWM_OBJ.GetComponent().isInstall = true; Score_9001.cdzIndex = 0; } - else if (num == 5) + else if (num == 5)//扫描二维码 { Score_9001.cdzIndex = 0; } - else if (num == 6) + else if (num == 6)//移除损坏二维码 { Score_9001.cdzIndex = 1; } - else if (num == 7) + else if (num == 7)//更换二维码 { Score_9001.cdzIndex = 2; device_Control.ewmh.SetActive(false);