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:
SevCrane
2024-06-05 23:53:03 +08:00
parent 5e482958f6 24aa3e00bd
commit 3cb29a9a37
179 changed files with 17873 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
module/os_ash/ash.py
View File

@@ -49,6 +49,7 @@ class AshCombat(Combat):
return False
def handle_battle_preparation(self):
<<<<<<< HEAD
if self.appear(BATTLE_PREPARATION, offset=(20, 20)):
self.device.sleep(0.5)
@@ -58,6 +59,10 @@ class AshCombat(Combat):
GGHandler(config=self.config, device=self.device).power_limit('Ash')
if super().handle_battle_preparation():
return True
=======
if super().handle_battle_preparation():
return True
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
if self.appear_then_click(ASH_START, offset=(30, 30), interval=2):
return True