From 09cc23188c5c91cd0a3afc44d96cd3f4ef31a2e5 Mon Sep 17 00:00:00 2001 From: uye <99072975+ABA2396@users.noreply.github.com> Date: Fri, 10 Nov 2023 14:06:43 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BF=AE=E6=94=B9=E6=B8=B8=E6=88=8F?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=9B=B4=E6=96=B0=E5=90=8E=E7=9A=84=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaWpfGui/Models/ResourceUpdater.cs | 12 ++++++++++-- src/MaaWpfGui/Res/Localizations/en-us.xaml | 1 + src/MaaWpfGui/Res/Localizations/ja-jp.xaml | 1 + src/MaaWpfGui/Res/Localizations/ko-kr.xaml | 1 + src/MaaWpfGui/Res/Localizations/zh-cn.xaml | 1 + src/MaaWpfGui/Res/Localizations/zh-tw.xaml | 1 + 6 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/MaaWpfGui/Models/ResourceUpdater.cs b/src/MaaWpfGui/Models/ResourceUpdater.cs index d3b6d09fe7..bab1e75d49 100644 --- a/src/MaaWpfGui/Models/ResourceUpdater.cs +++ b/src/MaaWpfGui/Models/ResourceUpdater.cs @@ -210,10 +210,12 @@ namespace MaaWpfGui.Models if (ret1 != UpdateResult.Success && ret2 != UpdateResult.Success) { + OutputDownloadProgress(LocalizationHelper.GetString("GameResourceNotModified")); return UpdateResult.NotModified; } PostProcVersionChecks(); + OutputDownloadProgress(LocalizationHelper.GetString("GameResourceUpdated")); return UpdateResult.Success; } @@ -244,6 +246,7 @@ namespace MaaWpfGui.Models } } + OutputDownloadProgress(2, "Update completed"); return ret; } @@ -299,6 +302,7 @@ namespace MaaWpfGui.Models } } + OutputDownloadProgress(1, "Update completed"); return ret; } @@ -346,8 +350,12 @@ namespace MaaWpfGui.Models private static void OutputDownloadProgress(int index, int count = 0, int maxCount = 1) { - OutputDownloadProgress( - $"index {index}/2: {count}/{maxCount}({100 * count / maxCount}%)"); + OutputDownloadProgress(index, $"{count}/{maxCount}({100 * count / maxCount}%)"); + } + + private static void OutputDownloadProgress(int index, string output) + { + OutputDownloadProgress($"index {index}/2: {output}"); } private static void OutputDownloadProgress(string output) diff --git a/src/MaaWpfGui/Res/Localizations/en-us.xaml b/src/MaaWpfGui/Res/Localizations/en-us.xaml index a394a0c0b1..497ed56738 100644 --- a/src/MaaWpfGui/Res/Localizations/en-us.xaml +++ b/src/MaaWpfGui/Res/Localizations/en-us.xaml @@ -689,6 +689,7 @@ The video aspect ratio needs to be 16:9 without interference factors such as bla Stage data retrieval successful Game resources are being updated. + Game resource updated. Game resource updated, please restart MAA. Game resource update failed, please try again later. diff --git a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml index a183d8115d..db1948bbf4 100644 --- a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml +++ b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml @@ -689,6 +689,7 @@ Bilibili: ログイン インターフェイスに表示されるアカウント ステージデータの取得に成功しました ゲームリソースが更新中です。 + ゲームリソースが更新されました。 ゲームリソースが更新されました。MAAを再起動してください。 ゲームリソースの更新に失敗しました。後でもう一度お試しください。 diff --git a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml index 1c19506817..116437b223 100644 --- a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml +++ b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml @@ -689,6 +689,7 @@ Bilibili: 로그인 인터페이스에 표시되는 계정 이름(예: 장산) 스테이지 데이터 획득 성공 게임 자원이 업데이트 중입니다. + 게임 리소스가 업데이트되었으니. 게임 리소스가 업데이트되었으니 MAA를 다시 시작해주세요. 게임 자원 업데이트 실패, 나중에 다시 시도해주세요. diff --git a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml index dd6cebb336..6085c2b826 100644 --- a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml +++ b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml @@ -689,6 +689,7 @@ 关卡数据获取成功 游戏资源正在更新 + 游戏资源已更新。 游戏资源已更新,请重启 MAA。 游戏资源更新失败,请稍后尝试。 diff --git a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml index 6e0ad93641..4e9efb845d 100644 --- a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml +++ b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml @@ -689,6 +689,7 @@ 關卡數據獲取成功 遊戲資源正在更新 + 遊戲資源已更新。 遊戲資源已更新,請重啟 MAA。 遊戲資源更新失敗,請稍後嘗試。