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

Merge branch 'master' of LmeSzinc

Browse Source
This commit is contained in:
sui-feng-cb
2024-07-26 06:54:28 +08:00
parent d8f62e2884 c396f8b49d
commit b1e80fbeb5
113 changed files with 1392 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
module/device/device.py
View File

@@ -76,11 +76,14 @@ class Device(Screenshot, Control, AppControl, Input):
stuck_long_wait_list = ['BATTLE_STATUS_S', 'PAUSE', 'LOGIN_CHECK']
def __init__(self, *args, **kwargs):
for _ in range(2):
for trial in range(4):
try:
super().__init__(*args, **kwargs)
break
except EmulatorNotRunningError:
if trial >= 3:
logger.critical('Failed to start emulator after 3 trial')
raise RequestHumanTakeover
# Try to start emulator
if self.emulator_instance is not None:
self.emulator_start()
@@ -89,7 +92,7 @@ class Device(Screenshot, Control, AppControl, Input):
f'No emulator with serial "{self.config.Emulator_Serial}" found, '
f'please set a correct serial'
)
raise
raise RequestHumanTakeover
# Auto-fill emulator info
if IS_WINDOWS and self.config.EmulatorInfo_Emulator == 'auto':
@@ -141,7 +144,11 @@ class Device(Screenshot, Control, AppControl, Input):
# Allow Hermit on VMOS only
if self.config.Emulator_ControlMethod == 'Hermit' and not self.is_vmos:
logger.warning('ControlMethod is allowed on VMOS only')
self.config.Emulator_ControlMethod = 'minitouch'
self.config.Emulator_ControlMethod = 'MaaTouch'
if self.config.Emulator_ScreenshotMethod == 'ldopengl' \
and self.config.Emulator_ControlMethod == 'minitouch':
logger.warning('Use MaaTouch on ldplayer')
self.config.Emulator_ControlMethod = 'MaaTouch'
pass
def handle_night_commission(self, daily_trigger='21:00', threshold=30):