diff --git a/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs b/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs index 295418c..5c67c39 100644 --- a/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs +++ b/Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs @@ -50,7 +50,8 @@ public class Device_MeasuringCabinet : MonoBehaviour private void Awake() { AddActions(); - GameManager.EventMgr.AddEventListener(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID); + if (GameManager.RunModelMgr.ModeType == E_ModeType.Study) + GameManager.EventMgr.AddEventListener(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID); sundries.gameObject.SetActive(false); } /// @@ -291,10 +292,12 @@ public class Device_MeasuringCabinet : MonoBehaviour private void OnDestroy() { - GameManager.EventMgr.RemoveEventListener(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID); + if (GameManager.RunModelMgr.ModeType == E_ModeType.Study) + GameManager.EventMgr.RemoveEventListener(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID); } private void OnDisable() { - GameManager.EventMgr.RemoveEventListener(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID); + if (GameManager.RunModelMgr.ModeType == E_ModeType.Study) + GameManager.EventMgr.RemoveEventListener(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID); } } diff --git a/Assets/Scripts/Project/Manager/OfficeManager.cs b/Assets/Scripts/Project/Manager/OfficeManager.cs index af1aaa1..ce38503 100644 --- a/Assets/Scripts/Project/Manager/OfficeManager.cs +++ b/Assets/Scripts/Project/Manager/OfficeManager.cs @@ -64,8 +64,11 @@ public class OfficeManager : SingletonMono { panel.Init(GameManager.ProcessMgr.subProcessId); }); - GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchSubProcessStepTriggerID, ProcessManager.Instance.subProcessStepTriggerID); - GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchSubProcess, GameManager.ProcessMgr.subProcessId); + if (GameManager.RunModelMgr.ModeType == E_ModeType.Study) + { + GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchSubProcessStepTriggerID, ProcessManager.Instance.subProcessStepTriggerID); + GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchSubProcess, GameManager.ProcessMgr.subProcessId); + } } GameManager.UIMgr.ShowPanel(E_UI_Layer.Mid, (panel) => diff --git a/Assets/Scripts/Project/Objects/Other/PermanentTriggerBase.cs b/Assets/Scripts/Project/Objects/Other/PermanentTriggerBase.cs index 015c8ca..d769552 100644 --- a/Assets/Scripts/Project/Objects/Other/PermanentTriggerBase.cs +++ b/Assets/Scripts/Project/Objects/Other/PermanentTriggerBase.cs @@ -56,7 +56,8 @@ public class PermanentTriggerBase : MonoBehaviour { if (GetComponent()) _highlight = GetComponent(); - GameManager.EventMgr.AddEventListener(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID); + if (GameManager.RunModelMgr.ModeType == E_ModeType.Study) + GameManager.EventMgr.AddEventListener(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID); } /// /// Start @@ -96,7 +97,8 @@ public class PermanentTriggerBase : MonoBehaviour private void OnDestroy() { - GameManager.EventMgr.RemoveEventListener(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID); + if (GameManager.RunModelMgr.ModeType == E_ModeType.Study) + GameManager.EventMgr.RemoveEventListener(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID); } //private void OnDisable() //{ diff --git a/Assets/Scripts/Project/Objects/ToolAndMaterial/BaseToolOrDevice.cs b/Assets/Scripts/Project/Objects/ToolAndMaterial/BaseToolOrDevice.cs index b258fb1..6eb40c9 100644 --- a/Assets/Scripts/Project/Objects/ToolAndMaterial/BaseToolOrDevice.cs +++ b/Assets/Scripts/Project/Objects/ToolAndMaterial/BaseToolOrDevice.cs @@ -29,7 +29,8 @@ public abstract class BaseToolOrDevice : MonoBehaviour private void Awake() { _highlight = GetComponent(); - GameManager.EventMgr.AddEventListener(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID); + if (GameManager.RunModelMgr.ModeType == E_ModeType.Study) + GameManager.EventMgr.AddEventListener(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID); } private void SwitchSubProcessStepTriggerID(string arg0) @@ -105,7 +106,8 @@ public abstract class BaseToolOrDevice : MonoBehaviour private void OnDestroy() { - GameManager.EventMgr.RemoveEventListener(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID); + if (GameManager.RunModelMgr.ModeType == E_ModeType.Study) + GameManager.EventMgr.RemoveEventListener(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID); } //private void OnDisable() //{ diff --git a/Assets/Scripts/Project/UI/UI_Item/UI_CheckMyselfItem.cs b/Assets/Scripts/Project/UI/UI_Item/UI_CheckMyselfItem.cs index d425a75..b561cd5 100644 --- a/Assets/Scripts/Project/UI/UI_Item/UI_CheckMyselfItem.cs +++ b/Assets/Scripts/Project/UI/UI_Item/UI_CheckMyselfItem.cs @@ -20,7 +20,8 @@ public class UI_CheckMyselfItem : BaseItem tips.text = isOn ? "װ" : ""; } GetControl("iconBtn").sprite = Resources.Load(Const.LoadToolAndMaterialPath + _itemInfo.toolName); - GameManager.EventMgr.AddEventListener(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID); + if (GameManager.RunModelMgr.ModeType == E_ModeType.Study) + GameManager.EventMgr.AddEventListener(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID); } @@ -56,11 +57,13 @@ public class UI_CheckMyselfItem : BaseItem private void OnDestroy() { - GameManager.EventMgr.RemoveEventListener(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID); + if (GameManager.RunModelMgr.ModeType == E_ModeType.Study) + GameManager.EventMgr.RemoveEventListener(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID); } private void OnDisable() { - GameManager.EventMgr.RemoveEventListener(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID); + if (GameManager.RunModelMgr.ModeType == E_ModeType.Study) + GameManager.EventMgr.RemoveEventListener(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID); } } \ No newline at end of file diff --git a/Assets/Scripts/Project/UI/UI_Item/UI_ToolOrMaterialsOrDeviceItem.cs b/Assets/Scripts/Project/UI/UI_Item/UI_ToolOrMaterialsOrDeviceItem.cs index 2dd16d3..273add8 100644 --- a/Assets/Scripts/Project/UI/UI_Item/UI_ToolOrMaterialsOrDeviceItem.cs +++ b/Assets/Scripts/Project/UI/UI_Item/UI_ToolOrMaterialsOrDeviceItem.cs @@ -14,17 +14,21 @@ public class UI_ToolOrMaterialsOrDeviceItem : BaseItem { itemInfoList = _itemInfo; currentItem = itemInfoList[0]; - if (GameManager.RunModelMgr.ModeType == E_ModeType.Study) - { - itemCloseBtn.gameObject.SetActive(false); - } if (GameManager.RunModelMgr.SceneType != E_SceneType.Site) { GetControl("iconBtn").GetComponent