From 1fa6d6533920737da67273a50b46ac0f1d2204db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=8F=90=E7=93=A6=E7=89=B9=E9=92=93=E9=B1=BC=E7=8E=B3?= =?UTF-8?q?=E5=B8=88?= <144542161+Hijiwos@users.noreply.github.com> Date: Mon, 5 May 2025 07:35:56 +0800 Subject: [PATCH] =?UTF-8?q?JS=E8=84=9A=E6=9C=AC=EF=BC=9A=E6=8F=90=E7=93=A6?= =?UTF-8?q?=E7=89=B9=E5=85=A8=E8=87=AA=E5=8A=A8=E9=92=93=E9=B1=BC=E3=80=90?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E3=80=91=20(#701)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 添加了制谱器 * 修正两个误改点位 * 更新版号 * 添加制谱器【跟新描述】 * 添加制谱器 * Delete repo/js/AutoYuanQin/assets/1.小星星.json * Delete repo/js/AutoYuanQin/assets/2.小星星变奏曲.json * Delete repo/js/AutoYuanQin/assets/3.Unknown Mother Goose [アンノウン・マザーグース].json * Delete repo/js/AutoYuanQin/assets/4.铃芽之旅[Suzume].json * Delete repo/js/AutoYuanQin/assets/5.Flower Dance.json * Delete repo/js/AutoYuanQin/assets/example.json * 更新制谱器 * 完善制谱器 完善了制谱器，修复了制谱器的遗留问题 * 删除重复文件 * 更新制谱器版号 * update repo.json * JS脚本: 自动烹饪 * 修正JS脚本描述 * 添加了全部料理的快速选择 * JS脚本： 全禽肉收集(提瓦特) * JS脚本：禽肉全收集(提瓦特)【修复】 * JS脚本；一只爱可菲（厨娘版）【修复】 * JS脚本：一只爱可菲【厨娘版】【修复】 修复了烹饪结果识别异常的bug * JS脚本：狗粮ABE路线，自动拾取分解 去七天神像回复关闭自动拾取 * 删除不必要的图片 * 更新版号 * 更新层岩和渊下宫路线 --- .../层岩巨渊·地下矿区-垂钓点-地下水泽西.json | 85 +++++++++++++ .../层岩巨渊·地下矿区-垂钓点-无名遗迹西.json | 112 ++++++++++++++++++ .../pathing/渊下宫-垂钓点-蛇心之地北.json | 112 ++++++++++++++++++ .../pathing/渊下宫-垂钓点-蛇心之地西北.json | 76 ++++++++++++ .../pathing/渊下宫-垂钓点-蛇肠之路南.json | 85 +++++++++++++ .../pathing/稻妻-垂钓点-八酝岛名椎滩北.json | 4 +- repo/js/AutoFishingTeyvat/main.js | 24 ++-- repo/js/AutoFishingTeyvat/manifest.json | 6 +- repo/js/AutoFishingTeyvat/settings.json | 5 + 9 files changed, 491 insertions(+), 18 deletions(-) create mode 100644 repo/js/AutoFishingTeyvat/assets/pathing/层岩巨渊·地下矿区-垂钓点-地下水泽西.json create mode 100644 repo/js/AutoFishingTeyvat/assets/pathing/层岩巨渊·地下矿区-垂钓点-无名遗迹西.json create mode 100644 repo/js/AutoFishingTeyvat/assets/pathing/渊下宫-垂钓点-蛇心之地北.json create mode 100644 repo/js/AutoFishingTeyvat/assets/pathing/渊下宫-垂钓点-蛇心之地西北.json create mode 100644 repo/js/AutoFishingTeyvat/assets/pathing/渊下宫-垂钓点-蛇肠之路南.json diff --git a/repo/js/AutoFishingTeyvat/assets/pathing/层岩巨渊·地下矿区-垂钓点-地下水泽西.json b/repo/js/AutoFishingTeyvat/assets/pathing/层岩巨渊·地下矿区-垂钓点-地下水泽西.json new file mode 100644 index 00000000..a7d39194 --- /dev/null +++ b/repo/js/AutoFishingTeyvat/assets/pathing/层岩巨渊·地下矿区-垂钓点-地下水泽西.json @@ -0,0 +1,85 @@ +{ + "info": { + "name": "层岩巨渊·地下矿区-垂钓点-地下水泽西", + "type": "collect", + "author": "提瓦特钓鱼玳师", + "version": "1.0", + "description": "地区: 层岩巨渊·地下矿区\n类型: 垂钓点\n详细位置: 地下水泽西\n鱼类: 花锵、斗棘鱼、赤魔王、流纹褐蝶鱼、苦炮鲀\n饵类: 果酿饵、赤糜饵、蠕虫假饵、飞蝇假饵\n附加信息: 普通", + "map_name": "TheChasm", + "bgi_version": "0.45.0" + }, + "positions": [ + { + "id": 1, + "x": 551.105, + "y": 950.869, + "action": "", + "move_mode": "walk", + "action_params": "", + "type": "teleport" + }, + { + "id": 2, + "x": 566.109, + "y": 933.139, + "action": "combat_script", + "move_mode": "fly", + "action_params": "keypress(space),wait(3.5),attack(0.1),wait(0.5)", + "type": "path" + }, + { + "id": 3, + "x": 561.944, + "y": 885.065, + "action": "", + "move_mode": "walk", + "action_params": "", + "type": "path" + }, + { + "id": 4, + "x": 574.903, + "y": 859.303, + "action": "", + "move_mode": "walk", + "action_params": "", + "type": "path" + }, + { + "id": 5, + "x": 604.154, + "y": 802.218, + "action": "", + "move_mode": "walk", + "action_params": "", + "type": "path" + }, + { + "id": 6, + "x": 615.878, + "y": 784.315, + "action": "combat_script", + "move_mode": "walk", + "action_params": "keypress(space),wait(0.8),keypress(space)", + "type": "target" + }, + { + "id": 7, + "x": 663.171, + "y": 781.444, + "action": "stop_flying", + "move_mode": "fly", + "action_params": "", + "type": "path" + }, + { + "id": 8, + "x": 659.821, + "y": 779.057, + "action": "combat_script", + "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)", + "type": "target" + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoFishingTeyvat/assets/pathing/层岩巨渊·地下矿区-垂钓点-无名遗迹西.json b/repo/js/AutoFishingTeyvat/assets/pathing/层岩巨渊·地下矿区-垂钓点-无名遗迹西.json new file mode 100644 index 00000000..00d99d4a --- /dev/null +++ b/repo/js/AutoFishingTeyvat/assets/pathing/层岩巨渊·地下矿区-垂钓点-无名遗迹西.json @@ -0,0 +1,112 @@ +{ + "info": { + "name": "层岩巨渊·地下矿区-垂钓点-无名遗迹西", + "type": "collect", + "author": "提瓦特钓鱼玳师", + "version": "1.0", + "description": "地区: 层岩巨渊·地下矿区\n类型: 垂钓点\n详细位置: 无名遗迹西\n鱼类: 甜甜花锵、擒霞客、水晶宴、赤魔王、炮鲀\n饵类: 果酿饵、赤糜饵、飞蝇假饵\n附加信息: 普通", + "map_name": "TheChasm", + "bgi_version": "0.45.0" + }, + "positions": [ + { + "id": 1, + "action": "", + "move_mode": "walk", + "type": "teleport", + "x": 663.818, + "y": 710.265, + "action_params": "" + }, + { + "id": 2, + "x": 668.568, + "y": 708.216, + "type": "path", + "move_mode": "walk", + "action": "", + "action_params": "" + }, + { + "id": 3, + "x": 685.488, + "y": 668.296, + "type": "path", + "move_mode": "fly", + "action": "", + "action_params": "" + }, + { + "id": 4, + "x": 699.35, + "y": 635.75, + "type": "path", + "move_mode": "fly", + "action": "", + "action_params": "" + }, + { + "id": 5, + "x": 702.592, + "y": 628.227, + "type": "path", + "move_mode": "swim", + "action": "", + "action_params": "" + }, + { + "id": 6, + "x": 708.633, + "y": 620.217, + "type": "path", + "move_mode": "run", + "action": "", + "action_params": "" + }, + { + "id": 7, + "x": 722.96, + "y": 602.276, + "type": "path", + "move_mode": "walk", + "action": "", + "action_params": "" + }, + { + "id": 8, + "x": 721.157, + "y": 575.572, + "type": "path", + "move_mode": "swim", + "action": "", + "action_params": "" + }, + { + "id": 9, + "x": 719.015, + "y": 553.48, + "type": "path", + "move_mode": "walk", + "action": "", + "action_params": "" + }, + { + "id": 10, + "x": 722.443, + "y": 525.935, + "type": "path", + "move_mode": "fly", + "action": "", + "action_params": "" + }, + { + "id": 11, + "x": 722.454, + "y": 525.244, + "type": "target", + "move_mode": "walk", + "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)" + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoFishingTeyvat/assets/pathing/渊下宫-垂钓点-蛇心之地北.json b/repo/js/AutoFishingTeyvat/assets/pathing/渊下宫-垂钓点-蛇心之地北.json new file mode 100644 index 00000000..20963099 --- /dev/null +++ b/repo/js/AutoFishingTeyvat/assets/pathing/渊下宫-垂钓点-蛇心之地北.json @@ -0,0 +1,112 @@ +{ + "info": { + "name": "渊下宫-垂钓点-蛇心之地北", + "type": "collect", + "author": "提瓦特钓鱼玳师", + "version": "1.0", + "description": "地区: 渊下宫\n类型: 垂钓点\n详细位置: 蛇心之地北\n鱼类: 擒霞客、赤魔王、佛玛洛鳐、迪芙妲鳐\n饵类: 果酿饵、赤糜饵、飞蝇假饵\n附加信息: 战斗", + "map_name": "Enkanomiya", + "bgi_version": "0.45.0" + }, + "positions": [ + { + "id": 1, + "x": 449.603, + "y": -122.144, + "action": "", + "move_mode": "walk", + "action_params": "", + "type": "teleport" + }, + { + "id": 2, + "x": 457.674, + "y": -122.943, + "action": "", + "move_mode": "fly", + "action_params": "", + "type": "path" + }, + { + "id": 3, + "x": 526.159, + "y": -122.198, + "action": "", + "move_mode": "fly", + "action_params": "", + "type": "path" + }, + { + "id": 4, + "x": 509.609, + "y": -122.332, + "action": "combat_script", + "move_mode": "fly", + "action_params": "keypress(space),wait(2),attack(0.1),wait(1)", + "type": "path" + }, + { + "id": 5, + "x": 433.06, + "y": -124.77, + "action": "", + "move_mode": "run", + "action_params": "", + "type": "path" + }, + { + "id": 6, + "x": 424.593, + "y": -125.994, + "action": "", + "move_mode": "fly", + "action_params": "", + "type": "path" + }, + { + "id": 7, + "x": 415.059, + "y": -132.12, + "action": "", + "move_mode": "walk", + "action_params": "", + "type": "path" + }, + { + "id": 8, + "x": 399.839, + "y": -130.368, + "action": "", + "move_mode": "run", + "action_params": "", + "type": "path" + }, + { + "id": 9, + "x": 361.897, + "y": -145.638, + "action": "fight", + "move_mode": "walk", + "action_params": "", + "type": "path" + }, + { + "id": 10, + "x": 359.386, + "y": -147.161, + "action": "", + "move_mode": "walk", + "action_params": "", + "type": "path" + }, + { + "id": 11, + "x": 365.236, + "y": -151.347, + "action": "combat_script", + "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)", + "type": "target" + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoFishingTeyvat/assets/pathing/渊下宫-垂钓点-蛇心之地西北.json b/repo/js/AutoFishingTeyvat/assets/pathing/渊下宫-垂钓点-蛇心之地西北.json new file mode 100644 index 00000000..e631c623 --- /dev/null +++ b/repo/js/AutoFishingTeyvat/assets/pathing/渊下宫-垂钓点-蛇心之地西北.json @@ -0,0 +1,76 @@ +{ + "info": { + "name": "渊下宫-垂钓点-蛇心之地西北", + "type": "collect", + "author": "提瓦特钓鱼玳师", + "version": "1.0", + "description": "地区: 渊下宫\n类型: 垂钓点\n详细位置: 蛇心之地西北\n鱼类: 擒霞客、流纹京紫鲽鱼、佛玛洛鳐、迪芙妲鳐\n饵类: 果酿饵、蠕虫假饵、飞蝇假饵\n附加信息: 普通", + "map_name": "Enkanomiya", + "bgi_version": "0.45.0" + }, + "positions": [ + { + "id": 1, + "x": 449.696, + "y": -122.206, + "action": "", + "move_mode": "walk", + "action_params": "", + "type": "teleport" + }, + { + "id": 2, + "x": 456.196, + "y": -171.875, + "action": "", + "move_mode": "walk", + "action_params": "", + "type": "path" + }, + { + "id": 3, + "x": 460.745, + "y": -176.165, + "action": "", + "move_mode": "walk", + "action_params": "", + "type": "path" + }, + { + "id": 4, + "x": 521.016, + "y": -189.905, + "action": "combat_script", + "move_mode": "fly", + "action_params": "keypress(space),wait(0.5)", + "type": "path" + }, + { + "id": 5, + "x": 505.83, + "y": -184.017, + "action": "stop_flying", + "move_mode": "fly", + "action_params": "", + "type": "path" + }, + { + "id": 6, + "x": 486.078, + "y": -182.429, + "action": "", + "move_mode": "walk", + "action_params": "", + "type": "path" + }, + { + "id": 7, + "x": 477.826, + "y": -185.83, + "action": "combat_script", + "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)", + "type": "target" + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoFishingTeyvat/assets/pathing/渊下宫-垂钓点-蛇肠之路南.json b/repo/js/AutoFishingTeyvat/assets/pathing/渊下宫-垂钓点-蛇肠之路南.json new file mode 100644 index 00000000..c32d7420 --- /dev/null +++ b/repo/js/AutoFishingTeyvat/assets/pathing/渊下宫-垂钓点-蛇肠之路南.json @@ -0,0 +1,85 @@ +{ + "info": { + "name": "渊下宫-垂钓点-蛇肠之路南", + "type": "collect", + "author": "提瓦特钓鱼玳师", + "version": "1.0", + "description": "地区: 渊下宫\n类型: 垂钓点\n详细位置: 蛇肠之路南\n鱼类: 水晶宴、肺棘鱼、佛玛洛鳐、迪芙妲鳐\n饵类: 果酿饵、赤糜饵、飞蝇假饵\n附加信息: 普通", + "map_name": "Enkanomiya", + "bgi_version": "0.45.0" + }, + "positions": [ + { + "id": 1, + "action": "", + "move_mode": "walk", + "type": "teleport", + "x": 1409.515, + "y": -462.347, + "action_params": "" + }, + { + "id": 2, + "x": 1410.812, + "y": -480.44, + "type": "path", + "move_mode": "run", + "action": "", + "action_params": "" + }, + { + "id": 3, + "x": 1407.039, + "y": -488.239, + "type": "path", + "move_mode": "run", + "action": "", + "action_params": "" + }, + { + "id": 4, + "x": 1409.159, + "y": -500.089, + "type": "path", + "move_mode": "run", + "action": "", + "action_params": "" + }, + { + "id": 5, + "x": 1404.23, + "y": -514.432, + "type": "path", + "move_mode": "run", + "action": "", + "action_params": "" + }, + { + "id": 6, + "x": 1391.264, + "y": -523.862, + "type": "path", + "move_mode": "run", + "action": "", + "action_params": "" + }, + { + "id": 7, + "x": 1373.303, + "y": -522.7, + "type": "path", + "move_mode": "run", + "action": "", + "action_params": "" + }, + { + "id": 8, + "x": 1375.642, + "y": -520.469, + "type": "target", + "move_mode": "walk", + "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)" + } + ] +} \ No newline at end of file diff --git a/repo/js/AutoFishingTeyvat/assets/pathing/稻妻-垂钓点-八酝岛名椎滩北.json b/repo/js/AutoFishingTeyvat/assets/pathing/稻妻-垂钓点-八酝岛名椎滩北.json index 064a0f41..f901eb14 100644 --- a/repo/js/AutoFishingTeyvat/assets/pathing/稻妻-垂钓点-八酝岛名椎滩北.json +++ b/repo/js/AutoFishingTeyvat/assets/pathing/稻妻-垂钓点-八酝岛名椎滩北.json @@ -3,7 +3,7 @@ "name": "稻妻-垂钓点-八酝岛名椎滩北", "type": "collect", "author": "提瓦特钓鱼玳师", - "version": "1.5", + "version": "1.6", "description": "地区: 稻妻\n类型: 垂钓点\n详细位置: 八酝岛名椎滩北\n鱼类: 花鳉、肺棘鱼、流纹京紫蝶鱼、苦炮鲀\n饵类: 果酿饵、赤糜饵、蠕虫假饵、飞蝇假饵\n附加信息: 普通", "bgiVersion": "0.42.4" }, @@ -69,7 +69,7 @@ "type": "target", "move_mode": "walk", "action": "combat_script", - "action_params": "wait(10),keypress(f)wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f)" + "action_params": "wait(2),keypress(f)wait(0.2),keypress(f),wait(0.2),keypress(f),wait(0.2),keypress(f)" } ] } \ No newline at end of file diff --git a/repo/js/AutoFishingTeyvat/main.js b/repo/js/AutoFishingTeyvat/main.js index 7b5864f1..44ecde74 100644 --- a/repo/js/AutoFishingTeyvat/main.js +++ b/repo/js/AutoFishingTeyvat/main.js @@ -1,7 +1,7 @@ (async function () { const area_list = ['蒙德', '璃月', '稻妻', '须弥', '枫丹', '纳塔', '至冬', '层岩巨渊·地下矿区', '渊下宫'] - const fish_list = ['花鳉', '波波心羽鲈', '烘烘心羽鲈', '维护机关·水域清理者', '维护机关·态势控制者', '维护机关·澄金领队型', '海涛斧枪鱼', '维护机关·初始能力型', '维护机关·白金典藏型', '吹沙角鲀', '甜甜花鳉', '擒霞客', '水晶宴', '斗棘鱼', '炮鲀', '流纹褐蝶鱼', '锖假龙', '金赤假龙', '玉玉心羽鲈', '赤魔王', '长生仙', '苦炮鲀', '肺棘鱼', '流纹京紫蝶鱼', '琉璃花鳉', '伪装鲨鲨独角鱼', '繁花斗士急流鱼', '深潜斗士急流鱼', '晚霞翻车鲀', '青浪翻车鲀', '拟似燃素独角鱼', '炽岩斗士急流鱼', '蓝染花鳉', '鸩棘鱼', '流纹茶蝶鱼', '雪中君', '真果角鲀', '青金斧枪鱼', '暮云角鲀', '翡玉斧枪鱼', '沉波蜜桃', '雷鸣仙'] + const fish_list = ['花鳉', '波波心羽鲈', '烘烘心羽鲈', '维护机关·水域清理者', '维护机关·态势控制者', '维护机关·澄金领队型', '海涛斧枪鱼', '维护机关·初始能力型', '维护机关·白金典藏型', '吹沙角鲀', '甜甜花鳉', '擒霞客', '水晶宴', '斗棘鱼', '炮鲀', '流纹褐蝶鱼', '锖假龙', '金赤假龙', '玉玉心羽鲈', '赤魔王', '长生仙', '苦炮鲀', '肺棘鱼', '流纹京紫蝶鱼', '琉璃花鳉', '伪装鲨鲨独角鱼', '繁花斗士急流鱼', '深潜斗士急流鱼', '晚霞翻车鲀', '青浪翻车鲀', '拟似燃素独角鱼', '炽岩斗士急流鱼', '蓝染花鳉', '鸩棘鱼', '流纹茶蝶鱼', '雪中君', '真果角鲀', '青金斧枪鱼', '暮云角鲀', '翡玉斧枪鱼', '沉波蜜桃', '雷鸣仙', '佛玛洛鳐', '迪芙妲鳐'] const bait_list = ['果酿饵', '酸桔饵', '维护机关频闪诱饵', '甘露饵', '赤糜饵', '飞蝇假饵', '蠕虫假饵', '澄晶果粒饵', '温火饵'] const material_msg = { "风缠": ["花鳉", "蓝染花鳉", "鸩棘鱼", "流纹茶蝶鱼"], @@ -20,7 +20,7 @@ const time_msg = { '白天': ['烘烘心羽鲈', '维护机关·水域清理者', '吹沙角鲀', '水晶宴', '流纹褐蝶鱼', '赤魔王', '长生仙', '流纹京紫蝶鱼', '深潜斗士急流鱼', '青浪翻车鲀', '流纹茶蝶鱼', '真果角鲀', '沉波蜜桃'], '夜晚': ['波波心羽鲈', '维护机关·态势控制者', '维护机关·白金典藏型', '擒霞客', '斗棘鱼', '肺棘鱼', '繁花斗士急流鱼', '晚霞翻车鲀', '鸩棘鱼', '雪中君', '暮云角鲀', '雷鸣仙'], - '全天': ['花鳉', '维护机关·澄金领队型', '海涛斧枪鱼', '维护机关·初始能力型', '甜甜花鳉', '炮鲀', '锖假龙', '金赤假龙', '玉玉心羽鲈', '苦炮鲀', '琉璃花鳉', '伪装鲨鲨独角鱼', '拟似燃素独角鱼', '炽岩斗士急流鱼', '蓝染花鳉', '青金斧枪鱼', '翡玉斧枪鱼'] + '全天': ['花鳉', '维护机关·澄金领队型', '海涛斧枪鱼', '维护机关·初始能力型', '甜甜花鳉', '炮鲀', '锖假龙', '金赤假龙', '玉玉心羽鲈', '苦炮鲀', '琉璃花鳉', '伪装鲨鲨独角鱼', '拟似燃素独角鱼', '炽岩斗士急流鱼', '蓝染花鳉', '青金斧枪鱼', '翡玉斧枪鱼', '佛玛洛鳐', '迪芙妲鳐'] } const fish_msg = { // 可能有误，需要检查 '花鳉': {'bait': '果酿饵', 'time': '全天'}, @@ -65,8 +65,8 @@ '翡玉斧枪鱼': {'bait': '甘露饵', 'time': '全天'}, '沉波蜜桃': {'bait': '甘露饵', 'time': '白天'}, '雷鸣仙': {'bait': '蠕虫假饵', 'time': '夜晚'}, - '佛玛洛鳐': {'bait': '', 'time': ''}, - '迪芙妲鳐': {'bait': '', 'time': ''} + '佛玛洛鳐': {'bait': '飞蝇假饵', 'time': '全天'}, + '迪芙妲鳐': {'bait': '飞蝇假饵', 'time': '全天'} } const path_pathing = [ '枫丹-垂钓点-伊黎耶林区幽林雾道西南-花鳉_波波心羽鲈_烘烘心羽鲈_维护机关·水域清理者_维护机关·态势控制者_维护机关·澄金领队型-果酿饵_酸橘饵_维护机关频闪诱饵-普通', @@ -98,6 +98,8 @@ '璃月-垂钓点-碧水原望舒客栈西-甜甜花鳉_斗棘鱼_赤魔王_金赤假龙_锖假龙_流纹褐蝶鱼-果酿饵_赤糜饵_蠕虫假饵_飞蝇假饵-普通', '璃月-垂钓点-碧水原药蝶谷东-花鳉_斗棘鱼_流纹褐蝶鱼-果酿饵_赤糜饵_蠕虫假饵-普通', '璃月-垂钓点-碧水原轻策庄东北-甜甜花鳉_擒霞客_水晶宴_斗棘鱼_流纹褐蝶鱼_苦炮鲀-果酿饵_赤糜饵_蠕虫假饵_飞蝇假饵-普通', + '层岩巨渊·地下矿区-垂钓点-地下水泽西-花锵_斗棘鱼_赤魔王_流纹褐蝶鱼_苦炮鲀-果酿饵_赤糜饵_蠕虫假饵_飞蝇假饵-普通', + '层岩巨渊·地下矿区-垂钓点-无名遗迹西-甜甜花锵_擒霞客_水晶宴_赤魔王_炮鲀-果酿饵_赤糜饵_飞蝇假饵-普通', '稻妻-垂钓点-八酝岛名椎滩北-花鳉_肺棘鱼_流纹京紫蝶鱼_苦炮鲀-果酿饵_赤糜饵_蠕虫假饵_飞蝇假饵-普通', '稻妻-垂钓点-海祇岛水月池东-花鳉_琉璃花鳉_擒霞客_水晶宴_肺棘鱼_流纹京紫蝶鱼-果酿饵_赤糜饵_蠕虫假饵-普通', '稻妻-垂钓点-海祇岛珊瑚宫北-花鳉_琉璃花鳉_擒霞客_水晶宴_肺棘鱼_流纹京紫蝶鱼-果酿饵_赤糜饵_蠕虫假饵-普通', @@ -108,6 +110,9 @@ '稻妻-垂钓点-鹤观千来神祠西-花鳉_琉璃花鳉_擒霞客_水晶宴-果酿饵-普通', '稻妻-垂钓点-鹤观逢岳之野西南-花鳉_肺棘鱼_赤魔王_流纹京紫蝶鱼-果酿饵_赤糜饵_蠕虫假饵-普通', '稻妻-垂钓点-神无冢九条阵屋东南-雷鸣仙-蠕虫假饵-GCM', + '渊下宫-垂钓点-蛇肠之路南-水晶宴_肺棘鱼_佛玛洛鳐_迪芙妲鳐-果酿饵_赤糜饵_飞蝇假饵-普通', + '渊下宫-垂钓点-蛇心之地北-擒霞客_赤魔王_佛玛洛鳐_迪芙妲鳐-果酿饵_赤糜饵_飞蝇假饵-战斗', + '渊下宫-垂钓点-蛇心之地西北-擒霞客_流纹京紫鲽鱼_佛玛洛鳐_迪芙妲鳐-果酿饵_蠕虫假饵_飞蝇假饵-普通', '纳塔-垂钓点-境壁山浮羽之湾东-伪装鲨鲨独角鱼_花鳉_繁花斗士急流鱼_深潜斗士急流鱼_晚霞翻车鲀_青浪翻车鲀-果酿饵_澄晶果粒饵-普通', '纳塔-垂钓点-奥奇卡纳塔东-花鳉_青浪翻车鲀_晚霞翻车鲀_伪装鲨鲨独角鱼-果酿饵_澄晶果粒饵-普通', '纳塔-垂钓点-奥奇卡纳塔东北-青浪翻车鲀_繁花斗士急流鱼_伪装鲨鲨独角鱼-澄晶果粒饵-战斗', @@ -137,14 +142,7 @@ '须弥-垂钓点-道成林维摩庄北-花鳉_青果角鲀_吹沙角鲀_暮云角鲀_青金斧枪鱼_翡玉斧枪鱼-果酿饵_甘露饵-普通', '须弥-垂钓点-道成林须弥城南-擒霞客_吹沙角鲀_暮云角鲀_青金斧枪鱼-果酿饵_甘露饵-普通', '须弥-垂钓点-阿陀河谷奥摩斯港北-水晶宴_青果角鲀_吹沙角鲀_暮云角鲀_青金斧枪鱼_翡玉斧枪鱼-果酿饵_甘露饵-普通', - '须弥-垂钓点-阿陀河谷降诸魔山-擒霞客_青果角鲀_暮云角鲀_翡玉斧枪鱼-果酿饵_甘露饵-普通' - ] - const path_pathing_patch = [ - '层岩巨渊·地下矿区-垂钓点-地下水泽西-花锵_斗棘鱼_赤魔王_流纹褐蝶鱼_苦炮鲀-果酿饵_赤糜饵_蠕虫假饵_飞蝇假饵-普通', - '层岩巨渊·地下矿区-垂钓点-无名遗迹西-甜甜花锵_擒霞客_水晶宴_赤魔王_炮鲀-果酿饵_赤糜饵_飞蝇假饵', - '渊下宫-垂钓点-蛇肠之路南-水晶宴_肺棘鱼_佛玛洛鳐_迪芙妲鳐-果酿饵_赤糜饵_飞蝇假饵-普通', - '渊下宫-垂钓点-蛇心之地北-擒霞客_赤魔王_佛玛洛鳐_迪芙妲鳐-果酿饵_赤糜饵_飞蝇假饵-普通', - '渊下宫-垂钓点-蛇心之地西北-擒霞客_流纹京紫鲽鱼_佛玛洛鳐_迪芙妲鳐-果酿饵_蠕虫假饵_飞蝇假饵-普通' + '须弥-垂钓点-阿陀河谷降诸魔山-擒霞客_青果角鲀_暮云角鲀_翡玉斧枪鱼-果酿饵_甘露饵-普通', ] const fishing_time_dic = { "全天": {"name": "All", "param": 0}, @@ -251,7 +249,7 @@ } } bait_include = path_sort_bait.filter(item => !bait_exclude.includes(item)) - // 根据 全部饵类排除掉 排除计算的饵类 后剩下的饵类生成正则表达式 + // 根据 全部饵类 排除掉 排除计算的饵类 后剩下的饵类生成正则表达式 regex_bait_include = new RegExp(bait_include.join("|")); } diff --git a/repo/js/AutoFishingTeyvat/manifest.json b/repo/js/AutoFishingTeyvat/manifest.json index d6405657..1251da95 100644 --- a/repo/js/AutoFishingTeyvat/manifest.json +++ b/repo/js/AutoFishingTeyvat/manifest.json @@ -1,9 +1,9 @@ { "manifest_version": 1, "name": "提瓦特自动钓鱼（全流程+自选）", - "version": "1.5.1", - "bgi_version": "0.43.1", - "description": "脚本名称：提瓦特自动钓鱼（全流程+自选）\n功能描述：支持自动追踪并垂钓bgi支持的全提瓦特垂钓点\n核心功能------------------------------>\n1.可自选地区、鱼类、鱼饵\n2.可直接钓取特定物品的兑换材料（例如渔获）\n3.脚本会根据需要的鱼类自动调节时间，不需要的时段会跳过\n4.支持部分地图追踪无法到达的钓鱼点（例如炽岩斗士急流鱼钓鱼点，枫丹廷东北钓鱼点、雷鸣仙垂钓点）\n5.支持从特定的垂钓点继续任务（仅启用所有垂钓点时可用）\n6.默认禁用需要战斗的路线，如有需要请在JS脚本配置内启用\n7.支持自定义钓鱼超时时间\n8.支持设置定时关闭（最多24小时）\n9.4点自动领取月卡（可选）\n10.启用自动拾取（可选）\n注意事项------------------------------>\n1.部分点位涉及战斗，且队伍内不能有双风和跑步（不是冲刺）时加移速的角色\n2.跑图位必须是少男体型\n3.同时选择鱼类和鱼饵的情况下按照以下逻辑选择路线: 所有被选的鱼类会被加入任务列表，如果选择的鱼饵中某个鱼饵不是已选的任何一个鱼类的对应的鱼饵，那么这个鱼饵对应的所有鱼类将被添加到任务列表\n4.JS脚本的设置内各设置项含有优先级，如果存在高优先级且选项不为默认，则只有最高优先级的设置项生效\n5.部分钓鱼点为路径追踪+键鼠脚本(GCM)的混合模式，可能会出现因键鼠脚本误差卡死的情况，如果出现这种情况，请在JS脚本设置禁用键鼠路线来禁用所有包含键鼠脚本的钓鱼点\n---------------------------------------->\n作者：提瓦特钓鱼玳师\n脚本反馈邮箱：hijiwos@hotmail.com", + "version": "2.0.0", + "bgi_version": "0.44.9", + "description": "脚本名称：提瓦特自动钓鱼（全流程+自选）\n功能描述：支持自动追踪并垂钓bgi支持的全提瓦特垂钓点\n核心功能------------------------------>\n1.可自选地区、鱼类、鱼饵\n2.可直接钓取特定物品的兑换材料（例如渔获）\n3.脚本会根据需要的鱼类自动调节时间，不需要的时段会跳过\n4.支持部分地图追踪无法到达的钓鱼点（例如炽岩斗士急流鱼钓鱼点，枫丹廷东北钓鱼点、雷鸣仙垂钓点）\n5.支持从特定的垂钓点继续任务（仅启用所有垂钓点时可用）\n6.默认禁用需要战斗的路线，如有需要请在JS脚本配置内启用\n7.支持自定义钓鱼超时时间\n8.支持设置定时关闭（最多24小时）\n9.4点自动领取月卡（可选）\n10.启用自动拾取（可选）\n注意事项------------------------------>\n1.部分点位涉及战斗，且队伍内不能有双风和跑步（不是冲刺）时加移速的角色\n2.跑图位必须是少男体型(防止键鼠路线[GCM]出错)\n3.同时选择鱼类和鱼饵的情况下按照以下逻辑选择路线: 所有被选的鱼类会被加入任务列表，如果选择的鱼饵中某个鱼饵不是已选的任何一个鱼类的对应的鱼饵，那么这个鱼饵对应的所有鱼类将被添加到任务列表\n4.JS脚本的设置内各设置项含有优先级，如果存在高优先级且选项不为默认，则只有最高优先级的设置项生效\n5.部分钓鱼点为路径追踪+键鼠脚本(GCM)的混合模式，可能会出现因键鼠脚本误差卡死的情况，如果出现这种情况，请在JS脚本设置禁用键鼠路线来禁用所有包含键鼠脚本的钓鱼点\n---------------------------------------->\n作者：提瓦特钓鱼玳师\n脚本反馈邮箱：hijiwos@hotmail.com", "authors": [ { "name": "提瓦特钓鱼玳师" diff --git a/repo/js/AutoFishingTeyvat/settings.json b/repo/js/AutoFishingTeyvat/settings.json index cd916614..988bf345 100644 --- a/repo/js/AutoFishingTeyvat/settings.json +++ b/repo/js/AutoFishingTeyvat/settings.json @@ -291,6 +291,8 @@ "璃月-垂钓点-碧水原望舒客栈西-普通", "璃月-垂钓点-碧水原药蝶谷东-普通", "璃月-垂钓点-碧水原轻策庄东北-普通", + "层岩巨渊·地下矿区-垂钓点-地下水泽西-普通", + "层岩巨渊·地下矿区-垂钓点-无名遗迹西-普通", "稻妻-垂钓点-八酝岛名椎滩北-普通", "稻妻-垂钓点-海祇岛水月池东-普通", "稻妻-垂钓点-海祇岛珊瑚宫北-普通", @@ -301,6 +303,9 @@ "稻妻-垂钓点-鹤观千来神祠西-普通", "稻妻-垂钓点-鹤观逢岳之野西南-普通", "稻妻-垂钓点-神无冢九条阵屋东南-GCM", + "渊下宫-垂钓点-蛇肠之路南-普通", + "渊下宫-垂钓点-蛇心之地北-战斗", + "渊下宫-垂钓点-蛇心之地西北-普通", "纳塔-垂钓点-境壁山浮羽之湾东-普通", "纳塔-垂钓点-奥奇卡纳塔东-普通", "纳塔-垂钓点-奥奇卡纳塔东北-战斗",