sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-04-16 03:29:53 +08:00
Code Activity

Fix: Handle GET_ITEMS when exiting from meow chore (#912)

Browse Source
This commit is contained in:
LmeSzinc
2022-01-30 17:23:43 +08:00
parent 2a09605eb6
commit 4937e5b773
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
module/meowfficer/meowfficer.py
View File

@@ -286,8 +286,9 @@ class RewardMeowfficer(UI):
in: MEOWFFICER_FORT in: MEOWFFICER_FORT
out: MEOWFFICER_FORT out: MEOWFFICER_FORT
""" """
self.interval_clear(GET_ITEMS_1)
check_timer = Timer(1, count=2) check_timer = Timer(1, count=2)
confirm_timer = Timer(1.5, count=3).start() confirm_timer = Timer(1.5, count=4).start()
while 1: while 1:
if skip_first_screenshot: if skip_first_screenshot:
skip_first_screenshot = False skip_first_screenshot = False
@@ -300,7 +301,7 @@ class RewardMeowfficer(UI):
confirm_timer.reset() confirm_timer.reset()
continue continue
if self.appear(GET_ITEMS_1, interval=5): if self.appear(GET_ITEMS_1, offset=5, interval=3):
self.device.click(MEOWFFICER_FORT_CHECK) self.device.click(MEOWFFICER_FORT_CHECK)
check_timer.reset() check_timer.reset()
confirm_timer.reset() confirm_timer.reset()
@@ -344,8 +345,14 @@ class RewardMeowfficer(UI):
self.meow_chores() self.meow_chores()
# Exit back into page_meowfficer # Exit back into page_meowfficer
def additional():
if self.appear_then_click(GET_ITEMS_1, offset=5, interval=3):
return True
return False
self.ui_click(MEOWFFICER_GOTO_DORM, self.ui_click(MEOWFFICER_GOTO_DORM,
check_button=MEOWFFICER_FORT_ENTER, appear_button=MEOWFFICER_FORT_CHECK, offset=None) check_button=MEOWFFICER_FORT_ENTER, appear_button=MEOWFFICER_FORT_CHECK,
additional=additional, offset=None, skip_first_screenshot=True)
return True return True