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

perf: 自动战斗-战斗列表 批量导入关卡名正则优化 (#9723)

Browse Source
This commit is contained in:
status102
2024-07-18 19:14:58 +08:00
committed by GitHub
parent afb706bab6 d1183830bd
commit b78f6ed14f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -345,7 +345,7 @@ namespace MaaWpfGui.Main
private void CallbackFunction(int msg, AsstHandle jsonBuffer, AsstHandle customArg)
{
string jsonStr = PtrToStringCustom(jsonBuffer, Encoding.UTF8);
var jsonStr = PtrToStringCustom(jsonBuffer, Encoding.UTF8);
// Console.WriteLine(json_str);
var json = (JObject?)JsonConvert.DeserializeObject(jsonStr);

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

@@ -283,7 +283,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|MO)-)?(?:\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\)(?=\.json))?";
/// <summary>
/// 为自动战斗列表匹配名字
@@ -299,7 +299,7 @@ namespace MaaWpfGui.ViewModels.UI
}
// 一旦有由小写字母、数字、'-'组成的name则视为关卡名直接使用
var directName = names.FirstOrDefault(name => name.ToLower().All(c => (c >= 'a' && c <= 'z') || (c >= '0' && c <= '9') || c == '-'));
var directName = names.FirstOrDefault(name => Regex.IsMatch(name.ToLower(), @"^[0-9a-z\-]+$"));
if (!string.IsNullOrEmpty(directName))
{
return directName;
@@ -589,7 +589,7 @@ namespace MaaWpfGui.ViewModels.UI
}
var fileName = fileInfo.Name[..^fileInfo.Extension.Length];
var stageName = FindStageName(fileName);
var stageName = FindStageName(fileInfo.Name, fileName);
if (string.IsNullOrEmpty(stageName))
{