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 af6853f9e..000000000 Binary files a/repo/js/AutoHoeingOneDragon/assets/targetItems/怪物掉落材料/A丘丘王/破损的面具(1).png and /dev/null differ diff --git a/repo/js/AutoHoeingOneDragon/assets/targetItems/怪物掉落材料/A丘丘王/破损的面具.png b/repo/js/AutoHoeingOneDragon/assets/targetItems/怪物掉落材料/A丘丘王/破损的面具.png new file mode 100644 index 000000000..bfb733c8c Binary files /dev/null and b/repo/js/AutoHoeingOneDragon/assets/targetItems/怪物掉落材料/A丘丘王/破损的面具.png differ 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": [ {