sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-04-08 13:44:19 +08:00
Code 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
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)): if self.appear(DORM_FURNITURE_DETAILS_QUIT, offset=(20, 20)):
break break
if self.ui_additional(): if self.ui_additional(get_ship=False):
self.interval_clear(DORM_CHECK) self.interval_clear(DORM_CHECK)
continue 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): if self.appear_then_click(DORM_MANAGE, offset=(20, 20), interval=3):
continue continue
# Handle all popups # Handle all popups
if self.ui_additional(): if self.ui_additional(get_ship=False):
continue continue
if self.appear_then_click(DORM_FURNITURE_CONFIRM, offset=(30, 30), interval=3): if self.appear_then_click(DORM_FURNITURE_CONFIRM, offset=(30, 30), interval=3):
continue continue
@@ -263,7 +263,7 @@ class RewardDorm(UI):
self.device.screenshot() self.device.screenshot()
# Handle all popups # Handle all popups
if self.ui_additional(): if self.ui_additional(get_ship=False):
continue continue
# Collect coins and loves through the quick collect button # 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)): if self.appear(DORM_FEED_CHECK, offset=(20, 20)):
break break
if self.ui_additional(): if self.ui_additional(get_ship=False):
self.interval_clear(DORM_CHECK) self.interval_clear(DORM_CHECK)
continue continue
if self.appear(DORM_CHECK, offset=(20, 20), interval=5): if self.appear(DORM_CHECK, offset=(20, 20), interval=5):
@@ -465,7 +465,7 @@ class RewardDorm(UI):
if self.handle_popup_cancel('DORM_FEED'): if self.handle_popup_cancel('DORM_FEED'):
self.interval_clear(DORM_CHECK) self.interval_clear(DORM_CHECK)
continue continue
if self.ui_additional(): if self.ui_additional(get_ship=False):
self.interval_clear(DORM_CHECK) self.interval_clear(DORM_CHECK)
continue continue
@@ -526,7 +526,7 @@ class RewardDorm(UI):
if self.appear_then_click(DORM_FURNITURE_CONFIRM, offset=(30, 30), interval=3): if self.appear_then_click(DORM_FURNITURE_CONFIRM, offset=(30, 30), interval=3):
timeout.reset() timeout.reset()
continue continue
if self.ui_additional(): if self.ui_additional(get_ship=False):
timeout.reset() timeout.reset()
continue continue

4
module/ui/ui.py
View File

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