From 2b7708b219eff9ff43d31d25384635270dbe6800 Mon Sep 17 00:00:00 2001 From: uye <99072975+ABA2396@users.noreply.github.com> Date: Sat, 12 Jul 2025 22:44:25 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=8F=8A=E5=9F=BA=E5=BB=BA=E8=AE=BE=E6=96=BD=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaWpfGui/Main/AsstProxy.cs | 12 +++++++----- src/MaaWpfGui/Res/Localizations/en-us.xaml | 5 +++++ src/MaaWpfGui/Res/Localizations/ja-jp.xaml | 5 +++++ src/MaaWpfGui/Res/Localizations/ko-kr.xaml | 5 +++++ src/MaaWpfGui/Res/Localizations/zh-cn.xaml | 5 +++++ src/MaaWpfGui/Res/Localizations/zh-tw.xaml | 5 +++++ 6 files changed, 32 insertions(+), 5 deletions(-) diff --git a/src/MaaWpfGui/Main/AsstProxy.cs b/src/MaaWpfGui/Main/AsstProxy.cs index 174e279085..e7224c9768 100644 --- a/src/MaaWpfGui/Main/AsstProxy.cs +++ b/src/MaaWpfGui/Main/AsstProxy.cs @@ -889,7 +889,7 @@ namespace MaaWpfGui.Main case AsstMsg.TaskChainStart: { - Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("StartTask") + taskChain); + Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("StartTask") + LocalizationHelper.GetString(taskChain)); TaskStatusUpdate(taskId, TaskStatus.InProgress); break; } @@ -917,11 +917,11 @@ namespace MaaWpfGui.Main if (taskChain == "Fight" && FightTask.SanityReport is not null) { var sanityLog = "\n" + string.Format(LocalizationHelper.GetString("CurrentSanity"), FightTask.SanityReport.SanityCurrent, FightTask.SanityReport.SanityMax); - Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("CompleteTask") + taskChain + sanityLog); + Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("CompleteTask") + LocalizationHelper.GetString(taskChain) + sanityLog); } else { - Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("CompleteTask") + taskChain); + Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("CompleteTask") + LocalizationHelper.GetString(taskChain)); } if (isCopilotTaskChain) @@ -1066,7 +1066,7 @@ namespace MaaWpfGui.Main } else if (isCopilotTaskChain) { - ToastNotification.ShowDirect(LocalizationHelper.GetString("CompleteTask") + taskChain); + ToastNotification.ShowDirect(LocalizationHelper.GetString("CompleteTask") + LocalizationHelper.GetString(taskChain)); } if (buyWine) @@ -1531,7 +1531,9 @@ namespace MaaWpfGui.Main } case "EnterFacility": - Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("ThisFacility") + subTaskDetails!["facility"] + " " + (int)(subTaskDetails["index"] ?? -1)); + Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("ThisFacility") + + LocalizationHelper.GetString($"{subTaskDetails?["facility"]}") + " " + + ((int)(subTaskDetails?["index"] ?? -2) + 1).ToString("D2")); break; case "ProductIncorrect": diff --git a/src/MaaWpfGui/Res/Localizations/en-us.xaml b/src/MaaWpfGui/Res/Localizations/en-us.xaml index 6a8b8a06e1..49245ebef4 100644 --- a/src/MaaWpfGui/Res/Localizations/en-us.xaml +++ b/src/MaaWpfGui/Res/Localizations/en-us.xaml @@ -514,12 +514,17 @@ The primary instance is 0, and other instances are the numbers after the version Farming Login + {key=WakeUp} Auto Recruit + {key=Recruiting} Base + {key=Base} Combat + {key=Combat} Visit Friends Credit Store Collect Rewards + {key=Mission} Auto I.S. Reclamation Algorithm Mini-Games diff --git a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml index e9ae3d55a4..0364f999ba 100644 --- a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml +++ b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml @@ -516,12 +516,17 @@ C:\\leidian\\LDPlayer9 スタート ウェイクアップ + {key=WakeUp} 公開求人 + {key=Recruiting} 基地仕事 + {key=Base} 作戦 + {key=Combat} 戦友訪問 FP獲得と交換 報酬受取 + {key=Mission} 自動ローグ 生息演算 ミニゲーム diff --git a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml index fefb059629..8b89567c30 100644 --- a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml +++ b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml @@ -515,12 +515,17 @@ C:\\leidian\\LDPlayer9 시작 로그인 + {key=WakeUp} 공개모집 + {key=Recruiting} 기반시설 교대 + {key=Base} 이성 사용 + {key=Combat} 친구 방문 크레딧 수급 및 상점 보상 수령 + {key=Mission} 통합전략 생존연산 미니게임 diff --git a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml index f5074fe384..c004bb0856 100644 --- a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml +++ b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml @@ -515,12 +515,17 @@ C:\\leidian\\LDPlayer9。\n 一键长草 开始唤醒 + {key=WakeUp} 自动公招 + {key=Recruiting} 基建换班 + {key=Base} 刷理智 + {key=Combat} 访问好友 获取信用及购物 领取奖励 + {key=Mission} 自动肉鸽 生息演算 小游戏 diff --git a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml index ce9b13c011..527a8e7151 100644 --- a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml +++ b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml @@ -513,12 +513,17 @@ C:\\leidian\\LDPlayer9。\n 一鍵長草 開始喚醒 + {key=WakeUp} 自動公招 + {key=Recruiting} 基建換班 + {key=Base} 刷理智 + {key=Combat} 訪問好友 獲取信用及購物 領取獎勵 + {key=Mission} 自動肉鴿 生息演算 小遊戲