Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript

module/config/argument/args.json

@@ -281,6 +281,7 @@
           "cn_android-25",
           "cn_android-26",
           "cn_android-27",
+          "cn_android-28",
           "cn_ios-0",
           "cn_ios-1",
           "cn_ios-2",
@@ -3445,24 +3446,22 @@
         "type": "state",
         "value": "campaign_main",
         "option": [
-          "raid_20240328",
-          "raid_20250116"
+          "raid_20260212"
         ],
         "option_cn": [
-          "raid_20240328"
+          "raid_20260212"
         ],
         "option_en": [
-          "raid_20240328"
+          "raid_20260212"
         ],
         "option_jp": [
-          "raid_20240328"
+          "raid_20260212"
         ],
         "option_tw": [
-          "raid_20250116"
+          "raid_20260212"
         ],
         "option_bold": [
-          "raid_20240328",
-          "raid_20250116"
+          "raid_20260212"
         ]
       },
       "Mode": {
@@ -6936,24 +6935,22 @@
         "type": "state",
         "value": "campaign_main",
         "option": [
-          "raid_20240328",
-          "raid_20250116"
+          "raid_20260212"
         ],
         "option_cn": [
-          "raid_20240328"
+          "raid_20260212"
         ],
         "option_en": [
-          "raid_20240328"
+          "raid_20260212"
         ],
         "option_jp": [
-          "raid_20240328"
+          "raid_20260212"
         ],
         "option_tw": [
-          "raid_20250116"
+          "raid_20260212"
         ],
         "option_bold": [
-          "raid_20240328",
-          "raid_20250116"
+          "raid_20260212"
         ]
       },
       "Mode": {

module/config/argument/menu.json

@@ -23,11 +23,11 @@
     "page": "setting",
     "tasks": [
       "EventGeneral",
-      "Coalition",
       "Event",
       "Event2",
       "Raid",
       "Hospital",
+      "Coalition",
       "MaritimeEscort",
       "WarArchives"
     ]
@@ -36,13 +36,13 @@
     "menu": "collapse",
     "page": "setting",
     "tasks": [
-      "CoalitionSp",
       "EventA",
       "EventB",
       "EventC",
       "EventD",
       "EventSp",
-      "RaidDaily"
+      "RaidDaily",
+      "CoalitionSp"
     ]
   },
   "Reward": {

module/config/argument/task.yaml

@@ -73,12 +73,6 @@ Event:
     EventGeneral:
       - EventGeneral
       - TaskBalancer
-    Coalition:
-      - Scheduler
-      - Campaign
-      - Coalition
-      - StopCondition
-      - Emotion
     Event:
       - Scheduler
       - Campaign
@@ -108,6 +102,12 @@ Event:
       - Hospital
       - StopCondition
       - Emotion
+    Coalition:
+      - Scheduler
+      - Campaign
+      - Coalition
+      - StopCondition
+      - Emotion
     MaritimeEscort:
       - Scheduler
       - MaritimeEscort
@@ -129,12 +129,6 @@ EventDaily:
   menu: 'collapse'
   page: 'setting'
   tasks:
-    CoalitionSp:
-      - Scheduler
-      - Campaign
-      - Coalition
-      - StopCondition
-      - Emotion
     EventA:
       - Scheduler
       - EventDaily
@@ -190,6 +184,12 @@ EventDaily:
       - Campaign
       - StopCondition
       - Emotion
+    CoalitionSp:
+      - Scheduler
+      - Campaign
+      - Coalition
+      - StopCondition
+      - Emotion
 
 # ==================== Reward ====================
 

module/config/config_generated.py

@@ -20,7 +20,7 @@ class GeneratedConfig:
     # Group `Emulator`
     Emulator_Serial = 'auto'
     Emulator_PackageName = 'auto'  # auto, com.bilibili.azurlane, com.YoStarEN.AzurLane, com.YoStarJP.AzurLane, com.hkmanjuu.azurlane.gp, com.bilibili.blhx.huawei, com.bilibili.blhx.honor, com.bilibili.blhx.mi, com.tencent.tmgp.bilibili.blhx, com.bilibili.blhx.baidu, com.bilibili.blhx.qihoo, com.bilibili.blhx.nearme.gamecenter, com.bilibili.blhx.vivo, com.bilibili.blhx.mz, com.bilibili.blhx.dl, com.bilibili.blhx.lenovo, com.bilibili.blhx.uc, com.bilibili.blhx.mzw, com.yiwu.blhx.yx15, com.bilibili.blhx.m4399, com.bilibili.blhx.bilibiliMove, com.hkmanjuu.azurlane.gp.mc
-    Emulator_ServerName = 'disabled'  # disabled, cn_android-0, cn_android-1, cn_android-2, cn_android-3, cn_android-4, cn_android-5, cn_android-6, cn_android-7, cn_android-8, cn_android-9, cn_android-10, cn_android-11, cn_android-12, cn_android-13, cn_android-14, cn_android-15, cn_android-16, cn_android-17, cn_android-18, cn_android-19, cn_android-20, cn_android-21, cn_android-22, cn_android-23, cn_android-24, cn_android-25, cn_android-26, cn_android-27, cn_ios-0, cn_ios-1, cn_ios-2, cn_ios-3, cn_ios-4, cn_ios-5, cn_ios-6, cn_ios-7, cn_ios-8, cn_ios-9, cn_ios-10, cn_channel-0, cn_channel-1, cn_channel-2, cn_channel-3, cn_channel-4, en-0, en-1, en-2, en-3, en-4, en-5, jp-0, jp-1, jp-2, jp-3, jp-4, jp-5, jp-6, jp-7, jp-8, jp-9, jp-10, jp-11, jp-12, jp-13, jp-14, jp-15, jp-16, jp-17
+    Emulator_ServerName = 'disabled'  # disabled, cn_android-0, cn_android-1, cn_android-2, cn_android-3, cn_android-4, cn_android-5, cn_android-6, cn_android-7, cn_android-8, cn_android-9, cn_android-10, cn_android-11, cn_android-12, cn_android-13, cn_android-14, cn_android-15, cn_android-16, cn_android-17, cn_android-18, cn_android-19, cn_android-20, cn_android-21, cn_android-22, cn_android-23, cn_android-24, cn_android-25, cn_android-26, cn_android-27, cn_android-28, cn_ios-0, cn_ios-1, cn_ios-2, cn_ios-3, cn_ios-4, cn_ios-5, cn_ios-6, cn_ios-7, cn_ios-8, cn_ios-9, cn_ios-10, cn_channel-0, cn_channel-1, cn_channel-2, cn_channel-3, cn_channel-4, en-0, en-1, en-2, en-3, en-4, en-5, jp-0, jp-1, jp-2, jp-3, jp-4, jp-5, jp-6, jp-7, jp-8, jp-9, jp-10, jp-11, jp-12, jp-13, jp-14, jp-15, jp-16, jp-17
     Emulator_ScreenshotMethod = 'auto'  # auto, ADB, ADB_nc, uiautomator2, aScreenCap, aScreenCap_nc, DroidCast, DroidCast_raw, nemu_ipc, ldopengl
     Emulator_ControlMethod = 'MaaTouch'  # ADB, uiautomator2, minitouch, Hermit, MaaTouch
     Emulator_ScreenshotDedithering = False

module/config/i18n/en-US.json

@@ -66,10 +66,6 @@
       "name": "Event General",
       "help": ""
     },
