diff --git a/repo/combat/0命龙王净土副本(茜芙龙草).txt b/repo/combat/0命龙王净土副本(茜芙龙草).txt index 8841c376..8d2729c9 100644 --- a/repo/combat/0命龙王净土副本(茜芙龙草).txt +++ b/repo/combat/0命龙王净土副本(茜芙龙草).txt @@ -1,8 +1,9 @@ -// 作者:LX666-666 -// 描述:最好1命龙,冻绽放yyds +// 作者:星野 +// 描述:适合零命龙王纳塔虹灵的净土副本,稳定36秒,奶奶带祭礼保证冻结,利用冻结打断敌人攻击,保证龙王不被打断,测试配置0命金珀龙0命灰河芙0命祭礼奶 那维莱特 walk(w,0.7),e -茜特菈莉 wait(1.5),e,q,e +茜特菈莉 wait(1.5),e,q 芙宁娜 e,q -纳西妲 e(hold),e +茜特菈莉 e +纳西妲 e 那维莱特 e,q,charge(3),charge(3),charge(3) \ No newline at end of file diff --git a/repo/combat/自动委托(茜芙龙万).txt b/repo/combat/自动委托(茜芙龙万).txt new file mode 100644 index 00000000..42e4e9b5 --- /dev/null +++ b/repo/combat/自动委托(茜芙龙万).txt @@ -0,0 +1,8 @@ +// 作者:星野 +// 描述:自动委托战斗脚本,芙请换成黑芙,奶奶最好带祭礼 + +那维莱特 e +茜特菈莉 e,q,e +芙宁娜 e,q +枫原万叶 e,attack,q +那维莱特 e,q,charge(3),charge(3),charge(3) \ No newline at end of file diff --git a/repo/combat/自动委托(超绽放).txt b/repo/combat/自动委托(超绽放).txt new file mode 100644 index 00000000..d84bd1d7 --- /dev/null +++ b/repo/combat/自动委托(超绽放).txt @@ -0,0 +1,8 @@ +// 作者:星野 +// 描述:自动委托战斗脚本,芙请换成黑芙,奶奶最好带祭礼 + +茜特菈莉 e,q,e +纳西妲 e(hold),wait(0.3),q +芙宁娜 e,wait(0.3),q +久岐忍 e,wait(0.3),q +纳西妲 attack(3) \ No newline at end of file diff --git a/repo/combat/自动委托(龙芙草久).txt b/repo/combat/自动委托(龙芙草久).txt new file mode 100644 index 00000000..436ca915 --- /dev/null +++ b/repo/combat/自动委托(龙芙草久).txt @@ -0,0 +1,8 @@ +// 作者:星野 +// 描述:自动委托战斗脚本,芙请换成黑芙 + +那维莱特 e +纳西妲 e(hold),wait(0.3),q +芙宁娜 e,q +久岐忍 e,q +那维莱特 e,q,charge(3),charge(3),charge(3) \ No newline at end of file diff --git a/repo/combat/自动委托(龙草冻绽放).txt b/repo/combat/自动委托(龙草冻绽放).txt new file mode 100644 index 00000000..e239adb6 --- /dev/null +++ b/repo/combat/自动委托(龙草冻绽放).txt @@ -0,0 +1,8 @@ +// 作者:星野 +// 描述:自动委托战斗脚本,芙请换成黑芙,奶奶最好带祭礼 + +那维莱特 e +茜特菈莉 e,q,e +芙宁娜 e,q +纳西妲 e(hold),wait(0.3),q +那维莱特 e,q,charge(3),charge(3),charge(3) \ No newline at end of file diff --git a/repo/js/AutoEntrust/Data/commissions_data.json b/repo/js/AutoEntrust/Data/commissions_data.json index 5af7c770..d0bf112b 100644 --- a/repo/js/AutoEntrust/Data/commissions_data.json +++ b/repo/js/AutoEntrust/Data/commissions_data.json @@ -1,29 +1,29 @@ { - "timestamp": "2025-05-05T09:38:31.853Z", + "timestamp": "2025-05-09T12:48:45.688Z", "commissions": [ { "id": 1, - "name": "丘丘人的一小步", - "supported": true, - "location": "鹰翔海滩" + "name": "纳西妲世界第一可爱", + "supported": false, + "location": "须弥" }, { "id": 2, - "name": "圆滚滚的易爆品", - "supported": true, - "location": "坠星山谷" + "name": "纳西妲世界第一可爱", + "supported": false, + "location": "须弥" }, { "id": 3, - "name": "临危受命", - "supported": true, - "location": "千风神殿" + "name": "纳西妲世界第一可爱", + "supported": false, + "location": "须弥" }, { "id": 4, - "name": "餐品订单", + "name": "纳西妲世界第一可爱", "supported": false, - "location": "蒙德城" + "location": "须弥" } ] } \ No newline at end of file diff --git a/repo/js/AutoEntrust/README.md b/repo/js/AutoEntrust/README.md index b58d2407..b607ee3f 100644 --- a/repo/js/AutoEntrust/README.md +++ b/repo/js/AutoEntrust/README.md @@ -10,11 +10,14 @@ ## 更新日志 -### 当前版本：0.92 +### 当前版本：0.93 +- 修复已知问题 + +### 上一版本：0.92 - 修复部分路径命名错误 - 修复第4个委托识别失败 -### 当前版本：0.91 +### 上一版本：0.91 - 修改寻路功能改为两条路径都尝试一遍 - 修复委托已完成退出错误 - 增加输入检测 @@ -33,5 +36,10 @@ - 战斗的队伍名称 3. 常见问题:1.Q:明明这个地方没有委托，却跑回去打怪。A:脚本是这样写的，未来会增加检测功能，优化脚本。2.Q:为什么有的蒙德打怪委托未完成？A:因为请将脚本data/文件夹下面的数据,log/日志下今日日志，每日委托任务截图。反馈给3302871403 +## 主要功能 +- 1.加3302871403QQ好友 +- 2.发送截图,日志给3302871403@qq.com +- 3.加bgi v8群@星野（bgi v7群也可以） + ## 注意事项 - 部分委托可能无法正确识别或追踪，遇到问题请手动完成 diff --git a/repo/js/AutoEntrust/assets/丘丘人的一小步/低语森林-1.json b/repo/js/AutoEntrust/assets/丘丘人的一小步/低语森林-1.json index 92cb6e76..de9df306 100644 --- a/repo/js/AutoEntrust/assets/丘丘人的一小步/低语森林-1.json +++ b/repo/js/AutoEntrust/assets/丘丘人的一小步/低语森林-1.json @@ -1,152 +1,38 @@ { "info": { - "name": "苍风高地南侧-丘丘人的一小步+圆滚滚易爆品4", + "name": "低语森林-1", "type": "collect", - "author": "1", + "author": "LX666-666", "version": "1.0", "description": "", - "bgiVersion": "0.35.1" + "bgiVersion": "0.42.3" }, "positions": [ { "id": 1, - "x": -601.4267910651051, - "y": 1842.75, "action": "", "move_mode": "walk", - "type": "teleport" + "type": "teleport", + "x": -1332, + "y": 2559.5, + "action_params": "" }, { "id": 2, - "x": -627.875397257787, - "y": 1820.25, "action": "", - "move_mode": "walk", - "action_params": "", - "type": "path" + "move_mode": "fly", + "type": "path", + "x": -1296.5, + "y": 2549, + "action_params": "" }, { "id": 3, - "x": -645.5177063470437, - "y": 1810.125, - "action": "", - "move_mode": "walk", - "action_params": "", - "type": "path" - }, - { - "id": 4, - "x": -656.0011350222467, - "y": 1801, - "action": "", - "move_mode": "run", - "type": "path" - }, - { - "id": 5, - "x": -668.0009931444656, - "y": 1789, "action": "fight", - "move_mode": "walk", - "action_params": "", - "type": "path" - }, - { - "id": 6, - "x": -673.4395714155999, - "y": 1782.5625, - "action": "fight", - "move_mode": "walk", - "action_params": "", - "type": "path" - }, - { - "id": 7, - "x": -687.999091982203, - "y": 1783.75, - "action": "", "move_mode": "run", - "type": "path" - }, - { - "id": 8, - "x": -715.7503405066745, - "y": 1764, - "action": "", - "move_mode": "run", - "type": "path" - }, - { - "id": 9, - "x": -731.9997729955503, - "y": 1752.5, - "action": "", - "move_mode": "run", - "type": "path" - }, - { - "id": 10, - "x": -765.7448923998909, - "y": 1754, - "action": "", - "move_mode": "run", - "type": "path" - }, - { - "id": 11, - "x": -795.4900118042315, - "y": 1752.75, - "action": "", - "move_mode": "run", - "type": "path" - }, - { - "id": 12, - "x": -810.9973894488339, - "y": 1719.25, - "action": "", - "move_mode": "run", - "type": "path" - }, - { - "id": 13, - "x": -815.0074911468273, - "y": 1684.25, - "action": "", - "move_mode": "run", - "type": "path" - }, - { - "id": 14, - "x": -812.2463679288121, - "y": 1659, - "action": "", - "move_mode": "walk", - "type": "path" - }, - { - "id": 15, - "x": -793.6370652864789, - "y": 1651.5, - "action": "", - "move_mode": "walk", - "type": "path" - }, - { - "id": 16, - "x": -760, - "y": 1649.5, - "action": "fight", - "move_mode": "walk", - "type": "target" - }, - { - "id": 17, - "x": -767.25, - "y": 1643.5, "type": "path", - "move_mode": "walk", - "action": "fight", + "x": -1108.625, + "y": 2459.375, "action_params": "" } ] diff --git a/repo/js/AutoEntrust/assets/临危受命/覆雪之路-1.json b/repo/js/AutoEntrust/assets/临危受命/覆雪之路-1.json new file mode 100644 index 00000000..1108f88e --- /dev/null +++ b/repo/js/AutoEntrust/assets/临危受命/覆雪之路-1.json @@ -0,0 +1,28 @@ +{ + "info": { + "name": "球球王，临危受命", + "type": "collect", + "author": "", + "version": "1.0", + "description": "", + "bgiVersion": "0.35.1" + }, + "positions": [ + { + "id": 1, + "action": "", + "move_mode": "walk", + "type": "teleport", + "x": -1025.4448379188234, + "y": 1321.75 + }, + { + "id": 2, + "action": "fight", + "move_mode": "walk", + "type": "path", + "x": -1050.1836011985833, + "y": 1304.75 + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoEntrust/assets/攀高危险/坠星山谷-.json b/repo/js/AutoEntrust/assets/攀高危险/坠星山谷-.json new file mode 100644 index 00000000..25eec066 --- /dev/null +++ b/repo/js/AutoEntrust/assets/攀高危险/坠星山谷-.json @@ -0,0 +1,118 @@ +{ + "info": { + "name": "", + "type": "collect", + "author": "1", + "version": "", + "description": "", + "bgiVersion": "0.42.3" + }, + "positions": [ + { + "id": 1, + "x": -1330.1259765625, + "y": 2563.9345703125, + "action": "", + "move_mode": "walk", + "type": "teleport" + }, + { + "id": 2, + "x": -1333.1416015625, + "y": 2553.201416015625, + "action": "", + "move_mode": "walk", + "type": "path" + }, + { + "id": 3, + "x": -1326.80078125, + "y": 2528.472412109375, + "action": "", + "move_mode": "walk", + "type": "path" + }, + { + "id": 4, + "x": -1309.8095703125, + "y": 2495.436767578125, + "action": "", + "move_mode": "walk", + "type": "path" + }, + { + "id": 5, + "x": -1299.0400390625, + "y": 2483.9990234375, + "action": "", + "move_mode": "walk", + "type": "path" + }, + { + "id": 6, + "x": -1288.671875, + "y": 2468.27001953125, + "action": "", + "move_mode": "walk", + "type": "path" + }, + { + "id": 7, + "x": -1284.498046875, + "y": 2457.3017578125, + "action": "", + "move_mode": "walk", + "type": "path" + }, + { + "id": 8, + "x": -1284.0712890625, + "y": 2443.161376953125, + "action": "", + "move_mode": "walk", + "type": "path" + }, + { + "id": 9, + "x": -1281.72265625, + "y": 2435.364990234375, + "action": "fight", + "move_mode": "walk", + "action_params": "", + "type": "path" + }, + { + "id": 10, + "x": -1277.1962890625, + "y": 2429.894287109375, + "action": "", + "move_mode": "walk", + "type": "path" + }, + { + "id": 11, + "x": -1259.9453125, + "y": 2430.3662109375, + "action": "fight", + "move_mode": "walk", + "action_params": "", + "type": "path" + }, + { + "id": 12, + "x": -1254.6484375, + "y": 2432.4619140625, + "action": "", + "move_mode": "walk", + "type": "path" + }, + { + "id": 13, + "x": -1256.115234375, + "y": 2440.033203125, + "action": "", + "move_mode": "walk", + "type": "path" + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoEntrust/assets/攀高危险/坠星山谷-1.json b/repo/js/AutoEntrust/assets/攀高危险/坠星山谷-1.json index 25eec066..49ae0d35 100644 --- a/repo/js/AutoEntrust/assets/攀高危险/坠星山谷-1.json +++ b/repo/js/AutoEntrust/assets/攀高危险/坠星山谷-1.json @@ -10,106 +10,92 @@ "positions": [ { "id": 1, - "x": -1330.1259765625, - "y": 2563.9345703125, - "action": "", - "move_mode": "walk", + "x": -1536.748046875, + "y": 1978.66064453125, + "action": "stop_flying", + "move_mode": "fly", + "action_params": "", "type": "teleport" }, { "id": 2, - "x": -1333.1416015625, - "y": 2553.201416015625, - "action": "", - "move_mode": "walk", + "x": -1531.8544921875, + "y": 1989.931640625, + "action": "stop_flying", + "move_mode": "fly", + "action_params": "", "type": "path" }, { "id": 3, - "x": -1326.80078125, - "y": 2528.472412109375, + "x": -1518.408203125, + "y": 1993.5244140625, "action": "", - "move_mode": "walk", + "move_mode": "run", "type": "path" }, { "id": 4, - "x": -1309.8095703125, - "y": 2495.436767578125, + "x": -1506.5390625, + "y": 1996.80615234375, "action": "", "move_mode": "walk", "type": "path" }, { "id": 5, - "x": -1299.0400390625, - "y": 2483.9990234375, + "x": -1499.138671875, + "y": 1998.91943359375, "action": "", "move_mode": "walk", "type": "path" }, { "id": 6, - "x": -1288.671875, - "y": 2468.27001953125, - "action": "", + "x": -1492.2099609375, + "y": 1999.458984375, + "action": "fight", "move_mode": "walk", + "action_params": "", "type": "path" }, { "id": 7, - "x": -1284.498046875, - "y": 2457.3017578125, + "x": -1501.3818359375, + "y": 1991.93896484375, "action": "", "move_mode": "walk", "type": "path" }, { "id": 8, - "x": -1284.0712890625, - "y": 2443.161376953125, + "x": -1488.1494140625, + "y": 1990.18408203125, "action": "", "move_mode": "walk", "type": "path" }, { "id": 9, - "x": -1281.72265625, - "y": 2435.364990234375, - "action": "fight", + "x": -1478.8046875, + "y": 1988.1220703125, + "action": "", "move_mode": "walk", - "action_params": "", "type": "path" }, { "id": 10, - "x": -1277.1962890625, - "y": 2429.894287109375, - "action": "", - "move_mode": "walk", - "type": "path" - }, - { - "id": 11, - "x": -1259.9453125, - "y": 2430.3662109375, + "x": -1470.0712890625, + "y": 1977.84423828125, "action": "fight", "move_mode": "walk", "action_params": "", "type": "path" }, { - "id": 12, - "x": -1254.6484375, - "y": 2432.4619140625, - "action": "", - "move_mode": "walk", - "type": "path" - }, - { - "id": 13, - "x": -1256.115234375, - "y": 2440.033203125, + "id": 11, + "x": -1471.990234375, + "y": 1998.48681640625, "action": "", "move_mode": "walk", "type": "path" diff --git a/repo/js/AutoEntrust/main.js b/repo/js/AutoEntrust/main.js index 7f278ab3..aca15d7e 100644 --- a/repo/js/AutoEntrust/main.js +++ b/repo/js/AutoEntrust/main.js @@ -47,6 +47,7 @@ async function prepareForLeyLineRun(settings) { // 开局传送到七天神像 + await genshin.returnMainUi() await genshin.tpToStatueOfTheSeven(); // 切换战斗队伍 @@ -498,11 +499,10 @@ } else if (detailStatus === "未知" || detailStatus === "错误") { log.warn("无法确认是否进入详情界面，尝试继续执行"); // 尝试识别委托地点 - const location = recognizeCommissionLocation(); - commission.location = location; - log.info("委托 {name} 的地点: {location}", commission.name,commission.location); + location = recognizeCommissionLocation(); + fourthCommission.location = location; + log.info("委托 {name} 的地点: {location}", fourthCommission.name, location); } else { - log.info("1"); location = recognizeCommissionLocation(); fourthCommission.location = location; log.info("委托 {name} 的地点: {location}", fourthCommission.name, location); diff --git a/repo/js/AutoEntrust/manifest.json b/repo/js/AutoEntrust/manifest.json index d41ba179..57b659be 100644 --- a/repo/js/AutoEntrust/manifest.json +++ b/repo/js/AutoEntrust/manifest.json @@ -1,9 +1,9 @@ { "manifest_version": 1, "name": "(Beta)全自动寻路蒙德地区每日委托", - "version": "0.92", - "bgi_version": "0.44.7", - "description": "基于BetterGI的原神自动化脚本，可自动识别每日委托内容、OCR识别委托地点和状态、自动追踪委托路径。目前支持蒙德地区委托，未来将支持全国家委托。使用前请阅读README.md获取详细说明和常见问题解答。如果发生错误，如不支持的战斗委托，请将脚本data/文件夹下面的数据,log/日志下今日日志，每日委托任务尽量包含地点截图。反馈给3302871403", + "version": "0.93", + "bgi_version": "0.44.3", + "description": "基于BetterGI的原神自动化脚本，可自动识别每日委托内容、OCR识别委托地点和状态、自动追踪委托路径。目前支持蒙德地区委托，未来将支持全国家委托。使用前请阅读README.md（可用记事本打开）获取详细说明和常见问题解答。如果发生错误，如不支持的战斗委托，请将脚本data/文件夹下面的数据,log/日志下今日日志，每日委托任务包含地点截图。反馈给作者反馈方法1.加3302871403QQ好友2.发送截图,日志给3302871403@qq.com3.加bgi v8群@星野（bgi v7群也可以）", "authors": [ { "name": "LX666-666,换苏伟u",