Merge branch 'bug_fix' of https://github.com/LmeSzinc/AzurLaneAutoScript into supply_pack

module/config/argument/argument.yaml

@@ -93,6 +93,9 @@ OneClickRetire:
   KeepLimitBreak:
     value: keep_limit_break
     option: [ keep_limit_break, do_not_keep ]
+  RetireAmount:
+    value: retire_all
+    option: [ retire_all, retire_10 ]
 Enhance:
   ShipToEnhance:
     value: all
@@ -104,6 +107,9 @@ OldRetire:
   R: true
   SR: false
   SSR: false
+  RetireAmount:
+    value: retire_all
+    option: [ retire_all, retire_10 ]
 
 # ==================== Farm ====================
 

module/config/argument/menu.json

@@ -9,7 +9,8 @@
       "Main",
       "Main2",
       "Main3",
-      "GemsFarming"
+      "GemsFarming",
+      "Sos"
     ],
     "Event": [
       "EventGeneral",
@@ -20,6 +21,7 @@
       "EventC",
       "EventD",
       "EventSp",
+      "WarArchives",
       "Raid",
       "RaidDaily",
       "MaritimeEscort"
@@ -33,20 +35,16 @@
       "Guild",
       "Reward"
     ],
-    "DailyReward": [
+    "DailyMission": [
+      "Daily",
+      "Hard",
+      "Exercise",
       "ShopFrequent",
       "ShopOnce",
       "Shipyard",
       "Gacha",
       "Freebies"
     ],
-    "DailyMission": [
-      "Daily",
-      "Hard",
-      "Exercise",
-      "Sos",
-      "WarArchives"
-    ],
     "Opsi": [
       "OpsiGeneral",
       "OpsiAshBeacon",

module/config/argument/task.yaml

@@ -56,6 +56,16 @@ GemsFarming:
   - Submarine
   - Emotion
   - EnemyPriority
+Sos:
+  - Scheduler
+  - Sos
+  - Campaign
+  - StopCondition
+  - Fleet
+  - Submarine
+  - Emotion
+  - HpControl
+  - EnemyPriority
 
 # ==================== Event ====================
 
@@ -129,6 +139,15 @@ EventSp:
   - Emotion
   - HpControl
   - EnemyPriority
+WarArchives:
+  - Scheduler
+  - Campaign
+  - StopCondition
+  - Fleet
+  - Submarine
+  - Emotion
+  - HpControl
+  - EnemyPriority
 Raid:
   - Scheduler
   - Raid
@@ -173,8 +192,17 @@ Reward:
   - Scheduler
   - Reward
 
-# ==================== DailyReward ====================
+# ==================== DailyMission ====================
 
+Daily:
+  - Scheduler
+  - Daily
+Hard:
+  - Scheduler
+  - Hard
+Exercise:
+  - Scheduler
+  - Exercise
 ShopFrequent:
   - Scheduler
   - GeneralShop
@@ -198,37 +226,6 @@ Freebies:
   - Mail
   - SupplyPack
 
-# ==================== DailyMission ====================
-
-Daily:
-  - Scheduler
-  - Daily
-Hard:
-  - Scheduler
-  - Hard
-Exercise:
-  - Scheduler
-  - Exercise
-Sos:
-  - Scheduler
-  - Sos
-  - Campaign
-  - StopCondition
-  - Fleet
-  - Submarine
-  - Emotion
-  - HpControl
-  - EnemyPriority
-WarArchives:
-  - Scheduler
-  - Campaign
-  - StopCondition
-  - Fleet
-  - Submarine
-  - Emotion
-  - HpControl
-  - EnemyPriority
-
 # ==================== Opsi ====================
 
 OpsiGeneral: