From 704dfbf56935db4c5ee6c6df964ec5ee128e3a2b Mon Sep 17 00:00:00 2001
From: YangHua <1475658476@qq.com>
Date: Tue, 27 Aug 2024 17:25:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/Scripts/Project/Manager/ProcessManager.cs           | 1 +
 Assets/Scripts/Project/Objects/Other/ImageTips.cs          | 7 +++++--
 Assets/Scripts/Project/UI/UI_Panel/UI_CheckMyselfPanel.cs  | 2 +-
 .../Scripts/Project/UI/UI_Panel/UI_ToolAndMaterialPanel.cs | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Assets/Scripts/Project/Manager/ProcessManager.cs b/Assets/Scripts/Project/Manager/ProcessManager.cs
index 640a2de..9e33ce6 100644
--- a/Assets/Scripts/Project/Manager/ProcessManager.cs
+++ b/Assets/Scripts/Project/Manager/ProcessManager.cs
@@ -205,6 +205,7 @@ public class ProcessManager : BaseManager<ProcessManager>
                         {
                             splitResult = triggerNameTemp;
                         }
+                        subProcessStepTriggerID = splitResult;
                         GameManager.EventMgr.EventTrigger<string>(Enum_EventType.SwitchSubProcessStepTriggerID, splitResult);
                     }
                     return 0;
diff --git a/Assets/Scripts/Project/Objects/Other/ImageTips.cs b/Assets/Scripts/Project/Objects/Other/ImageTips.cs
index ec07b58..b4fb541 100644
--- a/Assets/Scripts/Project/Objects/Other/ImageTips.cs
+++ b/Assets/Scripts/Project/Objects/Other/ImageTips.cs
@@ -30,8 +30,11 @@ public class ImageTips : MonoBehaviour
     public void HideTips()
     {
         transform.parent = null;
-        StopCoroutine(FlashRoutine());
-        gameObject.SetActive(false);
+        if (gameObject.activeSelf)
+        {
+            StopCoroutine(FlashRoutine());
+            gameObject.SetActive(false);
+        }
     }
     private IEnumerator FlashRoutine()
     {
diff --git a/Assets/Scripts/Project/UI/UI_Panel/UI_CheckMyselfPanel.cs b/Assets/Scripts/Project/UI/UI_Panel/UI_CheckMyselfPanel.cs
index db5bb48..df119fe 100644
--- a/Assets/Scripts/Project/UI/UI_Panel/UI_CheckMyselfPanel.cs
+++ b/Assets/Scripts/Project/UI/UI_Panel/UI_CheckMyselfPanel.cs
@@ -27,7 +27,7 @@ public class UI_CheckMyselfPanel : BasePanel
         {
             GetControl<Button>("closeBtn").interactable = false;
             GameManager.EventMgr.AddEventListener(Enum_EventType.WearState, OnWearState);
-            GameManager.EventMgr.EventTrigger<string>(Enum_EventType.SwitchSubProcessStepTriggerID, GameManager.ProcessMgr.d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersName[0]);
+            GameManager.EventMgr.EventTrigger<string>(Enum_EventType.SwitchSubProcessStepTriggerID, GameManager.ProcessMgr.subProcessStepTriggerID);
         }
     }
 
diff --git a/Assets/Scripts/Project/UI/UI_Panel/UI_ToolAndMaterialPanel.cs b/Assets/Scripts/Project/UI/UI_Panel/UI_ToolAndMaterialPanel.cs
index 3336cdd..d8027c2 100644
--- a/Assets/Scripts/Project/UI/UI_Panel/UI_ToolAndMaterialPanel.cs
+++ b/Assets/Scripts/Project/UI/UI_Panel/UI_ToolAndMaterialPanel.cs
@@ -41,7 +41,7 @@ public class UI_ToolAndMaterialPanel : BasePanel
                 uiTMDitem.Init(bagDatas[item]);
             }
         }
