sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-22 15:13:45 +08:00
Code Activity

Fix: Handle empty mail list (#4011)

Browse Source
This commit is contained in:
LmeSzinc
2024-07-20 05:40:00 +08:00
parent 11e3580c61
commit 0fe1479a27
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
module/freebies/mail_white.py
View File

@@ -1,4 +1,5 @@
from module.base.decorator import cached_property from module.base.decorator import cached_property
from module.base.timer import Timer
from module.combat.assets import GET_ITEMS_1, GET_ITEMS_2 from module.combat.assets import GET_ITEMS_1, GET_ITEMS_2
from module.freebies.assets import * from module.freebies.assets import *
from module.logger import logger from module.logger import logger
@@ -28,6 +29,9 @@ class MailWhite(UI):
def _mail_enter(self, skip_first_screenshot=True): def _mail_enter(self, skip_first_screenshot=True):
""" """
Returns:
int: If having mails
Page: Page:
in: page_main_white or MAIL_MANAGE in: page_main_white or MAIL_MANAGE
out: MAIL_BATCH_CLAIM out: MAIL_BATCH_CLAIM
@@ -36,6 +40,7 @@ class MailWhite(UI):
self.interval_clear([ self.interval_clear([
MAIL_MANAGE MAIL_MANAGE
]) ])
timeout = Timer(0.6, count=1)
while 1: while 1:
if skip_first_screenshot: if skip_first_screenshot:
skip_first_screenshot = False skip_first_screenshot = False
@@ -45,7 +50,12 @@ class MailWhite(UI):
# End # End
if self.appear(MAIL_BATCH_CLAIM, offset=(20, 20)): if self.appear(MAIL_BATCH_CLAIM, offset=(20, 20)):
logger.info('Mail entered') logger.info('Mail entered')
break return True
if self.appear(GOTO_MAIN_WHITE, offset=(20, 20)):
timeout.start()
if timeout.reached():
logger.info('Mail empty')
return False
# Click # Click
if self.appear_then_click(MAIL_MANAGE, offset=(30, 30), interval=3): if self.appear_then_click(MAIL_MANAGE, offset=(30, 30), interval=3):
@@ -186,6 +196,9 @@ class MailWhite(UI):
in: page_main_white or MAIL_MANAGE in: page_main_white or MAIL_MANAGE
out: MAIL_BATCH_CLAIM out: MAIL_BATCH_CLAIM
""" """
if not self._mail_enter():
return
if merit: if merit:
logger.hr('Mail merit', level=2) logger.hr('Mail merit', level=2)
self._mail_enter() self._mail_enter()