Merge branch 'develop' into develop

2025-11-19 21:02:53 +08:00 · 2024-06-06 01:33:09 +08:00
parent 49c75dde2a 5d8a39fe43
commit f22f165592
13 changed files with 67 additions and 33 deletions
--- 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<LaunchGameWindow>();
-            return;
-        }
+            case null:
+                LaunchGameWindow launchGameWindow = serviceProvider.GetRequiredService<LaunchGameWindow>();
+                currentWindowReference.Window = launchGameWindow;

-        if (currentWindowReference.Window is MainWindow)
-        {
-            await serviceProvider
-                .GetRequiredService<INavigationService>()
-                .NavigateAsync<View.Page.LaunchGamePage>(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<INavigationService>()
+                    .NavigateAsync<View.Page.LaunchGamePage>(INavigationAwaiter.Default, true)
+                    .ConfigureAwait(false);
+                return;
+
+            case LaunchGameWindow currentLaunchGameWindow:
+                currentLaunchGameWindow.SwitchTo();
+                currentLaunchGameWindow.BringToForeground();
+                return;
+
+            default:
+                Process.GetCurrentProcess().Kill();
+                return;
        }
    }

--- 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);
        }
--- a/src/Snap.Hutao/Snap.Hutao/Package.appxmanifest
+++ b/src/Snap.Hutao/Snap.Hutao/Package.appxmanifest
@@ -13,7 +13,7 @@
  <Identity
    Name="60568DGPStudio.SnapHutao"
    Publisher="CN=35C8E923-85DF-49A7-9172-B39DC6312C52"
-    Version="1.10.2.0" />
+    Version="1.10.3.0" />

  <Properties>
    <DisplayName>Snap Hutao</DisplayName>
--- a/src/Snap.Hutao/Snap.Hutao/Package.development.appxmanifest
+++ b/src/Snap.Hutao/Snap.Hutao/Package.development.appxmanifest
@@ -13,7 +13,7 @@
  <Identity
    Name="60568DGPStudio.SnapHutaoDev"
    Publisher="CN=35C8E923-85DF-49A7-9172-B39DC6312C52"
-    Version="1.10.2.0" />
+    Version="1.10.3.0" />

  <Properties>
    <DisplayName>Snap Hutao Dev</DisplayName>
--- 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 @@
  <data name="ViewUserDocumentationHeader" xml:space="preserve">
    <value>Document</value>
  </data>
+  <data name="ViewUserLoginMihoyoUserDisabledTooltip" xml:space="preserve">
+    <value>由于米游社安全策略的相关更改，网页登录暂不可用</value>
+  </data>
  <data name="ViewUserNoUserHint" xml:space="preserve">
    <value>Haven't logged in</value>
  </data>
--- 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 @@
  <data name="ViewUserDocumentationHeader" xml:space="preserve">
    <value>文档</value>
  </data>
+  <data name="ViewUserLoginMihoyoUserDisabledTooltip" xml:space="preserve">
+    <value>由于米游社安全策略的相关更改，网页登录暂不可用</value>
+  </data>
  <data name="ViewUserNoUserHint" xml:space="preserve">
    <value>尚未登录</value>
  </data>
--- 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 @@
  <data name="ViewUserDocumentationHeader" xml:space="preserve">
    <value>Dokumen</value>
  </data>
+  <data name="ViewUserLoginMihoyoUserDisabledTooltip" xml:space="preserve">
+    <value>由于米游社安全策略的相关更改，网页登录暂不可用</value>
+  </data>
  <data name="ViewUserNoUserHint" xml:space="preserve">
    <value>Tidak masuk</value>
  </data>
--- 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 @@
  <data name="ViewUserDocumentationHeader" xml:space="preserve">
    <value>ドキュメント</value>
  </data>
+  <data name="ViewUserLoginMihoyoUserDisabledTooltip" xml:space="preserve">
+    <value>由于米游社安全策略的相关更改，网页登录暂不可用</value>
+  </data>
  <data name="ViewUserNoUserHint" xml:space="preserve">
    <value>ログインしていません</value>
  </data>
