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

rft: Wpf重构自动公招任务序列化 (#11951)

Browse Source
This commit is contained in:
status102
2025-02-17 21:02:51 +08:00
committed by GitHub
parent c4fb641873
commit 5b5ba74a2d
5 changed files with 113 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2231,82 +2231,6 @@ namespace MaaWpfGui.Main
return id != 0;
}
/// <summary>
/// 公开招募。
/// </summary>
/// <param name="maxTimes">加急次数，仅在 <paramref name="useExpedited"/> 为 <see langword="true"/> 时有效。</param>
/// <param name="firstTags">首选 Tags，仅在 Tag 等级为 3 时有效。</param>
/// <param name="selectLevel">会去点击标签的 Tag 等级。</param>
/// <param name="confirmLevel">会去点击确认的 Tag 等级。若仅公招计算，可设置为空数组。</param>
/// <param name="needRefresh">是否刷新三星 Tags。</param>
/// <param name="needForceRefresh">无招募许可时是否继续尝试刷新 Tags。</param>
/// <param name="useExpedited">是否使用加急许可。</param>
/// <param name="selectExtraTagsMode">
/// 公招选择额外tag的模式。可用值包括：
/// <list type="bullet">
/// <item>
/// <term><c>0</c></term>
/// <description>默认不选择额外tag。</description>
/// </item>
/// <item>
/// <term><c>1</c></term>
/// <description>选满至3个tag。</description>
/// </item>
/// <item>
/// <term><c>2</c></term>
/// <description>尽可能多选且只选四星以上的tag。</description>
/// </item>
/// </list>
/// </param>
/// <param name="skipRobot">是否在识别到小车词条时跳过。</param>
/// <param name="chooseLevel3Time">3 星招募时间</param>
/// <param name="chooseLevel4Time">4 星招募时间</param>
/// <param name="chooseLevel5Time">5 星招募时间</param>
/// <returns>是否成功。</returns>
public bool AsstAppendRecruit(
int maxTimes,
string[] firstTags,
int[] selectLevel,
int[] confirmLevel,
bool needRefresh,
bool needForceRefresh,
bool useExpedited,
int selectExtraTagsMode,
bool skipRobot,
int chooseLevel3Time,
int chooseLevel4Time,
int chooseLevel5Time)
{
var taskParams = new JObject
{
["refresh"] = needRefresh,
["force_refresh"] = needForceRefresh,
["select"] = new JArray(selectLevel),
["confirm"] = new JArray(confirmLevel),
["times"] = maxTimes,
["set_time"] = true,
["expedite"] = useExpedited,
["extra_tags_mode"] = selectExtraTagsMode,
["expedite_times"] = maxTimes,
["skip_robot"] = skipRobot,
["first_tags"] = new JArray(firstTags),
["recruitment_time"] = new JObject
{
["3"] = chooseLevel3Time,
["4"] = chooseLevel4Time,
["5"] = chooseLevel5Time,
},
["report_to_penguin"] = SettingsViewModel.GameSettings.EnablePenguin,
["report_to_yituliu"] = SettingsViewModel.GameSettings.EnableYituliu,
["penguin_id"] = SettingsViewModel.GameSettings.PenguinId,
["server"] = Instances.SettingsViewModel.ServerType,
};
AsstTaskId id = AsstAppendTaskWithEncoding(AsstTaskType.Recruit, taskParams);
_taskStatus.Add(id, TaskType.Recruit);
return id != 0;
}
private static JObject SerializeInfrastTaskParams(
IEnumerable<string> order,
string usesOfDrones,

11
src/MaaWpfGui/ViewModels/TaskViewModel.cs
View File

@@ -11,7 +11,9 @@
// but WITHOUT ANY WARRANTY
// </copyright>
#nullable enable
using System;
using MaaWpfGui.Main;
using MaaWpfGui.Services;
using Newtonsoft.Json.Linq;
using Stylet;
@@ -22,4 +24,13 @@ public class TaskViewModel : PropertyChangedBase
public virtual void ProcSubTaskMsg(AsstMsg msg, JObject details)
{
}
/// <summary>
/// 序列化MAA任务
/// </summary>
/// <returns>返回(Asst任务类型, 参数)</returns>
public virtual (AsstTaskType Type, JObject Params) Serialize()
{
throw new NotImplementedException();
}
}

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

