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

Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript

Browse Source
This commit is contained in:
GH Action - Upstream Sync
2026-01-01 16:31:36 +00:00
parent c3c36797ca 2bf6b7227e
commit 51266010b1
14 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
module/combat/combat.py
View File

@@ -121,6 +121,8 @@ class Combat(Level, HPBalancer, Retirement, SubmarineCall, CombatAuto, CombatMan
return PAUSE_Ninja
if PAUSE_ShadowPuppetry.match_luma(self.device.image, offset=(10, 10)):
return PAUSE_ShadowPuppetry
if PAUSE_MaidCafe.match_template_color(self.device.image, offset=(10, 10)):
return PAUSE_MaidCafe
return False
def handle_combat_quit(self, offset=(20, 20), interval=3):
@@ -168,6 +170,10 @@ class Combat(Level, HPBalancer, Retirement, SubmarineCall, CombatAuto, CombatMan
self.device.click(QUIT_Ninja)
timer.reset()
return True
if QUIT_MaidCafe.match_luma(self.device.image, offset=offset):
self.device.click(QUIT_MaidCafe)
timer.reset()
return True
return False
def ensure_combat_oil_loaded(self):