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

18
deploy/installer.py
View File

@@ -1,4 +1,3 @@
<<<<<<< HEAD
from deploy.Windows.logger import Progress, logger
from deploy.Windows.patch import pre_checks
@@ -10,18 +9,6 @@ from deploy.Windows.app import AppManager
from deploy.Windows.config import ExecutionError
from deploy.Windows.git import GitManager
from deploy.Windows.pip import PipManager
=======
from deploy.patch import pre_checks
pre_checks()
from deploy.adb import AdbManager
from deploy.alas import AlasManager
from deploy.app import AppManager
from deploy.config import ExecutionError
from deploy.git import GitManager
from deploy.pip import PipManager
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
class Installer(GitManager, PipManager, AdbManager, AppManager, AlasManager):
@@ -36,7 +23,6 @@ class Installer(GitManager, PipManager, AdbManager, AppManager, AlasManager):
exit(1)
<<<<<<< HEAD
def run():
Progress.Start()
installer = Installer()
@@ -46,7 +32,3 @@ def run():
logger.info('Finish')
Progress.Finish()
=======
if __name__ == '__main__':
Installer().install()
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0