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 branch 'dev' into bug_fix

Browse Source
This commit is contained in:
LmeSzinc
2023-02-03 00:40:29 +08:00
parent 2f1ac3eaeb 36e1f01cb7
commit 3ff3dcac1d
14 changed files with 263 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
module/daemon/benchmark.py
View File

@@ -166,7 +166,7 @@ class Benchmark(DaemonBase, CampaignUI):
device = self.config.Benchmark_DeviceType
# device == 'emulator'
screenshot = ['ADB', 'ADB_nc', 'uiautomator2', 'aScreenCap', 'aScreenCap_nc', 'DroidCast', 'DroidCast_raw']
click = ['ADB', 'uiautomator2', 'minitouch']
click = ['ADB', 'uiautomator2', 'minitouch', 'MaaTouch']
def remove(*args):
return [l for l in screenshot if l not in args]
@@ -180,7 +180,7 @@ class Benchmark(DaemonBase, CampaignUI):
# VMOS
if device == 'android_phone_vmos':
screenshot = ['ADB', 'aScreenCap', 'DroidCast', 'DroidCast_raw']
click = ['ADB', 'Hermit']
click = ['ADB', 'Hermit', 'MaaTouch']
scene = self.config.Benchmark_TestScene
if 'screenshot' not in scene: