diff --git a/src/MaaWpfGui/Main/AsstProxy.cs b/src/MaaWpfGui/Main/AsstProxy.cs
index b185b1f7be..90cc381c78 100644
--- a/src/MaaWpfGui/Main/AsstProxy.cs
+++ b/src/MaaWpfGui/Main/AsstProxy.cs
@@ -2163,31 +2163,6 @@ namespace MaaWpfGui.Main
return AsstSetTaskParamsWithEncoding(id, taskParams);
}
- ///
- /// 公招识别。
- ///
- /// 会去点击标签的 Tag 等级。
- /// 是否设置 9 小时。
- /// 3 星招募时间
- /// 4 星招募时间
- /// 5 星招募时间
- /// 是否成功。
- 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();
- }
-
///
/// 仓库识别。
///
diff --git a/src/MaaWpfGui/ViewModels/UI/RecognizerViewModel.cs b/src/MaaWpfGui/ViewModels/UI/RecognizerViewModel.cs
index 4f690e2d19..23ea5bd572 100644
--- a/src/MaaWpfGui/ViewModels/UI/RecognizerViewModel.cs
+++ b/src/MaaWpfGui/ViewModels/UI/RecognizerViewModel.cs
@@ -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));