mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-03-12 05:08:19 +08:00
Resolve merge conflicts
This commit is contained in:
@@ -337,7 +337,7 @@ def main(ini_name=''):
|
||||
adb.add_argument('--device_screenshot_method', default=default('--device_screenshot_method'),
|
||||
choices=['aScreenCap', 'uiautomator2', 'ADB'], help='Speed: aScreenCap >> uiautomator2 > ADB', gooey_options={'label_color': '#4B5F83'})
|
||||
adb.add_argument('--device_control_method', default=default('--device_control_method'),
|
||||
choices=['uiautomator2', 'ADB'], help='Speed: uiautomator2 >> ADB', gooey_options={'label_color': '#4B5F83'})
|
||||
choices=['minitouch','uiautomator2', 'ADB'], help='Speed: minitouch >> uiautomator2 >> ADB', gooey_options={'label_color': '#4B5F83'})
|
||||
adb.add_argument('--combat_screenshot_interval', default=default('--combat_screenshot_interval'),
|
||||
help='Slow down the screenshot speed during battle and reduce CPU', gooey_options={'label_color': '#4B5F83'})
|
||||
|
||||
|
||||
Reference in New Issue
Block a user