fix typing mistakes and fine-tune

This commit is contained in:
Yang-z
2024-12-03 17:51:13 +08:00
parent ea2c00fe88
commit 0ce26e895f
16 changed files with 303 additions and 377 deletions

View File

@@ -254,29 +254,35 @@
"move_mode": "walk"
},
{
"x": -3134.7275390625,
"y": -3566.712890625,
"x": -3134.486328125,
"y": -3566.083984375,
"type": "path",
"move_mode": "fly"
},
{
"x": -3136.1005859375,
"y": -3568.3203125,
"x": -3133.8037109375,
"y": -3571.03125,
"type": "path",
"move_mode": "walk"
},
{
"x": -3134.8310546875,
"y": -3571.3720703125,
"type": "path",
"move_mode": "walk"
},
{
"x": -3138.798828125,
"y": -3570.107421875,
"x": -3138.2890625,
"y": -3570.9365234375,
"type": "target",
"move_mode": "walk",
"action": "",
"#": "13"
},
{
"x": -3139.0625,
"y": -3571.1171875,
"x": -3138.3134765625,
"y": -3570.9609375,
"type": "target",
"move_mode": "walk",
"action": "",

View File

@@ -301,87 +301,76 @@
"action": "",
"#": "19"
},
{
"x": -3144.9853515625,
"y": -3708.4521484375,
"x": -3145.0146484375,
"y": -3706.4208984375,
"type": "target",
"move_mode": "walk"
},
{
"x": -3146.5185546875,
"y": -3713.2802734375,
"type": "path",
"move_mode": "walk"
},
{
"x": -3148.638671875,
"y": -3716.90234375,
"type": "path",
"move_mode": "walk"
"move_mode": "fly"
},
{
"x": -3153.908203125,
"y": -3718.08203125,
"x": -3156.5849609375,
"y": -3886.06640625,
"type": "teleport",
"move_mode": "walk"
},
{
"x": -3139.6357421875,
"y": -3873.5673828125,
"type": "path",
"move_mode": "run"
},
{
"x": -3118.478515625,
"y": -3801.2685546875,
"type": "path",
"move_mode": "run"
},
{
"x": -3128.7255859375,
"y": -3755.45703125,
"type": "path",
"move_mode": "walk"
},
{
"x": -3160.7529296875,
"y": -3717.9111328125,
"type": "target",
"move_mode": "walk"
},
{
"x": -3160.779296875,
"y": -3720.1904296875,
"type": "target",
"move_mode": "walk"
},
{
"x": -3161.1572265625,
"y": -3721.9765625,
"x": -3156.3916015625,
"y": -3754.88671875,
"type": "path",
"move_mode": "fly"
},
{
"x": -3154.974609375,
"y": -3736.6025390625,
"x": -3124.9794921875,
"y": -3742.8154296875,
"type": "path",
"move_mode": "fly",
"action": "stop_flying"
},
{
"x": -3119.84375,
"y": -3751.44921875,
"type": "path",
"move_mode": "fly"
},
{
"x": -3147.8583984375,
"y": -3741.576171875,
"x": -3133.15234375,
"y": -3739.20703125,
"type": "path",
"move_mode": "walk"
"move_mode": "fly",
"action": "stop_flying"
},
{
"x": -3142.1376953125,
"y": -3741.7470703125,
"type": "path",
"move_mode": "walk"
},
{
"x": -3134.73828125,
"y": -3736.9609375,
"type": "path",
"move_mode": "walk"
},
{
"x": -3135.3974609375,
"y": -3734.583984375,
"x": -3134.6318359375,
"y": -3735.2392578125,
"type": "target",
"move_mode": "walk",
"action": "",
"#": "20"
},
{
"x": -3134.900390625,
"y": -3734.37890625,
"x": -3134.6318359375,
"y": -3735.2392578125,
"type": "target",
"move_mode": "walk",
"action": "",

View File

@@ -89,8 +89,8 @@
"move_mode": "run"
},
{
"x": 642.0517578125,
"y": 941.64453125,
"x": 642.1728515625,
"y": 941.576171875,
"type": "target",
"move_mode": "walk",
"action": "",
@@ -104,21 +104,6 @@
"action": "",
"No.": "2"
},
{
"x": 641.3134765625,
"y": 941.08837890625,
"type": "target",
"move_mode": "walk",
"action": "",
"No.": "2"
},
{
"x": 643.544921875,
"y": 941.38330078125,
"type": "path",
"move_mode": "walk"
},
{
"x": 625.1875,
@@ -141,8 +126,6 @@
"No.": "3"
},
{
"x": 579.1728515625,
"y": 915.19921875,
@@ -248,48 +231,34 @@
"move_mode": "walk"
},
{
"x": 648.986328125,
"y": 830.923828125,
"type": "target",
"move_mode": "walk",
"action": "",
"No.": "5 6"
},
{
"x": 649.0009765625,
"y": 831.3779296875,
"type": "target",
"move_mode": "walk",
"action": "",
"No.": "5 6"
},
{
"x": 649.83984375,
"y": 831.625,
"type": "target",
"move_mode": "walk",
"action": "",
"No.": "5"
},
{
"x": 649.708984375,
"y": 831.6279296875,
"type": "target",
"move_mode": "walk",
"action": "",
"No.": "5"
},
{
"x": 649.0048828125,
"y": 831.23583984375,
"type": "target",
"move_mode": "walk",
"action": "",
"No.": "6"
},
{
"x": 646.3505859375,
"y": 833.35546875,
"type": "target",
"move_mode": "walk"
},
{
"x": 645.8408203125,
"y": 832.71533203125,
"x": 645.453125,
"y": 835.6357421875,
"type": "target",
"move_mode": "walk",
"action": "",
"No.": "7"
},
{
"x": 646.037109375,
"y": 832.7724609375,
"x": 645.7451171875,
"y": 836.59033203125,
"type": "target",
"move_mode": "walk",
"action": "",
@@ -297,16 +266,16 @@
},
{
"x": 645.37109375,
"y": 833.572265625,
"x": 645.79296875,
"y": 832.70556640625,
"type": "target",
"move_mode": "walk",
"action": "",
"No.": "8"
},
{
"x": 645.076171875,
"y": 834.3232421875,
"x": 645.79296875,
"y": 832.70556640625,
"type": "target",
"move_mode": "walk",
"action": "",
@@ -314,61 +283,29 @@
},
{
"x": 645.8359375,
"y": 835.81396484375,
"x": 645.3515625,
"y": 834.46533203125,
"type": "target",
"move_mode": "walk",
"action": "",
"No.": "9"
},
{
"x": 645.671875,
"y": 835.916015625,
"x": 645.1220703125,
"y": 833.75927734375,
"type": "target",
"move_mode": "walk",
"action": "",
"No.": "9"
},
{
"x": 646.037109375,
"y": 832.7724609375,
"type": "path",
"move_mode": "walk"
},
{
"x": 646.2255859375,
"y": 836.51025390625,
"type": "path",
"move_mode": "walk"
},
{
"x": 646.80859375,
"y": 837.4140625,
"type": "path",
"move_mode": "walk"
},
{
"x": 646.8876953125,
"y": 834.0068359375,
"type": "path",
"move_mode": "walk"
},
{
"x": 648.2548828125,
"y": 829.93701171875,
"x": 644.1279296875,
"y": 834.39501953125,
"type": "target",
"move_mode": "walk"
},
{
"x": 645.55859375,
"y": 830.66357421875,
"type": "path",
"move_mode": "walk"
"move_mode": "fly"
}
]
}

