diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-镜璧山-七天神像下-3个-f.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-镜璧山-七天神像下-3个-f.json index dd7f63c2..732b5466 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-镜璧山-七天神像下-3个-f.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-镜璧山-七天神像下-3个-f.json @@ -19,8 +19,8 @@ "move_mode": "walk" }, { - "x": 9544.2265625, - "y": -1765.392578125, + "x": 9546.2421875, + "y": -1766.9150390625, "type": "path", "move_mode": "fly", "action": "combat_script", diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-镜璧山-南-9个-f.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-镜璧山-南-9个-f.json index 51d9aed0..310e134f 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-镜璧山-南-9个-f.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-纳塔-镜璧山-南-9个-f.json @@ -107,6 +107,12 @@ "type": "path", "move_mode": "walk" }, + { + "x": 9575.009765625, + "y": -1961.1123046875, + "type": "path", + "move_mode": "walk" + }, diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-龙脊雪山-西-3个-f.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-蒙德-龙脊雪山-西-3个-f.json similarity index 90% rename from repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-龙脊雪山-西-3个-f.json rename to repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-蒙德-龙脊雪山-西-3个-f.json index 8faffd7c..9546e6a7 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-龙脊雪山-西-3个-f.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-蒙德-龙脊雪山-西-3个-f.json @@ -15,25 +15,25 @@ "x": -411.111328125, "y": 1188.4970703125, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { "x": -418.5693359375, "y": 1198.78271484375, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { "x": -473.318359375, "y": 1170.80029296875, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { "x": -496.7890625, "y": 1148.134765625, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-须弥-须弥城-4个.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-须弥-须弥城-4个.json index 94715e18..6f5d1eef 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-须弥-须弥城-4个.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮A线@Yang-z/狗粮-须弥-须弥城-4个.json @@ -13,6 +13,14 @@ "move_mode": "walk" }, + { + "x": 2864.76025390625, + "y": -301.87109375, + "type": "target", + "move_mode": "walk", + "action": "", + "#": "1" + }, { "x": 2864.76025390625, "y": -301.87109375, @@ -26,7 +34,7 @@ "x": 2844.2900390625, "y": -293.8876953125, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { "x": 2801.1259765625, diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/【收尾】狗粮-稻妻-清籁岛-清籁丸-20个-f.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/【收尾】狗粮-稻妻-清籁岛-清籁丸-20个-f.json index 69483c12..3efd1afb 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/【收尾】狗粮-稻妻-清籁岛-清籁丸-20个-f.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/【收尾】狗粮-稻妻-清籁岛-清籁丸-20个-f.json @@ -15,7 +15,7 @@ "x": -3888.8369140625, "y": -4398.5390625, "type": "path", - "move_mode": "run" + "move_mode": "walk" }, { "x": -3850.6845703125, @@ -34,6 +34,14 @@ "action": "", "#": "SE1" }, + { + "x": -3850.6787109375, + "y": -4510.998046875, + "type": "target", + "move_mode": "walk", + "action": "", + "#": "SE1" + }, { "x": -3848.8515625, "y": -4510.4755859375, @@ -86,19 +94,24 @@ "move_mode": "walk" }, - { - "x": -3835.259765625, - "y": -4488.0927734375, + "x": -3835.5830078125, + "y": -4483.216796875, "type": "path", "move_mode": "dash" }, + { + "x": -3840.095703125, + "y": -4483.7294921875, + "type": "orientation", + "move_mode": "walk" + }, { - "x": -3840.205078125, - "y": -4483.6513671875, + "x": -3840.095703125, + "y": -4483.7294921875, "type": "target", - "move_mode": "fly", + "move_mode": "walk", "action": "", "#": "SE3" }, @@ -208,8 +221,8 @@ "move_mode": "walk" }, { - "x": -3776.099609375, - "y": -4440.3583984375, + "x": -3775.7900390625, + "y": -4441.2607421875, "type": "target", "move_mode": "walk", "action": "", diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-枫丹庭区-3个.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-枫丹庭区-3个.json index 241b42c0..07ea6925 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-枫丹庭区-3个.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-枫丹庭区-3个.json @@ -75,18 +75,20 @@ }, { - "x": 4471.1904296875, - "y": 3566.983642578125, + "x": 4470.59619140625, + "y": 3566.292724609375, "type": "target", "move_mode": "walk", "action": "", "#" : "3" }, { - "x": 4471.05224609375, - "y": 3564.799072265625, - "type": "path", - "move_mode": "walk" + "x": 4470.8291015625, + "y": 3566.026123046875, + "type": "target", + "move_mode": "walk", + "action": "", + "#" : "3" } ] } \ No newline at end of file diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-研究院区-中部塔内-9个.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-研究院区-中部塔内-9个.json index 1a1ed4c0..49724aaa 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-研究院区-中部塔内-9个.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-研究院区-中部塔内-9个.json @@ -269,7 +269,8 @@ "y": 4921.35107421875, "type": "target", "move_mode": "walk", - "action": "", + "action": "combat_script", + "action_params": "wait(1.0)", "#" : "8" }, { diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-研究院区-西北-6个/7个.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-研究院区-西北-6个/7个.json index d44e182b..8a861879 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-研究院区-西北-6个/7个.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-枫丹-研究院区-西北-6个/7个.json @@ -13,16 +13,16 @@ }, { - "x": 4609.60595703125, - "y": 4937.71826171875, - "type": "path", + "x": 4604.92626953125, + "y": 4934.400390625, + "type": "orientation", "move_mode": "run" }, { - "x": 4604.48583984375, - "y": 4934.646484375, + "x": 4604.92626953125, + "y": 4934.400390625, "type": "target", - "move_mode": "walk", + "move_mode": "run", "action": "", "#": "1" }, diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-海祇岛-东方小岛-2个-f.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-海祇岛-东方小岛-2个-f.json index be440005..98d899b2 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-海祇岛-东方小岛-2个-f.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-海祇岛-东方小岛-2个-f.json @@ -19,18 +19,10 @@ }, { - "x": -1354.482421875, - "y": -3761.173828125, - "type": "path", - "move_mode": "run" - }, - - - { - "x": -1364.560546875, + "x": -1364.8, "y": -3757.7734375, "type": "target", - "move_mode": "walk", + "move_mode": "run", "action": "", "#": "1" }, @@ -44,24 +36,31 @@ }, { - "x": -1366.6474609375, - "y": -3756.6708984375, + "x": -1366.8330078125, + "y": -3756.2978515625, "type": "target", "move_mode": "walk", "action": "", "#": "2" }, { - "x": -1366.6787109375, - "y": -3756.6015625, + "x": -1366.8330078125, + "y": -3756.2978515625, "type": "target", "move_mode": "walk", "action": "", "#": "2" }, + { - "x": -1366.2890625, - "y": -3753.4658203125, + "x": -1369.9873046875, + "y": -3754.9521484375, + "type": "path", + "move_mode": "walk" + }, + { + "x": -1364.927734375, + "y": -3755.2236328125, "type": "path", "move_mode": "walk" } diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-神无冢-堇色之庭-4个.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-神无冢-堇色之庭-4个.json index 7a6fc584..c08355ad 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-神无冢-堇色之庭-4个.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮B线@Yang-z/狗粮-稻妻-神无冢-堇色之庭-4个.json @@ -31,12 +31,19 @@ }, { - "x": -3954.767578125, - "y": -3198.376953125, + "x": -3953.9296875, + "y": -3198.4306640625, "type": "path", "move_mode": "walk" }, + { + "x": -3958.9462890625, + "y": -3197.0888671875, + "type": "target", + "move_mode": "walk", + "#": 1 + }, { "x": -3958.9462890625, "y": -3197.0888671875, diff --git a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮额外@Yang-z/【额外】狗粮-纳塔-灵谜纹+13个.json b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮额外@Yang-z/【额外】狗粮-纳塔-灵谜纹+13个.json index 7a0f0455..24c8947f 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮额外@Yang-z/【额外】狗粮-纳塔-灵谜纹+13个.json +++ b/repo/js/AutoArtifacts_A_B_Extra/assets/狗粮额外@Yang-z/【额外】狗粮-纳塔-灵谜纹+13个.json @@ -20,8 +20,17 @@ "type": "path", "move_mode": "walk", "action": "combat_script", - "action_params": "wait(0.2),keypress(t),wait(2.8),keydown(VK_SPACE),wait(0.5),keyup(VK_SPACE)", - "//": "附身,起跳" + "action_params": "wait(0.2),keypress(t),wait(2.8)", + "//": "附身" + }, + { + "x": 9712.369140625, + "y": -1540.556640625, + "type": "path", + "move_mode": "walk", + "action": "combat_script", + "action_params": "keydown(VK_SPACE),wait(0.5),keyup(VK_SPACE)", + "//": "起跳" }, { "x": 9734.8701171875, @@ -53,14 +62,21 @@ "//": "降落,扫码,起跳", "#": "2" }, + { "x": 9732.736328125, "y": -1552.6640625, "type": "path", + "move_mode": "walk" + }, + { + "x": 9726.189453125, + "y": -1548.61181640625, + "type": "orientation", "move_mode": "walk", "action": "combat_script", - "action_params": "mousedown,wait(0.5),moveby(-100,3000),wait(1.0),mouseup", - "//": "扫码", + "action_params": "mousedown,wait(0.5),moveby(-300,3000),wait(1.0),mouseup", + "//": "朝向,扫码", "#": "3" }, @@ -128,21 +144,19 @@ "action_params": "wait(0.2),keypress(t),wait(0.2),keypress(t),wait(2.8)", "//": "附身" }, - - { - "x": 9452.5068359375, - "y": -1669.4013671875, - "type": "path", - "move_mode": "walk" - }, - { "x": 9447.9716796875, "y": -1653.560546875, "type": "path", + "move_mode": "walk" + }, + { + "x": 9440.7099609375, + "y": -1639.97314453125, + "type": "orientation", "move_mode": "walk", "action": "combat_script", - "action_params": "mousedown,wait(1.0),mouseup", + "action_params": "mousedown,wait(0.5),moveby(-300,0),wait(1.0),mouseup", "#": "5" }, { @@ -195,33 +209,34 @@ "type": "path", "move_mode": "walk" }, - { - "x": 9358.73046875, - "y": -1536.876953125, - "type": "path", - "move_mode": "walk" - }, - { - "x": 9352.041015625, - "y": -1518.994140625, + "x": 9376.677734375, + "y": -1526.3984375, "type": "path", "move_mode": "walk" }, { - "x": 9358.6669921875, - "y": -1522.3046875, - "type": "path", + "x": 9364.810546875, + "y": -1523.54150390625, + "type": "orientation", + "move_mode": "walk", + "//": "朝向", + "//1": "bgi的转向有时会明显偏离出误差范围,可能是中途到达过范围内但镜头转动未及时刹停的缘故导致。故大于90度的转向做两次,以保证停在误差范围内。下同。" + }, + { + "x": 9364.810546875, + "y": -1523.54150390625, + "type": "orientation", "move_mode": "walk", "action": "combat_script", - "action_params": "wait(0.2),mousedown,wait(1.0),mouseup,wait(0.2)", - "#": "7" + "action_params": "mousedown,wait(0.5),moveby(0,-300),wait(1.0),mouseup", + "#": "7", + "//": "朝向,扫码" }, - { - "x": 9377.734375, - "y": -1528.00830078125, + "x": 9386.9453125, + "y": -1536.5107421875, "type": "path", "move_mode": "walk", "action": "combat_script", @@ -238,20 +253,20 @@ "//": "降落" }, { - "x": 9386.4736328125, - "y": -1553.3427734375, + "x": 9388.27734375, + "y": -1551.734375, "type": "path", "move_mode": "walk" }, - { - "x": 9390.462890625, - "y": -1548.35400390625, - "type": "path", + "x": 9395.9384765625, + "y": -1543.498046875, + "type": "orientation", "move_mode": "walk", "action": "combat_script", - "action_params": "mousedown,wait(0.5),moveby(0,0),wait(1.0),mouseup", - "#": "8" + "action_params": "mousedown,wait(0.5),moveby(-300,100),wait(1.0),mouseup", + "#": "8", + "//": "朝向,扫码" }, @@ -290,8 +305,24 @@ "type": "path", "move_mode": "walk", "action": "combat_script", - "action_params": "wait(0.2),keypress(t),wait(2.8),mousedown,wait(0.5),moveby(3000,400),wait(1.0),mouseup,wait(0.5),keydown(VK_SPACE),wait(0.5),keyup(VK_SPACE)", - "//": "附身,转身,扫码,起跳", + "action_params": "wait(0.2),keypress(t),wait(2.8)", + "//": "附身" + }, + { + "x": 10080.150390625, + "y": -86.77099609375, + "type": "orientation", + "move_mode": "walk", + "//": "朝向" + }, + { + "x": 10080.150390625, + "y": -86.77099609375, + "type": "orientation", + "move_mode": "walk", + "action": "combat_script", + "action_params": "mousedown,wait(0.5),moveby(-1200,0),wait(1.0),mouseup,wait(0.5),keydown(VK_SPACE),wait(0.5),keyup(VK_SPACE)", + "//": "朝向,扫码,起跳", "#": "9" }, { @@ -304,14 +335,21 @@ "//": "降落" }, { - "x": 10098.0927734375, - "y": -91.4072265625, - "type": "path", + "x": 10098.0146484375, + "y": -95.76318359375, + "type": "orientation", + "move_mode": "walk", + "//": "朝向" + }, + { + "x": 10098.0146484375, + "y": -95.76318359375, + "type": "orientation", "move_mode": "walk", "action": "combat_script", - "action_params": "mousedown,wait(0.5),moveby(0,0),wait(1.0),mouseup", + "action_params": "mousedown,wait(0.5),moveby(-800,0),wait(1.0),mouseup", "#": "10", - "//": "扫码" + "//": "朝向,扫码" }, @@ -370,22 +408,22 @@ "action_params": "wait(0.2),keypress(t),wait(2.8)", "//": "附身" }, - { - "x": 10030.1083984375, - "y": 149.4091796875, - "type": "path", - "move_mode": "walk" + "x": 10024.544921875, + "y": 146.2294921875, + "type": "orientation", + "move_mode": "walk", + "//": "朝向" }, - { - "x": 10026.705078125, - "y": 148.04931640625, - "type": "path", + "x": 10024.544921875, + "y": 146.2294921875, + "type": "orientation", "move_mode": "walk", "action": "combat_script", - "action_params": "mousedown,wait(0.5),moveby(-600,0),wait(1.0),mouseup", - "#": "12" + "action_params": "mousedown,wait(0.5),moveby(-300,0),wait(1.0),mouseup", + "#": "12", + "//": "朝向,扫码" }, diff --git a/repo/js/AutoArtifacts_A_B_Extra/main.js b/repo/js/AutoArtifacts_A_B_Extra/main.js index 59d5a394..47fa08e4 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/main.js +++ b/repo/js/AutoArtifacts_A_B_Extra/main.js @@ -5,7 +5,7 @@ const folderE = 'assets/狗粮额外@Yang-z/'; const pathingA = [ - "狗粮-龙脊雪山-西-3个-f.json", + "狗粮-蒙德-龙脊雪山-西-3个-f.json", "狗粮-璃月-碧水源-盐中之地-3个-f.json", "狗粮-璃月-珉林-东北-9个-f.json", "狗粮-璃月-珉林-北-5个.json", @@ -78,8 +78,8 @@ ]; // 13个 // 每日拾取点位数及耗时 - // A: 98 + 21 + 8 + 10 = 137 ~(34 + 12 = 46 minutes) - // B: 97 + 20 + 8 + 13 = 138 ~(33 + 12 = 45 minutes) + // A: (98 + 21) + (8 + 10) = 137 ~ 31 + 10 = 41 minutes + // B: (97 + 20) + (8 + 13) = 138 ~ 32 + 11 = 43 minutes // 读取用户设置 @@ -110,14 +110,14 @@ } // 初始化 - async function init(shouldRestore = true, shouldResizeMap = true) { + async function init(shouldRestore = true, shouldResizeMap = false) { // close forced interaction just in case.. dispatcher.addTimer(new RealtimeTimer("AutoPick", { "forceInteraction": false })); // restore and alignment if (shouldRestore) await genshin.tp("1468.0732421875", "1998.04443359375"); await sleep(3000); - // resize map here even after bgi v0.37.5 + // resize map here (not necessary after bgi v0.41.0) if (shouldResizeMap) await resizeMap(); } @@ -156,8 +156,11 @@ } // 单一脚本执行 + let count = 0; async function runFile(filePath, times = 2) { try { + --times; + // 如关闭主动去神像恢复,则依赖队伍配置持续恢复角色,及bgi的低血量被动恢复 let isToRestore = filePath.search("(恢复)") != -1; if (isToRestore && !activeRestore) return; @@ -166,15 +169,18 @@ // if (isToRestore) dispatcher.removeTimer(...); // else... + // 分解圣遗物 + if (!isToRestore && count++ % autoSalvageSpan == 0) await salvage(); + + // 调整地图缩放 (bgi[v0.41.0]后不需要) + // let shouldResizeMap = filePath.search("-m") != -1; + // if (shouldResizeMap) await resizeMap(); + // 配置自动拾取,根据文件名指定信息,确定是否强制交互(快速拾取) let forceInteraction = filePath.search("-f") != -1; // dispatcher.addTimer(new RealtimeTimer("AutoPick", { "forceInteraction": forceInteraction })); - // 调整地图缩放 (bgi[v0.40.0]版本下仍需要,可能下个版本会解决) - let shouldResizeMap = filePath.search("-m") != -1; - if (shouldResizeMap) await resizeMap(); - - times--; + //执行路径追踪脚本 log.info(filePath); await pathingScript.runFile(filePath); } @@ -186,10 +192,8 @@ } // 批量执行 - let count = 0; async function batch(folder, files) { for (let file of files) { - if (count++ % autoSalvageSpan == 0) await salvage(); const filePath = folder + file; await runFile(filePath); } @@ -219,7 +223,7 @@ if (path == 'B' || extraAB == false) await batch(folderE, pathingE_B); } - await init(true, false); + await init(); log.info(`今日狗粮拾取任务完成。拾取路线:${path}${extra ? '+E' : ''}`); await sleep(1000); diff --git a/repo/js/AutoArtifacts_A_B_Extra/manifest.json b/repo/js/AutoArtifacts_A_B_Extra/manifest.json index 5723baf6..96a8dd31 100644 --- a/repo/js/AutoArtifacts_A_B_Extra/manifest.json +++ b/repo/js/AutoArtifacts_A_B_Extra/manifest.json @@ -1,8 +1,8 @@ { "manifest_version": 1, "name": "狗粮ABE路线,自动拾取分解", - "version": "2.2.6", - "bgi_version": "0.40.0", + "version": "2.3.0", + "bgi_version": "0.41.0", "description": "圣遗物狗粮AB及额外路线,自动轮换,自动分解,就近恢复。", "authors": [ { diff --git a/repo/pathing/圣遗物/狗粮A线@Yang-z/备选/狗粮-龙脊雪山-南-4个-f.json b/repo/pathing/圣遗物/狗粮A线@Yang-z/备选/狗粮-蒙德-龙脊雪山-南-4个-f.json similarity index 100% rename from repo/pathing/圣遗物/狗粮A线@Yang-z/备选/狗粮-龙脊雪山-南-4个-f.json rename to repo/pathing/圣遗物/狗粮A线@Yang-z/备选/狗粮-蒙德-龙脊雪山-南-4个-f.json diff --git a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-纳塔-镜璧山-七天神像下-3个-f.json b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-纳塔-镜璧山-七天神像下-3个-f.json index dd7f63c2..732b5466 100644 --- a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-纳塔-镜璧山-七天神像下-3个-f.json +++ b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-纳塔-镜璧山-七天神像下-3个-f.json @@ -19,8 +19,8 @@ "move_mode": "walk" }, { - "x": 9544.2265625, - "y": -1765.392578125, + "x": 9546.2421875, + "y": -1766.9150390625, "type": "path", "move_mode": "fly", "action": "combat_script", diff --git a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-纳塔-镜璧山-南-9个-f.json b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-纳塔-镜璧山-南-9个-f.json index 51d9aed0..310e134f 100644 --- a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-纳塔-镜璧山-南-9个-f.json +++ b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-纳塔-镜璧山-南-9个-f.json @@ -107,6 +107,12 @@ "type": "path", "move_mode": "walk" }, + { + "x": 9575.009765625, + "y": -1961.1123046875, + "type": "path", + "move_mode": "walk" + }, diff --git a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-龙脊雪山-西-3个-f.json b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-蒙德-龙脊雪山-西-3个-f.json similarity index 90% rename from repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-龙脊雪山-西-3个-f.json rename to repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-蒙德-龙脊雪山-西-3个-f.json index 8faffd7c..9546e6a7 100644 --- a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-龙脊雪山-西-3个-f.json +++ b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-蒙德-龙脊雪山-西-3个-f.json @@ -15,25 +15,25 @@ "x": -411.111328125, "y": 1188.4970703125, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { "x": -418.5693359375, "y": 1198.78271484375, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { "x": -473.318359375, "y": 1170.80029296875, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { "x": -496.7890625, "y": 1148.134765625, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { diff --git a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-须弥-须弥城-4个.json b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-须弥-须弥城-4个.json index 94715e18..6f5d1eef 100644 --- a/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-须弥-须弥城-4个.json +++ b/repo/pathing/圣遗物/狗粮A线@Yang-z/狗粮-须弥-须弥城-4个.json @@ -13,6 +13,14 @@ "move_mode": "walk" }, + { + "x": 2864.76025390625, + "y": -301.87109375, + "type": "target", + "move_mode": "walk", + "action": "", + "#": "1" + }, { "x": 2864.76025390625, "y": -301.87109375, @@ -26,7 +34,7 @@ "x": 2844.2900390625, "y": -293.8876953125, "type": "path", - "move_mode": "run" + "move_mode": "dash" }, { "x": 2801.1259765625, diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/【收尾】狗粮-稻妻-清籁岛-清籁丸-20个-f.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/【收尾】狗粮-稻妻-清籁岛-清籁丸-20个-f.json index 69483c12..3efd1afb 100644 --- a/repo/pathing/圣遗物/狗粮B线@Yang-z/【收尾】狗粮-稻妻-清籁岛-清籁丸-20个-f.json +++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/【收尾】狗粮-稻妻-清籁岛-清籁丸-20个-f.json @@ -15,7 +15,7 @@ "x": -3888.8369140625, "y": -4398.5390625, "type": "path", - "move_mode": "run" + "move_mode": "walk" }, { "x": -3850.6845703125, @@ -34,6 +34,14 @@ "action": "", "#": "SE1" }, + { + "x": -3850.6787109375, + "y": -4510.998046875, + "type": "target", + "move_mode": "walk", + "action": "", + "#": "SE1" + }, { "x": -3848.8515625, "y": -4510.4755859375, @@ -86,19 +94,24 @@ "move_mode": "walk" }, - { - "x": -3835.259765625, - "y": -4488.0927734375, + "x": -3835.5830078125, + "y": -4483.216796875, "type": "path", "move_mode": "dash" }, + { + "x": -3840.095703125, + "y": -4483.7294921875, + "type": "orientation", + "move_mode": "walk" + }, { - "x": -3840.205078125, - "y": -4483.6513671875, + "x": -3840.095703125, + "y": -4483.7294921875, "type": "target", - "move_mode": "fly", + "move_mode": "walk", "action": "", "#": "SE3" }, @@ -208,8 +221,8 @@ "move_mode": "walk" }, { - "x": -3776.099609375, - "y": -4440.3583984375, + "x": -3775.7900390625, + "y": -4441.2607421875, "type": "target", "move_mode": "walk", "action": "", diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-枫丹庭区-3个.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-枫丹庭区-3个.json index 241b42c0..07ea6925 100644 --- a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-枫丹庭区-3个.json +++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-枫丹庭区-3个.json @@ -75,18 +75,20 @@ }, { - "x": 4471.1904296875, - "y": 3566.983642578125, + "x": 4470.59619140625, + "y": 3566.292724609375, "type": "target", "move_mode": "walk", "action": "", "#" : "3" }, { - "x": 4471.05224609375, - "y": 3564.799072265625, - "type": "path", - "move_mode": "walk" + "x": 4470.8291015625, + "y": 3566.026123046875, + "type": "target", + "move_mode": "walk", + "action": "", + "#" : "3" } ] } \ No newline at end of file diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-中部塔内-9个.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-中部塔内-9个.json index 1a1ed4c0..49724aaa 100644 --- a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-中部塔内-9个.json +++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-中部塔内-9个.json @@ -269,7 +269,8 @@ "y": 4921.35107421875, "type": "target", "move_mode": "walk", - "action": "", + "action": "combat_script", + "action_params": "wait(1.0)", "#" : "8" }, { diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-西北-6个/7个.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-西北-6个/7个.json index d44e182b..8a861879 100644 --- a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-西北-6个/7个.json +++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-枫丹-研究院区-西北-6个/7个.json @@ -13,16 +13,16 @@ }, { - "x": 4609.60595703125, - "y": 4937.71826171875, - "type": "path", + "x": 4604.92626953125, + "y": 4934.400390625, + "type": "orientation", "move_mode": "run" }, { - "x": 4604.48583984375, - "y": 4934.646484375, + "x": 4604.92626953125, + "y": 4934.400390625, "type": "target", - "move_mode": "walk", + "move_mode": "run", "action": "", "#": "1" }, diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-海祇岛-东方小岛-2个-f.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-海祇岛-东方小岛-2个-f.json index be440005..98d899b2 100644 --- a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-海祇岛-东方小岛-2个-f.json +++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-海祇岛-东方小岛-2个-f.json @@ -19,18 +19,10 @@ }, { - "x": -1354.482421875, - "y": -3761.173828125, - "type": "path", - "move_mode": "run" - }, - - - { - "x": -1364.560546875, + "x": -1364.8, "y": -3757.7734375, "type": "target", - "move_mode": "walk", + "move_mode": "run", "action": "", "#": "1" }, @@ -44,24 +36,31 @@ }, { - "x": -1366.6474609375, - "y": -3756.6708984375, + "x": -1366.8330078125, + "y": -3756.2978515625, "type": "target", "move_mode": "walk", "action": "", "#": "2" }, { - "x": -1366.6787109375, - "y": -3756.6015625, + "x": -1366.8330078125, + "y": -3756.2978515625, "type": "target", "move_mode": "walk", "action": "", "#": "2" }, + { - "x": -1366.2890625, - "y": -3753.4658203125, + "x": -1369.9873046875, + "y": -3754.9521484375, + "type": "path", + "move_mode": "walk" + }, + { + "x": -1364.927734375, + "y": -3755.2236328125, "type": "path", "move_mode": "walk" } diff --git a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-神无冢-堇色之庭-4个.json b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-神无冢-堇色之庭-4个.json index 7a6fc584..c08355ad 100644 --- a/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-神无冢-堇色之庭-4个.json +++ b/repo/pathing/圣遗物/狗粮B线@Yang-z/狗粮-稻妻-神无冢-堇色之庭-4个.json @@ -31,12 +31,19 @@ }, { - "x": -3954.767578125, - "y": -3198.376953125, + "x": -3953.9296875, + "y": -3198.4306640625, "type": "path", "move_mode": "walk" }, + { + "x": -3958.9462890625, + "y": -3197.0888671875, + "type": "target", + "move_mode": "walk", + "#": 1 + }, { "x": -3958.9462890625, "y": -3197.0888671875, diff --git a/repo/pathing/圣遗物/狗粮额外@Yang-z/【额外】狗粮-纳塔-灵谜纹+13个.json b/repo/pathing/圣遗物/狗粮额外@Yang-z/【额外】狗粮-纳塔-灵谜纹+13个.json index 7a0f0455..24c8947f 100644 --- a/repo/pathing/圣遗物/狗粮额外@Yang-z/【额外】狗粮-纳塔-灵谜纹+13个.json +++ b/repo/pathing/圣遗物/狗粮额外@Yang-z/【额外】狗粮-纳塔-灵谜纹+13个.json @@ -20,8 +20,17 @@ "type": "path", "move_mode": "walk", "action": "combat_script", - "action_params": "wait(0.2),keypress(t),wait(2.8),keydown(VK_SPACE),wait(0.5),keyup(VK_SPACE)", - "//": "附身,起跳" + "action_params": "wait(0.2),keypress(t),wait(2.8)", + "//": "附身" + }, + { + "x": 9712.369140625, + "y": -1540.556640625, + "type": "path", + "move_mode": "walk", + "action": "combat_script", + "action_params": "keydown(VK_SPACE),wait(0.5),keyup(VK_SPACE)", + "//": "起跳" }, { "x": 9734.8701171875, @@ -53,14 +62,21 @@ "//": "降落,扫码,起跳", "#": "2" }, + { "x": 9732.736328125, "y": -1552.6640625, "type": "path", + "move_mode": "walk" + }, + { + "x": 9726.189453125, + "y": -1548.61181640625, + "type": "orientation", "move_mode": "walk", "action": "combat_script", - "action_params": "mousedown,wait(0.5),moveby(-100,3000),wait(1.0),mouseup", - "//": "扫码", + "action_params": "mousedown,wait(0.5),moveby(-300,3000),wait(1.0),mouseup", + "//": "朝向,扫码", "#": "3" }, @@ -128,21 +144,19 @@ "action_params": "wait(0.2),keypress(t),wait(0.2),keypress(t),wait(2.8)", "//": "附身" }, - - { - "x": 9452.5068359375, - "y": -1669.4013671875, - "type": "path", - "move_mode": "walk" - }, - { "x": 9447.9716796875, "y": -1653.560546875, "type": "path", + "move_mode": "walk" + }, + { + "x": 9440.7099609375, + "y": -1639.97314453125, + "type": "orientation", "move_mode": "walk", "action": "combat_script", - "action_params": "mousedown,wait(1.0),mouseup", + "action_params": "mousedown,wait(0.5),moveby(-300,0),wait(1.0),mouseup", "#": "5" }, { @@ -195,33 +209,34 @@ "type": "path", "move_mode": "walk" }, - { - "x": 9358.73046875, - "y": -1536.876953125, - "type": "path", - "move_mode": "walk" - }, - { - "x": 9352.041015625, - "y": -1518.994140625, + "x": 9376.677734375, + "y": -1526.3984375, "type": "path", "move_mode": "walk" }, { - "x": 9358.6669921875, - "y": -1522.3046875, - "type": "path", + "x": 9364.810546875, + "y": -1523.54150390625, + "type": "orientation", + "move_mode": "walk", + "//": "朝向", + "//1": "bgi的转向有时会明显偏离出误差范围,可能是中途到达过范围内但镜头转动未及时刹停的缘故导致。故大于90度的转向做两次,以保证停在误差范围内。下同。" + }, + { + "x": 9364.810546875, + "y": -1523.54150390625, + "type": "orientation", "move_mode": "walk", "action": "combat_script", - "action_params": "wait(0.2),mousedown,wait(1.0),mouseup,wait(0.2)", - "#": "7" + "action_params": "mousedown,wait(0.5),moveby(0,-300),wait(1.0),mouseup", + "#": "7", + "//": "朝向,扫码" }, - { - "x": 9377.734375, - "y": -1528.00830078125, + "x": 9386.9453125, + "y": -1536.5107421875, "type": "path", "move_mode": "walk", "action": "combat_script", @@ -238,20 +253,20 @@ "//": "降落" }, { - "x": 9386.4736328125, - "y": -1553.3427734375, + "x": 9388.27734375, + "y": -1551.734375, "type": "path", "move_mode": "walk" }, - { - "x": 9390.462890625, - "y": -1548.35400390625, - "type": "path", + "x": 9395.9384765625, + "y": -1543.498046875, + "type": "orientation", "move_mode": "walk", "action": "combat_script", - "action_params": "mousedown,wait(0.5),moveby(0,0),wait(1.0),mouseup", - "#": "8" + "action_params": "mousedown,wait(0.5),moveby(-300,100),wait(1.0),mouseup", + "#": "8", + "//": "朝向,扫码" }, @@ -290,8 +305,24 @@ "type": "path", "move_mode": "walk", "action": "combat_script", - "action_params": "wait(0.2),keypress(t),wait(2.8),mousedown,wait(0.5),moveby(3000,400),wait(1.0),mouseup,wait(0.5),keydown(VK_SPACE),wait(0.5),keyup(VK_SPACE)", - "//": "附身,转身,扫码,起跳", + "action_params": "wait(0.2),keypress(t),wait(2.8)", + "//": "附身" + }, + { + "x": 10080.150390625, + "y": -86.77099609375, + "type": "orientation", + "move_mode": "walk", + "//": "朝向" + }, + { + "x": 10080.150390625, + "y": -86.77099609375, + "type": "orientation", + "move_mode": "walk", + "action": "combat_script", + "action_params": "mousedown,wait(0.5),moveby(-1200,0),wait(1.0),mouseup,wait(0.5),keydown(VK_SPACE),wait(0.5),keyup(VK_SPACE)", + "//": "朝向,扫码,起跳", "#": "9" }, { @@ -304,14 +335,21 @@ "//": "降落" }, { - "x": 10098.0927734375, - "y": -91.4072265625, - "type": "path", + "x": 10098.0146484375, + "y": -95.76318359375, + "type": "orientation", + "move_mode": "walk", + "//": "朝向" + }, + { + "x": 10098.0146484375, + "y": -95.76318359375, + "type": "orientation", "move_mode": "walk", "action": "combat_script", - "action_params": "mousedown,wait(0.5),moveby(0,0),wait(1.0),mouseup", + "action_params": "mousedown,wait(0.5),moveby(-800,0),wait(1.0),mouseup", "#": "10", - "//": "扫码" + "//": "朝向,扫码" }, @@ -370,22 +408,22 @@ "action_params": "wait(0.2),keypress(t),wait(2.8)", "//": "附身" }, - { - "x": 10030.1083984375, - "y": 149.4091796875, - "type": "path", - "move_mode": "walk" + "x": 10024.544921875, + "y": 146.2294921875, + "type": "orientation", + "move_mode": "walk", + "//": "朝向" }, - { - "x": 10026.705078125, - "y": 148.04931640625, - "type": "path", + "x": 10024.544921875, + "y": 146.2294921875, + "type": "orientation", "move_mode": "walk", "action": "combat_script", - "action_params": "mousedown,wait(0.5),moveby(-600,0),wait(1.0),mouseup", - "#": "12" + "action_params": "mousedown,wait(0.5),moveby(-300,0),wait(1.0),mouseup", + "#": "12", + "//": "朝向,扫码" },