Fun/Snap.Hutao
1
0
Fork 0
mirror of https://jihulab.com/DGP-Studio/Snap.Hutao.git synced 2025-11-19 21:02:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixup cookie creation key collision

Browse Source
This commit is contained in:
Lightczx
2023-04-18 11:24:56 +08:00
parent 2432b1ec5d
commit dc38def97c
7 changed files with 48 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Snap.Hutao.Bookmark/SpiralAbyssUpload.js Normal file
View File

File diff suppressed because one or more lines are too long

9
src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.Designer.cs generated
View File

@@ -1536,6 +1536,15 @@ namespace Snap.Hutao.Resource.Localization {
}
}
/// <summary>
/// 查找类似 据上一个五/四星 的本地化字符串。
/// </summary>
internal static string ViewCardGachaStatisticsTitle {
get {
return ResourceManager.GetString("ViewCardGachaStatisticsTitle", resourceCulture);
}
}
/// <summary>
/// 查找类似 等级 的本地化字符串。
/// </summary>

51
src/Snap.Hutao/Snap.Hutao/Resource/Localization/SH.resx
View File

@@ -1887,79 +1887,82 @@
<data name="ViewPageWiKiGeneralAddToDevPlanButtonLabel" xml:space="preserve">
<value>添加到养成计划</value>
</data>
<data name="ViewPageWiKiAvatarAutoSuggestBoxPlaceHolder" xml:space="preserve">
<data name="ViewPageWiKiAvatarAutoSuggestBoxPlaceHolder" xml:space="preserve">
<value>筛选角色</value>
</data>
<data name="ViewPageWiKiAvatarOccupationNameTitle" xml:space="preserve">
<data name="ViewPageWiKiAvatarOccupationNameTitle" xml:space="preserve">
<value>所属</value>
</data>
<data name="ViewPageWiKiAvatarConstellationNameTitle" xml:space="preserve">
<data name="ViewPageWiKiAvatarConstellationNameTitle" xml:space="preserve">
<value>命之座</value>
</data>
<data name="ViewPageWiKiAvatarDateofBirthTitle" xml:space="preserve">
<data name="ViewPageWiKiAvatarDateofBirthTitle" xml:space="preserve">
<value>生日</value>
</data>
<data name="ViewPageWiKiAvatarChineseCVNameTitle" xml:space="preserve">
<data name="ViewPageWiKiAvatarChineseCVNameTitle" xml:space="preserve">
<value>汉语 CV</value>
</data>
<data name="ViewPageWiKiAvatarJapaneseCVNameTitle" xml:space="preserve">
<data name="ViewPageWiKiAvatarJapaneseCVNameTitle" xml:space="preserve">
<value>日语 CV</value>
</data>
<data name="ViewPageWiKiAvatarEnglishCVNameTitle" xml:space="preserve">
<data name="ViewPageWiKiAvatarEnglishCVNameTitle" xml:space="preserve">
<value>英语 CV</value>
</data>
<data name="ViewPageWiKiAvatarKoreanCVNameTitle" xml:space="preserve">
<data name="ViewPageWiKiAvatarKoreanCVNameTitle" xml:space="preserve">
<value>韩语 CV</value>
</data>
<data name="ViewPageWiKiAvatarAscensionMaterialsHeader" xml:space="preserve">
<data name="ViewPageWiKiAvatarAscensionMaterialsHeader" xml:space="preserve">
<value>养成材料</value>
</data>
<data name="ViewPageWiKiAvatarTanlentHeader" xml:space="preserve">
<data name="ViewPageWiKiAvatarTanlentHeader" xml:space="preserve">
<value>天赋</value>
</data>
<data name="ViewPageWiKiAvatarTeamCombinationHeader" xml:space="preserve">
<data name="ViewPageWiKiAvatarTeamCombinationHeader" xml:space="preserve">
<value>搭配角色</value>
</data>
<data name="ViewPageWiKiAvatarWeaponCombinationHeader" xml:space="preserve">
<data name="ViewPageWiKiAvatarWeaponCombinationHeader" xml:space="preserve">
<value>搭配武器</value>
</data>
<data name="ViewPageWiKiAvatarArtifactSetCombinationHeader" xml:space="preserve">
<data name="ViewPageWiKiAvatarArtifactSetCombinationHeader" xml:space="preserve">
<value>搭配圣遗物</value>
</data>
<data name="ViewPageWiKiAvatarMiscHeader" xml:space="preserve">
<data name="ViewPageWiKiAvatarMiscHeader" xml:space="preserve">
<value>其它</value>
</data>
<data name="ViewPageWiKiAvatarFoodHeader" xml:space="preserve">
<data name="ViewPageWiKiAvatarFoodHeader" xml:space="preserve">
<value>料理</value>
</data>
<data name="ViewPageWiKiAvatarSpecialFoodTitle" xml:space="preserve">
<data name="ViewPageWiKiAvatarSpecialFoodTitle" xml:space="preserve">
<value>特殊料理</value>
</data>
<data name="ViewPageWiKiAvatarOriginalFoodTitle" xml:space="preserve">
<data name="ViewPageWiKiAvatarOriginalFoodTitle" xml:space="preserve">
<value>原料理</value>
</data>
<data name="ViewPageWiKiAvatarCostumeHeader" xml:space="preserve">
<data name="ViewPageWiKiAvatarCostumeHeader" xml:space="preserve">
<value>衣装</value>
</data>
<data name="ViewPageWiKiAvatarQuotesHeader" xml:space="preserve">
<data name="ViewPageWiKiAvatarQuotesHeader" xml:space="preserve">
<value>资料</value>
</data>
<data name="ViewPageWiKiAvatarStoriesHeader" xml:space="preserve">
<data name="ViewPageWiKiAvatarStoriesHeader" xml:space="preserve">
<value>故事</value>
</data>
<data name="ViewPageWiKiMonsterAutoSuggestBoxPlaceHolder" xml:space="preserve">
<data name="ViewPageWiKiMonsterAutoSuggestBoxPlaceHolder" xml:space="preserve">
<value>筛选怪物</value>
</data>
<data name="ViewPageWiKiWeaponAutoSuggestBoxPlaceHolder" xml:space="preserve">
<data name="ViewPageWiKiWeaponAutoSuggestBoxPlaceHolder" xml:space="preserve">
<value>筛选武器</value>
</data>
<data name="ViewPageWiKiWeaponBeforeAscensionTitle" xml:space="preserve">
<data name="ViewPageWiKiWeaponBeforeAscensionTitle" xml:space="preserve">
<value>突破前</value>
</data>
<data name="ViewPageWiKiWeaponAfterAscensionTitle" xml:space="preserve">
<data name="ViewPageWiKiWeaponAfterAscensionTitle" xml:space="preserve">
<value>突破后</value>
</data>
<data name="ViewPageHomeLaunchGameSettingAction" xml:space="preserve">
<value>设置</value>
</data>
<data name="ViewCardGachaStatisticsTitle" xml:space="preserve">
<value>据上一个五/四星</value>
</data>
</root>

