diff --git a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Cover.cs b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Cover.cs index 5f02214..9c638c8 100644 --- a/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Cover.cs +++ b/Assets/Scripts/CXX/Devices/直接接入式电能计量装置/Device_Cover.cs @@ -1,7 +1,6 @@ using DG.Tweening; using System.Collections; using System.Collections.Generic; -using Unity.VisualScripting.Antlr3.Runtime; using UnityEngine; /// diff --git a/Assets/Scripts/Project/Manager/LiveSceneManager.cs b/Assets/Scripts/Project/Manager/LiveSceneManager.cs index eb81e2d..4405437 100644 --- a/Assets/Scripts/Project/Manager/LiveSceneManager.cs +++ b/Assets/Scripts/Project/Manager/LiveSceneManager.cs @@ -105,12 +105,15 @@ public class LiveSceneManager : SingletonMono public void OnCheckSubProcess(bool ifdestroy = true) { - if (tMDTips != null) - tMDTips.gameObject.SetActive(false); - if (ifdestroy) - Destroy(currentTool); - currentTool = null; - GameManager.EventMgr.EventTrigger(Enum_EventType.TakeOutAndRetrievingTheTools, null); + if (currentTool != null) + { + if (tMDTips != null) + tMDTips.gameObject.SetActive(false); + if (ifdestroy) + DestroyImmediate(currentTool); + currentTool = null; + GameManager.EventMgr.EventTrigger(Enum_EventType.TakeOutAndRetrievingTheTools, null); + } } private void OnDestroy() diff --git a/Assets/Scripts/Project/UI/UI_Item/UI_SubProcessItem.cs b/Assets/Scripts/Project/UI/UI_Item/UI_SubProcessItem.cs index 2187edf..4ca0103 100644 --- a/Assets/Scripts/Project/UI/UI_Item/UI_SubProcessItem.cs +++ b/Assets/Scripts/Project/UI/UI_Item/UI_SubProcessItem.cs @@ -77,8 +77,9 @@ public class UI_SubProcessItem : BaseItem GameManager.ProcessMgr.HandoverProcess(processID, subProcessID, subProcessStepID); // StepStateControl.instance.InvokeInitStepState(GameManager.Instance.systemId, GameManager.ProcessMgr.d_Scheme.id, subProcessID); + //֪ͨui GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchSubProcess, subProcessID); - //Debug.LogError(ProcessManager.Instance.subProcessStepTriggerID); + //֪ͨ GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchSubProcessStepTriggerID, ProcessManager.Instance.subProcessStepTriggerID); }); });