diff --git a/repo/js/AutoHoeingOneDragon/README.md b/repo/js/AutoHoeingOneDragon/README.md index ff406338a..f06261ae1 100644 --- a/repo/js/AutoHoeingOneDragon/README.md +++ b/repo/js/AutoHoeingOneDragon/README.md @@ -44,7 +44,7 @@ - - bgi原版拾取:使用bgi自带的拾取 - - 不拾取:不拾取任何物品 - **拾取时间参数:** 建议先不要调节,观察到拾取异常时再根据自定义配置提示调节 - - **效率降序运行:** 当你时间不足以刷完所有怪物且不确定时,建议通过开启该项和配置下一项来实现在指定时间前尽可能多刷效率高的路线并按时终止 + - **组内路线排序模式:** 效率降序用于当你的时间不足以刷完所有路线时使用,先刷效率最高的(可配合优先关键词使用,这些路线效率会被视为最高);高收益优先选项将会将包含高倍率怪物(如600,400,81,飞萤)的路线排在前面,避免因为超出上限损失这部分收益 - **输入不运行的时间或时间段的小时数** 当你需要让js在特定的时间终止运行时,按描述填写,js会在距离目标时间小于五分钟时终止运行并等待到目标时间 - **泥头车模式:** 接近战斗地点(距离5-30)时,提前让指定序号的角色开e,建议以下角色开启:芙宁娜,爱可菲,雷电将军,不建议各种盾位或纳塔角色开启。 - 第二部分:路线选择与分组配置:该部分将决定路线的选择与分配,js将尝试按照以下配置选择路线以达到目标数量的怪物,并分配到不同的路径组,在第一部分中选择不同的路径组以执行对应的路线 @@ -56,6 +56,7 @@ - - 传奇 :表明路线含有地方传奇,战斗强度通常极高,请评估后选择是否排除 - - 蕈兽 :表明路线含有蕈兽,蕈兽遇到雷火元素时会发生转化,转化后占据精英怪物的名额却只掉落少量摩拉,通常建议禁用 - - 小怪 :表明路线只含小怪,战斗强度低,且无需携带万叶来拾取可能掉落的狗粮,可以适当携带等级较低或不上场的角色来获取经验收益 + - - 狭窄地形 :表明路线存在部分非常狭窄,任何位移技能都容易导致致命后果 - - 分组逻辑:不含路径组1排除标签和任何其他组标签的路径会进入路径组1,剩余路径若含有路径组x的标签之一,则会进入路径组x - - 使用示例:路径组一填写蕈兽,禁用蕈兽路线,路径组二填写次数盾,水免,处理路径组一的配队难以处理的次数盾和水免怪物,路径组三填写小怪,队伍中放升级中角色获取经验,将本js添加到【多个配置组】中,根据路径组的具体情况配置每个配置组的设置 - - 新增支持自定义标签,将会尝试将未知的标签通过文件路径,description匹配,含有对应关键词的路线即视为含有这些标签 diff --git a/repo/js/AutoHoeingOneDragon/assets/monsterInfo.json b/repo/js/AutoHoeingOneDragon/assets/monsterInfo.json index 502be7842..8f3115ee0 100644 --- a/repo/js/AutoHoeingOneDragon/assets/monsterInfo.json +++ b/repo/js/AutoHoeingOneDragon/assets/monsterInfo.json @@ -621,6 +621,22 @@ "次数盾" ] }, + { + "name": "深邃拟覆叶_400", + "moraRate": 2, + "type": "精英", + "tags": [ + "次数盾" + ] + }, + { + "name": "深邃拟覆叶_200", + "moraRate": 1, + "type": "精英", + "tags": [ + "次数盾" + ] + }, { "name": "深邃摹结株", "moraRate": 1, diff --git a/repo/js/AutoHoeingOneDragon/main.js b/repo/js/AutoHoeingOneDragon/main.js index 808c3d29f..ad3d355de 100644 --- a/repo/js/AutoHoeingOneDragon/main.js +++ b/repo/js/AutoHoeingOneDragon/main.js @@ -356,6 +356,14 @@ async function processPathings(groupTags) { } else if (monster.type === "精英") { pathing.e += count; // 增加精英怪物数量 pathing.mora_e += count * 200 * monster.moraRate; // 增加精英怪物摩拉值 + + } + + if (monster.moraRate > 1) { + pathing.tags.push('高收益'); + if (monster.type === "精英") { + pathing.tags.push('精英高收益'); + } } // 添加标签 @@ -547,7 +555,11 @@ async function findBestRouteGroups(pathings, k1, k2, targetEliteNum, targetMonst /* ========== 3. 最小不可再减集合(贪心逆筛,不碰优先路线) ========== */ // 1. 只留非优先的已选路线,按性价比升序排 const selectedList = pathings - .filter(p => p.selected && !p.prioritized) + .filter(p => + p.selected && + !p.prioritized && + !p.tags.includes('精英高收益') + ) .sort((a, b) => { const score = p => { const eliteGain = p.e === 0 ? 200 : (p.G1 - p.G2) / p.e; @@ -578,12 +590,25 @@ async function findBestRouteGroups(pathings, k1, k2, targetEliteNum, targetMonst p.tags.push("小怪"); } }); - if (settings.runByEfficiency) { - log.info("使用效率降序运行"); - pathings.sort((a, b) => b.E1 - a.E1 || b.E2 - a.E2); - } else { - log.info("使用默认顺序运行"); - pathings.sort((a, b) => a.index - b.index); + + switch (settings.sortMode) { + case "效率降序": + log.info("使用效率降序运行"); + pathings.sort((a, b) => b.E1 - a.E1 || b.E2 - a.E2); + break; + + case "高收益优先": + log.info("使用高收益优先运行"); + pathings.sort((a, b) => { + const aHigh = a.tags.includes("高收益") ? 1 : 0; + const bHigh = b.tags.includes("高收益") ? 1 : 0; + return bHigh - aHigh || a.index - b.index; // 有标签的在前,同标签按原顺序 + }); + break; + + default: + log.info("使用原文件顺序运行"); + pathings.sort((a, b) => a.index - b.index); } log.info(`总精英怪数量: ${totalSelectedElites.toFixed(0)}`); diff --git a/repo/js/AutoHoeingOneDragon/manifest.json b/repo/js/AutoHoeingOneDragon/manifest.json index f3cdf4689..4e925bc0d 100644 --- a/repo/js/AutoHoeingOneDragon/manifest.json +++ b/repo/js/AutoHoeingOneDragon/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 1, "name": "锄地一条龙", - "version": "1.16.0", + "version": "1.17.0", "description": "一站式解决自动化锄地,支持只拾取狗粮,请仔细阅读README.md后使用", "authors": [ { diff --git a/repo/js/AutoHoeingOneDragon/pathing/0-汐酱/0-传奇/003纳塔奥奇卡纳塔铜锁 传奇.json b/repo/js/AutoHoeingOneDragon/pathing/0-汐酱/0-传奇/003纳塔奥奇卡纳塔铜锁 传奇.json index 0e65e4b8d..04ea05a38 100644 --- a/repo/js/AutoHoeingOneDragon/pathing/0-汐酱/0-传奇/003纳塔奥奇卡纳塔铜锁 传奇.json +++ b/repo/js/AutoHoeingOneDragon/pathing/0-汐酱/0-传奇/003纳塔奥奇卡纳塔铜锁 传奇.json @@ -7,7 +7,7 @@ } ], "bgi_version": "0.45.0", - "description": " 路线信息:该路线预计用时140秒,预计收入600摩拉,包含以下怪物:3只精英传奇倍率一。", + "description": " 路线信息:该路线预计用时58.34秒,预计收入800摩拉,包含以下怪物:4只精英传奇倍率一。", "enable_monster_loot_split": false, "last_modified_time": 1764614235214, "map_match_method": "", diff --git a/repo/js/AutoHoeingOneDragon/pathing/0-汐酱/0-传奇/004枫丹旧日之海龙蜥 传奇.json b/repo/js/AutoHoeingOneDragon/pathing/0-汐酱/0-传奇/004枫丹旧日之海龙蜥 传奇.json deleted file mode 100644 index 8f9a17c45..000000000 --- a/repo/js/AutoHoeingOneDragon/pathing/0-汐酱/0-传奇/004枫丹旧日之海龙蜥 传奇.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "info": { - "authors": [ - { - "links": "", - "name": "汐" - } - ], - "bgi_version": "0.45.0", - "description": " 路线信息:该路线预计用时100秒,预计收入1200摩拉,包含以下怪物:2只精英传奇倍率三。", - "enable_monster_loot_split": false, - "last_modified_time": 1767726586175, - "map_match_method": "", - "map_name": "SeaOfBygoneEras", - "name": "004枫丹旧日之海龙蜥 传奇", - "tags": [], - "type": "collect", - "version": "1.0" - }, - "positions": [ - { - "action": "", - "action_params": "", - "id": 1, - "move_mode": "walk", - "type": "teleport", - "x": 3542.162841796875, - "y": 1377.1722412109375 - }, - { - "action": "", - "action_params": "", - "id": 2, - "move_mode": "dash", - "type": "path", - "x": 3550.346923828125, - "y": 1430.4874267578125 - }, - { - "action": "fight", - "action_params": "", - "id": 3, - "move_mode": "dash", - "type": "path", - "x": 3544.763427734375, - "y": 1462.154052734375 - }, - { - "action": "fight", - "action_params": "", - "id": 4, - "move_mode": "dash", - "type": "orientation", - "x": 3544.763427734375, - "y": 1462.154052734375 - }, - { - "action": "combat_script", - "action_params": "wait(0.2)", - "id": 5, - "move_mode": "dash", - "type": "orientation", - "x": 3544.763427734375, - "y": 1462.154052734375 - } - ] -} \ No newline at end of file diff --git a/repo/js/AutoHoeingOneDragon/pathing/0-汐酱/2-收尾/313稻妻越石村(200_2).json b/repo/js/AutoHoeingOneDragon/pathing/0-汐酱/1-精英/313稻妻越石村(200_2).json similarity index 100% rename from repo/js/AutoHoeingOneDragon/pathing/0-汐酱/2-收尾/313稻妻越石村(200_2).json rename to repo/js/AutoHoeingOneDragon/pathing/0-汐酱/1-精英/313稻妻越石村(200_2).json diff --git a/repo/js/AutoHoeingOneDragon/pathing/0-汐酱/2-收尾/314稻妻平海砦北(200_3).json b/repo/js/AutoHoeingOneDragon/pathing/0-汐酱/1-精英/314稻妻平海砦北(200_3).json similarity index 100% rename from repo/js/AutoHoeingOneDragon/pathing/0-汐酱/2-收尾/314稻妻平海砦北(200_3).json rename to repo/js/AutoHoeingOneDragon/pathing/0-汐酱/1-精英/314稻妻平海砦北(200_3).json diff --git a/repo/js/AutoHoeingOneDragon/pathing/0-汐酱/2-收尾/315稻妻平海砦南(200_6).json b/repo/js/AutoHoeingOneDragon/pathing/0-汐酱/1-精英/315稻妻平海砦南(200_6).json similarity index 100% rename from repo/js/AutoHoeingOneDragon/pathing/0-汐酱/2-收尾/315稻妻平海砦南(200_6).json rename to repo/js/AutoHoeingOneDragon/pathing/0-汐酱/1-精英/315稻妻平海砦南(200_6).json diff --git a/repo/js/AutoHoeingOneDragon/pathing/0-汐酱/2-收尾/316稻妻天云峠(200_20).json b/repo/js/AutoHoeingOneDragon/pathing/0-汐酱/1-精英/316稻妻天云峠(200_20).json similarity index 100% rename from repo/js/AutoHoeingOneDragon/pathing/0-汐酱/2-收尾/316稻妻天云峠(200_20).json rename to repo/js/AutoHoeingOneDragon/pathing/0-汐酱/1-精英/316稻妻天云峠(200_20).json diff --git a/repo/js/AutoHoeingOneDragon/pathing/0-汐酱/2-收尾/317稻妻鹤观千来神祠(200_12~16).json b/repo/js/AutoHoeingOneDragon/pathing/0-汐酱/1-精英/317稻妻鹤观千来神祠(200_12~16).json similarity index 100% rename from repo/js/AutoHoeingOneDragon/pathing/0-汐酱/2-收尾/317稻妻鹤观千来神祠(200_12~16).json rename to repo/js/AutoHoeingOneDragon/pathing/0-汐酱/1-精英/317稻妻鹤观千来神祠(200_12~16).json diff --git a/repo/js/AutoHoeingOneDragon/pathing/0-汐酱/2-收尾/319稻妻鹤观茂知祭场(200_9).json b/repo/js/AutoHoeingOneDragon/pathing/0-汐酱/1-精英/319稻妻鹤观茂知祭场(200_9).json similarity index 100% rename from repo/js/AutoHoeingOneDragon/pathing/0-汐酱/2-收尾/319稻妻鹤观茂知祭场(200_9).json rename to repo/js/AutoHoeingOneDragon/pathing/0-汐酱/1-精英/319稻妻鹤观茂知祭场(200_9).json diff --git a/repo/js/AutoHoeingOneDragon/pathing/0-汐酱/1-精英/525枫丹切萨勒姆宫(200_2).json b/repo/js/AutoHoeingOneDragon/pathing/0-汐酱/1-精英/525枫丹切萨勒姆宫(200_2).json deleted file mode 100644 index 73a5ec6db..000000000 --- a/repo/js/AutoHoeingOneDragon/pathing/0-汐酱/1-精英/525枫丹切萨勒姆宫(200_2).json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "info": { - "authors": [ - { - "links": "", - "name": "汐" - } - ], - "bgi_version": "0.45.0", - "description": " 路线信息:该路线预计用时51秒,包含以下怪物:2只魔像禁卫。", - "enable_monster_loot_split": false, - "last_modified_time": 1767728650378, - "map_match_method": "", - "map_name": "SeaOfBygoneEras", - "name": "525枫丹切萨勒姆宫(200_2)", - "tags": [], - "type": "collect", - "version": "1.0" - }, - "positions": [ - { - "action": "", - "action_params": "", - "id": 1, - "move_mode": "walk", - "type": "teleport", - "x": 4739.18896484375, - "y": 1354.5679931640625 - }, - { - "action": "", - "action_params": "", - "id": 2, - "move_mode": "dash", - "type": "path", - "x": 4730.55078125, - "y": 1374.54443359375 - }, - { - "action": "fight", - "action_params": "", - "id": 3, - "move_mode": "dash", - "type": "path", - "x": 4713.1474609375, - "y": 1388.3568115234375 - } - ] -} \ No newline at end of file diff --git a/repo/js/AutoHoeingOneDragon/pathing/0-汐酱/1-精英/526枫丹切萨勒姆宫东(200_2).json b/repo/js/AutoHoeingOneDragon/pathing/0-汐酱/1-精英/526枫丹切萨勒姆宫东(200_2).json deleted file mode 100644 index b84934ba0..000000000 --- a/repo/js/AutoHoeingOneDragon/pathing/0-汐酱/1-精英/526枫丹切萨勒姆宫东(200_2).json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "info": { - "authors": [ - { - "links": "", - "name": "汐" - } - ], - "bgi_version": "0.45.0", - "description": " 路线信息:该路线预计用时66秒,包含以下怪物:2只魔像禁卫。", - "enable_monster_loot_split": false, - "last_modified_time": 1767728638478, - "map_match_method": "", - "map_name": "SeaOfBygoneEras", - "name": "526枫丹切萨勒姆宫东(200_2)", - "tags": [], - "type": "collect", - "version": "1.0" - }, - "positions": [ - { - "action": "", - "action_params": "", - "id": 1, - "move_mode": "walk", - "type": "teleport", - "x": 4547.02490234375, - "y": 1477.1634521484375 - }, - { - "action": "", - "action_params": "", - "id": 2, - "move_mode": "dash", - "type": "path", - "x": 4564.86767578125, - "y": 1371.078857421875 - }, - { - "action": "combat_script", - "action_params": "keydown(w),wait(2.4),dash", - "id": 3, - "locked": false, - "move_mode": "dash", - "type": "orientation", - "x": 4541.044921875, - "y": 1351.780029296875 - }, - { - "action": "", - "action_params": "", - "id": 4, - "move_mode": "dash", - "type": "path", - "x": 4541.044921875, - "y": 1351.780029296875 - }, - { - "action": "fight", - "action_params": "", - "id": 5, - "move_mode": "dash", - "type": "path", - "x": 4556.9306640625, - "y": 1311.4007568359375 - } - ] -} \ No newline at end of file diff --git a/repo/js/AutoHoeingOneDragon/pathing/0-汐酱/1-精英/527枫丹旧日之海谐律院(200_2).json b/repo/js/AutoHoeingOneDragon/pathing/0-汐酱/1-精英/527枫丹旧日之海谐律院(200_2).json deleted file mode 100644 index 3d7ca0808..000000000 --- a/repo/js/AutoHoeingOneDragon/pathing/0-汐酱/1-精英/527枫丹旧日之海谐律院(200_2).json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "info": { - "authors": [ - { - "links": "", - "name": "汐" - } - ], - "bgi_version": "0.45.0", - "description": " 路线信息:该路线预计用时52秒,包含以下怪物:2只魔像禁卫。", - "enable_monster_loot_split": false, - "last_modified_time": 1767728664745, - "map_match_method": "", - "map_name": "SeaOfBygoneEras", - "name": "527枫丹旧日之海谐律院(200_2)", - "tags": [], - "type": "collect", - "version": "1.0" - }, - "positions": [ - { - "action": "", - "action_params": "", - "id": 1, - "move_mode": "walk", - "type": "teleport", - "x": 4006.736328125, - "y": 1337.83544921875 - }, - { - "action": "", - "action_params": "", - "id": 2, - "move_mode": "dash", - "type": "path", - "x": 3981.960693359375, - "y": 1324.236328125 - }, - { - "action": "fight", - "action_params": "", - "id": 3, - "move_mode": "dash", - "type": "path", - "x": 3967.423583984375, - "y": 1273.9945068359375 - } - ] -} \ No newline at end of file diff --git a/repo/js/AutoHoeingOneDragon/settings.json b/repo/js/AutoHoeingOneDragon/settings.json index e2a08d297..795114947 100644 --- a/repo/js/AutoHoeingOneDragon/settings.json +++ b/repo/js/AutoHoeingOneDragon/settings.json @@ -75,9 +75,15 @@ "label": "泥头车模式,将在接近战斗点前提前释放部分角色e技能\n需要启用时填写这些角色在队伍中的编号\n有多个角色需要释放时用【中文逗号】分隔" }, { - "name": "runByEfficiency", - "type": "checkbox", - "label": "组内按照效率降序运行\n会略微增加传送花费时间,用于在时间有限时优先跑高效路线\n建议配合下一项配置使用\n含优先关键词的路线效率会被视为最高" + "name": "sortMode", + "type": "select", + "label": "组内路线排序模式", + "options": [ + "原文件顺序", + "效率降序", + "高收益优先" + ], + "default": "原文件顺序" }, { "name": "timeRule", @@ -93,8 +99,8 @@ { "name": "tagsForGroup1", "type": "input-text", - "label": "允许使用的标签:\n水免,次数盾,高危,传奇,蕈兽,小怪,沙暴]\n允许使用自定义标签,文件路径或描述包含时将会视为路线含有该标签\n多个标签使用【中文逗号】分隔\n\n路径组一要【排除】的标签", - "default": "蕈兽,传奇" + "label": "允许使用的标签:\n水免,次数盾,高危,传奇,蕈兽,小怪,沙暴,狭窄地形]\n允许使用自定义标签,文件路径或描述包含时将会视为路线含有该标签\n多个标签使用【中文逗号】分隔\n\n路径组一要【排除】的标签", + "default": "蕈兽,传奇,狭窄地形" }, { "name": "tagsForGroup2", diff --git a/repo/js/AutoHoeingOneDragon/settings/默认账户1.json b/repo/js/AutoHoeingOneDragon/settings/默认账户1.json deleted file mode 100644 index 7ab3a6b1b..000000000 --- a/repo/js/AutoHoeingOneDragon/settings/默认账户1.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "tagsForGroup1": "蕈兽", - "tagsForGroup2": "小怪", - "tagsForGroup3": "", - "tagsForGroup4": "", - "tagsForGroup5": "", - "tagsForGroup6": "", - "tagsForGroup7": "", - "tagsForGroup8": "", - "tagsForGroup9": "", - "tagsForGroup10": "", - "disableSelfOptimization": false, - "eEfficiencyIndex": "2.5", - "mEfficiencyIndex": "0.5", - "splitFactor": "0", - "targetEliteNum": "400", - "targetMonsterNum": "1675", - "priorityTags": "", - "excludeTags": "" -} \ No newline at end of file