修改练习问题

Assets/Scripts/CXX/Devices/计量柜/Device_MeasuringCabinet.cs

@@ -50,6 +50,7 @@ public class Device_MeasuringCabinet : MonoBehaviour
     private void Awake()
     {
         AddActions();
+        if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
             GameManager.EventMgr.AddEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
         sundries.gameObject.SetActive(false);
     }
@@ -291,10 +292,12 @@ public class Device_MeasuringCabinet : MonoBehaviour
 
     private void OnDestroy()
     {
+        if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
             GameManager.EventMgr.RemoveEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
     }
     private void OnDisable()
     {
+        if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
             GameManager.EventMgr.RemoveEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
     }
 }

Assets/Scripts/Project/Manager/OfficeManager.cs

@@ -64,9 +64,12 @@ public class OfficeManager : SingletonMono<OfficeManager>
             {
                 panel.Init(GameManager.ProcessMgr.subProcessId);
             });
+            if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
+            {
                 GameManager.EventMgr.EventTrigger<string>(Enum_EventType.SwitchSubProcessStepTriggerID, ProcessManager.Instance.subProcessStepTriggerID);
                 GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchSubProcess, GameManager.ProcessMgr.subProcessId);
             }
+        }
 
         GameManager.UIMgr.ShowPanel<UI_MenuBar>(E_UI_Layer.Mid, (panel) =>
         {

Assets/Scripts/Project/Objects/Other/PermanentTriggerBase.cs

@@ -56,6 +56,7 @@ public class PermanentTriggerBase : MonoBehaviour
     {
         if (GetComponent<HighlightEffect>())
             _highlight = GetComponent<HighlightEffect>();
+        if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
             GameManager.EventMgr.AddEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
     }
     /// <summary>
@@ -96,6 +97,7 @@ public class PermanentTriggerBase : MonoBehaviour
 
     private void OnDestroy()
     {
+        if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
             GameManager.EventMgr.RemoveEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
     }
     //private void OnDisable()

Assets/Scripts/Project/Objects/ToolAndMaterial/BaseToolOrDevice.cs

@@ -29,6 +29,7 @@ public abstract class BaseToolOrDevice : MonoBehaviour
     private void Awake()
     {
         _highlight = GetComponent<HighlightEffect>();
+        if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
             GameManager.EventMgr.AddEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
     }
 
@@ -105,6 +106,7 @@ public abstract class BaseToolOrDevice : MonoBehaviour
 
     private void OnDestroy()
     {
+        if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
             GameManager.EventMgr.RemoveEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
     }
     //private void OnDisable()

Assets/Scripts/Project/UI/UI_Item/UI_CheckMyselfItem.cs

@@ -20,6 +20,7 @@ public class UI_CheckMyselfItem : BaseItem
             tips.text = isOn ? "ÒÑ×°Åä" : "";
         }
         GetControl<Image>("iconBtn").sprite = Resources.Load<Sprite>(Const.LoadToolAndMaterialPath + _itemInfo.toolName);
+        if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
             GameManager.EventMgr.AddEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
     }
 
@@ -56,11 +57,13 @@ public class UI_CheckMyselfItem : BaseItem
 
     private void OnDestroy()
     {
+        if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
             GameManager.EventMgr.RemoveEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
     }
 
     private void OnDisable()
     {
+        if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
             GameManager.EventMgr.RemoveEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
     }
 }

Assets/Scripts/Project/UI/UI_Item/UI_ToolOrMaterialsOrDeviceItem.cs

@@ -14,18 +14,22 @@ 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<Image>("iconBtn").GetComponent<Button>().interactable = false;
         }
+        else
+        {
+            itemCloseBtn.gameObject.SetActive(false);
+        }
         GetControl<TextMeshProUGUI>("countText").text = _itemInfo.Count.ToString();
         GetControl<Image>("iconBtn").sprite = Resources.Load<Sprite>(Const.LoadToolAndMaterialPath + currentItem.toolName);
+        if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
+        {
+            itemCloseBtn.gameObject.SetActive(false);
             GameManager.EventMgr.AddEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
         }
