From af6355963d7120da7e23442677f28a064e9138dc Mon Sep 17 00:00:00 2001
From: mno <718135749@qq.com>
Date: Wed, 13 Aug 2025 09:50: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.4.2=20(#1576)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

### 1.4.2（2025.08.13）
1.修改拾取后延时效果
---
 repo/js/AutoHoeingOneDragon/README.md     |  2 ++
 repo/js/AutoHoeingOneDragon/main.js       | 20 ++++++++++++--------
 repo/js/AutoHoeingOneDragon/manifest.json |  6 +++++-
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/repo/js/AutoHoeingOneDragon/README.md b/repo/js/AutoHoeingOneDragon/README.md
index 99a15648..8d4eb110 100644
--- a/repo/js/AutoHoeingOneDragon/README.md
+++ b/repo/js/AutoHoeingOneDragon/README.md
@@ -78,6 +78,8 @@
 
 ---
 ### 更新日志
+### 1.4.2（2025.08.13）
+1.修改拾取后延时效果
 ### 1.4.1（2025.08.12）
 1.优化精英101路线
 ### 1.4.0（2025.08.12）
diff --git a/repo/js/AutoHoeingOneDragon/main.js b/repo/js/AutoHoeingOneDragon/main.js
index 744d6992..0b5f02eb 100644
--- a/repo/js/AutoHoeingOneDragon/main.js
+++ b/repo/js/AutoHoeingOneDragon/main.js
@@ -1,4 +1,4 @@
-//当前js版本 1.4.1
+//当前js版本 1.4.2
 
 //拾取时上下滑动的时间
 let timeMoveUp = 500;
@@ -58,7 +58,7 @@ let targetItems;
 
     targetItems = await readFolder(targetItemPath, false);
     //模板匹配对象处理
-    if (settings.pickupMode === "模板匹配拾取，默认只拾取狗粮") {
+    if (pickupMode === "模板匹配拾取，默认只拾取狗粮") {
         for (const targetItem of targetItems) {
             targetItem.template = file.ReadImageMatSync(targetItem.fullPath);
             targetItem.itemName = targetItem.fileName.replace(/\.png$/, '');
@@ -691,7 +691,7 @@ async function runPath(pathFilePath, map_name, whitelistKeywords, blacklistKeywo
             let foundTarget = false;
             // 获取 F 图标的中心点 Y 坐标
             let centerYF = Math.round(fRes.y + fRes.height / 2);
-            if (settings.pickupMode === "ocr拾取，默认只拾取狗粮和晶蝶") {
+            if (pickupMode === "ocr拾取，默认只拾取狗粮和晶蝶") {
                 // 在当前屏幕范围内进行 OCR 识别
                 let ocrResults = await performOcr(whitelistKeywords, textxRange, { min: fRes.y - texttolerance, max: fRes.y + fRes.height + texttolerance * 2 });
 
@@ -716,15 +716,15 @@ async function runPath(pathFilePath, map_name, whitelistKeywords, blacklistKeywo
                         break;
                     }
                 }
-            } else if (settings.pickupMode === "模板匹配拾取，默认只拾取狗粮") {
-                let start = new Date();
+            } else if (pickupMode === "模板匹配拾取，默认只拾取狗粮") {
+                //let start = new Date();
                 let itemName = await performTemplateMatch(centerYF);
-                let end = new Date();
+                //let end = new Date();
                 //log.info(`调试-匹配用时${end - start}毫秒`)
                 if (itemName) {
                     keyPress("F"); // 执行交互操作
                     log.info(`交互或拾取："${itemName}"`);
-                    await sleep(2 * trigger); // 操作后暂停 2*trigger 毫秒
+                    await sleep(2 * trigger + 100); // 操作后暂停 2*trigger+100 毫秒
                     foundTarget = true;
                 }
 
@@ -751,7 +751,11 @@ async function runPath(pathFilePath, map_name, whitelistKeywords, blacklistKeywo
                     // 否则执行下翻
                     await keyMouseScript.runFile(`assets/滚轮上翻.json`);
                 }
-                await sleep(Math.round(trigger / 5));
+                if (pickupMode === "模板匹配拾取，默认只拾取狗粮") {
+                    await sleep(Math.round(trigger / 5));
+                } else {
+                    await sleep(Math.round(trigger));
+                }
             }
 
             if (state.cancelRequested) {
diff --git a/repo/js/AutoHoeingOneDragon/manifest.json b/repo/js/AutoHoeingOneDragon/manifest.json
index 6a57799d..389f9ba1 100644
--- a/repo/js/AutoHoeingOneDragon/manifest.json
+++ b/repo/js/AutoHoeingOneDragon/manifest.json
@@ -1,12 +1,16 @@
 {
   "manifest_version": 1,
   "name": "锄地一条龙",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "description": "一站式解决自动化锄地，支持只拾取狗粮，请仔细阅读README.md后使用",
   "authors": [
     {
       "name": "mno",
       "links": "https://github.com/Bedrockx"
+    },
+    {
+      "name": "汐",
+      "links": "https://github.com/jiegedabaobei"
     }
   ],
   "settings_ui": "settings.json",