diff --git a/module/config/argument/args.json b/module/config/argument/args.json index 40f6f579a..1cec1d669 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -161,6 +161,7 @@ "LDPlayer3", "LDPlayer4", "LDPlayer9", + "LDPlayer14", "MuMuPlayer", "MuMuPlayerX", "MuMuPlayer12", diff --git a/module/config/argument/argument.yaml b/module/config/argument/argument.yaml index d27cdf4c4..bfc910a0f 100644 --- a/module/config/argument/argument.yaml +++ b/module/config/argument/argument.yaml @@ -69,6 +69,7 @@ EmulatorInfo: LDPlayer3, LDPlayer4, LDPlayer9, + LDPlayer14, MuMuPlayer, MuMuPlayerX, MuMuPlayer12, diff --git a/module/config/config_generated.py b/module/config/config_generated.py index e698e9877..8b0b1115d 100644 --- a/module/config/config_generated.py +++ b/module/config/config_generated.py @@ -27,7 +27,7 @@ class GeneratedConfig: Emulator_AdbRestart = False # Group `EmulatorInfo` - EmulatorInfo_Emulator = 'auto' # auto, NoxPlayer, NoxPlayer64, BlueStacks4, BlueStacks5, BlueStacks4HyperV, BlueStacks5HyperV, LDPlayer3, LDPlayer4, LDPlayer9, MuMuPlayer, MuMuPlayerX, MuMuPlayer12, MEmuPlayer + EmulatorInfo_Emulator = 'auto' # auto, NoxPlayer, NoxPlayer64, BlueStacks4, BlueStacks5, BlueStacks4HyperV, BlueStacks5HyperV, LDPlayer3, LDPlayer4, LDPlayer9, LDPlayer14, MuMuPlayer, MuMuPlayerX, MuMuPlayer12, MEmuPlayer EmulatorInfo_name = None EmulatorInfo_path = None @@ -202,6 +202,7 @@ class GeneratedConfig: # Group `AddNewStudent` AddNewStudent_Enable = False AddNewStudent_Favorite = True + AddNewStudent_MinLevel = 50 # Group `Research` Research_UseCube = 'only_05_hour' # always_use, only_05_hour, only_no_project, do_not_use diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index d9cfe5d8e..5b01b62cd 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -470,6 +470,7 @@ "LDPlayer3": "LD Player 3", "LDPlayer4": "LD Player 4", "LDPlayer9": "LD Player 9", + "LDPlayer14": "LDPlayer 14", "MuMuPlayer": "MuMu Player", "MuMuPlayerX": "MuMu Player X", "MuMuPlayer12": "MuMu Player 12", diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index 686a40d84..2005c4584 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -470,6 +470,7 @@ "LDPlayer3": "LDPlayer3", "LDPlayer4": "LDPlayer4", "LDPlayer9": "LDPlayer9", + "LDPlayer14": "LDPlayer14", "MuMuPlayer": "MuMuPlayer", "MuMuPlayerX": "MuMuPlayerX", "MuMuPlayer12": "MuMuPlayer12", diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index 91f022671..f76b0b2f8 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -470,6 +470,7 @@ "LDPlayer3": "雷电模拟器3", "LDPlayer4": "雷电模拟器4", "LDPlayer9": "雷电模拟器9", + "LDPlayer14": "雷电模拟器14", "MuMuPlayer": "MuMu模拟器", "MuMuPlayerX": "MuMu模拟器X", "MuMuPlayer12": "MuMu模拟器12", diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index edee19175..f98b049e1 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -470,6 +470,7 @@ "LDPlayer3": "雷電模擬器3", "LDPlayer4": "雷電模擬器4", "LDPlayer9": "雷電模擬器9", + "LDPlayer14": "雷電模擬器14", "MuMuPlayer": "MuMu模擬器", "MuMuPlayerX": "MuMu模擬器X", "MuMuPlayer12": "MuMu模擬器12", diff --git a/module/device/method/ldopengl.py b/module/device/method/ldopengl.py index fbd6009ca..b4e6c38f0 100644 --- a/module/device/method/ldopengl.py +++ b/module/device/method/ldopengl.py @@ -332,7 +332,7 @@ class LDOpenGL(Platform): if not self.is_ldplayer_bluestacks_family: return False logger.attr('EmulatorInfo_Emulator', self.config.EmulatorInfo_Emulator) - if self.config.EmulatorInfo_Emulator not in ['LDPlayer9']: + if self.config.EmulatorInfo_Emulator not in ['LDPlayer9', 'LDPlayer14']: return False try: diff --git a/module/device/platform/emulator_base.py b/module/device/platform/emulator_base.py index 19943fd95..522c6b51d 100644 --- a/module/device/platform/emulator_base.py +++ b/module/device/platform/emulator_base.py @@ -155,7 +155,8 @@ class EmulatorBase: LDPlayer3 = 'LDPlayer3' LDPlayer4 = 'LDPlayer4' LDPlayer9 = 'LDPlayer9' - LDPlayerFamily = [LDPlayer3, LDPlayer4, LDPlayer9] + LDPlayer14 = 'LDPlayer14' + LDPlayerFamily = [LDPlayer3, LDPlayer4, LDPlayer9, LDPlayer14] MuMuPlayer = 'MuMuPlayer' MuMuPlayerX = 'MuMuPlayerX' MuMuPlayer12 = 'MuMuPlayer12' diff --git a/module/device/platform/emulator_windows.py b/module/device/platform/emulator_windows.py index 78a5b6b0c..c48a0922a 100644 --- a/module/device/platform/emulator_windows.py +++ b/module/device/platform/emulator_windows.py @@ -110,6 +110,8 @@ class Emulator(EmulatorBase): return cls.LDPlayer4 elif dir1 == 'ldplayer9': return cls.LDPlayer9 + elif dir1 == 'ldplayer14': + return cls.LDPlayer14 else: return cls.LDPlayer3 if exe == 'nemuplayer.exe': @@ -538,8 +540,11 @@ class EmulatorManager(EmulatorManagerBase): exe.add(file) # LDPlayer install path - for path in [r'SOFTWARE\leidian\ldplayer', - r'SOFTWARE\leidian\ldplayer9']: + for path in [ + r'SOFTWARE\leidian\ldplayer', + r'SOFTWARE\leidian\ldplayer9', + r'SOFTWARE\leidian\ldplayer14', + ]: ld = self.get_install_dir_from_reg(path, 'InstallDir') if ld: ld = abspath(os.path.join(ld, './dnplayer.exe'))