From c13dcef46ae62d1d46fb68b5576df28e761da13e Mon Sep 17 00:00:00 2001 From: W1NDes Date: Sun, 23 Nov 2025 21:14:29 +0800 Subject: [PATCH] Upd(Coalition): upd stage increase --- .../cn/coalition/COALITION_FLEET_1_CHOOSE.png | Bin 9011 -> 10268 bytes module/coalition/assets.py | 2 +- module/coalition/coalition.py | 6 +++--- module/coalition/ui.py | 3 ++- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/assets/cn/coalition/COALITION_FLEET_1_CHOOSE.png b/assets/cn/coalition/COALITION_FLEET_1_CHOOSE.png index 949deced5c45173bf77e7cebded168e27c1bad1e..38961bb041e2bf383b3af1838a7c5df80f4f80bf 100644 GIT binary patch literal 10268 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 BHuwMl diff --git a/module/coalition/assets.py b/module/coalition/assets.py index 3e77100fc..e0d22c846 100644 --- a/module/coalition/assets.py +++ b/module/coalition/assets.py @@ -20,7 +20,7 @@ COALITION_ACADEMY_CAMPAIGN_CHECK = Button(area={'cn': (131, 50, 168, 83), 'en': COALITION_ACADEMY_GOTO_CAMPAIGN = Button(area={'cn': (1123, 615, 1159, 651), 'en': (1123, 615, 1159, 651), 'jp': (1123, 615, 1159, 651), 'tw': (1123, 615, 1159, 651)}, color={'cn': (160, 134, 93), 'en': (160, 134, 93), 'jp': (160, 134, 93), 'tw': (160, 134, 93)}, button={'cn': (1123, 615, 1159, 651), 'en': (1123, 615, 1159, 651), 'jp': (1123, 615, 1159, 651), 'tw': (1123, 615, 1159, 651)}, file={'cn': './assets/cn/coalition/COALITION_ACADEMY_GOTO_CAMPAIGN.png', 'en': './assets/en/coalition/COALITION_ACADEMY_GOTO_CAMPAIGN.png', 'jp': './assets/jp/coalition/COALITION_ACADEMY_GOTO_CAMPAIGN.png', 'tw': './assets/tw/coalition/COALITION_ACADEMY_GOTO_CAMPAIGN.png'}) COALITION_ACADEMY_HOME = Button(area={'cn': (1221, 48, 1244, 73), 'en': (1221, 48, 1244, 73), 'jp': (1221, 48, 1244, 73), 'tw': (1221, 48, 1244, 73)}, color={'cn': (182, 197, 203), 'en': (182, 197, 203), 'jp': (182, 197, 203), 'tw': (182, 197, 203)}, button={'cn': (1221, 48, 1244, 73), 'en': (1221, 48, 1244, 73), 'jp': (1221, 48, 1244, 73), 'tw': (1221, 48, 1244, 73)}, file={'cn': './assets/cn/coalition/COALITION_ACADEMY_HOME.png', 'en': './assets/en/coalition/COALITION_ACADEMY_HOME.png', 'jp': './assets/jp/coalition/COALITION_ACADEMY_HOME.png', 'tw': './assets/tw/coalition/COALITION_ACADEMY_HOME.png'}) COALITION_ACADEMY_MAIN_CHECK = Button(area={'cn': (132, 57, 163, 92), 'en': (164, 57, 221, 78), 'jp': (112, 44, 145, 86), 'tw': (346, 48, 427, 89)}, color={'cn': (143, 202, 205), 'en': (205, 189, 166), 'jp': (142, 155, 153), 'tw': (178, 145, 124)}, button={'cn': (132, 57, 163, 92), 'en': (164, 57, 221, 78), 'jp': (112, 44, 145, 86), 'tw': (346, 48, 427, 89)}, file={'cn': './assets/cn/coalition/COALITION_ACADEMY_MAIN_CHECK.png', 'en': './assets/en/coalition/COALITION_ACADEMY_MAIN_CHECK.png', 'jp': './assets/jp/coalition/COALITION_ACADEMY_MAIN_CHECK.png', 'tw': './assets/tw/coalition/COALITION_ACADEMY_MAIN_CHECK.png'}) -COALITION_FLEET_1_CHOOSE = Button(area={'cn': (795, 209, 850, 258), 'en': (795, 209, 850, 258), 'jp': (795, 209, 850, 258), 'tw': (795, 209, 850, 258)}, color={'cn': (205, 161, 101), 'en': (205, 161, 101), 'jp': (205, 161, 101), 'tw': (205, 161, 101)}, button={'cn': (795, 209, 850, 258), 'en': (795, 209, 850, 258), 'jp': (795, 209, 850, 258), 'tw': (795, 209, 850, 258)}, file={'cn': './assets/cn/coalition/COALITION_FLEET_1_CHOOSE.png', 'en': './assets/cn/coalition/COALITION_FLEET_1_CHOOSE.png', 'jp': './assets/cn/coalition/COALITION_FLEET_1_CHOOSE.png', 'tw': './assets/cn/coalition/COALITION_FLEET_1_CHOOSE.png'}) +COALITION_FLEET_1_CHOOSE = Button(area={'cn': (741, 214, 788, 258), 'en': (741, 214, 788, 258), 'jp': (741, 214, 788, 258), 'tw': (741, 214, 788, 258)}, color={'cn': (208, 167, 107), 'en': (208, 167, 107), 'jp': (208, 167, 107), 'tw': (208, 167, 107)}, button={'cn': (741, 214, 788, 258), 'en': (741, 214, 788, 258), 'jp': (741, 214, 788, 258), 'tw': (741, 214, 788, 258)}, file={'cn': './assets/cn/coalition/COALITION_FLEET_1_CHOOSE.png', 'en': './assets/cn/coalition/COALITION_FLEET_1_CHOOSE.png', 'jp': './assets/cn/coalition/COALITION_FLEET_1_CHOOSE.png', 'tw': './assets/cn/coalition/COALITION_FLEET_1_CHOOSE.png'}) COALITION_FLEET_1_IN_USE = Button(area={'cn': (252, 200, 320, 267), 'en': (252, 200, 320, 267), 'jp': (252, 200, 320, 267), 'tw': (252, 200, 320, 267)}, color={'cn': (192, 174, 165), 'en': (192, 174, 165), 'jp': (192, 174, 165), 'tw': (192, 174, 165)}, button={'cn': (252, 200, 320, 267), 'en': (252, 200, 320, 267), 'jp': (252, 200, 320, 267), 'tw': (252, 200, 320, 267)}, file={'cn': './assets/cn/coalition/COALITION_FLEET_1_IN_USE.png', 'en': './assets/cn/coalition/COALITION_FLEET_1_IN_USE.png', 'jp': './assets/cn/coalition/COALITION_FLEET_1_IN_USE.png', 'tw': './assets/cn/coalition/COALITION_FLEET_1_IN_USE.png'}) COALITION_LOW_EMOTION = Button(area={'cn': (848, 305, 934, 338), 'en': (848, 305, 934, 338), 'jp': (848, 305, 934, 338), 'tw': (848, 305, 934, 338)}, color={'cn': (76, 77, 83), 'en': (76, 77, 83), 'jp': (76, 77, 83), 'tw': (76, 77, 83)}, button={'cn': (848, 305, 934, 338), 'en': (848, 305, 934, 338), 'jp': (848, 305, 934, 338), 'tw': (848, 305, 934, 338)}, file={'cn': './assets/cn/coalition/COALITION_LOW_EMOTION.png', 'en': './assets/cn/coalition/COALITION_LOW_EMOTION.png', 'jp': './assets/cn/coalition/COALITION_LOW_EMOTION.png', 'tw': './assets/cn/coalition/COALITION_LOW_EMOTION.png'}) COALITION_REWARD_CONFIRM = Button(area={'cn': (814, 611, 877, 637), 'en': (788, 612, 902, 634), 'jp': (814, 611, 876, 637), 'tw': (814, 611, 877, 637)}, color={'cn': (155, 186, 227), 'en': (162, 189, 226), 'jp': (143, 176, 219), 'tw': (150, 181, 221)}, button={'cn': (814, 611, 877, 637), 'en': (788, 612, 902, 634), 'jp': (814, 611, 876, 637), 'tw': (814, 611, 877, 637)}, file={'cn': './assets/cn/coalition/COALITION_REWARD_CONFIRM.png', 'en': './assets/en/coalition/COALITION_REWARD_CONFIRM.png', 'jp': './assets/jp/coalition/COALITION_REWARD_CONFIRM.png', 'tw': './assets/tw/coalition/COALITION_REWARD_CONFIRM.png'}) diff --git a/module/coalition/coalition.py b/module/coalition/coalition.py index ed3bf4c4b..13eac6eeb 100644 --- a/module/coalition/coalition.py +++ b/module/coalition/coalition.py @@ -215,9 +215,9 @@ class Coalition(CoalitionCombat, CampaignEvent): # UI switches if self.config.SERVER in ['tw']: - self.ui_goto(page_campaign_menu) - if self.triggered_stop_condition(oil_check=True): - break + self.ui_goto(page_campaign_menu) + if self.triggered_stop_condition(oil_check=True): + break self.device.stuck_record_clear() self.device.click_record_clear() self.ui_goto_coalition() diff --git a/module/coalition/ui.py b/module/coalition/ui.py index 3a4a073e5..6ade5354a 100644 --- a/module/coalition/ui.py +++ b/module/coalition/ui.py @@ -299,7 +299,8 @@ class CoalitionUI(Combat): # Stage sequence for coalition_20230323 event 'coalition_20230323': ['tc1', 'tc2', 'tc3'], # Stage sequence for coalition_20240627 event - 'coalition_20240627': ['easy', 'normal', 'hard'] + 'coalition_20240627': ['easy', 'normal', 'hard'], + 'coalition_20251120': ['area1-normal', 'area2-normal', 'area3-normal', 'area4-normal', 'area5-normal', 'area6-normal','area6-hard'] } # Find which list contains the current stage