From 9bfcc65e186edac8fb25f6419cf2ec635ffe78b4 Mon Sep 17 00:00:00 2001 From: xoipz <85264015+xoipz@users.noreply.github.com> Date: Mon, 29 Sep 2025 10:19:54 +0800 Subject: [PATCH] =?UTF-8?q?js=EF=BC=9A=E6=AF=8F=E6=97=A5=E5=A7=94=E6=89=98?= =?UTF-8?q?=200.98.7=20(#2029)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- repo/js/AutoCommission/README.md | 11 +- .../process/落叶归风/风起地/process.json | 45 ++- .../process/落叶归风/风起地/落叶归风-1.json | 57 ++-- .../process/落叶归风/风起地/落叶归风-2.json | 306 ++++++++++-------- .../鸽子习惯一去不回/清泉镇/process.json | 4 +- .../清泉镇/把信件送给莎拉.json | 40 +++ .../鸽子习惯一去不回/清泉镇/点击关闭.json | 19 +- .../鸽子习惯一去不回/清泉镇/调查前方.json | 35 -- .../清泉镇/鸽子习惯一去不回-1.json | 135 ++++---- .../assets/临危受命/达达乌帕谷-2.json | 170 +++++----- .../assets/固若金汤/龙脊雪山-2.json | 242 +++++++++----- .../assets/攀高危险/奔狼领-1.json | 43 ++- .../assets/攀高危险/奔狼领-2.json | 164 +++++----- .../assets/攀高危险/风啸山坡-2.json | 145 ++++++--- repo/js/AutoCommission/constants.js | 4 +- .../js/AutoCommission/lib/dialog-processor.js | 47 +-- repo/js/AutoCommission/manifest.json | 2 +- 17 files changed, 867 insertions(+), 602 deletions(-) create mode 100644 repo/js/AutoCommission/assets/process/鸽子习惯一去不回/清泉镇/把信件送给莎拉.json diff --git a/repo/js/AutoCommission/README.md b/repo/js/AutoCommission/README.md index 9ae330d9a..26031f57b 100644 --- a/repo/js/AutoCommission/README.md +++ b/repo/js/AutoCommission/README.md @@ -75,7 +75,16 @@ - 3.BGI QQ频道@星野 ## 更新日志 -### 当前版本：0.98.6 +### 当前版本：0.98.7 (2025-09-29) +- 大幅优化委托流程执行效率 +- 新增"把信件送给莎拉"委托自动化支持 +- 完善"鸽子习惯一去不回"系列委托流程 +- 优化13个委托流程配置文件，提升执行精确度 +- 重构对话处理器代码逻辑，简化维护 +- 改进战斗委托追踪和对话识别机制 +- 总计修改16个文件（新增761行，删除505行） + +### 上一版本：0.98.6 - 新增图像识别工具库（image_utils.js） - 新增对话处理器功能增强 - 新增商店关闭功能（close-store.js） diff --git a/repo/js/AutoCommission/assets/process/落叶归风/风起地/process.json b/repo/js/AutoCommission/assets/process/落叶归风/风起地/process.json index 7dd536526..30b622c6b 100644 --- a/repo/js/AutoCommission/assets/process/落叶归风/风起地/process.json +++ b/repo/js/AutoCommission/assets/process/落叶归风/风起地/process.json @@ -1,5 +1,40 @@ -落叶归风-1.json -F -落叶归风-2.json -落叶归风-3.json -F \ No newline at end of file +[ + { + "type": "地图追踪", + "data": "落叶归风-1.json", + "note": "执行第一个地图追踪步骤" + }, + { + "type": "对话", + "note": "执行对话步骤，默认跳过10次对话" + }, + { + "type": "自动任务", + "data": { + "action": "enable", + "taskType": "AutoPick" + }, + "note": "启用自动拾取" +}, + { + "type": "地图追踪", + "data": "落叶归风-2.json", + "note": "执行第二个地图追踪步骤" + }, + { + "type": "地图追踪", + "data": "落叶归风-3.json", + "note": "执行第三个地图追踪步骤" + }, + { + "type": "对话", + "note": "执行对话步骤，默认跳过10次对话" + }, + { + "type": "自动任务", + "data": { + "action": "disable" + }, + "note": "取消所有自动任务" +} +] \ No newline at end of file diff --git a/repo/js/AutoCommission/assets/process/落叶归风/风起地/落叶归风-1.json b/repo/js/AutoCommission/assets/process/落叶归风/风起地/落叶归风-1.json index d3c008903..7f38eaf39 100644 --- a/repo/js/AutoCommission/assets/process/落叶归风/风起地/落叶归风-1.json +++ b/repo/js/AutoCommission/assets/process/落叶归风/风起地/落叶归风-1.json @@ -1,40 +1,53 @@ -{ +{ "info": { - "name": "落叶归风-1", - "type": "collect", - "author": "云闲vsv", - "version": "1.0", - "description": "落叶归风-1", + "authors": [], + "bgi_version": "0.45.0", + "description": "", + "enable_monster_loot_split": false, + "last_modified_time": 1758870447408, + "map_match_method": "", "map_name": "Teyvat", - "bgi_version": "0.45.0" + "name": "落叶归风-1", + "tags": [], + "type": "collect", + "version": "1.0" }, "positions": [ { - "id": 1, "action": "", + "action_params": "", + "id": 1, "move_mode": "walk", "type": "teleport", - "x": -1267.353515625, - "y": 1933.14111328125, - "action_params": "" + "x": -1266.388671875, + "y": 1934.0517578125 }, { + "action": "", + "action_params": "", "id": 2, - "x": -1288.4189453125, - "y": 1911.71875, + "move_mode": "dash", "type": "path", - "move_mode": "walk", - "action": "", - "action_params": "" + "x": -1279.697265625, + "y": 1916.27880859375 }, { - "id": 3, - "x": -1290.771484375, - "y": 1907.5302734375, - "type": "path", - "move_mode": "walk", "action": "", - "action_params": "" + "action_params": "", + "id": 3, + "move_mode": "walk", + "type": "path", + "x": -1288.08984375, + "y": 1909.5068359375 + }, + { + "action": "", + "action_params": "", + "id": 4, + "move_mode": "walk", + "type": "target", + "x": -1289.75, + "y": 1908.2705078125 } ] } \ No newline at end of file diff --git a/repo/js/AutoCommission/assets/process/落叶归风/风起地/落叶归风-2.json b/repo/js/AutoCommission/assets/process/落叶归风/风起地/落叶归风-2.json index 8dca2938b..3d6cf4f93 100644 --- a/repo/js/AutoCommission/assets/process/落叶归风/风起地/落叶归风-2.json +++ b/repo/js/AutoCommission/assets/process/落叶归风/风起地/落叶归风-2.json @@ -1,193 +1,229 @@ -{ +{ "info": { - "name": "落叶归风-2", - "type": "collect", - "author": "云闲vsv", - "version": "1.0", - "description": "落叶归风-2", + "authors": [ + { + "links": "", + "name": "云闲vsv" + } + ], + "bgi_version": "0.45.0", + "description": "", + "enable_monster_loot_split": false, + "last_modified_time": 1758871317893, + "map_match_method": "", "map_name": "Teyvat", - "bgi_version": "0.45.0" + "name": "落叶归风-2", + "tags": [], + "type": "collect", + "version": "1.0" }, "positions": [ { + "action": "", + "action_params": "", "id": 1, + "move_mode": "walk", + "type": "path", "x": -1290.771484375, - "y": 1907.5302734375, - "action": "", - "move_mode": "walk", - "action_params": "", - "type": "path" + "y": 1907.5302734375 }, { + "action": "", + "action_params": "", "id": 2, + "move_mode": "walk", + "type": "target", "x": -1290.33984375, - "y": 1892.49267578125, - "action": "", - "move_mode": "walk", - "action_params": "", - "type": "target" + "y": 1892.49267578125 }, { + "action": "", + "action_params": "", "id": 3, + "move_mode": "climb", + "type": "path", "x": -1268.744140625, - "y": 1885.0380859375, - "action": "", - "move_mode": "climb", - "action_params": "", - "type": "path" + "y": 1885.0380859375 }, { + "action": "", + "action_params": "", "id": 4, - "x": -1264.0009765625, - "y": 1887.2626953125, - "action": "", "move_mode": "climb", - "action_params": "", - "type": "target" + "type": "target", + "x": -1264.0009765625, + "y": 1887.2626953125 }, { + "action": "", + "action_params": "", "id": 5, + "move_mode": "walk", + "type": "target", "x": -1264.7138671875, - "y": 1887.85595703125, - "action": "", - "move_mode": "walk", - "action_params": "", - "type": "target" + "y": 1887.85595703125 }, { + "action": "combat_script", + "action_params": "wait(0.5),keypress(F),wait(2),w(0.1),wait(0.5),keypress(F),wait(2),w(0.1),wait(0.5),keypress(F)", "id": 6, - "x": -1265.947265625, - "y": 1885.361328125, - "action": "combat_script", "move_mode": "walk", - "action_params": "attack,wait(1),keypress(F),", - "type": "target" + "type": "target", + "x": -1265.306640625, + "y": 1886.03076171875 }, { + "action": "", + "action_params": "", "id": 7, - "x": -1268.0458984375, - "y": 1882.6875, - "action": "", "move_mode": "walk", - "action_params": "", - "type": "path" + "type": "target", + "x": -1267.134765625, + "y": 1883.25244140625 }, { + "action": "", + "action_params": "", "id": 8, - "x": -1268.3876953125, - "y": 1880.10302734375, - "action": "", "move_mode": "walk", - "action_params": "", - "type": "target" + "type": "target", + "x": -1267.72265625, + "y": 1881.333984375 }, { + "action": "", + "action_params": "", "id": 9, - "x": -1266.9638671875, - "y": 1871.62939453125, - "action": "", "move_mode": "walk", - "action_params": "", - "type": "path" + "type": "target", + "x": -1267.96484375, + "y": 1879.31884765625 }, { + "action": "", + "action_params": "", "id": 10, - "x": -1266.9453125, - "y": 1870.853515625, - "action": "", "move_mode": "walk", - "action_params": "", - "type": "target" + "type": "target", + "x": -1267.568359375, + "y": 1875.6982421875 }, { + "action": "", + "action_params": "", "id": 11, - "x": -1268.1201171875, - "y": 1862.07666015625, - "action": "combat_script", "move_mode": "walk", - "action_params": "attack,wait(1),keypress(F),", - "type": "target" + "type": "target", + "x": -1266.513671875, + "y": 1870.6787109375 }, { + "action": "", + "action_params": "", "id": 12, - "x": -1267.541015625, - "y": 1864.69775390625, - "type": "path", "move_mode": "walk", - "action": "", - "action_params": "" + "type": "target", + "x": -1266.724609375, + "y": 1868.4736328125 }, { - "id": 13, - "x": -1266.9453125, - "y": 1870.853515625, - "action": "", - "move_mode": "walk", - "action_params": "", - "type": "target" - }, - { - "id": 14, - "x": -1267.7177734375, - "y": 1872.92822265625, - "type": "path", - "move_mode": "walk", - "action": "", - "action_params": "" - }, - { - "id": 15, - "x": -1268.3876953125, - "y": 1880.10302734375, - "action": "", - "move_mode": "walk", - "action_params": "", - "type": "target" - }, - { - "id": 16, - "x": -1268.0458984375, - "y": 1882.6875, - "action": "", - "move_mode": "walk", - "action_params": "", - "type": "path" - }, - { - "id": 17, - "x": -1266.9374749271265, - "y": 1883.5, - "action": "", - "move_mode": "walk", - "action_params": "", - "type": "target" - }, - { - "id": 18, - "x": -1264.1728515625, - "y": 1887.189453125, - "action": "", - "move_mode": "walk", - "action_params": "", - "type": "path" - }, - { - "id": 19, - "x": -1262.1220703125, - "y": 1892.853515625, - "action": "", - "move_mode": "walk", - "action_params": "", - "type": "target" - }, - { - "id": 20, - "x": -1264.603515625, - "y": 1894.21435546875, "action": "combat_script", + "action_params": "wait(0.5),keypress(F),wait(2),w(0.1),wait(0.3),keypress(F)", + "id": 13, "move_mode": "walk", - "action_params": "attack,wait(1),keypress(F),", - "type": "target" + "type": "target", + "x": -1267.625, + "y": 1862.55859375 + }, + { + "action": "", + "action_params": "", + "id": 14, + "move_mode": "walk", + "type": "target", + "x": -1267.556640625, + "y": 1863.6611328125 + }, + { + "action": "", + "action_params": "", + "id": 15, + "move_mode": "walk", + "type": "target", + "x": -1267.087890625, + "y": 1866.6064453125 + }, + { + "action": "", + "action_params": "", + "id": 16, + "move_mode": "walk", + "type": "target", + "x": -1266.349609375, + "y": 1869.4365234375 + }, + { + "action": "", + "action_params": "", + "id": 17, + "move_mode": "walk", + "type": "target", + "x": -1266.83203125, + "y": 1871.91796875 + }, + { + "action": "", + "action_params": "", + "id": 18, + "move_mode": "walk", + "type": "target", + "x": -1267.97265625, + "y": 1876.986328125 + }, + { + "action": "", + "action_params": "", + "id": 19, + "move_mode": "walk", + "type": "target", + "x": -1268.03125, + "y": 1879.99462890625 + }, + { + "action": "", + "action_params": "", + "id": 20, + "move_mode": "walk", + "type": "target", + "x": -1266.896484375, + "y": 1883.859375 + }, + { + "action": "", + "action_params": "", + "id": 21, + "move_mode": "walk", + "type": "target", + "x": -1263.826171875, + "y": 1889.0625 + }, + { + "action": "", + "action_params": "", + "id": 22, + "move_mode": "walk", + "type": "target", + "x": -1261.763671875, + "y": 1892.5205078125 + }, + { + "action": "combat_script", + "action_params": "wait(0.5),keypress(F),wait(2),w(0.1),wait(0.3),keypress(F)", + "id": 23, + "move_mode": "walk", + "type": "target", + "x": -1264.216796875, + "y": 1894.1630859375 } ] } \ No newline at end of file diff --git a/repo/js/AutoCommission/assets/process/鸽子习惯一去不回/清泉镇/process.json b/repo/js/AutoCommission/assets/process/鸽子习惯一去不回/清泉镇/process.json index 45878bc2a..03c6b568a 100644 --- a/repo/js/AutoCommission/assets/process/鸽子习惯一去不回/清泉镇/process.json +++ b/repo/js/AutoCommission/assets/process/鸽子习惯一去不回/清泉镇/process.json @@ -57,9 +57,9 @@ }, { "type": "委托描述检测", - "data": "把信件送给沙拉", + "data": "把信件送给莎拉", "note": "分支名字正确的情况", - "run": "把信件送给沙拉.json" + "run": "把信件送给莎拉.json" } diff --git a/repo/js/AutoCommission/assets/process/鸽子习惯一去不回/清泉镇/把信件送给莎拉.json b/repo/js/AutoCommission/assets/process/鸽子习惯一去不回/清泉镇/把信件送给莎拉.json new file mode 100644 index 000000000..b639fc255 --- /dev/null +++ b/repo/js/AutoCommission/assets/process/鸽子习惯一去不回/清泉镇/把信件送给莎拉.json @@ -0,0 +1,40 @@ +[ + { + "type": "地图追踪", + "data": "鸽子习惯一去不回-4.json", + "note": "执行第四个地图追踪步骤" + }, + { + "type": "对话", + "data": { + "skipCount": 5, + "priorityOptions": [ + "有你的信" + + ], + "npcWhiteList": [ + "莎拉" + ] + }, + "note": "执行对话步骤，优先选择特定选项并与白名单NPC交互" + }, + { + "type": "地图追踪", + "data": "鸽子习惯一去不回-1.json", + "note": "执行第一个地图追踪步骤" + }, + { + "type": "对话", + "data": { + "skipCount": 5, + "priorityOptions": [ + "关于鸽子" + + ], + "npcWhiteList": [ + "杜拉夫" + ] + }, + "note": "执行对话步骤，优先选择特定选项并与白名单NPC交互" + } +] \ No newline at end of file diff --git a/repo/js/AutoCommission/assets/process/鸽子习惯一去不回/清泉镇/点击关闭.json b/repo/js/AutoCommission/assets/process/鸽子习惯一去不回/清泉镇/点击关闭.json index 0b3fb1e2c..aec383cb6 100644 --- a/repo/js/AutoCommission/assets/process/鸽子习惯一去不回/清泉镇/点击关闭.json +++ b/repo/js/AutoCommission/assets/process/鸽子习惯一去不回/清泉镇/点击关闭.json @@ -1,18 +1 @@ -{ - "macroEvents": [ - { - "type": 4, - "mouseX": 1840, - "mouseY": 43, - "mouseButton": "Left", - "time": 1125 - }, - { - "type": 5, - "mouseX": 1840, - "mouseY": 43, - "mouseButton": "Left", - "time": 1235 - } - ] -} \ No newline at end of file +{"macroEvents":[{"type":0,"keyCode":70,"mouseX":0,"mouseY":0,"time":1078},{"type":1,"keyCode":70,"mouseX":0,"mouseY":0,"time":1250},{"type":0,"keyCode":70,"mouseX":0,"mouseY":0,"time":2406},{"type":1,"keyCode":70,"mouseX":0,"mouseY":0,"time":2531},{"type":0,"keyCode":70,"mouseX":0,"mouseY":0,"time":3391},{"type":1,"keyCode":70,"mouseX":0,"mouseY":0,"time":3516},{"type":0,"keyCode":70,"mouseX":0,"mouseY":0,"time":4703},{"type":1,"keyCode":70,"mouseX":0,"mouseY":0,"time":4844},{"type":0,"keyCode":70,"mouseX":0,"mouseY":0,"time":5844},{"type":1,"keyCode":70,"mouseX":0,"mouseY":0,"time":5985},{"type":0,"keyCode":70,"mouseX":0,"mouseY":0,"time":6938},{"type":1,"keyCode":70,"mouseX":0,"mouseY":0,"time":7110},{"type":0,"keyCode":27,"mouseX":0,"mouseY":0,"time":8719},{"type":1,"keyCode":27,"mouseX":0,"mouseY":0,"time":8891},{"type":0,"keyCode":27,"mouseX":0,"mouseY":0,"time":10094},{"type":1,"keyCode":27,"mouseX":0,"mouseY":0,"time":10219},{"type":0,"keyCode":27,"mouseX":0,"mouseY":0,"time":11641},{"type":1,"keyCode":27,"mouseX":0,"mouseY":0,"time":11781},{"type":0,"keyCode":27,"mouseX":0,"mouseY":0,"time":12953},{"type":1,"keyCode":27,"mouseX":0,"mouseY":0,"time":13141},{"type":0,"keyCode":27,"mouseX":0,"mouseY":0,"time":13891},{"type":1,"keyCode":27,"mouseX":0,"mouseY":0,"time":14047},{"type":0,"keyCode":27,"mouseX":0,"mouseY":0,"time":15000},{"type":1,"keyCode":27,"mouseX":0,"mouseY":0,"time":15203},{"type":0,"keyCode":70,"mouseX":0,"mouseY":0,"time":16141},{"type":1,"keyCode":70,"mouseX":0,"mouseY":0,"time":16266},{"type":0,"keyCode":70,"mouseX":0,"mouseY":0,"time":17235},{"type":1,"keyCode":70,"mouseX":0,"mouseY":0,"time":17344}],"info":{"name":"","description":"","x":319,"y":195,"width":1920,"height":1080,"recordDpi":1.25}} \ No newline at end of file diff --git a/repo/js/AutoCommission/assets/process/鸽子习惯一去不回/清泉镇/调查前方.json b/repo/js/AutoCommission/assets/process/鸽子习惯一去不回/清泉镇/调查前方.json index a9736daaf..2ba622055 100644 --- a/repo/js/AutoCommission/assets/process/鸽子习惯一去不回/清泉镇/调查前方.json +++ b/repo/js/AutoCommission/assets/process/鸽子习惯一去不回/清泉镇/调查前方.json @@ -14,46 +14,11 @@ "data": "F", "note": "对话" }, - { - "type": "按键", - "data": "F", - "note": "对话" - }, - { - "type": "按键", - "data": "F", - "note": "对话" - }, - { - "type": "按键", - "data": "F", - "note": "对话" - }, - { - "type": "按键", - "data": "F", - "note": "对话" - }, - { - "type": "按键", - "data": "F", - "note": "对话" - }, - { - "type": "按键", - "data": "F", - "note": "对话" - }, { "type": "键鼠脚本", "data": "点击关闭.json", "note": "关闭阅读" }, - { - "type": "按键", - "data": "F", - "note": "对话" - }, { "type": "按键", "data": "F", diff --git a/repo/js/AutoCommission/assets/process/鸽子习惯一去不回/清泉镇/鸽子习惯一去不回-1.json b/repo/js/AutoCommission/assets/process/鸽子习惯一去不回/清泉镇/鸽子习惯一去不回-1.json index c0b516048..71ace5b6b 100644 --- a/repo/js/AutoCommission/assets/process/鸽子习惯一去不回/清泉镇/鸽子习惯一去不回-1.json +++ b/repo/js/AutoCommission/assets/process/鸽子习惯一去不回/清泉镇/鸽子习惯一去不回-1.json @@ -1,87 +1,94 @@ -{ +{ "info": { - "name": "鸽子习惯一去不回-1", - "type": "collect", - "author": "云闲vsv", - "version": "1.0", - "description": "鸽子习惯一去不回-1", - "map_name": "Teyvat", + "authors": [ + { + "links": "", + "name": "云闲vsv" + } + ], "bgi_version": "0.45.0", + "description": "", + "enable_monster_loot_split": false, + "last_modified_time": 1758599200822, + "map_match_method": "", + "map_name": "Teyvat", + "name": "鸽子习惯一去不回-1", "tags": [], - "last_modified_time": 1751447956213 + "type": "collect", + "version": "1.0" }, "positions": [ { + "action": "", + "action_params": "", "id": 1, - "x": -867.9482421875, - "y": 1992.02685546875, + "move_mode": "walk", "type": "teleport", - "move_mode": "walk", - "action": "", - "action_params": "" + "x": -867.9482421875, + "y": 1992.02685546875 }, { - "id": 2, - "x": -911.3984375, - "y": 1975.8359375, - "type": "path", - "move_mode": "walk", - "action": "", - "action_params": "" - }, - { - "id": 3, - "x": -916.0224609375, - "y": 1963.8603515625, - "type": "path", - "move_mode": "walk", - "action": "", - "action_params": "" - }, - { - "id": 4, - "x": -927.671875, - "y": 1951.90185546875, - "type": "path", - "move_mode": "walk", - "action": "", - "action_params": "" - }, - { - "id": 5, - "x": -917.8017578125, - "y": 1929.73193359375, - "action": "", - "move_mode": "dash", - "action_params": "", - "type": "path" - }, - { - "id": 6, - "x": -927.4892578125, - "y": 1917.6005859375, "action": "set_time", - "move_mode": "walk", "action_params": "20:00", - "type": "path" + "id": 2, + "move_mode": "dash", + "type": "path", + "x": -911.3984375, + "y": 1975.8359375 }, { + "action": "", + "action_params": "", + "id": 3, + "move_mode": "walk", + "type": "path", + "x": -916.0224609375, + "y": 1963.8603515625 + }, + { + "action": "", + "action_params": "", + "id": 4, + "move_mode": "walk", + "type": "path", + "x": -927.671875, + "y": 1951.90185546875 + }, + { + "action": "", + "action_params": "", + "id": 5, + "move_mode": "dash", + "type": "path", + "x": -917.8017578125, + "y": 1929.73193359375 + }, + { + "action": "set_time", + "action_params": "20:00", + "id": 6, + "move_mode": "walk", + "type": "path", + "x": -927.4892578125, + "y": 1917.6005859375 + }, + { + "action": "", + "action_params": "", "id": 7, - "x": -935.8974609375, - "y": 1924.3876953125, - "action": "", "move_mode": "walk", - "action_params": "", - "type": "path" + "type": "path", + "x": -935.8974609375, + "y": 1924.3876953125 }, { - "id": 8, - "x": -940.9462890625, - "y": 1928.05322265625, "action": "", - "move_mode": "walk", "action_params": "", - "type": "target" + "id": 8, + "move_mode": "walk", + "type": "target", + "x": -940.9462890625, + "y": 1928.05322265625 } ] } \ No newline at end of file diff --git a/repo/js/AutoCommission/assets/临危受命/达达乌帕谷-2.json b/repo/js/AutoCommission/assets/临危受命/达达乌帕谷-2.json index d749c4654..a97adf7ec 100644 --- a/repo/js/AutoCommission/assets/临危受命/达达乌帕谷-2.json +++ b/repo/js/AutoCommission/assets/临危受命/达达乌帕谷-2.json @@ -1,97 +1,103 @@ -{ +{ "info": { - "name": "达达乌帕谷-2", - "type": "collect", - "author": "星野", - "version": "1.0", - "description": "", - "map_name": "Teyvat", + "authors": [ + { + "links": "", + "name": "星野" + } + ], "bgi_version": "0.45.0", + "description": "", + "enable_monster_loot_split": false, + "last_modified_time": 1758690711332, + "map_match_method": "", + "map_name": "Teyvat", + "name": "达达乌帕谷-2", "tags": [], - "last_modified_time": 1752312906100 + "type": "collect", + "version": "1.0" }, "positions": [ { + "action": "", + "action_params": "", "id": 1, - "x": -1452.33, - "y": 1455.5, - "action": "", "move_mode": "walk", - "action_params": "", - "type": "teleport" + "type": "teleport", + "x": -1866.923828125, + "y": 1331.5537109375 }, { + "action": "", + "action_params": "", "id": 2, - "x": -1587.33, - "y": 1417.25, - "action": "", - "move_mode": "run", - "action_params": "", - "type": "path" - }, - { - "id": 3, - "x": -1614, - "y": 1354.880000000001, - "action": "", - "move_mode": "dash", - "action_params": "", - "type": "path" - }, - { - "id": 4, - "x": -1632.8099999999995, - "y": 1355, - "action": "", - "move_mode": "run", - "action_params": "", - "type": "path" - }, - { - "id": 5, - "x": -1649, - "y": 1357.5, - "action": "", - "move_mode": "dash", - "action_params": "", - "type": "path" - }, - { - "id": 6, - "x": -1664.75, - "y": 1349.25, - "action": "", - "move_mode": "dash", - "action_params": "", - "type": "path" - }, - { - "id": 7, - "x": -1679.0599999999995, - "y": 1338.75, - "action": "", - "move_mode": "dash", - "action_params": "", - "type": "path" - }, - { - "id": 8, - "x": -1676.5, - "y": 1298, - "action": "", - "move_mode": "dash", - "action_params": "", - "type": "path" - }, - { - "id": 9, - "x": -1687.369999999999, - "y": 1262.619999999999, - "action": "fight", - "move_mode": "dash", - "action_params": "", + "move_mode": "walk", "type": "path", - "locked": false + "x": -1860.09765625, + "y": 1339.08251953125 + }, + { + "action": "", + "action_params": "", + "id": 3, + "move_mode": "dash", + "type": "path", + "x": -1829.203125, + "y": 1352.439453125 + }, + { + "action": "", + "action_params": "", + "id": 4, + "move_mode": "dash", + "type": "path", + "x": -1770.19140625, + "y": 1325.61572265625 + }, + { + "action": "", + "action_params": "", + "id": 5, + "move_mode": "dash", + "type": "path", + "x": -1741.921875, + "y": 1316.458984375 + }, + { + "action": "", + "action_params": "", + "id": 6, + "move_mode": "dash", + "type": "path", + "x": -1725.2265625, + "y": 1308.51171875 + }, + { + "action": "", + "action_params": "", + "id": 7, + "move_mode": "walk", + "type": "path", + "x": -1721.73046875, + "y": 1296.6826171875 + }, + { + "action": "stop_flying", + "action_params": "", + "id": 8, + "move_mode": "fly", + "type": "path", + "x": -1712.8828125, + "y": 1289.53515625 + }, + { + "action": "fight", + "action_params": "", + "id": 9, + "move_mode": "dash", + "type": "path", + "x": -1691.380859375, + "y": 1267.9755859375 } ] } \ No newline at end of file diff --git a/repo/js/AutoCommission/assets/固若金汤/龙脊雪山-2.json b/repo/js/AutoCommission/assets/固若金汤/龙脊雪山-2.json index 98a40f7d2..ce04b72db 100644 --- a/repo/js/AutoCommission/assets/固若金汤/龙脊雪山-2.json +++ b/repo/js/AutoCommission/assets/固若金汤/龙脊雪山-2.json @@ -1,133 +1,213 @@ -{ +{ "info": { - "name": "龙脊雪山-2", - "type": "collect", - "author": "星野", - "version": "1.0", - "description": "龙脊雪山-2", + "authors": [ + { + "links": "", + "name": "星野" + } + ], + "bgi_version": "0.45.0", + "description": "", + "enable_monster_loot_split": false, + "last_modified_time": 1758960208248, + "map_match_method": "", "map_name": "Teyvat", - "bgi_version": "0.45.0" + "name": "龙脊雪山-3", + "tags": [], + "type": "collect", + "version": "1.0" }, "positions": [ { + "action": "", + "action_params": "", "id": 1, - "x": -1006.9482421875, - "y": 859.47802734375, - "action": "", "move_mode": "walk", - "action_params": "", - "type": "teleport" + "type": "teleport", + "x": -415.833984375, + "y": 729.3310546875 }, { + "action": "", + "action_params": "", "id": 2, - "x": -942.2998046875, - "y": 836.51416015625, - "action": "", - "move_mode": "dash", - "action_params": "", - "type": "path" + "move_mode": "walk", + "type": "path", + "x": -413.4765625, + "y": 715.685546875 }, { + "action": "", + "action_params": "", "id": 3, - "x": -914.130859375, - "y": 792.2294921875, - "action": "", "move_mode": "dash", - "action_params": "", - "type": "path" + "type": "path", + "x": -455.529296875, + "y": 659.1240234375 }, { - "id": 4, - "x": -908.173828125, - "y": 783.08740234375, "action": "", - "move_mode": "fly", "action_params": "", - "type": "path" + "id": 4, + "move_mode": "dash", + "type": "path", + "x": -485.0859375, + "y": 670.80615234375 }, { + "action": "", + "action_params": "", "id": 5, - "x": -825.5185546875, - "y": 677.07763671875, - "action": "stop_flying", - "move_mode": "fly", - "action_params": "", - "type": "path" + "move_mode": "dash", + "type": "path", + "x": -523.228515625, + "y": 672.498046875 }, { + "action": "", + "action_params": "", "id": 6, - "x": -815.767578125, - "y": 666.306640625, - "action": "combat_script", - "move_mode": "walk", - "action_params": "attack,wait(1)keypress(F),wait(0.3),keypress(F),", - "type": "target" - }, - { - "id": 7, - "x": -815.767578125, - "y": 666.306640625, - "action": "combat_script", - "move_mode": "walk", - "action_params": "attack,wait(0.3),keypress(1),wait(0.3),keypress(E),wait(0.3),keypress(Q),wait(2.1),keypress(2),wait(0.3),keypress(E),wait(0.4),attack,wait(0.3),keypress(Q),wait(2.1),keypress(3),wait(0.3),keypress(E),wait(0.3),attack(1),wait(0.3),keypress(Q),wait(2.1),keypress(4),wait(0.3),keypress(E),wait(0.3),attack(1),wait(0.3),keypress(Q),wait(1),", + "move_mode": "dash", "type": "path", - "locked": false + "x": -570.03515625, + "y": 667.85400390625 }, { - "id": 8, - "x": -815.767578125, - "y": 666.306640625, - "action": "fight", - "move_mode": "walk", + "action": "", "action_params": "", - "type": "path" + "id": 7, + "move_mode": "dash", + "type": "path", + "x": -605.958984375, + "y": 676.76806640625 }, { + "action": "", + "action_params": "", + "id": 8, + "move_mode": "walk", + "type": "path", + "x": -613.62890625, + "y": 685.05810546875 + }, + { + "action": "", + "action_params": "", "id": 9, - "x": -814.5986328125, - "y": 673.32080078125, - "type": "path", "move_mode": "walk", - "action": "combat_script", - "action_params": "attack,wait(0.3),keypress(1),wait(0.3),keypress(E),wait(0.3),keypress(Q),wait(2.1),keypress(2),wait(0.3),keypress(E),wait(0.4),attack,wait(0.3),keypress(Q),wait(2.1),", - "locked": false + "type": "path", + "x": -635.974609375, + "y": 686.5751953125 }, { + "action": "", + "action_params": "", "id": 10, - "x": -814.5986328125, - "y": 673.32080078125, + "move_mode": "fly", "type": "path", - "move_mode": "walk", - "action": "combat_script", - "action_params": "attack,wait(0.3),keypress(3),wait(0.3),keypress(E),wait(0.3),attack(1),wait(0.3),keypress(Q),wait(2.1),keypress(4),wait(0.3),keypress(E),wait(0.3),attack(1),wait(0.3),keypress(Q),wait(1)," + "x": -638.828125, + "y": 686.16796875 }, { + "action": "stop_flying", + "action_params": "", "id": 11, - "x": -812.1103515625, - "y": 656.17529296875, - "type": "target", - "move_mode": "walk", - "action": "combat_script", - "action_params": "attack,wait(0.3),keypress(1),wait(0.3),keypress(E),wait(0.3),keypress(Q),wait(2.1),keypress(2),wait(0.3),keypress(E),wait(0.4),attack,wait(0.3),keypress(Q),wait(2.1),", - "locked": false + "move_mode": "fly", + "type": "path", + "x": -689.72265625, + "y": 678.259765625 }, { + "action": "", + "action_params": "", "id": 12, - "x": -812.1103515625, - "y": 656.17529296875, + "move_mode": "dash", "type": "path", - "move_mode": "walk", - "action": "combat_script", - "action_params": "attack,wait(0.3),keypress(3),wait(0.3),keypress(E),wait(0.3),attack(1),wait(0.3),keypress(Q),wait(2.1),keypress(4),wait(0.3),keypress(E),wait(0.3),attack(1),wait(0.3),keypress(Q),wait(1)," + "x": -759.0859375, + "y": 667.7080078125 }, { + "action": "", + "action_params": "", "id": 13, - "x": -826.2216796875, - "y": 661.57421875, + "move_mode": "dash", "type": "path", + "x": -798.8359375, + "y": 669.0166015625 + }, + { + "action": "", + "action_params": "", + "id": 14, "move_mode": "walk", + "type": "path", + "x": -810.14453125, + "y": 666.86572265625 + }, + { + "action": "combat_script", + "action_params": "keypress(F),wait(0.7),w(0.1),wait(0.3),keypress(F)", + "id": 15, + "move_mode": "walk", + "type": "target", + "x": -815.34375, + "y": 666.11328125 + }, + { "action": "fight", - "action_params": "" + "action_params": "", + "id": 16, + "move_mode": "jump", + "type": "path", + "x": -818.275390625, + "y": 662.67431640625 + }, + { + "action": "combat_script", + "action_params": "attack,wait(0.3),keypress(1),wait(0.3),keypress(E),wait(0.4),keypress(Q),wait(0.6),attack,wait(0.3),keypress(2),wait(0.3),keypress(E),wait(0.3),keypress(Q)", + "id": 17, + "locked": false, + "move_mode": "walk", + "type": "path", + "x": -812.24609375, + "y": 657 + }, + { + "action": "combat_script", + "action_params": "attack,wait(0.3),keypress(3),wait(0.3),keypress(E),wait(0.4),keypress(Q),wait(0.6),attack,wait(0.3),keypress(4),wait(0.3),keypress(E),wait(0.3),keypress(Q)", + "id": 18, + "move_mode": "walk", + "type": "path", + "x": -812.24609375, + "y": 657 + }, + { + "action": "combat_script", + "action_params": "attack,wait(0.3),keypress(1),wait(0.3),keypress(E),wait(0.4),keypress(Q),wait(0.6),attack,wait(0.3),keypress(2),wait(0.3),keypress(E),wait(0.3),keypress(Q)", + "id": 19, + "locked": false, + "move_mode": "walk", + "type": "path", + "x": -814.765625, + "y": 672.7841796875 + }, + { + "action": "combat_script", + "action_params": "attack,wait(0.3),keypress(3),wait(0.3),keypress(E),wait(0.4),keypress(Q),wait(0.6),attack,wait(0.3),keypress(4),wait(0.3),keypress(E),wait(0.3),keypress(Q)", + "id": 20, + "move_mode": "walk", + "type": "path", + "x": -814.765625, + "y": 672.7841796875 + }, + { + "action": "fight", + "action_params": "", + "id": 21, + "move_mode": "walk", + "type": "path", + "x": -821.861328125, + "y": 664.9912109375 } ] } \ No newline at end of file diff --git a/repo/js/AutoCommission/assets/攀高危险/奔狼领-1.json b/repo/js/AutoCommission/assets/攀高危险/奔狼领-1.json index f1ff07514..d846c2002 100644 --- a/repo/js/AutoCommission/assets/攀高危险/奔狼领-1.json +++ b/repo/js/AutoCommission/assets/攀高危险/奔狼领-1.json @@ -3,13 +3,13 @@ "authors": [ { "links": "", - "name": "星野" + "name": "1" } ], "bgi_version": "0.45.0", "description": "", "enable_monster_loot_split": false, - "last_modified_time": 1757315272020, + "last_modified_time": 1758606849257, "map_match_method": "", "map_name": "Teyvat", "name": "奔狼领-1", @@ -42,13 +42,50 @@ "id": 3, "move_mode": "walk", "type": "path", + "x": -490.92, + "y": 2221.81 + }, + { + "action": "", + "action_params": "", + "id": 4, + "move_mode": "walk", + "type": "path", + "x": -497.42, + "y": 2235.31 + }, + { + "action": "", + "action_params": "", + "id": 5, + "move_mode": "walk", + "type": "path", + "x": -510.79, + "y": 2235.68 + }, + { + "action": "", + "action_params": "", + "id": 6, + "move_mode": "walk", + "type": "path", "x": -508.29, "y": 2222.93 }, + { + "action": "combat_script", + "action_params": "attack(3),wait(0.3),keypress(1),wait(0.3),keypress(E),wait(0.4),keypress(Q),wait(0.6),attack(1),wait(0.3),keypress(2),wait(0.3),keypress(E),wait(0.3),keypress(Q)", + "id": 7, + "locked": false, + "move_mode": "walk", + "type": "path", + "x": -500.92, + "y": 2228.68 + }, { "action": "fight", "action_params": "", - "id": 4, + "id": 8, "move_mode": "walk", "type": "path", "x": -500.92, diff --git a/repo/js/AutoCommission/assets/攀高危险/奔狼领-2.json b/repo/js/AutoCommission/assets/攀高危险/奔狼领-2.json index 671b7357e..048d7ee4d 100644 --- a/repo/js/AutoCommission/assets/攀高危险/奔狼领-2.json +++ b/repo/js/AutoCommission/assets/攀高危险/奔狼领-2.json @@ -1,142 +1,162 @@ -{ +{ "info": { - "name": "奔狼领-2", - "type": "collect", - "author": "1", - "version": "", + "authors": [ + { + "links": "", + "name": "1" + } + ], + "bgi_version": "0.45.0", "description": "", - "bgi_version": "0.42.3" + "enable_monster_loot_split": false, + "last_modified_time": 1758606853328, + "map_match_method": "", + "map_name": "Teyvat", + "name": "奔狼领-2", + "tags": [], + "type": "collect", + "version": "" }, "positions": [ { + "action": "", "id": 1, + "move_mode": "dash", + "type": "teleport", "x": -200.99, - "y": 1861.85, - "action": "", - "move_mode": "dash", - "type": "teleport" + "y": 1861.85 }, { + "action": "", "id": 2, + "move_mode": "dash", + "type": "path", "x": -192.67, - "y": 1900.9, - "action": "", - "move_mode": "dash", - "type": "path" + "y": 1900.9 }, { + "action": "", "id": 3, + "move_mode": "run", + "type": "path", "x": -181.44, - "y": 1929.24, - "action": "", - "move_mode": "run", - "type": "path" + "y": 1929.24 }, { + "action": "", "id": 4, + "move_mode": "run", + "type": "path", "x": -173.08, - "y": 1948.51, - "action": "", - "move_mode": "run", - "type": "path" + "y": 1948.51 }, { + "action": "", "id": 5, + "move_mode": "dash", + "type": "path", "x": -164.96, - "y": 1966.61, - "action": "", - "move_mode": "dash", - "type": "path" + "y": 1966.61 }, { + "action": "", "id": 6, + "move_mode": "walk", + "type": "path", "x": -149.92, - "y": 1978.28, - "action": "", - "move_mode": "walk", - "type": "path" + "y": 1978.28 }, { + "action": "", "id": 7, + "move_mode": "run", + "type": "path", "x": -127.75, - "y": 1991.45, - "action": "", - "move_mode": "run", - "type": "path" + "y": 1991.45 }, { + "action": "", "id": 8, + "move_mode": "dash", + "type": "path", "x": -111.92, - "y": 2000.33, - "action": "", - "move_mode": "dash", - "type": "path" + "y": 2000.33 }, { + "action": "", "id": 9, - "x": -96.77, - "y": 2006.77, - "action": "", "move_mode": "dash", - "type": "path" + "type": "path", + "x": -96.77, + "y": 2006.77 }, { + "action": "", "id": 10, - "x": -86.85, - "y": 2010.63, - "action": "", "move_mode": "run", - "type": "path" + "type": "path", + "x": -86.85, + "y": 2010.63 }, { + "action": "", "id": 11, + "move_mode": "walk", + "type": "path", "x": -78.28, - "y": 2019.24, - "action": "", - "move_mode": "walk", - "type": "path" + "y": 2019.24 }, { + "action": "fight", + "action_params": "", "id": 12, + "move_mode": "walk", + "type": "path", "x": -63.1, - "y": 2038.01, - "action": "fight", - "move_mode": "walk", - "action_params": "", - "type": "path" + "y": 2038.01 }, { + "action": "", "id": 13, + "move_mode": "walk", + "type": "path", "x": -70.25, - "y": 2044.91, - "action": "", - "move_mode": "walk", - "type": "path" + "y": 2044.91 }, { + "action": "", "id": 14, + "move_mode": "walk", + "type": "path", "x": -65.8, - "y": 2048.8, - "action": "", - "move_mode": "walk", - "type": "path" + "y": 2048.8 }, { + "action": "combat_script", + "action_params": "attack(3.5),wait(0.3),keypress(1),wait(0.3),keypress(E),wait(0.4),keypress(Q),wait(0.6),attack,wait(0.3),keypress(2),wait(0.3),keypress(E),wait(0.3),keypress(Q)", "id": 15, - "x": -40.5, - "y": 2039.56, - "action": "fight", + "locked": false, "move_mode": "walk", - "action_params": "", - "type": "path" + "type": "path", + "x": -40.5, + "y": 2039.56 }, { + "action": "fight", + "action_params": "", "id": 16, - "x": -30.25, - "y": 2053.26, - "action": "", "move_mode": "walk", - "type": "path" + "type": "path", + "x": -40.5, + "y": 2039.56 + }, + { + "action": "", + "id": 17, + "move_mode": "walk", + "type": "path", + "x": -30.25, + "y": 2053.26 } ] } \ No newline at end of file diff --git a/repo/js/AutoCommission/assets/攀高危险/风啸山坡-2.json b/repo/js/AutoCommission/assets/攀高危险/风啸山坡-2.json index 26f40f9a7..92ad483dc 100644 --- a/repo/js/AutoCommission/assets/攀高危险/风啸山坡-2.json +++ b/repo/js/AutoCommission/assets/攀高危险/风啸山坡-2.json @@ -1,66 +1,139 @@ -{ +{ "info": { - "name": "风啸山坡-2", - "type": "collect", - "author": "1", - "version": "1.0", + "authors": [ + { + "links": "", + "name": "1" + } + ], + "bgi_version": "0.45.0", "description": "", - "bgi_version": "0.42.0" + "enable_monster_loot_split": false, + "last_modified_time": 1758608255056, + "map_match_method": "", + "map_name": "Teyvat", + "name": "风啸山坡-2", + "tags": [], + "type": "collect", + "version": "1.0" }, "positions": [ { - "id": 1, "action": "", + "action_params": "", + "id": 1, "move_mode": "walk", "type": "teleport", - "x": -1124.14, - "y": 1594.07, - "action_params": "" + "x": -1124.1399999999994, + "y": 1594.0699999999997 }, { + "action": "", + "action_params": "", "id": 2, - "action": "", "move_mode": "walk", "type": "path", - "x": -1154.64, - "y": 1591.32, - "action_params": "" + "x": -1134.50390625, + "y": 1587.55859375 }, { + "action": "", + "action_params": "", "id": 3, - "action": "fight", "move_mode": "walk", "type": "path", - "x": -1185.89, - "y": 1565.82, - "action_params": "" + "x": -1169.671875, + "y": 1575.46337890625 }, { - "id": 4, - "action": "fight", - "move_mode": "walk", - "type": "path", - "x": -1177.14, - "y": 1549.07, - "action_params": "" - }, - { - "id": 5, "action": "", - "move_mode": "walk", + "action_params": "", + "id": 4, + "move_mode": "dash", "type": "path", - "x": -1184.14, - "y": 1549.57, - "action_params": "" + "x": -1175.787109375, + "y": 1564.94873046875 }, { - "id": 6, "action": "fight", + "action_params": "", + "id": 5, + "move_mode": "dash", + "type": "path", + "x": -1185.7504068637718, + "y": 1557.374678761591 + }, + { + "action": "", + "action_params": "", + "id": 6, + "move_mode": "walk", + "type": "orientation", + "x": -1174.1923828125, + "y": 1536.65234375 + }, + { + "action": "combat_script", + "action_params": "attack(4),wait(0.35),keypress(1),wait(0.3),keypress(E),wait(0.3),keypress(2),wait(0.35),keypress(E)", + "id": 7, + "move_mode": "dash", + "type": "target", + "x": -1177.93359375, + "y": 1545.46337890625 + }, + { + "action": "fight", + "action_params": "", + "id": 8, + "move_mode": "walk", + "type": "target", + "x": -1177.93359375, + "y": 1545.46337890625 + }, + { + "action": "combat_script", + "action_params": "attack(3.5),wait(0.3),keypress(3),wait(0.3),keypress(E),wait(0.3),keypress(4),wait(0.3),keypress(E)", + "id": 9, + "move_mode": "walk", + "type": "target", + "x": -1177.93359375, + "y": 1545.46337890625 + }, + { + "action": "", + "action_params": "", + "id": 10, "move_mode": "walk", "type": "path", - "x": -1180.14, - "y": 1565.32, - "action_params": "" + "x": -1187.9609375, + "y": 1549.5 + }, + { + "action": "", + "action_params": "", + "id": 11, + "move_mode": "walk", + "type": "orientation", + "x": -1186.6455078125, + "y": 1560.61572265625 + }, + { + "action": "combat_script", + "action_params": "attack(5.5),wait(0.3),keypress(1),wait(0.3),keypress(E),wait(0.3),keypress(2),keypress(E)", + "id": 12, + "move_mode": "walk", + "type": "target", + "x": -1187.2685546875, + "y": 1553.9638671875 + }, + { + "action": "combat_script", + "action_params": "attack(5.5),wait(0.3),keypress(3),wait(0.3),keypress(E),wait(0.3),keypress(4),keypress(E)", + "id": 13, + "move_mode": "walk", + "type": "target", + "x": -1187.2685546875, + "y": 1553.9638671875 } ] } \ No newline at end of file diff --git a/repo/js/AutoCommission/constants.js b/repo/js/AutoCommission/constants.js index 8848ea96a..2036698fd 100644 --- a/repo/js/AutoCommission/constants.js +++ b/repo/js/AutoCommission/constants.js @@ -1,8 +1,8 @@ // 原神每日委托自动执行脚本 - 常量定义模块 var Constants = { // 版本和编译信息 - VERSION: "0.98.6", - BUILD_TIME: "2025.09.26", + VERSION: "0.98.7", + BUILD_TIME: "2025.09.29", // 文件路径常量 SUPPORT_LIST_PATH: "name.json", diff --git a/repo/js/AutoCommission/lib/dialog-processor.js b/repo/js/AutoCommission/lib/dialog-processor.js index 75b39629f..319541fd1 100644 --- a/repo/js/AutoCommission/lib/dialog-processor.js +++ b/repo/js/AutoCommission/lib/dialog-processor.js @@ -164,7 +164,7 @@ var DialogProcessor = { repetition = 0; } oldcount = ocrResults.count; - if (repetition >= 5 && !isInMainUI()) { + if (repetition >= 5) { log.info("连续5次选项数量一样，执行F跳过"); keyPress("F"); repetition = 0; @@ -191,48 +191,9 @@ var DialogProcessor = { } // 如果没有找到优先选项，则使用默认跳过 - if (!foundPriorityOption && !isInMainUI()) { - let exitList = await Utils.easyTemplateMatch( - Constants.TALK_EXIT_IMAGE_PATH, - dialogRegion, - (useMask = true) - ); - let iconList = await Utils.easyTemplateMatch( - Constants.TALK_ICON_IMAGE_PATH, - dialogRegion - ); - let clickXY = null; - //正常应该只识别到一个退出选项，如果识别到多个，则去点击气泡对话选项 - if (exitList.count === 1) { - log.info("发现一个退出对话选项"); - clickXY = [exitList[0].x, exitList[0].y]; - - //点击最下边的气泡选项 - } else if (iconList.count > 0) { - log.info( - `发现{count}个气泡对话选项，点击最后一个`, - iconList.count - ); - iconList = [...iconList]; - iconList.sort((a, b) => b.y - a.y); - clickXY = [iconList[0].x, iconList[0].y]; - } else { - log.warn("指定类型的对话选项不符合数量条件，不进行操作"); - log.warn( - `退出图标：{exit}个，气泡图标：{icon}个`, - exitList.count, - iconList.count - ); - } - - //点击对话选项 - if (clickXY) { - keyDown("VK_MENU"); - await sleep(300); - click(...clickXY); - leftButtonClick(); - keyUp("VK_MENU"); - } + if (!foundPriorityOption) { + keyPress("F"); + await sleep(100); } } } diff --git a/repo/js/AutoCommission/manifest.json b/repo/js/AutoCommission/manifest.json index fe6acf868..bda587874 100644 --- a/repo/js/AutoCommission/manifest.json +++ b/repo/js/AutoCommission/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 1, "name": "(对话+成就)全自动蒙德地区每日委托", - "version": "0.98.6", + "version": "0.98.7", "tags": ["委托","对话","战斗","成就","历练点"], "description": "自动完成每日委托、自动识别委托内容、自动追踪战斗委托、自动完成对话委托、自动获得到隐藏成就。使用前请阅读README.md获取详细说明和常见问题解答。目前项目急需人手,有意者可加群。感谢云闲vsv & 换苏伟u & 小鹰划船不用桨 & 塔台 & 未知_ 的共同开发", "authors": [