sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-04-08 14:48:44 +08:00
Code Activity

Opt: Rescan only once in SAFE zones

Browse Source
This commit is contained in:
LmeSzinc
2022-05-16 21:36:23 +08:00
parent 8ff93a15e3
commit 94c2891428
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
module/os/map.py
View File

@@ -246,7 +246,15 @@ class OSMap(OSFleet, Map, GlobeCamera):
if 'akashi' in result: if 'akashi' in result:
self._solved_map_event.add('is_akashi') self._solved_map_event.add('is_akashi')
return True return True
elif 'event' in result and grid.is_logging_tower:
self._solved_map_event.add('is_logging_tower')
return True
elif 'event' in result and grid.is_scanning_device:
self._solved_map_event.add('is_scanning_device')
self.os_auto_search_run(drop=drop)
return True
else: else:
logger.warning(f'Arrive question with unexpected result: {result}, expected: {grid.str}')
continue continue
def run_auto_search(self, rescan=None): def run_auto_search(self, rescan=None):
@@ -342,7 +350,7 @@ class OSMap(OSFleet, Map, GlobeCamera):
return False return False
grids = self.view.select(is_fleet_mechanism=True) grids = self.view.select(is_fleet_mechanism=True)
if self.config.Scheduler_Command == 'OpsiExplore' \ if self.config.task.command == 'OpsiExplore' \
and 'is_fleet_mechanism' not in self._solved_map_event \ and 'is_fleet_mechanism' not in self._solved_map_event \
and grids \ and grids \
and grids[0].is_fleet_mechanism: and grids[0].is_fleet_mechanism:
@@ -402,6 +410,9 @@ class OSMap(OSFleet, Map, GlobeCamera):
self.fleet_set(self.config.OpsiFleet_Fleet) self.fleet_set(self.config.OpsiFleet_Fleet)
else: else:
self.fleet_set(self.get_second_fleet()) self.fleet_set(self.get_second_fleet())
if not self.config.task.command == 'OpsiExplore' and len(self._solved_map_event):
logger.info('Solved a map event and not in OpsiExplore, stop rescan')
return False
result = self.map_rescan_once(drop=drop) result = self.map_rescan_once(drop=drop)
if not result: if not result:
logger.attr('Solved_map_event', self._solved_map_event) logger.attr('Solved_map_event', self._solved_map_event)