From 726af55700bf52ad17186d2425c06344c0605c17 Mon Sep 17 00:00:00 2001
From: mno <718135749@qq.com>
Date: Tue, 15 Jul 2025 08:16:18 +0800
Subject: [PATCH] =?UTF-8?q?js=EF=BC=9A=E9=94=84=E5=9C=B0=E4=B8=80=E6=9D=A1?=
 =?UTF-8?q?=E9=BE=99=20(#1347)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复修改主界面判定导致的拾取失效
---
 repo/js/AutoHoeingOneDragon/main.js       | 5 ++++-
 repo/js/AutoHoeingOneDragon/manifest.json | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/repo/js/AutoHoeingOneDragon/main.js b/repo/js/AutoHoeingOneDragon/main.js
index 72e514a3..4048aff6 100644
--- a/repo/js/AutoHoeingOneDragon/main.js
+++ b/repo/js/AutoHoeingOneDragon/main.js
@@ -512,6 +512,7 @@ async function runPath(pathFilePath, map_name, whitelistKeywords, blacklistKeywo
                 }
                 return null;
             }
+
             //检查是否在主界面
             async function isMainUI() {
                 // 修改后的图像路径
@@ -553,13 +554,15 @@ async function runPath(pathFilePath, map_name, whitelistKeywords, blacklistKeywo
 
             // 尝试找到 F 图标
             let fRes = await findFIcon(imagePath, 1102, 335, 34, 400, 200);
-            if (!fRes || new Date() - lastCheckMainUi > 2011) {
+            if (!fRes || ((new Date() - lastCheckMainUi) > 2011)) {
                 state.atMainUi = await isMainUI();
                 lastCheckMainUi = new Date();
             }
             if (!fRes && state.atMainUi) {
                 //log.info("在主界面，尝试下滑");
                 await keyMouseScript.runFile(`assets/滚轮下翻.json`);
+            }
+            if (!fRes) {
                 continue;
             }
 
diff --git a/repo/js/AutoHoeingOneDragon/manifest.json b/repo/js/AutoHoeingOneDragon/manifest.json
index 4ae22a93..8daf5360 100644
--- a/repo/js/AutoHoeingOneDragon/manifest.json
+++ b/repo/js/AutoHoeingOneDragon/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 1,
   "name": "锄地一条龙",
-  "version": "1.1.9",
+  "version": "1.1.10",
   "description": "一站式解决自动化锄地，支持只拾取狗粮，请阅读README.md后使用",
   "authors": [
     {