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

chore(wpf): 刷理智筛选候选关卡后在日志中记录

Browse Source
This commit is contained in:
status102
2026-03-03 11:24:27 +08:00
parent 0b9fc73298
commit 6e93de1d6d
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1426,7 +1426,7 @@ public class AsstProxy
&& (Instances.TaskQueueViewModel.TaskItemViewModels.FirstOrDefault(t => t.TaskId == taskId)?.Index ?? -1) is int index and > -1
&& index <= ConfigFactory.CurrentConfig.TaskQueue.Count
&& ConfigFactory.CurrentConfig.TaskQueue[index] is Configuration.Single.MaaTask.FightTask fight
&& FightTask.GetFightStage(fight) is "Annihilation")
&& FightSettingsUserControlModel.GetFightStage(fight.StagePlan) == FightSettingsUserControlModel.AnnihilationName)
{
Instances.TaskQueueViewModel.AddLog("AnnihilationStage, " + LocalizationHelper.GetString("GiveUpUploadingPenguins"));
break;

13
src/MaaWpfGui/ViewModels/UserControl/TaskQueue/FightSettingsUserControlModel.cs
View File

@@ -656,16 +656,11 @@ public class FightSettingsUserControlModel : TaskSettingsViewModel, FightSetting
return value;
}
public static string? GetFightStage(FightTask fightTask)
public static string? GetFightStage(IEnumerable<string> list)
{
if (fightTask == null)
{
return null;
}
var list = fightTask.StagePlan;
var stage = list?.FirstOrDefault(Instances.TaskQueueViewModel.IsStageOpen);
var stage = list?.FirstOrDefault(s => Instances.StageManager.IsStageOpen(s, Instances.TaskQueueViewModel.CurDayOfWeek));
stage ??= list?.FirstOrDefault();
_logger.Information("GetFightStage: from {list}, selected {stage}", list, stage);
return stage;
}
@@ -924,7 +919,7 @@ public class FightSettingsUserControlModel : TaskSettingsViewModel, FightSetting
}
using var scope = _lock.EnterScope();
var stage = GetFightStage(fight);
var stage = FightSettingsUserControlModel.GetFightStage(fight.StagePlan);
if (stage is null)
{
return null;