update repo.json

JS脚本：提瓦特全自动钓鱼【修复】 (#1519 )
* 修复了月卡等待异常的问题 * Delete repo/js/AutoFishingTeyvat/assets/archive.json * Delete repo/js/AutoFishingTeyvat/READEME.md
2025-08-09 03:49:49 +00:00 · 2025-08-09 11:49:31 +08:00
11 changed files with 835 additions and 822 deletions
--- a/repo.json
+++ b/repo.json
@@ -1,5 +1,5 @@
 {
-  "time": "20250809103533",
+  "time": "20250809114948",
  "url": "https://github.com/babalae/bettergi-scripts-list/archive/refs/heads/main.zip",
  "file": "repo.json",
  "indexes": [
@@ -75523,8 +75523,8 @@
        {
          "name": "AutoFishingTeyvat",
          "type": "directory",
-          "hash": "864c881c53ca92c487e74b9720de4e7bb58a7add",
-          "version": "2.2.4",
+          "hash": "905e55581d6fde3cc4268fe74136ec5ad3b5aee3",
+          "version": "2.2.5",
          "author": "提瓦特钓鱼玳师",
          "authors": [
            {
@@ -75536,7 +75536,7 @@
          "tags": [
            "bgi≥0.47.0"
          ],
-          "lastUpdated": "2025-07-22 10:42:35"
+          "lastUpdated": "2025-08-09 11:49:31"
        },
        {
          "name": "AutoFontaineLeyLine",
--- a/repo/js/AutoFishingTeyvat/main.js
+++ b/repo/js/AutoFishingTeyvat/main.js
@@ -23,51 +23,51 @@
        '全天': ['花鳉', '维护机关·澄金领队型', '海涛斧枪鱼', '维护机关·初始能力型', '甜甜花鳉', '炮鲀', '锖假龙', '金赤假龙', '玉玉心羽鲈', '苦炮鲀', '琉璃花鳉', '伪装鲨鲨独角鱼', '拟似燃素独角鱼', '炽岩斗士急流鱼', '蓝染花鳉', '青金斧枪鱼', '翡玉斧枪鱼', '佛玛洛鳐', '迪芙妲鳐', '秘源机关·巡戒使']
    }
    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 = [
        '枫丹-垂钓点-伊黎耶林区幽林雾道西南-花鳉_波波心羽鲈_烘烘心羽鲈_维护机关·水域清理者_维护机关·态势控制者_维护机关·澄金领队型-果酿饵_酸橘饵_维护机关频闪诱饵-普通',
@@ -149,10 +149,10 @@
        '须弥-垂钓点-阿陀河谷降诸魔山-擒霞客_真果角鲀_暮云角鲀_翡玉斧枪鱼-果酿饵_甘露饵-普通',
    ]
    const fishing_time_dic = {
-        "全天": { "name": "All", "param": 0 },
-        "白天": { "name": "Daytime", "param": 1 },
-        "夜晚": { "name": "Nighttime", "param": 2 },
-        "禁用": { "name": "Block", "param": "" },
+        "全天": {"name": "All", "param": 0},
+        "白天": {"name": "Daytime", "param": 1},
+        "夜晚": {"name": "Nighttime", "param": 2},
+        "禁用": {"name": "Block", "param": ""},
    }
    const statue_name = "蒙德-七天神像-苍风高地";
    // 存储本次任务中的所有鱼类，作为调节时间的关键参考
@@ -207,9 +207,9 @@
                content[user_id][pathing_name]["Nighttime"] = timestamp;
            } else if (time_status === "白天") {
                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 === "夜晚") {
-                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;
            }

@@ -290,15 +290,15 @@
            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 !== "无(默认)") {
@@ -418,9 +418,9 @@
        // 时间调节
        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));
        // 正则-全天出现的鱼
@@ -445,12 +445,12 @@
            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("出错：未找到匹配的钓鱼时间")
                return null;
-            } else if (is_daytime && !is_nighttime) { // 只有白天的鱼
+            } else if (is_daytime && !is_nighttime){ // 只有白天的鱼
                fishing_time = "白天";
-            } else if (!is_daytime && is_nighttime) { // 只有夜晚的鱼
+            } else if (!is_daytime && is_nighttime){ // 只有夜晚的鱼
                fishing_time = "夜晚";
            }
            // 昼夜都有则还是 全天
@@ -461,44 +461,57 @@
            fishing_time = path_time;
        }