--- 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 @@
  <data name="ViewUserDocumentationHeader" xml:space="preserve">
    <value>문서</value>
  </data>
+  <data name="ViewUserLoginMihoyoUserDisabledTooltip" xml:space="preserve">
+    <value>由于米游社安全策略的相关更改，网页登录暂不可用</value>
+  </data>
  <data name="ViewUserNoUserHint" xml:space="preserve">
    <value>尚未登录</value>
  </data>
--- 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 @@
  <data name="ViewUserDocumentationHeader" xml:space="preserve">
    <value>Documentação</value>
  </data>
+  <data name="ViewUserLoginMihoyoUserDisabledTooltip" xml:space="preserve">
+    <value>由于米游社安全策略的相关更改，网页登录暂不可用</value>
+  </data>
  <data name="ViewUserNoUserHint" xml:space="preserve">
    <value>Sem login</value>
  </data>
--- 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 @@
  <data name="ViewUserDocumentationHeader" xml:space="preserve">
    <value>Документация</value>
  </data>
+  <data name="ViewUserLoginMihoyoUserDisabledTooltip" xml:space="preserve">
+    <value>由于米游社安全策略的相关更改，网页登录暂不可用</value>
+  </data>
  <data name="ViewUserNoUserHint" xml:space="preserve">
    <value>Вы не вошли в приложение</value>
  </data>
--- 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 @@
  <data name="ViewUserDocumentationHeader" xml:space="preserve">
    <value>文档</value>
  </data>
+  <data name="ViewUserLoginMihoyoUserDisabledTooltip" xml:space="preserve">
+    <value>由于米游社安全策略的相关更改，网页登录暂不可用</value>
+  </data>
  <data name="ViewUserNoUserHint" xml:space="preserve">
    <value>尚未登录</value>
  </data>
--- 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 @@
    <value>胡桃 Dev {0}</value>
  </data>
  <data name="AppElevatedDevNameAndVersion" xml:space="preserve">
-    <value>胡桃Dev {0} [系統管理员]</value>
+    <value>胡桃 Dev {0} [系統管理員]</value>
  </data>
  <data name="AppElevatedNameAndVersion" xml:space="preserve">
    <value>胡桃 {0} [系統管理員]</value>
@@ -166,7 +166,7 @@
    <value>數據庫已損壞：{0}</value>
  </data>
  <data name="CoreExceptionServiceUserdataCorruptedMessage" xml:space="preserve">
-    <value>用户數據已損壞：{0}</value>
+    <value>用戶數據已損壞：{0}</value>
  </data>
  <data name="CoreIOPickerExtensionPickerExceptionInfoBarMessage" xml:space="preserve">
    <value>請勿在系統管理員模式下使用此功能 {0}</value>
@@ -274,13 +274,13 @@
    <value>上場 {0} 次</value>
  </data>
  <data name="ModelBindingLaunchGameLaunchSchemeBilibili" xml:space="preserve">
-    <value>渠道伺服器</value>
+    <value>渠道服</value>
  </data>
  <data name="ModelBindingLaunchGameLaunchSchemeChinese" xml:space="preserve">
-    <value>官方伺服器</value>
+    <value>官方服</value>
  </data>
  <data name="ModelBindingLaunchGameLaunchSchemeOversea" xml:space="preserve">
-    <value>國際伺服器</value>
+    <value>國際服</value>
  </data>
  <data name="ModelBindingUserInitializationFailed" xml:space="preserve">
    <value>網絡異常</value>
@@ -573,7 +573,7 @@
    <value>上傳了 UID：{0} 的 {1} 筆祈願記錄，儲存了 {2} 筆</value>
  </data>
  <data name="ServerPassportLoginRequired" xml:space="preserve">
-    <value>請先登入或注冊胡桃帳號</value>
+    <value>請先登入或註冊胡桃帳號</value>
  </data>
  <data name="ServerPassportLoginSucceed" xml:space="preserve">
    <value>登入成功</value>
@@ -1011,7 +1011,7 @@
    <value>無法找到遊戲本體路徑，請前往設定修改</value>
  </data>
  <data name="ServiceGameRegisteryInteropLongPathsDisabled" xml:space="preserve">
