sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-22 15:13:45 +08:00
Code Activity

Opt: Limit screenshot and control combinations when using nemu_ipc

Browse Source
This commit is contained in:
LmeSzinc
2024-04-08 04:32:33 +08:00
parent 78adcbbc7d
commit 2a74c338a3
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
module/config/config_updater.py
View File

@@ -726,6 +726,11 @@ class ConfigUpdater:
key = key.split(".") key = key.split(".")
key[-1] = key[-1].replace("Value", "Record") key[-1] = key[-1].replace("Value", "Record")
yield ".".join(key), datetime.now().strftime("%Y-%m-%d %H:%M:%S") yield ".".join(key), datetime.now().strftime("%Y-%m-%d %H:%M:%S")
# Oh no, dynamic dropdown update can only be used on pywebio > 1.8.0
# elif key == 'Alas.Emulator.ScreenshotMethod' and value == 'nemu_ipc':
# yield 'Alas.Emulator.ControlMethod', 'nemu_ipc'
# elif key == 'Alas.Emulator.ControlMethod' and value == 'nemu_ipc':
# yield 'Alas.Emulator.ScreenshotMethod', 'nemu_ipc'
def read_file(self, config_name, is_template=False): def read_file(self, config_name, is_template=False):
""" """

18
module/device/device.py
View File

@@ -81,6 +81,7 @@ class Device(Screenshot, Control, AppControl):
_ = self.emulator_instance _ = self.emulator_instance
self.screenshot_interval_set() self.screenshot_interval_set()
self.method_check()
# Auto-select the fastest screenshot method # Auto-select the fastest screenshot method
if not self.config.is_template_config and self.config.Emulator_ScreenshotMethod == 'auto': if not self.config.is_template_config and self.config.Emulator_ScreenshotMethod == 'auto':
@@ -99,7 +100,22 @@ class Device(Screenshot, Control, AppControl):
bench = Benchmark(config=self.config, device=self) bench = Benchmark(config=self.config, device=self)
method = bench.run_simple_screenshot_benchmark() method = bench.run_simple_screenshot_benchmark()
# Set # Set
self.config.Emulator_ScreenshotMethod = method with self.config.multi_set():
self.config.Emulator_ScreenshotMethod = method
if method == 'nemu_ipc':
self.config.Emulator_ControlMethod = 'nemu_ipc'
def method_check(self):
"""
Check combinations of screenshot method and control methods
"""
# nemu_ipc should be together
if self.config.Emulator_ScreenshotMethod == 'nemu_ipc' and self.config.Emulator_ControlMethod != 'nemu_ipc':
logger.warning('When using nemu_ipc, both screenshot and control should use nemu_ipc')
self.config.Emulator_ControlMethod = 'nemu_ipc'
if self.config.Emulator_ScreenshotMethod != 'nemu_ipc' and self.config.Emulator_ControlMethod == 'nemu_ipc':
logger.warning('When not using nemu_ipc, both screenshot and control should not use nemu_ipc')
self.config.Emulator_ControlMethod = 'minitouch'
def handle_night_commission(self, daily_trigger='21:00', threshold=30): def handle_night_commission(self, daily_trigger='21:00', threshold=30):
""" """