From a462d23010c488010a8818e15508211309f556e0 Mon Sep 17 00:00:00 2001
From: mno <718135749@qq.com>
Date: Tue, 5 Aug 2025 10:03:43 +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=991.3.1=20(#1478)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

### 1.3.1（2025.08.05）
1.修复异步使用滚动造成的拾取失效
---
 repo/js/AutoHoeingOneDragon/README.md            | 2 ++
 repo/js/AutoHoeingOneDragon/assets/滚轮上翻.json | 6 +++---
 repo/js/AutoHoeingOneDragon/assets/滚轮下翻.json | 4 ++--
 repo/js/AutoHoeingOneDragon/main.js              | 7 ++++---
 repo/js/AutoHoeingOneDragon/manifest.json        | 2 +-
 5 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/repo/js/AutoHoeingOneDragon/README.md b/repo/js/AutoHoeingOneDragon/README.md
index 5de7aa92..30f3573a 100644
--- a/repo/js/AutoHoeingOneDragon/README.md
+++ b/repo/js/AutoHoeingOneDragon/README.md
@@ -74,6 +74,8 @@
 
 ---
 ### 更新日志
+### 1.3.1（2025.08.05）
+1.修复异步使用滚动造成的拾取失效
 ### 1.3.0（2025.08.04）
 1.增加了识图频率限制，可以通过自定义配置中触发器间隔调节
 1.优化了拾取时的滚动效果
diff --git a/repo/js/AutoHoeingOneDragon/assets/滚轮上翻.json b/repo/js/AutoHoeingOneDragon/assets/滚轮上翻.json
index 9b5b8618..ec7f12fe 100644
--- a/repo/js/AutoHoeingOneDragon/assets/滚轮上翻.json
+++ b/repo/js/AutoHoeingOneDragon/assets/滚轮上翻.json
@@ -3,19 +3,19 @@
     {
       "type": 6,
       "mouseX": 0,
-      "mouseY": 1200,
+      "mouseY": 120,
       "time": 0
     },
     {
       "type": 6,
       "mouseX": 0,
       "mouseY": 0,
-      "time": 50
+      "time": 49
     }
   ],
   "info": {
     "name": "滚轮上翻",
-    "description": "模拟鼠标滚轮向上滚动1200单位",
+    "description": "模拟鼠标滚轮向上滚动120单位",
     "x": 0,
     "y": 0,
     "width": 1920,
diff --git a/repo/js/AutoHoeingOneDragon/assets/滚轮下翻.json b/repo/js/AutoHoeingOneDragon/assets/滚轮下翻.json
index 838a6326..522e7401 100644
--- a/repo/js/AutoHoeingOneDragon/assets/滚轮下翻.json
+++ b/repo/js/AutoHoeingOneDragon/assets/滚轮下翻.json
@@ -10,12 +10,12 @@
             "type": 6,
             "mouseX": 0,
             "mouseY": 0,
-            "time": 25
+            "time": 49
         }
     ],
     "info": {
         "name": "",
-        "description": "",
+        "description": "模拟鼠标滚轮向上滚动120单位",
         "x": 0,
         "y": 0,
         "width": 1920,
diff --git a/repo/js/AutoHoeingOneDragon/main.js b/repo/js/AutoHoeingOneDragon/main.js
index df204c55..1678ba05 100644
--- a/repo/js/AutoHoeingOneDragon/main.js
+++ b/repo/js/AutoHoeingOneDragon/main.js
@@ -638,9 +638,10 @@ async function runPath(pathFilePath, map_name, whitelistKeywords, blacklistKeywo
                 state.lastCheckMainUi = new Date();
                 if (state.atMainUi) {
                     //log.info("在主界面，尝试下滑");
-                    keyMouseScript.runFile(`assets/滚轮下翻.json`);
+                    await keyMouseScript.runFile(`assets/滚轮下翻.json`);
                 }
                 await sleep(trigger);
+                lastMoveDown = new Date();
                 continue;
             }
 
@@ -681,7 +682,7 @@ async function runPath(pathFilePath, map_name, whitelistKeywords, blacklistKeywo
 
                 // 如果距离上次下翻超过timeMoveUp秒，则执行下翻
                 if (currentTime - lastMoveDown > timeMoveUp) {
-                    keyMouseScript.runFile(`assets/滚轮下翻.json`);
+                    await keyMouseScript.runFile(`assets/滚轮下翻.json`);
 
                     // 如果这是第一次下翻，记录这次下翻的时间
                     if (thisMoveUpTime === 0) {
@@ -695,7 +696,7 @@ async function runPath(pathFilePath, map_name, whitelistKeywords, blacklistKeywo
                     }
                 } else {
                     // 否则执行下翻
-                    keyMouseScript.runFile(`assets/滚轮上翻.json`);
+                    await keyMouseScript.runFile(`assets/滚轮上翻.json`);
                 }
             }
 
diff --git a/repo/js/AutoHoeingOneDragon/manifest.json b/repo/js/AutoHoeingOneDragon/manifest.json
index 227a02ee..fc5da19a 100644
--- a/repo/js/AutoHoeingOneDragon/manifest.json
+++ b/repo/js/AutoHoeingOneDragon/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 1,
   "name": "锄地一条龙",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "一站式解决自动化锄地，支持只拾取狗粮，请仔细阅读README.md后使用",
   "authors": [
     {