mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-03-12 07:28:21 +08:00
Fix: End condition order in auto_search_combat of os_combat (#3103)
This commit is contained in:
@@ -253,6 +253,9 @@ class Combat(Combat_, MapEventHandler):
|
||||
continue
|
||||
|
||||
# End
|
||||
if self.is_in_map():
|
||||
self.device.screenshot_interval_set()
|
||||
break
|
||||
if self.is_combat_executing():
|
||||
continue
|
||||
if self.handle_auto_search_battle_status():
|
||||
@@ -263,9 +266,6 @@ class Combat(Combat_, MapEventHandler):
|
||||
continue
|
||||
if self.handle_map_event():
|
||||
continue
|
||||
if self.is_in_map():
|
||||
self.device.screenshot_interval_set()
|
||||
break
|
||||
|
||||
|
||||
logger.info('Combat end.')
|
||||
return success
|
||||
|
||||
Reference in New Issue
Block a user