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

merge alas

Browse Source
This commit is contained in:
SevCrane
2024-06-05 23:57:58 +08:00
parent 3cb29a9a37
commit abfbbe5064
146 changed files with 0 additions and 13646 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module/handler/fast_forward.py
View File

@@ -245,7 +245,6 @@ class FastForwardHandler(AutoSearchHandler):
logger.info('Auto search setting')
self.fleet_preparation_sidebar_ensure(3)
<<<<<<< HEAD
if not self.auto_search_setting_ensure(self.config.Fleet_FleetOrder):
if self.config.task.command == 'GemsFarming' and self.config.GemsFarming_StopIFAutoNotEnsured:
from module.notify import handle_notify
@@ -262,9 +261,6 @@ class FastForwardHandler(AutoSearchHandler):
logger.critical('Auto search could not be ensured.')
logger.critical('Close Task: GemsFarming')
self.config.task_stop('Auto search could not be ensured.')
=======
self.auto_search_setting_ensure(self.config.Fleet_FleetOrder)
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
if self.config.SUBMARINE:
self.auto_search_setting_ensure(self.config.Submarine_AutoSearchMode)
return True