-    <value>未開啟長路徑功能，無法設定註冊表鍵值</value>
+    <value>未開啟長路徑功能，無法設定登錄檔鍵值</value>
  </data>
  <data name="ServiceGameSetMultiChannelConfigFileNotFound" xml:space="preserve">
    <value>無法讀取遊戲設定檔 {0}，可能是檔案不存在</value>
@@ -1878,7 +1878,7 @@
    <value>同步角色天賦信息</value>
  </data>
  <data name="ViewPageAvatarPropertyRefreshFromHoyolabGameRecord" xml:space="preserve">
-    <value>從 HoYoLAB 戰績同步</value>
+    <value>從 HoYoLAB - 戰績同步</value>
  </data>
  <data name="ViewPageAvatarPropertyRefreshFromHoyolabGameRecordDescription" xml:space="preserve">
    <value>同步角色天賦外的大部分信息</value>
@@ -2064,7 +2064,7 @@
    <value>胡桃雲</value>
  </data>
  <data name="ViewPageGachaLogHutaoCloudAfdianPurchaseDescription" xml:space="preserve">
-    <value>前往愛發電購買相關服務</value>
+    <value>前往爱发电購買相關服務</value>
  </data>
  <data name="ViewPageGachaLogHutaoCloudAfdianPurchaseHeader" xml:space="preserve">
    <value>購買/續費雲服務</value>
@@ -2436,13 +2436,13 @@
    <value>請輸入您的 HoYoLAB UID</value>
  </data>
  <data name="ViewPageLoginMihoyoUserDescription" xml:space="preserve">
-    <value>你正在通過由我們提供的內嵌網頁視圖登入 miHoYo 通行證賬號，我們會在你點擊 我已登入 按鈕後，讀取你的 Cookie 信息，由此視圖發起的網絡通信只發生於你的計算機與 miHoYo 服務器之間</value>
+    <value>你正在通過由我們提供的內嵌網頁視圖登錄 米哈游通行证，我們會在你點擊 我已登錄 按鈕後，讀取你的 Cookie 信息，由此視圖發起的網絡通信只發生於你的計算機與米哈遊服務器之間</value>
  </data>
  <data name="ViewPageLoginMihoyoUserLoggedInAction" xml:space="preserve">
    <value>我已登入</value>
  </data>
  <data name="ViewPageLoginMihoyoUserTitle" xml:space="preserve">
-    <value>在下方登入 miHoYo 通行證賬號</value>
+    <value>在下方登入米哈游通行证</value>
  </data>
  <data name="ViewPageOpenScreenshotFolderAction" xml:space="preserve">
    <value>開啟截圖檔案夾</value>
@@ -2961,7 +2961,7 @@
    <value>工具</value>
  </data>
  <data name="ViewUserCookieOperation" xml:space="preserve">
-    <value>米遊社</value>
+    <value>米游社</value>
  </data>
  <data name="ViewUserCookieOperation2" xml:space="preserve">
    <value>HoYoLAB</value>
@@ -2996,6 +2996,9 @@
  <data name="ViewUserDocumentationHeader" xml:space="preserve">
    <value>文檔</value>
  </data>
+  <data name="ViewUserLoginMihoyoUserDisabledTooltip" xml:space="preserve">
+    <value>由于米游社安全策略的相关更改，网页登录暂不可用</value>
+  </data>
  <data name="ViewUserNoUserHint" xml:space="preserve">
    <value>尚未登入</value>
  </data>
@@ -3225,10 +3228,10 @@
    <value>無效的 UID</value>
  </data>
  <data name="WebHoyolabRegionCNGF01" xml:space="preserve">
-    <value>大陸伺服器 官方伺服器</value>
+    <value>陸服 官方服</value>
  </data>
  <data name="WebHoyolabRegionCNQD01" xml:space="preserve">
-    <value>大陸伺服器 渠道伺服器</value>
+    <value>陸服 渠道服</value>
  </data>
  <data name="WebHoyolabRegionOSASIA" xml:space="preserve">
    <value>國際服 亞服</value>