diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/Uri.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/Uri.xaml index 4237308b..5ee6d30c 100644 --- a/src/Snap.Hutao/Snap.Hutao/Control/Theme/Uri.xaml +++ b/src/Snap.Hutao/Snap.Hutao/Control/Theme/Uri.xaml @@ -31,4 +31,5 @@ https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon250.png https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon272.png https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon293.png + https://api.snapgenshin.com/static/raw/EmotionIcon/UI_EmotionIcon445.png diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx index 5b3a21e5..b81f3242 100644 --- a/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx +++ b/src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx @@ -2144,6 +2144,9 @@ 预下载 + + 选择游戏路径 + 该账号尚未绑定实时便笺通知 UID diff --git a/src/Snap.Hutao/Snap.Hutao/Service/User/UserCollectionService.cs b/src/Snap.Hutao/Snap.Hutao/Service/User/UserCollectionService.cs index bce34ac7..76c6f72c 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/User/UserCollectionService.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/User/UserCollectionService.cs @@ -38,8 +38,8 @@ internal sealed partial class UserCollectionService : IUserCollectionService, ID public async ValueTask> GetUserCollectionAsync() { - // Force run in background thread - await taskContext.SwitchToBackgroundAsync(); + // Force run in background thread, otherwise will cause reentrance + await Task.CompletedTask.ConfigureAwait(ConfigureAwaitOptions.ForceYielding); using (await throttler.EnterAsync().ConfigureAwait(false)) { if (userCollection is null) diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml index f5c5bd18..f552da5f 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml +++ b/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml @@ -13,6 +13,7 @@ xmlns:shcb="using:Snap.Hutao.Control.Behavior" xmlns:shccs="using:Snap.Hutao.Control.Collection.Selector" xmlns:shch="using:Snap.Hutao.Control.Helper" + xmlns:shci="using:Snap.Hutao.Control.Image" xmlns:shcm="using:Snap.Hutao.Control.Markup" xmlns:shvc="using:Snap.Hutao.View.Control" xmlns:shvg="using:Snap.Hutao.ViewModel.Game" @@ -350,6 +351,16 @@ HorizontalAlignment="Center" VerticalAlignment="Center" Spacing="3"> + +