View File

@@ -97,6 +97,12 @@
"type": "target",
"move_mode": "walk"
},
{
"x": 9756.541015625,
"y": -626.3955078125,
"type": "path",
"move_mode": "walk"
},
{
"x": 9726.82421875,

View File

@@ -357,6 +357,7 @@
"action": "",
"#": "9"
},
{
"x": -3738.0673828125,
"y": -4439.9228515625,
@@ -364,9 +365,6 @@
"move_mode": "walk"
},
{
"x": -3740.6142578125,
"y": -4435.5537109375,
@@ -385,18 +383,28 @@
"type": "path",
"move_mode": "walk"
},
{
"x": -3759.4287109375,
"y": -4433.74609375,
"x": -3750.2587890625,
"y": -4429.8232421875,
"type": "path",
"move_mode": "walk"
},
{
"x": -3767.8017578125,
"y": -4437.771484375,
"x": -3766.1845703125,
"y": -4434.904296875,
"type": "path",
"move_mode": "walk"
},
{
"x": -3772.146484375,
"y": -4439.849609375,
"type": "target",
"move_mode": "walk",
"action": "",
"#": "10"
},
{
"x": -3772.146484375,
"y": -4439.849609375,

View File

@@ -19,47 +19,48 @@
"action": "stop_flying"
},
{
"x": 3951.25634765625,
"y": 4835.40869140625,
"x": 3950.2333984375,
"y": 4837.30517578125,
"type": "path",
"move_mode": "walk"
},
{
"x": 3948.80908203125,
"y": 4844.0986328125,
"x": 3947.6455078125,
"y": 4844.3544921875,
"type": "path",
"move_mode": "walk"
},
{
"x": 3945.87353515625,
"y": 4850.1220703125,
"x": 3944.673828125,
"y": 4851.689453125,
"type": "path",
"move_mode": "walk"
},
{
"x": 3942.392578125,
"y": 4861.06591796875,
"x": 3943.515625,
"y": 4855.76171875,
"type": "path",
"move_mode": "walk"
},
{
"x": 3950.94970703125,
"y": 4864.2421875,
"x": 3941.748046875,
"y": 4860.615234375,
"type": "path",
"move_mode": "walk"
},
{
"x": 3952.46728515625,
"y": 4862.3974609375,
"x": 3950.771484375,
"y": 4865.1259765625,
"type": "path",
"move_mode": "walk"
},
{
"x": 3953.22021484375,
"y": 4857.1064453125,
"x": 3952.0966796875,
"y": 4862.296875,
"type": "path",
"move_mode": "walk"
},
{
"x": 3953.05126953125,
"y": 4853.205078125,
@@ -68,9 +69,16 @@
"action": "",
"#": 1
},
{
"x": 3953.2607421875,
"y": 4857.310546875,
"x": 3953.16015625,
"y": 4857.77587890625,
"type": "path",
"move_mode": "walk"
},
{
"x": 3949.775390625,
"y": 4868.416015625,
"type": "path",
"move_mode": "walk"
},

