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

Fix: is_mumu_over_version_356 is True on mumu mac

Browse Source
This commit is contained in:
LmeSzinc
2024-07-12 02:06:17 +08:00
parent b6fd913b56
commit 834ef85cdb
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
module/device/connection.py
View File

@@ -306,8 +306,16 @@ class Connection(ConnectionAttr):
Returns: Returns:
bool: If MuMu12 version >= 3.5.6, bool: If MuMu12 version >= 3.5.6,
which has nemud.app_keep_alive and always be a vertical device which has nemud.app_keep_alive and always be a vertical device
MuMu PRO on mac has the same feature
""" """
return self.nemud_app_keep_alive != '' if self.nemud_app_keep_alive != '':
return True
if IS_MACINTOSH:
res = self.adb_getprop('nemud.player_engine')
logger.attr('nemud.player_engine', res)
if 'MACPRO' in res:
return True
return False
@cached_property @cached_property
def _nc_server_host_port(self): def _nc_server_host_port(self):
@@ -896,7 +904,10 @@ class Connection(ConnectionAttr):
self.serial = emu_serial self.serial = emu_serial
# Redirect MuMu12 from 127.0.0.1:7555 to 127.0.0.1:16xxx # Redirect MuMu12 from 127.0.0.1:7555 to 127.0.0.1:16xxx
if self.serial == '127.0.0.1:7555': if (
(IS_WINDOWS and self.serial == '127.0.0.1:7555')
or (IS_MACINTOSH and self.serial == '127.0.0.1:5555')
):
for _ in range(2): for _ in range(2):
mumu12 = available.select(may_mumu12_family=True) mumu12 = available.select(may_mumu12_family=True)
if mumu12.count == 1: if mumu12.count == 1: