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

Chore: [ALAS] Prefer MaaTouch if both minitouch and MaaTouch are fastest

Browse Source
This commit is contained in:
LmeSzinc
2025-02-03 23:42:34 +08:00
parent 4cd0261fcd
commit 463e5ff187
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
module/daemon/benchmark.py
View File

@@ -165,6 +165,9 @@ class Benchmark(DaemonBase, CampaignUI):
if click_result: if click_result:
self.show(test='Control', data=click_result, evaluate_func=self.evaluate_click) self.show(test='Control', data=click_result, evaluate_func=self.evaluate_click)
fastest = sorted(click_result, key=lambda item: compare(item))[0] fastest = sorted(click_result, key=lambda item: compare(item))[0]
# Prefer MaaTouch if both minitouch and MaaTouch are fastest
if 'MaaTouch' in click and fastest[0] == 'minitouch':
fastest[0] = 'MaaTouch'
logger.info(f'Recommend control method: {fastest[0]} ({float2str(fastest[1])})') logger.info(f'Recommend control method: {fastest[0]} ({float2str(fastest[1])})')
fastest_click = fastest[0] fastest_click = fastest[0]
@@ -174,7 +177,7 @@ class Benchmark(DaemonBase, CampaignUI):
device = self.config.Benchmark_DeviceType device = self.config.Benchmark_DeviceType
# device == 'emulator' # device == 'emulator'
screenshot = ['ADB', 'ADB_nc', 'uiautomator2', 'aScreenCap', 'aScreenCap_nc', 'DroidCast', 'DroidCast_raw'] screenshot = ['ADB', 'ADB_nc', 'uiautomator2', 'aScreenCap', 'aScreenCap_nc', 'DroidCast', 'DroidCast_raw']
click = ['ADB', 'uiautomator2', 'minitouch'] click = ['ADB', 'uiautomator2', 'minitouch', 'MaaTouch']
def remove(*args): def remove(*args):
return [l for l in screenshot if l not in args] return [l for l in screenshot if l not in args]