View File

@@ -76,6 +76,7 @@
"action": "",
"#": "2"
},
{
"x": 4688.0302734375,
"y": 4989.86865234375,
@@ -84,23 +85,31 @@
},
{
"x": 4712.2392578125,
"y": 4928.29638671875,
"x": 4705.22705078125,
"y": 4928.8642578125,
"type": "path",
"move_mode": "run"
},
{
"x": 4705.22705078125,
"y": 4928.8642578125,
"type": "path",
"move_mode": "walk"
},
{
"x": 4717.4814453125,
"y": 4929.82568359375,
"type": "path",
"move_mode": "run"
"move_mode": "walk"
},
{
"x": 4720.08154296875,
"y": 4930.87353515625,
"type": "path",
"move_mode": "fly"
},
{
"x": 4723.99169921875,
"y": 4932.6865234375,

View File

@@ -76,7 +76,7 @@
let swapPath = settings.swapPath != undefined && settings.swapPath != '否' ? true : false;
let extra = settings.extra != undefined && settings.extra != '是' ? false : true;
let autoSalvage = settings.autoSalvage != undefined && settings.autoSalvage != '是' ? false : true;
let autoSalvage4 = settings.autoSalvage4 != undefined && autoSalvage4 != '否' ? true : false;
let autoSalvage4 = settings.autoSalvage4 != undefined && settings.autoSalvage4 != '否' ? true : false;
let autoSalvageSpan = settings.autoSalvageSpan != undefined && ~~settings.autoSalvageSpan > 0 ? ~~settings.autoSalvageSpan : 10;
log.debug(`path: ${path}; swapPath: ${swapPath}; extra: ${extra}; autoSalvage: ${autoSalvage}; autoSalvage4: ${autoSalvage4}; autoSalvageSpan: ${autoSalvageSpan};`);
@@ -178,7 +178,7 @@
await batch(folderE, pathingE, true); // 强制交互
}
log.info(`今日狗粮拾取任务完成。拾取路线:${path}+E`);
log.info(`今日狗粮拾取任务完成。拾取路线:${path}${extra ? '+E' : ''}`);
await sleep(3000);
})();

