mirror of
https://github.com/sui-feng-cb/AzurLaneAutoScript1.git
synced 2026-07-20 21:25:37 +08:00
Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript
This commit is contained in:
@@ -337,10 +337,14 @@ class Connection(ConnectionAttr):
|
||||
# MuMU Pro is the Mac version of MuMu
|
||||
if not IS_MACINTOSH:
|
||||
return False
|
||||
if not self.is_mumu_family:
|
||||
return False
|
||||
logger.attr('is_mumu_pro', True)
|
||||
return True
|
||||
if self.is_mumu_family:
|
||||
logger.attr('is_mumu_pro', True)
|
||||
return True
|
||||
if self.serial.startswith('emulator-'):
|
||||
if 'MACPRO' in self.nemud_player_engine.upper():
|
||||
logger.attr('is_mumu_pro', True)
|
||||
return True
|
||||
return False
|
||||
|
||||
@cached_property
|
||||
@retry
|
||||
@@ -366,7 +370,7 @@ class Connection(ConnectionAttr):
|
||||
return res
|
||||
|
||||
def check_mumu_app_keep_alive(self):
|
||||
if not self.is_mumu_family:
|
||||
if not (self.is_mumu_family or self.is_mumu_pro):
|
||||
return False
|
||||
|
||||
res = self.nemud_app_keep_alive
|
||||
@@ -401,15 +405,14 @@ class Connection(ConnectionAttr):
|
||||
which has nemud.app_keep_alive and always be a vertical device
|
||||
MuMu PRO on mac has the same feature
|
||||
"""
|
||||
if self.is_mumu_pro:
|
||||
return True
|
||||
if not self.is_mumu_family:
|
||||
return False
|
||||
if self.is_mumu_over_version_400:
|
||||
return True
|
||||
if self.nemud_app_keep_alive != '':
|
||||
return True
|
||||
if IS_MACINTOSH:
|
||||
if 'MACPRO' in self.nemud_player_engine:
|
||||
return True
|
||||
return False
|
||||
|
||||
@cached_property
|
||||
|
||||
Reference in New Issue
Block a user