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 { splitResult = triggerNameTemp; } + subProcessStepTriggerID = splitResult; GameManager.EventMgr.EventTrigger(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..c395b20 100644 --- a/Assets/Scripts/Project/Objects/Other/ImageTips.cs +++ b/Assets/Scripts/Project/Objects/Other/ImageTips.cs @@ -17,22 +17,27 @@ public class ImageTips : MonoBehaviour gameObject.SetActive(true); selfRect = GetComponent(); image = GetComponent(); + 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; - StopCoroutine(FlashRoutine()); - gameObject.SetActive(false); + 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(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID); } - private void OnDisable() - { - GameManager.EventMgr.RemoveEventListener(Enum_EventType.SwitchSubProcessStepTriggerID, SwitchSubProcessStepTriggerID); - } - - - + //private void OnDisable() + //{ + // GameManager.EventMgr.RemoveEventListener(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().enabled = false; currentTool.name = currentItem.toolName; LiveSceneManager.Instance.SetSpawnToolInfo(currentTool); + GameManager.UIMgr.imageTips.HideTips(); } break; } 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