From ff6c682e1b3755443dc06e60594d5544df2b1892 Mon Sep 17 00:00:00 2001 From: Masterain Date: Fri, 31 May 2024 10:16:41 -0700 Subject: [PATCH 01/15] New translations sh.resx (Chinese Traditional) --- .../Resource/Localization/SH.zh-Hant.resx | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.zh-Hant.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.zh-Hant.resx index 57bf7253..27aeea2c 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.zh-Hant.resx +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.zh-Hant.resx @@ -121,7 +121,7 @@ 胡桃 Dev {0} - 胡桃Dev {0} [系統管理员] + 胡桃 Dev {0} [系統管理員] 胡桃 {0} [系統管理員] @@ -166,7 +166,7 @@ 數據庫已損壞：{0} - 用户數據已損壞：{0} + 用戶數據已損壞：{0} 請勿在系統管理員模式下使用此功能 {0} @@ -274,13 +274,13 @@ 上場 {0} 次 - 渠道伺服器 + 渠道服 - 官方伺服器 + 官方服 - 國際伺服器 + 國際服 網絡異常 @@ -573,7 +573,7 @@ 上傳了 UID：{0} 的 {1} 筆祈願記錄，儲存了 {2} 筆 - 請先登入或注冊胡桃帳號 + 請先登入或註冊胡桃帳號 登入成功 @@ -1011,7 +1011,7 @@ 無法找到遊戲本體路徑，請前往設定修改 - 未開啟長路徑功能，無法設定註冊表鍵值 + 未開啟長路徑功能，無法設定登錄檔鍵值 無法讀取遊戲設定檔 {0}，可能是檔案不存在 @@ -3225,10 +3225,10 @@ 無效的 UID - 大陸伺服器 官方伺服器 + 陸服 官方服 - 大陸伺服器 渠道伺服器 + 陸服 渠道服 國際服 亞服 From e34e87359f719a25ba72f690bf3913ca233ca3a2 Mon Sep 17 00:00:00 2001 From: Masterain Date: Sat, 1 Jun 2024 09:51:13 -0700 Subject: [PATCH 02/15] New translations sh.resx (Chinese Traditional) --- .../Snap.Hutao/Resource/Localization/SH.zh-Hant.resx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.zh-Hant.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.zh-Hant.resx index 27aeea2c..7037d8f1 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.zh-Hant.resx +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.zh-Hant.resx @@ -1878,7 +1878,7 @@ 同步角色天賦信息 - 從 HoYoLAB 戰績同步 + 從 HoYoLAB - 戰績同步 同步角色天賦外的大部分信息 @@ -2961,7 +2961,7 @@ 工具 - 米遊社 + 米游社 HoYoLAB @@ -3174,7 +3174,7 @@ {0} 秒 - 驗證失敗，請手動進行驗證或前往「 HoYoLAB -工具箱-戰績-即時便箋」頁面查看。 + 驗證失敗，請手動進行驗證或前往「米游社-旅行工具-原神战绩-实时便笺」頁面查看。 錯誤的 UID 格式 @@ -3246,7 +3246,7 @@ 胡桃服務維護中 - 驗證失敗，請手動進行驗證或前往「 HoYoLAB -工具箱-戰績」頁面查看。 + 驗證失敗，請手動進行驗證或前往「米游社-旅行工具-原神战绩」頁面查看。 狀態：{0} | 信息：{1} From 5859ca3c12ab334673390cfef9dd720768fd39dd Mon Sep 17 00:00:00 2001 From: Masterain Date: Sat, 1 Jun 2024 11:19:36 -0700 Subject: [PATCH 03/15] New translations sh.resx (Chinese Traditional) --- src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.zh-Hant.resx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.zh-Hant.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.zh-Hant.resx index 7037d8f1..278322aa 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.zh-Hant.resx +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.zh-Hant.resx @@ -2064,7 +2064,7 @@ 胡桃雲 - 前往愛發電購買相關服務 + 前往爱发电購買相關服務 購買/續費雲服務 From c85a74dfc3a5fd4d226cbb7a2caf648491a27331 Mon Sep 17 00:00:00 2001 From: Masterain Date: Mon, 3 Jun 2024 07:31:29 -0700 Subject: [PATCH 04/15] New translations sh.resx (Chinese Traditional) --- .../Snap.Hutao/Resource/Localization/SH.zh-Hant.resx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.zh-Hant.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.zh-Hant.resx index 278322aa..81192cfa 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.zh-Hant.resx +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.zh-Hant.resx @@ -2436,13 +2436,13 @@ 請輸入您的 HoYoLAB UID - 你正在通過由我們提供的內嵌網頁視圖登入 miHoYo 通行證賬號，我們會在你點擊 我已登入 按鈕後，讀取你的 Cookie 信息，由此視圖發起的網絡通信只發生於你的計算機與 miHoYo 服務器之間 + 你正在通過由我們提供的內嵌網頁視圖登錄 米哈游通行证，我們會在你點擊 我已登錄 按鈕後，讀取你的 Cookie 信息，由此視圖發起的網絡通信只發生於你的計算機與米哈遊服務器之間 我已登入 - 在下方登入 miHoYo 通行證賬號 + 在下方登入米哈游通行证 開啟截圖檔案夾 @@ -3174,7 +3174,7 @@ {0} 秒 - 驗證失敗，請手動進行驗證或前往「米游社-旅行工具-原神战绩-实时便笺」頁面查看。 + 驗證失敗，請手動進行驗證或前往「 HoYoLAB -工具箱-戰績-即時便箋」頁面查看。 錯誤的 UID 格式 @@ -3246,7 +3246,7 @@ 胡桃服務維護中 - 驗證失敗，請手動進行驗證或前往「米游社-旅行工具-原神战绩」頁面查看。 + 驗證失敗，請手動進行驗證或前往「 HoYoLAB -工具箱-戰績」頁面查看。 狀態：{0} | 信息：{1} From bba62996a0f313e415c5c105da21c391e566007d Mon Sep 17 00:00:00 2001 From: Masterain Date: Tue, 4 Jun 2024 18:31:28 -0700 Subject: [PATCH 05/15] New translations sh.resx (Japanese) --- src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.ja.resx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.ja.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.ja.resx index 776c9947..ead14d55 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.ja.resx +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.ja.resx @@ -2996,6 +2996,9 @@ ドキュメント + + 由于米游社安全策略的相关更改，网页登录暂不可用 + ログインしていません From 11dc8e60bbe226bf1e76ba215cfcec972f870067 Mon Sep 17 00:00:00 2001 From: Masterain Date: Tue, 4 Jun 2024 18:31:29 -0700 Subject: [PATCH 06/15] New translations sh.resx (Korean) --- src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.ko.resx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.ko.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.ko.resx index bf0e74a1..c898cd00 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.ko.resx +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.ko.resx @@ -2996,6 +2996,9 @@ 문서 + + 由于米游社安全策略的相关更改，网页登录暂不可用 + 尚未登录 From eacd697cfe6664d349864640de07047093b83a05 Mon Sep 17 00:00:00 2001 From: Masterain Date: Tue, 4 Jun 2024 18:31:31 -0700 Subject: [PATCH 07/15] New translations sh.resx (Portuguese) --- src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.pt.resx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.pt.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.pt.resx index ec3f4af2..761b3fdf 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.pt.resx +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.pt.resx @@ -2996,6 +2996,9 @@ Documentação + + 由于米游社安全策略的相关更改，网页登录暂不可用 + Sem login From baf5612333b94344b8a5ad024771c563b428e67f Mon Sep 17 00:00:00 2001 From: Masterain Date: Tue, 4 Jun 2024 18:31:32 -0700 Subject: [PATCH 08/15] New translations sh.resx (Russian) --- src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.ru.resx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.ru.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.ru.resx index 2ddd964c..52dc7869 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.ru.resx +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.ru.resx @@ -2996,6 +2996,9 @@ Документация + + 由于米游社安全策略的相关更改，网页登录暂不可用 + Вы не вошли в приложение From b080a553c3a85d009ed7ed490fae04e3fce96c09 Mon Sep 17 00:00:00 2001 From: Masterain Date: Tue, 4 Jun 2024 18:31:33 -0700 Subject: [PATCH 09/15] New translations sh.resx (Chinese Traditional) --- .../Snap.Hutao/Resource/Localization/SH.zh-Hant.resx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.zh-Hant.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.zh-Hant.resx index 81192cfa..177107eb 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.zh-Hant.resx +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.zh-Hant.resx @@ -2996,6 +2996,9 @@ 文檔 + + 由于米游社安全策略的相关更改，网页登录暂不可用 + 尚未登入 From c8ba04ee11a4484c1066cec73e22b9602bce544b Mon Sep 17 00:00:00 2001 From: Masterain Date: Tue, 4 Jun 2024 18:31:34 -0700 Subject: [PATCH 10/15] New translations sh.resx (English) --- src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.en.resx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.en.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.en.resx index 6cae5c70..888dcad3 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.en.resx +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.en.resx @@ -2996,6 +2996,9 @@ Document + + 由于米游社安全策略的相关更改，网页登录暂不可用 + Haven't logged in From 706401350c0babf8d411dd3ddd1cbe6cd2f6b571 Mon Sep 17 00:00:00 2001 From: Masterain Date: Tue, 4 Jun 2024 18:31:36 -0700 Subject: [PATCH 11/15] New translations sh.resx (Indonesian) --- src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.id.resx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.id.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.id.resx index 0c5f31e0..14890764 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.id.resx +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.id.resx @@ -2996,6 +2996,9 @@ Dokumen + + 由于米游社安全策略的相关更改，网页登录暂不可用 + Tidak masuk From 35491c4eb115d967881d925a68793f940bc928f3 Mon Sep 17 00:00:00 2001 From: Masterain Date: Tue, 4 Jun 2024 18:31:36 -0700 Subject: [PATCH 12/15] New translations sh.resx (French) --- src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.fr.resx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.fr.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.fr.resx index 00b80665..9317aea6 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.fr.resx +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.fr.resx @@ -2996,6 +2996,9 @@ 文档 + + 由于米游社安全策略的相关更改，网页登录暂不可用 + 尚未登录 From a204eaa95cfbf9e35103ab064ce4444806814d26 Mon Sep 17 00:00:00 2001 From: Masterain Date: Tue, 4 Jun 2024 18:31:38 -0700 Subject: [PATCH 13/15] New translations sh.resx (Vietnamese) --- src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.vi.resx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.vi.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.vi.resx index fa25d21a..7f0d3c84 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.vi.resx +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.vi.resx @@ -2996,6 +2996,9 @@ 文档 + + 由于米游社安全策略的相关更改，网页登录暂不可用 + 尚未登录 From 031cf77c2724389c3df12e430261421d1171497c Mon Sep 17 00:00:00 2001 From: qhy040404 Date: Wed, 5 Jun 2024 19:09:57 +0800 Subject: [PATCH 14/15] refine LaunchGameAction --- .../Core/LifeCycle/AppActivation.cs | 38 +++++++++++-------- .../Core/Windowing/WindowExtension.cs | 3 +- 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/AppActivation.cs b/src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/AppActivation.cs index fb9be880..588c061b 100644 --- a/src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/AppActivation.cs +++ b/src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/AppActivation.cs @@ -96,25 +96,31 @@ internal sealed partial class AppActivation : IAppActivation, IAppActivationActi await taskContext.SwitchToMainThreadAsync(); - if (currentWindowReference.Window is null) + switch (currentWindowReference.Window) { - currentWindowReference.Window = serviceProvider.GetRequiredService(); - return; - } + case null: + LaunchGameWindow launchGameWindow = serviceProvider.GetRequiredService(); + currentWindowReference.Window = launchGameWindow; - if (currentWindowReference.Window is MainWindow) - { - await serviceProvider - .GetRequiredService() - .NavigateAsync(INavigationAwaiter.Default, true) - .ConfigureAwait(false); + launchGameWindow.SwitchTo(); + launchGameWindow.BringToForeground(); + return; - return; - } - else - { - // We have a non-Main Window, just exit current process anyway - Process.GetCurrentProcess().Kill(); + case MainWindow: + await serviceProvider + .GetRequiredService() + .NavigateAsync(INavigationAwaiter.Default, true) + .ConfigureAwait(false); + return; + + case LaunchGameWindow currentLaunchGameWindow: + currentLaunchGameWindow.SwitchTo(); + currentLaunchGameWindow.BringToForeground(); + return; + + default: + Process.GetCurrentProcess().Kill(); + return; } } diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowExtension.cs b/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowExtension.cs index 89c48c77..19262af0 100644 --- a/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowExtension.cs +++ b/src/Snap.Hutao/Snap.Hutao/Core/Windowing/WindowExtension.cs @@ -63,7 +63,8 @@ internal static class WindowExtension { ShowWindow(hwnd, SHOW_WINDOW_CMD.SW_SHOW); } - else if (IsIconic(hwnd)) + + if (IsIconic(hwnd)) { ShowWindow(hwnd, SHOW_WINDOW_CMD.SW_RESTORE); } From 5d8a39fe43f850ebf4ee8c663edb4e4a88f78e76 Mon Sep 17 00:00:00 2001 From: DismissedLight <1686188646@qq.com> Date: Wed, 5 Jun 2024 21:29:28 +0800 Subject: [PATCH 15/15] bump version --- src/Snap.Hutao/Snap.Hutao/Package.appxmanifest | 2 +- src/Snap.Hutao/Snap.Hutao/Package.development.appxmanifest | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Snap.Hutao/Snap.Hutao/Package.appxmanifest b/src/Snap.Hutao/Snap.Hutao/Package.appxmanifest index 0aa319b1..76e05736 100644 --- a/src/Snap.Hutao/Snap.Hutao/Package.appxmanifest +++ b/src/Snap.Hutao/Snap.Hutao/Package.appxmanifest @@ -13,7 +13,7 @@ + Version="1.10.3.0" /> Snap Hutao diff --git a/src/Snap.Hutao/Snap.Hutao/Package.development.appxmanifest b/src/Snap.Hutao/Snap.Hutao/Package.development.appxmanifest index 388af5d2..170a6c2f 100644 --- a/src/Snap.Hutao/Snap.Hutao/Package.development.appxmanifest +++ b/src/Snap.Hutao/Snap.Hutao/Package.development.appxmanifest @@ -13,7 +13,7 @@ + Version="1.10.3.0" /> Snap Hutao Dev