diff --git a/repo/js/AutoCommission/assets/process/新的风暴尚未出现/望风海岸/process-前往望风角塔楼顶部-TP.json b/repo/js/AutoCommission/assets/process/新的风暴尚未出现/望风海岸/process-前往望风角塔楼顶部-TP.json new file mode 100644 index 000000000..3b09e1106 --- /dev/null +++ b/repo/js/AutoCommission/assets/process/新的风暴尚未出现/望风海岸/process-前往望风角塔楼顶部-TP.json @@ -0,0 +1,21 @@ +[ + { + "type": "地图追踪", + "data": "新的风暴尚未出现-1.json", + "note": "重新传送寻路后再爬塔" + }, + { + "type": "地图追踪", + "data": "前往望风角塔楼顶部.json", + "note": "前往望风角塔楼顶部" + }, + { + "type": "按键", + "data": "F", + "note": "按下F键" + }, + { + "type": "等待返回主界面", + "note": "等待返回主界面" + } +] \ No newline at end of file diff --git a/repo/js/AutoCommission/assets/process/新的风暴尚未出现/望风海岸/process-前往望风角塔楼顶部.json b/repo/js/AutoCommission/assets/process/新的风暴尚未出现/望风海岸/process-前往望风角塔楼顶部.json new file mode 100644 index 000000000..bcca049f6 --- /dev/null +++ b/repo/js/AutoCommission/assets/process/新的风暴尚未出现/望风海岸/process-前往望风角塔楼顶部.json @@ -0,0 +1,16 @@ +[ + { + "type": "地图追踪", + "data": "前往望风角塔楼顶部.json", + "note": "前往望风角塔楼顶部" + }, + { + "type": "按键", + "data": "F", + "note": "按下F键" + }, + { + "type": "等待返回主界面", + "note": "等待返回主界面" + } +] \ 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 667e80169..058db4f86 100644 --- a/repo/js/AutoCommission/assets/process/新的风暴尚未出现/望风海岸/process.json +++ b/repo/js/AutoCommission/assets/process/新的风暴尚未出现/望风海岸/process.json @@ -51,18 +51,28 @@ "note": "等待10秒钟" }, { - "type": "地图追踪", - "data": "前往望风角塔楼顶部.json", - "note": "前往望风角塔楼顶部" + "type": "委托描述检测", + "data": "与芬德修女对话", + "note": "第一次尝试登塔", + "run": "process-前往望风角塔楼顶部.json" }, { - "type": "按键", - "data": "F", - "note": "按下F键" + "type": "委托描述检测", + "data": "与芬德修女对话", + "note": "第二次尝试登塔", + "run": "process-前往望风角塔楼顶部.json" }, { - "type": "等待返回主界面", - "note": "等待返回主界面" + "type": "委托描述检测", + "data": "与芬德修女对话", + "note": "第三次尝试登塔,这次会尝试传送重新跑", + "run": "process-前往望风角塔楼顶部-TP.json" + }, + { + "type": "委托描述检测", + "data": "与芬德修女对话", + "note": "第四次尝试登塔,这次会尝试传送重新跑", + "run": "process-前往望风角塔楼顶部-TP.json" } ] diff --git a/repo/js/AutoCommission/assets/process/新的风暴尚未出现/望风角/process.json b/repo/js/AutoCommission/assets/process/新的风暴尚未出现/望风角/process.json deleted file mode 100644 index 667e80169..000000000 --- a/repo/js/AutoCommission/assets/process/新的风暴尚未出现/望风角/process.json +++ /dev/null @@ -1,68 +0,0 @@ -[ - { - "type": "地图追踪", - "data": "新的风暴尚未出现-1.json", - "note": "执行第一个地图追踪步骤" - }, - { - "type": "自动任务", - "data": { - "action": "enable", - "taskType": "AutoSkip" - }, - "note": "开启自动剧情" - }, - { - "type": "按键", - "data": "F", - "note": "按下F键" - }, - { - "type": "等待返回主界面", - "note": "等待返回主界面" - }, - { - "type": "地图追踪", - "data": "新的风暴尚未出现-2.json", - "note": "执行第二个地图追踪步骤" - }, - { - "type": "地图追踪", - "data": "新的风暴尚未出现-3.json", - "note": "执行第3个地图追踪步骤" - }, - { - "type": "按键", - "data": "F", - "note": "按下F键" - }, - { - "type": "等待返回主界面", - "note": "等待返回主界面" - }, - { - "type": "地图追踪", - "data": "新的风暴尚未出现-4.json", - "note": "执行第4个地图追踪步骤" - }, - { - "type": "等待", - "data": 10000, - "note": "等待10秒钟" - }, - { - "type": "地图追踪", - "data": "前往望风角塔楼顶部.json", - "note": "前往望风角塔楼顶部" - }, - { - "type": "按键", - "data": "F", - "note": "按下F键" - }, - { - "type": "等待返回主界面", - "note": "等待返回主界面" - } -] - diff --git a/repo/js/AutoCommission/assets/process/新的风暴尚未出现/望风角/前往望风角塔楼打怪.json b/repo/js/AutoCommission/assets/process/新的风暴尚未出现/望风角/前往望风角塔楼打怪.json deleted file mode 100644 index f1ecf0252..000000000 --- a/repo/js/AutoCommission/assets/process/新的风暴尚未出现/望风角/前往望风角塔楼打怪.json +++ /dev/null @@ -1,139 +0,0 @@ -{ - "info": { - "authors": [ - { - "links": "", - "name": "星野" - } - ], - "bgi_version": "0.45.0", - "description": "", - "enable_monster_loot_split": false, - "last_modified_time": 1757315839407, - "map_match_method": "", - "map_name": "Teyvat", - "name": " 前往望风角塔楼打怪", - "tags": [], - "type": "collect", - "version": "1.0" - }, - "positions": [ - { - "action": "", - "action_params": "", - "id": 1, - "move_mode": "walk", - "type": "path", - "x": -1849.755859375, - "y": 2875.167724609375 - }, - { - "action": "", - "action_params": "", - "id": 2, - "move_mode": "walk", - "type": "target", - "x": -1850.3750121540143, - "y": 2886.5625 - }, - { - "action": "", - "action_params": "", - "id": 3, - "move_mode": "walk", - "type": "path", - "x": -1845.73046875, - "y": 2886.145263671875 - }, - { - "action": "", - "action_params": "", - "id": 4, - "move_mode": "walk", - "type": "target", - "x": -1839.5937013839357, - "y": 2884.34375 - }, - { - "action": "", - "action_params": "", - "id": 5, - "move_mode": "walk", - "type": "target", - "x": -1839.2431640625, - "y": 2879.853271484375 - }, - { - "action": "", - "action_params": "", - "id": 6, - "move_mode": "walk", - "type": "target", - "x": -1844.2734375, - "y": 2875.896728515625 - }, - { - "action": "", - "action_params": "", - "id": 7, - "move_mode": "climb", - "type": "path", - "x": -1846.8552734375007, - "y": 2878.7737304687507 - }, - { - "action": "", - "action_params": "", - "id": 8, - "move_mode": "walk", - "type": "target", - "x": -1847.1103515625, - "y": 2879.4228515625 - }, - { - "action": "", - "action_params": "", - "id": 9, - "move_mode": "walk", - "type": "target", - "x": -1846.1953125, - "y": 2882.475830078125 - }, - { - "action": "", - "action_params": "", - "id": 10, - "move_mode": "walk", - "type": "target", - "x": -1842.1689453125, - "y": 2883.2734375 - }, - { - "action": "", - "action_params": "", - "id": 11, - "move_mode": "walk", - "type": "path", - "x": -1840.6201171875, - "y": 2880.635498046875 - }, - { - "action": "", - "action_params": "", - "id": 12, - "move_mode": "walk", - "type": "target", - "x": -1841.287109375, - "y": 2877.12548828125 - }, - { - "action": "", - "action_params": "", - "id": 13, - "move_mode": "walk", - "type": "target", - "x": -1844.287109375, - "y": 2878.12548828125 - } - ] -} \ No newline at end of file diff --git a/repo/js/AutoCommission/assets/process/新的风暴尚未出现/望风角/前往望风角塔楼顶部.json b/repo/js/AutoCommission/assets/process/新的风暴尚未出现/望风角/前往望风角塔楼顶部.json deleted file mode 100644 index 0fefb7e52..000000000 --- a/repo/js/AutoCommission/assets/process/新的风暴尚未出现/望风角/前往望风角塔楼顶部.json +++ /dev/null @@ -1,170 +0,0 @@ -{ - "info": { - "authors": [], - "bgi_version": "0.45.0", - "description": "", - "enable_monster_loot_split": false, - "last_modified_time": 1757918588164, - "map_match_method": "", - "map_name": "Teyvat", - "name": "前往望风角塔楼顶部", - "tags": [], - "type": "collect", - "version": "1.0" - }, - "positions": [ - { - "action": "", - "action_params": "", - "id": 1, - "move_mode": "walk", - "type": "path", - "x": -1849.7490506511967, - "y": 2886.437247598393 - }, - { - "action": "", - "action_params": "", - "id": 2, - "move_mode": "walk", - "type": "path", - "x": -1847.00390625, - "y": 2885.959716796875 - }, - { - "action": "", - "action_params": "", - "id": 3, - "move_mode": "walk", - "type": "path", - "x": -1842.541015625, - "y": 2885.30419921875 - }, - { - "action": "", - "action_params": "", - "id": 4, - "move_mode": "walk", - "type": "target", - "x": -1840.2109375, - "y": 2883.41162109375 - }, - { - "action": "", - "action_params": "", - "id": 5, - "move_mode": "walk", - "type": "path", - "x": -1839.330078125, - "y": 2879.35302734375 - }, - { - "action": "", - "action_params": "", - "id": 6, - "move_mode": "walk", - "type": "target", - "x": -1841.4296875, - "y": 2876.974853515625 - }, - { - "action": "", - "action_params": "", - "id": 7, - "move_mode": "walk", - "type": "path", - "x": -1844.625, - "y": 2876.363525390625 - }, - { - "action": "", - "action_params": "", - "id": 8, - "move_mode": "walk", - "type": "target", - "x": -1845.01953125, - "y": 2876.78955078125 - }, - { - "action": "", - "action_params": "", - "id": 9, - "move_mode": "walk", - "type": "path", - "x": -1846.5078125, - "y": 2879.21142578125 - }, - { - "action": "", - "action_params": "", - "id": 10, - "move_mode": "walk", - "type": "target", - "x": -1846.61328125, - "y": 2881.89990234375 - }, - { - "action": "", - "action_params": "", - "id": 11, - "move_mode": "walk", - "type": "target", - "x": -1845.12890625, - "y": 2883.322265625 - }, - { - "action": "", - "action_params": "", - "id": 12, - "move_mode": "walk", - "type": "target", - "x": -1842.037109375, - "y": 2883.720458984375 - }, - { - "action": "", - "action_params": "", - "id": 13, - "move_mode": "walk", - "type": "path", - "x": -1840.4609375, - "y": 2882.312744140625 - }, - { - "action": "", - "action_params": "", - "id": 14, - "move_mode": "walk", - "type": "target", - "x": -1840.080078125, - "y": 2880.403564453125 - }, - { - "action": "", - "action_params": "", - "id": 15, - "move_mode": "walk", - "type": "path", - "x": -1841.49609375, - "y": 2877.44091796875 - }, - { - "action": "", - "action_params": "", - "id": 16, - "move_mode": "walk", - "type": "path", - "x": -1843.31640625, - "y": 2877.53369140625 - }, - { - "action": "", - "action_params": "", - "id": 17, - "move_mode": "walk", - "type": "target", - "x": -1845.7593750000015, - "y": 2877.8777832031246 - } - ] -} \ No newline at end of file diff --git a/repo/js/AutoCommission/assets/process/新的风暴尚未出现/望风角/前往望风角塔楼顶部by柒叶子.json b/repo/js/AutoCommission/assets/process/新的风暴尚未出现/望风角/前往望风角塔楼顶部by柒叶子.json deleted file mode 100644 index 6126ecd15..000000000 --- a/repo/js/AutoCommission/assets/process/新的风暴尚未出现/望风角/前往望风角塔楼顶部by柒叶子.json +++ /dev/null @@ -1,212 +0,0 @@ -{ - "info": { - "name": "前往望风角塔楼顶部by柒叶子", - "type": "collect", - "author": "柒叶子", - "version": "1.0", - "description": "柒叶子老师nb", - "map_name": "Teyvat", - "bgi_version": "0.45.0" - }, - "positions": [ - { - "id": 1, - "x": -1629.2958984375, - "y": 2834.411865234375, - "action": "", - "move_mode": "walk", - "action_params": "", - "type": "teleport" - }, - { - "id": 2, - "x": -1653.572265625, - "y": 2834.874755859375, - "action": "", - "move_mode": "walk", - "action_params": "", - "type": "path" - }, - { - "id": 3, - "x": -1703.2529296875, - "y": 2843.67822265625, - "action": "", - "move_mode": "walk", - "action_params": "", - "type": "path" - }, - { - "id": 4, - "x": -1726.9443359375, - "y": 2847.81640625, - "action": "", - "move_mode": "walk", - "action_params": "", - "type": "path" - }, - { - "id": 5, - "x": -1752.2021484375, - "y": 2850.199462890625, - "action": "", - "move_mode": "walk", - "action_params": "", - "type": "path" - }, - { - "id": 6, - "x": -1768.94921875, - "y": 2848.8212890625, - "action": "", - "move_mode": "walk", - "action_params": "", - "type": "path" - }, - { - "id": 7, - "x": -1795.8515625, - "y": 2847.02783203125, - "action": "", - "move_mode": "walk", - "action_params": "", - "type": "path" - }, - { - "id": 8, - "x": -1807.73828125, - "y": 2858.350341796875, - "action": "", - "move_mode": "walk", - "action_params": "", - "type": "path" - }, - { - "id": 9, - "x": -1833.505859375, - "y": 2864.002197265625, - "action": "", - "move_mode": "walk", - "action_params": "", - "type": "path" - }, - { - "id": 10, - "x": -1859.2421875, - "y": 2871.079345703125, - "action": "", - "move_mode": "walk", - "action_params": "", - "type": "path" - }, - { - "id": 11, - "x": -1852.779296875, - "y": 2885.40869140625, - "action": "", - "move_mode": "walk", - "action_params": "", - "type": "target" - }, - { - "id": 12, - "x": -1843.294921875, - "y": 2884.653076171875, - "action": "", - "move_mode": "fly", - "action_params": "", - "type": "path" - }, - { - "id": 13, - "x": -1842.29296875, - "y": 2884.297607421875, - "action": "", - "move_mode": "fly", - "action_params": "", - "type": "target" - }, - { - "id": 14, - "x": -1839.2431640625, - "y": 2879.853271484375, - "action": "", - "move_mode": "walk", - "action_params": "", - "type": "target" - }, - { - "id": 15, - "x": -1844.2734375, - "y": 2875.896728515625, - "action": "", - "move_mode": "walk", - "action_params": "", - "type": "target" - }, - { - "id": 16, - "x": -1846.8552734375, - "y": 2878.77373046875, - "action": "", - "move_mode": "climb", - "action_params": "", - "type": "path" - }, - { - "id": 17, - "x": -1847.1103515625, - "y": 2879.4228515625, - "action": "", - "move_mode": "walk", - "action_params": "", - "type": "target" - }, - { - "id": 18, - "x": -1846.1953125, - "y": 2882.475830078125, - "action": "", - "move_mode": "walk", - "action_params": "", - "type": "target" - }, - { - "id": 19, - "x": -1842.1689453125, - "y": 2883.2734375, - "action": "", - "move_mode": "walk", - "action_params": "", - "type": "target" - }, - { - "id": 20, - "x": -1840.6201171875, - "y": 2880.635498046875, - "action": "", - "move_mode": "walk", - "action_params": "", - "type": "path" - }, - { - "id": 21, - "x": -1841.287109375, - "y": 2877.12548828125, - "action": "", - "move_mode": "walk", - "action_params": "", - "type": "target", - "locked": false - }, - { - "id": 22, - "x": -1844.287109375, - "y": 2878.12548828125, - "action": "", - "move_mode": "walk", - "action_params": "", - "type": "target" - } - ] -} \ No newline at end of file diff --git a/repo/js/AutoCommission/assets/process/新的风暴尚未出现/望风角/新的风暴尚未出现-1.json b/repo/js/AutoCommission/assets/process/新的风暴尚未出现/望风角/新的风暴尚未出现-1.json deleted file mode 100644 index 8f7e8e8e0..000000000 --- a/repo/js/AutoCommission/assets/process/新的风暴尚未出现/望风角/新的风暴尚未出现-1.json +++ /dev/null @@ -1,84 +0,0 @@ -{ - "info": { - "name": "新的风暴尚未出现-1", - "type": "collect", - "author": "星野", - "version": "", - "description": "", - "bgi_version": "0.42.3" - }, - "positions": [ - { - "id": 1, - "x": -1629.1162109375, - "y": 2833.7861328125, - "action": "", - "move_mode": "dash", - "type": "teleport" - }, - { - "id": 2, - "x": -1708.4482421875, - "y": 2834.314697265625, - "action": "", - "move_mode": "dash", - "type": "path" - }, - { - "id": 3, - "x": -1759.6064453125, - "y": 2835.28271484375, - "action": "", - "move_mode": "fly", - "type": "path" - }, - { - "id": 4, - "x": -1785.251953125, - "y": 2850.209228515625, - "action": "", - "move_mode": "dash", - "type": "path" - }, - { - "id": 5, - "x": -1793.935546875, - "y": 2857.962890625, - "action": "", - "move_mode": "walk", - "type": "path" - }, - { - "id": 6, - "x": -1821.6806640625, - "y": 2855.65478515625, - "action": "", - "move_mode": "dash", - "type": "path" - }, - { - "id": 7, - "x": -1839.416015625, - "y": 2847.714111328125, - "action": "", - "move_mode": "dash", - "type": "path" - }, - { - "id": 8, - "x": -1858.431640625, - "y": 2837.705078125, - "action": "", - "move_mode": "dash", - "type": "path" - }, - { - "id": 9, - "x": -1875.25, - "y": 2829.442626953125, - "action": "", - "move_mode": "walk", - "type": "target" - } - ] -} \ No newline at end of file diff --git a/repo/js/AutoCommission/assets/process/新的风暴尚未出现/望风角/新的风暴尚未出现-2.json b/repo/js/AutoCommission/assets/process/新的风暴尚未出现/望风角/新的风暴尚未出现-2.json deleted file mode 100644 index b90a462e4..000000000 --- a/repo/js/AutoCommission/assets/process/新的风暴尚未出现/望风角/新的风暴尚未出现-2.json +++ /dev/null @@ -1,107 +0,0 @@ -{ - "info": { - "authors": [], - "bgi_version": "0.45.0", - "description": "", - "enable_monster_loot_split": false, - "last_modified_time": 1757913572784, - "map_match_method": "", - "map_name": "Teyvat", - "name": "新的风暴尚未出现-2", - "tags": [], - "type": "collect", - "version": "1.0" - }, - "positions": [ - { - "action": "", - "action_params": "", - "id": 1, - "move_mode": "dash", - "type": "path", - "x": -1863.46484375, - "y": 2842.766845703125 - }, - { - "action": "fight", - "action_params": "", - "id": 2, - "move_mode": "dash", - "type": "path", - "x": -1847.66796875, - "y": 2873.0673828125 - }, - { - "action": "", - "action_params": "", - "id": 3, - "move_mode": "walk", - "type": "path", - "x": -1854.76953125, - "y": 2876.55419921875 - }, - { - "action": "", - "action_params": "", - "id": 4, - "move_mode": "walk", - "type": "target", - "x": -1852.1484375, - "y": 2886.126708984375 - }, - { - "action": "", - "action_params": "", - "id": 5, - "move_mode": "jump", - "type": "target", - "x": -1842.197265625, - "y": 2885.20166015625 - }, - { - "action": "", - "action_params": "", - "id": 6, - "move_mode": "walk", - "type": "path", - "x": -1839.97265625, - "y": 2882.318359375 - }, - { - "action": "", - "action_params": "", - "id": 7, - "move_mode": "walk", - "type": "path", - "x": -1839.17578125, - "y": 2880.1904296875 - }, - { - "action": "fight", - "action_params": "", - "id": 8, - "move_mode": "walk", - "type": "path", - "x": -1842.16015625, - "y": 2876.5869140625 - }, - { - "action": "", - "action_params": "", - "id": 9, - "move_mode": "walk", - "type": "target", - "x": -1844.81640625, - "y": 2876.34765625 - }, - { - "action": "fight", - "action_params": "", - "id": 10, - "move_mode": "jump", - "type": "path", - "x": -1847.15234375, - "y": 2879.74755859375 - } - ] -} \ No newline at end of file diff --git a/repo/js/AutoCommission/assets/process/新的风暴尚未出现/望风角/新的风暴尚未出现-3.json b/repo/js/AutoCommission/assets/process/新的风暴尚未出现/望风角/新的风暴尚未出现-3.json deleted file mode 100644 index 1a5a9cdea..000000000 --- a/repo/js/AutoCommission/assets/process/新的风暴尚未出现/望风角/新的风暴尚未出现-3.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "info": { - "authors": [], - "bgi_version": "0.45.0", - "description": "", - "enable_monster_loot_split": false, - "last_modified_time": 1757913767832, - "map_match_method": "", - "map_name": "Teyvat", - "name": "新的风暴尚未出现-3", - "tags": [], - "type": "collect", - "version": "1.0" - }, - "positions": [ - { - "action": "", - "action_params": "", - "id": 1, - "move_mode": "dash", - "type": "path", - "x": -1850.85546875, - "y": 2865.22021484375 - }, - { - "action": "", - "action_params": "", - "id": 2, - "move_mode": "walk", - "type": "path", - "x": -1864.44921875, - "y": 2839.31591796875 - }, - { - "action": "", - "action_params": "", - "id": 3, - "move_mode": "walk", - "type": "target", - "x": -1865.822265625, - "y": 2836.79345703125 - } - ] -} \ No newline at end of file diff --git a/repo/js/AutoCommission/assets/process/新的风暴尚未出现/望风角/新的风暴尚未出现-4.json b/repo/js/AutoCommission/assets/process/新的风暴尚未出现/望风角/新的风暴尚未出现-4.json deleted file mode 100644 index 3d1be5a6e..000000000 --- a/repo/js/AutoCommission/assets/process/新的风暴尚未出现/望风角/新的风暴尚未出现-4.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "info": { - "authors": [], - "bgi_version": "0.45.0", - "description": "", - "enable_monster_loot_split": false, - "last_modified_time": 1757914499577, - "map_match_method": "", - "map_name": "Teyvat", - "name": "新的风暴尚未出现-4", - "tags": [], - "type": "collect", - "version": "1.0" - }, - "positions": [ - { - "action": "", - "action_params": "", - "id": 1, - "move_mode": "dash", - "type": "path", - "x": -1857.62109375, - "y": 2856.49462890625 - }, - { - "action": "", - "action_params": "", - "id": 2, - "move_mode": "dash", - "type": "path", - "x": -1852.96875, - "y": 2874.458984375 - } - ] -} \ No newline at end of file diff --git a/repo/js/AutoCommission/lib/execute.js b/repo/js/AutoCommission/lib/execute.js index c42577141..9e0f5063f 100644 --- a/repo/js/AutoCommission/lib/execute.js +++ b/repo/js/AutoCommission/lib/execute.js @@ -444,8 +444,6 @@ var Execute = { // 按F键并执行优化的自动剧情 log.info("执行自动剧情"); await DialogProcessor.executeOptimizedAutoTalk( - null, - 5, context.priorityOptions, context.npcWhiteList, context.isInMainUI @@ -484,8 +482,6 @@ var Execute = { // 执行对话,使用当前步骤的优先选项和NPC白名单 await DialogProcessor.executeOptimizedAutoTalk( - null, - skipCount, priorityOptions, npcWhiteList, isInMainUI diff --git a/repo/js/AutoCommission/manifest.json b/repo/js/AutoCommission/manifest.json index 507c60edf..181bd63ad 100644 --- a/repo/js/AutoCommission/manifest.json +++ b/repo/js/AutoCommission/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 1, "name": "(对话+成就)全自动蒙德地区每日委托", - "version": "0.98.15", + "version": "0.98.16", "tags": [ "委托", "对话",