From e2b7590bc837eb504e4c5c52af3a9009fd2e2ba4 Mon Sep 17 00:00:00 2001 From: guoh064 <50830808+guoh064@users.noreply.github.com> Date: Fri, 25 Apr 2025 01:00:21 +0900 Subject: [PATCH] Opt: allow entering page_mail from page_main (#4752) --- module/freebies/mail_white.py | 4 ++-- module/ui/page.py | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/module/freebies/mail_white.py b/module/freebies/mail_white.py index 7a4f495fc..2a953c57c 100644 --- a/module/freebies/mail_white.py +++ b/module/freebies/mail_white.py @@ -262,8 +262,8 @@ class MailWhite(UI): logger.info('At page_main_white') pass elif self.appear(page_main.check_button, offset=(5, 5)): - logger.warning('At page_main, cannot enter mail page from old UI') - return False + logger.info('At page_main') + pass else: logger.warning('Unknown page_main, cannot enter mail page') return False diff --git a/module/ui/page.py b/module/ui/page.py index f722629b2..8b387fe9e 100644 --- a/module/ui/page.py +++ b/module/ui/page.py @@ -2,6 +2,7 @@ import traceback 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.ui.assets import * @@ -294,6 +295,7 @@ page_mail = Page(MAIL_CHECK) page_mail.link(button=GOTO_MAIN_WHITE, destination=page_main) # Mail enter varies from different UI page_main_white.link(button=MAIL_ENTER_WHITE, destination=page_mail) +page_main.link(button=MAIL_ENTER, destination=page_mail) # World channel # Both old and new UI have CHANNEL_CHECK