-    "Coalition": {
-      "name": "Light & Shadow Fashion Shoot",
-      "help": ""
-    },
     "Event": {
       "name": "Event",
       "help": ""
@@ -86,6 +82,10 @@
       "name": "Valley Hospital Story",
       "help": ""
     },
+    "Coalition": {
+      "name": "Light & Shadow Fashion Shoot",
+      "help": ""
+    },
     "MaritimeEscort": {
       "name": "Maritime Escort",
       "help": ""
@@ -94,10 +94,6 @@
       "name": "War Archives",
       "help": "Due to the lack of maintenance of war archives, continuous clear may not work normally, if Alas runs abnormally, Please manually finish clearing and use auto search"
     },
-    "CoalitionSp": {
-      "name": "Light & Shadow Fashion Shoot SP",
-      "help": ""
-    },
     "EventA": {
       "name": "Event Daily A",
       "help": ""
@@ -122,6 +118,10 @@
       "name": "Raid Daily",
       "help": ""
     },
+    "CoalitionSp": {
+      "name": "Light & Shadow Fashion Shoot SP",
+      "help": ""
+    },
     "Commission": {
       "name": "Commission",
       "help": ""
@@ -386,6 +386,7 @@
       "cn_android-25": "[国服] 水仙行动",
       "cn_android-26": "[国服] 冬月计划",
       "cn_android-27": "[国服] 长弓计划",
+      "cn_android-28": "[国服] 裁决协议",
       "cn_ios-0": "[国服] 夏威夷",
       "cn_ios-1": "[国服] 珊瑚海",
       "cn_ios-2": "[国服] 中途岛",
@@ -793,6 +794,7 @@
       "raid_20240130": "Spring Festive Fiasco",
       "raid_20240328": "From Zero to Hero Rerun",
       "raid_20250116": "Spring Fashion Festa",
+      "raid_20260212": "Spring Auction Adventure",
       "war_archives_20180607_cn": "archives Ink Stained Steel Sakura",
       "war_archives_20180726_cn": "archives Iris of Light and Dark",
       "war_archives_20181020_en": "archives Strive Wish and Strategize",

module/config/i18n/ja-JP.json

@@ -66,10 +66,6 @@
       "name": "イベント共通設定",
       "help": ""
     },
