diff --git a/repo/js/Auto Commission && Expedition/main.js b/repo/js/Auto Commission && Expedition/main.js index 471154db..e815beeb 100644 --- a/repo/js/Auto Commission && Expedition/main.js +++ b/repo/js/Auto Commission && Expedition/main.js @@ -1,11 +1,6 @@ (async function () { - //传送到枫丹 - log.info('开始传送到枫丹廷'); - let Catherine_Egeria = `assets/AutoPath/冒险家协会_枫丹.json`; - await pathingScript.runFile(Catherine_Egeria); - log.info('开始每日委托或探索派遣,若无退出对话,则说明重复领取或未完成派遣'); // 自动每日或纪行 - await keyPress("f"); + await genshin.goToAdventurersGuild("枫丹"); + await keyPress("F"); dispatcher.addTimer(new RealtimeTimer("AutoSkip", { "forceInteraction": true })); - })(); \ No newline at end of file diff --git a/repo/js/Auto Commission && Expedition/manifest.json b/repo/js/Auto Commission && Expedition/manifest.json index 227c4625..1f9d6dd8 100644 --- a/repo/js/Auto Commission && Expedition/manifest.json +++ b/repo/js/Auto Commission && Expedition/manifest.json @@ -1,12 +1,16 @@ { "manifest_version": 1, "name": "自动领取委托或派遣", - "version": "1.0", + "version": "1.1", "description": "自动传送到枫丹并领取每日委托或探索派遣,两个都要请运行两次,建议搭配领取历练点使用", "authors": [ { "name": "yemaxul", "link": "https://github.com/yemaxul" + }, + { + "name": "起个名字好难的喵", + "links":"https://github.com/MisakaAldrich" } ], "main": "main.js" diff --git a/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/main.js b/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/main.js index 614fb2a3..bd8e33f4 100644 --- a/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/main.js +++ b/repo/js/AutoFriendshipEvilBaresItsFangsGetRawMeat/main.js @@ -76,8 +76,9 @@ await genshin.tpToStatueOfTheSeven(); await AutoPath(`好感-张牙舞爪的恶党-触发位置(二净甸)`); } else if (!await comparePosition()){ // 对比触发位置坐标,如果不符合预期坐标则重新执行触发线路 - log.info(`导航至好感-张牙舞爪的恶党-触发位置(二净甸)`); + log.info(`导航至突发任务(张牙舞爪的恶党)触发位置(二净甸)`); await AutoPath(`好感-张牙舞爪的恶党-触发位置(二净甸)`); + notification.send(`已抵达突发任务(张牙舞爪的恶党)触发位置`); } if (await comparePosition()){ log.info(`当前次数:${i + 1}/${runTimes}`); @@ -149,7 +150,8 @@ log.info("正在尝试切换至" + settings.partyName); await genshin.switchParty(settings.partyName); } catch { - log.warn("队伍切换失败,可能处于联机模式或其他不可切换状态"); + log.error("队伍切换失败,可能处于联机模式或其他不可切换状态"); + notification.error(`队伍切换失败,可能处于联机模式或其他不可切换状态`); await genshin.returnMainUi(); } } else { diff --git a/repo/pathing/久雨莲-枫丹庭(纳西妲)-8.json b/repo/pathing/久雨莲/久雨莲-枫丹庭(纳西妲)-8.json similarity index 100% rename from repo/pathing/久雨莲-枫丹庭(纳西妲)-8.json rename to repo/pathing/久雨莲/久雨莲-枫丹庭(纳西妲)-8.json diff --git a/repo/pathing/堇瓜/README.md b/repo/pathing/堇瓜/README.md new file mode 100644 index 00000000..eb9820db --- /dev/null +++ b/repo/pathing/堇瓜/README.md @@ -0,0 +1,3 @@ +# 食材 +## 非特产 +### 稻妻 \ No newline at end of file diff --git a/repo/pathing/堇瓜-(纳西妲)-9.json b/repo/pathing/堇瓜/堇瓜-(纳西妲)-9.json similarity index 100% rename from repo/pathing/堇瓜-(纳西妲)-9.json rename to repo/pathing/堇瓜/堇瓜-(纳西妲)-9.json diff --git a/repo/pathing/烛伞蘑菇-彩石顶(纳西妲)-9.json b/repo/pathing/烛伞蘑菇/烛伞蘑菇-彩石顶(纳西妲)-9.json similarity index 100% rename from repo/pathing/烛伞蘑菇-彩石顶(纳西妲)-9.json rename to repo/pathing/烛伞蘑菇/烛伞蘑菇-彩石顶(纳西妲)-9.json