diff --git a/assets/cn/raid/CHANGWU_OCR_PT.png b/assets/cn/raid/CHANGWU_OCR_PT.png new file mode 100644 index 000000000..69f91e624 Binary files /dev/null and b/assets/cn/raid/CHANGWU_OCR_PT.png differ diff --git a/assets/cn/raid/CHANGWU_OCR_REMAIN_EASY.png b/assets/cn/raid/CHANGWU_OCR_REMAIN_EASY.png new file mode 100644 index 000000000..81cc31b96 Binary files /dev/null and b/assets/cn/raid/CHANGWU_OCR_REMAIN_EASY.png differ diff --git a/assets/cn/raid/CHANGWU_OCR_REMAIN_EX.png b/assets/cn/raid/CHANGWU_OCR_REMAIN_EX.png new file mode 100644 index 000000000..3cfa3e115 Binary files /dev/null and b/assets/cn/raid/CHANGWU_OCR_REMAIN_EX.png differ diff --git a/assets/cn/raid/CHANGWU_OCR_REMAIN_HARD.png b/assets/cn/raid/CHANGWU_OCR_REMAIN_HARD.png new file mode 100644 index 000000000..058042521 Binary files /dev/null and b/assets/cn/raid/CHANGWU_OCR_REMAIN_HARD.png differ diff --git a/assets/cn/raid/CHANGWU_OCR_REMAIN_NORMAL.png b/assets/cn/raid/CHANGWU_OCR_REMAIN_NORMAL.png new file mode 100644 index 000000000..dae85770a Binary files /dev/null and b/assets/cn/raid/CHANGWU_OCR_REMAIN_NORMAL.png differ diff --git a/assets/cn/raid/CHANGWU_RAID_EASY.png b/assets/cn/raid/CHANGWU_RAID_EASY.png new file mode 100644 index 000000000..f77fe6413 Binary files /dev/null and b/assets/cn/raid/CHANGWU_RAID_EASY.png differ diff --git a/assets/cn/raid/CHANGWU_RAID_EX.png b/assets/cn/raid/CHANGWU_RAID_EX.png new file mode 100644 index 000000000..6488b54c7 Binary files /dev/null and b/assets/cn/raid/CHANGWU_RAID_EX.png differ diff --git a/assets/cn/raid/CHANGWU_RAID_HARD.png b/assets/cn/raid/CHANGWU_RAID_HARD.png new file mode 100644 index 000000000..e221a3764 Binary files /dev/null and b/assets/cn/raid/CHANGWU_RAID_HARD.png differ diff --git a/assets/cn/raid/CHANGWU_RAID_NORMAL.png b/assets/cn/raid/CHANGWU_RAID_NORMAL.png new file mode 100644 index 000000000..9e50e8a8d Binary files /dev/null and b/assets/cn/raid/CHANGWU_RAID_NORMAL.png differ diff --git a/assets/en/raid/CHANGWU_OCR_PT.png b/assets/en/raid/CHANGWU_OCR_PT.png new file mode 100644 index 000000000..69f91e624 Binary files /dev/null and b/assets/en/raid/CHANGWU_OCR_PT.png differ diff --git a/assets/en/raid/CHANGWU_OCR_REMAIN_EASY.png b/assets/en/raid/CHANGWU_OCR_REMAIN_EASY.png new file mode 100644 index 000000000..81cc31b96 Binary files /dev/null and b/assets/en/raid/CHANGWU_OCR_REMAIN_EASY.png differ diff --git a/assets/en/raid/CHANGWU_OCR_REMAIN_EX.png b/assets/en/raid/CHANGWU_OCR_REMAIN_EX.png new file mode 100644 index 000000000..3cfa3e115 Binary files /dev/null and b/assets/en/raid/CHANGWU_OCR_REMAIN_EX.png differ diff --git a/assets/en/raid/CHANGWU_OCR_REMAIN_HARD.png b/assets/en/raid/CHANGWU_OCR_REMAIN_HARD.png new file mode 100644 index 000000000..058042521 Binary files /dev/null and b/assets/en/raid/CHANGWU_OCR_REMAIN_HARD.png differ diff --git a/assets/en/raid/CHANGWU_OCR_REMAIN_NORMAL.png b/assets/en/raid/CHANGWU_OCR_REMAIN_NORMAL.png new file mode 100644 index 000000000..dae85770a Binary files /dev/null and b/assets/en/raid/CHANGWU_OCR_REMAIN_NORMAL.png differ diff --git a/assets/en/raid/CHANGWU_RAID_EASY.png b/assets/en/raid/CHANGWU_RAID_EASY.png new file mode 100644 index 000000000..2d92d8c58 Binary files /dev/null and b/assets/en/raid/CHANGWU_RAID_EASY.png differ diff --git a/assets/en/raid/CHANGWU_RAID_EX.png b/assets/en/raid/CHANGWU_RAID_EX.png new file mode 100644 index 000000000..6488b54c7 Binary files /dev/null and b/assets/en/raid/CHANGWU_RAID_EX.png differ diff --git a/assets/en/raid/CHANGWU_RAID_HARD.png b/assets/en/raid/CHANGWU_RAID_HARD.png new file mode 100644 index 000000000..e04d8b506 Binary files /dev/null and b/assets/en/raid/CHANGWU_RAID_HARD.png differ diff --git a/assets/en/raid/CHANGWU_RAID_NORMAL.png b/assets/en/raid/CHANGWU_RAID_NORMAL.png new file mode 100644 index 000000000..2431085cb Binary files /dev/null and b/assets/en/raid/CHANGWU_RAID_NORMAL.png differ diff --git a/assets/jp/raid/CHANGWU_OCR_PT.png b/assets/jp/raid/CHANGWU_OCR_PT.png new file mode 100644 index 000000000..69f91e624 Binary files /dev/null and b/assets/jp/raid/CHANGWU_OCR_PT.png differ diff --git a/assets/jp/raid/CHANGWU_OCR_REMAIN_EASY.png b/assets/jp/raid/CHANGWU_OCR_REMAIN_EASY.png new file mode 100644 index 000000000..81cc31b96 Binary files /dev/null and b/assets/jp/raid/CHANGWU_OCR_REMAIN_EASY.png differ diff --git a/assets/jp/raid/CHANGWU_OCR_REMAIN_EX.png b/assets/jp/raid/CHANGWU_OCR_REMAIN_EX.png new file mode 100644 index 000000000..3cfa3e115 Binary files /dev/null and b/assets/jp/raid/CHANGWU_OCR_REMAIN_EX.png differ diff --git a/assets/jp/raid/CHANGWU_OCR_REMAIN_HARD.png b/assets/jp/raid/CHANGWU_OCR_REMAIN_HARD.png new file mode 100644 index 000000000..058042521 Binary files /dev/null and b/assets/jp/raid/CHANGWU_OCR_REMAIN_HARD.png differ diff --git a/assets/jp/raid/CHANGWU_OCR_REMAIN_NORMAL.png b/assets/jp/raid/CHANGWU_OCR_REMAIN_NORMAL.png new file mode 100644 index 000000000..dae85770a Binary files /dev/null and b/assets/jp/raid/CHANGWU_OCR_REMAIN_NORMAL.png differ diff --git a/assets/jp/raid/CHANGWU_RAID_EASY.png b/assets/jp/raid/CHANGWU_RAID_EASY.png new file mode 100644 index 000000000..57b3d424e Binary files /dev/null and b/assets/jp/raid/CHANGWU_RAID_EASY.png differ diff --git a/assets/jp/raid/CHANGWU_RAID_EX.png b/assets/jp/raid/CHANGWU_RAID_EX.png new file mode 100644 index 000000000..6488b54c7 Binary files /dev/null and b/assets/jp/raid/CHANGWU_RAID_EX.png differ diff --git a/assets/jp/raid/CHANGWU_RAID_HARD.png b/assets/jp/raid/CHANGWU_RAID_HARD.png new file mode 100644 index 000000000..a3078d799 Binary files /dev/null and b/assets/jp/raid/CHANGWU_RAID_HARD.png differ diff --git a/assets/jp/raid/CHANGWU_RAID_NORMAL.png b/assets/jp/raid/CHANGWU_RAID_NORMAL.png new file mode 100644 index 000000000..1e12dc279 Binary files /dev/null and b/assets/jp/raid/CHANGWU_RAID_NORMAL.png differ diff --git a/assets/tw/raid/CHANGWU_OCR_PT.png b/assets/tw/raid/CHANGWU_OCR_PT.png new file mode 100644 index 000000000..69f91e624 Binary files /dev/null and b/assets/tw/raid/CHANGWU_OCR_PT.png differ diff --git a/assets/tw/raid/CHANGWU_OCR_REMAIN_EASY.png b/assets/tw/raid/CHANGWU_OCR_REMAIN_EASY.png new file mode 100644 index 000000000..81cc31b96 Binary files /dev/null and b/assets/tw/raid/CHANGWU_OCR_REMAIN_EASY.png differ diff --git a/assets/tw/raid/CHANGWU_OCR_REMAIN_EX.png b/assets/tw/raid/CHANGWU_OCR_REMAIN_EX.png new file mode 100644 index 000000000..3cfa3e115 Binary files /dev/null and b/assets/tw/raid/CHANGWU_OCR_REMAIN_EX.png differ diff --git a/assets/tw/raid/CHANGWU_OCR_REMAIN_HARD.png b/assets/tw/raid/CHANGWU_OCR_REMAIN_HARD.png new file mode 100644 index 000000000..058042521 Binary files /dev/null and b/assets/tw/raid/CHANGWU_OCR_REMAIN_HARD.png differ diff --git a/assets/tw/raid/CHANGWU_OCR_REMAIN_NORMAL.png b/assets/tw/raid/CHANGWU_OCR_REMAIN_NORMAL.png new file mode 100644 index 000000000..dae85770a Binary files /dev/null and b/assets/tw/raid/CHANGWU_OCR_REMAIN_NORMAL.png differ diff --git a/assets/tw/raid/CHANGWU_RAID_EASY.png b/assets/tw/raid/CHANGWU_RAID_EASY.png new file mode 100644 index 000000000..a05ce4ed8 Binary files /dev/null and b/assets/tw/raid/CHANGWU_RAID_EASY.png differ diff --git a/assets/tw/raid/CHANGWU_RAID_EX.png b/assets/tw/raid/CHANGWU_RAID_EX.png new file mode 100644 index 000000000..6488b54c7 Binary files /dev/null and b/assets/tw/raid/CHANGWU_RAID_EX.png differ diff --git a/assets/tw/raid/CHANGWU_RAID_HARD.png b/assets/tw/raid/CHANGWU_RAID_HARD.png new file mode 100644 index 000000000..bb8b6bbd6 Binary files /dev/null and b/assets/tw/raid/CHANGWU_RAID_HARD.png differ diff --git a/assets/tw/raid/CHANGWU_RAID_NORMAL.png b/assets/tw/raid/CHANGWU_RAID_NORMAL.png new file mode 100644 index 000000000..9d4903978 Binary files /dev/null and b/assets/tw/raid/CHANGWU_RAID_NORMAL.png differ diff --git a/campaign/Readme.md b/campaign/Readme.md index d4785cb83..a3701d128 100644 --- a/campaign/Readme.md +++ b/campaign/Readme.md @@ -280,3 +280,4 @@ To add a new event, add a new row in here, and run `python -m module.config.conf | 20260122 | event 20220526 cn | Pledge of the Radiant Court | - | - | - | 泠誓光庭 | | 20260129 | coalition 20260122 | Light & Shadow Fashion Shoot! | - | - | - | 光影風尚-拍攝進行時 | | 20260205 | raid 20240328 | From Zero to Hero | 复刻从零开始的魔王讨伐之旅 | From Zero to Hero Rerun | ゼロから頑張る魔王討伐（復刻） | - | +| 20260212 | raid 20260212 | Spring Auction Adventure | 春宴怀玉香满庭 | Spring Auction Adventure | 新春玉逸品会 | 春宴懷玉香滿庭 | diff --git a/module/config/argument/args.json b/module/config/argument/args.json index d356302c1..ba6a6e53e 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -67,6 +67,7 @@ "cn_android-25", "cn_android-26", "cn_android-27", + "cn_android-28", "cn_ios-0", "cn_ios-1", "cn_ios-2", @@ -2722,24 +2723,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": { @@ -6082,24 +6081,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": { diff --git a/module/config/argument/menu.json b/module/config/argument/menu.json index 7a2c2243d..abdfe9c9b 100644 --- a/module/config/argument/menu.json +++ b/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": { diff --git a/module/config/argument/task.yaml b/module/config/argument/task.yaml index 2cfc4b372..c6f20bb00 100644 --- a/module/config/argument/task.yaml +++ b/module/config/argument/task.yaml @@ -71,12 +71,6 @@ Event: EventGeneral: - EventGeneral - TaskBalancer - Coalition: - - Scheduler - - Campaign - - Coalition - - StopCondition - - Emotion Event: - Scheduler - Campaign @@ -106,6 +100,12 @@ Event: - Hospital - StopCondition - Emotion + Coalition: + - Scheduler + - Campaign + - Coalition + - StopCondition + - Emotion MaritimeEscort: - Scheduler - MaritimeEscort @@ -126,12 +126,6 @@ EventDaily: menu: 'collapse' page: 'setting' tasks: - CoalitionSp: - - Scheduler - - Campaign - - Coalition - - StopCondition - - Emotion EventA: - Scheduler - EventDaily @@ -187,6 +181,12 @@ EventDaily: - Campaign - StopCondition - Emotion + CoalitionSp: + - Scheduler + - Campaign + - Coalition + - StopCondition + - Emotion # ==================== Reward ==================== diff --git a/module/config/config_generated.py b/module/config/config_generated.py index 109d1a932..808993bb1 100644 --- a/module/config/config_generated.py +++ b/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 diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index 2249cd951..adaa84ac0 100644 --- a/module/config/i18n/en-US.json +++ b/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", "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": "" @@ -378,6 +378,7 @@ "cn_android-25": "[国服] 水仙行动", "cn_android-26": "[国服] 冬月计划", "cn_android-27": "[国服] 长弓计划", + "cn_android-28": "[国服] 裁决协议", "cn_ios-0": "[国服] 夏威夷", "cn_ios-1": "[国服] 珊瑚海", "cn_ios-2": "[国服] 中途岛", @@ -775,6 +776,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", diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index 701531f35..9fb20cc05 100644 --- a/module/config/i18n/ja-JP.json +++ b/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": "" @@ -378,6 +378,7 @@ "cn_android-25": "[国服] 水仙行动", "cn_android-26": "[国服] 冬月计划", "cn_android-27": "[国服] 长弓计划", + "cn_android-28": "[国服] 裁决协议", "cn_ios-0": "[国服] 夏威夷", "cn_ios-1": "[国服] 珊瑚海", "cn_ios-2": "[国服] 中途岛", @@ -775,6 +776,7 @@ "raid_20240130": "新春宴会狂騒曲", "raid_20240328": "ゼロから頑張る魔王討伐（復刻）", "raid_20250116": "新春華裳協奏曲", + "raid_20260212": "新春玉逸品会", "war_archives_20180607_cn": "檔案 墨染まりし鋼の桜", "war_archives_20180726_cn": "檔案 光と影のアイリス", "war_archives_20181020_en": "檔案 努力希望と計画", diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index fc7a08902..4f94e0cc8 100644 --- a/module/config/i18n/zh-CN.json +++ b/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": "" @@ -378,6 +378,7 @@ "cn_android-25": "[国服] 水仙行动", "cn_android-26": "[国服] 冬月计划", "cn_android-27": "[国服] 长弓计划", + "cn_android-28": "[国服] 裁决协议", "cn_ios-0": "[国服] 夏威夷", "cn_ios-1": "[国服] 珊瑚海", "cn_ios-2": "[国服] 中途岛", @@ -775,6 +776,7 @@ "raid_20240130": "寰昌宇定家事忙", "raid_20240328": "复刻从零开始的魔王讨伐之旅", "raid_20250116": "华裳巧展喜事长", + "raid_20260212": "春宴怀玉香满庭", "war_archives_20180607_cn": "档案 墨染的钢铁之花", "war_archives_20180726_cn": "档案 光与影的鸢尾之华", "war_archives_20181020_en": "档案 努力希望和计划", diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index 22fc84184..10fb4caac 100644 --- a/module/config/i18n/zh-TW.json +++ b/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": "" @@ -378,6 +378,7 @@ "cn_android-25": "[国服] 水仙行动", "cn_android-26": "[国服] 冬月计划", "cn_android-27": "[国服] 长弓计划", + "cn_android-28": "[国服] 裁决协议", "cn_ios-0": "[国服] 夏威夷", "cn_ios-1": "[国服] 珊瑚海", "cn_ios-2": "[国服] 中途岛", @@ -775,6 +776,7 @@ "raid_20240130": "寰昌宇定家事忙", "raid_20240328": "從零開始的魔王討伐之旅", "raid_20250116": "華裳巧展喜事長", + "raid_20260212": "春宴懷玉香滿庭", "war_archives_20180607_cn": "檔案 墨染的鋼鐵之花", "war_archives_20180726_cn": "檔案 光與影的鳶尾之華", "war_archives_20181020_en": "檔案 努力希望和計劃", diff --git a/module/config/server.py b/module/config/server.py index e91fa48ce..3cf519518 100644 --- a/module/config/server.py +++ b/module/config/server.py @@ -74,7 +74,7 @@ VALID_SERVER_LIST = { '小王冠行动', '波茨坦公告', '白色方案', '瓦尔基里行动', '曼哈顿计划', '八月风暴', '秋季旅行', '水星行动', '莱茵河卫兵', '北极光计划', '长戟计划', '暴雨行动', '水仙行动', '冬月计划', - '长弓计划' + '长弓计划', '裁决协议', ], 'cn_ios': [ '夏威夷', '珊瑚海', '中途岛', '铁底湾', '所罗门', '马里亚纳', diff --git a/module/raid/assets.py b/module/raid/assets.py index 299e92b94..172c02e78 100644 --- a/module/raid/assets.py +++ b/module/raid/assets.py @@ -17,6 +17,15 @@ BRISTOL_OCR_REMAIN_NORMAL = Button(area={'cn': (1089, 414, 1148, 432), 'en': (10 BRISTOL_RAID_EASY = Button(area={'cn': (1151, 490, 1203, 528), 'en': (1155, 504, 1197, 524), 'jp': (1152, 491, 1203, 528), 'tw': (1151, 490, 1204, 519)}, color={'cn': (141, 164, 177), 'en': (145, 167, 177), 'jp': (126, 151, 166), 'tw': (117, 142, 159)}, button={'cn': (1151, 490, 1203, 528), 'en': (1155, 504, 1197, 524), 'jp': (1152, 491, 1203, 528), 'tw': (1151, 490, 1204, 519)}, file={'cn': './assets/cn/raid/BRISTOL_RAID_EASY.png', 'en': './assets/en/raid/BRISTOL_RAID_EASY.png', 'jp': './assets/jp/raid/BRISTOL_RAID_EASY.png', 'tw': './assets/tw/raid/BRISTOL_RAID_EASY.png'}) BRISTOL_RAID_HARD = Button(area={'cn': (1167, 246, 1220, 285), 'en': (1156, 259, 1231, 278), 'jp': (1159, 250, 1229, 285), 'tw': (1170, 249, 1217, 275)}, color={'cn': (136, 160, 173), 'en': (133, 156, 168), 'jp': (145, 168, 181), 'tw': (100, 126, 145)}, button={'cn': (1167, 246, 1220, 285), 'en': (1156, 259, 1231, 278), 'jp': (1159, 250, 1229, 285), 'tw': (1170, 249, 1217, 275)}, file={'cn': './assets/cn/raid/BRISTOL_RAID_HARD.png', 'en': './assets/en/raid/BRISTOL_RAID_HARD.png', 'jp': './assets/jp/raid/BRISTOL_RAID_HARD.png', 'tw': './assets/tw/raid/BRISTOL_RAID_HARD.png'}) BRISTOL_RAID_NORMAL = Button(area={'cn': (1098, 367, 1150, 404), 'en': (1089, 380, 1158, 396), 'jp': (1099, 368, 1149, 404), 'tw': (1097, 367, 1151, 393)}, color={'cn': (129, 152, 165), 'en': (131, 153, 164), 'jp': (119, 146, 163), 'tw': (121, 144, 159)}, button={'cn': (1098, 367, 1150, 404), 'en': (1089, 380, 1158, 396), 'jp': (1099, 368, 1149, 404), 'tw': (1097, 367, 1151, 393)}, file={'cn': './assets/cn/raid/BRISTOL_RAID_NORMAL.png', 'en': './assets/en/raid/BRISTOL_RAID_NORMAL.png', 'jp': './assets/jp/raid/BRISTOL_RAID_NORMAL.png', 'tw': './assets/tw/raid/BRISTOL_RAID_NORMAL.png'}) +CHANGWU_OCR_PT = Button(area={'cn': (1174, 603, 1280, 632), 'en': (1174, 603, 1280, 632), 'jp': (1174, 603, 1280, 632), 'tw': (1174, 603, 1280, 632)}, color={'cn': (183, 118, 101), 'en': (183, 118, 101), 'jp': (183, 118, 101), 'tw': (183, 118, 101)}, button={'cn': (1174, 603, 1280, 632), 'en': (1174, 603, 1280, 632), 'jp': (1174, 603, 1280, 632), 'tw': (1174, 603, 1280, 632)}, file={'cn': './assets/cn/raid/CHANGWU_OCR_PT.png', 'en': './assets/en/raid/CHANGWU_OCR_PT.png', 'jp': './assets/jp/raid/CHANGWU_OCR_PT.png', 'tw': './assets/tw/raid/CHANGWU_OCR_PT.png'}) +CHANGWU_OCR_REMAIN_EASY = Button(area={'cn': (1057, 565, 1116, 585), 'en': (1057, 565, 1116, 585), 'jp': (1057, 565, 1116, 585), 'tw': (1057, 565, 1116, 585)}, color={'cn': (96, 83, 81), 'en': (96, 83, 81), 'jp': (96, 83, 81), 'tw': (96, 83, 81)}, button={'cn': (1057, 565, 1116, 585), 'en': (1057, 565, 1116, 585), 'jp': (1057, 565, 1116, 585), 'tw': (1057, 565, 1116, 585)}, file={'cn': './assets/cn/raid/CHANGWU_OCR_REMAIN_EASY.png', 'en': './assets/en/raid/CHANGWU_OCR_REMAIN_EASY.png', 'jp': './assets/jp/raid/CHANGWU_OCR_REMAIN_EASY.png', 'tw': './assets/tw/raid/CHANGWU_OCR_REMAIN_EASY.png'}) +CHANGWU_OCR_REMAIN_EX = Button(area={'cn': (1138, 26, 1185, 49), 'en': (1138, 26, 1185, 49), 'jp': (1138, 26, 1185, 49), 'tw': (1138, 26, 1185, 49)}, color={'cn': (213, 128, 103), 'en': (213, 128, 103), 'jp': (213, 128, 103), 'tw': (213, 128, 103)}, button={'cn': (1138, 26, 1185, 49), 'en': (1138, 26, 1185, 49), 'jp': (1138, 26, 1185, 49), 'tw': (1138, 26, 1185, 49)}, file={'cn': './assets/cn/raid/CHANGWU_OCR_REMAIN_EX.png', 'en': './assets/en/raid/CHANGWU_OCR_REMAIN_EX.png', 'jp': './assets/jp/raid/CHANGWU_OCR_REMAIN_EX.png', 'tw': './assets/tw/raid/CHANGWU_OCR_REMAIN_EX.png'}) +CHANGWU_OCR_REMAIN_HARD = Button(area={'cn': (1169, 409, 1229, 429), 'en': (1169, 409, 1229, 429), 'jp': (1169, 409, 1229, 429), 'tw': (1169, 409, 1229, 429)}, color={'cn': (100, 86, 82), 'en': (100, 86, 82), 'jp': (100, 86, 82), 'tw': (100, 86, 82)}, button={'cn': (1169, 409, 1229, 429), 'en': (1169, 409, 1229, 429), 'jp': (1169, 409, 1229, 429), 'tw': (1169, 409, 1229, 429)}, file={'cn': './assets/cn/raid/CHANGWU_OCR_REMAIN_HARD.png', 'en': './assets/en/raid/CHANGWU_OCR_REMAIN_HARD.png', 'jp': './assets/jp/raid/CHANGWU_OCR_REMAIN_HARD.png', 'tw': './assets/tw/raid/CHANGWU_OCR_REMAIN_HARD.png'}) +CHANGWU_OCR_REMAIN_NORMAL = Button(area={'cn': (1112, 487, 1170, 506), 'en': (1112, 487, 1170, 506), 'jp': (1112, 487, 1170, 506), 'tw': (1112, 487, 1170, 506)}, color={'cn': (100, 87, 84), 'en': (100, 87, 84), 'jp': (100, 87, 84), 'tw': (100, 87, 84)}, button={'cn': (1112, 487, 1170, 506), 'en': (1112, 487, 1170, 506), 'jp': (1112, 487, 1170, 506), 'tw': (1112, 487, 1170, 506)}, file={'cn': './assets/cn/raid/CHANGWU_OCR_REMAIN_NORMAL.png', 'en': './assets/en/raid/CHANGWU_OCR_REMAIN_NORMAL.png', 'jp': './assets/jp/raid/CHANGWU_OCR_REMAIN_NORMAL.png', 'tw': './assets/tw/raid/CHANGWU_OCR_REMAIN_NORMAL.png'}) +CHANGWU_RAID_EASY = Button(area={'cn': (976, 559, 1032, 590), 'en': (971, 562, 1037, 584), 'jp': (978, 561, 1031, 588), 'tw': (977, 560, 1031, 588)}, color={'cn': (144, 130, 122), 'en': (158, 144, 134), 'jp': (151, 137, 128), 'tw': (162, 147, 137)}, button={'cn': (976, 559, 1032, 590), 'en': (971, 562, 1037, 584), 'jp': (978, 561, 1031, 588), 'tw': (977, 560, 1031, 588)}, file={'cn': './assets/cn/raid/CHANGWU_RAID_EASY.png', 'en': './assets/en/raid/CHANGWU_RAID_EASY.png', 'jp': './assets/jp/raid/CHANGWU_RAID_EASY.png', 'tw': './assets/tw/raid/CHANGWU_RAID_EASY.png'}) +CHANGWU_RAID_EX = Button(area={'cn': (1135, 296, 1209, 331), 'en': (1135, 296, 1209, 331), 'jp': (1135, 296, 1209, 331), 'tw': (1135, 296, 1209, 331)}, color={'cn': (151, 138, 125), 'en': (151, 138, 125), 'jp': (151, 138, 125), 'tw': (151, 138, 125)}, button={'cn': (1135, 296, 1209, 331), 'en': (1135, 296, 1209, 331), 'jp': (1135, 296, 1209, 331), 'tw': (1135, 296, 1209, 331)}, file={'cn': './assets/cn/raid/CHANGWU_RAID_EX.png', 'en': './assets/en/raid/CHANGWU_RAID_EX.png', 'jp': './assets/jp/raid/CHANGWU_RAID_EX.png', 'tw': './assets/tw/raid/CHANGWU_RAID_EX.png'}) +CHANGWU_RAID_HARD = Button(area={'cn': (1087, 403, 1146, 433), 'en': (1083, 407, 1150, 428), 'jp': (1073, 405, 1143, 431), 'tw': (1089, 405, 1145, 432)}, color={'cn': (154, 139, 130), 'en': (173, 157, 145), 'jp': (133, 119, 112), 'tw': (173, 157, 145)}, button={'cn': (1087, 403, 1146, 433), 'en': (1083, 407, 1150, 428), 'jp': (1073, 405, 1143, 431), 'tw': (1089, 405, 1145, 432)}, file={'cn': './assets/cn/raid/CHANGWU_RAID_HARD.png', 'en': './assets/en/raid/CHANGWU_RAID_HARD.png', 'jp': './assets/jp/raid/CHANGWU_RAID_HARD.png', 'tw': './assets/tw/raid/CHANGWU_RAID_HARD.png'}) +CHANGWU_RAID_NORMAL = Button(area={'cn': (1032, 480, 1091, 511), 'en': (1009, 485, 1104, 506), 'jp': (1034, 482, 1089, 510), 'tw': (1033, 481, 1089, 510)}, color={'cn': (144, 130, 122), 'en': (168, 153, 142), 'jp': (146, 131, 123), 'tw': (151, 136, 128)}, button={'cn': (1032, 480, 1091, 511), 'en': (1009, 485, 1104, 506), 'jp': (1034, 482, 1089, 510), 'tw': (1033, 481, 1089, 510)}, file={'cn': './assets/cn/raid/CHANGWU_RAID_NORMAL.png', 'en': './assets/en/raid/CHANGWU_RAID_NORMAL.png', 'jp': './assets/jp/raid/CHANGWU_RAID_NORMAL.png', 'tw': './assets/tw/raid/CHANGWU_RAID_NORMAL.png'}) CHIENWU_OCR_PT = Button(area={'cn': (1166, 604, 1279, 632), 'en': (1166, 604, 1279, 632), 'jp': (1166, 604, 1279, 632), 'tw': (1166, 604, 1279, 632)}, color={'cn': (126, 40, 47), 'en': (126, 40, 47), 'jp': (126, 40, 47), 'tw': (126, 40, 47)}, button={'cn': (1166, 604, 1279, 632), 'en': (1166, 604, 1279, 632), 'jp': (1166, 604, 1279, 632), 'tw': (1166, 604, 1279, 632)}, file={'cn': './assets/cn/raid/CHIENWU_OCR_PT.png', 'en': './assets/cn/raid/CHIENWU_OCR_PT.png', 'jp': './assets/cn/raid/CHIENWU_OCR_PT.png', 'tw': './assets/cn/raid/CHIENWU_OCR_PT.png'}) CHIENWU_OCR_REMAIN_EASY = Button(area={'cn': (1111, 528, 1163, 549), 'en': (1111, 528, 1163, 549), 'jp': (1111, 528, 1163, 549), 'tw': (1111, 528, 1163, 549)}, color={'cn': (174, 153, 133), 'en': (174, 153, 133), 'jp': (174, 153, 133), 'tw': (174, 153, 133)}, button={'cn': (1111, 528, 1163, 549), 'en': (1111, 528, 1163, 549), 'jp': (1111, 528, 1163, 549), 'tw': (1111, 528, 1163, 549)}, file={'cn': './assets/cn/raid/CHIENWU_OCR_REMAIN_EASY.png', 'en': './assets/cn/raid/CHIENWU_OCR_REMAIN_EASY.png', 'jp': './assets/cn/raid/CHIENWU_OCR_REMAIN_EASY.png', 'tw': './assets/cn/raid/CHIENWU_OCR_REMAIN_EASY.png'}) CHIENWU_OCR_REMAIN_EX = Button(area={'cn': (1086, 16, 1152, 44), 'en': (1086, 16, 1152, 44), 'jp': (1086, 16, 1152, 44), 'tw': (1086, 16, 1152, 44)}, color={'cn': (90, 39, 34), 'en': (90, 39, 34), 'jp': (90, 39, 34), 'tw': (90, 39, 34)}, button={'cn': (1086, 16, 1152, 44), 'en': (1086, 16, 1152, 44), 'jp': (1086, 16, 1152, 44), 'tw': (1086, 16, 1152, 44)}, file={'cn': './assets/cn/raid/CHIENWU_OCR_REMAIN_EX.png', 'en': './assets/cn/raid/CHIENWU_OCR_REMAIN_EX.png', 'jp': './assets/cn/raid/CHIENWU_OCR_REMAIN_EX.png', 'tw': './assets/cn/raid/CHIENWU_OCR_REMAIN_EX.png'}) diff --git a/module/raid/raid.py b/module/raid/raid.py index b4cd2391c..126247a9c 100644 --- a/module/raid/raid.py +++ b/module/raid/raid.py @@ -82,6 +82,8 @@ def raid_name_shorten(name): return "RPG" elif name == 'raid_20250116': return 'CHIENWU' + elif name == 'raid_20260212': + return 'CHANGWU' else: raise ScriptError(f'Unknown raid name: {name}') @@ -157,6 +159,11 @@ def raid_ocr(raid, mode): return Digit(button, letter=(247, 223, 222), threshold=128) else: return DigitCounter(button, letter=(0, 0, 0), threshold=128) + elif raid == 'CHANGWU': + if mode == 'ex': + return Digit(button, letter=(255, 239, 215), threshold=128) + else: + return DigitCounter(button, lang='cnocr', letter=(154, 148, 133), threshold=128) def pt_ocr(raid): @@ -186,6 +193,8 @@ def pt_ocr(raid): return HuanChangPtOcr(button, letter=(23, 20, 6), threshold=128) elif raid == 'CHIENWU': return Digit(button, letter=(255, 231, 231), threshold=128) + elif raid == 'CHANGWU': + return Digit(button, letter=(255, 239, 215), threshold=128) class Raid(MapOperation, RaidCombat, CampaignEvent): @@ -195,9 +204,7 @@ class Raid(MapOperation, RaidCombat, CampaignEvent): Game devs are too asshole to drop oil display for UI design https://github.com/LmeSzinc/AzurLaneAutoScript/issues/5214 """ - if self.config.Campaign_Event == 'raid_20240328': - return False - return True + return False def triggered_stop_condition(self, oil_check=False, pt_check=False, coin_check=False): """ diff --git a/module/ui/page.py b/module/ui/page.py index c3540ed50..2705a53a4 100644 --- a/module/ui/page.py +++ b/module/ui/page.py @@ -215,10 +215,16 @@ page_main.link(button=MAIN_GOTO_EVENT_LIST, destination=page_event_list) page_main_white.link(button=MAIN_GOTO_EVENT_LIST_WHITE, destination=page_event_list) # Raid +# before +# page_raid = Page(RAID_CHECK) +# page_raid.link(button=GOTO_MAIN, destination=page_main) +# page_main.link(button=MAIN_GOTO_RAID, destination=page_raid) +# page_main_white.link(button=MAIN_GOTO_RAID_WHITE, destination=page_raid) +# after 2026.02.12 page_raid = Page(RAID_CHECK) page_raid.link(button=GOTO_MAIN, destination=page_main) -page_main.link(button=MAIN_GOTO_RAID, destination=page_raid) -page_main_white.link(button=MAIN_GOTO_RAID_WHITE, destination=page_raid) +page_raid.link(button=BACK_ARROW, destination=page_campaign_menu) +page_campaign_menu.link(button=CAMPAIGN_MENU_GOTO_EVENT, destination=page_raid) # Dock page_dock = Page(DOCK_CHECK) diff --git a/module/ui/ui.py b/module/ui/ui.py index 49a61f0f1..92ec1a825 100644 --- a/module/ui/ui.py +++ b/module/ui/ui.py @@ -1,9 +1,7 @@ from module.base.button import Button from module.base.decorator import run_once from module.base.timer import Timer -from module.coalition.assets import NEONCITY_FLEET_PREPARATION, NEONCITY_PREPARATION_EXIT, DAL_DIFFICULTY_EXIT from module.combat.assets import GET_ITEMS_1, GET_ITEMS_2, GET_SHIP -from module.event_hospital.assets import HOSIPITAL_CLUE_CHECK, HOSPITAL_BATTLE_EXIT from module.exception import (GameNotRunningError, GamePageUnknownError, RequestHumanTakeover) from module.exercise.assets import EXERCISE_PREPARATION @@ -19,7 +17,7 @@ from module.ocr.ocr import Ocr from module.os_handler.assets import (AUTO_SEARCH_REWARD, EXCHANGE_CHECK, RESET_FLEET_PREPARATION, RESET_TICKET_POPUP) from module.raid.assets import * from module.ui.assets import * -from module.ui.page import Page, page_campaign, page_event, page_main, page_main_white, page_sp +from module.ui.page import Page, page_academy, page_campaign, page_event, page_main, page_main_white, page_sp from module.ui_white.assets import * @@ -39,6 +37,11 @@ class UI(InfoHandler): if self.appear(page_main.check_button, offset=(5, 5), interval=interval): return True return False + # shitty EN localization changing font width of ACADEMY title, + # check other buttons also + if self.config.SERVER == 'en' and page == page_academy: + if self.appear(ACADEMY_GOTO_MUNITIONS, offset=offset, interval=interval): + return True return self.appear(page.check_button, offset=offset, interval=interval) def is_in_main(self, offset=(30, 30), interval=0): @@ -551,8 +554,8 @@ class UI(InfoHandler): return True # RPG event (raid_20240328) - if self.appear_then_click(RPG_STATUS_POPUP, offset=(30, 30), interval=3): - return True + # if self.appear_then_click(RPG_STATUS_POPUP, offset=(30, 30), interval=3): + # return True # Hospital event (20250327) # if self.appear_then_click(HOSIPITAL_CLUE_CHECK, offset=(20, 20), interval=2): # return True @@ -560,10 +563,10 @@ class UI(InfoHandler): # return True # Neon city (coalition_20250626) # FASHION (coalition_20260122) reuse NEONCITY - if self.appear(NEONCITY_FLEET_PREPARATION, offset=(20, 20), interval=3): - logger.info(f'{NEONCITY_FLEET_PREPARATION} -> {NEONCITY_PREPARATION_EXIT}') - self.device.click(NEONCITY_PREPARATION_EXIT) - return True + # if self.appear(NEONCITY_FLEET_PREPARATION, offset=(20, 20), interval=3): + # logger.info(f'{NEONCITY_FLEET_PREPARATION} -> {NEONCITY_PREPARATION_EXIT}') + # self.device.click(NEONCITY_PREPARATION_EXIT) + # return True # DATE A LANE (coalition_20251120) # if self.appear_then_click(DAL_DIFFICULTY_EXIT, offset=(20, 20), interval=3): # return True