ReDawn/M-AzurLaneAutoScript
1
0
Fork 0
mirror of https://github.com/W1NDes/M-AzurLaneAutoScript.git synced 2026-05-14 07:08:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Upd(Coalition): upd stage increase

Browse Source
This commit is contained in:
W1NDes 2025-11-23 21:14:29 +08:00
parent bc2bbb72cc
commit c13dcef46a
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/cn/coalition/COALITION_FLEET_1_CHOOSE.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.8 KiB

After

Width:  |  Height:  |  Size: 10 KiB

2
module/coalition/assets.py
View File

@ -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'})

6
module/coalition/coalition.py
View File

@ -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()

3
module/coalition/ui.py
View File

@ -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