View File

@@ -1,7 +1,7 @@
{
"manifest_version": 1,
"name": "狗粮ABE路线自动拾取分解",
"version": "1.6",
"version": "1.6.1",
"bgi_version": "0.37.1",
"description": "圣遗物狗粮AB路线自动轮换及额外点位拾取途中自动分解。更新纳塔5.2优质点位。",
"authors": [

View File

@@ -254,29 +254,35 @@
"move_mode": "walk"
},
{
"x": -3134.7275390625,
"y": -3566.712890625,
"x": -3134.486328125,
"y": -3566.083984375,
"type": "path",
"move_mode": "fly"
},
{
"x": -3136.1005859375,
"y": -3568.3203125,
"x": -3133.8037109375,
"y": -3571.03125,
"type": "path",
"move_mode": "walk"
},
{
"x": -3134.8310546875,
"y": -3571.3720703125,
"type": "path",
"move_mode": "walk"
},
{
"x": -3138.798828125,
"y": -3570.107421875,
"x": -3138.2890625,
"y": -3570.9365234375,
"type": "target",
"move_mode": "walk",
"action": "",
"#": "13"
},
{
"x": -3139.0625,
"y": -3571.1171875,
"x": -3138.3134765625,
"y": -3570.9609375,
"type": "target",
"move_mode": "walk",
"action": "",

View File

@@ -301,87 +301,76 @@
"action": "",
"#": "19"
},
{
"x": -3144.9853515625,
"y": -3708.4521484375,
"x": -3145.0146484375,
"y": -3706.4208984375,
"type": "target",
"move_mode": "walk"
},
{
"x": -3146.5185546875,
"y": -3713.2802734375,
"type": "path",
"move_mode": "walk"
},
{
"x": -3148.638671875,
"y": -3716.90234375,
"type": "path",
"move_mode": "walk"
"move_mode": "fly"
},
{
"x": -3153.908203125,
"y": -3718.08203125,
"x": -3156.5849609375,
"y": -3886.06640625,
"type": "teleport",
"move_mode": "walk"
},
{
"x": -3139.6357421875,
"y": -3873.5673828125,
"type": "path",
"move_mode": "run"
},
{
"x": -3118.478515625,
"y": -3801.2685546875,
"type": "path",
"move_mode": "run"
},
{
"x": -3128.7255859375,
"y": -3755.45703125,
"type": "path",
"move_mode": "walk"
},
{
"x": -3160.7529296875,
"y": -3717.9111328125,
"type": "target",
"move_mode": "walk"
},
{
"x": -3160.779296875,
"y": -3720.1904296875,
"type": "target",
"move_mode": "walk"
},
{
"x": -3161.1572265625,
"y": -3721.9765625,
"x": -3156.3916015625,
"y": -3754.88671875,
"type": "path",
"move_mode": "fly"
},
{
"x": -3154.974609375,
"y": -3736.6025390625,
"x": -3124.9794921875,
"y": -3742.8154296875,
"type": "path",
"move_mode": "fly",
"action": "stop_flying"
},
{
"x": -3119.84375,
"y": -3751.44921875,
"type": "path",
"move_mode": "fly"
},
{
"x": -3147.8583984375,
"y": -3741.576171875,
"x": -3133.15234375,
"y": -3739.20703125,
"type": "path",
"move_mode": "walk"
"move_mode": "fly",
"action": "stop_flying"
},
{
"x": -3142.1376953125,
"y": -3741.7470703125,
"type": "path",
"move_mode": "walk"
},
{
"x": -3134.73828125,
"y": -3736.9609375,
"type": "path",
"move_mode": "walk"
},
{
"x": -3135.3974609375,
"y": -3734.583984375,
"x": -3134.6318359375,
"y": -3735.2392578125,
"type": "target",
"move_mode": "walk",
"action": "",
"#": "20"
},
{
"x": -3134.900390625,
"y": -3734.37890625,
"x": -3134.6318359375,
"y": -3735.2392578125,
"type": "target",
"move_mode": "walk",
"action": "",

View File

@@ -89,8 +89,8 @@
"move_mode": "run"
},
{
"x": 642.0517578125,
"y": 941.64453125,
"x": 642.1728515625,
"y": 941.576171875,
"type": "target",
"move_mode": "walk",
"action": "",
@@ -104,21 +104,6 @@
"action": "",
"No.": "2"
},
{
"x": 641.3134765625,
"y": 941.08837890625,
"type": "target",
"move_mode": "walk",
"action": "",
"No.": "2"
},
{
"x": 643.544921875,
"y": 941.38330078125,
"type": "path",
"move_mode": "walk"
},
{
"x": 625.1875,
@@ -141,8 +126,6 @@
"No.": "3"
},
{
"x": 579.1728515625,
"y": 915.19921875,
@@ -248,48 +231,34 @@
"move_mode": "walk"
},
{
"x": 648.986328125,
"y": 830.923828125,
"type": "target",
"move_mode": "walk",
"action": "",
"No.": "5 6"
},
{
"x": 649.0009765625,
"y": 831.3779296875,
"type": "target",
"move_mode": "walk",
"action": "",
"No.": "5 6"
},
{
"x": 649.83984375,
"y": 831.625,
"type": "target",
"move_mode": "walk",
"action": "",
"No.": "5"
},
{
"x": 649.708984375,
"y": 831.6279296875,
"type": "target",
"move_mode": "walk",
"action": "",
"No.": "5"
},
{
"x": 649.0048828125,
"y": 831.23583984375,
"type": "target",
"move_mode": "walk",
"action": "",
"No.": "6"
},
{
"x": 646.3505859375,
"y": 833.35546875,
"type": "target",
"move_mode": "walk"
},
{
"x": 645.8408203125,
"y": 832.71533203125,
"x": 645.453125,
"y": 835.6357421875,
"type": "target",
"move_mode": "walk",
"action": "",
"No.": "7"
},
{
"x": 646.037109375,
"y": 832.7724609375,
"x": 645.7451171875,
"y": 836.59033203125,
"type": "target",
"move_mode": "walk",
"action": "",
@@ -297,16 +266,16 @@
},
{
"x": 645.37109375,
"y": 833.572265625,
"x": 645.79296875,
"y": 832.70556640625,
"type": "target",
"move_mode": "walk",
"action": "",
"No.": "8"
},
{
"x": 645.076171875,
"y": 834.3232421875,
"x": 645.79296875,
"y": 832.70556640625,
"type": "target",
"move_mode": "walk",
"action": "",
@@ -314,61 +283,29 @@
},
{
"x": 645.8359375,
"y": 835.81396484375,
"x": 645.3515625,
"y": 834.46533203125,
"type": "target",
"move_mode": "walk",
"action": "",
"No.": "9"
},
{
"x": 645.671875,
"y": 835.916015625,
"x": 645.1220703125,
"y": 833.75927734375,
"type": "target",
"move_mode": "walk",
"action": "",
"No.": "9"
},
{
"x": 646.037109375,
"y": 832.7724609375,
"type": "path",
"move_mode": "walk"
},
{
"x": 646.2255859375,
"y": 836.51025390625,
"type": "path",
"move_mode": "walk"
},
{
"x": 646.80859375,
"y": 837.4140625,
"type": "path",
"move_mode": "walk"
},
{
"x": 646.8876953125,
"y": 834.0068359375,
"type": "path",
"move_mode": "walk"
},
{
"x": 648.2548828125,
"y": 829.93701171875,
"x": 644.1279296875,
"y": 834.39501953125,
"type": "target",
"move_mode": "walk"
},
{
"x": 645.55859375,
"y": 830.66357421875,
"type": "path",
"move_mode": "walk"
"move_mode": "fly"
}
]
}

