WindyMadman/AzurLaneAutoScript
1
0
Fork 0
mirror of https://github.com/LmeSzinc/AzurLaneAutoScript.git synced 2025-01-07 07:47:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Subpress get_ship in dorm (#4488)

Browse Source
This commit is contained in:
LmeSzinc 2025-01-04 22:44:56 +08:00
parent b72095e39f
commit 0052dc470f
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
module/dorm/buy_furniture.py
View File

@ -56,7 +56,7 @@ class BuyFurniture(UI):
if self.appear(DORM_FURNITURE_DETAILS_QUIT, offset=(20, 20)):
break
if self.ui_additional():
if self.ui_additional(get_ship=False):
self.interval_clear(DORM_CHECK)
continue

10
module/dorm/dorm.py
View File

@ -221,7 +221,7 @@ class RewardDorm(UI):
if self.appear_then_click(DORM_MANAGE, offset=(20, 20), interval=3):
continue
# Handle all popups
if self.ui_additional():
if self.ui_additional(get_ship=False):
continue
if self.appear_then_click(DORM_FURNITURE_CONFIRM, offset=(30, 30), interval=3):
continue
@ -263,7 +263,7 @@ class RewardDorm(UI):
self.device.screenshot()
# Handle all popups
if self.ui_additional():
if self.ui_additional(get_ship=False):
continue
# Collect coins and loves through the quick collect button
@ -423,7 +423,7 @@ class RewardDorm(UI):
if self.appear(DORM_FEED_CHECK, offset=(20, 20)):
break
if self.ui_additional():
if self.ui_additional(get_ship=False):
self.interval_clear(DORM_CHECK)
continue
if self.appear(DORM_CHECK, offset=(20, 20), interval=5):
@ -465,7 +465,7 @@ class RewardDorm(UI):
if self.handle_popup_cancel('DORM_FEED'):
self.interval_clear(DORM_CHECK)
continue
if self.ui_additional():
if self.ui_additional(get_ship=False):
self.interval_clear(DORM_CHECK)
continue
@ -526,7 +526,7 @@ class RewardDorm(UI):
if self.appear_then_click(DORM_FURNITURE_CONFIRM, offset=(30, 30), interval=3):
timeout.reset()
continue
if self.ui_additional():
if self.ui_additional(get_ship=False):
timeout.reset()
continue

4
module/ui/ui.py
View File

@ -451,7 +451,7 @@ class UI(InfoHandler):
return False
def ui_additional(self):
def ui_additional(self, get_ship=True):
"""
Handle all annoying popups during UI switching.
"""
@ -468,7 +468,7 @@ class UI(InfoHandler):
return True
# Popups appear at page_main, page_reward
if self.ui_page_main_popups():
if self.ui_page_main_popups(get_ship=get_ship):
return True
# Story