@@ -1778,50 +1778,9 @@ namespace MaaWpfGui.ViewModels.UI
private static bool AppendRecruit()
{
// for debug
if (!int.TryParse(RecruitTask.RecruitMaxTimes, out var maxTimes))
{
maxTimes = 0;
}
var firstList = RecruitTask.AutoRecruitFirstList;
var reqList = new List<int>();
var cfmList = new List<int>();
if (RecruitTask.ChooseLevel3)
{
cfmList.Add(3);
}
if (RecruitTask.ChooseLevel4)
{
reqList.Add(4);
cfmList.Add(4);
}
// ReSharper disable once InvertIf
if (RecruitTask.ChooseLevel5)
{
reqList.Add(5);
cfmList.Add(5);
}
_ = int.TryParse(RecruitTask.SelectExtraTags, out var selectExtra);
return Instances.AsstProxy.AsstAppendRecruit(
maxTimes,
firstList.Cast<CombinedData>().Select(i => i.Value).ToArray(),
[.. reqList],
[.. cfmList],
RecruitTask.RefreshLevel3,
RecruitTask.ForceRefresh,
RecruitTask.UseExpedited,
selectExtra,
RecruitTask.NotChooseLevel1,
RecruitTask.ChooseLevel3Time,
RecruitTask.ChooseLevel4Time,
RecruitTask.ChooseLevel5Time);
// 被RemoteControlService反射调用，暂不移除
var (type, param) = RecruitTask.Serialize();
return Instances.AsstProxy.AsstAppendTaskWithEncoding(AsstProxy.TaskType.Recruit, type, param);
}
private static bool AppendRoguelike()

8
src/MaaWpfGui/ViewModels/UserControl/TaskQueue/ReclamationSettingsUserControlModel.cs
View File

