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

Opt: Reuse screenshots in dorm_view_reset()

Browse Source
This commit is contained in:
LmeSzinc
2024-04-03 23:50:35 +08:00
parent 894e0c4c82
commit dd3d26d97e
1 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
module/dorm/dorm.py
View File

@@ -158,29 +158,42 @@ class RewardDorm(UI):
Use Dorm manage and Back to reset dorm view. Use Dorm manage and Back to reset dorm view.
Pages: Pages:
in: page_dorm, without info_bar in: page_dorm
out: page_dorm, without info_bar out: page_dorm
""" """
logger.info('Dorm view reset')
while 1: while 1:
if skip_first_screenshot: if skip_first_screenshot:
skip_first_screenshot = False skip_first_screenshot = False
else: else:
self.device.screenshot() self.device.screenshot()
# End
if self.appear(DORM_MANAGE_CHECK, offset=(20, 20)): if self.appear(DORM_MANAGE_CHECK, offset=(20, 20)):
break break
if self.appear(DORM_FEED_ENTER, offset=(20, 20), interval=5): if self.appear(DORM_FEED_ENTER, offset=(20, 20), interval=3):
self.device.click(DORM_MANAGE) self.device.click(DORM_MANAGE)
continue
# Handle all popups
if self.ui_additional():
continue
if self.appear_then_click(DORM_FURNITURE_CONFIRM, offset=(30, 30), interval=3):
continue
skip_first_screenshot = True
while 1: while 1:
self.device.screenshot() if skip_first_screenshot:
skip_first_screenshot = False
else:
self.device.screenshot()
if self.appear(DORM_FEED_ENTER, offset=(20, 20)): if self.appear(DORM_FEED_ENTER, offset=(20, 20)):
break break
if self.appear(DORM_MANAGE_CHECK, offset=(20, 20), interval=5): if self.appear(DORM_MANAGE_CHECK, offset=(20, 20), interval=3):
self.device.click(DORM_FURNITURE_SHOP_QUIT) self.device.click(DORM_FURNITURE_SHOP_QUIT)
continue
def dorm_collect(self): def dorm_collect(self):
""" """
@@ -193,7 +206,7 @@ class RewardDorm(UI):
out: page_dorm, without info_bar out: page_dorm, without info_bar
""" """
logger.hr('Dorm collect') logger.hr('Dorm collect')
self.dorm_view_reset() self.dorm_view_reset()
# Collect # Collect
@@ -531,7 +544,7 @@ class RewardDorm(UI):
self.config.Scheduler_Enable = False self.config.Scheduler_Enable = False
self.config.task_stop() self.config.task_stop()
self.dorm_run(feed=self.config.Dorm_Feed, self.dorm_run(feed=self.config.Dorm_Feed,
collect=self.config.Dorm_Collect, collect=self.config.Dorm_Collect,
buy_furniture=self.config.BuyFurniture_Enable) buy_furniture=self.config.BuyFurniture_Enable)