mirror of
https://github.com/MaaAssistantArknights/MaaAssistantArknights.git
synced 2026-07-19 02:23:01 +08:00
chore: 移除视频识别
This commit is contained in:
@@ -19,6 +19,7 @@ using static MaaWpfGui.Main.AsstProxy;
|
||||
|
||||
namespace MaaWpfGui.Configuration.Single.MaaTask;
|
||||
|
||||
// [JsonDerivedType(typeof(VideoRecognition), typeDiscriminator: nameof(VideoRecognition))]
|
||||
[JsonDerivedType(typeof(StartUpTask), typeDiscriminator: nameof(StartUpTask))]
|
||||
[JsonDerivedType(typeof(CloseDownTask), typeDiscriminator: nameof(CloseDownTask))]
|
||||
[JsonDerivedType(typeof(FightTask), typeDiscriminator: nameof(FightTask))]
|
||||
@@ -30,7 +31,6 @@ namespace MaaWpfGui.Configuration.Single.MaaTask;
|
||||
[JsonDerivedType(typeof(CopilotTask), typeDiscriminator: nameof(CopilotTask))]
|
||||
[JsonDerivedType(typeof(SSSCopilotTask), typeDiscriminator: nameof(SSSCopilotTask))]
|
||||
[JsonDerivedType(typeof(SingleStepTask), typeDiscriminator: nameof(SingleStepTask))]
|
||||
[JsonDerivedType(typeof(VideoRecognition), typeDiscriminator: nameof(VideoRecognition))]
|
||||
[JsonDerivedType(typeof(DepotTask), typeDiscriminator: nameof(DepotTask))]
|
||||
[JsonDerivedType(typeof(OperBoxTask), typeDiscriminator: nameof(OperBoxTask))]
|
||||
[JsonDerivedType(typeof(ReclamationTask), typeDiscriminator: nameof(ReclamationTask))]
|
||||
@@ -78,9 +78,11 @@ public class SingleStepTask : BaseTask
|
||||
{
|
||||
}
|
||||
|
||||
/*
|
||||
public class VideoRecognition : BaseTask
|
||||
{
|
||||
}
|
||||
*/
|
||||
|
||||
public class DepotTask : BaseTask
|
||||
{
|
||||
|
||||
@@ -995,7 +995,7 @@ public class AsstProxy
|
||||
}
|
||||
}
|
||||
|
||||
bool isCopilotTaskChain = taskChain is "Copilot" or "SSSCopilot" or "VideoRecognition";
|
||||
bool isCopilotTaskChain = taskChain is "Copilot" or "SSSCopilot"; /* or "VideoRecognition"; */
|
||||
|
||||
switch (msg)
|
||||
{
|
||||
@@ -1019,7 +1019,7 @@ public class AsstProxy
|
||||
{
|
||||
Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("AnnihilationTaskFailed"), UiLogColor.Warning);
|
||||
}
|
||||
else if (value is { Type: TaskType.Copilot } or { Type: TaskType.VideoRec })
|
||||
else if (value is { Type: TaskType.Copilot }) /* or { Type: TaskType.VideoRec }) */
|
||||
{
|
||||
Instances.CopilotViewModel.AddLog(LocalizationHelper.GetString("CombatError"), UiLogColor.Error);
|
||||
AchievementTrackerHelper.Instance.Unlock(AchievementIds.CopilotError);
|
||||
@@ -1050,7 +1050,7 @@ public class AsstProxy
|
||||
TaskStatusUpdate(taskId, TaskStatus.InProgress);
|
||||
|
||||
// LinkStart 按钮也会修改,但小工具中的日志源需要在这里修改
|
||||
Instances.OverlayViewModel.LogItemsSource = (taskChain is "Copilot" or "SSSCopilot" or "VideoRecognition")
|
||||
Instances.OverlayViewModel.LogItemsSource = (taskChain is "Copilot" or "SSSCopilot") /* or "VideoRecognition") */
|
||||
? Instances.CopilotViewModel.LogItemViewModels
|
||||
: Instances.TaskQueueViewModel.LogItemViewModels;
|
||||
|
||||
@@ -1710,9 +1710,11 @@ public class AsstProxy
|
||||
ProcRecruitCalcMsg(details);
|
||||
break;
|
||||
|
||||
/*
|
||||
case "VideoRecognition":
|
||||
ProcVideoRecMsg(details);
|
||||
break;
|
||||
*/
|
||||
}
|
||||
|
||||
var subTaskDetails = details["details"];
|
||||
@@ -2522,8 +2524,10 @@ public class AsstProxy
|
||||
/// <summary>自动战斗</summary>
|
||||
Copilot,
|
||||
|
||||
/*
|
||||
/// <summary>视频识别(真有人用吗)</summary>
|
||||
VideoRec,
|
||||
*/
|
||||
|
||||
/// <summary>仓库识别</summary>
|
||||
Depot,
|
||||
@@ -2661,6 +2665,7 @@ public class AsstProxy
|
||||
return AsstAppendTaskWithEncoding(TaskType.MiniGame, type, param) && AsstStart();
|
||||
}
|
||||
|
||||
/*
|
||||
/// <summary>
|
||||
/// 视频识别。
|
||||
/// </summary>
|
||||
@@ -2675,6 +2680,7 @@ public class AsstProxy
|
||||
_tasksStatus.Add(id, (TaskType.Copilot, TaskStatus.Idle));
|
||||
return id != 0 && AsstStart();
|
||||
}
|
||||
*/
|
||||
|
||||
public bool AsstAppendTaskWithEncoding(TaskType wpfTasktype, AsstBaseTask task)
|
||||
{
|
||||
|
||||
@@ -154,10 +154,12 @@ public enum AsstTaskType : byte
|
||||
/// </summary>
|
||||
SingleStep,
|
||||
|
||||
/*
|
||||
/// <summary>
|
||||
/// 视频识别
|
||||
/// </summary>
|
||||
VideoRecognition,
|
||||
*/
|
||||
|
||||
/// <summary>
|
||||
/// 仓库识别
|
||||
|
||||
@@ -67,7 +67,9 @@ public partial class CopilotViewModel : Screen
|
||||
private CopilotBase? _copilotCache;
|
||||
private const string CopilotIdPrefix = "maa://";
|
||||
private static readonly string TempCopilotFile = Path.Combine(CacheDir, "_temp_copilot.json");
|
||||
private static readonly string[] _supportExt = [".json", ".mp4", ".m4s", ".mkv", ".flv", ".avi"];
|
||||
|
||||
// VideoRecognition 已不支持:仅保留 json 作业
|
||||
private static readonly string[] _supportExt = [".json"];
|
||||
private static readonly string CopilotJsonDir = Path.Combine(ConfigDir, "copilot");
|
||||
private const string StageNameRegex = @"(?:[a-z]{0,3})(?:\d{0,2})-(?:(?:A|B|C|D|EX|S|TR|MO)-?)?(?:\d{1,2})";
|
||||
private const string InvalidStageNameChars = @"[:',\.\(\)\|\[\]\?,。【】{};:]"; // 无效字符
|
||||
@@ -810,7 +812,7 @@ public partial class CopilotViewModel : Screen
|
||||
public void SelectFile()
|
||||
{
|
||||
var dialog = new OpenFileDialog {
|
||||
Filter = "JSON|*.json|Video|*.mp4;*.m4s;*.mkv;*.flv;*.avi",
|
||||
Filter = "JSON|*.json",
|
||||
};
|
||||
|
||||
if (dialog.ShowDialog() == true)
|
||||
@@ -1031,7 +1033,7 @@ public partial class CopilotViewModel : Screen
|
||||
bool isJsonFile = filename.ToLower().EndsWith(".json") || fileSize < 4 * 1024 * 1024;
|
||||
if (!isJsonFile)
|
||||
{
|
||||
_taskType = AsstTaskType.VideoRecognition;
|
||||
AddLog(LocalizationHelper.GetString("NotCopilotJson"), UiLogColor.Error, showTime: false);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1736,7 +1738,11 @@ public partial class CopilotViewModel : Screen
|
||||
|
||||
Instances.OverlayViewModel.LogItemsSource = LogItemViewModels;
|
||||
|
||||
if (_taskType == AsstTaskType.VideoRecognition)
|
||||
// if (_taskType == AsstTaskType.VideoRecognition)
|
||||
// {
|
||||
// _ = StartVideoTask();
|
||||
// return;
|
||||
// }
|
||||
{
|
||||
_ = StartVideoTask();
|
||||
return;
|
||||
|
||||
@@ -389,6 +389,7 @@
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
</TabItem>
|
||||
<!--
|
||||
<TabItem Header="{DynamicResource VideoRecognition}" Visibility="Collapsed">
|
||||
<controls:TextBlock
|
||||
Height="80"
|
||||
@@ -401,6 +402,7 @@
|
||||
Text="{DynamicResource VideoRecognitionTips}"
|
||||
TextWrapping="Wrap" />
|
||||
</TabItem>
|
||||
-->
|
||||
<TabItem Header="{DynamicResource Gacha}">
|
||||
<Grid Margin="20,0,20,0">
|
||||
<Grid.RowDefinitions>
|
||||
|
||||
Reference in New Issue
Block a user