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

Upd: AUTOMATION_CONFIRM

Browse Source
This commit is contained in:
LmeSzinc
2022-08-20 23:28:15 +08:00
parent 9f2defedfb
commit ea28a0cb65
6 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
module/combat/combat.py
View File

@@ -84,8 +84,8 @@ class Combat(Level, HPBalancer, Retirement, SubmarineCall, CombatAuto, CombatMan
self.wait_until_stable(COMBAT_OIL_LOADING)
def handle_combat_automation_confirm(self):
if self.appear(AUTOMATION_CONFIRM_CHECK, interval=1):
self.appear_then_click(AUTOMATION_CONFIRM, offset=True)
if self.appear(AUTOMATION_CONFIRM_CHECK, threshold=30, interval=1):
self.appear_then_click(AUTOMATION_CONFIRM, offset=(20, 20))
return True
return False
@@ -176,7 +176,7 @@ class Combat(Level, HPBalancer, Retirement, SubmarineCall, CombatAuto, CombatMan
self._automation_set_timer.reset()
return True
if self.appear_then_click(AUTOMATION_CONFIRM, offset=True):
if self.handle_combat_automation_confirm():
self._automation_set_timer.reset()
return True
@@ -230,8 +230,9 @@ class Combat(Level, HPBalancer, Retirement, SubmarineCall, CombatAuto, CombatMan
while 1:
self.device.screenshot()
if not confirm_timer.reached() and self.appear_then_click(AUTOMATION_CONFIRM, offset=True):
continue
if not confirm_timer.reached():
if self.handle_combat_automation_confirm():
continue
if self.handle_story_skip():
continue