sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-25 02:30:09 +08:00
Code Activity

Fix: Handle automation confirm in ash combat (#387)

Browse Source
This commit is contained in:
LmeSzinc
2021-03-20 19:19:06 +08:00
parent 55f35398ab
commit 54832ce5a9
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
module/os_ash/ash.py
View File

@@ -134,7 +134,8 @@ class OSAsh(UI):
break break
self._ash_beacon_select(tier=self.config.OS_ASH_ASSIST_TIER) self._ash_beacon_select(tier=self.config.OS_ASH_ASSIST_TIER)
self.ui_click(ASH_START, check_button=BATTLE_PREPARATION, offset=(30, 30), skip_first_screenshot=True) self.ui_click(ASH_START, check_button=BATTLE_PREPARATION, offset=(30, 30),
additional=ash_combat.handle_combat_automation_confirm, skip_first_screenshot=True)
ash_combat.combat(expected_end=self.is_in_ash) ash_combat.combat(expected_end=self.is_in_ash)
continue continue
@@ -265,7 +266,8 @@ class OSAsh(UI):
if self._handle_ash_beacon_reward(): if self._handle_ash_beacon_reward():
continue continue
if self.appear(ASH_START, offset=(30, 30)): if self.appear(ASH_START, offset=(30, 30)):
self.ui_click(ASH_START, check_button=BATTLE_PREPARATION, offset=(30, 30), skip_first_screenshot=True) self.ui_click(ASH_START, check_button=BATTLE_PREPARATION, offset=(30, 30),
additional=ash_combat.handle_combat_automation_confirm, skip_first_screenshot=True)
ash_combat.combat(expected_end=self.is_in_ash) ash_combat.combat(expected_end=self.is_in_ash)
continue continue