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

Opt: Daily can also trigger guild pop up, cancel when encountered

Browse Source 
Fix: During campaign, may enter this method too early resulting
in stuck status. Allow method to detect for guild pop up as well
This commit is contained in:
nEEtdo0d
2021-01-26 14:43:16 -05:00
parent bb9ebc524e
commit b4dd5b2d96
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
module/daily/daily.py
View File

@@ -85,6 +85,7 @@ class Daily(Reward, DailyEquipment):
self.ui_ensure_index(fleet, letter=OCR_DAILY_FLEET_INDEX, prev_button=DAILY_FLEET_PREV, self.ui_ensure_index(fleet, letter=OCR_DAILY_FLEET_INDEX, prev_button=DAILY_FLEET_PREV,
next_button=DAILY_FLEET_NEXT, fast=False, skip_first_screenshot=True) next_button=DAILY_FLEET_NEXT, fast=False, skip_first_screenshot=True)
self.combat(emotion_reduce=False, save_get_items=False, expected_end=daily_end, balance_hp=False) self.combat(emotion_reduce=False, save_get_items=False, expected_end=daily_end, balance_hp=False)
self.combat_status(save_get_items=False, expected_end=daily_end)
self.ui_click(click_button=BACK_ARROW, check_button=DAILY_CHECK) self.ui_click(click_button=BACK_ARROW, check_button=DAILY_CHECK)
self.device.sleep((1, 1.2)) self.device.sleep((1, 1.2))

6
module/handler/enemy_searching.py
View File

@@ -89,6 +89,12 @@ class EnemySearchingHandler(InfoHandler):
timeout.limit = 10 timeout.limit = 10
timeout.reset() timeout.reset()
if self.handle_guild_popup_cancel():
self.config.GUILD_POPUP_TRIGGERED = True
timeout.limit = 10
timeout.reset()
continue
# End # End
if self.enemy_searching_appear(): if self.enemy_searching_appear():
appeared = True appeared = True