diff --git a/repo/js/AutoEntrust/README.md b/repo/js/AutoEntrust/README.md index b607ee3f..900f3f76 100644 --- a/repo/js/AutoEntrust/README.md +++ b/repo/js/AutoEntrust/README.md @@ -1,7 +1,7 @@ # 原神自动化脚本集合 ## 项目简介 -本项目是一个基于BetterGI的原神自动化脚本集合，主要功能包括自动完成每日委托、自动识别委托内容、自动追踪委托路径等。路径追踪脚本由换苏伟u大佬提供。未来准备支持全国家的每日委托，需要对话的委托来自动刷取成就奖励。 +本项目是一个基于BetterGI的原神自动化脚本集合，主要功能包括自动完成每日委托、自动识别委托内容、自动追踪委托路径等。路径追踪脚本由换苏伟u大佬提供。未来准备支持全国家的每日委托，需要对话的委托来自动刷取成就奖励。目前项目正处于初级阶段急需人手,有意者请加作者QQ好友（会在地图上标点即可）。 ## 主要功能 - 自动识别每日委托内容 @@ -10,7 +10,11 @@ ## 更新日志 -### 当前版本：0.93 +### 当前版本：0.94 +- 修复攀高危险问题 +- 新建了对话委托的文件夹 + +### 上一版本：0.93 - 修复已知问题 ### 上一版本：0.92 @@ -43,3 +47,7 @@ ## 注意事项 - 部分委托可能无法正确识别或追踪，遇到问题请手动完成 +- 推荐关闭自动战斗-自动拾取掉落物，避免浪费大量时间 + +## 项目贡献者 +- 星野,换苏伟u diff --git a/repo/js/AutoEntrust/assets/process/语言交流/process.json b/repo/js/AutoEntrust/assets/process/语言交流/process.json new file mode 100644 index 00000000..7c2120a4 --- /dev/null +++ b/repo/js/AutoEntrust/assets/process/语言交流/process.json @@ -0,0 +1,7 @@ +语言交流-1.json +F +语言交流-2.json +F +语言交流-3.json +语言交流-4.json +F \ No newline at end of file diff --git a/repo/js/AutoEntrust/assets/process/语言交流/语言交流-1.json b/repo/js/AutoEntrust/assets/process/语言交流/语言交流-1.json new file mode 100644 index 00000000..4aa190ef --- /dev/null +++ b/repo/js/AutoEntrust/assets/process/语言交流/语言交流-1.json @@ -0,0 +1,30 @@ +{ + "info": { + "name": "语言交流-1", + "type": "collect", + "author": "LX666-666", + "version": "1.0", + "description": "", + "bgiVersion": "0.42.3" + }, + "positions": [ + { + "id": 1, + "action": "", + "move_mode": "walk", + "type": "teleport", + "x": -1558.7587890625, + "y": 2495.6064453125, + "action_params": "" + }, + { + "id": 2, + "x": -1526.3173828125, + "y": 2498.93212890625, + "type": "target", + "move_mode": "walk", + "action": "", + "action_params": "" + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoEntrust/assets/process/语言交流/语言交流-2.json b/repo/js/AutoEntrust/assets/process/语言交流/语言交流-2.json new file mode 100644 index 00000000..168d43f6 --- /dev/null +++ b/repo/js/AutoEntrust/assets/process/语言交流/语言交流-2.json @@ -0,0 +1,30 @@ +{ + "info": { + "name": "语言交流-2", + "type": "collect", + "author": "LX666-666", + "version": "1.0", + "description": "", + "bgiVersion": "0.42.3" + }, + "positions": [ + { + "id": 1, + "x": -1526.9365234375, + "y": 2498.802001953125, + "type": "path", + "move_mode": "walk", + "action": "", + "action_params": "" + }, + { + "id": 2, + "x": -1527.57421875, + "y": 2479.588134765625, + "type": "target", + "move_mode": "walk", + "action": "", + "action_params": "" + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoEntrust/assets/process/语言交流/语言交流-3.json b/repo/js/AutoEntrust/assets/process/语言交流/语言交流-3.json new file mode 100644 index 00000000..5cfecaba --- /dev/null +++ b/repo/js/AutoEntrust/assets/process/语言交流/语言交流-3.json @@ -0,0 +1,39 @@ +{ + "info": { + "name": "语言交流-3", + "type": "collect", + "author": "LX666-666", + "version": "1.0", + "description": "", + "bgiVersion": "0.42.3" + }, + "positions": [ + { + "id": 1, + "x": -1527.5419921875, + "y": 2480.11181640625, + "action": "", + "move_mode": "walk", + "action_params": "", + "type": "path" + }, + { + "id": 2, + "x": -1513.6279296875, + "y": 2478.95361328125, + "action": "", + "move_mode": "walk", + "action_params": "", + "type": "path" + }, + { + "id": 3, + "x": -1514.599609375, + "y": 2472.046875, + "action": "fight", + "move_mode": "walk", + "action_params": "", + "type": "target" + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoEntrust/assets/process/语言交流/语言交流-4.json b/repo/js/AutoEntrust/assets/process/语言交流/语言交流-4.json new file mode 100644 index 00000000..d1e5f3b8 --- /dev/null +++ b/repo/js/AutoEntrust/assets/process/语言交流/语言交流-4.json @@ -0,0 +1,21 @@ +{ + "info": { + "name": "语言交流-4", + "type": "collect", + "author": "LX666-666", + "version": "1.0", + "description": "", + "bgiVersion": "0.42.3" + }, + "positions": [ + { + "id": 1, + "x": -1514.599609375, + "y": 2472.046875, + "type": "target", + "move_mode": "walk", + "action": "", + "action_params": "" + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoEntrust/assets/process/说到做到/process.json b/repo/js/AutoEntrust/assets/process/说到做到/process.json new file mode 100644 index 00000000..3eeee4d3 --- /dev/null +++ b/repo/js/AutoEntrust/assets/process/说到做到/process.json @@ -0,0 +1,6 @@ +说到做到-1.json +F +去山底 +说到做到-1.json +说到做到-2.json +F \ No newline at end of file diff --git a/repo/js/AutoEntrust/assets/process/说到做到/说到做到-1.json b/repo/js/AutoEntrust/assets/process/说到做到/说到做到-1.json new file mode 100644 index 00000000..b8ca4118 --- /dev/null +++ b/repo/js/AutoEntrust/assets/process/说到做到/说到做到-1.json @@ -0,0 +1,76 @@ +{ + "info": { + "name": "说到做到-1", + "type": "collect", + "author": "LX666-666", + "version": "1.0", + "description": "", + "bgiVersion": "0.42.3" + }, + "positions": [ + { + "id": 1, + "x": -1136, + "y": 1589, + "action": "", + "move_mode": "walk", + "action_params": "", + "type": "teleport" + }, + { + "id": 2, + "x": -1142.5, + "y": 1623.5, + "action": "", + "move_mode": "dash", + "action_params": "", + "type": "path" + }, + { + "id": 3, + "x": -1097, + "y": 1647.75, + "action": "", + "move_mode": "dash", + "action_params": "", + "type": "path" + }, + { + "id": 4, + "x": -1079.5, + "y": 1666.75, + "action": "", + "move_mode": "dash", + "action_params": "", + "type": "path" + }, + { + "id": 5, + "x": -1091.875, + "y": 1767.5, + "action": "", + "move_mode": "dash", + "action_params": "", + "type": "path" + }, + { + "id": 6, + "x": -1094.125, + "y": 1775.375, + "action": "stop_flying", + "move_mode": "fly", + "action_params": "", + "type": "path", + "locked": false + }, + { + "id": 7, + "x": -1088.517578125, + "y": 1770.88134765625, + "type": "target", + "move_mode": "walk", + "action": "", + "action_params": "" + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoEntrust/assets/process/说到做到/说到做到-2.json b/repo/js/AutoEntrust/assets/process/说到做到/说到做到-2.json new file mode 100644 index 00000000..baf1348a --- /dev/null +++ b/repo/js/AutoEntrust/assets/process/说到做到/说到做到-2.json @@ -0,0 +1,53 @@ +{ + "info": { + "name": "说到做到-2", + "type": "collect", + "author": "LX666-666", + "version": "1.0", + "description": "", + "bgiVersion": "0.42.3" + }, + "positions": [ + { + "id": 1, + "x": -1131.666015625, + "y": 1597.25390625, + "action": "", + "move_mode": "dash", + "action_params": "", + "type": "teleport" + }, + { + "id": 2, + "x": -1155.25, + "y": 1628, + "type": "path", + "move_mode": "dash" + }, + { + "id": 3, + "x": -1186.5, + "y": 1648, + "type": "path", + "move_mode": "fly" + }, + { + "id": 4, + "x": -1198.5, + "y": 1654.75, + "type": "path", + "move_mode": "fly", + "action": "stop_flying", + "action_params": "" + }, + { + "id": 5, + "x": -1192.25, + "y": 1645, + "action": "fight", + "move_mode": "walk", + "action_params": "", + "type": "path" + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoEntrust/assets/攀高危险/坠星山谷-2.json b/repo/js/AutoEntrust/assets/攀高危险/坠星山谷-2.json index 49ae0d35..25eec066 100644 --- a/repo/js/AutoEntrust/assets/攀高危险/坠星山谷-2.json +++ b/repo/js/AutoEntrust/assets/攀高危险/坠星山谷-2.json @@ -10,92 +10,106 @@ "positions": [ { "id": 1, - "x": -1536.748046875, - "y": 1978.66064453125, - "action": "stop_flying", - "move_mode": "fly", - "action_params": "", + "x": -1330.1259765625, + "y": 2563.9345703125, + "action": "", + "move_mode": "walk", "type": "teleport" }, { "id": 2, - "x": -1531.8544921875, - "y": 1989.931640625, - "action": "stop_flying", - "move_mode": "fly", - "action_params": "", + "x": -1333.1416015625, + "y": 2553.201416015625, + "action": "", + "move_mode": "walk", "type": "path" }, { "id": 3, - "x": -1518.408203125, - "y": 1993.5244140625, + "x": -1326.80078125, + "y": 2528.472412109375, "action": "", - "move_mode": "run", + "move_mode": "walk", "type": "path" }, { "id": 4, - "x": -1506.5390625, - "y": 1996.80615234375, + "x": -1309.8095703125, + "y": 2495.436767578125, "action": "", "move_mode": "walk", "type": "path" }, { "id": 5, - "x": -1499.138671875, - "y": 1998.91943359375, + "x": -1299.0400390625, + "y": 2483.9990234375, "action": "", "move_mode": "walk", "type": "path" }, { "id": 6, - "x": -1492.2099609375, - "y": 1999.458984375, - "action": "fight", + "x": -1288.671875, + "y": 2468.27001953125, + "action": "", "move_mode": "walk", - "action_params": "", "type": "path" }, { "id": 7, - "x": -1501.3818359375, - "y": 1991.93896484375, + "x": -1284.498046875, + "y": 2457.3017578125, "action": "", "move_mode": "walk", "type": "path" }, { "id": 8, - "x": -1488.1494140625, - "y": 1990.18408203125, + "x": -1284.0712890625, + "y": 2443.161376953125, "action": "", "move_mode": "walk", "type": "path" }, { "id": 9, - "x": -1478.8046875, - "y": 1988.1220703125, - "action": "", - "move_mode": "walk", - "type": "path" - }, - { - "id": 10, - "x": -1470.0712890625, - "y": 1977.84423828125, + "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": -1471.990234375, - "y": 1998.48681640625, + "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" diff --git a/repo/js/AutoEntrust/assets/攀高危险/奔狼领-1.json b/repo/js/AutoEntrust/assets/攀高危险/奔狼领-1.json index ad0e3de6..c5be04ba 100644 --- a/repo/js/AutoEntrust/assets/攀高危险/奔狼领-1.json +++ b/repo/js/AutoEntrust/assets/攀高危险/奔狼领-1.json @@ -1,38 +1,74 @@ { "info": { - "name": "奔狼领-1.json", + "name": "D6-果酒湖攀高危险", "type": "collect", - "author": "LX666-666", + "author": "1", "version": "1.0", "description": "", - "bgiVersion": "0.42.3" + "bgiVersion": "0.35.1" }, "positions": [ { "id": 1, "action": "", - "move_mode": "run", + "move_mode": "walk", "type": "teleport", - "x": -535.25, - "y": 2165.25, + "x": -510.04342623900266, + "y": 2193.182701647178, "action_params": "" }, { "id": 2, "action": "fight", - "move_mode": "run", - "type": "target", - "x": -507.5, - "y": 2208.5, + "move_mode": "walk", + "type": "path", + "x": -510, + "y": 2210, "action_params": "" }, { "id": 3, + "action": "", + "move_mode": "walk", + "type": "path", + "x": -490.91842623900266, + "y": 2221.807701647178, + "action_params": "" + }, + { + "id": 4, + "action": "", + "move_mode": "walk", + "type": "path", + "x": -497.41842623900266, + "y": 2235.307701647178, + "action_params": "" + }, + { + "id": 5, + "action": "", + "move_mode": "walk", + "type": "path", + "x": -510.79342623900266, + "y": 2235.682701647178, + "action_params": "" + }, + { + "id": 6, + "action": "", + "move_mode": "walk", + "type": "path", + "x": -508.29342623900266, + "y": 2222.932701647178, + "action_params": "" + }, + { + "id": 7, "action": "fight", - "move_mode": "run", - "type": "target", - "x": -485.25, - "y": 2222, + "move_mode": "walk", + "type": "path", + "x": -500.91842623900266, + "y": 2228.682701647178, "action_params": "" } ] diff --git a/repo/js/AutoEntrust/assets/攀高危险/明冠山地-1.json b/repo/js/AutoEntrust/assets/攀高危险/明冠山地-1.json new file mode 100644 index 00000000..72053f91 --- /dev/null +++ b/repo/js/AutoEntrust/assets/攀高危险/明冠山地-1.json @@ -0,0 +1,142 @@ +{ + "info": { + "name": "", + "type": "collect", + "author": "1", + "version": "", + "description": "", + "bgiVersion": "0.42.3" + }, + "positions": [ + { + "id": 1, + "x": -200.9921875, + "y": 1861.8486328125, + "action": "", + "move_mode": "dash", + "type": "teleport" + }, + { + "id": 2, + "x": -192.6748046875, + "y": 1900.900390625, + "action": "", + "move_mode": "dash", + "type": "path" + }, + { + "id": 3, + "x": -181.435546875, + "y": 1929.23583984375, + "action": "", + "move_mode": "run", + "type": "path" + }, + { + "id": 4, + "x": -173.0771484375, + "y": 1948.51025390625, + "action": "", + "move_mode": "run", + "type": "path" + }, + { + "id": 5, + "x": -164.9638671875, + "y": 1966.611328125, + "action": "", + "move_mode": "dash", + "type": "path" + }, + { + "id": 6, + "x": -149.9150390625, + "y": 1978.275390625, + "action": "", + "move_mode": "walk", + "type": "path" + }, + { + "id": 7, + "x": -127.75, + "y": 1991.451171875, + "action": "", + "move_mode": "run", + "type": "path" + }, + { + "id": 8, + "x": -111.9208984375, + "y": 2000.33447265625, + "action": "", + "move_mode": "dash", + "type": "path" + }, + { + "id": 9, + "x": -96.765625, + "y": 2006.76953125, + "action": "", + "move_mode": "dash", + "type": "path" + }, + { + "id": 10, + "x": -86.8486328125, + "y": 2010.62548828125, + "action": "", + "move_mode": "run", + "type": "path" + }, + { + "id": 11, + "x": -78.27734375, + "y": 2019.2392578125, + "action": "", + "move_mode": "walk", + "type": "path" + }, + { + "id": 12, + "x": -63.0966796875, + "y": 2038.01318359375, + "action": "fight", + "move_mode": "walk", + "action_params": "", + "type": "path" + }, + { + "id": 13, + "x": -70.25, + "y": 2044.90869140625, + "action": "", + "move_mode": "walk", + "type": "path" + }, + { + "id": 14, + "x": -65.796875, + "y": 2048.800048828125, + "action": "", + "move_mode": "walk", + "type": "path" + }, + { + "id": 15, + "x": -40.5, + "y": 2039.5625, + "action": "fight", + "move_mode": "walk", + "action_params": "", + "type": "path" + }, + { + "id": 16, + "x": -30.251953125, + "y": 2053.257568359375, + "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 new file mode 100644 index 00000000..36a0af3a --- /dev/null +++ b/repo/js/AutoEntrust/assets/攀高危险/苍风高地-1.json @@ -0,0 +1,150 @@ +{ + "info": { + "name": "", + "type": "collect", + "author": "1", + "version": "", + "description": "", + "bgiVersion": "0.42.3" + }, + "positions": [ + { + "id": 1, + "x": -914.8740234375, + "y": 1795.3798828125, + "action": "", + "move_mode": "walk", + "type": "teleport" + }, + { + "id": 2, + "x": -918.7158203125, + "y": 1797.517578125, + "action": "", + "move_mode": "walk", + "type": "path" + }, + { + "id": 3, + "x": -945.123046875, + "y": 1808.46240234375, + "action": "", + "move_mode": "dash", + "type": "path" + }, + { + "id": 4, + "x": -966.814453125, + "y": 1831.2880859375, + "action": "", + "move_mode": "dash", + "type": "path" + }, + { + "id": 5, + "x": -982.142578125, + "y": 1833.36279296875, + "action": "", + "move_mode": "dash", + "type": "path" + }, + { + "id": 6, + "x": -996.263671875, + "y": 1835.796875, + "action": "", + "move_mode": "dash", + "type": "path" + }, + { + "id": 7, + "x": -1014.08203125, + "y": 1868.94287109375, + "action": "", + "move_mode": "dash", + "type": "path" + }, + { + "id": 8, + "x": -1027.60546875, + "y": 1868.2216796875, + "action": "", + "move_mode": "dash", + "type": "path" + }, + { + "id": 9, + "x": -1054.4765625, + "y": 1863.02001953125, + "action": "", + "move_mode": "dash", + "type": "path" + }, + { + "id": 10, + "x": -1067.9853515625, + "y": 1860.21240234375, + "action": "", + "move_mode": "dash", + "type": "path" + }, + { + "id": 11, + "x": -1078.9716796875, + "y": 1852.5400390625, + "action": "", + "move_mode": "run", + "type": "path" + }, + { + "id": 12, + "x": -1086.3154296875, + "y": 1849.5341796875, + "action": "", + "move_mode": "walk", + "type": "path" + }, + { + "id": 13, + "x": -1099.388671875, + "y": 1843.0283203125, + "action": "", + "move_mode": "walk", + "type": "path" + }, + { + "id": 14, + "x": -1106.380859375, + "y": 1846.39892578125, + "action": "fight", + "move_mode": "walk", + "action_params": "", + "type": "path" + }, + { + "id": 15, + "x": -1103.787109375, + "y": 1859.50244140625, + "action": "", + "move_mode": "walk", + "type": "path" + }, + { + "id": 16, + "x": -1106.3701171875, + "y": 1867.03759765625, + "action": "fight", + "move_mode": "walk", + "action_params": "", + "type": "path" + }, + { + "id": 17, + "x": -1096.205078125, + "y": 1867.17529296875, + "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 new file mode 100644 index 00000000..b729880f --- /dev/null +++ b/repo/js/AutoEntrust/assets/攀高危险/风啸山坡-1.json @@ -0,0 +1,102 @@ +{ + "info": { + "name": "", + "type": "collect", + "author": "1", + "version": "", + "description": "", + "bgiVersion": "0.42.3" + }, + "positions": [ + { + "id": 1, + "x": -1427.7802734375, + "y": 1661.56494140625, + "action": "", + "move_mode": "walk", + "type": "teleport" + }, + { + "id": 2, + "x": -1408.232421875, + "y": 1656.1640625, + "action": "", + "move_mode": "dash", + "type": "path" + }, + { + "id": 3, + "x": -1386.9072265625, + "y": 1636.85888671875, + "action": "", + "move_mode": "walk", + "type": "path" + }, + { + "id": 4, + "x": -1372.4765625, + "y": 1627.75439453125, + "action": "", + "move_mode": "walk", + "type": "path" + }, + { + "id": 5, + "x": -1360.5712890625, + "y": 1620.15478515625, + "action": "fight", + "move_mode": "walk", + "action_params": "", + "type": "path" + }, + { + "id": 6, + "x": -1348.6953125, + "y": 1620.9013671875, + "action": "", + "move_mode": "walk", + "type": "path" + }, + { + "id": 7, + "x": -1338.3818359375, + "y": 1621.787109375, + "action": "", + "move_mode": "walk", + "type": "path" + }, + { + "id": 8, + "x": -1330.0869140625, + "y": 1622.74755859375, + "action": "fight", + "move_mode": "walk", + "action_params": "", + "type": "path" + }, + { + "id": 9, + "x": -1331.349609375, + "y": 1628.9501953125, + "action": "", + "move_mode": "walk", + "type": "path" + }, + { + "id": 10, + "x": -1336.2158203125, + "y": 1619.8310546875, + "action": "", + "move_mode": "walk", + "type": "path" + }, + { + "id": 11, + "x": -1329.16015625, + "y": 1618.35595703125, + "action": "", + "move_mode": "walk", + "type": "path" + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoEntrust/assets/攀高危险/风啸山坡-2.json b/repo/js/AutoEntrust/assets/攀高危险/风啸山坡-2.json new file mode 100644 index 00000000..8513d387 --- /dev/null +++ b/repo/js/AutoEntrust/assets/攀高危险/风啸山坡-2.json @@ -0,0 +1,66 @@ +{ + "info": { + "name": "F4山底部攀高危险", + "type": "collect", + "author": "1", + "version": "1.0", + "description": "", + "bgiVersion": "0.35.1" + }, + "positions": [ + { + "id": 1, + "action": "", + "move_mode": "walk", + "type": "teleport", + "x": -1124.1362061807995, + "y": 1594.0666294075218, + "action_params": "" + }, + { + "id": 2, + "action": "", + "move_mode": "walk", + "type": "path", + "x": -1154.6362061807995, + "y": 1591.3166294075218, + "action_params": "" + }, + { + "id": 3, + "action": "fight", + "move_mode": "walk", + "type": "path", + "x": -1185.8862061807995, + "y": 1565.8166294075218, + "action_params": "" + }, + { + "id": 4, + "action": "fight", + "move_mode": "walk", + "type": "path", + "x": -1177.1362061807995, + "y": 1549.0666294075218, + "action_params": "" + }, + { + "id": 5, + "action": "", + "move_mode": "walk", + "type": "path", + "x": -1184.1362061807995, + "y": 1549.5666294075218, + "action_params": "" + }, + { + "id": 6, + "action": "fight", + "move_mode": "walk", + "type": "path", + "x": -1180.1362061807995, + "y": 1565.3166294075218, + "action_params": "" + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoEntrust/main.js b/repo/js/AutoEntrust/main.js index aca15d7e..87f94cf1 100644 --- a/repo/js/AutoEntrust/main.js +++ b/repo/js/AutoEntrust/main.js @@ -57,15 +57,7 @@ } } - async function loadConfig() { - try { - const configData = JSON.parse(await file.readText("config.json")); - return configData; - } catch (error) { - log.error(`加载配置文件失败: ${error.message}`); - throw new Error("配置文件加载失败，请检查config.json文件是否存在"); - } -} + // 读取支持的委托列表 function loadSupportedCommissions() { let supportedCommissions = []; @@ -129,12 +121,7 @@ // 点击委托界面 log.info("点击委托界面"); - await sleep(800); - click(300, 350); - click(300, 350); - click(300, 350); - click(300, 350); - click(300, 350); + await sleep(900); click(300, 350); await sleep(100); log.info("已进入委托界面"); @@ -857,7 +844,6 @@ async function loadCommissionsFromData() { } } -// ... existing code ... /** * 执行委托追踪 @@ -925,6 +911,7 @@ async function executeCommissionTracking() { await file.readText(scriptPath); log.info("找到路径追踪脚本: {path}", scriptPath); scriptFound = true; + scriptExecuted = true; } catch (readError) { log.info("路径追踪脚本不存在: {path}", scriptPath); continue; // 尝试下一个脚本路径 @@ -940,7 +927,7 @@ async function executeCommissionTracking() { //log.info("委托 {name} 执行完成", commission.name); // 成功执行一个脚本后，跳出循环 - break; + //break; } catch (scriptError) { log.error("执行路径追踪脚本时出错: {error}", scriptError); } @@ -1011,7 +998,7 @@ async function executeCommissionTracking_old() { log.info("开始处理委托: {name} ({location})", commission.name, commission.location || "未知地点"); // 执行委托追踪脚本 - const success = await executeTrackingScript(commission); + //const success = await executeTrackingScript(commission); if (success) { log.info("委托 {name} 已成功完成", commission.name); @@ -1037,15 +1024,14 @@ async function executeCommissionTracking_old() { log.info("跳过识别，直接加载数据"); }else{ await Identification(); - } - if(!settings.team){ - log.info("没有设置切换队伍"); - } + }//识别委托 + // 开局准备 await prepareForLeyLineRun(settings); - // 如果启用了自动追踪，执行追踪脚本 + // 执行自动委托 await executeCommissionTracking(); + log.info("每日委托执行完成，前往安全地点"); await genshin.tpToStatueOfTheSeven(); } diff --git a/repo/js/AutoEntrust/manifest.json b/repo/js/AutoEntrust/manifest.json index 57b659be..ff957eda 100644 --- a/repo/js/AutoEntrust/manifest.json +++ b/repo/js/AutoEntrust/manifest.json @@ -1,12 +1,12 @@ { "manifest_version": 1, "name": "(Beta)全自动寻路蒙德地区每日委托", - "version": "0.93", + "version": "0.94", "bgi_version": "0.44.3", - "description": "基于BetterGI的原神自动化脚本，可自动识别每日委托内容、OCR识别委托地点和状态、自动追踪委托路径。目前支持蒙德地区委托，未来将支持全国家委托。使用前请阅读README.md（可用记事本打开）获取详细说明和常见问题解答。如果发生错误，如不支持的战斗委托，请将脚本data/文件夹下面的数据,log/日志下今日日志，每日委托任务包含地点截图。反馈给作者反馈方法1.加3302871403QQ好友2.发送截图,日志给3302871403@qq.com3.加bgi v8群@星野（bgi v7群也可以）", + "description": "基于BetterGI的原神自动化脚本，可自动识别每日委托内容、OCR识别委托地点和状态、自动追踪委托路径。目前支持蒙德地区委托，未来将支持全国家委托。使用前请阅读README.md（可用记事本打开）获取详细说明和常见问题解答。如果发生错误，如不支持的战斗委托，请将脚本data/文件夹下面的数据,log/日志下今日日志，每日委托任务包含地点截图反馈给作者。反馈方法1.加3302871403QQ好友2.发送截图,日志给3302871403@qq.com3.加1036100501bgi v8群@星野（bgi v7群也可以）。目前项目正处于开发阶段急需人手,有意者可私信作者（会在地图上标点即可）", "authors": [ { - "name": "LX666-666,换苏伟u", + "name": "星野(Main) & 换苏伟u", "link": "https://github.com/LX666-666" } ],