diff --git a/src/MaaWpfGui/Main/AsstProxy.cs b/src/MaaWpfGui/Main/AsstProxy.cs index 59f8910557..d40d8adea8 100644 --- a/src/MaaWpfGui/Main/AsstProxy.cs +++ b/src/MaaWpfGui/Main/AsstProxy.cs @@ -1554,9 +1554,11 @@ namespace MaaWpfGui.Main /// 是否成功。 public bool AsstConnect(ref string error) { - if (Instances.SettingsViewModel.MuMuEmulator12Extras.Enable) + switch (Instances.SettingsViewModel.ConnectConfig) { - AsstSetConnectionExtrasMuMu12(Instances.SettingsViewModel.MuMuEmulator12Extras.Config); + case "MuMuEmulator12": + AsstSetConnectionExtrasMuMu12(Instances.SettingsViewModel.MuMuEmulator12Extras.Config); + break; } if (Instances.SettingsViewModel.AutoDetectConnection) diff --git a/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs b/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs index 94c41924a2..0fc676b71c 100644 --- a/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs +++ b/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs @@ -3295,7 +3295,13 @@ namespace MaaWpfGui.ViewModels.UI get => _enable; set { + if (_enable == value) + { + return; + } + _enable = value; + Instances.AsstProxy.Connected = false; OnPropertyChanged(); ConfigurationHelper.SetValue(ConfigurationKeys.MuMu12ExtrasEnabled, value.ToString()); } @@ -3349,12 +3355,24 @@ namespace MaaWpfGui.ViewModels.UI } } - public string Config => JsonConvert.SerializeObject(new JObject() + public string Config { - ["path"] = EmulatorPath, - ["index"] = int.TryParse(Index, out var indexParse) ? indexParse : 0, - ["display"] = int.TryParse(Display, out var displayParse) ? displayParse : 0, - }); + get + { + if (!Enable) + { + return JsonConvert.SerializeObject(new JObject()); + } + + var configObject = new JObject + { + ["path"] = EmulatorPath, + ["index"] = int.TryParse(Index, out var indexParse) ? indexParse : 0, + ["display"] = int.TryParse(Display, out var displayParse) ? displayParse : 0, + }; + return JsonConvert.SerializeObject(configObject); + } + } public MuMuEmulator12ConnectionExtras() {