@@ -138,7 +138,6 @@ public class ReclamationSettingsUserControlModel : TaskViewModel
/// <summary>
/// 自动生息演算。
/// </summary>
/// <param name="toolToCraft">要组装的支援道具。</param>
/// <param name="theme">生息演算主题["Tales"]</param>
/// <param name="mode">
/// 策略。可用值包括：
@@ -153,10 +152,11 @@ public class ReclamationSettingsUserControlModel : TaskViewModel
/// </item>
/// </list>
/// </param>
/// <param name="incrementMode">点击类型：0 连点；1 长按</param>
/// <param name="numCraftBatches">单次最大制造轮数</param>
/// <param name="increment_mode">点击类型：0 连点；1 长按</param>
/// <param name="num_craft_batches">单次最大制造轮数</param>
/// <param name="tools_to_craft">要组装的支援道具。</param>
/// <returns>返回(Asst任务类型, 参数)</returns>
public (AsstTaskType Type, JObject Params) Serialize()
public override (AsstTaskType Type, JObject Params) Serialize()
{
var data = new JObject
{

124
src/MaaWpfGui/ViewModels/UserControl/TaskQueue/RecruitSettingsUserControlModel.cs
View File

@@ -16,10 +16,16 @@ using System.Collections.Generic;
using System.Linq;
using MaaWpfGui.Constants;
using MaaWpfGui.Helper;
using MaaWpfGui.Services;
using MaaWpfGui.Utilities.ValueType;
using MaaWpfGui.ViewModels.UI;
using Newtonsoft.Json.Linq;
namespace MaaWpfGui.ViewModels.UserControl.TaskQueue;
/// <summary>
/// 自动公招model
/// </summary>
public class RecruitSettingsUserControlModel : TaskViewModel
{
static RecruitSettingsUserControlModel()
@@ -72,18 +78,18 @@ public class RecruitSettingsUserControlModel : TaskViewModel
}
}
private string _recruitMaxTimes = ConfigurationHelper.GetValue(ConfigurationKeys.RecruitMaxTimes, "4");
private int _recruitMaxTimes = int.TryParse(ConfigurationHelper.GetValue(ConfigurationKeys.RecruitMaxTimes, "4"), out var outMaxTimes) ? outMaxTimes : 4;
/// <summary>
/// Gets or sets the maximum times of recruit.
/// </summary>
public string RecruitMaxTimes
public int RecruitMaxTimes
{
get => _recruitMaxTimes;
set
{
SetAndNotify(ref _recruitMaxTimes, value);
ConfigurationHelper.SetValue(ConfigurationKeys.RecruitMaxTimes, value);
ConfigurationHelper.SetValue(ConfigurationKeys.RecruitMaxTimes, value.ToString());
}
}
@@ -128,40 +134,18 @@ public class RecruitSettingsUserControlModel : TaskViewModel
set => SetAndNotify(ref _useExpedited, value);
}
private string _selectExtraTags = ConfigurationHelper.GetValue(ConfigurationKeys.SelectExtraTags, "0");
private int _selectExtraTags = int.TryParse(ConfigurationHelper.GetValue(ConfigurationKeys.SelectExtraTags, "0"), out var outTags) ? outTags : 0;
/// <summary>
/// Gets or sets a value indicating three tags are always selected or select only rare tags as many as possible .
/// </summary>
public string SelectExtraTags
public int SelectExtraTags
{
get
{
if (int.TryParse(_selectExtraTags, out _))
{
return _selectExtraTags;
}
ConfigurationHelper.SetValue(ConfigurationKeys.SelectExtraTags, "0");
return "0";
// v4.28.0迁移，不再支持bool类型
/*
var value = "0";
if (bool.TryParse(_selectExtraTags, out bool boolValue))
{
value = boolValue ? "1" : "0";
}
SetAndNotify(ref _selectExtraTags, value);
ConfigurationHelper.SetValue(ConfigurationKeys.SelectExtraTags, value);
return value;*/
}
get => _selectExtraTags;
set
{
SetAndNotify(ref _selectExtraTags, value);
ConfigurationHelper.SetValue(ConfigurationKeys.SelectExtraTags, value);
ConfigurationHelper.SetValue(ConfigurationKeys.SelectExtraTags, value.ToString());
}
}
@@ -383,4 +367,86 @@ public class RecruitSettingsUserControlModel : TaskViewModel
SetAndNotify(ref _chooseLevel5Min, value % 60, nameof(ChooseLevel5Min));
}
}
/// <summary>
/// 公开招募。
/// </summary>
/// <param name="maxTimes">加急次数，仅在 <paramref name="useExpedited"/> 为 <see langword="true"/> 时有效。</param>
/// <param name="firstTags">首选 Tags，仅在 Tag 等级为 3 时有效。</param>
/// <param name="selectLevel">会去点击标签的 Tag 等级。</param>
/// <param name="confirmLevel">会去点击确认的 Tag 等级。若仅公招计算，可设置为空数组。</param>
/// <param name="needRefresh">是否刷新三星 Tags。</param>
/// <param name="needForceRefresh">无招募许可时是否继续尝试刷新 Tags。</param>
/// <param name="useExpedited">是否使用加急许可。</param>
/// <param name="selectExtraTagsMode">
/// 公招选择额外tag的模式。可用值包括：
/// <list type="bullet">
/// <item>
/// <term><c>0</c></term>
/// <description>默认不选择额外tag。</description>
/// </item>
/// <item>
/// <term><c>1</c></term>
/// <description>选满至3个tag。</description>
/// </item>
/// <item>
/// <term><c>2</c></term>
/// <description>尽可能多选且只选四星以上的tag。</description>
/// </item>
/// </list>
/// </param>
/// <param name="skipRobot">是否在识别到小车词条时跳过。</param>
/// <param name="chooseLevel3Time">3 星招募时间</param>
/// <param name="chooseLevel4Time">4 星招募时间</param>
/// <param name="chooseLevel5Time">5 星招募时间</param>
/// <returns>返回(Asst任务类型, 参数)</returns>
public override (AsstTaskType Type, JObject Params) Serialize()
{
var reqList = new List<int>();
var cfmList = new List<int>();
if (ChooseLevel3)
{
cfmList.Add(3);
}
if (ChooseLevel4)
{
reqList.Add(4);
cfmList.Add(4);
}
// ReSharper disable once InvertIf
if (ChooseLevel5)
{
reqList.Add(5);
cfmList.Add(5);
}
var param = new JObject
{
["refresh"] = RefreshLevel3,
["force_refresh"] = ForceRefresh,
["select"] = new JArray(reqList.ToArray()),
["confirm"] = new JArray(cfmList.ToArray()),
["times"] = RecruitMaxTimes,
["set_time"] = true,
["expedite"] = UseExpedited,
["extra_tags_mode"] = SelectExtraTags,
["expedite_times"] = RecruitMaxTimes,
["skip_robot"] = NotChooseLevel1,
["first_tags"] = new JArray(AutoRecruitFirstList.Cast<CombinedData>().Select(i => i.Value).ToArray()),
["recruitment_time"] = new JObject
{
["3"] = ChooseLevel3Time,
["4"] = ChooseLevel4Time,
["5"] = ChooseLevel5Time,
},
["report_to_penguin"] = SettingsViewModel.GameSettings.EnablePenguin,
["report_to_yituliu"] = SettingsViewModel.GameSettings.EnableYituliu,
["penguin_id"] = SettingsViewModel.GameSettings.PenguinId,
["server"] = Instances.SettingsViewModel.ServerType,
};
return (AsstTaskType.Recruit, param);
}
}