-
+        GameManager.EventMgr.EventTrigger<string>(Enum_EventType.SwitchSubProcessStepTriggerID,GameManager.ProcessMgr.subProcessStepTriggerID);
 
 
     }

From 57338dc352dfbd950f238abc39c68cb412d857d2 Mon Sep 17 00:00:00 2001
From: YangHua <1475658476@qq.com>
Date: Tue, 27 Aug 2024 18:56:19 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=A8=E5=86=8C?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/Scripts/Project/Objects/Other/ImageTips.cs     |  6 ++++--
 .../Project/Objects/Other/PermanentTriggerBase.cs     | 11 ++++-------
 .../UI/UI_Item/UI_ToolOrMaterialsOrDeviceItem.cs      |  1 +
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Assets/Scripts/Project/Objects/Other/ImageTips.cs b/Assets/Scripts/Project/Objects/Other/ImageTips.cs
index b4fb541..c395b20 100644
--- a/Assets/Scripts/Project/Objects/Other/ImageTips.cs
+++ b/Assets/Scripts/Project/Objects/Other/ImageTips.cs
@@ -17,25 +17,27 @@ public class ImageTips : MonoBehaviour
         gameObject.SetActive(true);
         selfRect = GetComponent<RectTransform>();
         image = GetComponent<Image>();
+        image.enabled = true;
         selfRect.SetParent(target);
         selfRect.anchorMin = Vector2.zero;
         selfRect.anchorMax = new Vector2(1, 1);
         selfRect.offsetMax = Vector2.zero;
         selfRect.offsetMin = Vector2.zero;
         //selfRect.sizeDelta = target.sizeDelta + sizeOffset;
-        if (gameObject.activeSelf)
+        if (gameObject.activeSelf && gameObject.activeInHierarchy)
             StartCoroutine(FlashRoutine());
     }
 
     public void HideTips()
     {
         transform.parent = null;
-        if (gameObject.activeSelf)
+        if (gameObject.activeSelf && gameObject.activeInHierarchy)
         {
             StopCoroutine(FlashRoutine());
             gameObject.SetActive(false);
         }
     }
+
     private IEnumerator FlashRoutine()
     {
         while (true)
diff --git a/Assets/Scripts/Project/Objects/Other/PermanentTriggerBase.cs b/Assets/Scripts/Project/Objects/Other/PermanentTriggerBase.cs
index 07e01bd..37f3d38 100644
--- a/Assets/Scripts/Project/Objects/Other/PermanentTriggerBase.cs
+++ b/Assets/Scripts/Project/Objects/Other/PermanentTriggerBase.cs
@@ -83,11 +83,8 @@ public class PermanentTriggerBase : MonoBehaviour
     {
         GameManager.EventMgr.RemoveEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
     }
-    private void OnDisable()
-    {
-        GameManager.EventMgr.RemoveEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
-    }
-
-
-
+    //private void OnDisable()
+    //{
+    //    GameManager.EventMgr.RemoveEventListener<string>(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID);
+    //}
 }
diff --git a/Assets/Scripts/Project/UI/UI_Item/UI_ToolOrMaterialsOrDeviceItem.cs b/Assets/Scripts/Project/UI/UI_Item/UI_ToolOrMaterialsOrDeviceItem.cs
index c29d272..b945f73 100644
--- a/Assets/Scripts/Project/UI/UI_Item/UI_ToolOrMaterialsOrDeviceItem.cs
+++ b/Assets/Scripts/Project/UI/UI_Item/UI_ToolOrMaterialsOrDeviceItem.cs
@@ -64,6 +64,7 @@ public class UI_ToolOrMaterialsOrDeviceItem : BaseItem
                     currentTool.GetComponent<Collider>().enabled = false;
                     currentTool.name = currentItem.toolName;
                     LiveSceneManager.Instance.SetSpawnToolInfo(currentTool);
+                    GameManager.UIMgr.imageTips.HideTips();
                 }
                 break;
         }