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

rft: Wpf迁移工具箱-公招识别任务

Browse Source
This commit is contained in:
status102
2025-04-08 19:23:26 +08:00
parent 9d546765dd
commit 180f96fc48
2 changed files with 15 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2163,31 +2163,6 @@ namespace MaaWpfGui.Main
return AsstSetTaskParamsWithEncoding(id, taskParams);
}
/// <summary>
/// 公招识别。
/// </summary>
/// <param name="selectLevel">会去点击标签的 Tag 等级。</param>
/// <param name="setTime">是否设置 9 小时。</param>
/// <param name="chooseLevel3Time">3 星招募时间</param>
/// <param name="chooseLevel4Time">4 星招募时间</param>
/// <param name="chooseLevel5Time">5 星招募时间</param>
/// <returns>是否成功。</returns>
public bool AsstStartRecruitCalc(int[] selectLevel, bool setTime, int chooseLevel3Time, int chooseLevel4Time, int chooseLevel5Time)
{
var task = new AsstRecruitTask()
{
SelectList = selectLevel.ToList(),
ConfirmList = [-1], // 仅公招识别时将-1加入comfirm_level
SetRecruitTime = setTime,
ChooseLevel3Time = chooseLevel3Time,
ChooseLevel4Time = chooseLevel4Time,
ChooseLevel5Time = chooseLevel5Time,
ServerType = Instances.SettingsViewModel.ServerType,
};
var (type, taskParams) = task.Serialize();
return AsstAppendTaskWithEncoding(TaskType.RecruitCalc, type, taskParams) && AsstStart();
}
/// <summary>
/// 仓库识别。
/// </summary>

16
src/MaaWpfGui/ViewModels/UI/RecognizerViewModel.cs
View File

@@ -23,11 +23,13 @@ using System.Windows.Threading;
using HandyControl.Controls;
using MaaWpfGui.Constants;
using MaaWpfGui.Helper;
using MaaWpfGui.Models.AsstTasks;
using MaaWpfGui.States;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Serilog;
using Stylet;
using static MaaWpfGui.Main.AsstProxy;
using Timer = System.Timers.Timer;
namespace MaaWpfGui.ViewModels.UI
@@ -219,7 +221,19 @@ namespace MaaWpfGui.ViewModels.UI
levelList.Add(6);
}
Instances.AsstProxy.AsstStartRecruitCalc(levelList.ToArray(), RecruitAutoSetTime, TaskQueueViewModel.RecruitTask.ChooseLevel3Time, TaskQueueViewModel.RecruitTask.ChooseLevel4Time, TaskQueueViewModel.RecruitTask.ChooseLevel5Time);
var task = new AsstRecruitTask()
{
SelectList = levelList,
ConfirmList = [-1], // 仅公招识别时将-1加入comfirm_level
SetRecruitTime = RecruitAutoSetTime,
ChooseLevel3Time = TaskQueueViewModel.RecruitTask.ChooseLevel3Time,
ChooseLevel4Time = TaskQueueViewModel.RecruitTask.ChooseLevel4Time,
ChooseLevel5Time = TaskQueueViewModel.RecruitTask.ChooseLevel5Time,
ServerType = Instances.SettingsViewModel.ServerType,
};
var (type, taskParams) = task.Serialize();
bool ret = Instances.AsstProxy.AsstAppendTaskWithEncoding(TaskType.RecruitCalc, type, taskParams);
ret &= Instances.AsstProxy.AsstStart();
}
private bool _recruitmentShowPotential = Convert.ToBoolean(ConfigurationHelper.GetValue(ConfigurationKeys.RecruitmentShowPotential, bool.TrueString));