diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/Condition/Conditions/Guide/ConditionLevelOver.cs b/ProjectNLD/Assets/Code/Scripts/Gameplay/Condition/Conditions/Guide/ConditionLevelOver.cs
index cdccb441086..b9f29bb4676 100644
--- a/ProjectNLD/Assets/Code/Scripts/Gameplay/Condition/Conditions/Guide/ConditionLevelOver.cs
+++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/Condition/Conditions/Guide/ConditionLevelOver.cs
@@ -14,7 +14,16 @@ public class ConditionLevelOver : ICondition
 
     public bool Check(List<float> args)
     {
-        return !LevelManager.Instance.IsInLevel;
+        if (LevelManager.Instance.IsInLevel)
+            return false;
+
+        if (null == LevelManager.Instance.CurrentLevel)
+            return true;
+
+        if (LevelManager.Instance.CurrentLevel.isInBattle)
+            return false;
+
+        return true;
     }
 
     public string[] GetArgLocalizations(List<float> args)
diff --git a/ProjectNLD/Assets/Code/Scripts/Gameplay/Guide/GuideManager.cs b/ProjectNLD/Assets/Code/Scripts/Gameplay/Guide/GuideManager.cs
index 57a58023e1a..b5f7797f353 100644
--- a/ProjectNLD/Assets/Code/Scripts/Gameplay/Guide/GuideManager.cs
+++ b/ProjectNLD/Assets/Code/Scripts/Gameplay/Guide/GuideManager.cs
@@ -109,13 +109,15 @@ namespace Gameplay.Guide
         /// <summary>
         /// 开始引导
         /// </summary>
-        public void BeginGuide()
+        public void BeginGuide(int completeStepId = 0)
         {
 #if GUIDE
             if (IsGuiding)
                 return;
 
-            int completeStepId = (int)Actor.Instance.Logic.GetCount((uint)LogicID.NewGuideProgress);
+            if (completeStepId == 0)
+                completeStepId = (int)Actor.Instance.Logic.GetCount((uint)LogicID.NewGuideProgress);
+
             int groupId = GetGuideGroupId(completeStepId);
             if (!dicGuideCfg.TryGetValue(groupId, out LinkedList<DataGuideCfg> linkCfg))
                 return;
@@ -222,7 +224,7 @@ namespace Gameplay.Guide
             NetHelper.SaveGuideProgress((uint)linkedCfg.Last.Value.Id); // 跳过引导步骤,保存服务器
             DebugUtil.Log($"<color=#00FA9A>跳过引导组，服务器保存引导id:{linkedCfg.Last.Value.Id}</color>");
             EndGuide(false);
-            BeginGuide();
+            BeginGuide(linkedCfg.Last.Value.Id);
         }
 
         /// <summary>