6
src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteService.cs
View File

@@ -141,12 +141,14 @@ internal sealed class DailyNoteService : IDailyNoteService, IRecipient<UserRemov
{
await new DailyNoteNotifier(scopeFactory, entry).NotifyAsync().ConfigureAwait(false);
}
await appDbContext.DailyNotes.UpdateAndSaveAsync(entry).ConfigureAwait(false);
}
else
{
IInfoBarService infoBarService = scope.ServiceProvider.GetRequiredService<IInfoBarService>();
// special retcode handling for dailynote
// Special retcode handling for dailynote
if (dailyNoteResponse.ReturnCode == (int)Web.Response.KnownReturnCode.CODE1034)
{
infoBarService.Warning(dailyNoteResponse.ToString());
@@ -157,8 +159,6 @@ internal sealed class DailyNoteService : IDailyNoteService, IRecipient<UserRemov
}
}
}
await appDbContext.SaveChangesAsync().ConfigureAwait(false);
}
}

6
src/Snap.Hutao/Snap.Hutao/View/Card/GachaStatisticsCard.xaml
View File

@@ -46,6 +46,12 @@
<TextBlock
Grid.Row="0"
Grid.ColumnSpan="3"
Text="{shcm:ResourceString Name=ViewCardGachaStatisticsTitle}"/>
<TextBlock
Grid.Row="0"
Grid.ColumnSpan="3"
HorizontalAlignment="Right"
Text="{Binding Uid}"/>
<StackPanel

2
src/Snap.Hutao/Snap.Hutao/ViewModel/Game/LaunchGameViewModelSlim.cs
View File

@@ -29,7 +29,7 @@ internal sealed class LaunchGameViewModelSlim : Abstraction.ViewModelSlim<View.P
{
gameService = serviceProvider.GetRequiredService<IGameService>();
LaunchCommand = new AsyncRelayCommand(LaunchAsync);
LaunchCommand = new AsyncRelayCommand(LaunchAsync, AsyncRelayCommandOptions.AllowConcurrentExecutions);
}
/// <summary>

2
src/Snap.Hutao/Snap.Hutao/Web/Hoyolab/Cookie.cs
View File

@@ -66,7 +66,7 @@ internal sealed partial class Cookie
foreach (CoreWebView2Cookie cookie in webView2Cookies)
{
cookieMap.Add(cookie.Name, cookie.Value);
cookieMap.TryAdd(cookie.Name, cookie.Value);
}
return new(cookieMap);