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

docs: 修改""为「」

Browse Source
This commit is contained in:
status102
2023-09-18 10:01:56 +08:00
parent 163b519c81
commit 64f04b648a
6 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/MaaWpfGui/Res/Localizations/en-us.xaml
View File

@@ -445,7 +445,7 @@ The video aspect ratio needs to be 16:9 without interference factors such as bla
<system:String x:Key="AutoSquadTip">「Favourite」 marked operators cannot be recognized at this time</system:String>
<system:String x:Key="AddTrust">Add low-trust operators</system:String>
<system:String x:Key="AddUserAdditional">Add custom operators</system:String>
<system:String x:Key="AddUserAdditionalTip">Use ";" as the separator, "," to separate the operator name and skills, for example: W, 3; Ash, 2</system:String>
<system:String x:Key="AddUserAdditionalTip">Use「;」as the separator,「,」to separate the operator name and skills, for example: W, 3; Ash, 2</system:String>
<system:String x:Key="UseCopilotList">Battle list</system:String>
<system:String x:Key="UseCopilotListTip">Please switch to the level selection page before starting</system:String>
<system:String x:Key="CopilotAddTask">Right click to add raid difficulty</system:String>

2
src/MaaWpfGui/Res/Localizations/ko-kr.xaml
View File

@@ -449,7 +449,7 @@ Bilibili: 로그인 인터페이스에 표시되는 계정 이름(예: Zhang San
<system:String x:Key="AutoSquadTip">자동 편성은 '선호' 오퍼레이터를 인식할 수 없습니다</system:String>
<system:String x:Key="AddTrust">신뢰도가 낮은 운영자 추가</system:String>
<system:String x:Key="AddUserAdditional">맞춤 연산자 추가</system:String>
<system:String x:Key="AddUserAdditionalTip">사용 ";" 운영자 이름과 기술을 구분하기 위해 구분 기호 ","를 사용합니다. 예: W, 3; Ash, 2</system:String>
<system:String x:Key="AddUserAdditionalTip">사용「;」운영자 이름과 기술을 구분하기 위해 구분 기호「,」를 사용합니다. 예: W, 3; Ash, 2</system:String>
<system:String x:Key="UseCopilotList">전투 목록</system:String>
<system:String x:Key="UseCopilotListTip">시작하기 전에 레벨 선택 페이지로 전환하세요</system:String>
<system:String x:Key="CopilotAddTask">공격대 난이도를 추가하려면 마우스 오른쪽 버튼을 클릭하세요.</system:String>

2
src/MaaWpfGui/Res/Localizations/zh-cn.xaml
View File

@@ -466,7 +466,7 @@
<system:String x:Key="AutoSquadTip">自动编队暂时无法识别「特别关注」的干员</system:String>
<system:String x:Key="AddTrust">补充低信赖干员</system:String>
<system:String x:Key="AddUserAdditional">追加自定干员</system:String>
<system:String x:Key="AddUserAdditionalTip">以英文";"为分隔符，英文","分隔干员名与技能，例: 史尔特尔,3;艾雅法拉,1</system:String>
<system:String x:Key="AddUserAdditionalTip">以英文「;」为分隔符，英文「,」分隔干员名与技能，例: 史尔特尔,3;艾雅法拉,1</system:String>
<system:String x:Key="LoopTimes">循环次数</system:String>
<system:String x:Key="UseCopilotList">战斗列表</system:String>
<system:String x:Key="UseCopilotListTip">开始前请切换至关卡选择页面</system:String>

2
src/MaaWpfGui/Res/Localizations/zh-tw.xaml
View File

@@ -447,7 +447,7 @@
<system:String x:Key="AutoSquadTip">自動編隊暫時無法辨識「特別關注」的幹員</system:String>
<system:String x:Key="AddTrust">補充低信賴幹員</system:String>
<system:String x:Key="AddUserAdditional">追加自定幹員</system:String>
<system:String x:Key="AddUserAdditionalTip">使用";"作為分隔符，用","分隔操作員姓名和技能，例：史尔特尔,3;艾雅法拉,1</system:String>
<system:String x:Key="AddUserAdditionalTip">使用「;」作為分隔符，用「,」分隔操作員姓名和技能，例：史尔特尔,3;艾雅法拉,1</system:String>
<system:String x:Key="UseCopilotList">戰鬥列表</system:String>
<system:String x:Key="UseCopilotListTip">開始前請切換至關卡選擇頁面</system:String>
<system:String x:Key="CopilotAddTask">右鍵添加突襲難度</system:String>

2
src/MaaWpfGui/ViewModels/CopilotItemViewModel.cs
View File

@@ -1,7 +1,5 @@
using System.Security.RightsManagement;
using MaaWpfGui.Helper;
using Stylet;
using Vanara.PInvoke;
namespace MaaWpfGui.ViewModels
{

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

@@ -52,7 +52,7 @@ namespace MaaWpfGui.ViewModels.UI
/// <summary>
/// Gets or private sets the view models of Copilot items.
/// </summary>
public ObservableCollection<CopilotItemViewModel> CopilotItemViewModels { get; private set; } = new ObservableCollection<CopilotItemViewModel>();
public ObservableCollection<CopilotItemViewModel> CopilotItemViewModels { get; } = new ObservableCollection<CopilotItemViewModel>();
/// <summary>
/// Initializes a new instance of the <see cref="CopilotViewModel"/> class.
@@ -567,7 +567,7 @@ namespace MaaWpfGui.ViewModels.UI
}
}
private static string copilotJsonDir = "cache/copilot";
private const string CopilotJsonDir = "cache/copilot";
public void AddCopilotTask()
{
@@ -594,13 +594,13 @@ namespace MaaWpfGui.ViewModels.UI
public void AddCopilotTaskToList(string stage_name)
{
var jsonPath = $"{copilotJsonDir}/{stage_name}.json";
var jsonPath = $"{CopilotJsonDir}/{stage_name}.json";
try
{
Directory.CreateDirectory(copilotJsonDir);
Directory.CreateDirectory(CopilotJsonDir);
}
catch
catch (Exception)
{
}
@@ -628,7 +628,7 @@ namespace MaaWpfGui.ViewModels.UI
["name"] = item.Name,
["file_path"] = item.FilePath,
["is_checked"] = item.IsChecked,
}).ToArray());
}).ToList());
ConfigurationHelper.SetValue(ConfigurationKeys.CopilotTaskList, JsonConvert.SerializeObject(jArray));
}
@@ -744,7 +744,7 @@ namespace MaaWpfGui.ViewModels.UI
JArray mUserAdditional = new JArray();
Regex regex = new Regex(@"(?<=;)(?<name>[^,;]+)(?:, *(?<skill>\d))? *", RegexOptions.Compiled);
MatchCollection matches = regex.Matches(";" + UserAdditional);
MatchCollection matches = regex.Matches(";" + UserAdditional.Replace("，", ",").Replace("；", ";"));
foreach (Match match in matches)
{
mUserAdditional.Add(new JObject