+    }
     private void SwitchSubProcessStepTriggerID(string arg0)
     {
         if (currentItem.toolName == arg0)
@@ -72,11 +76,13 @@ public class UI_ToolOrMaterialsOrDeviceItem : BaseItem
     }
     private void OnDestroy()
     {
+        if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
             GameManager.EventMgr.RemoveEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
     }
 
     private void OnDisable()
     {
+        if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
             GameManager.EventMgr.RemoveEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
     }
 }

Assets/Scripts/Project/UI/UI_Panel/UI_MenuBar.cs

@@ -48,10 +48,13 @@ public class UI_MenuBar : BasePanel
         toolKitBtn = GetControl<Button>("ToolKitBtn");
         disassemblyAssemblyWorkOrderBtn = GetControl<Button>("DisassemblyAssemblyWorkOrderBtn");
         notifyBtn = GetControl<Button>("NotifyBtn");
+        if(GameManager.RunModelMgr.ModeType == E_ModeType.Practice)
+            OpenMenu();
     }
     public override void ShowMe()
     {
         GameManager.EventMgr.AddEventListener<E_SceneType>(Enum_EventType.SwitchScene, CheckBtnBySceneName);
+        if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
             GameManager.EventMgr.AddEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
     }
 
@@ -111,12 +114,13 @@ public class UI_MenuBar : BasePanel
     public override void HideMe()
     {
         GameManager.EventMgr.RemoveEventListener<E_SceneType>(Enum_EventType.SwitchScene, CheckBtnBySceneName);
+        if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
             GameManager.EventMgr.RemoveEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
     }
     public void CheckBtnBySceneName(E_SceneType type)
     {
         Debug.Log(type.ToString());
-        CloseMenu();
+        //CloseMenu();
         toolRoomBtn.gameObject.SetActive(type != E_SceneType.ToolRoom);
         siteBtn.gameObject.SetActive(type == E_SceneType.ToolRoom);
         workOrderBtn.gameObject.SetActive(type == E_SceneType.Office);
@@ -180,7 +184,7 @@ public class UI_MenuBar : BasePanel
                         {
                             GameManager.EventMgr.EventTrigger<float>(Enum_EventType.UpdateProgress, 0.9f);
                             GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchScene, GameManager.RunModelMgr.SceneType);
-
+                            if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
                                 GameManager.EventMgr.EventTrigger<string>(Enum_EventType.SwitchSubProcessStepTriggerID, ProcessManager.Instance.subProcessStepTriggerID);
 
                         });
@@ -198,7 +202,7 @@ public class UI_MenuBar : BasePanel
                     {
                         GameManager.EventMgr.EventTrigger<float>(Enum_EventType.UpdateProgress, 0.9f);
                         GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchScene, GameManager.RunModelMgr.SceneType);
-
+                        if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
                             GameManager.EventMgr.EventTrigger<string>(Enum_EventType.SwitchSubProcessStepTriggerID, ProcessManager.Instance.subProcessStepTriggerID);
                     });
                 });
@@ -217,7 +221,7 @@ public class UI_MenuBar : BasePanel
                     {
                         GameManager.EventMgr.EventTrigger<float>(Enum_EventType.UpdateProgress, 0.9f);
                         GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchScene, GameManager.RunModelMgr.SceneType);
-
+                        if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
                             GameManager.EventMgr.EventTrigger<string>(Enum_EventType.SwitchSubProcessStepTriggerID, ProcessManager.Instance.subProcessStepTriggerID);
                     });
                 });

Assets/Scripts/Project/UI/UI_Panel/UI_ToolAndMaterialPanel.cs

@@ -43,6 +43,7 @@ public class UI_ToolAndMaterialPanel : BasePanel
                 uiTMDitem.Init(bagDatas[item]);
             }
         }
+        if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
             GameManager.EventMgr.EventTrigger<string>(Enum_EventType.SwitchSubProcessStepTriggerID, GameManager.ProcessMgr.subProcessStepTriggerID);