From ade9b0e32736f505d801c917d9816552db58ba4d Mon Sep 17 00:00:00 2001
From: YangHua <1475658476@qq.com>
Date: Thu, 29 Aug 2024 20:23:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=83=8C=E5=8C=85=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=A0=B9=E6=8D=AE=E5=9C=BA=E6=99=AF=E5=90=8D=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/Scripts/Project/UI/UI_Item/UI_SubProcessItem.cs      | 5 +----
 .../Scripts/Project/UI/UI_Panel/UI_ToolAndMaterialPanel.cs  | 6 ++++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Assets/Scripts/Project/UI/UI_Item/UI_SubProcessItem.cs b/Assets/Scripts/Project/UI/UI_Item/UI_SubProcessItem.cs
index e717d90..baa5c57 100644
--- a/Assets/Scripts/Project/UI/UI_Item/UI_SubProcessItem.cs
+++ b/Assets/Scripts/Project/UI/UI_Item/UI_SubProcessItem.cs
@@ -26,10 +26,7 @@ public class UI_SubProcessItem : BaseItem
     {
         GameManager.EventMgr.AddEventListener<int>(Enum_EventType.SwitchSubProcess, SwitchSubProcess);
     }
-    public override void HideMe()
-    {
-        GameManager.EventMgr.RemoveEventListener<int>(Enum_EventType.SwitchSubProcess, SwitchSubProcess);
-    }
+  
     /// <summary>
     /// ¿ØÖÆ°´Å¥×´Ì¬
     /// </summary>
diff --git a/Assets/Scripts/Project/UI/UI_Panel/UI_ToolAndMaterialPanel.cs b/Assets/Scripts/Project/UI/UI_Panel/UI_ToolAndMaterialPanel.cs
index d8027c2..00f00c7 100644
--- a/Assets/Scripts/Project/UI/UI_Panel/UI_ToolAndMaterialPanel.cs
+++ b/Assets/Scripts/Project/UI/UI_Panel/UI_ToolAndMaterialPanel.cs
@@ -14,10 +14,12 @@ public class UI_ToolAndMaterialPanel : BasePanel
     {
         if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
             GetControl<Button>("closeBtn").interactable = false;
+        if (GameManager.RunModelMgr.SceneType != E_SceneType.ToolRoom)
+            GetControl<Button>("closeBtn").gameObject.SetActive(false);
         CreatItem(E_ToolOrDeviceOrMaterials.Tool); //默认打开显示工器具
     }
 
-   
+
 
 
     private void CreatItem(E_ToolOrDeviceOrMaterials tmdTpye)
@@ -41,7 +43,7 @@ public class UI_ToolAndMaterialPanel : BasePanel
                 uiTMDitem.Init(bagDatas[item]);
             }
         }
-        GameManager.EventMgr.EventTrigger<string>(Enum_EventType.SwitchSubProcessStepTriggerID,GameManager.ProcessMgr.subProcessStepTriggerID);
+        GameManager.EventMgr.EventTrigger<string>(Enum_EventType.SwitchSubProcessStepTriggerID, GameManager.ProcessMgr.subProcessStepTriggerID);
 
 
     }