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

Fix: Task switched in os_cross_month

Browse Source
This commit is contained in:
LmeSzinc
2022-12-01 00:35:16 +08:00
parent fbf17e3000
commit 0f84712d6a
1 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
module/os/operation_siren.py
View File

@@ -164,6 +164,7 @@ class OperationSiren(OSMap):
return False return False
self.is_in_opsi_explore = false_func self.is_in_opsi_explore = false_func
self.config.task_switched = false_func
while 1: while 1:
# If unable to receive more dailies, finish them and try again. # If unable to receive more dailies, finish them and try again.
success = self.os_mission_overview_accept() success = self.os_mission_overview_accept()
@@ -190,23 +191,29 @@ class OperationSiren(OSMap):
OpsiFleetFilter_Filter=self.config.cross_get('OpsiAbyssal.OpsiFleetFilter.Filter'), OpsiFleetFilter_Filter=self.config.cross_get('OpsiAbyssal.OpsiFleetFilter.Filter'),
OpsiAbyssal_ForceRun=True, OpsiAbyssal_ForceRun=True,
) )
if self.storage_get_next_item('ABYSSAL', use_logger=True): while 1:
self.zone_init() if self.storage_get_next_item('ABYSSAL', use_logger=True):
result = self.run_abyssal() self.zone_init()
if not result: result = self.run_abyssal()
self.map_exit() if not result:
self.fleet_repair(revert=False) self.map_exit()
self.fleet_repair(revert=False)
else:
break
logger.hr('OS clear obscure', level=1) logger.hr('OS clear obscure', level=1)
if self.storage_get_next_item('OBSCURE', use_logger=True): while 1:
self.zone_init() if self.storage_get_next_item('OBSCURE', use_logger=True):
self.fleet_set(self.config.OpsiFleet_Fleet) self.zone_init()
self.os_order_execute( self.fleet_set(self.config.OpsiFleet_Fleet)
recon_scan=True, self.os_order_execute(
submarine_call=False) recon_scan=True,
self.run_auto_search(rescan=False) submarine_call=False)
self.map_exit() self.run_auto_search(rescan=False)
self.handle_after_auto_search() self.map_exit()
self.handle_after_auto_search()
else:
break
logger.hr(f'OS meowfficer farming, hazard_level=3', level=1) logger.hr(f'OS meowfficer farming, hazard_level=3', level=1)
self.config.override( self.config.override(