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

12
module/webui/process_manager.py
View File

@@ -12,12 +12,7 @@ from rich.console import Console, ConsoleRenderable
from module.config.utils import filepath_config
from module.logger import logger, set_file_logger, set_func_logger
from module.submodule.submodule import load_mod
<<<<<<< HEAD
from module.submodule.utils import get_available_mod, get_available_mod_func, get_config_mod, get_func_mod, list_mod_instance
=======
from module.submodule.utils import get_available_func, get_available_mod, get_available_mod_func, get_config_mod, \
get_func_mod, list_mod_instance
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
from module.webui.setting import State
@@ -154,7 +149,6 @@ class ProcessManager:
if e is not None:
AzurLaneAutoScript.stop_event = e
AzurLaneAutoScript(config_name=config_name).loop()
<<<<<<< HEAD
elif func == "Daemon":
from module.daemon.daemon import AzurLaneDaemon
@@ -175,12 +169,6 @@ class ProcessManager:
from module.daemon.game_manager import GameManager
GameManager(config=config_name, task="GameManager").run()
=======
elif func in get_available_func():
from alas import AzurLaneAutoScript
AzurLaneAutoScript(config_name=config_name).run(inflection.underscore(func))
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
elif func in get_available_mod():
mod = load_mod(func)