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

Resolve merge conflicts

Browse Source
This commit is contained in:
LmeSzinc
2020-08-19 00:24:23 +08:00
parent 3fa23af1a6
commit 1c0c0f1d7f
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/config/argparser.py
View File

@@ -318,7 +318,7 @@ def main(ini_name=''):
adb = emulator_parser.add_argument_group('ADB设置', '', gooey_options={'label_color': '#931D03'})
adb.add_argument('--设备截图方案', default=default('--设备截图方案'), choices=['aScreenCap', 'uiautomator2', 'ADB'], help='速度: aScreenCap >> uiautomator2 > ADB', gooey_options={'label_color': '#4B5F83'})
adb.add_argument('--设备控制方案', default=default('--设备控制方案'), choices=['uiautomator2', 'ADB'], help='速度: uiautomator2 >> ADB', gooey_options={'label_color': '#4B5F83'})
adb.add_argument('--设备控制方案', default=default('--设备控制方案'), choices=['minitouch','uiautomator2', 'ADB'], help='速度: minitouch >> uiautomator2 >> ADB', gooey_options={'label_color': '#4B5F83'})
adb.add_argument('--战斗中截图间隔', default=default('--战斗中截图间隔'), help='战斗中放慢截图速度, 降低CPU使用', gooey_options={'label_color': '#4B5F83'})
update = emulator_parser.add_argument_group('更新检查', '', gooey_options={'label_color': '#931D03'})

2
module/config/argparser_en.py
View File

@@ -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'})

2
module/config/argparser_jp.py
View File

@@ -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'})