fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-17 18:01:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 开关 MuMu 极速操控需要重启生效

Browse Source 
fix #8980
This commit is contained in:
uye
2024-05-04 16:44:22 +08:00
parent 3accd41f88
commit 610ffde230
2 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/MaaWpfGui/Main/AsstProxy.cs
View File

@@ -1554,9 +1554,11 @@ namespace MaaWpfGui.Main
/// <returns>是否成功。</returns>
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)

28
src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs
View File

@@ -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()
{