fix: SL不进行次数检测会导致500船/50战利品检测失效

Saratoga-Official · Saratoga-Official · commit c18527efa797 · 2026-02-06T11:26:18.000+08:00
diff --git a/assets/resource/pipeline/戰鬥.json b/assets/resource/pipeline/戰鬥.json
@@ -15,17 +15,25 @@
         "post_wait_freezes": 0,
         "next": [
             "[JumpBack]重新连接",
+            "战斗次数",
+            "[JumpBack]活动退出",
+            "[JumpBack]领取奖励",
+            "[JumpBack]退出",
+            "无动作结束"
+        ]
+    },
+    "战斗次数": {
+        "post_wait_freezes": 0,
+        "next": [
             "无限战斗检测",
             "无限战斗提示"
         ]
     },
     "无限战斗检测": {
         "post_wait_freezes": 0,
         "next": [
-            "战斗次数",
-            "[JumpBack]领取奖励",
-            "[JumpBack]退出",
-            "无动作结束"
+            "检查远征",
+            "开始导航"
         ]
     },
     "无限战斗提示": {
@@ -36,13 +44,6 @@
             "无动作结束"
         ]
     },
-    "战斗次数": {
-        "post_wait_freezes": 0,
-        "next": [
-            "检查远征",
-            "开始导航"
-        ]
-    },
     "进入关卡": {
         "recognition": {
             "type": "OCR",
@@ -699,7 +700,8 @@
         },
         "action": {
             "type": "Click"
-        }
+        },
+        "enabled": false
     },
     "节点1索敌成功": {
         "recognition": {
diff --git a/assets/resource/pipeline/通用.json b/assets/resource/pipeline/通用.json
@@ -250,8 +250,8 @@
         },
         "next": [
             "[JumpBack]重新连接",
-            "检查远征",
-            "进入关卡"
+            "无限战斗检测",
+            "无限战斗提示"
         ],
         "on_error": [
             "战斗SL",
diff --git a/assets/resource/tasks/活动.json b/assets/resource/tasks/活动.json
@@ -35,16 +35,12 @@
                                 581,
                                 254,
                                 75
-                            ],
-                            "next": [
-                                "[JumpBack]重新连接",
-                                "战斗次数",
-                                "[JumpBack]活动退出",
-                                "[JumpBack]退出",
-                                "无动作结束"
                             ]
                         },
-                        "战斗次数": {
+                        "活动退出": {
+                            "enabled": true
+                        },
+                        "无限战斗检测": {
                             "next": [
                                 "进入关卡"
                             ]
@@ -82,6 +78,7 @@
                     "pipeline_override": {
                         "进入活动": {
                             "next": [
+                                "[JumpBack]重新连接",
                                 "立体强袭开始"
                             ]
                         }
@@ -98,6 +95,7 @@
                     "pipeline_override": {
                         "进入活动": {
                             "next": [
+                                "[JumpBack]重新连接",
                                 "检查题目"
                             ]
                         }

Original file line number	Diff line number	Diff line change
`@@ -35,16 +35,12 @@`
`35`	`35`	`581,`
`36`	`36`	`254,`
`37`	`37`	`75`
`38`		`- ],`
`39`		`- "next": [`
`40`		`- "[JumpBack]重新连接",`
`41`		`- "战斗次数",`
`42`		`- "[JumpBack]活动退出",`
`43`		`- "[JumpBack]退出",`
`44`		`- "无动作结束"`
`45`	`38`	`]`
`46`	`39`	`},`
`47`		`- "战斗次数": {`
	`40`	`+ "活动退出": {`
	`41`	`+ "enabled": true`
	`42`	`+ },`
	`43`	`+ "无限战斗检测": {`
`48`	`44`	`"next": [`
`49`	`45`	`"进入关卡"`
`50`	`46`	`]`
`@@ -82,6 +78,7 @@`
`82`	`78`	`"pipeline_override": {`
`83`	`79`	`"进入活动": {`
`84`	`80`	`"next": [`
	`81`	`+ "[JumpBack]重新连接",`
`85`	`82`	`"立体强袭开始"`
`86`	`83`	`]`
`87`	`84`	`}`
`@@ -98,6 +95,7 @@`
`98`	`95`	`"pipeline_override": {`
`99`	`96`	`"进入活动": {`
`100`	`97`	`"next": [`
	`98`	`+ "[JumpBack]重新连接",`
`101`	`99`	`"检查题目"`
`102`	`100`	`]`
`103`	`101`	`}`