diff --git a/repo/js/AutoFishingTeyvat/assets/pathing/纳塔-垂钓点-安饶之野东.json b/repo/js/AutoFishingTeyvat/assets/pathing/纳塔-垂钓点-安饶之野东.json new file mode 100644 index 00000000..79c68ff6 --- /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": "Teyvat", + "bgi_version": "0.45.0" + }, + "positions": [ + { + "id": 1, + "x": 9812.729, + "y": -2852.583, + "action": "", + "move_mode": "walk", + "action_params": "", + "type": "teleport" + }, + { + "id": 2, + "x": 9801.256, + "y": -2861.62, + "action": "", + "move_mode": "walk", + "action_params": "", + "type": "path" + }, + { + "id": 3, + "x": 9804.77, + "y": -2881.036, + "action": "", + "move_mode": "run", + "action_params": "", + "type": "path" + }, + { + "id": 4, + "x": 9795.768, + "y": -2899.301, + "action": "", + "move_mode": "run", + "action_params": "", + "type": "path" + }, + { + "id": 5, + "x": 9805.4, + "y": -2962.396, + "action": "", + "move_mode": "run", + "action_params": "", + "type": "path" + }, + { + "id": 6, + "x": 9803.428, + "y": -2985.433, + "action": "", + "move_mode": "run", + "action_params": "", + "type": "path" + }, + { + "id": 7, + "x": 9793.289, + "y": -2985.362, + "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..f7d5972e --- /dev/null +++ b/repo/js/AutoFishingTeyvat/assets/pathing/纳塔-垂钓点-安饶之野西.json @@ -0,0 +1,58 @@ +{ + "info": { + "name": "纳塔-垂钓点-安饶之野西", + "type": "collect", + "author": "提瓦特钓鱼玳师", + "version": "1.0", + "description": "地区: 纳塔\n类型: 垂钓点\n详细位置: 安饶之野西\n鱼类: 拟似燃素独角鱼、秘源机关·巡戒使\n饵类: 温火饵\n附加信息: 普通", + "map_name": "Teyvat", + "bgi_version": "0.45.0" + }, + "positions": [ + { + "id": 1, + "x": 10794.748, + "y": -3069.641, + "action": "", + "move_mode": "walk", + "action_params": "", + "type": "teleport" + }, + { + "id": 2, + "x": 10778.971, + "y": -3026.83, + "action": "", + "move_mode": "run", + "action_params": "", + "type": "path" + }, + { + "id": 3, + "x": 10749.681, + "y": -2966.943, + "action": "", + "move_mode": "run", + "action_params": "", + "type": "path" + }, + { + "id": 4, + "x": 10739.55, + "y": -2959.098, + "action": "", + "move_mode": "walk", + "action_params": "", + "type": "target" + }, + { + "id": 5, + "x": 10733.511, + "y": -2968.688, + "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..06b2cc39 --- /dev/null +++ b/repo/js/AutoFishingTeyvat/assets/pathing/纳塔-垂钓点-安饶之野西北.json @@ -0,0 +1,103 @@ +{ + "info": { + "name": "纳塔-垂钓点-安饶之野西北", + "type": "collect", + "author": "提瓦特钓鱼玳师", + "version": "1.0", + "description": "地区: 纳塔\n类型: 垂钓点\n详细位置: 安饶之野西北\n鱼类: 炽岩斗士急流鱼、拟似燃素独角鱼、秘源机关·巡戒使\n饵类: 温火饵\n附加信息: 普通", + "map_name": "Teyvat", + "bgi_version": "0.45.0" + }, + "positions": [ + { + "id": 1, + "x": 10794.748, + "y": -3069.641, + "action": "", + "move_mode": "walk", + "action_params": "", + "type": "teleport" + }, + { + "id": 2, + "x": 10779.142, + "y": -3026.065, + "action": "", + "move_mode": "run", + "action_params": "", + "type": "path" + }, + { + "id": 3, + "x": 10745.41, + "y": -2968.309, + "action": "", + "move_mode": "run", + "action_params": "", + "type": "path" + }, + { + "id": 4, + "x": 10705.578, + "y": -2931.406, + "action": "", + "move_mode": "run", + "action_params": "", + "type": "path" + }, + { + "id": 5, + "x": 10684.321, + "y": -2882.594, + "action": "", + "move_mode": "run", + "action_params": "", + "type": "path" + }, + { + "id": 6, + "x": 10685.966, + "y": -2862.676, + "action": "", + "move_mode": "run", + "action_params": "", + "type": "path" + }, + { + "id": 7, + "x": 10701.326, + "y": -2848.815, + "action": "", + "move_mode": "walk", + "action_params": "", + "type": "path" + }, + { + "id": 8, + "x": 10704.088, + "y": -2835.582, + "action": "", + "move_mode": "walk", + "action_params": "", + "type": "path" + }, + { + "id": 9, + "x": 10693.224, + "y": -2812.176, + "action": "", + "move_mode": "run", + "action_params": "", + "type": "path" + }, + { + "id": 10, + "x": 10679.156, + "y": -2807.762, + "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/main.js b/repo/js/AutoFishingTeyvat/main.js index 98e720f0..a9bbe68a 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': '全天'}, @@ -66,7 +66,8 @@ '沉波蜜桃': {'bait': '甘露饵', 'time': '白天'}, '雷鸣仙': {'bait': '蠕虫假饵', 'time': '夜晚'}, '佛玛洛鳐': {'bait': '飞蝇假饵', 'time': '全天'}, - '迪芙妲鳐': {'bait': '飞蝇假饵', 'time': '全天'} + '迪芙妲鳐': {'bait': '飞蝇假饵', 'time': '全天'}, + '秘源机关·巡戒使': {'bait': '温火饵', 'time': '全天'} } const path_pathing = [ '枫丹-垂钓点-伊黎耶林区幽林雾道西南-花鳉_波波心羽鲈_烘烘心羽鲈_维护机关·水域清理者_维护机关·态势控制者_维护机关·澄金领队型-果酿饵_酸橘饵_维护机关频闪诱饵-普通', @@ -124,6 +125,9 @@ '纳塔-垂钓点-翘枝崖花羽会北-晚霞翻车鲀_深潜斗士急流鱼_伪装鲨鲨独角鱼-澄晶果粒饵-普通', '纳塔-垂钓点-翘枝崖花羽会西-花鳉_繁花斗士急流鱼_深潜斗士急流鱼_晚霞翻车鲀_伪装鲨鲨独角鱼-果酿饵_澄晶果粒饵-普通', '纳塔-垂钓点-距石山祖遗庙宇东-炽岩斗士急流鱼_拟似燃素独角鱼-温火饵-GCM', + '纳塔-垂钓点-安饶之野西-拟似燃素独角鱼_秘源机关·巡戒使-温火饵-普通', + '纳塔-垂钓点-安饶之野西北-炽岩斗士急流鱼_拟似燃素独角鱼_秘源机关·巡戒使-温火饵-普通', + '纳塔-垂钓点-安饶之野东-花鳉_繁花斗士急流鱼_青浪翻车鲀_晚霞翻车鲀_伪装鲨鲨独角鱼-果酿饵_澄晶果粒饵-普通', '蒙德-垂钓点-龙脊雪山寒天之钉西-花鳉_鸩棘鱼_雪中君_流纹茶蝶鱼-果酿饵_赤糜饵_蠕虫假饵-普通', '蒙德-垂钓点-坠星山谷低语森林南-蓝染花鳉_水晶宴_鸩棘鱼_锖假龙_流纹茶蝶鱼-果酿饵_赤糜饵_蠕虫假饵_飞蝇假饵-普通', '蒙德-垂钓点-坠星山谷望风山地-花鳉_蓝染花鳉_擒霞客_水晶宴_鸩棘鱼_金赤假龙_流纹茶蝶-果酿饵_赤糜饵_蠕虫假饵_飞蝇假饵-普通', @@ -505,7 +509,6 @@ } await run_file(path_msg, time_out_throw, time_out_whole, is_con, block_gcm, block_fight, block_tsurumi, auto_skip); - await sleep(100); } catch (error) { const file_name = `${path_msg["area"]}-${path_msg["type"]}-${path_msg["detail"]}`; log.info(`路径: ${file_name} 执行时出错，已跳过...\n错误信息: ${error}`) diff --git a/repo/js/AutoFishingTeyvat/manifest.json b/repo/js/AutoFishingTeyvat/manifest.json index 1251da95..4a92575c 100644 --- a/repo/js/AutoFishingTeyvat/manifest.json +++ b/repo/js/AutoFishingTeyvat/manifest.json @@ -1,8 +1,8 @@ { "manifest_version": 1, "name": "提瓦特自动钓鱼（全流程+自选）", - "version": "2.0.0", - "bgi_version": "0.44.9", + "version": "2.1.0", + "bgi_version": "0.45.0", "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": [ { diff --git a/repo/js/AutoFishingTeyvat/settings.json b/repo/js/AutoFishingTeyvat/settings.json index 988bf345..78feae9b 100644 --- a/repo/js/AutoFishingTeyvat/settings.json +++ b/repo/js/AutoFishingTeyvat/settings.json @@ -95,6 +95,9 @@ "纳塔-垂钓点-翘枝崖花羽会北-普通", "纳塔-垂钓点-翘枝崖花羽会西-普通", "纳塔-垂钓点-距石山祖遗庙宇东-GCM", + "纳塔-垂钓点-安饶之野西-普通", + "纳塔-垂钓点-安饶之野西北-普通", + "纳塔-垂钓点-安饶之野东-普通", "蒙德-垂钓点-坠星山谷低语森林南-普通", "蒙德-垂钓点-坠星山谷望风山地-普通", "蒙德-垂钓点-明冠山地风龙废墟北-普通", @@ -317,6 +320,9 @@ "纳塔-垂钓点-翘枝崖花羽会北-普通", "纳塔-垂钓点-翘枝崖花羽会西-普通", "纳塔-垂钓点-距石山祖遗庙宇东-GCM", + "纳塔-垂钓点-安饶之野西-普通", + "纳塔-垂钓点-安饶之野西北-普通", + "纳塔-垂钓点-安饶之野东-普通", "蒙德-垂钓点-坠星山谷低语森林南-普通", "蒙德-垂钓点-坠星山谷望风山地-普通", "蒙德-垂钓点-明冠山地风龙废墟北-普通",