Compare commits

..

2 Commits

Author SHA1 Message Date
zaodonganqi
f0aebe1ba0 update repo.json
Some checks failed
Build repo.json / build (18.x) (push) Has been cancelled
Build repo.json / upload (push) Has been cancelled
2025-08-09 03:49:49 +00:00
提瓦特钓鱼玳师
c61d1111f2 JS脚本:提瓦特全自动钓鱼【修复】 (#1519)
* 修复了月卡等待异常的问题

* Delete repo/js/AutoFishingTeyvat/assets/archive.json

* Delete repo/js/AutoFishingTeyvat/READEME.md
2025-08-09 11:49:31 +08:00
11 changed files with 835 additions and 822 deletions

View File

@@ -1,5 +1,5 @@
{ {
"time": "20250809103533", "time": "20250809114948",
"url": "https://github.com/babalae/bettergi-scripts-list/archive/refs/heads/main.zip", "url": "https://github.com/babalae/bettergi-scripts-list/archive/refs/heads/main.zip",
"file": "repo.json", "file": "repo.json",
"indexes": [ "indexes": [
@@ -75523,8 +75523,8 @@
{ {
"name": "AutoFishingTeyvat", "name": "AutoFishingTeyvat",
"type": "directory", "type": "directory",
"hash": "864c881c53ca92c487e74b9720de4e7bb58a7add", "hash": "905e55581d6fde3cc4268fe74136ec5ad3b5aee3",
"version": "2.2.4", "version": "2.2.5",
"author": "提瓦特钓鱼玳师", "author": "提瓦特钓鱼玳师",
"authors": [ "authors": [
{ {
@@ -75536,7 +75536,7 @@
"tags": [ "tags": [
"bgi≥0.47.0" "bgi≥0.47.0"
], ],
"lastUpdated": "2025-07-22 10:42:35" "lastUpdated": "2025-08-09 11:49:31"
}, },
{ {
"name": "AutoFontaineLeyLine", "name": "AutoFontaineLeyLine",

View File

@@ -1,85 +1,85 @@
{ {
"info": { "info": {
"name": "层岩巨渊·地下矿区-垂钓点-地下水泽西", "name": "层岩巨渊·地下矿区-垂钓点-地下水泽西",
"type": "collect", "type": "collect",
"author": "提瓦特钓鱼玳师", "author": "提瓦特钓鱼玳师",
"version": "1.0", "version": "1.0",
"description": "地区: 层岩巨渊·地下矿区\n类型: 垂钓点\n详细位置: 地下水泽西\n鱼类: 花锵、斗棘鱼、赤魔王、流纹褐蝶鱼、苦炮鲀\n饵类: 果酿饵、赤糜饵、蠕虫假饵、飞蝇假饵\n附加信息: 普通", "description": "地区: 层岩巨渊·地下矿区\n类型: 垂钓点\n详细位置: 地下水泽西\n鱼类: 花锵、斗棘鱼、赤魔王、流纹褐蝶鱼、苦炮鲀\n饵类: 果酿饵、赤糜饵、蠕虫假饵、飞蝇假饵\n附加信息: 普通",
"map_name": "TheChasm", "map_name": "TheChasm",
"bgi_version": "0.45.0" "bgi_version": "0.45.0"
}, },
"positions": [ "positions": [
{ {
"id": 1, "id": 1,
"x": 551.105, "x": 551.105,
"y": 950.869, "y": 950.869,
"action": "", "action": "",
"move_mode": "walk", "move_mode": "walk",
"action_params": "", "action_params": "",
"type": "teleport" "type": "teleport"
}, },
{ {
"id": 2, "id": 2,
"x": 566.109, "x": 566.109,
"y": 933.139, "y": 933.139,
"action": "combat_script", "action": "combat_script",
"move_mode": "fly", "move_mode": "fly",
"action_params": "keypress(space),wait(3.5),attack(0.1),wait(0.5)", "action_params": "keypress(space),wait(3.5),attack(0.1),wait(0.5)",
"type": "path" "type": "path"
}, },
{ {
"id": 3, "id": 3,
"x": 561.944, "x": 561.944,
"y": 885.065, "y": 885.065,
"action": "", "action": "",
"move_mode": "walk", "move_mode": "walk",
"action_params": "", "action_params": "",
"type": "path" "type": "path"
}, },
{ {
"id": 4, "id": 4,
"x": 574.903, "x": 574.903,
"y": 859.303, "y": 859.303,
"action": "", "action": "",
"move_mode": "walk", "move_mode": "walk",
"action_params": "", "action_params": "",
"type": "path" "type": "path"
}, },
{ {
"id": 5, "id": 5,
"x": 604.154, "x": 604.154,
"y": 802.218, "y": 802.218,
"action": "", "action": "",
"move_mode": "walk", "move_mode": "walk",
"action_params": "", "action_params": "",
"type": "path" "type": "path"
}, },
{ {
"id": 6, "id": 6,
"x": 615.878, "x": 615.878,
"y": 784.315, "y": 784.315,
"action": "combat_script", "action": "combat_script",
"move_mode": "walk", "move_mode": "walk",
"action_params": "keypress(space),wait(0.8),keypress(space)", "action_params": "keypress(space),wait(0.8),keypress(space)",
"type": "target" "type": "target"
}, },
{ {
"id": 7, "id": 7,
"x": 663.171, "x": 663.171,
"y": 781.444, "y": 781.444,
"action": "stop_flying", "action": "stop_flying",
"move_mode": "fly", "move_mode": "fly",
"action_params": "", "action_params": "",
"type": "path" "type": "path"
}, },
{ {
"id": 8, "id": 8,
"x": 659.821, "x": 659.821,
"y": 779.057, "y": 779.057,
"action": "combat_script", "action": "combat_script",
"move_mode": "walk", "move_mode": "walk",
"action_params": "wait(5.5),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f)", "action_params": "wait(5.5),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f)",
"type": "target" "type": "target"
} }
] ]
} }

View File

@@ -1,112 +1,112 @@
{ {
"info": { "info": {
"name": "层岩巨渊·地下矿区-垂钓点-无名遗迹西", "name": "层岩巨渊·地下矿区-垂钓点-无名遗迹西",
"type": "collect", "type": "collect",
"author": "提瓦特钓鱼玳师", "author": "提瓦特钓鱼玳师",
"version": "1.0", "version": "1.0",
"description": "地区: 层岩巨渊·地下矿区\n类型: 垂钓点\n详细位置: 无名遗迹西\n鱼类: 甜甜花锵、擒霞客、水晶宴、赤魔王、炮鲀\n饵类: 果酿饵、赤糜饵、飞蝇假饵\n附加信息: 普通", "description": "地区: 层岩巨渊·地下矿区\n类型: 垂钓点\n详细位置: 无名遗迹西\n鱼类: 甜甜花锵、擒霞客、水晶宴、赤魔王、炮鲀\n饵类: 果酿饵、赤糜饵、飞蝇假饵\n附加信息: 普通",
"map_name": "TheChasm", "map_name": "TheChasm",
"bgi_version": "0.45.0" "bgi_version": "0.45.0"
}, },
"positions": [ "positions": [
{ {
"id": 1, "id": 1,
"action": "", "action": "",
"move_mode": "walk", "move_mode": "walk",
"type": "teleport", "type": "teleport",
"x": 663.818, "x": 663.818,
"y": 710.265, "y": 710.265,
"action_params": "" "action_params": ""
}, },
{ {
"id": 2, "id": 2,
"x": 668.568, "x": 668.568,
"y": 708.216, "y": 708.216,
"type": "path", "type": "path",
"move_mode": "walk", "move_mode": "walk",
"action": "", "action": "",
"action_params": "" "action_params": ""
}, },
{ {
"id": 3, "id": 3,
"x": 685.488, "x": 685.488,
"y": 668.296, "y": 668.296,
"type": "path", "type": "path",
"move_mode": "fly", "move_mode": "fly",
"action": "", "action": "",
"action_params": "" "action_params": ""
}, },
{ {
"id": 4, "id": 4,
"x": 699.35, "x": 699.35,
"y": 635.75, "y": 635.75,
"type": "path", "type": "path",
"move_mode": "fly", "move_mode": "fly",
"action": "", "action": "",
"action_params": "" "action_params": ""
}, },
{ {
"id": 5, "id": 5,
"x": 702.592, "x": 702.592,
"y": 628.227, "y": 628.227,
"type": "path", "type": "path",
"move_mode": "swim", "move_mode": "swim",
"action": "", "action": "",
"action_params": "" "action_params": ""
}, },
{ {
"id": 6, "id": 6,
"x": 708.633, "x": 708.633,
"y": 620.217, "y": 620.217,
"type": "path", "type": "path",
"move_mode": "run", "move_mode": "run",
"action": "", "action": "",
"action_params": "" "action_params": ""
}, },
{ {
"id": 7, "id": 7,
"x": 722.96, "x": 722.96,
"y": 602.276, "y": 602.276,
"type": "path", "type": "path",
"move_mode": "walk", "move_mode": "walk",
"action": "", "action": "",
"action_params": "" "action_params": ""
}, },
{ {
"id": 8, "id": 8,
"x": 721.157, "x": 721.157,
"y": 575.572, "y": 575.572,
"type": "path", "type": "path",
"move_mode": "swim", "move_mode": "swim",
"action": "", "action": "",
"action_params": "" "action_params": ""
}, },
{ {
"id": 9, "id": 9,
"x": 719.015, "x": 719.015,
"y": 553.48, "y": 553.48,
"type": "path", "type": "path",
"move_mode": "walk", "move_mode": "walk",
"action": "", "action": "",
"action_params": "" "action_params": ""
}, },
{ {
"id": 10, "id": 10,
"x": 722.443, "x": 722.443,
"y": 525.935, "y": 525.935,
"type": "path", "type": "path",
"move_mode": "fly", "move_mode": "fly",
"action": "", "action": "",
"action_params": "" "action_params": ""
}, },
{ {
"id": 11, "id": 11,
"x": 722.454, "x": 722.454,
"y": 525.244, "y": 525.244,
"type": "target", "type": "target",
"move_mode": "walk", "move_mode": "walk",
"action": "combat_script", "action": "combat_script",
"action_params": "wait(0.5),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f)" "action_params": "wait(0.5),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f)"
} }
] ]
} }

View File

@@ -1,112 +1,112 @@
{ {
"info": { "info": {
"name": "渊下宫-垂钓点-蛇心之地北", "name": "渊下宫-垂钓点-蛇心之地北",
"type": "collect", "type": "collect",
"author": "提瓦特钓鱼玳师", "author": "提瓦特钓鱼玳师",
"version": "1.0", "version": "1.0",
"description": "地区: 渊下宫\n类型: 垂钓点\n详细位置: 蛇心之地北\n鱼类: 擒霞客、赤魔王、佛玛洛鳐、迪芙妲鳐\n饵类: 果酿饵、赤糜饵、飞蝇假饵\n附加信息: 战斗", "description": "地区: 渊下宫\n类型: 垂钓点\n详细位置: 蛇心之地北\n鱼类: 擒霞客、赤魔王、佛玛洛鳐、迪芙妲鳐\n饵类: 果酿饵、赤糜饵、飞蝇假饵\n附加信息: 战斗",
"map_name": "Enkanomiya", "map_name": "Enkanomiya",
"bgi_version": "0.45.0" "bgi_version": "0.45.0"
}, },
"positions": [ "positions": [
{ {
"id": 1, "id": 1,
"x": 449.603, "x": 449.603,
"y": -122.144, "y": -122.144,
"action": "", "action": "",
"move_mode": "walk", "move_mode": "walk",
"action_params": "", "action_params": "",
"type": "teleport" "type": "teleport"
}, },
{ {
"id": 2, "id": 2,
"x": 457.674, "x": 457.674,
"y": -122.943, "y": -122.943,
"action": "", "action": "",
"move_mode": "fly", "move_mode": "fly",
"action_params": "", "action_params": "",
"type": "path" "type": "path"
}, },
{ {
"id": 3, "id": 3,
"x": 526.159, "x": 526.159,
"y": -122.198, "y": -122.198,
"action": "", "action": "",
"move_mode": "fly", "move_mode": "fly",
"action_params": "", "action_params": "",
"type": "path" "type": "path"
}, },
{ {
"id": 4, "id": 4,
"x": 509.609, "x": 509.609,
"y": -122.332, "y": -122.332,
"action": "combat_script", "action": "combat_script",
"move_mode": "fly", "move_mode": "fly",
"action_params": "keypress(space),wait(2),attack(0.1),wait(1)", "action_params": "keypress(space),wait(2),attack(0.1),wait(1)",
"type": "path" "type": "path"
}, },
{ {
"id": 5, "id": 5,
"x": 433.06, "x": 433.06,
"y": -124.77, "y": -124.77,
"action": "", "action": "",
"move_mode": "run", "move_mode": "run",
"action_params": "", "action_params": "",
"type": "path" "type": "path"
}, },
{ {
"id": 6, "id": 6,
"x": 424.593, "x": 424.593,
"y": -125.994, "y": -125.994,
"action": "", "action": "",
"move_mode": "fly", "move_mode": "fly",
"action_params": "", "action_params": "",
"type": "path" "type": "path"
}, },
{ {
"id": 7, "id": 7,
"x": 415.059, "x": 415.059,
"y": -132.12, "y": -132.12,
"action": "", "action": "",
"move_mode": "walk", "move_mode": "walk",
"action_params": "", "action_params": "",
"type": "path" "type": "path"
}, },
{ {
"id": 8, "id": 8,
"x": 399.839, "x": 399.839,
"y": -130.368, "y": -130.368,
"action": "", "action": "",
"move_mode": "run", "move_mode": "run",
"action_params": "", "action_params": "",
"type": "path" "type": "path"
}, },
{ {
"id": 9, "id": 9,
"x": 361.897, "x": 361.897,
"y": -145.638, "y": -145.638,
"action": "fight", "action": "fight",
"move_mode": "walk", "move_mode": "walk",
"action_params": "", "action_params": "",
"type": "path" "type": "path"
}, },
{ {
"id": 10, "id": 10,
"x": 359.386, "x": 359.386,
"y": -147.161, "y": -147.161,
"action": "", "action": "",
"move_mode": "walk", "move_mode": "walk",
"action_params": "", "action_params": "",
"type": "path" "type": "path"
}, },
{ {
"id": 11, "id": 11,
"x": 365.236, "x": 365.236,
"y": -151.347, "y": -151.347,
"action": "combat_script", "action": "combat_script",
"move_mode": "walk", "move_mode": "walk",
"action_params": "wait(0.5),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f)", "action_params": "wait(0.5),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f)",
"type": "target" "type": "target"
} }
] ]
} }

View File

@@ -1,76 +1,76 @@
{ {
"info": { "info": {
"name": "渊下宫-垂钓点-蛇心之地西北", "name": "渊下宫-垂钓点-蛇心之地西北",
"type": "collect", "type": "collect",
"author": "提瓦特钓鱼玳师", "author": "提瓦特钓鱼玳师",
"version": "1.0", "version": "1.0",
"description": "地区: 渊下宫\n类型: 垂钓点\n详细位置: 蛇心之地西北\n鱼类: 擒霞客、流纹京紫鲽鱼、佛玛洛鳐、迪芙妲鳐\n饵类: 果酿饵、蠕虫假饵、飞蝇假饵\n附加信息: 普通", "description": "地区: 渊下宫\n类型: 垂钓点\n详细位置: 蛇心之地西北\n鱼类: 擒霞客、流纹京紫鲽鱼、佛玛洛鳐、迪芙妲鳐\n饵类: 果酿饵、蠕虫假饵、飞蝇假饵\n附加信息: 普通",
"map_name": "Enkanomiya", "map_name": "Enkanomiya",
"bgi_version": "0.45.0" "bgi_version": "0.45.0"
}, },
"positions": [ "positions": [
{ {
"id": 1, "id": 1,
"x": 449.696, "x": 449.696,
"y": -122.206, "y": -122.206,
"action": "", "action": "",
"move_mode": "walk", "move_mode": "walk",
"action_params": "", "action_params": "",
"type": "teleport" "type": "teleport"
}, },
{ {
"id": 2, "id": 2,
"x": 456.196, "x": 456.196,
"y": -171.875, "y": -171.875,
"action": "", "action": "",
"move_mode": "walk", "move_mode": "walk",
"action_params": "", "action_params": "",
"type": "path" "type": "path"
}, },
{ {
"id": 3, "id": 3,
"x": 460.745, "x": 460.745,
"y": -176.165, "y": -176.165,
"action": "", "action": "",
"move_mode": "walk", "move_mode": "walk",
"action_params": "", "action_params": "",
"type": "path" "type": "path"
}, },
{ {
"id": 4, "id": 4,
"x": 521.016, "x": 521.016,
"y": -189.905, "y": -189.905,
"action": "combat_script", "action": "combat_script",
"move_mode": "fly", "move_mode": "fly",
"action_params": "keypress(space),wait(0.5)", "action_params": "keypress(space),wait(0.5)",
"type": "path" "type": "path"
}, },
{ {
"id": 5, "id": 5,
"x": 505.83, "x": 505.83,
"y": -184.017, "y": -184.017,
"action": "stop_flying", "action": "stop_flying",
"move_mode": "fly", "move_mode": "fly",
"action_params": "", "action_params": "",
"type": "path" "type": "path"
}, },
{ {
"id": 6, "id": 6,
"x": 486.078, "x": 486.078,
"y": -182.429, "y": -182.429,
"action": "", "action": "",
"move_mode": "walk", "move_mode": "walk",
"action_params": "", "action_params": "",
"type": "path" "type": "path"
}, },
{ {
"id": 7, "id": 7,
"x": 477.826, "x": 477.826,
"y": -185.83, "y": -185.83,
"action": "combat_script", "action": "combat_script",
"move_mode": "walk", "move_mode": "walk",
"action_params": "wait(0.5),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f)", "action_params": "wait(0.5),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f)",
"type": "target" "type": "target"
} }
] ]
} }

View File

@@ -1,85 +1,85 @@
{ {
"info": { "info": {
"name": "渊下宫-垂钓点-蛇肠之路南", "name": "渊下宫-垂钓点-蛇肠之路南",
"type": "collect", "type": "collect",
"author": "提瓦特钓鱼玳师", "author": "提瓦特钓鱼玳师",
"version": "1.0", "version": "1.0",
"description": "地区: 渊下宫\n类型: 垂钓点\n详细位置: 蛇肠之路南\n鱼类: 水晶宴、肺棘鱼、佛玛洛鳐、迪芙妲鳐\n饵类: 果酿饵、赤糜饵、飞蝇假饵\n附加信息: 普通", "description": "地区: 渊下宫\n类型: 垂钓点\n详细位置: 蛇肠之路南\n鱼类: 水晶宴、肺棘鱼、佛玛洛鳐、迪芙妲鳐\n饵类: 果酿饵、赤糜饵、飞蝇假饵\n附加信息: 普通",
"map_name": "Enkanomiya", "map_name": "Enkanomiya",
"bgi_version": "0.45.0" "bgi_version": "0.45.0"
}, },
"positions": [ "positions": [
{ {
"id": 1, "id": 1,
"action": "", "action": "",
"move_mode": "walk", "move_mode": "walk",
"type": "teleport", "type": "teleport",
"x": 1409.515, "x": 1409.515,
"y": -462.347, "y": -462.347,
"action_params": "" "action_params": ""
}, },
{ {
"id": 2, "id": 2,
"x": 1410.812, "x": 1410.812,
"y": -480.44, "y": -480.44,
"type": "path", "type": "path",
"move_mode": "run", "move_mode": "run",
"action": "", "action": "",
"action_params": "" "action_params": ""
}, },
{ {
"id": 3, "id": 3,
"x": 1407.039, "x": 1407.039,
"y": -488.239, "y": -488.239,
"type": "path", "type": "path",
"move_mode": "run", "move_mode": "run",
"action": "", "action": "",
"action_params": "" "action_params": ""
}, },
{ {
"id": 4, "id": 4,
"x": 1409.159, "x": 1409.159,
"y": -500.089, "y": -500.089,
"type": "path", "type": "path",
"move_mode": "run", "move_mode": "run",
"action": "", "action": "",
"action_params": "" "action_params": ""
}, },
{ {
"id": 5, "id": 5,
"x": 1404.23, "x": 1404.23,
"y": -514.432, "y": -514.432,
"type": "path", "type": "path",
"move_mode": "run", "move_mode": "run",
"action": "", "action": "",
"action_params": "" "action_params": ""
}, },
{ {
"id": 6, "id": 6,
"x": 1391.264, "x": 1391.264,
"y": -523.862, "y": -523.862,
"type": "path", "type": "path",
"move_mode": "run", "move_mode": "run",
"action": "", "action": "",
"action_params": "" "action_params": ""
}, },
{ {
"id": 7, "id": 7,
"x": 1373.303, "x": 1373.303,
"y": -522.7, "y": -522.7,
"type": "path", "type": "path",
"move_mode": "run", "move_mode": "run",
"action": "", "action": "",
"action_params": "" "action_params": ""
}, },
{ {
"id": 8, "id": 8,
"x": 1375.642, "x": 1375.642,
"y": -520.469, "y": -520.469,
"type": "target", "type": "target",
"move_mode": "walk", "move_mode": "walk",
"action": "combat_script", "action": "combat_script",
"action_params": "wait(0.5),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f)" "action_params": "wait(0.5),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f)"
} }
] ]
} }

View File

@@ -1,76 +1,76 @@
{ {
"info": { "info": {
"name": "纳塔-垂钓点-安饶之野东", "name": "纳塔-垂钓点-安饶之野东",
"type": "collect", "type": "collect",
"author": "提瓦特钓鱼玳师", "author": "提瓦特钓鱼玳师",
"version": "1.0", "version": "1.0",
"description": "地区: 纳塔\n类型: 垂钓点\n详细位置: 安饶之野东\n鱼类: 花鳉、繁花斗士急流鱼、青浪翻车鲀、晚霞翻车鲀、伪装鲨鲨独角鱼\n饵类: 果酿饵、澄晶果粒饵\n附加信息: 普通", "description": "地区: 纳塔\n类型: 垂钓点\n详细位置: 安饶之野东\n鱼类: 花鳉、繁花斗士急流鱼、青浪翻车鲀、晚霞翻车鲀、伪装鲨鲨独角鱼\n饵类: 果酿饵、澄晶果粒饵\n附加信息: 普通",
"map_name": "Teyvat", "map_name": "Teyvat",
"bgi_version": "0.45.0" "bgi_version": "0.45.0"
}, },
"positions": [ "positions": [
{ {
"id": 1, "id": 1,
"x": 9812.729, "x": 9812.729,
"y": -2852.583, "y": -2852.583,
"action": "", "action": "",
"move_mode": "walk", "move_mode": "walk",
"action_params": "", "action_params": "",
"type": "teleport" "type": "teleport"
}, },
{ {
"id": 2, "id": 2,
"x": 9801.256, "x": 9801.256,
"y": -2861.62, "y": -2861.62,
"action": "", "action": "",
"move_mode": "walk", "move_mode": "walk",
"action_params": "", "action_params": "",
"type": "path" "type": "path"
}, },
{ {
"id": 3, "id": 3,
"x": 9804.77, "x": 9804.77,
"y": -2881.036, "y": -2881.036,
"action": "", "action": "",
"move_mode": "run", "move_mode": "run",
"action_params": "", "action_params": "",
"type": "path" "type": "path"
}, },
{ {
"id": 4, "id": 4,
"x": 9795.768, "x": 9795.768,
"y": -2899.301, "y": -2899.301,
"action": "", "action": "",
"move_mode": "run", "move_mode": "run",
"action_params": "", "action_params": "",
"type": "path" "type": "path"
}, },
{ {
"id": 5, "id": 5,
"x": 9805.4, "x": 9805.4,
"y": -2962.396, "y": -2962.396,
"action": "", "action": "",
"move_mode": "run", "move_mode": "run",
"action_params": "", "action_params": "",
"type": "path" "type": "path"
}, },
{ {
"id": 6, "id": 6,
"x": 9803.428, "x": 9803.428,
"y": -2985.433, "y": -2985.433,
"action": "", "action": "",
"move_mode": "run", "move_mode": "run",
"action_params": "", "action_params": "",
"type": "path" "type": "path"
}, },
{ {
"id": 7, "id": 7,
"x": 9793.289, "x": 9793.289,
"y": -2985.362, "y": -2985.362,
"action": "combat_script", "action": "combat_script",
"move_mode": "walk", "move_mode": "walk",
"action_params": "wait(0.5),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f)", "action_params": "wait(0.5),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f)",
"type": "target" "type": "target"
} }
] ]
} }

View File

@@ -1,58 +1,58 @@
{ {
"info": { "info": {
"name": "纳塔-垂钓点-安饶之野西", "name": "纳塔-垂钓点-安饶之野西",
"type": "collect", "type": "collect",
"author": "提瓦特钓鱼玳师", "author": "提瓦特钓鱼玳师",
"version": "1.0", "version": "1.0",
"description": "地区: 纳塔\n类型: 垂钓点\n详细位置: 安饶之野西\n鱼类: 拟似燃素独角鱼、秘源机关·巡戒使\n饵类: 温火饵\n附加信息: 普通", "description": "地区: 纳塔\n类型: 垂钓点\n详细位置: 安饶之野西\n鱼类: 拟似燃素独角鱼、秘源机关·巡戒使\n饵类: 温火饵\n附加信息: 普通",
"map_name": "Teyvat", "map_name": "Teyvat",
"bgi_version": "0.45.0" "bgi_version": "0.45.0"
}, },
"positions": [ "positions": [
{ {
"id": 1, "id": 1,
"x": 10794.748, "x": 10794.748,
"y": -3069.641, "y": -3069.641,
"action": "", "action": "",
"move_mode": "walk", "move_mode": "walk",
"action_params": "", "action_params": "",
"type": "teleport" "type": "teleport"
}, },
{ {
"id": 2, "id": 2,
"x": 10778.971, "x": 10778.971,
"y": -3026.83, "y": -3026.83,
"action": "", "action": "",
"move_mode": "run", "move_mode": "run",
"action_params": "", "action_params": "",
"type": "path" "type": "path"
}, },
{ {
"id": 3, "id": 3,
"x": 10749.681, "x": 10749.681,
"y": -2966.943, "y": -2966.943,
"action": "", "action": "",
"move_mode": "run", "move_mode": "run",
"action_params": "", "action_params": "",
"type": "path" "type": "path"
}, },
{ {
"id": 4, "id": 4,
"x": 10739.55, "x": 10739.55,
"y": -2959.098, "y": -2959.098,
"action": "", "action": "",
"move_mode": "walk", "move_mode": "walk",
"action_params": "", "action_params": "",
"type": "target" "type": "target"
}, },
{ {
"id": 5, "id": 5,
"x": 10733.511, "x": 10733.511,
"y": -2968.688, "y": -2968.688,
"action": "combat_script", "action": "combat_script",
"move_mode": "walk", "move_mode": "walk",
"action_params": "wait(0.5),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f)", "action_params": "wait(0.5),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f)",
"type": "target" "type": "target"
} }
] ]
} }

View File

@@ -1,103 +1,103 @@
{ {
"info": { "info": {
"name": "纳塔-垂钓点-安饶之野西北", "name": "纳塔-垂钓点-安饶之野西北",
"type": "collect", "type": "collect",
"author": "提瓦特钓鱼玳师", "author": "提瓦特钓鱼玳师",
"version": "1.0", "version": "1.0",
"description": "地区: 纳塔\n类型: 垂钓点\n详细位置: 安饶之野西北\n鱼类: 炽岩斗士急流鱼、拟似燃素独角鱼、秘源机关·巡戒使\n饵类: 温火饵\n附加信息: 普通", "description": "地区: 纳塔\n类型: 垂钓点\n详细位置: 安饶之野西北\n鱼类: 炽岩斗士急流鱼、拟似燃素独角鱼、秘源机关·巡戒使\n饵类: 温火饵\n附加信息: 普通",
"map_name": "Teyvat", "map_name": "Teyvat",
"bgi_version": "0.45.0" "bgi_version": "0.45.0"
}, },
"positions": [ "positions": [
{ {
"id": 1, "id": 1,
"x": 10794.748, "x": 10794.748,
"y": -3069.641, "y": -3069.641,
"action": "", "action": "",
"move_mode": "walk", "move_mode": "walk",
"action_params": "", "action_params": "",
"type": "teleport" "type": "teleport"
}, },
{ {
"id": 2, "id": 2,
"x": 10779.142, "x": 10779.142,
"y": -3026.065, "y": -3026.065,
"action": "", "action": "",
"move_mode": "run", "move_mode": "run",
"action_params": "", "action_params": "",
"type": "path" "type": "path"
}, },
{ {
"id": 3, "id": 3,
"x": 10745.41, "x": 10745.41,
"y": -2968.309, "y": -2968.309,
"action": "", "action": "",
"move_mode": "run", "move_mode": "run",
"action_params": "", "action_params": "",
"type": "path" "type": "path"
}, },
{ {
"id": 4, "id": 4,
"x": 10705.578, "x": 10705.578,
"y": -2931.406, "y": -2931.406,
"action": "", "action": "",
"move_mode": "run", "move_mode": "run",
"action_params": "", "action_params": "",
"type": "path" "type": "path"
}, },
{ {
"id": 5, "id": 5,
"x": 10684.321, "x": 10684.321,
"y": -2882.594, "y": -2882.594,
"action": "", "action": "",
"move_mode": "run", "move_mode": "run",
"action_params": "", "action_params": "",
"type": "path" "type": "path"
}, },
{ {
"id": 6, "id": 6,
"x": 10685.966, "x": 10685.966,
"y": -2862.676, "y": -2862.676,
"action": "", "action": "",
"move_mode": "run", "move_mode": "run",
"action_params": "", "action_params": "",
"type": "path" "type": "path"
}, },
{ {
"id": 7, "id": 7,
"x": 10701.326, "x": 10701.326,
"y": -2848.815, "y": -2848.815,
"action": "", "action": "",
"move_mode": "walk", "move_mode": "walk",
"action_params": "", "action_params": "",
"type": "path" "type": "path"
}, },
{ {
"id": 8, "id": 8,
"x": 10704.088, "x": 10704.088,
"y": -2835.582, "y": -2835.582,
"action": "", "action": "",
"move_mode": "walk", "move_mode": "walk",
"action_params": "", "action_params": "",
"type": "path" "type": "path"
}, },
{ {
"id": 9, "id": 9,
"x": 10693.224, "x": 10693.224,
"y": -2812.176, "y": -2812.176,
"action": "", "action": "",
"move_mode": "run", "move_mode": "run",
"action_params": "", "action_params": "",
"type": "path" "type": "path"
}, },
{ {
"id": 10, "id": 10,
"x": 10679.156, "x": 10679.156,
"y": -2807.762, "y": -2807.762,
"action": "combat_script", "action": "combat_script",
"move_mode": "walk", "move_mode": "walk",
"action_params": "wait(0.5),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f)", "action_params": "wait(0.5),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f)",
"type": "target" "type": "target"
} }
] ]
} }

View File

@@ -23,51 +23,51 @@
'全天': ['花鳉', '维护机关·澄金领队型', '海涛斧枪鱼', '维护机关·初始能力型', '甜甜花鳉', '炮鲀', '锖假龙', '金赤假龙', '玉玉心羽鲈', '苦炮鲀', '琉璃花鳉', '伪装鲨鲨独角鱼', '拟似燃素独角鱼', '炽岩斗士急流鱼', '蓝染花鳉', '青金斧枪鱼', '翡玉斧枪鱼', '佛玛洛鳐', '迪芙妲鳐', '秘源机关·巡戒使'] '全天': ['花鳉', '维护机关·澄金领队型', '海涛斧枪鱼', '维护机关·初始能力型', '甜甜花鳉', '炮鲀', '锖假龙', '金赤假龙', '玉玉心羽鲈', '苦炮鲀', '琉璃花鳉', '伪装鲨鲨独角鱼', '拟似燃素独角鱼', '炽岩斗士急流鱼', '蓝染花鳉', '青金斧枪鱼', '翡玉斧枪鱼', '佛玛洛鳐', '迪芙妲鳐', '秘源机关·巡戒使']
} }
const fish_msg = { // 可能有误,需要检查 const fish_msg = { // 可能有误,需要检查
'花鳉': { 'bait': '果酿饵', 'time': '全天' }, '花鳉': {'bait': '果酿饵', 'time': '全天'},
'波波心羽鲈': { 'bait': '酸桔饵', 'time': '夜晚' }, '波波心羽鲈': {'bait': '酸桔饵', 'time': '夜晚'},
'烘烘心羽鲈': { 'bait': '酸桔饵', 'time': '白天' }, '烘烘心羽鲈': {'bait': '酸桔饵', 'time': '白天'},
'维护机关·水域清理者': { 'bait': '维护机关频闪诱饵', 'time': '白天' }, '维护机关·水域清理者': {'bait': '维护机关频闪诱饵', 'time': '白天'},
'维护机关·态势控制者': { 'bait': '维护机关频闪诱饵', 'time': '夜晚' }, '维护机关·态势控制者': {'bait': '维护机关频闪诱饵', 'time': '夜晚'},
'维护机关·澄金领队型': { 'bait': '维护机关频闪诱饵', 'time': '全天' }, '维护机关·澄金领队型': {'bait': '维护机关频闪诱饵', 'time': '全天'},
'海涛斧枪鱼': { 'bait': '甘露饵', 'time': '全天' }, '海涛斧枪鱼': {'bait': '甘露饵', 'time': '全天'},
'维护机关·初始能力型': { 'bait': '维护机关频闪诱饵', 'time': '全天' }, '维护机关·初始能力型': {'bait': '维护机关频闪诱饵', 'time': '全天'},
'维护机关·白金典藏型': { 'bait': '维护机关频闪诱饵', 'time': '夜晚' }, '维护机关·白金典藏型': {'bait': '维护机关频闪诱饵', 'time': '夜晚'},
'吹沙角鲀': { 'bait': '甘露饵', 'time': '白天' }, '吹沙角鲀': {'bait': '甘露饵', 'time': '白天'},
'甜甜花鳉': { 'bait': '果酿饵', 'time': '全天' }, '甜甜花鳉': {'bait': '果酿饵', 'time': '全天'},
'擒霞客': { 'bait': '果酿饵', 'time': '夜晚' }, '擒霞客': {'bait': '果酿饵', 'time': '夜晚'},
'水晶宴': { 'bait': '果酿饵', 'time': '白天' }, '水晶宴': {'bait': '果酿饵', 'time': '白天'},
'斗棘鱼': { 'bait': '赤糜饵', 'time': '夜晚' }, '斗棘鱼': {'bait': '赤糜饵', 'time': '夜晚'},
'炮鲀': { 'bait': '飞蝇假饵', 'time': '全天' }, '炮鲀': {'bait': '飞蝇假饵', 'time': '全天'},
'流纹褐蝶鱼': { 'bait': '蠕虫假饵', 'time': '白天' }, '流纹褐蝶鱼': {'bait': '蠕虫假饵', 'time': '白天'},
'锖假龙': { 'bait': '飞蝇假饵', 'time': '全天' }, '锖假龙': {'bait': '飞蝇假饵', 'time': '全天'},
'金赤假龙': { 'bait': '飞蝇假饵', 'time': '全天' }, '金赤假龙': {'bait': '飞蝇假饵', 'time': '全天'},
'玉玉心羽鲈': { 'bait': '酸桔饵', 'time': '全天' }, '玉玉心羽鲈': {'bait': '酸桔饵', 'time': '全天'},
'赤魔王': { 'bait': '赤糜饵', 'time': '白天' }, '赤魔王': {'bait': '赤糜饵', 'time': '白天'},
'长生仙': { 'bait': '蠕虫假饵', 'time': '白天' }, '长生仙': {'bait': '蠕虫假饵', 'time': '白天'},
'苦炮鲀': { 'bait': '飞蝇假饵', 'time': '全天' }, '苦炮鲀': {'bait': '飞蝇假饵', 'time': '全天'},
'肺棘鱼': { 'bait': '赤糜饵', 'time': '夜晚' }, '肺棘鱼': {'bait': '赤糜饵', 'time': '夜晚'},
'流纹京紫蝶鱼': { 'bait': '蠕虫假饵', 'time': '白天' }, '流纹京紫蝶鱼': {'bait': '蠕虫假饵', 'time': '白天'},
'琉璃花鳉': { 'bait': '果酿饵', 'time': '全天' }, '琉璃花鳉': {'bait': '果酿饵', 'time': '全天'},
'伪装鲨鲨独角鱼': { 'bait': '澄晶果粒饵', 'time': '全天' }, '伪装鲨鲨独角鱼': {'bait': '澄晶果粒饵', 'time': '全天'},
'繁花斗士急流鱼': { 'bait': '澄晶果粒饵', 'time': '夜晚' }, '繁花斗士急流鱼': {'bait': '澄晶果粒饵', 'time': '夜晚'},
'深潜斗士急流鱼': { 'bait': '澄晶果粒饵', 'time': '白天' }, '深潜斗士急流鱼': {'bait': '澄晶果粒饵', 'time': '白天'},
'晚霞翻车鲀': { 'bait': '澄晶果粒饵', 'time': '夜晚' }, '晚霞翻车鲀': {'bait': '澄晶果粒饵', 'time': '夜晚'},
'青浪翻车鲀': { 'bait': '澄晶果粒饵', 'time': '白天' }, '青浪翻车鲀': {'bait': '澄晶果粒饵', 'time': '白天'},
'拟似燃素独角鱼': { 'bait': '温火饵', 'time': '全天' }, '拟似燃素独角鱼': {'bait': '温火饵', 'time': '全天'},
'炽岩斗士急流鱼': { 'bait': '温火饵', 'time': '全天' }, '炽岩斗士急流鱼': {'bait': '温火饵', 'time': '全天'},
'蓝染花鳉': { 'bait': '果酿饵', 'time': '全天' }, '蓝染花鳉': {'bait': '果酿饵', 'time': '全天'},
'鸩棘鱼': { 'bait': '赤糜饵', 'time': '夜晚' }, '鸩棘鱼': {'bait': '赤糜饵', 'time': '夜晚'},
'流纹茶蝶鱼': { 'bait': '蠕虫假饵', 'time': '白天' }, '流纹茶蝶鱼': {'bait': '蠕虫假饵', 'time': '白天'},
'雪中君': { 'bait': '赤糜饵', 'time': '夜晚' }, '雪中君': {'bait': '赤糜饵', 'time': '夜晚'},
'真果角鲀': { 'bait': '甘露饵', 'time': '白天' }, '真果角鲀': {'bait': '甘露饵', 'time': '白天'},
'青金斧枪鱼': { 'bait': '甘露饵', 'time': '全天' }, '青金斧枪鱼': {'bait': '甘露饵', 'time': '全天'},
'暮云角鲀': { 'bait': '甘露饵', 'time': '夜晚' }, '暮云角鲀': {'bait': '甘露饵', 'time': '夜晚'},
'翡玉斧枪鱼': { 'bait': '甘露饵', 'time': '全天' }, '翡玉斧枪鱼': {'bait': '甘露饵', 'time': '全天'},
'沉波蜜桃': { 'bait': '甘露饵', 'time': '白天' }, '沉波蜜桃': {'bait': '甘露饵', 'time': '白天'},
'雷鸣仙': { 'bait': '蠕虫假饵', 'time': '夜晚' }, '雷鸣仙': {'bait': '蠕虫假饵', 'time': '夜晚'},
'佛玛洛鳐': { 'bait': '飞蝇假饵', 'time': '全天' }, '佛玛洛鳐': {'bait': '飞蝇假饵', 'time': '全天'},
'迪芙妲鳐': { 'bait': '飞蝇假饵', 'time': '全天' }, '迪芙妲鳐': {'bait': '飞蝇假饵', 'time': '全天'},
'秘源机关·巡戒使': { 'bait': '温火饵', 'time': '全天' } '秘源机关·巡戒使': {'bait': '温火饵', 'time': '全天'}
} }
const path_pathing = [ const path_pathing = [
'枫丹-垂钓点-伊黎耶林区幽林雾道西南-花鳉_波波心羽鲈_烘烘心羽鲈_维护机关·水域清理者_维护机关·态势控制者_维护机关·澄金领队型-果酿饵_酸橘饵_维护机关频闪诱饵-普通', '枫丹-垂钓点-伊黎耶林区幽林雾道西南-花鳉_波波心羽鲈_烘烘心羽鲈_维护机关·水域清理者_维护机关·态势控制者_维护机关·澄金领队型-果酿饵_酸橘饵_维护机关频闪诱饵-普通',
@@ -149,10 +149,10 @@
'须弥-垂钓点-阿陀河谷降诸魔山-擒霞客_真果角鲀_暮云角鲀_翡玉斧枪鱼-果酿饵_甘露饵-普通', '须弥-垂钓点-阿陀河谷降诸魔山-擒霞客_真果角鲀_暮云角鲀_翡玉斧枪鱼-果酿饵_甘露饵-普通',
] ]
const fishing_time_dic = { const fishing_time_dic = {
"全天": { "name": "All", "param": 0 }, "全天": {"name": "All", "param": 0},
"白天": { "name": "Daytime", "param": 1 }, "白天": {"name": "Daytime", "param": 1},
"夜晚": { "name": "Nighttime", "param": 2 }, "夜晚": {"name": "Nighttime", "param": 2},
"禁用": { "name": "Block", "param": "" }, "禁用": {"name": "Block", "param": ""},
} }
const statue_name = "蒙德-七天神像-苍风高地"; const statue_name = "蒙德-七天神像-苍风高地";
// 存储本次任务中的所有鱼类,作为调节时间的关键参考 // 存储本次任务中的所有鱼类,作为调节时间的关键参考
@@ -207,9 +207,9 @@
content[user_id][pathing_name]["Nighttime"] = timestamp; content[user_id][pathing_name]["Nighttime"] = timestamp;
} else if (time_status === "白天") { } else if (time_status === "白天") {
content[user_id][pathing_name]["Daytime"] = timestamp; content[user_id][pathing_name]["Daytime"] = timestamp;
content[user_id][pathing_name]["Nighttime"] = Object.keys(content[user_id][pathing_name]).includes("Nighttime") ? content[user_id][pathing_name]["Nighttime"] : null; content[user_id][pathing_name]["Nighttime"] = Object.keys(content[user_id][pathing_name]).includes("Nighttime") ? content[user_id][pathing_name]["Nighttime"]: null;
} else if (time_status === "夜晚") { } else if (time_status === "夜晚") {
content[user_id][pathing_name]["Daytime"] = Object.keys(content[user_id][pathing_name]).includes("Daytime") ? content[user_id][pathing_name]["Daytime"] : null; content[user_id][pathing_name]["Daytime"] = Object.keys(content[user_id][pathing_name]).includes("Daytime") ? content[user_id][pathing_name]["Daytime"]: null;
content[user_id][pathing_name]["Nighttime"] = timestamp; content[user_id][pathing_name]["Nighttime"] = timestamp;
} }
@@ -290,15 +290,15 @@
let regex_area, regex_fish, regex_bait; let regex_area, regex_fish, regex_bait;
// 读取地区 // 读取地区
let path_sort_area = typeof (settings.path_sort_area) === 'undefined' || settings.path_sort_area === "" ? [] : settings.path_sort_area.split(' '); let path_sort_area = typeof(settings.path_sort_area) === 'undefined' || settings.path_sort_area === "" ? [] : settings.path_sort_area.split(' ');
// 读取鱼类 // 读取鱼类
let path_sort_fish = typeof (settings.path_sort_fish) === 'undefined' || settings.path_sort_fish === "" ? [] : settings.path_sort_fish.split(' '); let path_sort_fish = typeof(settings.path_sort_fish) === 'undefined' || settings.path_sort_fish === "" ? [] : settings.path_sort_fish.split(' ');
// 读取鱼饵 // 读取鱼饵
let path_sort_bait = typeof (settings.path_sort_bait) === 'undefined' || settings.path_sort_bait === "" ? [] : settings.path_sort_bait.split(' '); let path_sort_bait = typeof(settings.path_sort_bait) === 'undefined' || settings.path_sort_bait === "" ? [] : settings.path_sort_bait.split(' ');
// 读取兑换材料 // 读取兑换材料
let path_sort_material = typeof (settings.path_sort_material) === 'undefined' ? "无(默认)" : settings.path_sort_material; let path_sort_material = typeof(settings.path_sort_material) === 'undefined' ? "无(默认)" : settings.path_sort_material;
// 读取调试信息 // 读取调试信息
let path_select = typeof (settings.path_select) === 'undefined' ? "无(默认)" : settings.path_select; let path_select = typeof(settings.path_select) === 'undefined' ? "无(默认)" : settings.path_select;
// 调式模式 // 调式模式
if (path_select !== "无(默认)") { if (path_select !== "无(默认)") {
@@ -362,7 +362,7 @@
} }
} }
for (const path of path_pathing) { for (const path of path_pathing) {
if (regex_area.test(path) && regex_fish.test(path) && regex_bait_include.test(path)) { // 逻辑薄弱点可能导致bug if (regex_area.test(path) && regex_fish.test(path) && regex_bait_include.test(path)) { // 逻辑薄弱点可能导致bug
path_list.push(path); path_list.push(path);
} }
@@ -376,7 +376,7 @@
// 作为时间调节参照数组 // 作为时间调节参照数组
list_fish = msg; list_fish = msg;
log.info(`目标材料: ${material_name}\n鱼类: ${msg}`); log.info(`目标材料: ${material_name}\n鱼类: ${msg}`);
for (const path of path_pathing) { for (const path of path_pathing) {
const fish_sort_regex = new RegExp(msg.join("|")); const fish_sort_regex = new RegExp(msg.join("|"));
if (fish_sort_regex.test(path)) { if (fish_sort_regex.test(path)) {
path_list.push(path); path_list.push(path);
@@ -418,9 +418,9 @@
// 时间调节 // 时间调节
let fishing_time = "全天"; let fishing_time = "全天";
// 读取游戏模式(多人模式则禁用时间调节)[暂时不可用] // 读取游戏模式(多人模式则禁用时间调节)[暂时不可用]
let check_multiplayer = typeof (settings.check_multiplayer) === 'undefined' ? false : settings.check_multiplayer; let check_multiplayer = typeof(settings.check_multiplayer) === 'undefined' ? false : settings.check_multiplayer;
// 读取调试模式的时间 // 读取调试模式的时间
let path_time = typeof (settings.path_time) === 'undefined' ? "全天" : settings.path_time; let path_time = typeof(settings.path_time) === 'undefined' ? "全天" : settings.path_time;
// 需要的鱼类 // 需要的鱼类
let fish_need = list_fish.filter(item => path_msg["fish_type"].includes(item)); let fish_need = list_fish.filter(item => path_msg["fish_type"].includes(item));
// 正则-全天出现的鱼 // 正则-全天出现的鱼
@@ -445,12 +445,12 @@
const is_nighttime = fish_need.some(item => regex_nighttime.test(item)); const is_nighttime = fish_need.some(item => regex_nighttime.test(item));
// 调式模式不弹出未匹配钓鱼时间的报错 // 调式模式不弹出未匹配钓鱼时间的报错
if (!is_daytime && !is_nighttime && (typeof (settings.path_select) === 'undefined' || settings.path_select === "无(默认)")) { if (!is_daytime && !is_nighttime && (typeof(settings.path_select) === 'undefined' || settings.path_select === "无(默认)")) {
log.error("出错:未找到匹配的钓鱼时间") log.error("出错:未找到匹配的钓鱼时间")
return null; return null;
} else if (is_daytime && !is_nighttime) { // 只有白天的鱼 } else if (is_daytime && !is_nighttime){ // 只有白天的鱼
fishing_time = "白天"; fishing_time = "白天";
} else if (!is_daytime && is_nighttime) { // 只有夜晚的鱼 } else if (!is_daytime && is_nighttime){ // 只有夜晚的鱼
fishing_time = "夜晚"; fishing_time = "夜晚";
} }
// 昼夜都有则还是 全天 // 昼夜都有则还是 全天
@@ -461,44 +461,57 @@
fishing_time = path_time; fishing_time = path_time;
} }
// 4点自动领取月卡 if (auto_skip) {
let time_now = new Date(); // log.info(`[DEBUG] 开始自动领取月卡`);
let time_4 = new Date(time_now.getFullYear(), time_now.getMonth(), time_now.getDate(), 4, 0, 0); // 4点 // 4点自动领取月卡
let time_predict_end; // 根据超时时间预测本次钓鱼结束时间加1分钟容错 let time_now = new Date();
if (fishing_time === "全天") { let time_4 = new Date(time_now.getFullYear(), time_now.getMonth(), time_now.getDate(), 4, 0, 0); // 4点
time_predict_end = time_now.setSeconds(time_now.getSeconds() + time_out_whole * 2 + 60); // log.info(`[DEBUG] time_now: ${time_now}`);
} else { // log.info(`[DEBUG] time_4: ${time_4}`);
time_predict_end = time_now.setSeconds(time_now.getSeconds() + time_out_whole + 60); let time_predict_end; // 根据超时时间预测本次钓鱼结束时间加1分钟容错
} if (fishing_time === "全天") {
// 30s点击一次等待领取月卡 time_predict_end = new Date(time_now.getTime() + (time_out_whole * 2 + 60) * 1000);
let step_flag = 0; // 领取月卡步骤标志 } else {
while (auto_skip && time_now < time_4 && time_predict_end >= time_4) { time_predict_end = new Date(time_now.getTime() + (time_out_whole + 60) * 1000);
log.info(`等待领取月卡(剩余${Math.floor((time_4 - new Date()) / 1000)}s)...`);
if (step_flag === 0) {
// 传送到七天神像
await pathingScript.runFile(base_path_pathing + statue_name + ".json");
step_flag += 1;
} }
await sleep(30000); // log.info(`[DEBUG] time_predict_end: ${time_predict_end}`);
keyDown("VK_LBUTTON"); // log.info(`[DEBUG] ${time_now < time_4} | ${time_predict_end >= time_4}`);
await sleep(100); // 30s点击一次等待领取月卡
keyUp("VK_LBUTTON"); let step_flag = 0; // 领取月卡步骤标志
while (time_now < time_4 && time_predict_end >= time_4) {
log.info(`等待领取月卡(剩余${Math.floor((time_4 - new Date()) / 1000)}s)...`);
if (step_flag === 0) {
// 传送到七天神像
await pathingScript.runFile(base_path_statues + statue_name + ".json");
step_flag += 1;
}
await sleep(30000);
keyPress("ESCAPE");
await sleep(2000);
keyPress("ESCAPE");
time_now = new Date();
}
// 本次已经到达4点(5s容错) // 本次已经到达4点(5s容错)
if (new Date() > time_4.setSeconds(time_4.getSeconds() - 5)) { if (new Date() > time_4.setSeconds(time_4.getSeconds())) {
await sleep(5000);
step_flag += 1; step_flag += 1;
auto_skip = false; auto_skip = false;
} }
// 领取月卡(点击两次)
} if (step_flag === 2) {
// 领取月卡(点击两次) // step_flag = 0;
if (step_flag === 2) { await sleep(5000); // 补回容错时间
// step_flag = 0; await click(1450, 1020); // 点击时间调节的确认按钮的位置
await sleep(5); // 补回容错时间 await sleep(5000); // 等待月卡动画时间
await click(1450, 1020); // 点击时间调节的确认按钮的位置 await click(1450, 1020);
await sleep(5); // 等待月卡动画时间 await sleep(1000);
await click(1450, 1020); await click(1450, 1020);
await sleep(1); await sleep(1000);
await click(1450, 1020);
await sleep(1000);
}
} }
log.info(`该钓鱼点的时间: ${fishing_time}`); log.info(`该钓鱼点的时间: ${fishing_time}`);
@@ -595,8 +608,8 @@
let time_out_throw, time_out_whole; let time_out_throw, time_out_whole;
try { try {
// 读取超时时间 // 读取超时时间
time_out_throw = typeof (settings.time_out_throw) === 'undefined' ? 10 : parseInt(settings.time_out_throw, 10); time_out_throw = typeof(settings.time_out_throw) === 'undefined' ? 10 : parseInt(settings.time_out_throw, 10);
time_out_whole = typeof (settings.time_out_whole) === 'undefined' ? 300 : parseInt(settings.time_out_whole, 10); time_out_whole = typeof(settings.time_out_whole) === 'undefined' ? 300 : parseInt(settings.time_out_whole, 10);
} catch (error) { } catch (error) {
log.error(`超时时间读取错误请检查JS脚本配置: ${error}`); log.error(`超时时间读取错误请检查JS脚本配置: ${error}`);
return null; return null;
@@ -604,25 +617,25 @@
// 筛选路径 // 筛选路径
let path_filter = pathing_filter(); let path_filter = pathing_filter();
// 读取要继续的路径 // 读取要继续的路径
let path_continue = typeof (settings.path_continue) === 'undefined' ? "无(默认)" : settings.path_continue; let path_continue = typeof(settings.path_continue) === 'undefined' ? "无(默认)" : settings.path_continue;
let is_continue = true; let is_continue = true;
// 判断是否是调式模式 // 判断是否是调式模式
const is_con = !(typeof (settings.path_select) === 'undefined' || settings.path_select === "无(默认)"); const is_con = !(typeof(settings.path_select) === 'undefined' || settings.path_select === "无(默认)");
// 键鼠设置读取 // 键鼠设置读取
const block_gcm = typeof (settings.block_gcm) === 'undefined' ? false : settings.block_gcm; const block_gcm = typeof(settings.block_gcm) === 'undefined' ? false : settings.block_gcm;
// 战斗设置读取 // 战斗设置读取
const block_fight = typeof (settings.block_fight) === 'undefined' ? false : settings.block_fight; const block_fight = typeof(settings.block_fight) === 'undefined' ? false : settings.block_fight;
// 鹤观设置读取 // 鹤观设置读取
const block_tsurumi = typeof (settings.block_tsurumi) === 'undefined' ? false : settings.block_tsurumi; const block_tsurumi = typeof(settings.block_tsurumi) === 'undefined' ? false : settings.block_tsurumi;
// 读取自动拾取设置 // 读取自动拾取设置
const auto_pick = typeof (settings.auto_pick) === 'undefined' ? false : settings.auto_pick; const auto_pick = typeof(settings.auto_pick) === 'undefined' ? false : settings.auto_pick;
// 读取4点自动领取月卡的设置 // 读取4点自动领取月卡的设置
const auto_skip = typeof (settings.auto_skip) === 'undefined' ? false : settings.auto_skip; const auto_skip = typeof(settings.auto_skip) === 'undefined' ? false : settings.auto_skip;
// 读取垂钓点CD统计 // 读取垂钓点CD统计
let fishing_cd = typeof (settings.fishing_cd) === 'undefined' ? false : settings.fishing_cd; let fishing_cd = typeof(settings.fishing_cd) === 'undefined' ? false: settings.fishing_cd;
// 读取终止时间 // 读取终止时间
const kill_hour = typeof (settings.time_kill_hour) === 'undefined' ? "无" : settings.time_kill_hour; const kill_hour = typeof(settings.time_kill_hour) === 'undefined' ? "无" : settings.time_kill_hour;
const kill_minute = typeof (settings.time_kill_minute) === 'undefined' ? "无" : settings.time_kill_minute; const kill_minute = typeof(settings.time_kill_minute) === 'undefined' ? "无" : settings.time_kill_minute;
const is_time_kill = kill_hour !== "无" && kill_minute !== "无"; // 判断是否启用 const is_time_kill = kill_hour !== "无" && kill_minute !== "无"; // 判断是否启用
let time_target = new Date(); let time_target = new Date();
@@ -695,19 +708,19 @@
// 路径详细信息 // 路径详细信息
const path_msg = get_pathing_msg(path_filter[i]); const path_msg = get_pathing_msg(path_filter[i]);
// try { // try {
let current_msg = `${path_msg["area"]}-${path_msg["detail"]}` let current_msg = `${path_msg["area"]}-${path_msg["detail"]}`
log.info(`当前钓鱼点: ${current_msg}(进度: ${i + 1}/${path_filter.length})`); log.info(`当前钓鱼点: ${current_msg}(进度: ${i + 1}/${path_filter.length})`);
if (path_continue === current_msg) { if (path_continue === current_msg) {
is_continue = false; is_continue = false;
} }
// 从选择的点位继续 // 从选择的点位继续
if (path_continue !== "无(默认)" && !is_con && is_continue && path_filter.length === path_pathing.length) { if (path_continue !== "无(默认)" && !is_con && is_continue && path_filter.length === path_pathing.length) {
log.info("跳过..."); log.info("跳过...");
continue; continue;
} }
await run_file(path_msg, time_out_throw, time_out_whole, is_con, block_gcm, block_fight, block_tsurumi, auto_skip, fishing_cd, uid); await run_file(path_msg, time_out_throw, time_out_whole, is_con, block_gcm, block_fight, block_tsurumi, auto_skip, fishing_cd, uid);
// } catch (error) { // } catch (error) {
// const file_name = `${path_msg["area"]}-${path_msg["type"]}-${path_msg["detail"]}`; // const file_name = `${path_msg["area"]}-${path_msg["type"]}-${path_msg["detail"]}`;
// log.info(`路径: ${file_name} 执行时出错,已跳过...\n错误信息: ${error}`) // log.info(`路径: ${file_name} 执行时出错,已跳过...\n错误信息: ${error}`)

View File

@@ -1,7 +1,7 @@
{ {
"manifest_version": 1, "manifest_version": 1,
"name": "提瓦特自动钓鱼(全流程+自选)", "name": "提瓦特自动钓鱼(全流程+自选)",
"version": "2.2.4", "version": "2.2.5",
"bgi_version": "0.47.0", "bgi_version": "0.47.0",
"description": "支持自动追踪并垂钓bgi支持的全提瓦特垂钓点", "description": "支持自动追踪并垂钓bgi支持的全提瓦特垂钓点",
"authors": [ "authors": [