From 560bbb3ebcc5aec232a2a5216bea29984dd95457 Mon Sep 17 00:00:00 2001
From: mno <718135749@qq.com>
Date: Tue, 21 Oct 2025 19:02:42 +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.9.5=20(#2202)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

移动狗粮文件夹位置
修改黑名单处理，防止相同物品被重复加入
重置面具图片
---
 .../{其他 => }/00狗粮（0.8）/冒险家.png          | Bin
 .../{其他 => }/00狗粮（0.8）/幸运儿.png          | Bin
 .../{其他 => }/00狗粮（0.8）/战狂.png            | Bin
 .../{其他 => }/00狗粮（0.8）/教官(1).png         | Bin
 .../{其他 => }/00狗粮（0.8）/教官.png            | Bin
 .../{其他 => }/00狗粮（0.8）/流放者.png          | Bin
 .../{其他 => }/00狗粮（0.8）/游医.png            | Bin
 .../怪物掉落材料/A丘丘王/破损的面具(1).png       | Bin 2640 -> 0 bytes
 .../怪物掉落材料/A丘丘王/破损的面具.png          | Bin 0 -> 2313 bytes
 repo/js/AutoHoeingOneDragon/main.js              |   9 +++++++--
 repo/js/AutoHoeingOneDragon/manifest.json        |   2 +-
 11 files changed, 8 insertions(+), 3 deletions(-)
 rename repo/js/AutoHoeingOneDragon/assets/targetItems/{其他 => }/00狗粮（0.8）/冒险家.png (100%)
 rename repo/js/AutoHoeingOneDragon/assets/targetItems/{其他 => }/00狗粮（0.8）/幸运儿.png (100%)
 rename repo/js/AutoHoeingOneDragon/assets/targetItems/{其他 => }/00狗粮（0.8）/战狂.png (100%)
 rename repo/js/AutoHoeingOneDragon/assets/targetItems/{其他 => }/00狗粮（0.8）/教官(1).png (100%)
 rename repo/js/AutoHoeingOneDragon/assets/targetItems/{其他 => }/00狗粮（0.8）/教官.png (100%)
 rename repo/js/AutoHoeingOneDragon/assets/targetItems/{其他 => }/00狗粮（0.8）/流放者.png (100%)
 rename repo/js/AutoHoeingOneDragon/assets/targetItems/{其他 => }/00狗粮（0.8）/游医.png (100%)
 delete mode 100644 repo/js/AutoHoeingOneDragon/assets/targetItems/怪物掉落材料/A丘丘王/破损的面具(1).png
 create mode 100644 repo/js/AutoHoeingOneDragon/assets/targetItems/怪物掉落材料/A丘丘王/破损的面具.png

diff --git a/repo/js/AutoHoeingOneDragon/assets/targetItems/其他/00狗粮（0.8）/冒险家.png b/repo/js/AutoHoeingOneDragon/assets/targetItems/00狗粮（0.8）/冒险家.png
similarity index 100%
rename from repo/js/AutoHoeingOneDragon/assets/targetItems/其他/00狗粮（0.8）/冒险家.png
rename to repo/js/AutoHoeingOneDragon/assets/targetItems/00狗粮（0.8）/冒险家.png
diff --git a/repo/js/AutoHoeingOneDragon/assets/targetItems/其他/00狗粮（0.8）/幸运儿.png b/repo/js/AutoHoeingOneDragon/assets/targetItems/00狗粮（0.8）/幸运儿.png
similarity index 100%
rename from repo/js/AutoHoeingOneDragon/assets/targetItems/其他/00狗粮（0.8）/幸运儿.png
rename to repo/js/AutoHoeingOneDragon/assets/targetItems/00狗粮（0.8）/幸运儿.png
diff --git a/repo/js/AutoHoeingOneDragon/assets/targetItems/其他/00狗粮（0.8）/战狂.png b/repo/js/AutoHoeingOneDragon/assets/targetItems/00狗粮（0.8）/战狂.png
similarity index 100%
rename from repo/js/AutoHoeingOneDragon/assets/targetItems/其他/00狗粮（0.8）/战狂.png
rename to repo/js/AutoHoeingOneDragon/assets/targetItems/00狗粮（0.8）/战狂.png
diff --git a/repo/js/AutoHoeingOneDragon/assets/targetItems/其他/00狗粮（0.8）/教官(1).png b/repo/js/AutoHoeingOneDragon/assets/targetItems/00狗粮（0.8）/教官(1).png
similarity index 100%
rename from repo/js/AutoHoeingOneDragon/assets/targetItems/其他/00狗粮（0.8）/教官(1).png
rename to repo/js/AutoHoeingOneDragon/assets/targetItems/00狗粮（0.8）/教官(1).png
diff --git a/repo/js/AutoHoeingOneDragon/assets/targetItems/其他/00狗粮（0.8）/教官.png b/repo/js/AutoHoeingOneDragon/assets/targetItems/00狗粮（0.8）/教官.png
similarity index 100%
rename from repo/js/AutoHoeingOneDragon/assets/targetItems/其他/00狗粮（0.8）/教官.png
rename to repo/js/AutoHoeingOneDragon/assets/targetItems/00狗粮（0.8）/教官.png
diff --git a/repo/js/AutoHoeingOneDragon/assets/targetItems/其他/00狗粮（0.8）/流放者.png b/repo/js/AutoHoeingOneDragon/assets/targetItems/00狗粮（0.8）/流放者.png
similarity index 100%
rename from repo/js/AutoHoeingOneDragon/assets/targetItems/其他/00狗粮（0.8）/流放者.png
rename to repo/js/AutoHoeingOneDragon/assets/targetItems/00狗粮（0.8）/流放者.png
diff --git a/repo/js/AutoHoeingOneDragon/assets/targetItems/其他/00狗粮（0.8）/游医.png b/repo/js/AutoHoeingOneDragon/assets/targetItems/00狗粮（0.8）/游医.png
similarity index 100%
rename from repo/js/AutoHoeingOneDragon/assets/targetItems/其他/00狗粮（0.8）/游医.png
rename to repo/js/AutoHoeingOneDragon/assets/targetItems/00狗粮（0.8）/游医.png
diff --git a/repo/js/AutoHoeingOneDragon/assets/targetItems/怪物掉落材料/A丘丘王/破损的面具(1).png b/repo/js/AutoHoeingOneDragon/assets/targetItems/怪物掉落材料/A丘丘王/破损的面具(1).png
deleted file mode 100644
index af6853f9ebc468d6b672294f2de3362f8742f961..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2640
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

diff --git a/repo/js/AutoHoeingOneDragon/assets/targetItems/怪物掉落材料/A丘丘王/破损的面具.png b/repo/js/AutoHoeingOneDragon/assets/targetItems/怪物掉落材料/A丘丘王/破损的面具.png
new file mode 100644
index 0000000000000000000000000000000000000000..bfb733c8c9314d40b55b10ccc736055d7dd3d467
GIT binary patch
literal 2313
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

literal 0
HcmV?d00001

diff --git a/repo/js/AutoHoeingOneDragon/main.js b/repo/js/AutoHoeingOneDragon/main.js
index cd5536e86..8f108268b 100644
--- a/repo/js/AutoHoeingOneDragon/main.js
+++ b/repo/js/AutoHoeingOneDragon/main.js
@@ -614,8 +614,10 @@ async function runPath(fullPath, map_name) {
                             if (cnPart && ocrText.includes(cnPart)) {
                                 const itemName = targetItem.itemName;
                                 log.warn(`物品"${itemName}"已满，加入黑名单`);
-                                blacklistSet.add(itemName);
-                                blacklist.push(itemName);
+                                if (!blacklistSet.has(itemName)) {  // 仅当第一次出现才添加
+                                    blacklistSet.add(itemName);
+                                    blacklist.push(itemName);
+                                }
                                 await loadBlacklist(false);
                             }
                         }
@@ -669,7 +671,10 @@ async function recognizeAndInteract() {
 
         let foundTarget = false;
         if (pickup_Mode === "模板匹配拾取，拾取狗粮和怪物材料" || pickup_Mode === "模板匹配拾取，只拾取狗粮") {
+            let time1 = new Date();
             itemName = await performTemplateMatch(centerYF);
+            let time2 = new Date();
+            log.info(`调试-本次识别用时${time2 - time1}毫秒`);
         }
         if (itemName) {
             //log.info(`调试-识别到物品${itemName}`);
diff --git a/repo/js/AutoHoeingOneDragon/manifest.json b/repo/js/AutoHoeingOneDragon/manifest.json
index d5a68ef4d..98829ab06 100644
--- a/repo/js/AutoHoeingOneDragon/manifest.json
+++ b/repo/js/AutoHoeingOneDragon/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 1,
   "name": "锄地一条龙",
-  "version": "1.9.4",
+  "version": "1.9.5",
   "description": "一站式解决自动化锄地，支持只拾取狗粮，请仔细阅读README.md后使用",
   "authors": [
     {