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

perf: 移除不可达代码

Browse Source 
[skip changelog]
This commit is contained in:
status102
2024-03-06 14:54:08 +08:00
parent 2ebed924e6
commit 3b31ca5865
2 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -496,6 +496,7 @@ namespace MaaWpfGui.Main
{
Instances.TaskQueueViewModel.AddLog(message, color);
Instances.CopilotViewModel.AddLog(message, color);
HasPrintedScreencapWarning = true;
}
switch (screencapCostAvgInt)
@@ -503,12 +504,10 @@ namespace MaaWpfGui.Main
case >= 800:
AddLog(string.Format(LocalizationHelper.GetString("FastestWayToScreencapErrorTip"), screencapCostAvgInt), UiLogColor.Error);
AddLog(string.Format(LocalizationHelper.GetString("OptimizationTips"), screencapCostAvgInt), UiLogColor.Error);
HasPrintedScreencapWarning = true;
break;
case >= 400:
AddLog(string.Format(LocalizationHelper.GetString("FastestWayToScreencapWarningTip"), screencapCostAvgInt), UiLogColor.Warning);
AddLog(string.Format(LocalizationHelper.GetString("OptimizationTips"), screencapCostAvgInt), UiLogColor.Warning);
HasPrintedScreencapWarning = true;
break;
}
}

22
src/MaaWpfGui/ViewModels/UI/CopilotViewModel.cs
View File

@@ -268,7 +268,7 @@ namespace MaaWpfGui.ViewModels.UI
private const string TempCopilotFile = "cache/_temp_copilot.json";
private string _taskType = "General";
private const string StageNameRegex = @"(?:[a-z]{0,3})(?:\d{0,2})-(?:(?:A|B|C|D|EX|S|TR)-)?(?:\d{1,2})(\(Raid\))?";
private const string StageNameRegex = @"(?:[a-z]{0,3})(?:\d{0,2})-(?:(?:A|B|C|D|EX|S|TR|MO)-)?(?:\d{1,2})(\(Raid\))?";
/// <summary>
/// 为自动战斗列表匹配名字
@@ -317,7 +317,6 @@ namespace MaaWpfGui.ViewModels.UI
if (doc != null && doc.TryGetValue("title", out var titleValue))
{
title = titleValue.ToString();
CopilotTaskName = FindStageName((IsDataFromWeb ? string.Empty : _filename).Split(Path.DirectorySeparatorChar).LastOrDefault()?.Split('.').FirstOrDefault() ?? string.Empty, title);
}
@@ -355,18 +354,7 @@ namespace MaaWpfGui.ViewModels.UI
CopilotUrl = MaaUrls.BilibiliVideo + match.Value;
break;
}
if (string.IsNullOrEmpty(CopilotUrl))
{
linkParser = new Regex(@"(?:https?://)\S+\b", RegexOptions.Compiled | RegexOptions.IgnoreCase);
foreach (Match m in linkParser.Matches(details))
{
CopilotUrl = m.Value;
break;
}
}
}
}// 视频链接
}
AddLog(string.Empty, UiLogColor.Message);
@@ -935,7 +923,7 @@ namespace MaaWpfGui.ViewModels.UI
UserAdditional = UserAdditional.Replace("，", ",").Replace("；", ";").Trim();
Regex regex = new Regex(@"(?<=;)(?<name>[^,;]+)(?:, *(?<skill>\d))?(?=;)", RegexOptions.Compiled);
JArray mUserAdditional = new(regex.Matches(";" + UserAdditional + ";").ToList().Select(match => new JObject
JArray userAdditional = new(regex.Matches(";" + UserAdditional + ";").ToList().Select(match => new JObject
{
["name"] = match.Groups[1].Value.Trim(),
["skill"] = string.IsNullOrEmpty(match.Groups[2].Value) ? 0 : int.Parse(match.Groups[2].Value),
@@ -949,7 +937,7 @@ namespace MaaWpfGui.ViewModels.UI
foreach (var model in CopilotItemViewModels.Where(i => i.IsChecked))
{
_copilotIdList.Add(model.CopilotId);
ret &= Instances.AsstProxy.AsstStartCopilot(model.FilePath, Form, AddTrust, AddUserAdditional, mUserAdditional, UseCopilotList, model.Name, model.IsRaid, _taskType, Loop ? LoopTimes : 1, _useSanityPotion, false);
ret &= Instances.AsstProxy.AsstStartCopilot(model.FilePath, Form, AddTrust, AddUserAdditional, userAdditional, UseCopilotList, model.Name, model.IsRaid, _taskType, Loop ? LoopTimes : 1, _useSanityPotion, false);
startAny = true;
}
@@ -965,7 +953,7 @@ namespace MaaWpfGui.ViewModels.UI
}
else
{
ret &= Instances.AsstProxy.AsstStartCopilot(IsDataFromWeb ? TempCopilotFile : Filename, Form, AddTrust, AddUserAdditional, mUserAdditional, UseCopilotList, string.Empty, false, _taskType, Loop ? LoopTimes : 1, _useSanityPotion);
ret &= Instances.AsstProxy.AsstStartCopilot(IsDataFromWeb ? TempCopilotFile : Filename, Form, AddTrust, AddUserAdditional, userAdditional, UseCopilotList, string.Empty, false, _taskType, Loop ? LoopTimes : 1, _useSanityPotion);
}
if (ret)