diff --git a/assets/cn/ui/BUILD_GOTO_RETIRE.png b/assets/cn/ui/BUILD_GOTO_RETIRE.png new file mode 100644 index 000000000..700421d16 Binary files /dev/null and b/assets/cn/ui/BUILD_GOTO_RETIRE.png differ diff --git a/module/smallevent/samllevent.py b/module/smallevent/samllevent.py index a589b4b07..eae47811a 100644 --- a/module/smallevent/samllevent.py +++ b/module/smallevent/samllevent.py @@ -164,7 +164,9 @@ class SmallEvent(UI): if "任意科技箱" in text: logger.info(f'resolve the task: 打开科技箱') from module.storage.storage import StorageHandler - StorageHandler(self.config).storage_disassemble_equipment(rarity=1, amount=1) + boxDisassemble = StorageHandler(self.config) + boxDisassemble.device.screenshot() + boxDisassemble.storage_disassemble_equipment(rarity=1, amount=1) return True if "舰船强化" in text: logger.info(f'resolve the task: 舰船强化') @@ -172,6 +174,7 @@ class SmallEvent(UI): from module.retire.retirement import Retirement self.ui_ensure(destination=page_dock) enhance = Retirement(self.config) + enhance.device.screenshot() enhance.handle_dock_cards_loading() total, remain = enhance._enhance_handler() if not total: @@ -180,7 +183,20 @@ class SmallEvent(UI): return True if "舰船退役" in text: logger.info(f'resolve the task: 舰船退役') - logger.info(f'afraid of ship retirement, skip it') + from module.retire.retirement import Retirement + from module.ui.page import page_retire + self.ui_ensure(destination=page_retire) + retire = Retirement(self.config) + retire.device.screenshot() + total = retire.retire_ships_one_click() + if not total: + logger.warning( + 'No ship retired, trying to reset dock filter and disable favourite, then retire again') + retire.dock_favourite_set(False, wait_loading=False) + retire.dock_filter_set() + total = retire.retire_ships_one_click() + if not total: + logger.critical('No ship retired') return True return False diff --git a/module/ui/assets.py b/module/ui/assets.py index 1d5845e98..6e25139e6 100644 --- a/module/ui/assets.py +++ b/module/ui/assets.py @@ -10,6 +10,7 @@ ACADEMY_GOTO_MUNITIONS = Button(area={'cn': (1046, 188, 1137, 210), 'en': (1039, BACK_ARROW = Button(area={'cn': (33, 44, 47, 64), 'en': (33, 44, 47, 64), 'jp': (33, 44, 47, 64), 'tw': (33, 44, 47, 64)}, color={'cn': (112, 118, 152), 'en': (112, 118, 152), 'jp': (112, 118, 152), 'tw': (112, 118, 152)}, button={'cn': (33, 31, 81, 78), 'en': (33, 31, 81, 78), 'jp': (33, 31, 81, 78), 'tw': (33, 31, 81, 78)}, file={'cn': './assets/cn/ui/BACK_ARROW.png', 'en': './assets/en/ui/BACK_ARROW.png', 'jp': './assets/jp/ui/BACK_ARROW.png', 'tw': './assets/tw/ui/BACK_ARROW.png'}) BATTLE_PASS_CHECK = Button(area={'cn': (701, 674, 723, 699), 'en': (701, 674, 723, 699), 'jp': (701, 674, 723, 699), 'tw': (701, 674, 723, 699)}, color={'cn': (129, 130, 134), 'en': (129, 130, 134), 'jp': (129, 130, 134), 'tw': (129, 130, 134)}, button={'cn': (701, 674, 723, 699), 'en': (701, 674, 723, 699), 'jp': (701, 674, 723, 699), 'tw': (701, 674, 723, 699)}, file={'cn': './assets/cn/ui/BATTLE_PASS_CHECK.png', 'en': './assets/en/ui/BATTLE_PASS_CHECK.png', 'jp': './assets/jp/ui/BATTLE_PASS_CHECK.png', 'tw': './assets/tw/ui/BATTLE_PASS_CHECK.png'}) BUILD_CHECK = Button(area={'cn': (121, 15, 175, 40), 'en': (112, 16, 183, 40), 'jp': (121, 15, 175, 40), 'tw': (116, 11, 179, 41)}, color={'cn': (163, 179, 215), 'en': (125, 138, 178), 'jp': (166, 180, 215), 'tw': (128, 142, 179)}, button={'cn': (121, 15, 175, 40), 'en': (112, 16, 183, 40), 'jp': (121, 15, 175, 40), 'tw': (116, 11, 179, 41)}, file={'cn': './assets/cn/ui/BUILD_CHECK.png', 'en': './assets/en/ui/BUILD_CHECK.png', 'jp': './assets/jp/ui/BUILD_CHECK.png', 'tw': './assets/tw/ui/BUILD_CHECK.png'}) +BUILD_GOTO_RETIRE = Button(area={'cn': (36, 449, 68, 476), 'en': (36, 449, 68, 476), 'jp': (36, 449, 68, 476), 'tw': (36, 449, 68, 476)}, color={'cn': (73, 81, 92), 'en': (73, 81, 92), 'jp': (73, 81, 92), 'tw': (73, 81, 92)}, button={'cn': (36, 449, 68, 476), 'en': (36, 449, 68, 476), 'jp': (36, 449, 68, 476), 'tw': (36, 449, 68, 476)}, file={'cn': './assets/cn/ui/BUILD_GOTO_RETIRE.png', 'en': './assets/cn/ui/BUILD_GOTO_RETIRE.png', 'jp': './assets/cn/ui/BUILD_GOTO_RETIRE.png', 'tw': './assets/cn/ui/BUILD_GOTO_RETIRE.png'}) CAMPAIGN_CHECK = Button(area={'cn': (173, 78, 194, 98), 'en': (136, 79, 183, 91), 'jp': (172, 77, 192, 98), 'tw': (173, 78, 194, 98)}, color={'cn': (165, 182, 221), 'en': (109, 126, 172), 'jp': (163, 181, 220), 'tw': (165, 182, 221)}, button={'cn': (173, 78, 194, 98), 'en': (136, 79, 183, 91), 'jp': (172, 77, 192, 98), 'tw': (173, 78, 194, 98)}, file={'cn': './assets/cn/ui/CAMPAIGN_CHECK.png', 'en': './assets/en/ui/CAMPAIGN_CHECK.gif', 'jp': './assets/jp/ui/CAMPAIGN_CHECK.png', 'tw': './assets/tw/ui/CAMPAIGN_CHECK.png'}) CAMPAIGN_GOTO_DAILY = Button(area={'cn': (804, 648, 892, 703), 'en': (807, 648, 891, 703), 'jp': (791, 647, 893, 703), 'tw': (804, 648, 892, 703)}, color={'cn': (189, 145, 78), 'en': (165, 123, 54), 'jp': (176, 141, 73), 'tw': (189, 145, 78)}, button={'cn': (804, 648, 892, 703), 'en': (807, 648, 891, 703), 'jp': (791, 647, 893, 703), 'tw': (804, 648, 892, 703)}, file={'cn': './assets/cn/ui/CAMPAIGN_GOTO_DAILY.png', 'en': './assets/en/ui/CAMPAIGN_GOTO_DAILY.png', 'jp': './assets/jp/ui/CAMPAIGN_GOTO_DAILY.png', 'tw': './assets/tw/ui/CAMPAIGN_GOTO_DAILY.png'}) CAMPAIGN_GOTO_EVENT = Button(area={'cn': (173, 78, 194, 98), 'en': (129, 79, 186, 91), 'jp': (172, 77, 192, 98), 'tw': (173, 78, 194, 98)}, color={'cn': (165, 182, 221), 'en': (112, 130, 175), 'jp': (163, 181, 220), 'tw': (165, 182, 221)}, button={'cn': (1178, 171, 1230, 223), 'en': (1171, 164, 1237, 216), 'jp': (1178, 168, 1228, 217), 'tw': (1178, 171, 1230, 223)}, file={'cn': './assets/cn/ui/CAMPAIGN_GOTO_EVENT.png', 'en': './assets/en/ui/CAMPAIGN_GOTO_EVENT.png', 'jp': './assets/jp/ui/CAMPAIGN_GOTO_EVENT.png', 'tw': './assets/tw/ui/CAMPAIGN_GOTO_EVENT.png'}) diff --git a/module/ui/page.py b/module/ui/page.py index 814c2e825..fbc1e5cf7 100644 --- a/module/ui/page.py +++ b/module/ui/page.py @@ -4,7 +4,7 @@ from module.coalition.assets import * from module.event_hospital.assets import HOSIPITAL_CHECK from module.freebies.assets import MAIL_ENTER from module.raid.assets import * -from module.retire.assets import DOCK_CHECK +from module.retire.assets import DOCK_CHECK,IN_RETIREMENT_CHECK from module.ui.assets import * from module.ui_white.assets import * from module.ship_ir.assets import HANDBOOK_CHECK,MAIN_GOTO_COLLECTION,MAIN_GOTO_COLLECTION_WHITE,COLLECTION_CHECK,COLLECTION_GOTO_HANDBOOK @@ -316,6 +316,11 @@ page_build.link(button=GOTO_MAIN, destination=page_main) page_main.link(button=MAIN_GOTO_BUILD, destination=page_build) page_main_white.link(button=MAIN_GOTO_BUILD_WHITE, destination=page_build) +#Retire +page_retire = Page(IN_RETIREMENT_CHECK) +page_retire.link(button=GOTO_MAIN, destination=page_main) +page_build.link(button=BUILD_GOTO_RETIRE, destination=page_retire) + # Mail page_mail = Page(MAIL_CHECK) page_mail.link(button=GOTO_MAIN_WHITE, destination=page_main)