-    "Coalition": {
-      "name": "特集写真-撮影進行中",
-      "help": ""
-    },
     "Event": {
       "name": "イベント海域",
       "help": ""
@@ -86,6 +82,10 @@
       "name": "病院探訪ストーリー",
       "help": ""
     },
+    "Coalition": {
+      "name": "特集写真-撮影進行中",
+      "help": ""
+    },
     "MaritimeEscort": {
       "name": "Maritime Escort",
       "help": ""
@@ -94,10 +94,6 @@
       "name": "作戦履歴",
       "help": ""
     },
-    "CoalitionSp": {
-      "name": "特集写真-撮影進行中SP",
-      "help": ""
-    },
     "EventA": {
       "name": "毎日イベント海域A",
       "help": ""
@@ -122,6 +118,10 @@
       "name": "Raid Daily",
       "help": ""
     },
+    "CoalitionSp": {
+      "name": "特集写真-撮影進行中SP",
+      "help": ""
+    },
     "Commission": {
       "name": "委託",
       "help": ""
@@ -386,6 +386,7 @@
       "cn_android-25": "[国服] 水仙行动",
       "cn_android-26": "[国服] 冬月计划",
       "cn_android-27": "[国服] 长弓计划",
+      "cn_android-28": "[国服] 裁决协议",
       "cn_ios-0": "[国服] 夏威夷",
       "cn_ios-1": "[国服] 珊瑚海",
       "cn_ios-2": "[国服] 中途岛",
@@ -793,6 +794,7 @@
       "raid_20240130": "新春宴会狂騒曲",
       "raid_20240328": "ゼロから頑張る魔王討伐（復刻）",
       "raid_20250116": "新春華裳協奏曲",
+      "raid_20260212": "新春玉逸品会",
       "war_archives_20180607_cn": "檔案 墨染まりし鋼の桜",
       "war_archives_20180726_cn": "檔案 光と影のアイリス",
       "war_archives_20181020_en": "檔案 努力希望と計画",

module/config/i18n/zh-CN.json

@@ -66,10 +66,6 @@
       "name": "活动通用设置",
       "help": ""
     },
-    "Coalition": {
-      "name": "光影风尚-拍摄进行时",
-      "help": ""
-    },
     "Event": {
       "name": "活动图",
       "help": ""
@@ -86,6 +82,10 @@
       "name": "深谷来信",
       "help": ""
     },
+    "Coalition": {
+      "name": "光影风尚-拍摄进行时",
+      "help": ""
+    },
     "MaritimeEscort": {
       "name": "商船护航",
       "help": ""
@@ -94,10 +94,6 @@
       "name": "作战档案",
       "help": "由于作战档案缺少维护，开荒功能不一定能正常使用，如果发现Alas运行异常，请手动完成开荒后使用自律寻敌功能"
     },
