diff --git a/repo/js/AutoHoeingOneDragon/manifest.json b/repo/js/AutoHoeingOneDragon/manifest.json index 4101e28a8..b5bd13164 100644 --- a/repo/js/AutoHoeingOneDragon/manifest.json +++ b/repo/js/AutoHoeingOneDragon/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 1, "name": "锄地一条龙", - "version": "1.20.2", + "version": "1.20.4", "description": "一站式解决自动化锄地,支持只拾取狗粮,请仔细阅读README.md后使用", "authors": [ { diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/1-其他/3201稻妻九条阵屋.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/1-其他/3201稻妻九条阵屋.json index 5b010f251..f8ea81427 100644 --- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/1-其他/3201稻妻九条阵屋.json +++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/1-其他/3201稻妻九条阵屋.json @@ -174,13 +174,22 @@ "id": 17, "move_mode": "dash", "type": "path", + "x": -3612.55078125, + "y": -3227.9072265625 + }, + { + "action": "", + "action_params": "", + "id": 18, + "move_mode": "dash", + "type": "path", "x": -3632.2109375, "y": -3266.8359375 }, { "action": "", "action_params": "", - "id": 18, + "id": 19, "move_mode": "dash", "type": "path", "x": -3649.4296875, @@ -189,7 +198,7 @@ { "action": "", "action_params": "", - "id": 19, + "id": 20, "move_mode": "dash", "type": "path", "x": -3661.1484375, @@ -198,7 +207,7 @@ { "action": "fight", "action_params": "", - "id": 20, + "id": 21, "move_mode": "dash", "type": "path", "x": -3701.349609375, @@ -206,8 +215,8 @@ }, { "action": "combat_script", - "action_params": "wait(0.1)", - "id": 21, + "action_params": "wait(1)", + "id": 22, "move_mode": "dash", "type": "orientation", "x": -3701.349609375, diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/1-其他/5603枫丹场力北.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/1-其他/5603枫丹场力北.json index 86fcae23c..8123e175f 100644 --- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/1-其他/5603枫丹场力北.json +++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/1-其他/5603枫丹场力北.json @@ -64,6 +64,15 @@ "action": "", "action_params": "", "id": 5, + "move_mode": "dash", + "type": "path", + "x": 4210.8173828125, + "y": 4413.703125 + }, + { + "action": "", + "action_params": "", + "id": 6, "move_mode": "jump", "type": "path", "x": 4229.107421875, @@ -72,7 +81,7 @@ { "action": "combat_script", "action_params": "attack(0.3)", - "id": 6, + "id": 7, "move_mode": "dash", "type": "path", "x": 4284.1416015625, @@ -81,7 +90,7 @@ { "action": "fight", "action_params": "", - "id": 7, + "id": 8, "move_mode": "dash", "type": "path", "x": 4298.8515625, @@ -90,7 +99,16 @@ { "action": "", "action_params": "", - "id": 8, + "id": 9, + "move_mode": "dash", + "type": "path", + "x": 4298.8515625, + "y": 4386.09326171875 + }, + { + "action": "", + "action_params": "", + "id": 10, "move_mode": "walk", "type": "path", "x": 4299.681640625, @@ -99,7 +117,7 @@ { "action": "", "action_params": "", - "id": 9, + "id": 11, "move_mode": "dash", "type": "path", "x": 4350.880859375, @@ -108,7 +126,7 @@ { "action": "combat_script", "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;玛薇卡 e;爱可菲 e;菈乌玛 e;", - "id": 10, + "id": 12, "move_mode": "dash", "type": "path", "x": 4379.361328125, @@ -117,7 +135,7 @@ { "action": "", "action_params": "", - "id": 11, + "id": 13, "move_mode": "dash", "type": "path", "x": 4383.8232421875, @@ -126,34 +144,34 @@ { "action": "fight", "action_params": "", - "id": 12, - "move_mode": "dash", - "type": "path", - "x": 4397.7177734375, - "y": 4340.888671875 - }, - { - "action": "", - "action_params": "", - "id": 13, - "move_mode": "dash", - "type": "path", - "x": 4397.7177734375, - "y": 4340.888671875 - }, - { - "action": "", - "action_params": "", "id": 14, "move_mode": "dash", "type": "path", + "x": 4397.7177734375, + "y": 4340.888671875 + }, + { + "action": "", + "action_params": "", + "id": 15, + "move_mode": "dash", + "type": "path", + "x": 4397.7177734375, + "y": 4340.888671875 + }, + { + "action": "", + "action_params": "", + "id": 16, + "move_mode": "dash", + "type": "path", "x": 4408.3916015625, "y": 4314.4365234375 }, { "action": "stop_flying", "action_params": "", - "id": 15, + "id": 17, "move_mode": "fly", "type": "path", "x": 4426.5029296875, @@ -162,7 +180,7 @@ { "action": "combat_script", "action_params": "attack(0.3);伊涅芙 e;芙宁娜 e;玛薇卡 e;爱可菲 e;菈乌玛 e;wait(5)", - "id": 16, + "id": 18, "move_mode": "dash", "type": "path", "x": 4435.150390625, @@ -171,7 +189,7 @@ { "action": "", "action_params": "", - "id": 17, + "id": 19, "move_mode": "dash", "type": "path", "x": 4457.111328125, @@ -180,34 +198,34 @@ { "action": "fight", "action_params": "", - "id": 18, - "move_mode": "dash", - "type": "path", - "x": 4479.3154296875, - "y": 4383.04248046875 - }, - { - "action": "", - "action_params": "", - "id": 19, - "move_mode": "dash", - "type": "path", - "x": 4479.3154296875, - "y": 4383.04248046875 - }, - { - "action": "", - "action_params": "", "id": 20, "move_mode": "dash", "type": "path", + "x": 4479.3154296875, + "y": 4383.04248046875 + }, + { + "action": "", + "action_params": "", + "id": 21, + "move_mode": "dash", + "type": "path", + "x": 4479.3154296875, + "y": 4383.04248046875 + }, + { + "action": "", + "action_params": "", + "id": 22, + "move_mode": "dash", + "type": "path", "x": 4473.02734375, "y": 4391.7578125 }, { "action": "", "action_params": "", - "id": 21, + "id": 23, "move_mode": "dash", "type": "path", "x": 4393.18359375, @@ -216,7 +234,7 @@ { "action": "fight", "action_params": "", - "id": 22, + "id": 24, "move_mode": "dash", "type": "path", "x": 4420.6396484375, @@ -224,8 +242,8 @@ }, { "action": "combat_script", - "action_params": "wait(0.1)", - "id": 23, + "action_params": "wait(1)", + "id": 25, "move_mode": "dash", "type": "orientation", "x": 4420.6396484375, diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/1-其他/6001纳塔传奇莎孚.json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/1-其他/6001纳塔传奇莎孚.json index 1fab63b97..04ba258d9 100644 --- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/1-其他/6001纳塔传奇莎孚.json +++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/1-其他/6001纳塔传奇莎孚.json @@ -19,58 +19,58 @@ }, "positions": [ { + "action": "", + "action_params": "", "id": 1, - "x": 7853.67919921875, - "y": -1751.94921875, - "action": "", "move_mode": "walk", - "action_params": "", - "type": "teleport" + "type": "teleport", + "x": 7853.67919921875, + "y": -1751.94921875 }, { - "id": 2, - "x": 7878.28662109375, - "y": -1813.33935546875, "action": "", - "move_mode": "dash", "action_params": "", - "type": "path" + "id": 2, + "move_mode": "dash", + "type": "path", + "x": 7878.28662109375, + "y": -1813.33935546875 }, { - "id": 3, - "x": 7899.98681640625, - "y": -1819.5546875, "action": "combat_script", - "move_mode": "dash", "action_params": "attack(0.5)", - "type": "path" + "id": 3, + "move_mode": "dash", + "type": "path", + "x": 7899.98681640625, + "y": -1819.5546875 }, { + "action": "fight", + "action_params": "", "id": 4, - "x": 7892.82080078125, - "y": -1817.7080078125, - "action": "fight", "move_mode": "dash", - "action_params": "", - "type": "path" + "type": "path", + "x": 7892.82080078125, + "y": -1817.7080078125 }, { + "action": "fight", + "action_params": "", "id": 5, - "x": 7892.82080078125, - "y": -1817.7080078125, - "action": "fight", "move_mode": "dash", - "action_params": "", - "type": "path" + "type": "path", + "x": 7892.82080078125, + "y": -1817.7080078125 }, { - "id": 6, - "x": 7892.82080078125, - "y": -1817.7080078125, "action": "combat_script", + "action_params": "wait(1)", + "id": 6, "move_mode": "dash", - "action_params": "wait(0.1)", - "type": "orientation" + "type": "orientation", + "x": 7892.82080078125, + "y": -1817.7080078125 } ] } \ No newline at end of file diff --git a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/1-其他/6501--纳塔_坚岩隘谷_硫晶支脉_(6-4).json b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/1-其他/6501--纳塔_坚岩隘谷_硫晶支脉_(6-4).json index c2cdcfe35..74b76145e 100644 --- a/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/1-其他/6501--纳塔_坚岩隘谷_硫晶支脉_(6-4).json +++ b/repo/js/AutoHoeingOneDragon/pathing/1-莫酱/1-其他/6501--纳塔_坚岩隘谷_硫晶支脉_(6-4).json @@ -56,7 +56,7 @@ }, { "action": "combat_script", - "action_params": "wait(0.1)", + "action_params": "wait(1)", "id": 4, "move_mode": "dash", "type": "orientation", @@ -144,10 +144,19 @@ "x": 8532.228515625, "y": -1364.8125 }, + { + "action": "", + "action_params": "", + "id": 14, + "move_mode": "dash", + "type": "path", + "x": 8532.228515625, + "y": -1364.8125 + }, { "action": "stop_flying", "action_params": "4000", - "id": 14, + "id": 15, "move_mode": "fly", "type": "path", "x": 8495.19, @@ -156,7 +165,7 @@ { "action": "fight", "action_params": "", - "id": 15, + "id": 16, "move_mode": "dash", "type": "path", "x": 8512.05, @@ -164,8 +173,8 @@ }, { "action": "combat_script", - "action_params": "wait(0.1)", - "id": 16, + "action_params": "wait(1)", + "id": 17, "move_mode": "dash", "type": "orientation", "x": 8512.05, diff --git a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/16倍草&钓客/005挪德卡莱虚海望十六倍曼陀草 传奇.json b/repo/js/AutoHoeingOneDragon/pathing/6.3新图/005挪德卡莱虚海望十六倍曼陀草 传奇.json similarity index 97% rename from repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/16倍草&钓客/005挪德卡莱虚海望十六倍曼陀草 传奇.json rename to repo/js/AutoHoeingOneDragon/pathing/6.3新图/005挪德卡莱虚海望十六倍曼陀草 传奇.json index b28e26ef0..d2fe2cd42 100644 --- a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/16倍草&钓客/005挪德卡莱虚海望十六倍曼陀草 传奇.json +++ b/repo/js/AutoHoeingOneDragon/pathing/6.3新图/005挪德卡莱虚海望十六倍曼陀草 传奇.json @@ -1,4 +1,4 @@ -{ +{ "info": { "authors": [ { @@ -58,7 +58,6 @@ "action": "fight", "action_params": "", "id": 5, - "locked": false, "move_mode": "dash", "type": "path", "x": 9666.83203125, @@ -68,7 +67,6 @@ "action": "fight", "action_params": "", "id": 6, - "locked": false, "move_mode": "dash", "type": "path", "x": 9666.83203125, diff --git a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/16倍草&钓客/7a02临时挪德卡莱钓客_4.json b/repo/js/AutoHoeingOneDragon/pathing/6.3新图/7a02临时挪德卡莱钓客_4.json similarity index 83% rename from repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/16倍草&钓客/7a02临时挪德卡莱钓客_4.json rename to repo/js/AutoHoeingOneDragon/pathing/6.3新图/7a02临时挪德卡莱钓客_4.json index 534c611da..b91b72904 100644 --- a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/16倍草&钓客/7a02临时挪德卡莱钓客_4.json +++ b/repo/js/AutoHoeingOneDragon/pathing/6.3新图/7a02临时挪德卡莱钓客_4.json @@ -1,4 +1,4 @@ -{ +{ "info": { "authors": [ { @@ -44,6 +44,15 @@ "type": "path", "x": 10267.892578125, "y": 6323.14111328125 + }, + { + "action": "combat_script", + "action_params": "wait(1)", + "id": 4, + "move_mode": "dash", + "type": "orientation", + "x": 10267.892578125, + "y": 6323.14111328125 } ] } \ No newline at end of file diff --git a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/16倍草&钓客/7a03临时挪德卡莱2幽徒1狂狩.json b/repo/js/AutoHoeingOneDragon/pathing/6.3新图/7a03临时挪德卡莱2幽徒1狂狩.json similarity index 83% rename from repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/16倍草&钓客/7a03临时挪德卡莱2幽徒1狂狩.json rename to repo/js/AutoHoeingOneDragon/pathing/6.3新图/7a03临时挪德卡莱2幽徒1狂狩.json index 1ee451f0f..4006717da 100644 --- a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/16倍草&钓客/7a03临时挪德卡莱2幽徒1狂狩.json +++ b/repo/js/AutoHoeingOneDragon/pathing/6.3新图/7a03临时挪德卡莱2幽徒1狂狩.json @@ -1,4 +1,4 @@ -{ +{ "info": { "authors": [ { @@ -44,6 +44,15 @@ "type": "path", "x": 10139.98828125, "y": 6369.68212890625 + }, + { + "action": "combat_script", + "action_params": "wait(1)", + "id": 4, + "move_mode": "dash", + "type": "orientation", + "x": 10139.98828125, + "y": 6369.68212890625 } ] } \ No newline at end of file diff --git a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/16倍草&钓客/7a04临时挪德卡莱1狼兽4钓客.json b/repo/js/AutoHoeingOneDragon/pathing/6.3新图/7a04临时挪德卡莱1狼兽4钓客.json similarity index 73% rename from repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/16倍草&钓客/7a04临时挪德卡莱1狼兽4钓客.json rename to repo/js/AutoHoeingOneDragon/pathing/6.3新图/7a04临时挪德卡莱1狼兽4钓客.json index b4818ac08..7cd4c4a4e 100644 --- a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/16倍草&钓客/7a04临时挪德卡莱1狼兽4钓客.json +++ b/repo/js/AutoHoeingOneDragon/pathing/6.3新图/7a04临时挪德卡莱1狼兽4钓客.json @@ -1,4 +1,4 @@ -{ +{ "info": { "authors": [ { @@ -37,11 +37,29 @@ "y": 5511.2998046875 }, { - "action": "fight", + "action": "", "action_params": "", "id": 3, "move_mode": "dash", "type": "path", + "x": 9463.150390625, + "y": 5511.2998046875 + }, + { + "action": "fight", + "action_params": "", + "id": 4, + "move_mode": "dash", + "type": "path", + "x": 9416.267578125, + "y": 5467.5263671875 + }, + { + "action": "combat_script", + "action_params": "wait(1)", + "id": 5, + "move_mode": "dash", + "type": "orientation", "x": 9416.267578125, "y": 5467.5263671875 } diff --git a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/16倍草&钓客/7a05临时挪德卡莱9钓客.json b/repo/js/AutoHoeingOneDragon/pathing/6.3新图/7a05临时挪德卡莱9钓客.json similarity index 71% rename from repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/16倍草&钓客/7a05临时挪德卡莱9钓客.json rename to repo/js/AutoHoeingOneDragon/pathing/6.3新图/7a05临时挪德卡莱9钓客.json index f63399814..acf070966 100644 --- a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/16倍草&钓客/7a05临时挪德卡莱9钓客.json +++ b/repo/js/AutoHoeingOneDragon/pathing/6.3新图/7a05临时挪德卡莱9钓客.json @@ -1,4 +1,4 @@ -{ +{ "info": { "authors": [ { @@ -37,18 +37,36 @@ "y": 6318.3359375 }, { - "action": "fight", + "action": "", "action_params": "", "id": 3, "move_mode": "dash", "type": "path", + "x": 10141.259765625, + "y": 6318.3359375 + }, + { + "action": "fight", + "action_params": "", + "id": 4, + "move_mode": "dash", + "type": "path", "x": 10131.9169921875, "y": 6303.56787109375 }, { "action": "", "action_params": "", - "id": 4, + "id": 5, + "move_mode": "dash", + "type": "path", + "x": 10131.9169921875, + "y": 6303.56787109375 + }, + { + "action": "", + "action_params": "", + "id": 6, "move_mode": "dash", "type": "path", "x": 10119.0751953125, @@ -57,11 +75,20 @@ { "action": "fight", "action_params": "", - "id": 5, + "id": 7, "move_mode": "jump", "type": "path", "x": 10092.439453125, "y": 6282.8681640625 + }, + { + "action": "combat_script", + "action_params": "wait(1)", + "id": 8, + "move_mode": "jump", + "type": "orientation", + "x": 10092.439453125, + "y": 6282.8681640625 } ] } \ No newline at end of file diff --git a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/旧日之海/004枫丹旧日之海龙蜥 传奇.json b/repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/旧日之海/004枫丹旧日之海龙蜥 传奇.json similarity index 97% rename from repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/旧日之海/004枫丹旧日之海龙蜥 传奇.json rename to repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/旧日之海/004枫丹旧日之海龙蜥 传奇.json index 8f9a17c45..92773d98a 100644 --- a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/旧日之海/004枫丹旧日之海龙蜥 传奇.json +++ b/repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/旧日之海/004枫丹旧日之海龙蜥 传奇.json @@ -56,7 +56,7 @@ }, { "action": "combat_script", - "action_params": "wait(0.2)", + "action_params": "wait(1)", "id": 5, "move_mode": "dash", "type": "orientation", diff --git a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/旧日之海/525枫丹切萨勒姆宫(200_2).json b/repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/旧日之海/525枫丹切萨勒姆宫(200_2).json similarity index 83% rename from repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/旧日之海/525枫丹切萨勒姆宫(200_2).json rename to repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/旧日之海/525枫丹切萨勒姆宫(200_2).json index 73a5ec6db..406a3cdee 100644 --- a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/旧日之海/525枫丹切萨勒姆宫(200_2).json +++ b/repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/旧日之海/525枫丹切萨勒姆宫(200_2).json @@ -44,6 +44,15 @@ "type": "path", "x": 4713.1474609375, "y": 1388.3568115234375 + }, + { + "action": "combat_script", + "action_params": "wait(1)", + "id": 4, + "move_mode": "dash", + "type": "orientation", + "x": 4713.1474609375, + "y": 1388.3568115234375 } ] } \ No newline at end of file diff --git a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/旧日之海/526枫丹切萨勒姆宫东(200_2).json b/repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/旧日之海/526枫丹切萨勒姆宫东(200_2).json similarity index 87% rename from repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/旧日之海/526枫丹切萨勒姆宫东(200_2).json rename to repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/旧日之海/526枫丹切萨勒姆宫东(200_2).json index b84934ba0..48be4f4eb 100644 --- a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/旧日之海/526枫丹切萨勒姆宫东(200_2).json +++ b/repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/旧日之海/526枫丹切萨勒姆宫东(200_2).json @@ -40,7 +40,6 @@ "action": "combat_script", "action_params": "keydown(w),wait(2.4),dash", "id": 3, - "locked": false, "move_mode": "dash", "type": "orientation", "x": 4541.044921875, @@ -63,6 +62,15 @@ "type": "path", "x": 4556.9306640625, "y": 1311.4007568359375 + }, + { + "action": "combat_script", + "action_params": "wait(1)", + "id": 6, + "move_mode": "dash", + "type": "orientation", + "x": 4556.9306640625, + "y": 1311.4007568359375 } ] } \ No newline at end of file diff --git a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/旧日之海/527枫丹旧日之海谐律院(200_2).json b/repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/旧日之海/527枫丹旧日之海谐律院(200_2).json similarity index 83% rename from repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/旧日之海/527枫丹旧日之海谐律院(200_2).json rename to repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/旧日之海/527枫丹旧日之海谐律院(200_2).json index 3d7ca0808..9dd49a56b 100644 --- a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/旧日之海/527枫丹旧日之海谐律院(200_2).json +++ b/repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/旧日之海/527枫丹旧日之海谐律院(200_2).json @@ -44,6 +44,15 @@ "type": "path", "x": 3967.423583984375, "y": 1273.9945068359375 + }, + { + "action": "combat_script", + "action_params": "wait(1)", + "id": 4, + "move_mode": "dash", + "type": "orientation", + "x": 3967.423583984375, + "y": 1273.9945068359375 } ] } \ No newline at end of file diff --git a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/远古圣山/6a01纳塔远古圣山聚火祭验所西.json b/repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/远古圣山/6a01纳塔远古圣山聚火祭验所西.json similarity index 99% rename from repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/远古圣山/6a01纳塔远古圣山聚火祭验所西.json rename to repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/远古圣山/6a01纳塔远古圣山聚火祭验所西.json index 6a237a62e..d711db454 100644 --- a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/远古圣山/6a01纳塔远古圣山聚火祭验所西.json +++ b/repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/远古圣山/6a01纳塔远古圣山聚火祭验所西.json @@ -1,4 +1,4 @@ -{ +{ "info": { "authors": [ { diff --git a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/远古圣山/6a02纳塔远古圣山聚火祭验所西.json b/repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/远古圣山/6a02纳塔远古圣山聚火祭验所西.json similarity index 91% rename from repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/远古圣山/6a02纳塔远古圣山聚火祭验所西.json rename to repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/远古圣山/6a02纳塔远古圣山聚火祭验所西.json index 208098745..00209437a 100644 --- a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/远古圣山/6a02纳塔远古圣山聚火祭验所西.json +++ b/repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/远古圣山/6a02纳塔远古圣山聚火祭验所西.json @@ -1,4 +1,4 @@ -{ +{ "info": { "authors": [ { @@ -63,10 +63,19 @@ "x": -147.67919921875, "y": -215.98095703125 }, + { + "action": "", + "action_params": "", + "id": 6, + "move_mode": "dash", + "type": "path", + "x": -147.67919921875, + "y": -215.98095703125 + }, { "action": "combat_script", "action_params": "attack;芙宁娜 e", - "id": 6, + "id": 7, "move_mode": "dash", "type": "path", "x": -176.656494140625, @@ -75,7 +84,7 @@ { "action": "fight", "action_params": "", - "id": 7, + "id": 8, "move_mode": "dash", "type": "path", "x": -266.62939453125, @@ -84,7 +93,7 @@ { "action": "combat_script", "action_params": "wait(1)", - "id": 8, + "id": 9, "move_mode": "walk", "type": "orientation", "x": -266.636962890625, diff --git a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/远古圣山/6a03纳塔远古圣山聚火祭验所东.json b/repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/远古圣山/6a03纳塔远古圣山聚火祭验所东.json similarity index 90% rename from repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/远古圣山/6a03纳塔远古圣山聚火祭验所东.json rename to repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/远古圣山/6a03纳塔远古圣山聚火祭验所东.json index 812231fc4..7d7474792 100644 --- a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/远古圣山/6a03纳塔远古圣山聚火祭验所东.json +++ b/repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/远古圣山/6a03纳塔远古圣山聚火祭验所东.json @@ -1,4 +1,4 @@ -{ +{ "info": { "authors": [ { @@ -51,13 +51,22 @@ "id": 4, "move_mode": "dash", "type": "path", + "x": -331.73291015625, + "y": -245.585205078125 + }, + { + "action": "", + "action_params": "", + "id": 5, + "move_mode": "dash", + "type": "path", "x": -331.733154296875, "y": -245.590087890625 }, { "action": "", "action_params": "", - "id": 5, + "id": 6, "move_mode": "dash", "type": "path", "x": -406.59912109375, @@ -66,7 +75,7 @@ { "action": "fight", "action_params": "", - "id": 6, + "id": 7, "move_mode": "dash", "type": "path", "x": -409.73974609375, @@ -75,7 +84,7 @@ { "action": "combat_script", "action_params": "wait(1)", - "id": 7, + "id": 8, "move_mode": "dash", "type": "orientation", "x": -409.73974609375, diff --git a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/远古圣山/6a04纳塔远古圣山聚火祭验所东北.json b/repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/远古圣山/6a04纳塔远古圣山聚火祭验所东北.json similarity index 93% rename from repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/远古圣山/6a04纳塔远古圣山聚火祭验所东北.json rename to repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/远古圣山/6a04纳塔远古圣山聚火祭验所东北.json index ef830b514..f67ccbd89 100644 --- a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/远古圣山/6a04纳塔远古圣山聚火祭验所东北.json +++ b/repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/远古圣山/6a04纳塔远古圣山聚火祭验所东北.json @@ -1,4 +1,4 @@ -{ +{ "info": { "authors": [ { @@ -78,13 +78,22 @@ "id": 7, "move_mode": "dash", "type": "path", + "x": -641.77880859375, + "y": 190.7513427734375 + }, + { + "action": "", + "action_params": "", + "id": 8, + "move_mode": "dash", + "type": "path", "x": -631.021240234375, "y": 194.3299560546875 }, { "action": "", "action_params": "", - "id": 8, + "id": 9, "move_mode": "dash", "type": "path", "x": -618.7099609375, @@ -93,7 +102,7 @@ { "action": "stop_flying", "action_params": "", - "id": 9, + "id": 10, "move_mode": "fly", "type": "target", "x": -585.486083984375, @@ -102,7 +111,7 @@ { "action": "combat_script", "action_params": "keydown(w),dash(4.5),keyup(w)", - "id": 10, + "id": 11, "move_mode": "walk", "type": "orientation", "x": -587.25, @@ -111,7 +120,7 @@ { "action": "fight", "action_params": "", - "id": 11, + "id": 12, "move_mode": "walk", "type": "orientation", "x": -585.486083984375, @@ -120,7 +129,7 @@ { "action": "combat_script", "action_params": "wait(1)", - "id": 12, + "id": 13, "move_mode": "walk", "type": "orientation", "x": -585.486083984375, diff --git a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/远古圣山/6b01纳塔远古圣山分流识海东南.json b/repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/远古圣山/6b01纳塔远古圣山分流识海东南.json similarity index 84% rename from repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/远古圣山/6b01纳塔远古圣山分流识海东南.json rename to repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/远古圣山/6b01纳塔远古圣山分流识海东南.json index 389215104..14bf67808 100644 --- a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/远古圣山/6b01纳塔远古圣山分流识海东南.json +++ b/repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/远古圣山/6b01纳塔远古圣山分流识海东南.json @@ -1,4 +1,4 @@ -{ +{ "info": { "authors": [ { @@ -44,6 +44,15 @@ "type": "path", "x": 182.517333984375, "y": -59.42822265625 + }, + { + "action": "combat_script", + "action_params": "wait(1)", + "id": 4, + "move_mode": "dash", + "type": "orientation", + "x": 182.517333984375, + "y": -59.42822265625 } ] } \ No newline at end of file diff --git a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/远古圣山/6b02纳塔远古圣山分流识海东南.json b/repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/远古圣山/6b02纳塔远古圣山分流识海东南.json similarity index 87% rename from repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/远古圣山/6b02纳塔远古圣山分流识海东南.json rename to repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/远古圣山/6b02纳塔远古圣山分流识海东南.json index 2c9254a24..d7a6088b1 100644 --- a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/远古圣山/6b02纳塔远古圣山分流识海东南.json +++ b/repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/远古圣山/6b02纳塔远古圣山分流识海东南.json @@ -1,4 +1,4 @@ -{ +{ "info": { "authors": [ { @@ -69,13 +69,22 @@ "id": 6, "move_mode": "dash", "type": "path", + "x": 263.277587890625, + "y": -22.694580078125 + }, + { + "action": "", + "action_params": "", + "id": 7, + "move_mode": "dash", + "type": "path", "x": 307.8809814453125, "y": -27.71728515625 }, { "action": "combat_script", "action_params": "attack;芙宁娜 e", - "id": 7, + "id": 8, "move_mode": "dash", "type": "path", "x": 340.4974365234375, @@ -84,7 +93,7 @@ { "action": "fight", "action_params": "", - "id": 8, + "id": 9, "move_mode": "dash", "type": "path", "x": 334.5916748046875, @@ -93,7 +102,16 @@ { "action": "", "action_params": "", - "id": 9, + "id": 10, + "move_mode": "dash", + "type": "path", + "x": 334.5916748046875, + "y": -68.903076171875 + }, + { + "action": "", + "action_params": "", + "id": 11, "move_mode": "dash", "type": "path", "x": 343.25, @@ -102,7 +120,7 @@ { "action": "", "action_params": "", - "id": 10, + "id": 12, "move_mode": "fly", "type": "path", "x": 356.7403564453125, @@ -111,7 +129,7 @@ { "action": "stop_flying", "action_params": "", - "id": 11, + "id": 13, "move_mode": "fly", "type": "path", "x": 337.0032958984375, @@ -120,7 +138,7 @@ { "action": "combat_script", "action_params": "attack;芙宁娜 e", - "id": 12, + "id": 14, "move_mode": "dash", "type": "path", "x": 342.8885498046875, @@ -129,7 +147,7 @@ { "action": "", "action_params": "", - "id": 13, + "id": 15, "move_mode": "dash", "type": "path", "x": 327.3887939453125, @@ -138,7 +156,7 @@ { "action": "combat_script", "action_params": "attack;芙宁娜 e", - "id": 14, + "id": 16, "move_mode": "dash", "type": "path", "x": 329.753662109375, @@ -147,7 +165,7 @@ { "action": "fight", "action_params": "", - "id": 15, + "id": 17, "move_mode": "dash", "type": "path", "x": 328.6611328125, @@ -156,7 +174,16 @@ { "action": "", "action_params": "", - "id": 16, + "id": 18, + "move_mode": "dash", + "type": "path", + "x": 328.6611328125, + "y": -58.53076171875 + }, + { + "action": "", + "action_params": "", + "id": 19, "move_mode": "dash", "type": "path", "x": 334.485595703125, @@ -165,7 +192,7 @@ { "action": "combat_script", "action_params": "attack;芙宁娜 e", - "id": 17, + "id": 20, "move_mode": "dash", "type": "path", "x": 377.86376953125, @@ -174,7 +201,7 @@ { "action": "", "action_params": "", - "id": 18, + "id": 21, "move_mode": "dash", "type": "path", "x": 404.8792724609375, @@ -183,7 +210,7 @@ { "action": "fight", "action_params": "", - "id": 19, + "id": 22, "move_mode": "dash", "type": "path", "x": 414.243896484375, @@ -192,7 +219,16 @@ { "action": "", "action_params": "", - "id": 20, + "id": 23, + "move_mode": "dash", + "type": "path", + "x": 414.243896484375, + "y": -96.0693359375 + }, + { + "action": "", + "action_params": "", + "id": 24, "move_mode": "dash", "type": "path", "x": 447.2540283203125, @@ -201,7 +237,7 @@ { "action": "combat_script", "action_params": "attack;芙宁娜 e", - "id": 21, + "id": 25, "move_mode": "dash", "type": "path", "x": 457.986083984375, @@ -210,7 +246,7 @@ { "action": "", "action_params": "", - "id": 22, + "id": 26, "move_mode": "dash", "type": "path", "x": 473.8603515625, @@ -219,7 +255,7 @@ { "action": "fight", "action_params": "", - "id": 23, + "id": 27, "move_mode": "dash", "type": "path", "x": 457.986083984375, @@ -228,7 +264,7 @@ { "action": "combat_script", "action_params": "wait(1)", - "id": 24, + "id": 28, "move_mode": "dash", "type": "orientation", "x": 457.986083984375, diff --git a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/远古圣山/6b03纳塔远古圣山分流识海中.json b/repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/远古圣山/6b03纳塔远古圣山分流识海中.json similarity index 100% rename from repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/远古圣山/6b03纳塔远古圣山分流识海中.json rename to repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/远古圣山/6b03纳塔远古圣山分流识海中.json diff --git a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/远古圣山/6b04纳塔远古圣山分流识海北.json b/repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/远古圣山/6b04纳塔远古圣山分流识海北.json similarity index 99% rename from repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/远古圣山/6b04纳塔远古圣山分流识海北.json rename to repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/远古圣山/6b04纳塔远古圣山分流识海北.json index ea5ab70f3..3f4674cb8 100644 --- a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/远古圣山/6b04纳塔远古圣山分流识海北.json +++ b/repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/远古圣山/6b04纳塔远古圣山分流识海北.json @@ -1,4 +1,4 @@ -{ +{ "info": { "authors": [ { diff --git a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/远古圣山/6b05纳塔远古圣山分流识海西.json b/repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/远古圣山/6b05纳塔远古圣山分流识海西.json similarity index 96% rename from repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/远古圣山/6b05纳塔远古圣山分流识海西.json rename to repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/远古圣山/6b05纳塔远古圣山分流识海西.json index fcb786bf3..86eb4d6e0 100644 --- a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/远古圣山/6b05纳塔远古圣山分流识海西.json +++ b/repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/远古圣山/6b05纳塔远古圣山分流识海西.json @@ -1,4 +1,4 @@ -{ +{ "info": { "authors": [ { @@ -69,21 +69,21 @@ "id": 6, "move_mode": "dash", "type": "path", + "x": 361.61376953125, + "y": 99.7017822265625 + }, + { + "action": "", + "action_params": "", + "id": 7, + "move_mode": "dash", + "type": "path", "x": 361.2373046875, "y": 100.6024169921875 }, { "action": "fight", "action_params": "", - "id": 7, - "move_mode": "dash", - "type": "path", - "x": 351.7164306640625, - "y": 134.3717041015625 - }, - { - "action": "", - "action_params": "", "id": 8, "move_mode": "dash", "type": "path", @@ -96,13 +96,22 @@ "id": 9, "move_mode": "dash", "type": "path", + "x": 351.7164306640625, + "y": 134.3717041015625 + }, + { + "action": "", + "action_params": "", + "id": 10, + "move_mode": "dash", + "type": "path", "x": 354.285888671875, "y": 142.2803955078125 }, { "action": "fight", "action_params": "", - "id": 10, + "id": 11, "move_mode": "dash", "type": "path", "x": 312.4649658203125, @@ -111,7 +120,7 @@ { "action": "combat_script", "action_params": "click(middle),keypress(T),moveby(1200,0),wait(0.5),keypress(T),moveby(1200,0),wait(0.5),keypress(T),moveby(1200,0),wait(0.5),keypress(T),moveby(1200,0),wait(0.5),keypress(T),moveby(1200,0),wait(0.5),keypress(T)", - "id": 11, + "id": 12, "move_mode": "dash", "type": "target", "x": 312.4649658203125, @@ -120,7 +129,7 @@ { "action": "", "action_params": "", - "id": 12, + "id": 13, "move_mode": "walk", "type": "path", "x": 299.9208984375, @@ -129,7 +138,7 @@ { "action": "", "action_params": "", - "id": 13, + "id": 14, "move_mode": "walk", "type": "path", "x": 280.5816650390625, @@ -138,7 +147,7 @@ { "action": "", "action_params": "", - "id": 14, + "id": 15, "move_mode": "walk", "type": "target", "x": 277.4586181640625, @@ -147,7 +156,7 @@ { "action": "combat_script", "action_params": "keydown(e),wait(1.5),keyup(e),wait(0.5),j,keypress(e)", - "id": 15, + "id": 16, "move_mode": "walk", "type": "orientation", "x": 266.3702392578125, @@ -156,7 +165,7 @@ { "action": "", "action_params": "", - "id": 16, + "id": 17, "move_mode": "walk", "type": "path", "x": 266.18896484375, @@ -165,7 +174,7 @@ { "action": "combat_script", "action_params": "keydown(Q),wait(1.5),keyup(Q),wait(0.1)", - "id": 17, + "id": 18, "move_mode": "dash", "type": "path", "x": 253.0037841796875, @@ -174,7 +183,7 @@ { "action": "fight", "action_params": "", - "id": 18, + "id": 19, "move_mode": "dash", "type": "path", "x": 248.2806396484375, @@ -183,7 +192,7 @@ { "action": "combat_script", "action_params": "wait(1)", - "id": 19, + "id": 20, "move_mode": "dash", "type": "orientation", "x": 248.2806396484375, diff --git a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/远古圣山/6c01纳塔远古圣山力向逆心西.json b/repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/远古圣山/6c01纳塔远古圣山力向逆心西.json similarity index 83% rename from repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/远古圣山/6c01纳塔远古圣山力向逆心西.json rename to repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/远古圣山/6c01纳塔远古圣山力向逆心西.json index bd5213f85..767bf61e5 100644 --- a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/远古圣山/6c01纳塔远古圣山力向逆心西.json +++ b/repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/远古圣山/6c01纳塔远古圣山力向逆心西.json @@ -1,4 +1,4 @@ -{ +{ "info": { "authors": [ { @@ -55,9 +55,18 @@ "y": 340.62158203125 }, { - "action": "fight", + "action": "", "action_params": "", "id": 5, + "move_mode": "dash", + "type": "path", + "x": 308.025146484375, + "y": 340.62158203125 + }, + { + "action": "fight", + "action_params": "", + "id": 6, "move_mode": "jump", "type": "path", "x": 340.746826171875, @@ -66,7 +75,16 @@ { "action": "", "action_params": "", - "id": 6, + "id": 7, + "move_mode": "dash", + "type": "path", + "x": 340.746826171875, + "y": 337.2044677734375 + }, + { + "action": "", + "action_params": "", + "id": 8, "move_mode": "dash", "type": "path", "x": 337.4010009765625, @@ -75,7 +93,7 @@ { "action": "", "action_params": "", - "id": 7, + "id": 9, "move_mode": "dash", "type": "path", "x": 303.4107666015625, @@ -84,7 +102,7 @@ { "action": "", "action_params": "", - "id": 8, + "id": 10, "move_mode": "dash", "type": "path", "x": 316.9466552734375, @@ -93,7 +111,7 @@ { "action": "fight", "action_params": "", - "id": 9, + "id": 11, "move_mode": "dash", "type": "path", "x": 315.271240234375, @@ -102,7 +120,16 @@ { "action": "", "action_params": "", - "id": 10, + "id": 12, + "move_mode": "dash", + "type": "path", + "x": 315.271240234375, + "y": 244.720703125 + }, + { + "action": "", + "action_params": "", + "id": 13, "move_mode": "dash", "type": "path", "x": 293.7569580078125, @@ -111,7 +138,7 @@ { "action": "", "action_params": "", - "id": 11, + "id": 14, "move_mode": "dash", "type": "path", "x": 252.1058349609375, @@ -120,7 +147,7 @@ { "action": "", "action_params": "", - "id": 12, + "id": 15, "move_mode": "dash", "type": "path", "x": 249.1748046875, @@ -129,7 +156,7 @@ { "action": "fight", "action_params": "", - "id": 13, + "id": 16, "move_mode": "dash", "type": "path", "x": 245.1219482421875, @@ -138,7 +165,16 @@ { "action": "", "action_params": "", - "id": 14, + "id": 17, + "move_mode": "dash", + "type": "path", + "x": 245.1219482421875, + "y": 221.2191162109375 + }, + { + "action": "", + "action_params": "", + "id": 18, "move_mode": "jump", "type": "path", "x": 249.0576171875, @@ -147,7 +183,7 @@ { "action": "", "action_params": "", - "id": 15, + "id": 19, "move_mode": "dash", "type": "path", "x": 230.44140625, @@ -156,7 +192,7 @@ { "action": "fight", "action_params": "", - "id": 16, + "id": 20, "move_mode": "dash", "type": "path", "x": 173.629638671875, @@ -165,7 +201,7 @@ { "action": "combat_script", "action_params": "wait(1)", - "id": 17, + "id": 21, "move_mode": "dash", "type": "orientation", "x": 173.629638671875, diff --git a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/远古圣山/6c02纳塔远古圣山力向逆心西.json b/repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/远古圣山/6c02纳塔远古圣山力向逆心西.json similarity index 99% rename from repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/远古圣山/6c02纳塔远古圣山力向逆心西.json rename to repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/远古圣山/6c02纳塔远古圣山力向逆心西.json index 2bf10b586..213469dcd 100644 --- a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/远古圣山/6c02纳塔远古圣山力向逆心西.json +++ b/repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/远古圣山/6c02纳塔远古圣山力向逆心西.json @@ -1,4 +1,4 @@ -{ +{ "info": { "authors": [ { diff --git a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/远古圣山/6c03纳塔远古圣山力向逆心北.json b/repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/远古圣山/6c03纳塔远古圣山力向逆心北.json similarity index 99% rename from repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/远古圣山/6c03纳塔远古圣山力向逆心北.json rename to repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/远古圣山/6c03纳塔远古圣山力向逆心北.json index e08e3ebbc..94d61b923 100644 --- a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/远古圣山/6c03纳塔远古圣山力向逆心北.json +++ b/repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/远古圣山/6c03纳塔远古圣山力向逆心北.json @@ -1,4 +1,4 @@ -{ +{ "info": { "authors": [ { diff --git a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/远古圣山/6c04纳塔远古圣山支离武备所.json b/repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/远古圣山/6c04纳塔远古圣山支离武备所.json similarity index 100% rename from repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/远古圣山/6c04纳塔远古圣山支离武备所.json rename to repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/远古圣山/6c04纳塔远古圣山支离武备所.json diff --git a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/远古圣山/6c05纳塔远古圣山支离武备所东【狭窄地形】.json b/repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/远古圣山/6c05纳塔远古圣山支离武备所东【狭窄地形】.json similarity index 99% rename from repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/远古圣山/6c05纳塔远古圣山支离武备所东【狭窄地形】.json rename to repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/远古圣山/6c05纳塔远古圣山支离武备所东【狭窄地形】.json index c47d9c21a..03e298fe1 100644 --- a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/远古圣山/6c05纳塔远古圣山支离武备所东【狭窄地形】.json +++ b/repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/远古圣山/6c05纳塔远古圣山支离武备所东【狭窄地形】.json @@ -1,4 +1,4 @@ -{ +{ "info": { "authors": [ { diff --git a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/远古圣山/6c06纳塔远古圣山支离武备所东【高危】.json b/repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/远古圣山/6c06纳塔远古圣山支离武备所东【高危】.json similarity index 98% rename from repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/远古圣山/6c06纳塔远古圣山支离武备所东【高危】.json rename to repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/远古圣山/6c06纳塔远古圣山支离武备所东【高危】.json index f5d504f7d..f7efe7728 100644 --- a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/远古圣山/6c06纳塔远古圣山支离武备所东【高危】.json +++ b/repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/远古圣山/6c06纳塔远古圣山支离武备所东【高危】.json @@ -83,7 +83,7 @@ }, { "action": "combat_script", - "action_params": "wait(0.1)", + "action_params": "wait(1)", "id": 8, "move_mode": "run", "type": "orientation", diff --git a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/远古圣山/6c07纳塔远古圣山拟星的台座.json b/repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/远古圣山/6c07纳塔远古圣山拟星的台座.json similarity index 99% rename from repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/远古圣山/6c07纳塔远古圣山拟星的台座.json rename to repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/远古圣山/6c07纳塔远古圣山拟星的台座.json index 1c93f3e00..8f3f9e0e0 100644 --- a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/远古圣山/6c07纳塔远古圣山拟星的台座.json +++ b/repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/远古圣山/6c07纳塔远古圣山拟星的台座.json @@ -1,4 +1,4 @@ -{ +{ "info": { "authors": [ { diff --git a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/远古圣山/6c08纳塔远古圣山拟星的台座【狭窄地形】.json b/repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/远古圣山/6c08纳塔远古圣山拟星的台座【狭窄地形】.json similarity index 99% rename from repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/远古圣山/6c08纳塔远古圣山拟星的台座【狭窄地形】.json rename to repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/远古圣山/6c08纳塔远古圣山拟星的台座【狭窄地形】.json index b98762041..941b3d4fe 100644 --- a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/远古圣山/6c08纳塔远古圣山拟星的台座【狭窄地形】.json +++ b/repo/js/AutoHoeingOneDragon/pathing/旧日和圣山锄地路线/远古圣山/6c08纳塔远古圣山拟星的台座【狭窄地形】.json @@ -1,4 +1,4 @@ -{ +{ "info": { "authors": [ { diff --git a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/16倍草&钓客/README.md b/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/16倍草&钓客/README.md deleted file mode 100644 index 065ebdb9d..000000000 --- a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/16倍草&钓客/README.md +++ /dev/null @@ -1,4 +0,0 @@ -6.3地图目前(2026/1/14)正式版无法使用,当你使用的bgi版本为0.55+时才可以使用这部分路线 -请确保你的bgi版本已经支持6.3地图 -确认可以使用时,将该部分路线复制到pathing文件夹下任意位置 - diff --git a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/README.md b/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/README.md deleted file mode 100644 index 92e01c04b..000000000 --- a/repo/js/AutoHoeingOneDragon/实验路线(阅读对应文件夹中说明才能使用)/旧日和圣山锄地路线/README.md +++ /dev/null @@ -1,4 +0,0 @@ -旧日之海与远古圣山地图目前(2026/1/8)正式版无法使用,当你使用的bgi版本为测试版时才可以使用这部分路线 - -确认可以使用时,将该部分路线复制到pathing文件夹下任意位置 - diff --git a/repo/js/采集cd管理/main.js b/repo/js/采集cd管理/main.js index 9d3ae0808..d7c6458dd 100644 --- a/repo/js/采集cd管理/main.js +++ b/repo/js/采集cd管理/main.js @@ -180,6 +180,11 @@ let checkInterval = +settings.checkInterval || 50; "type": "input-text", "label": "填写需要禁用的路线的关键词,使用中文分号分隔\n文件路径含有相关关键词的路线会被禁用" }, + { + "name": "disableXYCheck", + "type": "checkbox", + "label": "勾选后跳过路线完成后的坐标校验\n【警告】运行卡死等未成功到达终点的路线也将进入cd" + }, { "name": "findFInterval", "type": "input-text", @@ -555,6 +560,7 @@ let checkInterval = +settings.checkInterval || 50; "云岩裂叶": "46小时刷新", "琉鳞石": "46小时刷新", "奇异的「牙齿」": "46小时刷新", + "冬凌草": "46小时刷新", // 12h 素材 "兽肉": "12小时刷新", @@ -2042,10 +2048,8 @@ async function appendDailyPickup(pickupLog) { }); // 滑动窗口:只保留最新 MAX_PICKUP_DAYS 条 - if (oldArr.length > MAX_PICKUP_DAYS) oldArr = oldArr.slice(0, MAX_PICKUP_DAYS); - - // 按日期倒序(最新在前) - oldArr.sort((a, b) => b.date.localeCompare(a.date)); + oldArr.sort((a, b) => b.date.localeCompare(a.date)); // 先排序 + if (oldArr.length > MAX_PICKUP_DAYS) oldArr = oldArr.slice(0, MAX_PICKUP_DAYS); // 再截断 // 写盘 + 异常捕获 try { @@ -2090,6 +2094,10 @@ async function findAndClick(target, doClick = true, maxAttempts = 60) { */ function isArrivedAtEndPoint(fullPath) { try { + if (settings.disableXYCheck) { + log.info("当前禁用了坐标校验,跳过坐标检查") + return true; + } /* 1. 读路线文件,取终点坐标 */ const raw = file.readTextSync(fullPath); const json = JSON.parse(raw); @@ -2110,14 +2118,20 @@ function isArrivedAtEndPoint(fullPath) { /* 2. 取当前人物坐标 */ const mapName = (json.info?.map_name && json.info.map_name.trim()) ? json.info.map_name : 'Teyvat'; - const pos = genshin.getPositionFromMap(mapName); // 同步 API + const pos = genshin.getPositionFromMap(mapName, 3000); const curX = pos.X; const curY = pos.Y; + let pathres = Math.abs(endX - curX) + Math.abs(endY - curY) <= 30; + if (!pathres) { + log.warn(`距离预定终点${Math.abs(endX - curX) + Math.abs(endY - curY)}`); + log.warn(`距离异常,不记录数据`); + } /* 3. 曼哈顿距离 ≤30 视为到达 */ - return Math.abs(endX - curX) + Math.abs(endY - curY) <= 30; + return pathres; } catch (e) { /* 任何异常(读盘失败、解析失败、API 异常)都算“未到达” */ + log.warn(`出现异常${error.message},不记录cd`); return false; } } diff --git a/repo/js/采集cd管理/manifest.json b/repo/js/采集cd管理/manifest.json index 8eacc215e..d271b1f10 100644 --- a/repo/js/采集cd管理/manifest.json +++ b/repo/js/采集cd管理/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 1, "name": "采集cd管理", - "version": "2.8.4", + "version": "2.9.0", "bgi_version": "0.44.8", "description": "仅面对会操作文件和读readme的用户,基于文件夹操作自动管理采集路线的cd,会按照路径组的顺序依次运行,直到指定的时间,并会按照给定的cd类型,自动跳过未刷新的路线", "saved_files": [