From fba8eb0d3b3bb483c707612c1483a07e729f156f Mon Sep 17 00:00:00 2001
From: yurui <952870061@qq.com>
Date: Fri, 11 Oct 2024 19:22:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=89=E5=BE=85=E6=88=98=E6=96=97=E7=BB=93?=
 =?UTF-8?q?=E6=9D=9F=E5=BC=95=E5=AF=BC=E8=BF=98=E5=8E=9F=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Assets/Code/Scripts/Gameplay/Guide/GuideManager.cs    | 8 +++++---
 .../Assets/Code/Scripts/Gameplay/Guide/GuideStep.cs       | 3 ++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/Guide/GuideManager.cs b/ProjectNLD/Assets/Code/Scripts/Gameplay/Guide/GuideManager.cs
index b5f7797f353..58f826e277d 100644
--- a/ProjectNLD/Assets/Code/Scripts/Gameplay/Guide/GuideManager.cs
+++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/Guide/GuideManager.cs
@@ -115,6 +115,9 @@ namespace Gameplay.Guide
             if (IsGuiding)
                 return;
 
+            if (ConditionReactor.INVALID_ALLOC_ID != reactionID)
+                ConditionReactor.Instance.RemoveReaction(reactionID);
+
             if (completeStepId == 0)
                 completeStepId = (int)Actor.Instance.Logic.GetCount((uint)LogicID.NewGuideProgress);
 
@@ -124,9 +127,6 @@ namespace Gameplay.Guide
 
             curGroup = new GuideGroup(groupId, linkCfg);
 
-            if (ConditionReactor.INVALID_ALLOC_ID != reactionID)
-                return;
-
             if (curGroup.CurStep.Cfg.BeginCondition.Length <= 0)
             {
                 OnBeginGuide(true, null, ConditionReactor.INVALID_ALLOC_ID);
@@ -363,6 +363,8 @@ namespace Gameplay.Guide
         private void RecoverState()
         {
             UIManager.Instance.IsEnableBack = true;
+            ConditionReactor.Instance.RemoveReaction(reactionID);
+            reactionID = ConditionReactor.INVALID_ALLOC_ID;
         }
 
         /// <summary>
diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/Guide/GuideStep.cs b/ProjectNLD/Assets/Code/Scripts/Gameplay/Guide/GuideStep.cs
index e28478008bc..3457a81b903 100644
--- a/ProjectNLD/Assets/Code/Scripts/Gameplay/Guide/GuideStep.cs
+++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/Guide/GuideStep.cs
@@ -712,7 +712,6 @@ namespace Gameplay.Guide
                 base.DoGuide();
 
                 UIManager.Instance.CloseWindow(UINameConst.UI_Guide);
-                LevelManager.Instance.ExitLevelChangeMainFunc = () => { return isContinue; };
             }
             catch (Exception e)
             {
@@ -722,10 +721,12 @@ namespace Gameplay.Guide
 
         protected override void SetGuideState()
         {
+            LevelManager.Instance.ExitLevelChangeMainFunc = () => { return isContinue; };
         }
 
         protected override void RecoverState()
         {
+            LevelManager.Instance.ExitLevelChangeMainFunc = null;
         }
     }