View File

@@ -97,6 +97,12 @@
"type": "target",
"move_mode": "walk"
},
{
"x": 9756.541015625,
"y": -626.3955078125,
"type": "path",
"move_mode": "walk"
},
{
"x": 9726.82421875,

View File

@@ -357,6 +357,7 @@
"action": "",
"#": "9"
},
{
"x": -3738.0673828125,
"y": -4439.9228515625,
@@ -364,9 +365,6 @@
"move_mode": "walk"
},
{
"x": -3740.6142578125,
"y": -4435.5537109375,
@@ -385,18 +383,28 @@
"type": "path",
"move_mode": "walk"
},
{
"x": -3759.4287109375,
"y": -4433.74609375,
"x": -3750.2587890625,
"y": -4429.8232421875,
"type": "path",
"move_mode": "walk"
},
{
"x": -3767.8017578125,
"y": -4437.771484375,
"x": -3766.1845703125,
"y": -4434.904296875,
"type": "path",
"move_mode": "walk"
},
{
"x": -3772.146484375,
"y": -4439.849609375,
"type": "target",
"move_mode": "walk",
"action": "",
"#": "10"
},
{
"x": -3772.146484375,
"y": -4439.849609375,

View File

@@ -19,47 +19,48 @@
"action": "stop_flying"
},
{
"x": 3951.25634765625,
"y": 4835.40869140625,
"x": 3950.2333984375,
"y": 4837.30517578125,
"type": "path",
"move_mode": "walk"
},
{
"x": 3948.80908203125,
"y": 4844.0986328125,
"x": 3947.6455078125,
"y": 4844.3544921875,
"type": "path",
"move_mode": "walk"
},
{
"x": 3945.87353515625,
"y": 4850.1220703125,
"x": 3944.673828125,
"y": 4851.689453125,
"type": "path",
"move_mode": "walk"
},
{
"x": 3942.392578125,
"y": 4861.06591796875,
"x": 3943.515625,
"y": 4855.76171875,
"type": "path",
"move_mode": "walk"
},
{
"x": 3950.94970703125,
"y": 4864.2421875,
"x": 3941.748046875,
"y": 4860.615234375,
"type": "path",
"move_mode": "walk"
},
{
"x": 3952.46728515625,
"y": 4862.3974609375,
"x": 3950.771484375,
"y": 4865.1259765625,
"type": "path",
"move_mode": "walk"
},
{
"x": 3953.22021484375,
"y": 4857.1064453125,
"x": 3952.0966796875,
"y": 4862.296875,
"type": "path",
"move_mode": "walk"
},
{
"x": 3953.05126953125,
"y": 4853.205078125,
@@ -68,9 +69,16 @@
"action": "",
"#": 1
},
{
"x": 3953.2607421875,
"y": 4857.310546875,
"x": 3953.16015625,
"y": 4857.77587890625,
"type": "path",
"move_mode": "walk"
},
{
"x": 3949.775390625,
"y": 4868.416015625,
"type": "path",
"move_mode": "walk"
},

View File

@@ -76,6 +76,7 @@
"action": "",
"#": "2"
},
{
"x": 4688.0302734375,
"y": 4989.86865234375,
@@ -84,23 +85,31 @@
},
{
"x": 4712.2392578125,
"y": 4928.29638671875,
"x": 4705.22705078125,
"y": 4928.8642578125,
"type": "path",
"move_mode": "run"
},
{
"x": 4705.22705078125,
"y": 4928.8642578125,
"type": "path",
"move_mode": "walk"
},
{
"x": 4717.4814453125,
"y": 4929.82568359375,
"type": "path",
"move_mode": "run"
"move_mode": "walk"
},
{
"x": 4720.08154296875,
"y": 4930.87353515625,
"type": "path",
"move_mode": "fly"
},
{
"x": 4723.99169921875,
"y": 4932.6865234375,