sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-22 11:43:44 +08:00
Code Activity

Fix: Detection of DAILY_ENTER_CHECK on android

Browse Source
This commit is contained in:
LmeSzinc
2022-02-07 17:57:58 +08:00
parent 1916d8b1e1
commit 0d9c256916
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
module/daily/daily.py
View File

@@ -110,12 +110,12 @@ class Daily(Combat, DailyEquipment):
logger.info(f'remain={remain}, stage={stage}, fleet={fleet}') logger.info(f'remain={remain}, stage={stage}, fleet={fleet}')
def daily_enter_check(): def daily_enter_check():
return self.appear(DAILY_ENTER_CHECK) return self.appear(DAILY_ENTER_CHECK, threshold=30)
def daily_end(): def daily_end():
if self.appear(BATTLE_PREPARATION, interval=2): if self.appear(BATTLE_PREPARATION, interval=2):
self.device.click(BACK_ARROW) self.device.click(BACK_ARROW)
return self.appear(DAILY_ENTER_CHECK) or self.appear(BACK_ARROW) return self.appear(DAILY_ENTER_CHECK, threshold=30) or self.appear(BACK_ARROW)
self.ui_click(click_button=DAILY_ENTER, check_button=daily_enter_check, appear_button=DAILY_CHECK, self.ui_click(click_button=DAILY_ENTER, check_button=daily_enter_check, appear_button=DAILY_CHECK,
skip_first_screenshot=True) skip_first_screenshot=True)
@@ -165,7 +165,7 @@ class Daily(Combat, DailyEquipment):
else: else:
self.device.screenshot() self.device.screenshot()
if self.appear(DAILY_ENTER_CHECK, interval=5): if self.appear(DAILY_ENTER_CHECK, threshold=30, interval=5):
self.device.click(button) self.device.click(button)
continue continue
if self.handle_get_items(): if self.handle_get_items():
@@ -190,7 +190,7 @@ class Daily(Combat, DailyEquipment):
return False return False
if self.info_bar_count(): if self.info_bar_count():
return False return False
if self.appear(DAILY_ENTER_CHECK): if self.appear(DAILY_ENTER_CHECK, threshold=30):
if self.info_bar_count(): if self.info_bar_count():
return False return False
if self.combat_appear(): if self.combat_appear():