From 99f45fcd05756454296639fb4dc96cebc0d12067 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=91=E7=AB=AF=E5=AE=A2?=
 <107686912+Kirito520Asuna@users.noreply.github.com>
Date: Sat, 11 Apr 2026 12:36:51 +0800
Subject: [PATCH] =?UTF-8?q?fix(AutoPlan):=20=E4=BF=AE=E5=A4=8D=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=E6=BB=9A=E5=8A=A8=E6=9F=A5=E6=89=BE=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20(#3106)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改scrollPagesByActivity函数默认滚动页面次数为4
- 调整活动查找结果判断条件，增加名称不存在的情况处理
- 解决已结束活动状态判断的逻辑错误
---
 repo/js/AutoPlan/README.md         | 4 ++++
 repo/js/AutoPlan/manifest.json     | 2 +-
 repo/js/AutoPlan/utils/activity.js | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/repo/js/AutoPlan/README.md b/repo/js/AutoPlan/README.md
index cfc5dd2a5..69502910d 100644
--- a/repo/js/AutoPlan/README.md
+++ b/repo/js/AutoPlan/README.md
@@ -303,8 +303,12 @@
 | 0.0.2 | oiJbmjU2R0NniiwiZxh |           0.0.5+           |
 | 0.0.3 | oiJbmjU2R0NniiwiZxh |           0.0.6+           |
 | 0.0.4 | oiJbmjU2R0NniiwiZxh |           0.0.6+           |
+| 0.0.5 | oiJbmjU2R0NniiwiZxh |           0.0.6+           |
 
 ## 版本历史（简要）
+### 0.0.4 2026.04.11
+- 调整幽境危战 查找结果判断条件，增加名称不存在的情况处理
+- 默认滚动页面次数为4
 ### 0.0.4 2026.03.25
 - 修复识别异常
 ### 0.0.3 2026.03.13
diff --git a/repo/js/AutoPlan/manifest.json b/repo/js/AutoPlan/manifest.json
index 1d6d4c044..f5584fcc1 100644
--- a/repo/js/AutoPlan/manifest.json
+++ b/repo/js/AutoPlan/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "自动体力计划",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "",
   "settings_ui": "settings.json",
   "main": "main.js",
diff --git a/repo/js/AutoPlan/utils/activity.js b/repo/js/AutoPlan/utils/activity.js
index 3e35f9b5f..7d5f7a285 100644
--- a/repo/js/AutoPlan/utils/activity.js
+++ b/repo/js/AutoPlan/utils/activity.js
@@ -58,7 +58,7 @@ async function scrollPage(totalDistance, isUp = false, waitCount = 6, stepDistan
  * @param {number} stepDistance - 每次滚动的步长距离
  * @param {number} scrollPageCount - 滚动页面次数，默认从config中获取
  */
-async function scrollPagesByActivity(isUp = false, total = 90, waitCount = 6, stepDistance = 30, scrollPageCount = config.scrollPageCount) {
+async function scrollPagesByActivity(isUp = false, total = 90, waitCount = 6, stepDistance = 30, scrollPageCount = 4) {
     // 根据滚动方向设置坐标位置
     // 如果是向上滚动，使用顶部坐标；否则使用底部坐标
     let x = isUp ? xyConfig.top.x : xyConfig.bottom.x;  // 根据滚动方向获取x坐标
@@ -356,7 +356,7 @@ async function findStygianOnslaught() {
         value: "已结束",
     }
     const findResult = await scrollFindActivity(findActivity.name, findActivity.key, findActivity.value);
-    if (findResult.name && findResult.key && findResult.value) {
+    if((!findResult.name)||(findResult.name && findResult.key && findResult.value) ){
         // 幽境危战 紊乱爆发期 已结束
         return false
     }