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

Revert "chore: 给剩余理智加个兜底"

Browse Source 
This reverts commit 3838bce450.
This commit is contained in:
status102
2025-04-12 20:35:24 +08:00
parent 65a33d4dcc
commit 5af7efa04b
1 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
View File

@@ -1584,30 +1584,25 @@ namespace MaaWpfGui.ViewModels.UI
}
}
if (!mainFightRet || !FightTask.UseRemainingSanityStage || string.IsNullOrEmpty(FightTask.RemainingSanityStage))
if (mainFightRet && FightTask.UseRemainingSanityStage && !string.IsNullOrEmpty(FightTask.RemainingSanityStage))
{
return mainFightRet;
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);
}
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;
return mainFightRet;
}
public bool EnableSetFightParams { get; set; } = true;