diff --git a/ProjectNLD/Assets/Config/Data/conditionconfig.json b/ProjectNLD/Assets/Config/Data/conditionconfig.json
index 0a58cf0eb3c..e795cf221e3 100644
--- a/ProjectNLD/Assets/Config/Data/conditionconfig.json
+++ b/ProjectNLD/Assets/Config/Data/conditionconfig.json
@@ -1,602 +1,602 @@
 [
   {
     "Id": 1,
-    "Type": 2,
+    "Type": 1,
     "Param1": 0,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 100002,
-    "Type": 5,
+    "Type": 4,
     "Param1": 100001,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 100003,
-    "Type": 5,
+    "Type": 4,
     "Param1": 100002,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 101001,
-    "Type": 5,
+    "Type": 4,
     "Param1": 100003,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 101002,
-    "Type": 5,
+    "Type": 4,
     "Param1": 101001,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 101003,
-    "Type": 5,
+    "Type": 4,
     "Param1": 101002,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 101004,
-    "Type": 5,
+    "Type": 4,
     "Param1": 101003,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 101005,
-    "Type": 5,
+    "Type": 4,
     "Param1": 101004,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 101006,
-    "Type": 5,
+    "Type": 4,
     "Param1": 101005,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 101007,
-    "Type": 5,
+    "Type": 4,
     "Param1": 101006,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 101008,
-    "Type": 5,
+    "Type": 4,
     "Param1": 101007,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 101009,
-    "Type": 5,
+    "Type": 4,
     "Param1": 101008,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 101010,
-    "Type": 5,
+    "Type": 4,
     "Param1": 101009,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 101011,
-    "Type": 5,
+    "Type": 4,
     "Param1": 101010,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 101012,
-    "Type": 5,
+    "Type": 4,
     "Param1": 101011,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 101013,
-    "Type": 5,
+    "Type": 4,
     "Param1": 101012,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 101014,
-    "Type": 5,
+    "Type": 4,
     "Param1": 101013,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 101015,
-    "Type": 5,
+    "Type": 4,
     "Param1": 101014,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 101016,
-    "Type": 5,
+    "Type": 4,
     "Param1": 101015,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 101017,
-    "Type": 5,
+    "Type": 4,
     "Param1": 101016,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 101018,
-    "Type": 5,
+    "Type": 4,
     "Param1": 101017,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 101019,
-    "Type": 5,
+    "Type": 4,
     "Param1": 101018,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 101020,
-    "Type": 5,
+    "Type": 4,
     "Param1": 101019,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 201001,
-    "Type": 5,
+    "Type": 4,
     "Param1": 101020,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 201002,
-    "Type": 5,
+    "Type": 4,
     "Param1": 201001,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 201003,
-    "Type": 5,
+    "Type": 4,
     "Param1": 201002,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 201004,
-    "Type": 5,
+    "Type": 4,
     "Param1": 201003,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 201005,
-    "Type": 5,
+    "Type": 4,
     "Param1": 201004,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 201006,
-    "Type": 5,
+    "Type": 4,
     "Param1": 201005,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 201007,
-    "Type": 5,
+    "Type": 4,
     "Param1": 201006,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 201008,
-    "Type": 5,
+    "Type": 4,
     "Param1": 201007,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 201009,
-    "Type": 5,
+    "Type": 4,
     "Param1": 201008,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 201010,
-    "Type": 5,
+    "Type": 4,
     "Param1": 201009,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 201011,
-    "Type": 5,
+    "Type": 4,
     "Param1": 201010,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 201012,
-    "Type": 5,
+    "Type": 4,
     "Param1": 201011,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 201013,
-    "Type": 5,
+    "Type": 4,
     "Param1": 201012,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 201014,
-    "Type": 5,
+    "Type": 4,
     "Param1": 201013,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 201015,
-    "Type": 5,
+    "Type": 4,
     "Param1": 201014,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 201016,
-    "Type": 5,
+    "Type": 4,
     "Param1": 201015,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 201017,
-    "Type": 5,
+    "Type": 4,
     "Param1": 201016,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 201018,
-    "Type": 5,
+    "Type": 4,
     "Param1": 201017,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 201019,
-    "Type": 5,
+    "Type": 4,
     "Param1": 201018,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 201020,
-    "Type": 5,
+    "Type": 4,
     "Param1": 201019,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 300002,
-    "Type": 5,
+    "Type": 4,
     "Param1": 100001,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 300003,
-    "Type": 5,
+    "Type": 4,
     "Param1": 100002,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 300004,
-    "Type": 5,
+    "Type": 4,
     "Param1": 100003,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 3010011,
-    "Type": 5,
+    "Type": 4,
     "Param1": 300004,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 3010021,
-    "Type": 5,
+    "Type": 4,
     "Param1": 101002,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 3010031,
-    "Type": 5,
+    "Type": 4,
     "Param1": 101004,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 3010041,
-    "Type": 5,
+    "Type": 4,
     "Param1": 101006,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 3010051,
-    "Type": 5,
+    "Type": 4,
     "Param1": 101008,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 3010061,
-    "Type": 5,
+    "Type": 4,
     "Param1": 101010,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 3010071,
-    "Type": 5,
+    "Type": 4,
     "Param1": 101012,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 3010081,
-    "Type": 5,
+    "Type": 4,
     "Param1": 101014,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 3010091,
-    "Type": 5,
+    "Type": 4,
     "Param1": 101016,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 3010101,
-    "Type": 5,
+    "Type": 4,
     "Param1": 101018,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 3010111,
-    "Type": 5,
+    "Type": 4,
     "Param1": 101020,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 3010022,
-    "Type": 5,
+    "Type": 4,
     "Param1": 301001,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 3010032,
-    "Type": 5,
+    "Type": 4,
     "Param1": 301002,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 3010042,
-    "Type": 5,
+    "Type": 4,
     "Param1": 301003,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 3010052,
-    "Type": 5,
+    "Type": 4,
     "Param1": 301004,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 3010062,
-    "Type": 5,
+    "Type": 4,
     "Param1": 301005,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 3010072,
-    "Type": 5,
+    "Type": 4,
     "Param1": 301006,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 3010082,
-    "Type": 5,
+    "Type": 4,
     "Param1": 301007,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 3010092,
-    "Type": 5,
+    "Type": 4,
     "Param1": 301008,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 3010102,
-    "Type": 5,
+    "Type": 4,
     "Param1": 301009,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 3010112,
-    "Type": 5,
+    "Type": 4,
     "Param1": 301010,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 401002,
-    "Type": 5,
+    "Type": 4,
     "Param1": 401001,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 401003,
-    "Type": 5,
+    "Type": 4,
     "Param1": 401002,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 402002,
-    "Type": 5,
+    "Type": 4,
     "Param1": 402001,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 402003,
-    "Type": 5,
+    "Type": 4,
     "Param1": 402002,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 403002,
-    "Type": 5,
+    "Type": 4,
     "Param1": 403001,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 403003,
-    "Type": 5,
+    "Type": 4,
     "Param1": 403002,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 404002,
-    "Type": 5,
+    "Type": 4,
     "Param1": 404001,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 404003,
-    "Type": 5,
+    "Type": 4,
     "Param1": 404002,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 405002,
-    "Type": 5,
+    "Type": 4,
     "Param1": 405001,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 405003,
-    "Type": 5,
+    "Type": 4,
     "Param1": 405002,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 406002,
-    "Type": 5,
+    "Type": 4,
     "Param1": 406001,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 406003,
-    "Type": 5,
+    "Type": 4,
     "Param1": 406002,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 407002,
-    "Type": 5,
+    "Type": 4,
     "Param1": 407001,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 407003,
-    "Type": 5,
+    "Type": 4,
     "Param1": 407002,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 408002,
-    "Type": 5,
+    "Type": 4,
     "Param1": 408001,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 409002,
-    "Type": 5,
+    "Type": 4,
     "Param1": 409001,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 410002,
-    "Type": 5,
+    "Type": 4,
     "Param1": 410001,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 411002,
-    "Type": 5,
+    "Type": 4,
     "Param1": 411001,
     "Param2": 0,
     "Param3": 0
   },
   {
     "Id": 412002,
-    "Type": 5,
+    "Type": 4,
     "Param1": 412001,
     "Param2": 0,
     "Param3": 0