sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-12 08:38:20 +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

11
module/base/base.py
View File

@@ -34,11 +34,6 @@ class ModuleBase:
"""
if isinstance(config, AzurLaneConfig):
self.config = config
<<<<<<< HEAD
=======
if task is not None:
self.config.init_task(task)
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
elif isinstance(config, str):
self.config = AzurLaneConfig(config, task=task)
else:
@@ -78,12 +73,6 @@ class ModuleBase:
if not self.config.is_actual_task:
logger.info('No actual task bound, skip early_ocr_import')
return
<<<<<<< HEAD
=======
if self.config.task.command in ['Daemon', 'OpsiDaemon']:
logger.info('No ocr in daemon task, skip early_ocr_import')
return
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
def do_ocr_import():
# Wait first image