From 00df712e0c9322c813d2e60ba6ed73f7ff323e4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B7=E4=B8=AA=E5=90=8D=E5=AD=97=E5=A5=BD=E9=9A=BE?= =?UTF-8?q?=E7=9A=84=E5=96=B5?= <25520958+MisakaAldrich@users.noreply.github.com> Date: Sat, 12 Apr 2025 10:44:17 +0800 Subject: [PATCH] =?UTF-8?q?JS=E8=84=9A=E6=9C=AC=EF=BC=9A=E5=85=BD=E8=82=89?= =?UTF-8?q?=E5=A5=BD=E6=84=9F=EF=BC=9Afix:=E5=88=A4=E6=96=AD=E6=9C=AC?= =?UTF-8?q?=E8=BD=AE=E6=98=AF=E5=90=A6=E6=89=A7=E8=A1=8C=E5=AE=8C=E6=AF=95?= =?UTF-8?q?=EF=BC=8C=E5=B9=B6=E5=AF=B9=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=8C=96=20(#561)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix部分：86-102 --- .../main.js | 291 +++++++++--------- .../manifest.json | 2 +- 2 files changed, 152 insertions(+), 141 deletions(-) diff --git a/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/main.js b/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/main.js index bd8e33f4..c94b994e 100644 --- a/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/main.js +++ b/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/main.js @@ -1,165 +1,176 @@ -(async function () { +(async function() { - function logTimeTaken(startTime) { - const currentTime = Date.now(); - const totalTimeInSeconds = (currentTime - startTime) / 1000; - const minutes = Math.floor(totalTimeInSeconds / 60); - const seconds = totalTimeInSeconds % 60; - const formattedTime = `${minutes}分${seconds.toFixed(0).padStart(2, '0')}秒`; - log.info(`当前运行总时长：${formattedTime}`); - } + function logTimeTaken(startTime) { + const currentTime = Date.now(); + const totalTimeInSeconds = (currentTime - startTime) / 1000; + const minutes = Math.floor(totalTimeInSeconds / 60); + const seconds = totalTimeInSeconds % 60; + const formattedTime = `${minutes}分${seconds.toFixed(0).padStart(2, '0')}秒`; + log.info(`当前运行总时长：${formattedTime}`); + } - // powered by 秋云 - function calculateEstimatedCompletion(startTime, current, total) { - if (current === 0) return "计算中..."; - const elapsedTime = Date.now() - startTime; - const timePerTask = elapsedTime / current; - const remainingTasks = total - current; - const remainingTime = timePerTask * remainingTasks; - const completionDate = new Date(Date.now() + remainingTime); - return `${completionDate.toLocaleTimeString()} (约 ${Math.round(remainingTime / 60000)} 分钟)`; - } + // powered by 秋云 + function calculateEstimatedCompletion(startTime, current, total) { + if (current === 0) return "计算中..."; + const elapsedTime = Date.now() - startTime; + const timePerTask = elapsedTime / current; + const remainingTasks = total - current; + const remainingTime = timePerTask * remainingTasks; + const completionDate = new Date(Date.now() + remainingTime); + return `${completionDate.toLocaleTimeString()} (约 ${Math.round(remainingTime / 60000)} 分钟)`; + } - async function AutoPath(locationName) { - try { - let filePath = `Assets/AutoPath/${locationName}.json`; - await pathingScript.runFile(filePath); - } catch (error) { - log.error(`执行 ${locationName} 路径时发生错误`); - log.error(error.message); - } - await sleep(1000); - } + async function AutoPath(locationName) { + try { + let filePath = `Assets/AutoPath/${locationName}.json`; + await pathingScript.runFile(filePath); + } catch (error) { + log.error(`执行 ${locationName} 路径时发生错误`); + log.error(error.message); + } + await sleep(1000); + } - async function comparePosition() { - const targetPosition = { X: 3615.48, Y: -521.27 }; - const maxDistance = 20; - let currentPosition; + async function comparePosition() { + const targetPosition = { + X: 3615.48, + Y: -521.27 + }; + const maxDistance = 20; + let currentPosition; - try { - // 优先使用小地图坐标 - await genshin.returnMainUi(); - currentPosition = genshin.getPositionFromMap(); - log.info(`当前小地图坐标: X=${currentPosition.X}, Y=${currentPosition.Y}`); - } catch (error) { - // 如果失败，使用大地图坐标 - log.warn(`获取小地图坐标失败，使用大地图坐标。错误信息: ${error}`); - await genshin.returnMainUi(); - keyPress("M"); - await sleep(2000); - currentPosition = genshin.getPositionFromBigMap(); - log.info(`当前大地图坐标: X=${currentPosition.X}, Y=${currentPosition.Y}`); - keyPress("Escape"); - } + try { + // 优先使用小地图坐标 + await genshin.returnMainUi(); + currentPosition = genshin.getPositionFromMap(); + log.info(`当前小地图坐标: X=${currentPosition.X}, Y=${currentPosition.Y}`); + } catch (error) { + // 如果失败，使用大地图坐标 + log.warn(`获取小地图坐标失败，使用大地图坐标。错误信息: ${error}`); + await genshin.returnMainUi(); + keyPress("M"); + await sleep(2000); + currentPosition = genshin.getPositionFromBigMap(); + log.info(`当前大地图坐标: X=${currentPosition.X}, Y=${currentPosition.Y}`); + keyPress("Escape"); + } - // 计算欧氏距离 - const dx = currentPosition.X - targetPosition.X; - const dy = currentPosition.Y - targetPosition.Y; - const distance = Math.sqrt(dx * dx + dy * dy); + // 计算欧氏距离 + const dx = currentPosition.X - targetPosition.X; + const dy = currentPosition.Y - targetPosition.Y; + const distance = Math.sqrt(dx * dx + dy * dy); - log.info(`与目标坐标的距离为: ${distance}`); + log.info(`与目标坐标的距离为: ${distance}`); - // 判断距离是否在允许范围内 - if (distance <= maxDistance) { - log.info("距离在突发任务范围内，循环继续"); - return true; - } else { - log.warn("距离超出突发任务范围，执行触发线路"); - return false; - } - } + // 判断距离是否在允许范围内 + if (distance <= maxDistance) { + log.info("距离在突发任务范围内，循环继续"); + return true; + } else { + log.warn("距离超出突发任务范围，执行触发线路"); + return false; + } + } - // 好感核心函数 - async function AutoFriendship(runTimes, statueTimes, GetMeatMode, startTime) { - for (let i = 0; i < runTimes; i++) { - if ((i + 1) % statueTimes === 0) { // 判断当前循环次数否达到去神像设置值 - await genshin.tpToStatueOfTheSeven(); - await AutoPath(`好感-张牙舞爪的恶党-触发位置(二净甸)`); - } else if (!await comparePosition()){ // 对比触发位置坐标，如果不符合预期坐标则重新执行触发线路 - log.info(`导航至突发任务（张牙舞爪的恶党）触发位置(二净甸)`); - await AutoPath(`好感-张牙舞爪的恶党-触发位置(二净甸)`); - notification.send(`已抵达突发任务（张牙舞爪的恶党）触发位置`); - } - if (await comparePosition()){ - log.info(`当前次数：${i + 1}/${runTimes}`); - dispatcher.addTimer(new RealtimeTimer("AutoPick", { "forceInteraction": true })); - await AutoPath(`好感-张牙舞爪的恶党-循环${GetMeatMode ? '(二净甸刷肉版)' : '(二净甸)'}`); - dispatcher.addTimer(new RealtimeTimer("AutoPick", { "forceInteraction": false })); - log.info(`已完成次数：${i + 1}/${runTimes}`); - } else { - i = i - 1; // 退回这次次数 - } - const estimatedCompletion = calculateEstimatedCompletion(startTime, i + 1, runTimes); - logTimeTaken(startTime); - log.info(`预计完成时间：${estimatedCompletion}`); - } - log.info('兽肉好感已完成'); - } + // 好感核心函数 + async function AutoFriendship(runTimes, statueTimes, GetMeatMode, startTime) { + for (let i = 0; i < runTimes; i++) { + if ((i + 1) % statueTimes === 0) { // 判断当前循环次数否达到去神像设置值 + await genshin.tpToStatueOfTheSeven(); + await AutoPath(`好感-张牙舞爪的恶党-触发位置(二净甸)`); + } else if (!await comparePosition()) { // 对比触发位置坐标，如果不符合预期坐标则重新执行触发线路 + log.info(`导航至突发任务（张牙舞爪的恶党）触发位置(二净甸)`); + await AutoPath(`好感-张牙舞爪的恶党-触发位置(二净甸)`); + notification.send(`已抵达突发任务（张牙舞爪的恶党）触发位置`); + } + // 开启急速拾取 + dispatcher.addTimer(new RealtimeTimer("AutoPick", { + "forceInteraction": true + })); + log.info(`当前次数：${i + 1}/${runTimes}`); + await AutoPath(`好感-张牙舞爪的恶党-循环${GetMeatMode ? '(二净甸刷肉版)' : '(二净甸)'}`); + // 关闭急速拾取 + dispatcher.addTimer(new RealtimeTimer("AutoPick", { + "forceInteraction": false + })); + // 判定本轮循环是否执行完毕 + if (await comparePosition()) { + log.info(`已完成次数：${i + 1}/${runTimes}`); + } else { + i = i - 1; // 退回这次次数 + log.warn(`判定本轮循环执行失败，退回本轮执行次数：${i + 1}/${runTimes}`); + } + const estimatedCompletion = calculateEstimatedCompletion(startTime, i + 1, runTimes); + logTimeTaken(startTime); + log.info(`预计完成时间：${estimatedCompletion}`); + } + log.info('兽肉好感已完成'); + } - // 刷肉相关参数 - let GetMeatMode = settings.GetMeatMode ? settings.GetMeatMode : false; - let inputValue = settings.inputValue ? settings.inputValue : 300; - let runTimes = GetMeatMode ? (isNaN(inputValue) ? 50 : Math.ceil(inputValue / 6)) : 10; - // 神像相关参数 - let goStatue = settings.goStatue ? settings.goStatue : false; - let statueTimes = goStatue ? (isNaN(settings.statueTimes) ? 5 : settings.statueTimes) : 0; - // 卡时间相关参数 - if(settings.waitTimeMode){ - let maxTimes = settings.maxTimes ? settings.maxTimes : runTimes ; - let waitTimeModeDay = settings.waitTimeModeDay - const datePattern = /^\d{4}-\d{2}-\d{2}$/; // 日期正则 - if (!datePattern.test(settings.waitTimeModeDay)) { - log.error(`检测到基准日期格式错误，当前输入值为：${waitTimeModeDay}`); - waitTimeModeDay = "2025-03-31"; - log.info(`使用的基准日期为：${waitTimeModeDay}`); - } + // 刷肉相关参数 + let GetMeatMode = settings.GetMeatMode ? settings.GetMeatMode : false; + let inputValue = settings.inputValue ? settings.inputValue : 300; + let runTimes = GetMeatMode ? (isNaN(inputValue) ? 50 : Math.ceil(inputValue / 6)) : 10; + // 神像相关参数 + let goStatue = settings.goStatue ? settings.goStatue : false; + let statueTimes = goStatue ? (isNaN(settings.statueTimes) ? 5 : settings.statueTimes) : 0; + // 卡时间相关参数 + if (settings.waitTimeMode) { + let maxTimes = settings.maxTimes ? settings.maxTimes : runTimes; + let waitTimeModeDay = settings.waitTimeModeDay + const datePattern = /^\d{4}-\d{2}-\d{2}$/; // 日期正则 + if (!datePattern.test(settings.waitTimeModeDay)) { + log.error(`检测到基准日期格式错误，当前输入值为：${waitTimeModeDay}`); + waitTimeModeDay = "2025-03-31"; + log.info(`使用的基准日期为：${waitTimeModeDay}`); + } const now = new Date(); const benchmark = new Date(waitTimeModeDay + "T04:00:00"); - const timeDiff = now.getTime() - benchmark.getTime(); + const timeDiff = now.getTime() - benchmark.getTime(); const daysDiff = Math.floor(timeDiff / (1000 * 60 * 60 * 24)); let period = Number(settings.waitTimeModePeriod); - if(isNaN(period)){ + if (isNaN(period)) { log.warn(`错误的卡时间模式周期 ${period}！使用 7 天作为周期。`); period = 7.0; } - if(period < 1 || period > 48){ + if (period < 1 || period > 48) { log.warn(`卡时间模式周期 ${period} 超过范围！使用 7 天作为周期。`); period = 7.0; } - const daysNormalized = daysDiff >= 0 ? daysDiff : period - (Math.abs(daysDiff) % period); - runTimes = Math.ceil(maxTimes / period) * (daysNormalized % period + 1); + const daysNormalized = daysDiff >= 0 ? daysDiff : period - (Math.abs(daysDiff) % period); + runTimes = Math.ceil(maxTimes / period) * (daysNormalized % period + 1); } - // Main - let messages = [ - '请确保队伍满员，并为队伍配置相应的战斗策略', - `使用的七天神像周期为： ${statueTimes}`, - `计算后的运行次数为： ${runTimes}`, - ]; - for (let message of messages) { - log.info(message); - await sleep(500); - } - log.info('兽肉好感开始...'); + // Main + let messages = [ + '请确保队伍满员，并为队伍配置相应的战斗策略', + `使用的七天神像周期为： ${statueTimes}`, + `计算后的运行次数为： ${runTimes}`, + ]; + for (let message of messages) { + log.info(message); + await sleep(500); + } + log.info('兽肉好感开始...'); - // 切换队伍 - if (!!settings.partyName) { - try { - await genshin.tpToStatueOfTheSeven(); - await sleep(2000); - log.info("正在尝试切换至" + settings.partyName); - await genshin.switchParty(settings.partyName); - } catch { - log.error("队伍切换失败，可能处于联机模式或其他不可切换状态"); - notification.error(`队伍切换失败，可能处于联机模式或其他不可切换状态`); - await genshin.returnMainUi(); - } - } else { - await genshin.returnMainUi(); - } + // 切换队伍 + if (!!settings.partyName) { + try { + await genshin.tpToStatueOfTheSeven(); + await sleep(2000); + log.info("正在尝试切换至" + settings.partyName); + await genshin.switchParty(settings.partyName); + } catch { + log.error("队伍切换失败，可能处于联机模式或其他不可切换状态"); + notification.error(`队伍切换失败，可能处于联机模式或其他不可切换状态`); + await genshin.returnMainUi(); + } + } else { + await genshin.returnMainUi(); + } + + const startTime = Date.now(); + await AutoFriendship(runTimes, statueTimes, GetMeatMode, startTime); + log.info(`兽肉好感运行总时长：${LogTimeTaken(startTime)}`); - const startTime = Date.now(); - await AutoFriendship(runTimes,statueTimes,GetMeatMode,startTime); - log.info(`兽肉好感运行总时长：${LogTimeTaken(startTime)}`); - })(); \ No newline at end of file diff --git a/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/manifest.json b/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/manifest.json index 74c12a34..ae47b9eb 100644 --- a/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/manifest.json +++ b/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 1, "name": "兽肉好感：自动好感度&刷两只鳄鱼兽肉&卡时间", - "version": "1.3.1", + "version": "1.3.2", "description": "通过突发事件:张牙舞爪的恶党刷兽肉，并顺带获取好感度（超过10次后不再获取），请使用满员好感度队伍，并为全体队伍角色配置相应的战斗策略", "authors": [ {