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": "起个名字好难的喵",