+        if (auto_skip) {
+            // log.info(`[DEBUG] 开始自动领取月卡`);
            // 4点自动领取月卡
            let time_now = new Date();
            let time_4 = new Date(time_now.getFullYear(), time_now.getMonth(), time_now.getDate(), 4, 0, 0); // 4点
+            // log.info(`[DEBUG] time_now: ${time_now}`);
+            // log.info(`[DEBUG] time_4: ${time_4}`);
            let time_predict_end; // 根据超时时间预测本次钓鱼结束时间（加1分钟容错）
            if (fishing_time === "全天") {
-            time_predict_end = time_now.setSeconds(time_now.getSeconds() + time_out_whole * 2 + 60);
+                time_predict_end = new Date(time_now.getTime() + (time_out_whole * 2 + 60) * 1000);
            } else {
-            time_predict_end = time_now.setSeconds(time_now.getSeconds() + time_out_whole + 60);
+                time_predict_end = new Date(time_now.getTime() + (time_out_whole + 60) * 1000);
            }
+            // log.info(`[DEBUG] time_predict_end: ${time_predict_end}`);
+            // log.info(`[DEBUG] ${time_now < time_4} | ${time_predict_end >= time_4}`);
            // 30s点击一次，等待领取月卡
            let step_flag = 0; // 领取月卡步骤标志
-        while (auto_skip && time_now < time_4 && time_predict_end >= time_4) {
+            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_pathing + statue_name + ".json");
+                    await pathingScript.runFile(base_path_statues + statue_name + ".json");
                    step_flag += 1;
                }
                await sleep(30000);
-            keyDown("VK_LBUTTON");
-            await sleep(100);
-            keyUp("VK_LBUTTON");
+                keyPress("ESCAPE");
+                await sleep(2000);
+                keyPress("ESCAPE");

+                time_now = new Date();
+
+            }
            // 本次已经到达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;
                auto_skip = false;
            }
-
-        }
            // 领取月卡(点击两次)
            if (step_flag === 2) {
                // step_flag = 0;
-            await sleep(5); // 补回容错时间
+                await sleep(5000); // 补回容错时间
                await click(1450, 1020); // 点击时间调节的确认按钮的位置
-            await sleep(5); // 等待月卡动画时间
+                await sleep(5000); // 等待月卡动画时间
                await click(1450, 1020);
-            await sleep(1);
+                await sleep(1000);
+                await click(1450, 1020);
+                await sleep(1000);
+                await click(1450, 1020);
+                await sleep(1000);
+            }
        }

        log.info(`该钓鱼点的时间: ${fishing_time}`);
@@ -595,8 +608,8 @@
        let time_out_throw, time_out_whole;
        try {
            // 读取超时时间
-            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_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);
        } catch (error) {
            log.error(`超时时间读取错误，请检查JS脚本配置: ${error}`);
            return null;
@@ -604,25 +617,25 @@
        // 筛选路径
        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;
        // 判断是否是调式模式
-        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点自动领取月卡的设置
-        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统计
-        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_minute = typeof (settings.time_kill_minute) === 'undefined' ? "无" : settings.time_kill_minute;
+        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 is_time_kill = kill_hour !== "无" && kill_minute !== "无"; // 判断是否启用
        let time_target = new Date();

--- a/repo/js/AutoFishingTeyvat/manifest.json
+++ b/repo/js/AutoFishingTeyvat/manifest.json
@@ -1,7 +1,7 @@
 {
  "manifest_version": 1,
  "name": "提瓦特自动钓鱼（全流程+自选）",
-  "version": "2.2.4",
+  "version": "2.2.5",
  "bgi_version": "0.47.0",
  "description": "支持自动追踪并垂钓bgi支持的全提瓦特垂钓点",
  "authors": [
Author	SHA1	Message	Date
zaodonganqi	f0aebe1ba0	update repo.json Some checks failed Build repo.json / build (18.x) (push) Has been cancelled Details Build repo.json / upload (push) Has been cancelled Details	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