mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-03-12 05:08:19 +08:00
Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript
This commit is contained in:
@@ -1,6 +1,9 @@
|
||||
from module.handler.login import LoginHandler
|
||||
from module.logger import logger
|
||||
<<<<<<< HEAD
|
||||
from module.gg_handler.gg_handler import GGHandler
|
||||
=======
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
|
||||
|
||||
class GameManager(LoginHandler):
|
||||
@@ -8,9 +11,16 @@ class GameManager(LoginHandler):
|
||||
logger.hr('Force Stop AzurLane', level=1)
|
||||
self.device.app_stop()
|
||||
logger.info('Force Stop finished')
|
||||
<<<<<<< HEAD
|
||||
GGHandler(config=self.config, device=self.device).check_config()
|
||||
if self.config.GameManager_AutoRestart:
|
||||
LoginHandler(config=self.config, device=self.device).app_restart()
|
||||
=======
|
||||
|
||||
if self.config.GameManager_AutoRestart:
|
||||
self.device.app_start()
|
||||
self.handle_app_login()
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
||||
@@ -1,7 +1,12 @@
|
||||
import shutil
|
||||
|
||||
<<<<<<< HEAD
|
||||
from deploy.Windows.git import GitManager
|
||||
from deploy.Windows.utils import *
|
||||
=======
|
||||
from deploy.git import GitManager
|
||||
from deploy.utils import *
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
from module.handler.login import LoginHandler
|
||||
from module.logger import logger
|
||||
|
||||
|
||||
Reference in New Issue
Block a user