-    "CoalitionSp": {
-      "name": "光影风尚-拍摄进行时SP",
-      "help": ""
-    },
     "EventA": {
       "name": "活动每日A图",
       "help": ""
@@ -122,6 +118,10 @@
       "name": "共斗活动每日",
       "help": ""
     },
+    "CoalitionSp": {
+      "name": "光影风尚-拍摄进行时SP",
+      "help": ""
+    },
     "Commission": {
       "name": "委托",
       "help": ""
@@ -386,6 +386,7 @@
       "cn_android-25": "[国服] 水仙行动",
       "cn_android-26": "[国服] 冬月计划",
       "cn_android-27": "[国服] 长弓计划",
+      "cn_android-28": "[国服] 裁决协议",
       "cn_ios-0": "[国服] 夏威夷",
       "cn_ios-1": "[国服] 珊瑚海",
       "cn_ios-2": "[国服] 中途岛",
@@ -793,6 +794,7 @@
       "raid_20240130": "寰昌宇定家事忙",
       "raid_20240328": "复刻从零开始的魔王讨伐之旅",
       "raid_20250116": "华裳巧展喜事长",
+      "raid_20260212": "春宴怀玉香满庭",
       "war_archives_20180607_cn": "档案 墨染的钢铁之花",
       "war_archives_20180726_cn": "档案 光与影的鸢尾之华",
       "war_archives_20181020_en": "档案 努力希望和计划",

module/config/i18n/zh-TW.json

@@ -66,10 +66,6 @@
       "name": "活動通用",
       "help": ""
     },
-    "Coalition": {
-      "name": "光影風尚-拍攝進行時",
-      "help": ""
-    },
     "Event": {
       "name": "活動圖",
       "help": ""
@@ -86,6 +82,10 @@
       "name": "深谷来信",
       "help": ""
     },
+    "Coalition": {
+      "name": "光影風尚-拍攝進行時",
+      "help": ""
+    },
     "MaritimeEscort": {
       "name": "商船護航",
       "help": ""
@@ -94,10 +94,6 @@
       "name": "作戰檔案",
       "help": "由於作戰檔案缺少維護，開荒功能不一定能正常使用，如果發現Alas運行異常，請手動完成開荒後使用自律尋敵功能"
     },
-    "CoalitionSp": {
-      "name": "光影風尚-拍攝進行時SP",
-      "help": ""
-    },
     "EventA": {
       "name": "活動每日A圖",
       "help": ""
@@ -122,6 +118,10 @@
       "name": "共鬥活動每日",
       "help": ""
     },
+    "CoalitionSp": {
+      "name": "光影風尚-拍攝進行時SP",
+      "help": ""
+    },
     "Commission": {
       "name": "委託",
       "help": ""
@@ -386,6 +386,7 @@
       "cn_android-25": "[国服] 水仙行动",
       "cn_android-26": "[国服] 冬月计划",
       "cn_android-27": "[国服] 长弓计划",
+      "cn_android-28": "[国服] 裁决协议",
       "cn_ios-0": "[国服] 夏威夷",
       "cn_ios-1": "[国服] 珊瑚海",
       "cn_ios-2": "[国服] 中途岛",
@@ -793,6 +794,7 @@
       "raid_20240130": "寰昌宇定家事忙",
       "raid_20240328": "從零開始的魔王討伐之旅",
       "raid_20250116": "華裳巧展喜事長",
+      "raid_20260212": "春宴懷玉香滿庭",
       "war_archives_20180607_cn": "檔案 墨染的鋼鐵之花",
       "war_archives_20180726_cn": "檔案 光與影的鳶尾之華",
       "war_archives_20181020_en": "檔案 努力希望和計劃",

module/config/server.py

@@ -74,7 +74,7 @@ VALID_SERVER_LIST = {
         '小王冠行动', '波茨坦公告', '白色方案', '瓦尔基里行动',
         '曼哈顿计划', '八月风暴', '秋季旅行', '水星行动', '莱茵河卫兵',
         '北极光计划', '长戟计划', '暴雨行动', '水仙行动', '冬月计划',
-        '长弓计划'
+        '长弓计划', '裁决协议',
     ],
     'cn_ios': [
         '夏威夷', '珊瑚海', '中途岛', '铁底湾', '所罗门', '马里亚纳',