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

Fix: Combat loading now check before ambush

Browse Source
This commit is contained in:
LmeSzinc
2020-09-09 02:04:33 +08:00
parent 22b534b619
commit 2084a994c7
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
module/map/fleet.py
View File

@@ -202,19 +202,6 @@ class Fleet(Camera, MapOperation, AmbushHandler):
self.device.screenshot() self.device.screenshot()
grid.image = np.array(self.device.image) grid.image = np.array(self.device.image)
# Ambush
if self.handle_ambush():
self.hp_get()
ambushed_retry.start()
walk_timeout.reset()
# Mystery
mystery = self.handle_mystery(button=grid)
if mystery:
self.mystery_count += 1
result = 'mystery'
result_mystery = mystery
# Combat # Combat
if self.config.ENABLE_MAP_FLEET_LOCK and not self.is_in_map(): if self.config.ENABLE_MAP_FLEET_LOCK and not self.is_in_map():
if self.handle_retirement(): if self.handle_retirement():
@@ -238,6 +225,19 @@ class Fleet(Camera, MapOperation, AmbushHandler):
grid = self.convert_map_to_grid(location) grid = self.convert_map_to_grid(location)
walk_timeout.reset() walk_timeout.reset()
# Ambush
if self.handle_ambush():
self.hp_get()
ambushed_retry.start()
walk_timeout.reset()
# Mystery
mystery = self.handle_mystery(button=grid)
if mystery:
self.mystery_count += 1
result = 'mystery'
result_mystery = mystery
# Cat attack animation # Cat attack animation
if self.handle_map_cat_attack(): if self.handle_map_cat_attack():
walk_timeout.reset() walk_timeout.reset()