From c68787bf2389be865ae3fd42e33a3193b1d9b3b5 Mon Sep 17 00:00:00 2001
From: mno <718135749@qq.com>
Date: Wed, 9 Jul 2025 16:26:56 +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(#1312)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

优化拾取时滚轮移动和日志输出（不会捡一个输出一串日志了）
---
 repo/js/AutoHoeingOneDragon/assets/滚轮上翻.json | 2 +-
 repo/js/AutoHoeingOneDragon/main.js              | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/repo/js/AutoHoeingOneDragon/assets/滚轮上翻.json b/repo/js/AutoHoeingOneDragon/assets/滚轮上翻.json
index 77437aa4..9b5b8618 100644
--- a/repo/js/AutoHoeingOneDragon/assets/滚轮上翻.json
+++ b/repo/js/AutoHoeingOneDragon/assets/滚轮上翻.json
@@ -10,7 +10,7 @@
       "type": 6,
       "mouseX": 0,
       "mouseY": 0,
-      "time": 100
+      "time": 50
     }
   ],
   "info": {
diff --git a/repo/js/AutoHoeingOneDragon/main.js b/repo/js/AutoHoeingOneDragon/main.js
index 28881ab8..61a999ae 100644
--- a/repo/js/AutoHoeingOneDragon/main.js
+++ b/repo/js/AutoHoeingOneDragon/main.js
@@ -1,6 +1,6 @@
 //拾取时上下滑动的时间
-const timeMoveUp = 600;
-const timeMoveDown = 1200;
+const timeMoveUp = 500;
+const timeMoveDown = 1000;
 
 (async function () {
     //自定义配置处理
@@ -380,6 +380,7 @@ async function runPathWithOcr(pathFilePath, targetTexts, blacklistKeywords) {
     let lastMoveDown = 0;
 
     let lastPickupTime = new Date();
+    let lastPickupItem = "";
     // 定义状态变量
     let state = { completed: false, cancelRequested: false };
     // 定义图像路径和目标文本列表
@@ -533,9 +534,10 @@ async function runPathWithOcr(pathFilePath, targetTexts, blacklistKeywords) {
                     continue;
                 }
 
-                if ((new Date() - lastPickupTime) > 200) {
+                if ((new Date() - lastPickupTime) > 1000 || ocrResult.text != lastPickupItem) {
                     log.info(`交互或拾取："${ocrResult.text}"`);
                     lastPickupTime = new Date();
+                    lastPickupItem = ocrResult.text;
                 }
 
                 // 计算目标文本的中心Y坐标