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

Fix: _dorm_receive handle stacked popups, may occur if ui_ensure did not handle

Browse Source
This commit is contained in:
nEEtdo0d
2021-10-16 19:57:17 -04:00
parent 7a89e26f87
commit c31366cb73
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
module/reward/dorm.py
View File

@@ -102,20 +102,20 @@ class RewardDorm(UI):
self.device.minitouch_send() self.device.minitouch_send()
# Collect # Collect
for n in range(3): _dorm_receive_attempt = 0
while 1:
self.device.screenshot() self.device.screenshot()
# Close trophies info
if self.appear(DORM_TROPHY_CONFIRM, offset=(30, 30)):
self.ui_click(DORM_TROPHY_CONFIRM, check_button=DORM_CHECK, skip_first_screenshot=True)
self.device.screenshot()
# Close DORM_INFO. Usually, it was handled in ui_ensure(), but sometimes not.
if self.appear(DORM_INFO, offset=(30, 30)):
self.ui_click(DORM_INFO, check_button=DORM_CHECK, skip_first_screenshot=True)
self.device.screenshot()
if self._dorm_receive_click(): # Handle page_dorm popups
self.ensure_no_info_bar() if self.ui_additional_page_dorm():
continue continue
# End
# - If max _dorm_receive_attempt (3+) reached
# - If _dorm_receive_click returns 0 (no coins/loves clicked)
if _dorm_receive_attempt < 3 and self._dorm_receive_click():
self.ensure_no_info_bar()
_dorm_receive_attempt += 1
else: else:
break break
@@ -238,7 +238,7 @@ class RewardDorm(UI):
if feed: if feed:
self.ui_click(click_button=DORM_FEED_ENTER, appear_button=DORM_CHECK, check_button=DORM_FEED_CHECK, self.ui_click(click_button=DORM_FEED_ENTER, appear_button=DORM_CHECK, check_button=DORM_FEED_CHECK,
skip_first_screenshot=True) additional=self.ui_additional_page_dorm, skip_first_screenshot=True)
self._dorm_feed() self._dorm_feed()
self.ui_click(click_button=DORM_FEED_ENTER, appear_button=DORM_FEED_CHECK, check_button=DORM_CHECK, self.ui_click(click_button=DORM_FEED_ENTER, appear_button=DORM_FEED_CHECK, check_button=DORM_CHECK,
skip_first_screenshot=True) skip_first_screenshot=True)