diff --git a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs index 42e88e6382..2cc28cd2d2 100644 --- a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs +++ b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs @@ -1584,25 +1584,30 @@ namespace MaaWpfGui.ViewModels.UI } } - if (mainFightRet && FightTask.UseRemainingSanityStage && !string.IsNullOrEmpty(FightTask.RemainingSanityStage)) + if (!mainFightRet || !FightTask.UseRemainingSanityStage || string.IsNullOrEmpty(FightTask.RemainingSanityStage)) { - var task = new AsstFightTask() - { - Stage = FightTask.RemainingSanityStage, - MaxTimes = int.MaxValue, - Series = 1, - IsDrGrandet = FightTask.IsDrGrandet, - ReportToPenguin = SettingsViewModel.GameSettings.EnablePenguin, - ReportToYituliu = SettingsViewModel.GameSettings.EnableYituliu, - PenguinId = SettingsViewModel.GameSettings.PenguinId, - YituliuId = SettingsViewModel.GameSettings.PenguinId, - ServerType = Instances.SettingsViewModel.ServerType, - ClientType = SettingsViewModel.GameSettings.ClientType, - }; - return Instances.AsstProxy.AsstAppendTaskWithEncoding(TaskType.FightRemainingSanity, type, task.Serialize().Params); + return mainFightRet; } - return mainFightRet; + var remainingSanityTask = new AsstFightTask() + { + Stage = FightTask.RemainingSanityStage, + MaxTimes = int.MaxValue, + Series = 1, + IsDrGrandet = FightTask.IsDrGrandet, + ReportToPenguin = SettingsViewModel.GameSettings.EnablePenguin, + ReportToYituliu = SettingsViewModel.GameSettings.EnableYituliu, + PenguinId = SettingsViewModel.GameSettings.PenguinId, + YituliuId = SettingsViewModel.GameSettings.PenguinId, + ServerType = Instances.SettingsViewModel.ServerType, + ClientType = SettingsViewModel.GameSettings.ClientType, + }; + if (!Instances.AsstProxy.AsstAppendTaskWithEncoding(TaskType.FightRemainingSanity, type, remainingSanityTask.Serialize().Params)) + { + AddLog("RemainingSanity Error", UiLogColor.Error); + } + + return true; } public bool EnableSetFightParams { get; set; } = true;