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

chore: 调整 OF-1 执行条件判断逻辑

Browse Source
This commit is contained in:
uye
2026-01-19 03:50:54 +08:00
parent 8797ce4b05
commit d8f7c74de4
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/MaaWpfGui/ViewModels/UserControl/TaskQueue/MallSettingsUserControlModel.cs
View File

@@ -194,9 +194,12 @@ public class MallSettingsUserControlModel : TaskSettingsViewModel
[Obsolete("使用SerializeTask作为代替")]
public override (AsstTaskType Type, JObject Params) Serialize()
{
var fightEnable = ConfigFactory.CurrentConfig.TaskQueue.FirstOrDefault(x => x is FightTask)?.IsEnable is not false;
var fightStageEmpty = ConfigFactory.CurrentConfig.TaskQueue
.OfType<FightTask>()
.Where(task => task.IsEnable is not false)
.Any(task => string.IsNullOrEmpty(FightSettingsUserControlModel.GetFightStage(task.StagePlan)));
var task = new AsstMallTask() {
// CreditFight = fightEnable ? (!string.IsNullOrEmpty(FightSettingsUserControlModel.Instance.Stage) && CreditFightTaskEnabled) : CreditFightTaskEnabled,
CreditFight = CreditFightTaskEnabled && !fightStageEmpty,
FormationIndex = CreditFightSelectFormation,
VisitFriends = CreditVisitFriendsEnabled,
WithShopping = CreditShopping,
@@ -218,7 +221,7 @@ public class MallSettingsUserControlModel : TaskSettingsViewModel
var fightStageEmpty = ConfigFactory.CurrentConfig.TaskQueue
.OfType<FightTask>()
.Where(task => task.IsEnable == true)
.Where(task => task.IsEnable is not false)
.Any(task => string.IsNullOrEmpty(FightSettingsUserControlModel.GetFightStage(task.StagePlan)));
var creditFight = mall.IsCreditFightAvailable;
var visitFriends = mall.IsVisitFriendsAvailable;