From bb1de7b7fe4ed2ef1de5829f8362e4717aef9829 Mon Sep 17 00:00:00 2001 From: LA-DI-DA <11174151+0O0o0oOoO00@users.noreply.github.com> Date: Sat, 30 Sep 2023 11:16:49 +0800 Subject: [PATCH 1/2] Add: gg package check --- alas.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/alas.py b/alas.py index 51fa9f669..1cb65fdd1 100644 --- a/alas.py +++ b/alas.py @@ -491,7 +491,18 @@ class AzurLaneAutoScript: AzurLaneConfig.is_hoarding_task = False return task.command + def gg_check(self): + if deep_get(self.config.data, "GameManager.GGHandler.Enabled"): + logger.info("GG is enabled, check gg package name") + if deep_get(self.config.data, "GameManager.GGHandler.GGPackageName") in self.device.list_package(): + logger.info("GG package name exists") + else: + logger.critical("GG package name doesn't exist, please check your gg setting") + logger.critical("友情翻译：你他妈的GG包名填错了，滚去重填！！！") + exit(1) + def loop(self): + self.gg_check() logger.set_file_logger(self.config_name) logger.info(f'Start scheduler loop: {self.config_name}') # Try forced task_call restart to reset GG status From e59ae7d732f586c9bef9c7974775d186ab67c207 Mon Sep 17 00:00:00 2001 From: Zuosizhu <2839299264@qq.com> Date: Sat, 30 Sep 2023 13:12:52 +0800 Subject: [PATCH 2/2] Fix: Droidcast_raw no longer has a separate apk. --- module/device/method/droidcast.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/device/method/droidcast.py b/module/device/method/droidcast.py index 80fdeb27b..773a43eb8 100644 --- a/module/device/method/droidcast.py +++ b/module/device/method/droidcast.py @@ -156,7 +156,7 @@ class DroidCast(Uiautomator2): self.droidcast_stop() logger.info('Pushing DroidCast apk') - self.adb_push(self.config.DROIDCAST_RAW_FILEPATH_LOCAL, self.config.DROIDCAST_RAW_FILEPATH_REMOTE) + self.adb_push(self.config.DROIDCAST_FILEPATH_LOCAL, self.config.DROIDCAST_FILEPATH_REMOTE) logger.info('Starting DroidCast apk') # DroidCastS-release-1.1.5.apk