From d78414e9236970de9eeefe309fb885a03e9b6fb4 Mon Sep 17 00:00:00 2001
From: YangHua <1475658476@qq.com>
Date: Thu, 29 Aug 2024 19:46:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B7=B3=E8=BD=AC=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Project/UI/UI_Item/UI_SubProcessItem.cs   | 27 ++++++++++++++-----
 .../Project/UI/UI_Panel/UI_MessagePanel.cs    |  6 ++---
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/Assets/Scripts/Project/UI/UI_Item/UI_SubProcessItem.cs b/Assets/Scripts/Project/UI/UI_Item/UI_SubProcessItem.cs
index da583f4..e717d90 100644
--- a/Assets/Scripts/Project/UI/UI_Item/UI_SubProcessItem.cs
+++ b/Assets/Scripts/Project/UI/UI_Item/UI_SubProcessItem.cs
@@ -48,12 +48,27 @@ public class UI_SubProcessItem : BaseItem
         switch (btnName)
         {
             case "subProcessBtn":
-                GameManager.ProcessMgr.HandoverProcess(processID, subProcessID, subProcessStepID);
-                //重置物体
-                StepStateControl.instance.InvokeInitStepState(GameManager.Instance.systemId, GameManager.ProcessMgr.d_Scheme.id, subProcessID);
-                GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcess, subProcessID);
-                Debug.LogError(ProcessManager.Instance.subProcessStepTriggerID);
-                GameManager.EventMgr.EventTrigger<string>(Enum_EventType.SwitchSubProcessStepTriggerID, ProcessManager.Instance.subProcessStepTriggerID);
+
+                if (GameManager.ProcessMgr.d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.triggersName.Count > 0)
+                {
+                    GameManager.UIMgr.ShowPanel<UI_MessagePanel>(E_UI_Layer.System, (p) =>
+                    {
+                        p.Init("提示", "当前步骤还没有学完，确定要切换吗？", E_MessageType.Error, () =>
+                        {
+                            GameManager.ProcessMgr.HandoverProcess(processID, subProcessID, subProcessStepID);
+                            //重置物体
+                            StepStateControl.instance.InvokeInitStepState(GameManager.Instance.systemId, GameManager.ProcessMgr.d_Scheme.id, subProcessID);
+                            GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcess, subProcessID);
+                            //Debug.LogError(ProcessManager.Instance.subProcessStepTriggerID);
+                            GameManager.EventMgr.EventTrigger<string>(Enum_EventType.SwitchSubProcessStepTriggerID, ProcessManager.Instance.subProcessStepTriggerID);
+                        },
+                        () =>
+                        {
+                            GameManager.UIMgr.HidePanel<UI_MessagePanel>();
+                        });
+                    });
+                }
+
                 break;
         }
     }
diff --git a/Assets/Scripts/Project/UI/UI_Panel/UI_MessagePanel.cs b/Assets/Scripts/Project/UI/UI_Panel/UI_MessagePanel.cs
index 6938877..9ed21e8 100644
--- a/Assets/Scripts/Project/UI/UI_Panel/UI_MessagePanel.cs
+++ b/Assets/Scripts/Project/UI/UI_Panel/UI_MessagePanel.cs
@@ -49,16 +49,16 @@ public class UI_MessagePanel : BasePanel
             case E_MessageType.Error:
                 GetControl<Image>("Image_NormalBackGround").gameObject.SetActive(true);
                 GetControl<Button>("Button_NormalConfirm").gameObject.SetActive(true);
-                GetControl<Button>("Button_NormalCancel").gameObject.SetActive(true);
                 GetControl<Image>("Image_WarnBackGround").gameObject.SetActive(false);
+                GetControl<Button>("Button_NormalCancel").gameObject.SetActive(true);
                 GetControl<Button>("Button_WarmConfirm").gameObject.SetActive(false);
                 break;
             case E_MessageType.Warning:
-                GetControl<Image>("Image_WarnBackGround").gameObject.SetActive(true);
-                GetControl<Button>("Button_WarmConfirm").gameObject.SetActive(true);
                 GetControl<Image>("Image_NormalBackGround").gameObject.SetActive(false);
                 GetControl<Button>("Button_NormalConfirm").gameObject.SetActive(false);
+                GetControl<Image>("Image_WarnBackGround").gameObject.SetActive(true);
                 GetControl<Button>("Button_NormalCancel").gameObject.SetActive(false);
+                GetControl<Button>("Button_WarmConfirm").gameObject.SetActive(true);
                 break;
         }