From 3c002ea81729c97e5e14826adbad6eb2dce4a0cf 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: Fri, 11 Apr 2025 03:38:19 +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=E6=B7=BB=E5=8A=A0=E4=B8=A4=E5=A4=84=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=EF=BC=8C=E6=94=B9=E7=94=A8=E5=86=85=E7=BD=AE=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E9=A2=86=E5=8F=96=E6=AF=8F=E6=97=A5=E5=A5=96=E5=8A=B1?=
 =?UTF-8?q?=EF=BC=9B=E5=9C=B0=E5=9B=BE=E8=BF=BD=E8=B8=AA=EF=BC=9A#549=20?=
 =?UTF-8?q?=E6=8C=AA=E4=BD=8D=E7=BD=AE=20(#555)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* JS脚本：兽肉好感添加两处通知

* JS脚本：改用内置方法领取每日奖励

* 地图追踪：#549 挪位置
---
 repo/js/Auto Commission && Expedition/main.js            | 9 ++-------
 repo/js/Auto Commission && Expedition/manifest.json      | 6 +++++-
 .../js/AutoFriendshipEvilBaresItsFangsGetRawMeat/main.js | 6 ++++--
 repo/pathing/{ => 久雨莲}/久雨莲-枫丹庭（纳西妲）-8.json | 0
 repo/pathing/堇瓜/README.md                              | 3 +++
 repo/pathing/{ => 堇瓜}/堇瓜-（纳西妲）-9.json           | 0
 .../{ => 烛伞蘑菇}/烛伞蘑菇-彩石顶（纳西妲）-9.json      | 0
 7 files changed, 14 insertions(+), 10 deletions(-)
 rename repo/pathing/{ => 久雨莲}/久雨莲-枫丹庭（纳西妲）-8.json (100%)
 create mode 100644 repo/pathing/堇瓜/README.md
 rename repo/pathing/{ => 堇瓜}/堇瓜-（纳西妲）-9.json (100%)
 rename repo/pathing/{ => 烛伞蘑菇}/烛伞蘑菇-彩石顶（纳西妲）-9.json (100%)

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