From 022678a55eecd229e5376f218431619361f1e5c7 Mon Sep 17 00:00:00 2001 From: mno <718135749@qq.com> Date: Sat, 14 Mar 2026 15:25:30 +0800 Subject: [PATCH] =?UTF-8?q?js=EF=BC=9A=E8=81=94=E6=9C=BA=E5=9B=A2=E8=B4=AD?= =?UTF-8?q?=EF=BC=8C=E9=94=84=E5=9C=B0=E4=B8=80=E6=9D=A1=E9=BE=99=EF=BC=8C?= =?UTF-8?q?=E9=87=87=E9=9B=86cd=E7=AE=A1=E7=90=86=20(#2991)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 联机团购 修复放人问题 * 锄地一条龙 1.增加二次识别，默认开启，可禁用 2.增加限定材料识别范围，默认禁用 * 采集cd管理 增加二次识别，默认开启，可禁用 --- repo/js/ArtifactsGroupPurchasing/main.js | 12 +- .../js/ArtifactsGroupPurchasing/manifest.json | 2 +- .../assets/monsterInfo.json | 1531 +++++++++++++++++ repo/js/AutoHoeingOneDragon/main.js | 72 +- repo/js/AutoHoeingOneDragon/manifest.json | 2 +- repo/js/AutoHoeingOneDragon/settings.json | 12 + repo/js/采集cd管理/main.js | 25 +- repo/js/采集cd管理/manifest.json | 2 +- 8 files changed, 1641 insertions(+), 17 deletions(-) diff --git a/repo/js/ArtifactsGroupPurchasing/main.js b/repo/js/ArtifactsGroupPurchasing/main.js index 05d6b40cb..c699d3583 100644 --- a/repo/js/ArtifactsGroupPurchasing/main.js +++ b/repo/js/ArtifactsGroupPurchasing/main.js @@ -648,7 +648,6 @@ async function autoEnter(autoEnterSettings) { // ===== 状态 ===== let enterCount = 0; let targetsRo = []; - let checkToEnd = false; let enteredPlayers = []; // ===== 初始化 ===== @@ -668,7 +667,7 @@ async function autoEnter(autoEnterSettings) { // ===== 主循环 ===== const totalTime = timeout * 60 * 1000; - let checkPoints = [false, false, false]; // 使用数组标记检查状态，分别对应30%、50%、70%时间点 + let checkPoints = [false, false, false, false, false]; // 使用数组标记检查状态，分别对应20%、40%、60%、80%、90%时间点 while (new Date() - start < totalTime) { if (enterMode === "进入他人世界") { const playerSign = await getPlayerSign(); @@ -717,18 +716,18 @@ async function autoEnter(autoEnterSettings) { // 检查时间点，触发额外检测 const elapsed = new Date() - start; - const timePoints = [0.3, 0.5, 0.7]; + const timePoints = [0.2, 0.4, 0.6, 0.8, 0.9]; for (let i = 0; i < timePoints.length; i++) { const point = timePoints[i]; if (!checkPoints[i] && elapsed >= totalTime * point) { checkPoints[i] = true; log.info(`达到超时时间的 ${point * 100}%，额外进行一次检测`); - enterCount = maxEnterCount; + enterCount = maxEnterCount; // 强制触发检测 break; } } - if (enterCount >= maxEnterCount) break; + // 继续执行，不在这里结束循环，由统一检查部分处理 if (await isYUI()) keyPress("VK_ESCAPE"); await sleep(500); await genshin.returnMainUi(); keyPress("Y"); await sleep(250); @@ -767,8 +766,7 @@ async function autoEnter(autoEnterSettings) { if (await isYUI()) { keyPress("VK_ESCAPE"); await genshin.returnMainUi(); } - if (enterCount >= maxEnterCount || checkToEnd) { - checkToEnd = true; + if (enterCount >= maxEnterCount) { await sleep(20000); if (await findTotalNumber() === maxEnterCount + 1) { notification.send(`已达到预定人数：${maxEnterCount + 1}`); diff --git a/repo/js/ArtifactsGroupPurchasing/manifest.json b/repo/js/ArtifactsGroupPurchasing/manifest.json index 2cb8b5d87..3c1cf4ad8 100644 --- a/repo/js/ArtifactsGroupPurchasing/manifest.json +++ b/repo/js/ArtifactsGroupPurchasing/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 1, "name": "AAA狗粮联机团购", - "version": "1.14.0", + "version": "1.14.1", "tags": [ "狗粮" ], diff --git a/repo/js/AutoHoeingOneDragon/assets/monsterInfo.json b/repo/js/AutoHoeingOneDragon/assets/monsterInfo.json index 1ca72d388..27d3b6a71 100644 --- a/repo/js/AutoHoeingOneDragon/assets/monsterInfo.json +++ b/repo/js/AutoHoeingOneDragon/assets/monsterInfo.json @@ -3,6 +3,7 @@ "name": "小怪传奇倍率一", "moraRate": 1, "type": "普通", + "item": [], "tags": [ "传奇" ] @@ -11,6 +12,7 @@ "name": "小怪传奇倍率二", "moraRate": 2, "type": "普通", + "item": [], "tags": [ "传奇" ] @@ -19,6 +21,7 @@ "name": "精英传奇倍率一", "moraRate": 1, "type": "精英", + "item": [], "tags": [ "传奇" ] @@ -27,6 +30,7 @@ "name": "精英传奇倍率二", "moraRate": 2, "type": "精英", + "item": [], "tags": [ "传奇" ] @@ -35,6 +39,7 @@ "name": "精英传奇倍率三", "moraRate": 3, "type": "精英", + "item": [], "tags": [ "传奇" ] @@ -43,6 +48,7 @@ "name": "精英传奇倍率五", "moraRate": 5, "type": "精英", + "item": [], "tags": [ "传奇" ] @@ -51,18 +57,33 @@ "name": "火史莱姆", "moraRate": 1, "type": "普通", + "item": [ + "史莱姆凝液", + "史莱姆清", + "史莱姆原浆" + ], "tags": [] }, { "name": "大型火史莱姆", "moraRate": 2, "type": "普通", + "item": [ + "史莱姆凝液", + "史莱姆清", + "史莱姆原浆" + ], "tags": [] }, { "name": "水史莱姆", "moraRate": 1, "type": "普通", + "item": [ + "史莱姆凝液", + "史莱姆清", + "史莱姆原浆" + ], "tags": [ "水免" ] @@ -71,6 +92,11 @@ "name": "大型水史莱姆", "moraRate": 2, "type": "普通", + "item": [ + "史莱姆凝液", + "史莱姆清", + "史莱姆原浆" + ], "tags": [ "水免" ] @@ -79,138 +105,213 @@ "name": "风史莱姆", "moraRate": 1, "type": "普通", + "item": [ + "史莱姆凝液", + "史莱姆清", + "史莱姆原浆" + ], "tags": [] }, { "name": "大型风史莱姆", "moraRate": 2, "type": "普通", + "item": [ + "史莱姆凝液", + "史莱姆清", + "史莱姆原浆" + ], "tags": [] }, { "name": "雷史莱姆", "moraRate": 1, "type": "普通", + "item": [ + "史莱姆凝液", + "史莱姆清", + "史莱姆原浆" + ], "tags": [] }, { "name": "大型雷史莱姆", "moraRate": 2, "type": "普通", + "item": [ + "史莱姆凝液", + "史莱姆清", + "史莱姆原浆" + ], "tags": [] }, { "name": "变异雷史莱姆", "moraRate": 2, "type": "普通", + "item": [ + "史莱姆凝液", + "史莱姆清", + "史莱姆原浆" + ], "tags": [] }, { "name": "草史莱姆", "moraRate": 1, "type": "普通", + "item": [ + "史莱姆凝液", + "史莱姆清", + "史莱姆原浆" + ], "tags": [] }, { "name": "大型草史莱姆", "moraRate": 2, "type": "普通", + "item": [ + "史莱姆凝液", + "史莱姆清", + "史莱姆原浆" + ], "tags": [] }, { "name": "冰史莱姆", "moraRate": 1, "type": "普通", + "item": [ + "史莱姆凝液", + "史莱姆清", + "史莱姆原浆" + ], "tags": [] }, { "name": "大型冰史莱姆", "moraRate": 2, "type": "普通", + "item": [ + "史莱姆凝液", + "史莱姆清", + "史莱姆原浆" + ], "tags": [] }, { "name": "岩史莱姆", "moraRate": 1, "type": "普通", + "item": [ + "史莱姆凝液", + "史莱姆清", + "史莱姆原浆" + ], "tags": [] }, { "name": "大型岩史莱姆", "moraRate": 2, "type": "普通", + "item": [ + "史莱姆凝液", + "史莱姆清", + "史莱姆原浆" + ], "tags": [] }, { "name": "狂风之核", "moraRate": 3, "type": "精英", + "item": [], "tags": [] }, { "name": "无相之火", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "无相之水", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "无相之风", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "无相之雷", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "无相之草", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "无相之冰", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "无相之岩", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "纯水精灵", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "雷音权现", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "火飘浮灵", "moraRate": 1, "type": "普通", + "item": [ + "浮游干核", + "浮游晶化核", + "浮游幽核" + ], "tags": [] }, { "name": "水飘浮灵", "moraRate": 1, "type": "普通", + "item": [ + "浮游干核", + "浮游晶化核", + "浮游幽核" + ], "tags": [ "水免" ] @@ -219,36 +320,66 @@ "name": "风飘浮灵", "moraRate": 1, "type": "普通", + "item": [ + "浮游干核", + "浮游晶化核", + "浮游幽核" + ], "tags": [] }, { "name": "雷飘浮灵", "moraRate": 1, "type": "普通", + "item": [ + "浮游干核", + "浮游晶化核", + "浮游幽核" + ], "tags": [] }, { "name": "草飘浮灵", "moraRate": 1, "type": "普通", + "item": [ + "浮游干核", + "浮游晶化核", + "浮游幽核" + ], "tags": [] }, { "name": "冰飘浮灵", "moraRate": 1, "type": "普通", + "item": [ + "浮游干核", + "浮游晶化核", + "浮游幽核" + ], "tags": [] }, { "name": "岩飘浮灵", "moraRate": 1, "type": "普通", + "item": [ + "浮游干核", + "浮游晶化核", + "浮游幽核" + ], "tags": [] }, { "name": "浊水粉碎幻灵", "moraRate": 1, "type": "精英", + "item": [ + "初生的浊水幻灵", + "浊水的一滴", + "浊水的一掬" + ], "tags": [ "水免" ] @@ -257,6 +388,11 @@ "name": "浊水喷吐幻灵", "moraRate": 1, "type": "精英", + "item": [ + "初生的浊水幻灵", + "浊水的一滴", + "浊水的一掬" + ], "tags": [ "水免" ] @@ -265,18 +401,29 @@ "name": "水形幻人", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "灼烜·霜夜灵嗣", "moraRate": 1, "type": "精英", + "item": [ + "霜夜的残照", + "霜夜的煌荣", + "霜夜的柔辉" + ], "tags": [] }, { "name": "涌流·霜夜灵嗣", "moraRate": 1, "type": "精英", + "item": [ + "霜夜的残照", + "霜夜的煌荣", + "霜夜的柔辉" + ], "tags": [ "水免" ] @@ -285,228 +432,466 @@ "name": "驰岚·霜夜灵嗣", "moraRate": 1, "type": "精英", + "item": [ + "霜夜的残照", + "霜夜的煌荣", + "霜夜的柔辉" + ], "tags": [] }, { "name": "辉电·霜夜灵嗣", "moraRate": 1, "type": "精英", + "item": [ + "霜夜的残照", + "霜夜的煌荣", + "霜夜的柔辉" + ], "tags": [] }, { "name": "蔓结·霜夜灵嗣", "moraRate": 1, "type": "精英", + "item": [ + "霜夜的残照", + "霜夜的煌荣", + "霜夜的柔辉" + ], "tags": [] }, { "name": "凌晶·霜夜灵嗣", "moraRate": 1, "type": "精英", + "item": [ + "霜夜的残照", + "霜夜的煌荣", + "霜夜的柔辉" + ], "tags": [] }, { "name": "金礞·霜夜灵嗣", "moraRate": 1, "type": "精英", + "item": [ + "霜夜的残照", + "霜夜的煌荣", + "霜夜的柔辉" + ], "tags": [] }, { "name": "霜夜巡天灵主", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "丘丘人", "moraRate": 1, "type": "普通", + "item": [ + "破损的面具", + "污秽的面具", + "不祥的面具" + ], "tags": [] }, { "name": "打手丘丘人", "moraRate": 1, "type": "普通", + "item": [ + "破损的面具", + "污秽的面具", + "不祥的面具" + ], "tags": [] }, { "name": "冲锋丘丘人", "moraRate": 1, "type": "普通", + "item": [ + "破损的面具", + "污秽的面具", + "不祥的面具" + ], "tags": [] }, { "name": "木盾丘丘人", "moraRate": 1, "type": "普通", + "item": [ + "破损的面具", + "污秽的面具", + "不祥的面具" + ], "tags": [] }, { "name": "冰盾丘丘人", "moraRate": 1, "type": "普通", + "item": [ + "破损的面具", + "污秽的面具", + "不祥的面具" + ], "tags": [] }, { "name": "岩盾丘丘人", "moraRate": 1, "type": "普通", + "item": [ + "破损的面具", + "污秽的面具", + "不祥的面具" + ], "tags": [] }, { "name": "射手丘丘人", "moraRate": 1, "type": "普通", + "item": [ + "牢固的箭簇", + "锐利的箭簇", + "历战的箭簇", + "破损的面具", + "污秽的面具", + "不祥的面具" + ], "tags": [] }, { "name": "火箭丘丘人", "moraRate": 1, "type": "普通", + "item": [ + "牢固的箭簇", + "锐利的箭簇", + "历战的箭簇", + "破损的面具", + "污秽的面具", + "不祥的面具" + ], "tags": [] }, { "name": "雷箭丘丘人", "moraRate": 1, "type": "普通", + "item": [ + "牢固的箭簇", + "锐利的箭簇", + "历战的箭簇", + "破损的面具", + "污秽的面具", + "不祥的面具" + ], "tags": [] }, { "name": "冰箭丘丘人", "moraRate": 1, "type": "普通", + "item": [ + "牢固的箭簇", + "锐利的箭簇", + "历战的箭簇", + "破损的面具", + "污秽的面具", + "不祥的面具" + ], "tags": [] }, { "name": "爆弹丘丘人", "moraRate": 1, "type": "普通", + "item": [ + "破损的面具", + "污秽的面具", + "不祥的面具" + ], "tags": [] }, { "name": "雷弹丘丘人", "moraRate": 1, "type": "普通", + "item": [ + "破损的面具", + "污秽的面具", + "不祥的面具" + ], "tags": [] }, { "name": "冰弹丘丘人", "moraRate": 1, "type": "普通", + "item": [ + "破损的面具", + "污秽的面具", + "不祥的面具" + ], "tags": [] }, { "name": "奇怪的丘丘人", "moraRate": 1, "type": "首领", + "item": [ + "卷心菜" + ], "tags": [] }, { "name": "木盾丘丘暴徒", "moraRate": 1, "type": "精英", + "item": [ + "沉重号角", + "黑铜号角", + "黑晶号角", + "破损的面具", + "污秽的面具", + "不祥的面具" + ], "tags": [] }, { "name": "岩盾丘丘暴徒", "moraRate": 1, "type": "精英", + "item": [ + "沉重号角", + "黑铜号角", + "黑晶号角", + "破损的面具", + "污秽的面具", + "不祥的面具" + ], "tags": [] }, { "name": "冰盾丘丘暴徒", "moraRate": 1, "type": "精英", + "item": [ + "沉重号角", + "黑铜号角", + "黑晶号角", + "破损的面具", + "污秽的面具", + "不祥的面具" + ], "tags": [] }, { "name": "火斧丘丘暴徒", "moraRate": 1, "type": "精英", + "item": [ + "沉重号角", + "黑铜号角", + "黑晶号角", + "破损的面具", + "污秽的面具", + "不祥的面具" + ], "tags": [] }, { "name": "雷斧丘丘暴徒", "moraRate": 1, "type": "精英", + "item": [ + "沉重号角", + "黑铜号角", + "黑晶号角", + "破损的面具", + "污秽的面具", + "不祥的面具" + ], "tags": [] }, { "name": "丘丘雷兜王", "moraRate": 3, "type": "精英", + "item": [ + "沉重号角", + "黑铜号角", + "黑晶号角", + "破损的面具", + "污秽的面具", + "不祥的面具" + ], "tags": [] }, { "name": "丘丘霜铠王", "moraRate": 3, "type": "精英", + "item": [ + "沉重号角", + "黑铜号角", + "黑晶号角", + "破损的面具", + "污秽的面具", + "不祥的面具" + ], "tags": [] }, { "name": "丘丘岩盔王", "moraRate": 3, "type": "精英", + "item": [ + "沉重号角", + "黑铜号角", + "黑晶号角", + "破损的面具", + "污秽的面具", + "不祥的面具" + ], "tags": [] }, { "name": "水丘丘萨满", "moraRate": 1, "type": "普通", + "item": [ + "导能绘卷", + "封魔绘卷", + "禁咒绘卷", + "破损的面具", + "污秽的面具", + "不祥的面具" + ], "tags": [] }, { "name": "风丘丘萨满", "moraRate": 1, "type": "普通", + "item": [ + "导能绘卷", + "封魔绘卷", + "禁咒绘卷", + "破损的面具", + "污秽的面具", + "不祥的面具" + ], "tags": [] }, { "name": "雷丘丘萨满", "moraRate": 1, "type": "普通", + "item": [ + "导能绘卷", + "封魔绘卷", + "禁咒绘卷", + "破损的面具", + "污秽的面具", + "不祥的面具" + ], "tags": [] }, { "name": "草丘丘萨满", "moraRate": 1, "type": "普通", + "item": [ + "导能绘卷", + "封魔绘卷", + "禁咒绘卷", + "破损的面具", + "污秽的面具", + "不祥的面具" + ], "tags": [] }, { "name": "冰丘丘萨满", "moraRate": 1, "type": "普通", + "item": [ + "导能绘卷", + "封魔绘卷", + "禁咒绘卷", + "破损的面具", + "污秽的面具", + "不祥的面具" + ], "tags": [] }, { "name": "岩丘丘萨满", "moraRate": 1, "type": "普通", + "item": [ + "导能绘卷", + "封魔绘卷", + "禁咒绘卷", + "破损的面具", + "污秽的面具", + "不祥的面具" + ], "tags": [] }, { "name": "丘丘水行游侠", "moraRate": 1, "type": "精英", + "item": [ + "何人所珍藏之花", + "来自何处的待放之", + "漫游者的盛放之花" + ], "tags": [] }, { "name": "丘丘风行游侠", "moraRate": 1, "type": "精英", + "item": [ + "何人所珍藏之花", + "来自何处的待放之", + "漫游者的盛放之花" + ], "tags": [] }, { "name": "火深渊法师", "moraRate": 1, "type": "精英", + "item": [ + "地脉的枯叶", + "地脉的新芽", + "地脉的旧枝" + ], "tags": [] }, { "name": "水深渊法师", "moraRate": 1, "type": "精英", + "item": [ + "地脉的枯叶", + "地脉的新芽", + "地脉的旧枝" + ], "tags": [ "水免" ] @@ -515,18 +900,36 @@ "name": "雷深渊法师", "moraRate": 1, "type": "精英", + "item": [ + "地脉的枯叶", + "地脉的新芽", + "地脉的旧枝" + ], "tags": [] }, { "name": "冰深渊法师", "moraRate": 1, "type": "精英", + "item": [ + "地脉的枯叶", + "地脉的新芽", + "地脉的旧枝" + ], "tags": [] }, { "name": "深渊使徒·激流", "moraRate": 3, "type": "精英", + "item": [ + "幽邃刻像", + "夤夜刻像", + "晦暗刻像", + "地脉的新芽", + "地脉的枯叶", + "地脉的旧枝" + ], "tags": [ "水免" ] @@ -535,114 +938,210 @@ "name": "深渊使徒·霜落", "moraRate": 3, "type": "精英", + "item": [ + "幽邃刻像", + "夤夜刻像", + "晦暗刻像", + "地脉的新芽", + "地脉的枯叶", + "地脉的旧枝" + ], "tags": [] }, { "name": "深渊咏者·渊火", "moraRate": 3, "type": "精英", + "item": [ + "幽邃刻像", + "夤夜刻像", + "晦暗刻像", + "地脉的新芽", + "地脉的枯叶", + "地脉的旧枝" + ], "tags": [] }, { "name": "深渊咏者·紫电", "moraRate": 3, "type": "精英", + "item": [ + "幽邃刻像", + "夤夜刻像", + "晦暗刻像", + "地脉的新芽", + "地脉的枯叶", + "地脉的旧枝" + ], "tags": [] }, { "name": "深罪浸礼者", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "嗜岩·兽境幼兽", "moraRate": 1, "type": "精英", + "item": [ + "隐兽指爪", + "隐兽利爪", + "隐兽鬼爪" + ], "tags": [] }, { "name": "嗜雷·兽境幼兽", "moraRate": 1, "type": "精英", + "item": [ + "隐兽指爪", + "隐兽利爪", + "隐兽鬼爪" + ], "tags": [] }, { "name": "嗜岩·兽境猎犬", "moraRate": 2, "type": "精英", + "item": [ + "隐兽指爪", + "隐兽利爪", + "隐兽鬼爪" + ], "tags": [] }, { "name": "嗜雷·兽境猎犬", "moraRate": 2, "type": "精英", + "item": [ + "隐兽指爪", + "隐兽利爪", + "隐兽鬼爪" + ], "tags": [] }, { "name": "黄金王兽", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "黯色空壳·旗令", "moraRate": 3, "type": "精英", + "item": [ + "幽邃刻像", + "夤夜刻像", + "晦暗刻像" + ], "tags": [] }, { "name": "黯色空壳·破阵", "moraRate": 3, "type": "精英", + "item": [ + "幽邃刻像", + "夤夜刻像", + "晦暗刻像" + ], "tags": [] }, { "name": "黯色空壳·近卫", "moraRate": 3, "type": "精英", + "item": [ + "幽邃刻像", + "夤夜刻像", + "晦暗刻像" + ], "tags": [] }, { "name": "黑蛇骑士·斩风之剑", "moraRate": 3, "type": "精英", + "item": [ + "幽邃刻像", + "夤夜刻像", + "晦暗刻像" + ], "tags": [] }, { "name": "黑蛇骑士·摧岩之钺", "moraRate": 3, "type": "精英", + "item": [ + "幽邃刻像", + "夤夜刻像", + "晦暗刻像" + ], "tags": [] }, { "name": "大型碎石隙境原体", "moraRate": 2, "type": "精英", + "item": [ + "隙间之核", + "外世突触", + "异界生命核" + ], "tags": [] }, { "name": "碎石隙境原体", "moraRate": 1, "type": "精英", + "item": [ + "隙间之核", + "外世突触", + "异界生命核" + ], "tags": [] }, { "name": "大型狂蔓隙境原体", "moraRate": 2, "type": "精英", + "item": [ + "隙间之核", + "外世突触", + "异界生命核" + ], "tags": [] }, { "name": "狂蔓隙境原体", "moraRate": 1, "type": "精英", + "item": [ + "隙间之核", + "外世突触", + "异界生命核" + ], "tags": [] }, { "name": "深邃拟覆叶", "moraRate": 3, "type": "精英", + "item": [ + "折光的胚芽", + "惑光的阔叶", + "迷光的蜷叶之心" + ], "tags": [ "次数盾" ] @@ -651,6 +1150,11 @@ "name": "深邃拟覆叶_400", "moraRate": 2, "type": "精英", + "item": [ + "折光的胚芽", + "惑光的阔叶", + "迷光的蜷叶之心" + ], "tags": [ "次数盾" ] @@ -659,6 +1163,11 @@ "name": "深邃拟覆叶_200", "moraRate": 1, "type": "精英", + "item": [ + "折光的胚芽", + "惑光的阔叶", + "迷光的蜷叶之心" + ], "tags": [ "次数盾" ] @@ -667,12 +1176,18 @@ "name": "深邃摹结株", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "荒野幽徒", "moraRate": 1, "type": "精英", + "item": [ + "幽雾化形", + "幽雾片甲", + "幽雾兜盔" + ], "tags": [ "狂猎" ] @@ -681,6 +1196,11 @@ "name": "荒野狂狩士", "moraRate": 2, "type": "精英", + "item": [ + "幽雾化形", + "幽雾片甲", + "幽雾兜盔" + ], "tags": [ "狂猎" ] @@ -689,852 +1209,1487 @@ "name": "深黯钓客", "moraRate": 1, "type": "精英", + "item": [ + "深黯的裂眼", + "深黯的怪核", + "深黯的钩喙" + ], "tags": [] }, { "name": "深黯魇语之主", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "愚人众先遣队·火统游击兵", "moraRate": 1, "type": "普通", + "item": [ + "新兵的徽记", + "士官的徽记", + "尉官的徽记" + ], "tags": [] }, { "name": "愚人众先遣队·水铳重卫士", "moraRate": 1, "type": "普通", + "item": [ + "新兵的徽记", + "士官的徽记", + "尉官的徽记" + ], "tags": [] }, { "name": "愚人众先遣队·风拳前锋军", "moraRate": 1, "type": "普通", + "item": [ + "新兵的徽记", + "士官的徽记", + "尉官的徽记" + ], "tags": [] }, { "name": "愚人众先遣队·雷锤前锋军", "moraRate": 1, "type": "普通", + "item": [ + "新兵的徽记", + "士官的徽记", + "尉官的徽记" + ], "tags": [] }, { "name": "愚人众先遣队·冰铳重卫士", "moraRate": 1, "type": "普通", + "item": [ + "新兵的徽记", + "士官的徽记", + "尉官的徽记" + ], "tags": [] }, { "name": "愚人众先遣队·岩使游击兵", "moraRate": 1, "type": "普通", + "item": [ + "新兵的徽记", + "士官的徽记", + "尉官的徽记" + ], "tags": [] }, { "name": "愚人众·火之债务处理人", "moraRate": 1, "type": "精英", + "item": [ + "新兵的徽记", + "士官的徽记", + "尉官的徽记" + ], "tags": [] }, { "name": "愚人众·雷莹术士", "moraRate": 1, "type": "精英", + "item": [ + "雾虚花粉", + "雾虚草囊", + "雾虚灯芯", + "新兵的徽记", + "士官的徽记", + "尉官的徽记" + ], "tags": [] }, { "name": "愚人众·冰萤术士", "moraRate": 1, "type": "精英", + "item": [ + "雾虚花粉", + "雾虚草囊", + "雾虚灯芯", + "新兵的徽记", + "士官的徽记", + "尉官的徽记" + ], "tags": [] }, { "name": "愚人众·藏镜仕女", "moraRate": 1, "type": "精英", + "item": [ + "黯淡棱镜", + "水晶棱镜", + "偏光棱镜" + ], "tags": [] }, { "name": "愚人众·风役人", "moraRate": 1, "type": "精英", + "item": [ + "老旧的役人怀表", + "役人的时时刻刻", + "役人的制式怀表" + ], "tags": [] }, { "name": "愚人众·霜役人", "moraRate": 1, "type": "精英", + "item": [ + "老旧的役人怀表", + "役人的时时刻刻", + "役人的制式怀表" + ], "tags": [] }, { "name": "愚人众特辖队·线列军", "moraRate": 1, "type": "普通", + "item": [ + "磨损的执凭", + "精致的执凭", + "霜镌的执凭" + ], "tags": [] }, { "name": "愚人众特辖队·支援兵", "moraRate": 1, "type": "普通", + "item": [ + "磨损的执凭", + "精致的执凭", + "霜镌的执凭" + ], "tags": [] }, { "name": "愚人众特辖队·榴铳手", "moraRate": 1, "type": "普通", + "item": [ + "磨损的执凭", + "精致的执凭", + "霜镌的执凭" + ], "tags": [] }, { "name": "愚人众特辖队·先锋士", "moraRate": 1, "type": "普通", + "item": [ + "磨损的执凭", + "精致的执凭", + "霜镌的执凭" + ], "tags": [] }, { "name": "愚人众特辖队·疗愈师", "moraRate": 1, "type": "普通", + "item": [ + "磨损的执凭", + "精致的执凭", + "霜镌的执凭" + ], "tags": [] }, { "name": "愚人众特辖队·掷弹兵", "moraRate": 1, "type": "普通", + "item": [ + "磨损的执凭", + "精致的执凭", + "霜镌的执凭" + ], "tags": [] }, { "name": "愚人众特辖队·火刃突击队", "moraRate": 2, "type": "普通", + "item": [ + "磨损的执凭", + "精致的执凭", + "霜镌的执凭" + ], "tags": [] }, { "name": "愚人众特辖队·冰雹重炮手", "moraRate": 2, "type": "普通", + "item": [ + "磨损的执凭", + "精致的执凭", + "霜镌的执凭" + ], "tags": [] }, { "name": "愚人众特辖队·雷霰近卫军", "moraRate": 2, "type": "普通", + "item": [ + "磨损的执凭", + "精致的执凭", + "霜镌的执凭" + ], "tags": [] }, { "name": "巡陆艇·近战攻坚型", "moraRate": 1, "type": "普通", + "item": [ + "毁损机轴", + "加固机轴", + "精制机轴" + ], "tags": [] }, { "name": "巡陆艇·近战斥候型", "moraRate": 1, "type": "普通", + "item": [ + "毁损机轴", + "加固机轴", + "精制机轴" + ], "tags": [] }, { "name": "巡陆艇·强侦攻坚型", "moraRate": 1, "type": "普通", + "item": [ + "毁损机轴", + "加固机轴", + "精制机轴" + ], "tags": [] }, { "name": "巡陆艇·强侦斥候型", "moraRate": 1, "type": "普通", + "item": [ + "毁损机轴", + "加固机轴", + "精制机轴" + ], "tags": [] }, { "name": "巡陆艇·强侦地效型", "moraRate": 1, "type": "普通", + "item": [ + "毁损机轴", + "加固机轴", + "精制机轴" + ], "tags": [] }, { "name": "巡陆艇·尖端全能攻坚型", "moraRate": 2, "type": "普通", + "item": [ + "毁损机轴", + "加固机轴", + "精制机轴" + ], "tags": [] }, { "name": "巡陆艇·尖端全能斥候型", "moraRate": 2, "type": "普通", + "item": [ + "毁损机轴", + "加固机轴", + "精制机轴" + ], "tags": [] }, { "name": "巡陆艇·尖端火力地效型", "moraRate": 2, "type": "普通", + "item": [ + "毁损机轴", + "加固机轴", + "精制机轴" + ], "tags": [] }, { "name": "遗迹守卫", "moraRate": 1, "type": "精英", + "item": [ + "混沌装置", + "混沌回路", + "混沌炉心" + ], "tags": [] }, { "name": "遗迹猎者", "moraRate": 1, "type": "精英", + "item": [ + "混沌装置", + "混沌回路", + "混沌炉心" + ], "tags": [] }, { "name": "遗迹重机", "moraRate": 3, "type": "精英", + "item": [ + "混沌装置", + "混沌回路", + "混沌炉心" + ], "tags": [] }, { "name": "遗迹巨蛇", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "遗迹巡弋者", "moraRate": 1, "type": "精英", + "item": [ + "混沌机关", + "混沌枢纽", + "混沌真眼" + ], "tags": [] }, { "name": "遗迹歼击者", "moraRate": 1, "type": "精英", + "item": [ + "混沌机关", + "混沌枢纽", + "混沌真眼" + ], "tags": [] }, { "name": "遗迹防卫者", "moraRate": 1, "type": "精英", + "item": [ + "混沌机关", + "混沌枢纽", + "混沌真眼" + ], "tags": [] }, { "name": "遗迹侦察者", "moraRate": 1, "type": "精英", + "item": [ + "混沌机关", + "混沌枢纽", + "混沌真眼" + ], "tags": [] }, { "name": "恒常机关阵列", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "遗迹龙兽·地巡", "moraRate": 1, "type": "精英", + "item": [ + "混沌容器", + "混沌模块", + "混沌锚栓" + ], "tags": [] }, { "name": "遗迹龙兽·空巡", "moraRate": 1, "type": "精英", + "item": [ + "混沌容器", + "混沌模块", + "混沌锚栓" + ], "tags": [] }, { "name": "兆载永劫龙兽", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "元能构装体·力场发生器", "moraRate": 1, "type": "精英", + "item": [ + "破缺棱晶", + "浑浊棱晶", + "辉光棱晶" + ], "tags": [] }, { "name": "元能构装体·重塑仪", "moraRate": 1, "type": "精英", + "item": [ + "破缺棱晶", + "浑浊棱晶", + "辉光棱晶" + ], "tags": [] }, { "name": "元能构装体·勘探机", "moraRate": 1, "type": "精英", + "item": [ + "破缺棱晶", + "浑浊棱晶", + "辉光棱晶" + ], "tags": [] }, { "name": "半永恒统辖矩阵", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "机关·侦察记录型", "moraRate": 1, "type": "普通", + "item": [ + "啮合齿轮", + "机关正齿轮", + "奇械机芯齿轮" + ], "tags": [] }, { "name": "机关·算力增幅器", "moraRate": 1, "type": "普通", + "item": [ + "啮合齿轮", + "机关正齿轮", + "奇械机芯齿轮" + ], "tags": [] }, { "name": "机关·水下勘测型", "moraRate": 1, "type": "普通", + "item": [ + "啮合齿轮", + "机关正齿轮", + "奇械机芯齿轮" + ], "tags": [] }, { "name": "机关·地质勘探型", "moraRate": 1, "type": "普通", + "item": [ + "啮合齿轮", + "机关正齿轮", + "奇械机芯齿轮" + ], "tags": [] }, { "name": "机关·水下巡游型", "moraRate": 1, "type": "普通", + "item": [ + "啮合齿轮", + "机关正齿轮", + "奇械机芯齿轮" + ], "tags": [] }, { "name": "机关·深海攻击型", "moraRate": 1, "type": "普通", + "item": [ + "啮合齿轮", + "机关正齿轮", + "奇械机芯齿轮" + ], "tags": [] }, { "name": "机关·灵活采集型", "moraRate": 1, "type": "普通", + "item": [ + "啮合齿轮", + "机关正齿轮", + "奇械机芯齿轮" + ], "tags": [] }, { "name": "机关·区域警戒型", "moraRate": 1, "type": "普通", + "item": [ + "啮合齿轮", + "机关正齿轮", + "奇械机芯齿轮" + ], "tags": [] }, { "name": "攻坚特化型机关", "moraRate": 2, "type": "普通", + "item": [ + "啮合齿轮", + "机关正齿轮", + "奇械机芯齿轮" + ], "tags": [] }, { "name": "压制特化型机关", "moraRate": 2, "type": "普通", + "item": [ + "啮合齿轮", + "机关正齿轮", + "奇械机芯齿轮" + ], "tags": [] }, { "name": "歼灭特化型机关", "moraRate": 2, "type": "普通", + "item": [ + "啮合齿轮", + "机关正齿轮", + "奇械机芯齿轮" + ], "tags": [] }, { "name": "建造特化型机关", "moraRate": 2, "type": "普通", + "item": [ + "啮合齿轮", + "机关正齿轮", + "奇械机芯齿轮" + ], "tags": [] }, { "name": "冰风组曲", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "实验性场力发生装置", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "魔偶剑鬼", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "秘源机兵·寻捕械", "moraRate": 1, "type": "精英", + "item": [ + "秘源轴", + "秘源机鞘", + "秘源真芯" + ], "tags": [] }, { "name": "秘源机兵·构型械", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "秘源机兵·统御械", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "重拳出击鸭", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "盗宝团·斥候", "moraRate": 1, "type": "普通", + "item": [ + "寻宝鸦印", + "藏银鸦印", + "攫金鸦印" + ], "tags": [] }, { "name": "盗宝团·火之药剂师", "moraRate": 1, "type": "普通", + "item": [ + "寻宝鸦印", + "藏银鸦印", + "攫金鸦印" + ], "tags": [] }, { "name": "盗宝团·水之药剂师", "moraRate": 1, "type": "普通", + "item": [ + "寻宝鸦印", + "藏银鸦印", + "攫金鸦印" + ], "tags": [] }, { "name": "盗宝团·雷之药剂师", "moraRate": 1, "type": "普通", + "item": [ + "寻宝鸦印", + "藏银鸦印", + "攫金鸦印" + ], "tags": [] }, { "name": "盗宝团·冰之药剂师", "moraRate": 1, "type": "普通", + "item": [ + "寻宝鸦印", + "藏银鸦印", + "攫金鸦印" + ], "tags": [] }, { "name": "盗宝团·杂工", "moraRate": 1, "type": "普通", + "item": [ + "寻宝鸦印", + "藏银鸦印", + "攫金鸦印" + ], "tags": [] }, { "name": "盗宝团·神射手", "moraRate": 1, "type": "普通", + "item": [ + "寻宝鸦印", + "藏银鸦印", + "攫金鸦印" + ], "tags": [] }, { "name": "盗宝团·掘墓者", "moraRate": 1, "type": "普通", + "item": [ + "寻宝鸦印", + "藏银鸦印", + "攫金鸦印" + ], "tags": [] }, { "name": "盗宝团·海上男儿", "moraRate": 1, "type": "普通", + "item": [ + "寻宝鸦印", + "藏银鸦印", + "攫金鸦印" + ], "tags": [] }, { "name": "盗宝团·拳术家", "moraRate": 1, "type": "普通", + "item": [ + "寻宝鸦印", + "藏银鸦印", + "攫金鸦印" + ], "tags": [] }, { "name": "盗宝团·粉碎者", "moraRate": 1, "type": "普通", + "item": [ + "寻宝鸦印", + "藏银鸦印", + "攫金鸦印" + ], "tags": [] }, { "name": "野伏·阵刀番", "moraRate": 1, "type": "普通", + "item": [ + "破旧的刀镡", + "影打刀镡", + "名刀镡" + ], "tags": [] }, { "name": "野伏·火伏番", "moraRate": 1, "type": "普通", + "item": [ + "破旧的刀镡", + "影打刀镡", + "名刀镡" + ], "tags": [] }, { "name": "野伏·机巧番", "moraRate": 1, "type": "普通", + "item": [ + "破旧的刀镡", + "影打刀镡", + "名刀镡" + ], "tags": [] }, { "name": "海乱鬼·炎威", "moraRate": 2, "type": "普通", + "item": [ + "破旧的刀镡", + "影打刀镡", + "名刀镡" + ], "tags": [] }, { "name": "海乱鬼·雷腾", "moraRate": 2, "type": "普通", + "item": [ + "破旧的刀镡", + "影打刀镡", + "名刀镡" + ], "tags": [] }, { "name": "镀金旅团·阵前斧手", "moraRate": 1, "type": "普通", + "item": [ + "褪色红绸", + "镶边红绸", + "织金红绸" + ], "tags": [] }, { "name": "镀金旅团·机弩兵", "moraRate": 1, "type": "普通", + "item": [ + "褪色红绸", + "镶边红绸", + "织金红绸" + ], "tags": [] }, { "name": "镀金旅团·鸦喙戟手", "moraRate": 1, "type": "普通", + "item": [ + "褪色红绸", + "镶边红绸", + "织金红绸" + ], "tags": [] }, { "name": "镀金旅团·破阵者", "moraRate": 1, "type": "普通", + "item": [ + "褪色红绸", + "镶边红绸", + "织金红绸" + ], "tags": [] }, { "name": "镀金旅团·刀舞者", "moraRate": 1, "type": "普通", + "item": [ + "褪色红绸", + "镶边红绸", + "织金红绸" + ], "tags": [] }, { "name": "镀金旅团·沙中净水", "moraRate": 1.5, "type": "普通", + "item": [ + "褪色红绸", + "镶边红绸", + "织金红绸" + ], "tags": [] }, { "name": "镀金旅团·炽阳凝冰", "moraRate": 1.5, "type": "普通", + "item": [ + "褪色红绸", + "镶边红绸", + "织金红绸" + ], "tags": [] }, { "name": "镀金旅团·白日鸣雷", "moraRate": 1.5, "type": "普通", + "item": [ + "褪色红绸", + "镶边红绸", + "织金红绸" + ], "tags": [] }, { "name": "镀金旅团·灵风猎手", "moraRate": 2, "type": "普通", + "item": [ + "褪色红绸", + "镶边红绸", + "织金红绸" + ], "tags": [] }, { "name": "镀金旅团·魔岩役使", "moraRate": 2, "type": "普通", + "item": [ + "褪色红绸", + "镶边红绸", + "织金红绸" + ], "tags": [] }, { "name": "镀金旅团·炽沙叙事人", "moraRate": 2, "type": "普通", + "item": [ + "褪色红绸", + "镶边红绸", + "织金红绸" + ], "tags": [] }, { "name": "镀金旅团·叶轮舞者", "moraRate": 2, "type": "普通", + "item": [ + "褪色红绸", + "镶边红绸", + "织金红绸" + ], "tags": [] }, { "name": "铸砂勇士·叩问人", "moraRate": 1, "type": "普通", + "item": [ + "卫从的木哨", + "战士的铁哨", + "龙冠武士的金哨" + ], "tags": [] }, { "name": "铸砂勇士·碎盾者", "moraRate": 1, "type": "普通", + "item": [ + "卫从的木哨", + "战士的铁哨", + "龙冠武士的金哨" + ], "tags": [] }, { "name": "铸砂勇士·投矛手", "moraRate": 1, "type": "普通", + "item": [ + "卫从的木哨", + "战士的铁哨", + "龙冠武士的金哨" + ], "tags": [] }, { "name": "疾讯勇士·引索客", "moraRate": 1, "type": "普通", + "item": [ + "卫从的木哨", + "战士的铁哨", + "龙冠武士的金哨" + ], "tags": [] }, { "name": "疾讯勇士·荡风斥候", "moraRate": 1, "type": "普通", + "item": [ + "卫从的木哨", + "战士的铁哨", + "龙冠武士的金哨" + ], "tags": [] }, { "name": "疾讯勇士·重刃讯使", "moraRate": 1, "type": "普通", + "item": [ + "卫从的木哨", + "战士的铁哨", + "龙冠武士的金哨" + ], "tags": [] }, { "name": "流刃勇士·游击人", "moraRate": 1, "type": "普通", + "item": [ + "卫从的木哨", + "战士的铁哨", + "龙冠武士的金哨" + ], "tags": [] }, { "name": "流刃勇士·锯脂者", "moraRate": 1, "type": "普通", + "item": [ + "卫从的木哨", + "战士的铁哨", + "龙冠武士的金哨" + ], "tags": [] }, { "name": "流刃勇士·掷叉猎手", "moraRate": 1, "type": "普通", + "item": [ + "卫从的木哨", + "战士的铁哨", + "龙冠武士的金哨" + ], "tags": [] }, { "name": "结羽勇士·腾空士", "moraRate": 1, "type": "普通", + "item": [ + "卫从的木哨", + "战士的铁哨", + "龙冠武士的金哨" + ], "tags": [] }, { "name": "结羽勇士·削羽人", "moraRate": 1, "type": "普通", + "item": [ + "卫从的木哨", + "战士的铁哨", + "龙冠武士的金哨" + ], "tags": [] }, { "name": "结羽勇士·驭空客", "moraRate": 1, "type": "普通", + "item": [ + "卫从的木哨", + "战士的铁哨", + "龙冠武士的金哨" + ], "tags": [] }, { "name": "灵觉勇士·执意师", "moraRate": 1, "type": "普通", + "item": [ + "卫从的木哨", + "战士的铁哨", + "龙冠武士的金哨" + ], "tags": [] }, { "name": "灵觉勇士·控念师", "moraRate": 1, "type": "普通", + "item": [ + "卫从的木哨", + "战士的铁哨", + "龙冠武士的金哨" + ], "tags": [] }, { "name": "灵觉勇士·冥思者", "moraRate": 1, "type": "普通", + "item": [ + "卫从的木哨", + "战士的铁哨", + "龙冠武士的金哨" + ], "tags": [] }, { "name": "横蛮勇士·冲撞手", "moraRate": 1, "type": "普通", + "item": [ + "卫从的木哨", + "战士的铁哨", + "龙冠武士的金哨" + ], "tags": [] }, { "name": "横蛮勇士·摔跤客", "moraRate": 1, "type": "普通", + "item": [ + "卫从的木哨", + "战士的铁哨", + "龙冠武士的金哨" + ], "tags": [] }, { "name": "横蛮勇士·抓扑人", "moraRate": 1, "type": "普通", + "item": [ + "卫从的木哨", + "战士的铁哨", + "龙冠武士的金哨" + ], "tags": [] }, { "name": "嵴锋龙武士·碎晶打者", "moraRate": 2, "type": "普通", + "item": [ + "卫从的木哨", + "战士的铁哨", + "龙冠武士的金哨" + ], "tags": [] }, { "name": "嵴锋龙武士·破岩锐刃", "moraRate": 2, "type": "普通", + "item": [ + "卫从的木哨", + "战士的铁哨", + "龙冠武士的金哨" + ], "tags": [] }, { "name": "匿叶龙武士·旋锯飞叶", "moraRate": 2, "type": "普通", + "item": [ + "卫从的木哨", + "战士的铁哨", + "龙冠武士的金哨" + ], "tags": [] }, { "name": "匿叶龙武士·流火鸣空", "moraRate": 2, "type": "普通", + "item": [ + "卫从的木哨", + "战士的铁哨", + "龙冠武士的金哨" + ], "tags": [] }, { "name": "鳍游龙武士·穿浪之梭", "moraRate": 2, "type": "普通", + "item": [ + "卫从的木哨", + "战士的铁哨", + "龙冠武士的金哨" + ], "tags": [] }, { "name": "鳍游龙武士·裂礁之涛", "moraRate": 2, "type": "普通", + "item": [ + "卫从的木哨", + "战士的铁哨", + "龙冠武士的金哨" + ], "tags": [] }, { "name": "绒翼龙武士·膛星之锤", "moraRate": 2, "type": "普通", + "item": [ + "卫从的木哨", + "战士的铁哨", + "龙冠武士的金哨" + ], "tags": [] }, { "name": "绒翼龙武士·长空明焰", "moraRate": 2, "type": "普通", + "item": [ + "卫从的木哨", + "战士的铁哨", + "龙冠武士的金哨" + ], "tags": [] }, { "name": "暝视龙武士·寒涌持者", "moraRate": 2, "type": "普通", + "item": [ + "卫从的木哨", + "战士的铁哨", + "龙冠武士的金哨" + ], "tags": [] }, { "name": "暝视龙武士·冰晶炮手", "moraRate": 2, "type": "普通", + "item": [ + "卫从的木哨", + "战士的铁哨", + "龙冠武士的金哨" + ], "tags": [] }, { "name": "突角龙武士·破空轰动", "moraRate": 2, "type": "普通", + "item": [ + "卫从的木哨", + "战士的铁哨", + "龙冠武士的金哨" + ], "tags": [] }, { "name": "突角龙武士·追缉灵光", "moraRate": 2, "type": "普通", + "item": [ + "卫从的木哨", + "战士的铁哨", + "龙冠武士的金哨" + ], "tags": [] }, { "name": "灵觉隐修的迷者", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "炽热骗骗花", "moraRate": 1, "type": "普通", + "item": [ + "骗骗花蜜", + "微光花蜜", + "元素花蜜" + ], "tags": [] }, { "name": "电气骗骗花", "moraRate": 1, "type": "普通", + "item": [ + "骗骗花蜜", + "微光花蜜", + "元素花蜜" + ], "tags": [] }, { "name": "冰霜骗骗花", "moraRate": 1, "type": "普通", + "item": [ + "骗骗花蜜", + "微光花蜜", + "元素花蜜" + ], "tags": [] }, { "name": "爆炎树", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "掣电树", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "急冻树", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "幼岩龙蜥", "moraRate": 1, "type": "精英", + "item": [ + "脆弱的骨片", + "结实的骨片", + "石化的骨片" + ], "tags": [] }, { "name": "岩龙蜥", "moraRate": 3, "type": "精英", + "item": [ + "脆弱的骨片", + "结实的骨片", + "石化的骨片" + ], "tags": [] }, { "name": "古岩龙蜥", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "深海龙蜥·原种", "moraRate": 1, "type": "精英", + "item": [ + "脆弱的骨片", + "结实的骨片", + "石化的骨片" + ], "tags": [] }, { "name": "深海龙蜥·原种_600", "moraRate": 3, "type": "精英", + "item": [ + "脆弱的骨片", + "结实的骨片", + "石化的骨片" + ], "tags": [] }, { "name": "深海龙蜥·啮冰", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "深海龙蜥·吞雷", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "水萤", "moraRate": 3, "type": "普通", + "item": [], "tags": [] }, { "name": "雷萤", "moraRate": 3, "type": "普通", + "item": [], "tags": [] }, { "name": "冰萤", "moraRate": 3, "type": "普通", + "item": [], "tags": [] }, { "name": "浮游水蕈兽", "moraRate": 1, "type": "普通", + "item": [ + "失活菌核", + "休眠菌核", + "茁壮菌核", + "荧光孢粉", + "蕈兽孢子", + "孢囊晶尘" + ], "tags": [ "蕈兽" ] @@ -1543,6 +2698,14 @@ "name": "浮游风蕈兽", "moraRate": 1, "type": "普通", + "item": [ + "失活菌核", + "休眠菌核", + "茁壮菌核", + "荧光孢粉", + "蕈兽孢子", + "孢囊晶尘" + ], "tags": [ "蕈兽" ] @@ -1551,6 +2714,14 @@ "name": "浮游草蕈兽", "moraRate": 1, "type": "普通", + "item": [ + "失活菌核", + "休眠菌核", + "茁壮菌核", + "荧光孢粉", + "蕈兽孢子", + "孢囊晶尘" + ], "tags": [ "蕈兽" ] @@ -1559,6 +2730,14 @@ "name": "旋转火蕈兽", "moraRate": 1, "type": "普通", + "item": [ + "失活菌核", + "休眠菌核", + "茁壮菌核", + "荧光孢粉", + "蕈兽孢子", + "孢囊晶尘" + ], "tags": [ "蕈兽" ] @@ -1567,6 +2746,14 @@ "name": "旋转雷蕈兽", "moraRate": 1, "type": "普通", + "item": [ + "失活菌核", + "休眠菌核", + "茁壮菌核", + "荧光孢粉", + "蕈兽孢子", + "孢囊晶尘" + ], "tags": [ "蕈兽" ] @@ -1575,6 +2762,14 @@ "name": "旋转冰蕈兽", "moraRate": 1, "type": "普通", + "item": [ + "失活菌核", + "休眠菌核", + "茁壮菌核", + "荧光孢粉", + "蕈兽孢子", + "孢囊晶尘" + ], "tags": [ "蕈兽" ] @@ -1583,6 +2778,14 @@ "name": "伸缩火蕈兽", "moraRate": 1, "type": "普通", + "item": [ + "失活菌核", + "休眠菌核", + "茁壮菌核", + "荧光孢粉", + "蕈兽孢子", + "孢囊晶尘" + ], "tags": [ "蕈兽" ] @@ -1591,6 +2794,14 @@ "name": "伸缩风蕈兽", "moraRate": 1, "type": "普通", + "item": [ + "失活菌核", + "休眠菌核", + "茁壮菌核", + "荧光孢粉", + "蕈兽孢子", + "孢囊晶尘" + ], "tags": [ "蕈兽" ] @@ -1599,6 +2810,14 @@ "name": "伸缩雷蕈兽", "moraRate": 1, "type": "普通", + "item": [ + "失活菌核", + "休眠菌核", + "茁壮菌核", + "荧光孢粉", + "蕈兽孢子", + "孢囊晶尘" + ], "tags": [ "蕈兽" ] @@ -1607,6 +2826,14 @@ "name": "伸缩岩蕈兽", "moraRate": 1, "type": "普通", + "item": [ + "失活菌核", + "休眠菌核", + "茁壮菌核", + "荧光孢粉", + "蕈兽孢子", + "孢囊晶尘" + ], "tags": [ "蕈兽" ] @@ -1615,6 +2842,14 @@ "name": "陆行水本真蕈", "moraRate": 2, "type": "普通", + "item": [ + "失活菌核", + "休眠菌核", + "茁壮菌核", + "荧光孢粉", + "蕈兽孢子", + "孢囊晶尘" + ], "tags": [ "蕈兽" ] @@ -1623,6 +2858,14 @@ "name": "有翼草本真蕈", "moraRate": 2, "type": "普通", + "item": [ + "失活菌核", + "休眠菌核", + "茁壮菌核", + "荧光孢粉", + "蕈兽孢子", + "孢囊晶尘" + ], "tags": [ "蕈兽" ] @@ -1631,6 +2874,14 @@ "name": "有翼冰本真蕈", "moraRate": 2, "type": "普通", + "item": [ + "失活菌核", + "休眠菌核", + "茁壮菌核", + "荧光孢粉", + "蕈兽孢子", + "孢囊晶尘" + ], "tags": [ "蕈兽" ] @@ -1639,6 +2890,14 @@ "name": "陆行岩本真蕈", "moraRate": 2, "type": "普通", + "item": [ + "失活菌核", + "休眠菌核", + "茁壮菌核", + "荧光孢粉", + "蕈兽孢子", + "孢囊晶尘" + ], "tags": [ "蕈兽" ] @@ -1647,432 +2906,704 @@ "name": "翠翎恐蕈", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "圣骸角鳄", "moraRate": 1, "type": "精英", + "item": [ + "残毀的橫脊", + "密固的横脊", + "锲纹的横脊" + ], "tags": [] }, { "name": "圣骸牙兽", "moraRate": 1, "type": "精英", + "item": [ + "残毀的橫脊", + "密固的横脊", + "锲纹的横脊" + ], "tags": [] }, { "name": "圣骸赤鹫", "moraRate": 1, "type": "精英", + "item": [ + "残毀的橫脊", + "密固的横脊", + "锲纹的横脊" + ], "tags": [] }, { "name": "圣骸毒蝎", "moraRate": 1, "type": "精英", + "item": [ + "残毀的橫脊", + "密固的横脊", + "锲纹的横脊" + ], "tags": [] }, { "name": "圣骸飞蛇", "moraRate": 1, "type": "精英", + "item": [ + "残毀的橫脊", + "密固的横脊", + "锲纹的横脊" + ], "tags": [] }, { "name": "风蚀沙虫", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "膨膨兽", "moraRate": 1, "type": "普通", + "item": [ + "异海凝珠", + "异海之块", + "异色结晶石" + ], "tags": [] }, { "name": "猎刀鳐·绿", "moraRate": 1, "type": "普通", + "item": [ + "异海凝珠", + "异海之块", + "异色结晶石" + ], "tags": [] }, { "name": "猎刀鳐·蓝", "moraRate": 1, "type": "普通", + "item": [ + "异海凝珠", + "异海之块", + "异色结晶石" + ], "tags": [] }, { "name": "重甲蟹·红", "moraRate": 1, "type": "普通", + "item": [ + "异海凝珠", + "异海之块", + "异色结晶石" + ], "tags": [] }, { "name": "重甲蟹·绿", "moraRate": 1, "type": "普通", + "item": [ + "异海凝珠", + "异海之块", + "异色结晶石" + ], "tags": [] }, { "name": "坚盾重甲蟹", "moraRate": 2, "type": "普通", + "item": [ + "异海凝珠", + "异海之块", + "异色结晶石" + ], "tags": [] }, { "name": "铁甲熔火帝皇", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "帽子水母·黄", "moraRate": 1, "type": "普通", + "item": [ + "异海凝珠", + "异海之块", + "异色结晶石" + ], "tags": [] }, { "name": "帽子水母·蓝", "moraRate": 1, "type": "普通", + "item": [ + "异海凝珠", + "异海之块", + "异色结晶石" + ], "tags": [] }, { "name": "泡泡海马·紫", "moraRate": 1, "type": "普通", + "item": [ + "异海凝珠", + "异海之块", + "异色结晶石" + ], "tags": [] }, { "name": "泡泡海马·蓝", "moraRate": 1, "type": "普通", + "item": [ + "异海凝珠", + "异海之块", + "异色结晶石" + ], "tags": [] }, { "name": "泡泡海马·褐", "moraRate": 1, "type": "普通", + "item": [ + "异海凝珠", + "异海之块", + "异色结晶石" + ], "tags": [] }, { "name": "泡泡雄海马", "moraRate": 2, "type": "普通", + "item": [ + "异海凝珠", + "异海之块", + "异色结晶石" + ], "tags": [] }, { "name": "千年珍珠骏麟", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "球球章鱼·红", "moraRate": 1, "type": "普通", + "item": [ + "异海凝珠", + "异海之块", + "异色结晶石" + ], "tags": [] }, { "name": "球球章鱼·褐", "moraRate": 1, "type": "普通", + "item": [ + "异海凝珠", + "异海之块", + "异色结晶石" + ], "tags": [] }, { "name": "天使海兔·蓝", "moraRate": 1, "type": "普通", + "item": [ + "异海凝珠", + "异海之块", + "异色结晶石" + ], "tags": [] }, { "name": "天使海兔·红", "moraRate": 1, "type": "普通", + "item": [ + "异海凝珠", + "异海之块", + "异色结晶石" + ], "tags": [] }, { "name": "大天使海兔", "moraRate": 2, "type": "普通", + "item": [ + "异海凝珠", + "异海之块", + "异色结晶石" + ], "tags": [] }, { "name": "玄文兽", "moraRate": 1, "type": "精英", + "item": [ + "羽状鳍翅", + "渊光鳍翅", + "月色鳍翅" + ], "tags": [] }, { "name": "隐山猊兽", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "魔像禁卫", "moraRate": 1, "type": "精英", + "item": [ + "裂断的剑柄", + "未熄的剑柄", + "残毁的剑柄" + ], "tags": [] }, { "name": "魔像督军", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "幼嵴锋龙", "moraRate": 1, "type": "普通", + "item": [ + "稚嫩的尖齿", + "老练的坚齿", + "横行霸者的利齿" + ], "tags": [] }, { "name": "嵴锋龙", "moraRate": 2, "type": "普通", + "item": [ + "稚嫩的尖齿", + "老练的坚齿", + "横行霸者的利齿" + ], "tags": [] }, { "name": "幼鳍游龙", "moraRate": 1, "type": "普通", + "item": [ + "稚嫩的尖齿", + "老练的坚齿", + "横行霸者的利齿" + ], "tags": [] }, { "name": "鳍游龙", "moraRate": 2, "type": "普通", + "item": [ + "稚嫩的尖齿", + "老练的坚齿", + "横行霸者的利齿" + ], "tags": [] }, { "name": "幼匿叶龙", "moraRate": 1, "type": "普通", + "item": [ + "稚嫩的尖齿", + "老练的坚齿", + "横行霸者的利齿" + ], "tags": [] }, { "name": "匿叶龙", "moraRate": 2, "type": "普通", + "item": [ + "稚嫩的尖齿", + "老练的坚齿", + "横行霸者的利齿" + ], "tags": [] }, { "name": "贪食匿叶龙山王", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "幼绒翼龙", "moraRate": 1, "type": "普通", + "item": [ + "稚嫩的尖齿", + "老练的坚齿", + "横行霸者的利齿" + ], "tags": [] }, { "name": "绒翼龙", "moraRate": 2, "type": "普通", + "item": [ + "稚嫩的尖齿", + "老练的坚齿", + "横行霸者的利齿" + ], "tags": [] }, { "name": "金焰绒翼龙暴君", "moraRate": 1, "type": "精英", + "item": [ + "稚嫩的尖齿", + "老练的坚齿", + "横行霸者的利齿" + ], "tags": [] }, { "name": "幼暝视龙", "moraRate": 1, "type": "普通", + "item": [ + "稚嫩的尖齿", + "老练的坚齿", + "横行霸者的利齿" + ], "tags": [] }, { "name": "暝视龙", "moraRate": 2, "type": "普通", + "item": [ + "稚嫩的尖齿", + "老练的坚齿", + "横行霸者的利齿" + ], "tags": [] }, { "name": "幼突角龙", "moraRate": 1, "type": "普通", + "item": [ + "稚嫩的尖齿", + "老练的坚齿", + "横行霸者的利齿" + ], "tags": [] }, { "name": "突角龙", "moraRate": 2, "type": "普通", + "item": [ + "稚嫩的尖齿", + "老练的坚齿", + "横行霸者的利齿" + ], "tags": [] }, { "name": "熔岩游像·蚀土者", "moraRate": 1, "type": "精英", + "item": [ + "聚燃的命种", + "聚燃的石块", + "聚燃的游像眼" + ], "tags": [] }, { "name": "熔岩游像·流燃体", "moraRate": 1, "type": "精英", + "item": [ + "聚燃的命种", + "聚燃的石块", + "聚燃的游像眼" + ], "tags": [] }, { "name": "熔岩辉龙像", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "窟岩·大灵显化身", "moraRate": 1, "type": "精英", + "item": [ + "意志明晰的寄偶", + "意志破碎的残片", + "意志巡游的符像" + ], "tags": [] }, { "name": "溯流·大灵显化身", "moraRate": 1, "type": "精英", + "item": [ + "意志明晰的寄偶", + "意志破碎的残片", + "意志巡游的符像" + ], "tags": [] }, { "name": "疾叶·大灵显化身", "moraRate": 1, "type": "精英", + "item": [ + "意志明晰的寄偶", + "意志破碎的残片", + "意志巡游的符像" + ], "tags": [] }, { "name": "凛冽·大灵显化身", "moraRate": 1, "type": "精英", + "item": [ + "意志明晰的寄偶", + "意志破碎的残片", + "意志巡游的符像" + ], "tags": [] }, { "name": "焚燃·大灵显化身", "moraRate": 1, "type": "精英", + "item": [ + "意志明晰的寄偶", + "意志破碎的残片", + "意志巡游的符像" + ], "tags": [] }, { "name": "雳震·大灵显化身", "moraRate": 1, "type": "精英", + "item": [ + "意志明晰的寄偶", + "意志破碎的残片", + "意志巡游的符像" + ], "tags": [] }, { "name": "炉壳山鼬", "moraRate": 1, "type": "精英", + "item": [ + "冷裂壳块", + "明燃的棱状壳", + "蕴热的背壳" + ], "tags": [] }, { "name": "蕴光奇羊", "moraRate": 1, "type": "精英", + "item": [ + "稀光遗骼", + "失光块骨", + "繁光躯外骸" + ], "tags": [] }, { "name": "蕴光刃犀", "moraRate": 1, "type": "精英", + "item": [ + "稀光遗骼", + "失光块骨", + "繁光躯外骸" + ], "tags": [] }, { "name": "蕴光璇蛸", "moraRate": 1, "type": "精英", + "item": [ + "稀光遗骼", + "失光块骨", + "繁光躯外骸" + ], "tags": [] }, { "name": "蕴光凛狼", "moraRate": 1, "type": "精英", + "item": [ + "稀光遗骼", + "失光块骨", + "繁光躯外骸" + ], "tags": [] }, { "name": "蕴光月幻蝶", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "裂空的魔龙", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "北风的王狼，奔狼的领主", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "「公子」", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "若陀龙王", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "「女士」", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "祸津御建鸣神命", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "「正机之神」", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "阿佩普的绿洲守望者", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "吞星之鲸", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "「仆人」", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "蚀灭的源焰之主", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "门扉前的弈局", "moraRate": 1, "type": "首领", + "item": [], "tags": [] }, { "name": "「博士」", "moraRate": 1, "type": "首领", + "item": [], "tags": [] } ] \ No newline at end of file diff --git a/repo/js/AutoHoeingOneDragon/main.js b/repo/js/AutoHoeingOneDragon/main.js index b3007036f..cf056fc1d 100644 --- a/repo/js/AutoHoeingOneDragon/main.js +++ b/repo/js/AutoHoeingOneDragon/main.js @@ -54,6 +54,7 @@ let pathings; let localeWorks; let lastEatBuff = 0; let currentFood = ""; +let monsterInfoObject; (async function () { //通用预处理 @@ -278,7 +279,7 @@ async function rotateWarnIfAccountEmpty() { async function processPathings(groupTags) { // 读取怪物信息 const monsterInfoContent = await file.readText("assets/monsterInfo.json"); - const monsterInfoObject = JSON.parse(monsterInfoContent); + monsterInfoObject = JSON.parse(monsterInfoContent); // 读取路径文件夹中的所有文件 log.info("开始读取路径文件"); @@ -1031,9 +1032,9 @@ async function runPath(fullPath, map_name, pm, pe) { } /* ===== 2. 重排 targetItems：当前路线拾取过的提前 ===== */ + const history = {}; if (targetItems && currentPathing && currentPathing.items && currentPathing.items.length) { // 用对象当 Set 做 O(1) 查询 - const history = {}; for (let i = 0; i < currentPathing.items.length; i++) { history[currentPathing.items[i]] = true; } @@ -1045,6 +1046,48 @@ async function runPath(fullPath, map_name, pm, pe) { }); } + /* ===== 2.1 处理 onlyRelatedItems 配置 ===== */ + if (settings.onlyRelatedItems && currentPathing && currentPathing.monsterInfo) { + // 首先将所有图片的 enabled 记为 true + for (const it of targetItems) { + it.enabled = true; + } + + // 将所有的怪物材料图片的 enabled 记为 false + for (const it of targetItems) { + if (it.isMonsterMaterial) { + it.enabled = false; + } + } + + // 根据当前路线包含的怪物类型，找出这些怪物的 item 合并后去重 + const monsterItems = new Set(); + for (const [monsterName, count] of Object.entries(currentPathing.monsterInfo)) { + const monster = monsterInfoObject.find(m => m.name === monsterName); + if (monster && monster.item && monster.item.length > 0) { + monster.item.forEach(itemName => monsterItems.add(itemName)); + } + } + + // 将结果数组与图片的 itemName 进行对比，如果纯中文部分相同，则说明需要启用该怪物材料 + for (const it of targetItems) { + if (it.isMonsterMaterial) { + const cnPart = it.itemName.replace(/[^\u4e00-\u9fa5]/g, ''); + for (const monsterItem of monsterItems) { + const monsterCnPart = monsterItem.replace(/[^\u4e00-\u9fa5]/g, ''); + if (cnPart === monsterCnPart) { + it.enabled = true; + break; + } + } + // 特别的，如果在历史中命中过，也视为相关，也改为 true + if (history[it.itemName]) { + it.enabled = true; + } + } + } + } + /* ===== 3. 原逻辑不变 ===== */ state = { running: true, currentPathing: currentPathing }; /* ---------- 主任务 ---------- */ @@ -1280,10 +1323,7 @@ async function recognizeAndInteract() { let foundTarget = false; if (pickup_Mode.includes("模板匹配")) { - let time1 = new Date(); itemName = await performTemplateMatch(centerYF); - let time2 = new Date(); - //log.info(`调试-本次识别用时${time2 - time1}毫秒`); } if (itemName) { //log.info(`调试-识别到物品${itemName}`); @@ -1341,16 +1381,34 @@ async function recognizeAndInteract() { } try { + let firstMatch = null; for (const it of targetItems) { + if (!it.enabled) continue; const cnLen = Math.min( [...it.itemName].filter(c => c >= '\u4e00' && c <= '\u9fff').length, 5 ); // 0-5 if (regions[cnLen].find(it.roi).isExist()) { - return it.itemName; + firstMatch = it; + break; } } + + if (!firstMatch) return null; + + if (!settings.disableSecondCheck) { + const cnLen = Math.min( + [...firstMatch.itemName].filter(c => c >= '\u4e00' && c <= '\u9fff').length, + 5 + ); + if (regions[cnLen].find(firstMatch.roi).isExist()) { + return firstMatch.itemName; + } + return null; + } else { + return firstMatch.itemName; + } } catch (e) { log.error(`performTemplateMatch: ${e.message}`); } finally { @@ -1969,6 +2027,8 @@ async function loadTargetItems() { it.template = file.ReadImageMatSync(it.fullPath); it.itemName = it.fileName.replace(/\.png$/i, ''); it.roi = RecognitionObject.TemplateMatch(it.template); + it.enabled = true; + it.isMonsterMaterial = it.fullPath.includes('怪物掉落材料'); // 新增：解析括号中的阈值 const match = it.fullPath.match(/[（(](.*?)[)）]/); // 匹配英文或中文括号 diff --git a/repo/js/AutoHoeingOneDragon/manifest.json b/repo/js/AutoHoeingOneDragon/manifest.json index 40428fea6..708a52e83 100644 --- a/repo/js/AutoHoeingOneDragon/manifest.json +++ b/repo/js/AutoHoeingOneDragon/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 1, "name": "锄地一条龙", - "version": "2.5.6", + "version": "2.6.0", "description": "一站式解决自动化锄地，支持只拾取狗粮，请仔细阅读README.md后使用", "authors": [ { diff --git a/repo/js/AutoHoeingOneDragon/settings.json b/repo/js/AutoHoeingOneDragon/settings.json index f34353c8a..e13b359e5 100644 --- a/repo/js/AutoHoeingOneDragon/settings.json +++ b/repo/js/AutoHoeingOneDragon/settings.json @@ -57,6 +57,18 @@ ], "default": "模板匹配拾取，拾取狗粮和怪物材料" }, + { + "name": "onlyRelatedItems", + "type": "checkbox", + "label": "只使用路线相关怪物材料进行识别，提高性能\n仅在选择模板匹配拾取，拾取狗粮和怪物材料时生效\n推荐先不勾选运行一段时间获取历史数据后勾选", + "default": false + }, + { + "name": "disableSecondCheck", + "type": "checkbox", + "label": "禁用识别到物品后的二次校验，可能增加误捡概率", + "default": false + }, { "name": "activeDumperMode", "type": "input-text", diff --git a/repo/js/采集cd管理/main.js b/repo/js/采集cd管理/main.js index 8ca63d6ba..122876db3 100644 --- a/repo/js/采集cd管理/main.js +++ b/repo/js/采集cd管理/main.js @@ -233,6 +233,7 @@ async function performTemplateMatch(centerYF) { } try { + let firstMatch = null; for (const it of targetItems) { const cnLen = Math.min( [...it.itemName].filter(c => c >= '\u4e00' && c <= '\u9fff').length, @@ -240,9 +241,25 @@ async function performTemplateMatch(centerYF) { ); // 0-5 if (regions[cnLen].find(it.roi).isExist()) { - return it.itemName; + firstMatch = it; + break; } } + + if (!firstMatch) return null; + + if (!settings.disableSecondCheck) { + const cnLen = Math.min( + [...firstMatch.itemName].filter(c => c >= '\u4e00' && c <= '\u9fff').length, + 5 + ); + if (regions[cnLen].find(firstMatch.roi).isExist()) { + return firstMatch.itemName; + } + return null; + } else { + return firstMatch.itemName; + } } catch (e) { log.error(`performTemplateMatch: ${e.message}`); } finally { @@ -1938,6 +1955,12 @@ async function buildSettingsJson() { "尽量调为夜晚" ], "default": "不调节时间" + }, + { + "name": "disableSecondCheck", + "type": "checkbox", + "label": "禁用识别到物品后的二次校验，可能增加误捡概率", + "default": false } ); diff --git a/repo/js/采集cd管理/manifest.json b/repo/js/采集cd管理/manifest.json index 355577d9d..e1094dbe0 100644 --- a/repo/js/采集cd管理/manifest.json +++ b/repo/js/采集cd管理/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 1, "name": "采集cd管理", - "version": "2.12.1", + "version": "2.13.0", "bgi_version": "0.44.8", "description": "仅面对会操作文件和读readme的用户，基于文件夹操作自动管理采集路线的cd，会按照路径组的顺序依次运行，直到指定的时间，并会按照给定的cd类型，自动跳过未刷新的路线", "saved_files": [