From 6a58d350c680064e69959673a7377e554212c2cd Mon Sep 17 00:00:00 2001 From: uye <99072975+ABA2396@users.noreply.github.com> Date: Sun, 24 Aug 2025 10:49:06 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20mumu=20=E4=BD=BF=E7=94=A8=207555=20?= =?UTF-8?q?=E7=AB=AF=E5=8F=A3=E6=97=B6=E7=A6=81=E7=94=A8=20Index=20?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E8=AD=A6=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaCore/Controller/AdbController.cpp | 4 ++++ src/MaaWpfGui/Helper/EmulatorHelper.cs | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/MaaCore/Controller/AdbController.cpp b/src/MaaCore/Controller/AdbController.cpp index 8b98b84fc7..eef5a3cadf 100644 --- a/src/MaaCore/Controller/AdbController.cpp +++ b/src/MaaCore/Controller/AdbController.cpp @@ -215,6 +215,10 @@ int asst::AdbController::get_mumu_index(const std::string& address) if (port >= 16384) { mumu_index = (port - 16384) / 32; } + else if (port == 7555) { + mumu_index = 0; + LogWarn << "Port 7555 is deprecated for MuMu6, please use 16384 or above."; + } else if (port >= 5555) { mumu_index = (port - 5555) / 2; } diff --git a/src/MaaWpfGui/Helper/EmulatorHelper.cs b/src/MaaWpfGui/Helper/EmulatorHelper.cs index db534b88d6..2050bb8fdd 100644 --- a/src/MaaWpfGui/Helper/EmulatorHelper.cs +++ b/src/MaaWpfGui/Helper/EmulatorHelper.cs @@ -86,6 +86,10 @@ public class EmulatorHelper case >= 16384: emuIndex = (port - 16384) / 32; break; + case 7555: + emuIndex = 0; + _logger.Warning("Port 7555 is deprecated for MuMu6, please use 16384 or above."); + break; case >= 5555: emuIndex = (port - 5555) / 2; break;