From b7ae44d4be1b8797b7655a1fba07b87a12e41e83 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: Thu, 22 May 2025 00:52:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A7=94=E6=89=98|=E6=B4=BE=E9=81=A3|?=
 =?UTF-8?q?=E7=BA=AA=E8=A1=8CJS=20=E5=8D=A1=E5=9C=A8=E5=87=AF=E7=91=9F?=
 =?UTF-8?q?=E7=90=B3=E5=AF=B9=E8=AF=9D=20(#904)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assets/AutoPath/冒险家协会_枫丹.json          |  0
 .../main.js                                       | 15 ++++++++-------
 .../manifest.json                                 |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)
 rename repo/js/{AutoCommission&Expedition => AutoCommission&Expedition&BattlePass}/assets/AutoPath/冒险家协会_枫丹.json (100%)
 rename repo/js/{AutoCommission&Expedition => AutoCommission&Expedition&BattlePass}/main.js (58%)
 rename repo/js/{AutoCommission&Expedition => AutoCommission&Expedition&BattlePass}/manifest.json (74%)

diff --git a/repo/js/AutoCommission&Expedition/assets/AutoPath/冒险家协会_枫丹.json b/repo/js/AutoCommission&Expedition&BattlePass/assets/AutoPath/冒险家协会_枫丹.json
similarity index 100%
rename from repo/js/AutoCommission&Expedition/assets/AutoPath/冒险家协会_枫丹.json
rename to repo/js/AutoCommission&Expedition&BattlePass/assets/AutoPath/冒险家协会_枫丹.json
diff --git a/repo/js/AutoCommission&Expedition/main.js b/repo/js/AutoCommission&Expedition&BattlePass/main.js
similarity index 58%
rename from repo/js/AutoCommission&Expedition/main.js
rename to repo/js/AutoCommission&Expedition&BattlePass/main.js
index e7694b51..bf79f7ee 100644
--- a/repo/js/AutoCommission&Expedition/main.js
+++ b/repo/js/AutoCommission&Expedition&BattlePass/main.js
@@ -1,20 +1,21 @@
 (async function () {
-    // 自动领取每日委托奖励&探索派遣
+    // 自动领取每日委托&探索派遣奖励
     await genshin.goToAdventurersGuild("枫丹");
     await sleep(1000);
-    click(960,1000);
+    click(960,300);
     await sleep(1000);
-    click(960,1000);
+    click(960,300);
     await sleep(1000);
+    await genshin.returnMainUi();
     // Again
     await genshin.goToAdventurersGuild("枫丹");
     await sleep(1000);
-    click(960,1000);
+    click(960,300);
     await sleep(1000);
-    click(960,1000);
+    click(960,300);
     await sleep(1000);
-    await keyPress("F");
-    dispatcher.addTimer(new RealtimeTimer("AutoSkip", { "forceInteraction": true }));
+    await genshin.returnMainUi();
     // 自动领取纪行奖励
     await genshin.claimBattlePassRewards();
+    await genshin.returnMainUi();
 })();
\ No newline at end of file
diff --git a/repo/js/AutoCommission&Expedition/manifest.json b/repo/js/AutoCommission&Expedition&BattlePass/manifest.json
similarity index 74%
rename from repo/js/AutoCommission&Expedition/manifest.json
rename to repo/js/AutoCommission&Expedition&BattlePass/manifest.json
index 7c3e8751..fc317d6b 100644
--- a/repo/js/AutoCommission&Expedition/manifest.json
+++ b/repo/js/AutoCommission&Expedition&BattlePass/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 1,
   "name": "自动领取委托、派遣和纪行",
   "version": "2.0",
-  "description": "自动传送到枫丹并领取每日委托奖励和探索派遣，并领取纪行奖励",
+  "description": "自动传送到枫丹并领取每日委托、探索派遣、纪行的奖励",
   "authors": [
     {
       "name": "起个名字好难的喵",