mirror of
https://jihulab.com/DGP-Studio/Snap.Hutao.git
synced 2025-11-19 21:02:53 +08:00
Compare commits
89 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
37767261cd | ||
|
|
97c5e7d37f | ||
|
|
388f9d5657 | ||
|
|
74e11f3823 | ||
|
|
c1305cda43 | ||
|
|
b0d5051957 | ||
|
|
6a42c36a76 | ||
|
|
7cf106ec50 | ||
|
|
f12cd63c92 | ||
|
|
c441fdb6b0 | ||
|
|
09a880525b | ||
|
|
15212d8f21 | ||
|
|
a60c4bff08 | ||
|
|
e02985926d | ||
|
|
09448b7137 | ||
|
|
6487df776a | ||
|
|
2be11c22df | ||
|
|
9ecb3d5821 | ||
|
|
ca64c3e0ef | ||
|
|
3fe726aa63 | ||
|
|
6b7ffe9fe9 | ||
|
|
5ed5729c4e | ||
|
|
9ba0066f40 | ||
|
|
9c639fbaa4 | ||
|
|
a592816661 | ||
|
|
ec9c5ebee1 | ||
|
|
9475c19b64 | ||
|
|
9bfe7f78ef | ||
|
|
88d7f0bcc7 | ||
|
|
4920da4ea2 | ||
|
|
99b2ccb33b | ||
|
|
9b94a75d6f | ||
|
|
e390ad2839 | ||
|
|
3086d59674 | ||
|
|
cb00fdbda0 | ||
|
|
1702dfcdc6 | ||
|
|
4b54b343f9 | ||
|
|
292b21a759 | ||
|
|
29e9413022 | ||
|
|
7c923aaa5e | ||
|
|
c6618be0fc | ||
|
|
45dd276b89 | ||
|
|
8a9fb38f49 | ||
|
|
1249216491 | ||
|
|
4bf3f4151e | ||
|
|
89d909b04f | ||
|
|
2cec0f5e0e | ||
|
|
bbb97cd802 | ||
|
|
67b058f126 | ||
|
|
b98611ccd9 | ||
|
|
80d6d5eb2b | ||
|
|
f682bb57e8 | ||
|
|
486c6eb308 | ||
|
|
0629f7c4c9 | ||
|
|
b49288a98f | ||
|
|
ee99d0b665 | ||
|
|
72b62aa9c6 | ||
|
|
6b031e1866 | ||
|
|
59c03c7f3b | ||
|
|
c03a96b44f | ||
|
|
d5a97903d3 | ||
|
|
7f998dc87f | ||
|
|
2367c4759d | ||
|
|
043e3f07d8 | ||
|
|
cd075c4dab | ||
|
|
65252f1f69 | ||
|
|
f5dd5f4c1d | ||
|
|
27ce55f3f7 | ||
|
|
311941bb89 | ||
|
|
07e2489cab | ||
|
|
699ac60aaf | ||
|
|
dc7bc7e35d | ||
|
|
bf67fcf3a2 | ||
|
|
5093246571 | ||
|
|
94fe192581 | ||
|
|
c679032387 | ||
|
|
d119b056c7 | ||
|
|
ab95ce8ce8 | ||
|
|
0ede5b158f | ||
|
|
6c9a98c2c9 | ||
|
|
a725fc0e9e | ||
|
|
5251dd9343 | ||
|
|
0b71053bf9 | ||
|
|
a91499171d | ||
|
|
e041def070 | ||
|
|
2e81ddf3f4 | ||
|
|
4d988e5500 | ||
|
|
36aff679c0 | ||
|
|
d490393108 |
BIN
res/Banner3-large-cn.psd
Normal file
BIN
res/Banner3-large-cn.psd
Normal file
Binary file not shown.
BIN
res/Banner3-large.psd
Normal file
BIN
res/Banner3-large.psd
Normal file
Binary file not shown.
BIN
res/Store/chs/abyss.psd
Normal file
BIN
res/Store/chs/abyss.psd
Normal file
Binary file not shown.
BIN
res/Store/chs/achievement.psd
Normal file
BIN
res/Store/chs/achievement.psd
Normal file
Binary file not shown.
BIN
res/Store/chs/character-data.psd
Normal file
BIN
res/Store/chs/character-data.psd
Normal file
Binary file not shown.
BIN
res/Store/chs/lancher.psd
Normal file
BIN
res/Store/chs/lancher.psd
Normal file
Binary file not shown.
BIN
res/Store/chs/realtime-notes.psd
Normal file
BIN
res/Store/chs/realtime-notes.psd
Normal file
Binary file not shown.
BIN
res/Store/chs/wish.psd
Normal file
BIN
res/Store/chs/wish.psd
Normal file
Binary file not shown.
BIN
res/Store/en/abyss.psd
Normal file
BIN
res/Store/en/abyss.psd
Normal file
Binary file not shown.
BIN
res/Store/en/achievement.psd
Normal file
BIN
res/Store/en/achievement.psd
Normal file
Binary file not shown.
BIN
res/Store/en/character-data.psd
Normal file
BIN
res/Store/en/character-data.psd
Normal file
Binary file not shown.
BIN
res/Store/en/lancher.psd
Normal file
BIN
res/Store/en/lancher.psd
Normal file
Binary file not shown.
BIN
res/Store/en/realtime-notes.psd
Normal file
BIN
res/Store/en/realtime-notes.psd
Normal file
Binary file not shown.
BIN
res/Store/en/wish.psd
Normal file
BIN
res/Store/en/wish.psd
Normal file
Binary file not shown.
@@ -110,7 +110,6 @@ dotnet_diagnostic.SA1642.severity = none
|
|||||||
|
|
||||||
dotnet_diagnostic.IDE0005.severity = warning
|
dotnet_diagnostic.IDE0005.severity = warning
|
||||||
dotnet_diagnostic.IDE0060.severity = none
|
dotnet_diagnostic.IDE0060.severity = none
|
||||||
dotnet_diagnostic.IDE0290.severity = none
|
|
||||||
|
|
||||||
# SA1208: System using directives should be placed before other using directives
|
# SA1208: System using directives should be placed before other using directives
|
||||||
dotnet_diagnostic.SA1208.severity = none
|
dotnet_diagnostic.SA1208.severity = none
|
||||||
@@ -321,7 +320,8 @@ dotnet_diagnostic.CA2227.severity = suggestion
|
|||||||
|
|
||||||
# CA2251: 使用 “string.Equals”
|
# CA2251: 使用 “string.Equals”
|
||||||
dotnet_diagnostic.CA2251.severity = suggestion
|
dotnet_diagnostic.CA2251.severity = suggestion
|
||||||
csharp_style_prefer_primary_constructors = true:suggestion
|
|
||||||
|
csharp_style_prefer_primary_constructors = false:none
|
||||||
|
|
||||||
[*.vb]
|
[*.vb]
|
||||||
#### 命名样式 ####
|
#### 命名样式 ####
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
using Microsoft.Extensions.DependencyInjection;
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
using System;
|
using System;
|
||||||
|
|
||||||
namespace Snap.Hutao.Test.PlatformExtensions;
|
namespace Snap.Hutao.Test.PlatformExtensions;
|
||||||
@@ -11,6 +12,7 @@ public sealed class DependencyInjectionTest
|
|||||||
.AddSingleton<IService, ServiceB>()
|
.AddSingleton<IService, ServiceB>()
|
||||||
.AddScoped<IScopedService, ServiceA>()
|
.AddScoped<IScopedService, ServiceA>()
|
||||||
.AddTransient(typeof(IGenericService<>), typeof(GenericService<>))
|
.AddTransient(typeof(IGenericService<>), typeof(GenericService<>))
|
||||||
|
.AddLogging(builder => builder.AddConsole())
|
||||||
.BuildServiceProvider();
|
.BuildServiceProvider();
|
||||||
|
|
||||||
[TestMethod]
|
[TestMethod]
|
||||||
@@ -41,6 +43,13 @@ public sealed class DependencyInjectionTest
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[TestMethod]
|
||||||
|
public void LoggerWithInterfaceTypeCanBeResolved()
|
||||||
|
{
|
||||||
|
Assert.IsNotNull(services.GetService<ILogger<IScopedService>>());
|
||||||
|
Assert.IsNotNull(services.GetRequiredService<ILoggerFactory>().CreateLogger(nameof(IScopedService)));
|
||||||
|
}
|
||||||
|
|
||||||
private interface IService
|
private interface IService
|
||||||
{
|
{
|
||||||
Guid Id { get; }
|
Guid Id { get; }
|
||||||
|
|||||||
@@ -12,9 +12,10 @@
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
|
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
|
||||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
|
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
|
||||||
<PackageReference Include="MSTest.TestAdapter" Version="3.2.2" />
|
<PackageReference Include="MSTest.TestAdapter" Version="3.3.1" />
|
||||||
<PackageReference Include="MSTest.TestFramework" Version="3.2.2" />
|
<PackageReference Include="MSTest.TestFramework" Version="3.3.1" />
|
||||||
<PackageReference Include="coverlet.collector" Version="6.0.2">
|
<PackageReference Include="coverlet.collector" Version="6.0.2">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
|
|||||||
@@ -10,8 +10,6 @@ using Snap.Hutao.Core.LifeCycle.InterProcess;
|
|||||||
using Snap.Hutao.Core.Logging;
|
using Snap.Hutao.Core.Logging;
|
||||||
using Snap.Hutao.Core.Shell;
|
using Snap.Hutao.Core.Shell;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
using System.Text;
|
|
||||||
using static Snap.Hutao.Core.Logging.ConsoleVirtualTerminalSequences;
|
|
||||||
|
|
||||||
namespace Snap.Hutao;
|
namespace Snap.Hutao;
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,10 @@
|
|||||||
|
// Copyright (c) DGP Studio. All rights reserved.
|
||||||
|
// Licensed under the MIT license.
|
||||||
|
|
||||||
|
namespace Snap.Hutao.Control.Builder.ButtonBase;
|
||||||
|
|
||||||
|
internal class ButtonBaseBuilder<TButton> : IButtonBaseBuilder<TButton>
|
||||||
|
where TButton : Microsoft.UI.Xaml.Controls.Primitives.ButtonBase, new()
|
||||||
|
{
|
||||||
|
public TButton Button { get; } = new();
|
||||||
|
}
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
// Copyright (c) DGP Studio. All rights reserved.
|
||||||
|
// Licensed under the MIT license.
|
||||||
|
|
||||||
|
using Snap.Hutao.Core.Abstraction.Extension;
|
||||||
|
|
||||||
|
namespace Snap.Hutao.Control.Builder.ButtonBase;
|
||||||
|
|
||||||
|
internal static class ButtonBaseBuilderExtension
|
||||||
|
{
|
||||||
|
public static TBuilder SetContent<TBuilder, TButton>(this TBuilder builder, object? content)
|
||||||
|
where TBuilder : IButtonBaseBuilder<TButton>
|
||||||
|
where TButton : Microsoft.UI.Xaml.Controls.Primitives.ButtonBase
|
||||||
|
{
|
||||||
|
builder.Configure(builder => builder.Button.Content = content);
|
||||||
|
return builder;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static TBuilder SetCommand<TBuilder, TButton>(this TBuilder builder, ICommand command)
|
||||||
|
where TBuilder : IButtonBaseBuilder<TButton>
|
||||||
|
where TButton : Microsoft.UI.Xaml.Controls.Primitives.ButtonBase
|
||||||
|
{
|
||||||
|
builder.Configure(builder => builder.Button.Command = command);
|
||||||
|
return builder;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
// Copyright (c) DGP Studio. All rights reserved.
|
||||||
|
// Licensed under the MIT license.
|
||||||
|
|
||||||
|
using Microsoft.UI.Xaml.Controls;
|
||||||
|
|
||||||
|
namespace Snap.Hutao.Control.Builder.ButtonBase;
|
||||||
|
|
||||||
|
internal sealed class ButtonBuilder : ButtonBaseBuilder<Button>;
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
// Copyright (c) DGP Studio. All rights reserved.
|
||||||
|
// Licensed under the MIT license.
|
||||||
|
|
||||||
|
using Microsoft.UI.Xaml.Controls;
|
||||||
|
|
||||||
|
namespace Snap.Hutao.Control.Builder.ButtonBase;
|
||||||
|
|
||||||
|
internal static class ButtonBuilderExtension
|
||||||
|
{
|
||||||
|
public static ButtonBuilder SetContent(this ButtonBuilder builder, object? content)
|
||||||
|
{
|
||||||
|
return builder.SetContent<ButtonBuilder, Button>(content);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ButtonBuilder SetCommand(this ButtonBuilder builder, ICommand command)
|
||||||
|
{
|
||||||
|
return builder.SetCommand<ButtonBuilder, Button>(command);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
// Copyright (c) DGP Studio. All rights reserved.
|
||||||
|
// Licensed under the MIT license.
|
||||||
|
|
||||||
|
using Snap.Hutao.Core.Abstraction;
|
||||||
|
|
||||||
|
namespace Snap.Hutao.Control.Builder.ButtonBase;
|
||||||
|
|
||||||
|
internal interface IButtonBaseBuilder<TButton> : IBuilder
|
||||||
|
where TButton : Microsoft.UI.Xaml.Controls.Primitives.ButtonBase
|
||||||
|
{
|
||||||
|
TButton Button { get; }
|
||||||
|
}
|
||||||
@@ -28,4 +28,21 @@ internal static class FrameworkElementExtension
|
|||||||
frameworkElement.IsRightTapEnabled = false;
|
frameworkElement.IsRightTapEnabled = false;
|
||||||
frameworkElement.IsTabStop = false;
|
frameworkElement.IsTabStop = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static void InitializeDataContext<TDataContext>(this FrameworkElement frameworkElement, IServiceProvider? serviceProvider = default)
|
||||||
|
where TDataContext : class
|
||||||
|
{
|
||||||
|
IServiceProvider service = serviceProvider ?? Ioc.Default;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
frameworkElement.DataContext = service.GetRequiredService<TDataContext>();
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
|
||||||
|
ILogger? logger = service.GetRequiredService(typeof(ILogger<>).MakeGenericType([frameworkElement.GetType()])) as ILogger;
|
||||||
|
logger?.LogError(ex, "Failed to initialize DataContext");
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -35,7 +35,7 @@ internal sealed class CachedImage : Implementation.ImageEx
|
|||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
HutaoException.ThrowIf(string.IsNullOrEmpty(imageUri.Host), HutaoExceptionKind.ImageCacheInvalidUri, SH.ControlImageCachedImageInvalidResourceUri);
|
HutaoException.ThrowIf(string.IsNullOrEmpty(imageUri.Host), SH.ControlImageCachedImageInvalidResourceUri);
|
||||||
string file = await imageCache.GetFileFromCacheAsync(imageUri).ConfigureAwait(true); // BitmapImage need to be created by main thread.
|
string file = await imageCache.GetFileFromCacheAsync(imageUri).ConfigureAwait(true); // BitmapImage need to be created by main thread.
|
||||||
token.ThrowIfCancellationRequested(); // check token state to determine whether the operation should be canceled.
|
token.ThrowIfCancellationRequested(); // check token state to determine whether the operation should be canceled.
|
||||||
return new BitmapImage(file.ToUri()); // BitmapImage initialize with a uri will increase image quality and loading speed.
|
return new BitmapImage(file.ToUri()); // BitmapImage initialize with a uri will increase image quality and loading speed.
|
||||||
|
|||||||
@@ -4,7 +4,6 @@
|
|||||||
using Microsoft.UI.Xaml;
|
using Microsoft.UI.Xaml;
|
||||||
using Microsoft.UI.Xaml.Controls;
|
using Microsoft.UI.Xaml.Controls;
|
||||||
using System.Collections.Specialized;
|
using System.Collections.Specialized;
|
||||||
using System.Runtime.CompilerServices;
|
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
using Windows.Foundation;
|
using Windows.Foundation;
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
// Licensed under the MIT license.
|
// Licensed under the MIT license.
|
||||||
|
|
||||||
using Microsoft.UI.Xaml;
|
using Microsoft.UI.Xaml;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
using Windows.Foundation;
|
using Windows.Foundation;
|
||||||
|
|
||||||
namespace Snap.Hutao.Control.Panel;
|
namespace Snap.Hutao.Control.Panel;
|
||||||
@@ -18,13 +19,14 @@ internal partial class HorizontalEqualPanel : Microsoft.UI.Xaml.Controls.Panel
|
|||||||
|
|
||||||
protected override Size MeasureOverride(Size availableSize)
|
protected override Size MeasureOverride(Size availableSize)
|
||||||
{
|
{
|
||||||
foreach (UIElement child in Children)
|
List<UIElement> visibleChildren = Children.Where(child => child.Visibility is Visibility.Visible).ToList();
|
||||||
|
foreach (ref readonly UIElement visibleChild in CollectionsMarshal.AsSpan(visibleChildren))
|
||||||
{
|
{
|
||||||
// ScrollViewer will always return an Infinity Size, we should use ActualWidth for this situation.
|
// ScrollViewer will always return an Infinity Size, we should use ActualWidth for this situation.
|
||||||
double availableWidth = double.IsInfinity(availableSize.Width) ? ActualWidth : availableSize.Width;
|
double availableWidth = double.IsInfinity(availableSize.Width) ? ActualWidth : availableSize.Width;
|
||||||
double childAvailableWidth = (availableWidth + Spacing) / Children.Count;
|
double childAvailableWidth = (availableWidth + Spacing) / visibleChildren.Count;
|
||||||
double childMaxAvailableWidth = Math.Max(MinItemWidth, childAvailableWidth);
|
double childMaxAvailableWidth = Math.Max(MinItemWidth, childAvailableWidth);
|
||||||
child.Measure(new(childMaxAvailableWidth - Spacing, ActualHeight));
|
visibleChild.Measure(new(childMaxAvailableWidth - Spacing, ActualHeight));
|
||||||
}
|
}
|
||||||
|
|
||||||
return base.MeasureOverride(availableSize);
|
return base.MeasureOverride(availableSize);
|
||||||
@@ -32,14 +34,14 @@ internal partial class HorizontalEqualPanel : Microsoft.UI.Xaml.Controls.Panel
|
|||||||
|
|
||||||
protected override Size ArrangeOverride(Size finalSize)
|
protected override Size ArrangeOverride(Size finalSize)
|
||||||
{
|
{
|
||||||
int itemCount = Children.Count;
|
List<UIElement> visibleChildren = Children.Where(child => child.Visibility is Visibility.Visible).ToList();
|
||||||
double availableItemWidth = (finalSize.Width - (Spacing * (itemCount - 1))) / itemCount;
|
double availableItemWidth = (finalSize.Width - (Spacing * (visibleChildren.Count - 1))) / visibleChildren.Count;
|
||||||
double actualItemWidth = Math.Max(MinItemWidth, availableItemWidth);
|
double actualItemWidth = Math.Max(MinItemWidth, availableItemWidth);
|
||||||
|
|
||||||
double offset = 0;
|
double offset = 0;
|
||||||
foreach (UIElement child in Children)
|
foreach (ref readonly UIElement visibleChild in CollectionsMarshal.AsSpan(visibleChildren))
|
||||||
{
|
{
|
||||||
child.Arrange(new Rect(offset, 0, actualItemWidth, finalSize.Height));
|
visibleChild.Arrange(new Rect(offset, 0, actualItemWidth, finalSize.Height));
|
||||||
offset += actualItemWidth + Spacing;
|
offset += actualItemWidth + Spacing;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -49,7 +51,8 @@ internal partial class HorizontalEqualPanel : Microsoft.UI.Xaml.Controls.Panel
|
|||||||
private static void OnLoaded(object sender, RoutedEventArgs e)
|
private static void OnLoaded(object sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
HorizontalEqualPanel panel = (HorizontalEqualPanel)sender;
|
HorizontalEqualPanel panel = (HorizontalEqualPanel)sender;
|
||||||
panel.MinWidth = (panel.MinItemWidth * panel.Children.Count) + (panel.Spacing * (panel.Children.Count - 1));
|
int vivibleChildrenCount = panel.Children.Count(child => child.Visibility is Visibility.Visible);
|
||||||
|
panel.MinWidth = (panel.MinItemWidth * vivibleChildrenCount) + (panel.Spacing * (vivibleChildrenCount - 1));
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void OnSizeChanged(object sender, SizeChangedEventArgs e)
|
private static void OnSizeChanged(object sender, SizeChangedEventArgs e)
|
||||||
|
|||||||
@@ -2,8 +2,6 @@
|
|||||||
// Licensed under the MIT license.
|
// Licensed under the MIT license.
|
||||||
|
|
||||||
using Microsoft.UI.Xaml;
|
using Microsoft.UI.Xaml;
|
||||||
using Microsoft.UI.Xaml.Controls;
|
|
||||||
using Microsoft.UI.Xaml.Controls.Primitives;
|
|
||||||
using Windows.Foundation;
|
using Windows.Foundation;
|
||||||
|
|
||||||
namespace Snap.Hutao.Control.Panel;
|
namespace Snap.Hutao.Control.Panel;
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ internal class ScopedPage : Page
|
|||||||
{
|
{
|
||||||
private readonly RoutedEventHandler unloadEventHandler;
|
private readonly RoutedEventHandler unloadEventHandler;
|
||||||
private readonly CancellationTokenSource viewCancellationTokenSource = new();
|
private readonly CancellationTokenSource viewCancellationTokenSource = new();
|
||||||
private readonly IServiceScope currentScope;
|
private readonly IServiceScope pageScope;
|
||||||
|
|
||||||
private bool inFrame = true;
|
private bool inFrame = true;
|
||||||
|
|
||||||
@@ -23,7 +23,7 @@ internal class ScopedPage : Page
|
|||||||
{
|
{
|
||||||
unloadEventHandler = OnUnloaded;
|
unloadEventHandler = OnUnloaded;
|
||||||
Unloaded += unloadEventHandler;
|
Unloaded += unloadEventHandler;
|
||||||
currentScope = Ioc.Default.GetRequiredService<IScopedPageScopeReferenceTracker>().CreateScope();
|
pageScope = Ioc.Default.GetRequiredService<IScopedPageScopeReferenceTracker>().CreateScope();
|
||||||
}
|
}
|
||||||
|
|
||||||
public async ValueTask NotifyRecipientAsync(INavigationData extra)
|
public async ValueTask NotifyRecipientAsync(INavigationData extra)
|
||||||
@@ -44,9 +44,17 @@ internal class ScopedPage : Page
|
|||||||
protected void InitializeWith<TViewModel>()
|
protected void InitializeWith<TViewModel>()
|
||||||
where TViewModel : class, IViewModel
|
where TViewModel : class, IViewModel
|
||||||
{
|
{
|
||||||
IViewModel viewModel = currentScope.ServiceProvider.GetRequiredService<TViewModel>();
|
try
|
||||||
viewModel.CancellationToken = viewCancellationTokenSource.Token;
|
{
|
||||||
DataContext = viewModel;
|
IViewModel viewModel = pageScope.ServiceProvider.GetRequiredService<TViewModel>();
|
||||||
|
viewModel.CancellationToken = viewCancellationTokenSource.Token;
|
||||||
|
DataContext = viewModel;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
pageScope.ServiceProvider.GetRequiredService<ILogger<ScopedPage>>().LogError(ex, "Failed to initialize view model.");
|
||||||
|
throw;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc/>
|
/// <inheritdoc/>
|
||||||
@@ -95,7 +103,7 @@ internal class ScopedPage : Page
|
|||||||
viewModel.IsViewDisposed = true;
|
viewModel.IsViewDisposed = true;
|
||||||
|
|
||||||
// Dispose the scope
|
// Dispose the scope
|
||||||
currentScope.Dispose();
|
pageScope.Dispose();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,10 +1,9 @@
|
|||||||
// Copyright (c) DGP Studio. All rights reserved.
|
// Copyright (c) DGP Studio. All rights reserved.
|
||||||
// Licensed under the MIT license.
|
// Licensed under the MIT license.
|
||||||
|
|
||||||
using Snap.Hutao.Web.Request.Builder.Abstraction;
|
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
|
|
||||||
namespace Snap.Hutao.Web.Request.Builder;
|
namespace Snap.Hutao.Core.Abstraction.Extension;
|
||||||
|
|
||||||
internal static class BuilderExtension
|
internal static class BuilderExtension
|
||||||
{
|
{
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
// Copyright (c) DGP Studio. All rights reserved.
|
// Copyright (c) DGP Studio. All rights reserved.
|
||||||
// Licensed under the MIT license.
|
// Licensed under the MIT license.
|
||||||
|
|
||||||
namespace Snap.Hutao.Web.Request.Builder.Abstraction;
|
namespace Snap.Hutao.Core.Abstraction;
|
||||||
|
|
||||||
internal interface IBuilder;
|
internal interface IBuilder;
|
||||||
@@ -5,6 +5,9 @@ using Snap.Hutao.Core.DependencyInjection.Annotation.HttpClient;
|
|||||||
using Snap.Hutao.Core.IO;
|
using Snap.Hutao.Core.IO;
|
||||||
using Snap.Hutao.Core.IO.Hashing;
|
using Snap.Hutao.Core.IO.Hashing;
|
||||||
using Snap.Hutao.Core.Logging;
|
using Snap.Hutao.Core.Logging;
|
||||||
|
using Snap.Hutao.ViewModel.Guide;
|
||||||
|
using Snap.Hutao.Web.Request.Builder;
|
||||||
|
using Snap.Hutao.Web.Request.Builder.Abstraction;
|
||||||
using System.Collections.Concurrent;
|
using System.Collections.Concurrent;
|
||||||
using System.Collections.Frozen;
|
using System.Collections.Frozen;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
@@ -36,6 +39,7 @@ internal sealed partial class ImageCache : IImageCache, IImageCacheFilePathOpera
|
|||||||
private readonly ConcurrentDictionary<string, Task> concurrentTasks = new();
|
private readonly ConcurrentDictionary<string, Task> concurrentTasks = new();
|
||||||
|
|
||||||
private readonly IHttpClientFactory httpClientFactory;
|
private readonly IHttpClientFactory httpClientFactory;
|
||||||
|
private readonly IHttpRequestMessageBuilderFactory httpRequestMessageBuilderFactory;
|
||||||
private readonly IServiceProvider serviceProvider;
|
private readonly IServiceProvider serviceProvider;
|
||||||
private readonly ILogger<ImageCache> logger;
|
private readonly ILogger<ImageCache> logger;
|
||||||
|
|
||||||
@@ -169,38 +173,49 @@ internal sealed partial class ImageCache : IImageCache, IImageCacheFilePathOpera
|
|||||||
HttpClient httpClient = httpClientFactory.CreateClient(nameof(ImageCache));
|
HttpClient httpClient = httpClientFactory.CreateClient(nameof(ImageCache));
|
||||||
while (retryCount < 3)
|
while (retryCount < 3)
|
||||||
{
|
{
|
||||||
using (HttpResponseMessage message = await httpClient.GetAsync(uri, HttpCompletionOption.ResponseHeadersRead).ConfigureAwait(false))
|
HttpRequestMessageBuilder requestMessageBuilder = httpRequestMessageBuilderFactory
|
||||||
{
|
.Create()
|
||||||
if (message.RequestMessage is { RequestUri: { } target } && target != uri)
|
.SetRequestUri(uri)
|
||||||
{
|
|
||||||
logger.LogDebug("The Request '{Source}' has been redirected to '{Target}'", uri, target);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (message.IsSuccessStatusCode)
|
// These headers are only available for our own api
|
||||||
|
.SetStaticResourceControlHeadersIf(uri.Host.Contains("api.snapgenshin.com", StringComparison.OrdinalIgnoreCase))
|
||||||
|
.Get();
|
||||||
|
|
||||||
|
using (HttpRequestMessage requestMessage = requestMessageBuilder.HttpRequestMessage)
|
||||||
|
{
|
||||||
|
using (HttpResponseMessage responseMessage = await httpClient.SendAsync(requestMessage, HttpCompletionOption.ResponseHeadersRead).ConfigureAwait(false))
|
||||||
{
|
{
|
||||||
using (Stream httpStream = await message.Content.ReadAsStreamAsync().ConfigureAwait(false))
|
if (responseMessage.RequestMessage is { RequestUri: { } target } && target != uri)
|
||||||
{
|
{
|
||||||
using (FileStream fileStream = File.Create(baseFile))
|
logger.LogDebug("The Request '{Source}' has been redirected to '{Target}'", uri, target);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (responseMessage.IsSuccessStatusCode)
|
||||||
|
{
|
||||||
|
using (Stream httpStream = await responseMessage.Content.ReadAsStreamAsync().ConfigureAwait(false))
|
||||||
{
|
{
|
||||||
await httpStream.CopyToAsync(fileStream).ConfigureAwait(false);
|
using (FileStream fileStream = File.Create(baseFile))
|
||||||
return;
|
{
|
||||||
|
await httpStream.CopyToAsync(fileStream).ConfigureAwait(false);
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
switch (message.StatusCode)
|
switch (responseMessage.StatusCode)
|
||||||
{
|
{
|
||||||
case HttpStatusCode.TooManyRequests:
|
case HttpStatusCode.TooManyRequests:
|
||||||
{
|
{
|
||||||
retryCount++;
|
retryCount++;
|
||||||
TimeSpan delay = message.Headers.RetryAfter?.Delta ?? retryCountToDelay[retryCount];
|
TimeSpan delay = responseMessage.Headers.RetryAfter?.Delta ?? retryCountToDelay[retryCount];
|
||||||
logger.LogInformation("Retry download '{Uri}' after {Delay}.", uri, delay);
|
logger.LogInformation("Retry download '{Uri}' after {Delay}.", uri, delay);
|
||||||
await Task.Delay(delay).ConfigureAwait(false);
|
await Task.Delay(delay).ConfigureAwait(false);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
default:
|
default:
|
||||||
return;
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,32 @@
|
|||||||
|
// Copyright (c) DGP Studio. All rights reserved.
|
||||||
|
// Licensed under the MIT license.
|
||||||
|
|
||||||
|
namespace Snap.Hutao.Core.Collection;
|
||||||
|
|
||||||
|
internal sealed class TwoEnumerbleEnumerator<TFirst, TSecond> : IDisposable
|
||||||
|
{
|
||||||
|
private readonly IEnumerator<TFirst> firstEnumerator;
|
||||||
|
private readonly IEnumerator<TSecond> secondEnumerator;
|
||||||
|
|
||||||
|
public TwoEnumerbleEnumerator(IEnumerable<TFirst> firstEnumerable, IEnumerable<TSecond> secondEnumerable)
|
||||||
|
{
|
||||||
|
firstEnumerator = firstEnumerable.GetEnumerator();
|
||||||
|
secondEnumerator = secondEnumerable.GetEnumerator();
|
||||||
|
}
|
||||||
|
|
||||||
|
public (TFirst First, TSecond Second) Current { get => (firstEnumerator.Current, secondEnumerator.Current); }
|
||||||
|
|
||||||
|
public bool MoveNext(ref bool moveFirst, ref bool moveSecond)
|
||||||
|
{
|
||||||
|
moveFirst = moveFirst && firstEnumerator.MoveNext();
|
||||||
|
moveSecond = moveSecond && secondEnumerator.MoveNext();
|
||||||
|
|
||||||
|
return moveFirst || moveSecond;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Dispose()
|
||||||
|
{
|
||||||
|
firstEnumerator.Dispose();
|
||||||
|
secondEnumerator.Dispose();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -13,13 +13,6 @@ namespace Snap.Hutao.Core.Database;
|
|||||||
[HighQuality]
|
[HighQuality]
|
||||||
internal static class DbSetExtension
|
internal static class DbSetExtension
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// 添加并保存
|
|
||||||
/// </summary>
|
|
||||||
/// <typeparam name="TEntity">实体类型</typeparam>
|
|
||||||
/// <param name="dbSet">数据库集</param>
|
|
||||||
/// <param name="entity">实体</param>
|
|
||||||
/// <returns>影响条数</returns>
|
|
||||||
public static int AddAndSave<TEntity>(this DbSet<TEntity> dbSet, TEntity entity)
|
public static int AddAndSave<TEntity>(this DbSet<TEntity> dbSet, TEntity entity)
|
||||||
where TEntity : class
|
where TEntity : class
|
||||||
{
|
{
|
||||||
@@ -27,27 +20,13 @@ internal static class DbSetExtension
|
|||||||
return dbSet.SaveChangesAndClearChangeTracker();
|
return dbSet.SaveChangesAndClearChangeTracker();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
public static ValueTask<int> AddAndSaveAsync<TEntity>(this DbSet<TEntity> dbSet, TEntity entity, CancellationToken token = default)
|
||||||
/// 异步添加并保存
|
|
||||||
/// </summary>
|
|
||||||
/// <typeparam name="TEntity">实体类型</typeparam>
|
|
||||||
/// <param name="dbSet">数据库集</param>
|
|
||||||
/// <param name="entity">实体</param>
|
|
||||||
/// <returns>影响条数</returns>
|
|
||||||
public static ValueTask<int> AddAndSaveAsync<TEntity>(this DbSet<TEntity> dbSet, TEntity entity)
|
|
||||||
where TEntity : class
|
where TEntity : class
|
||||||
{
|
{
|
||||||
dbSet.Add(entity);
|
dbSet.Add(entity);
|
||||||
return dbSet.SaveChangesAndClearChangeTrackerAsync();
|
return dbSet.SaveChangesAndClearChangeTrackerAsync(token);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 添加列表并保存
|
|
||||||
/// </summary>
|
|
||||||
/// <typeparam name="TEntity">实体类型</typeparam>
|
|
||||||
/// <param name="dbSet">数据库集</param>
|
|
||||||
/// <param name="entities">实体</param>
|
|
||||||
/// <returns>影响条数</returns>
|
|
||||||
public static int AddRangeAndSave<TEntity>(this DbSet<TEntity> dbSet, IEnumerable<TEntity> entities)
|
public static int AddRangeAndSave<TEntity>(this DbSet<TEntity> dbSet, IEnumerable<TEntity> entities)
|
||||||
where TEntity : class
|
where TEntity : class
|
||||||
{
|
{
|
||||||
@@ -55,27 +34,13 @@ internal static class DbSetExtension
|
|||||||
return dbSet.SaveChangesAndClearChangeTracker();
|
return dbSet.SaveChangesAndClearChangeTracker();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
public static ValueTask<int> AddRangeAndSaveAsync<TEntity>(this DbSet<TEntity> dbSet, IEnumerable<TEntity> entities, CancellationToken token = default)
|
||||||
/// 异步添加列表并保存
|
|
||||||
/// </summary>
|
|
||||||
/// <typeparam name="TEntity">实体类型</typeparam>
|
|
||||||
/// <param name="dbSet">数据库集</param>
|
|
||||||
/// <param name="entities">实体</param>
|
|
||||||
/// <returns>影响条数</returns>
|
|
||||||
public static ValueTask<int> AddRangeAndSaveAsync<TEntity>(this DbSet<TEntity> dbSet, IEnumerable<TEntity> entities)
|
|
||||||
where TEntity : class
|
where TEntity : class
|
||||||
{
|
{
|
||||||
dbSet.AddRange(entities);
|
dbSet.AddRange(entities);
|
||||||
return dbSet.SaveChangesAndClearChangeTrackerAsync();
|
return dbSet.SaveChangesAndClearChangeTrackerAsync(token);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 移除并保存
|
|
||||||
/// </summary>
|
|
||||||
/// <typeparam name="TEntity">实体类型</typeparam>
|
|
||||||
/// <param name="dbSet">数据库集</param>
|
|
||||||
/// <param name="entity">实体</param>
|
|
||||||
/// <returns>影响条数</returns>
|
|
||||||
public static int RemoveAndSave<TEntity>(this DbSet<TEntity> dbSet, TEntity entity)
|
public static int RemoveAndSave<TEntity>(this DbSet<TEntity> dbSet, TEntity entity)
|
||||||
where TEntity : class
|
where TEntity : class
|
||||||
{
|
{
|
||||||
@@ -83,27 +48,13 @@ internal static class DbSetExtension
|
|||||||
return dbSet.SaveChangesAndClearChangeTracker();
|
return dbSet.SaveChangesAndClearChangeTracker();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
public static ValueTask<int> RemoveAndSaveAsync<TEntity>(this DbSet<TEntity> dbSet, TEntity entity, CancellationToken token = default)
|
||||||
/// 异步移除并保存
|
|
||||||
/// </summary>
|
|
||||||
/// <typeparam name="TEntity">实体类型</typeparam>
|
|
||||||
/// <param name="dbSet">数据库集</param>
|
|
||||||
/// <param name="entity">实体</param>
|
|
||||||
/// <returns>影响条数</returns>
|
|
||||||
public static ValueTask<int> RemoveAndSaveAsync<TEntity>(this DbSet<TEntity> dbSet, TEntity entity)
|
|
||||||
where TEntity : class
|
where TEntity : class
|
||||||
{
|
{
|
||||||
dbSet.Remove(entity);
|
dbSet.Remove(entity);
|
||||||
return dbSet.SaveChangesAndClearChangeTrackerAsync();
|
return dbSet.SaveChangesAndClearChangeTrackerAsync(token);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 更新并保存
|
|
||||||
/// </summary>
|
|
||||||
/// <typeparam name="TEntity">实体类型</typeparam>
|
|
||||||
/// <param name="dbSet">数据库集</param>
|
|
||||||
/// <param name="entity">实体</param>
|
|
||||||
/// <returns>影响条数</returns>
|
|
||||||
public static int UpdateAndSave<TEntity>(this DbSet<TEntity> dbSet, TEntity entity)
|
public static int UpdateAndSave<TEntity>(this DbSet<TEntity> dbSet, TEntity entity)
|
||||||
where TEntity : class
|
where TEntity : class
|
||||||
{
|
{
|
||||||
@@ -111,18 +62,11 @@ internal static class DbSetExtension
|
|||||||
return dbSet.SaveChangesAndClearChangeTracker();
|
return dbSet.SaveChangesAndClearChangeTracker();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
public static ValueTask<int> UpdateAndSaveAsync<TEntity>(this DbSet<TEntity> dbSet, TEntity entity, CancellationToken token = default)
|
||||||
/// 异步更新并保存
|
|
||||||
/// </summary>
|
|
||||||
/// <typeparam name="TEntity">实体类型</typeparam>
|
|
||||||
/// <param name="dbSet">数据库集</param>
|
|
||||||
/// <param name="entity">实体</param>
|
|
||||||
/// <returns>影响条数</returns>
|
|
||||||
public static ValueTask<int> UpdateAndSaveAsync<TEntity>(this DbSet<TEntity> dbSet, TEntity entity)
|
|
||||||
where TEntity : class
|
where TEntity : class
|
||||||
{
|
{
|
||||||
dbSet.Update(entity);
|
dbSet.Update(entity);
|
||||||
return dbSet.SaveChangesAndClearChangeTrackerAsync();
|
return dbSet.SaveChangesAndClearChangeTrackerAsync(token);
|
||||||
}
|
}
|
||||||
|
|
||||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||||
@@ -136,11 +80,11 @@ internal static class DbSetExtension
|
|||||||
}
|
}
|
||||||
|
|
||||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||||
private static async ValueTask<int> SaveChangesAndClearChangeTrackerAsync<TEntity>(this DbSet<TEntity> dbSet)
|
private static async ValueTask<int> SaveChangesAndClearChangeTrackerAsync<TEntity>(this DbSet<TEntity> dbSet, CancellationToken token = default)
|
||||||
where TEntity : class
|
where TEntity : class
|
||||||
{
|
{
|
||||||
DbContext dbContext = dbSet.Context();
|
DbContext dbContext = dbSet.Context();
|
||||||
int count = await dbContext.SaveChangesAsync().ConfigureAwait(false);
|
int count = await dbContext.SaveChangesAsync(token).ConfigureAwait(false);
|
||||||
dbContext.ChangeTracker.Clear();
|
dbContext.ChangeTracker.Clear();
|
||||||
return count;
|
return count;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ internal sealed partial class ScopedDbCurrent<TEntity, TMessage>
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (serviceProvider.IsDisposedSlow())
|
if (serviceProvider.IsDisposed())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -96,7 +96,7 @@ internal sealed partial class ScopedDbCurrent<TEntityOnly, TEntity, TMessage>
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (serviceProvider.IsDisposedSlow())
|
if (serviceProvider.IsDisposed())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -24,7 +24,13 @@ internal static class DependencyInjection
|
|||||||
ServiceProvider serviceProvider = new ServiceCollection()
|
ServiceProvider serviceProvider = new ServiceCollection()
|
||||||
|
|
||||||
// Microsoft extension
|
// Microsoft extension
|
||||||
.AddLogging(builder => builder.AddDebug().AddConsoleWindow())
|
.AddLogging(builder =>
|
||||||
|
{
|
||||||
|
builder
|
||||||
|
.SetMinimumLevel(LogLevel.Trace)
|
||||||
|
.AddDebug()
|
||||||
|
.AddConsoleWindow();
|
||||||
|
})
|
||||||
.AddMemoryCache()
|
.AddMemoryCache()
|
||||||
|
|
||||||
// Hutao extensions
|
// Hutao extensions
|
||||||
|
|||||||
@@ -33,17 +33,17 @@ internal static class IocConfiguration
|
|||||||
return services
|
return services
|
||||||
.AddTransient(typeof(Database.ScopedDbCurrent<,>))
|
.AddTransient(typeof(Database.ScopedDbCurrent<,>))
|
||||||
.AddTransient(typeof(Database.ScopedDbCurrent<,,>))
|
.AddTransient(typeof(Database.ScopedDbCurrent<,,>))
|
||||||
.AddDbContext<AppDbContext>(AddDbContextCore);
|
.AddDbContextPool<AppDbContext>(AddDbContextCore);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void AddDbContextCore(IServiceProvider provider, DbContextOptionsBuilder builder)
|
private static void AddDbContextCore(IServiceProvider serviceProvider, DbContextOptionsBuilder builder)
|
||||||
{
|
{
|
||||||
RuntimeOptions runtimeOptions = provider.GetRequiredService<RuntimeOptions>();
|
RuntimeOptions runtimeOptions = serviceProvider.GetRequiredService<RuntimeOptions>();
|
||||||
string dbFile = System.IO.Path.Combine(runtimeOptions.DataFolder, "Userdata.db");
|
string dbFile = System.IO.Path.Combine(runtimeOptions.DataFolder, "Userdata.db");
|
||||||
string sqlConnectionString = $"Data Source={dbFile}";
|
string sqlConnectionString = $"Data Source={dbFile}";
|
||||||
|
|
||||||
// Temporarily create a context
|
// Temporarily create a context
|
||||||
using (AppDbContext context = AppDbContext.Create(sqlConnectionString))
|
using (AppDbContext context = AppDbContext.Create(serviceProvider, sqlConnectionString))
|
||||||
{
|
{
|
||||||
if (context.Database.GetPendingMigrations().Any())
|
if (context.Database.GetPendingMigrations().Any())
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -18,13 +18,22 @@ internal static class ServiceProviderExtension
|
|||||||
}
|
}
|
||||||
|
|
||||||
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
[MethodImpl(MethodImplOptions.AggressiveInlining)]
|
||||||
public static bool IsDisposedSlow(this IServiceProvider? serviceProvider)
|
public static bool IsDisposed(this IServiceProvider? serviceProvider)
|
||||||
{
|
{
|
||||||
if (serviceProvider is null)
|
if (serviceProvider is null)
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (serviceProvider is ServiceProvider serviceProviderImpl)
|
||||||
|
{
|
||||||
|
return GetPrivateDisposed(serviceProviderImpl);
|
||||||
|
}
|
||||||
|
|
||||||
return serviceProvider.GetType().GetField("_disposed")?.GetValue(serviceProvider) is true;
|
return serviceProvider.GetType().GetField("_disposed")?.GetValue(serviceProvider) is true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// private bool _disposed;
|
||||||
|
[UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_disposed")]
|
||||||
|
private static extern ref bool GetPrivateDisposed(ServiceProvider serviceProvider);
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,7 @@
|
|||||||
// Copyright (c) DGP Studio. All rights reserved.
|
// Copyright (c) DGP Studio. All rights reserved.
|
||||||
// Licensed under the MIT license.
|
// Licensed under the MIT license.
|
||||||
|
using Snap.Hutao.Core.Logging;
|
||||||
|
|
||||||
namespace Snap.Hutao.Core.Diagnostics;
|
namespace Snap.Hutao.Core.Diagnostics;
|
||||||
|
|
||||||
internal readonly struct MeasureExecutionToken : IDisposable
|
internal readonly struct MeasureExecutionToken : IDisposable
|
||||||
@@ -17,6 +19,6 @@ internal readonly struct MeasureExecutionToken : IDisposable
|
|||||||
|
|
||||||
public void Dispose()
|
public void Dispose()
|
||||||
{
|
{
|
||||||
logger.LogDebug("{Caller} toke {Time} ms", callerName, stopwatch.GetElapsedTime().TotalMilliseconds);
|
logger.LogColorizedDebug(("{Caller} toke {Time} ms", ConsoleColor.Gray), (callerName, ConsoleColor.Yellow), (stopwatch.GetElapsedTime().TotalMilliseconds, ConsoleColor.DarkGreen));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -5,50 +5,61 @@ namespace Snap.Hutao.Core.ExceptionService;
|
|||||||
|
|
||||||
internal sealed class HutaoException : Exception
|
internal sealed class HutaoException : Exception
|
||||||
{
|
{
|
||||||
public HutaoException(HutaoExceptionKind kind, string message, Exception? innerException)
|
public HutaoException(string message, Exception? innerException)
|
||||||
: this(message, innerException)
|
|
||||||
{
|
|
||||||
Kind = kind;
|
|
||||||
}
|
|
||||||
|
|
||||||
private HutaoException(string message, Exception? innerException)
|
|
||||||
: base($"{message}\n{innerException?.Message}", innerException)
|
: base($"{message}\n{innerException?.Message}", innerException)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
public HutaoExceptionKind Kind { get; private set; }
|
|
||||||
|
|
||||||
[DoesNotReturn]
|
[DoesNotReturn]
|
||||||
public static HutaoException Throw(HutaoExceptionKind kind, string message, Exception? innerException = default)
|
public static HutaoException Throw(string message, Exception? innerException = default)
|
||||||
{
|
{
|
||||||
throw new HutaoException(kind, message, innerException);
|
throw new HutaoException(message, innerException);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void ThrowIf(bool condition, HutaoExceptionKind kind, string message, Exception? innerException = default)
|
public static void ThrowIf(bool condition, string message, Exception? innerException = default)
|
||||||
{
|
{
|
||||||
if (condition)
|
if (condition)
|
||||||
{
|
{
|
||||||
throw new HutaoException(kind, message, innerException);
|
throw new HutaoException(message, innerException);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void ThrowIfNot(bool condition, HutaoExceptionKind kind, string message, Exception? innerException = default)
|
public static void ThrowIfNot(bool condition, string message, Exception? innerException = default)
|
||||||
{
|
{
|
||||||
if (!condition)
|
if (!condition)
|
||||||
{
|
{
|
||||||
throw new HutaoException(kind, message, innerException);
|
throw new HutaoException(message, innerException);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static HutaoException ServiceTypeCastFailed<TFrom, TTo>(string name, Exception? innerException = default)
|
[DoesNotReturn]
|
||||||
{
|
|
||||||
string message = $"This instance of '{typeof(TFrom).FullName}' '{name}' doesn't implement '{typeof(TTo).FullName}'";
|
|
||||||
throw new HutaoException(HutaoExceptionKind.ServiceTypeCastFailed, message, innerException);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static HutaoException GachaStatisticsInvalidItemId(uint id, Exception? innerException = default)
|
public static HutaoException GachaStatisticsInvalidItemId(uint id, Exception? innerException = default)
|
||||||
{
|
{
|
||||||
string message = SH.FormatServiceGachaStatisticsFactoryItemIdInvalid(id);
|
throw new HutaoException(SH.FormatServiceGachaStatisticsFactoryItemIdInvalid(id), innerException);
|
||||||
throw new HutaoException(HutaoExceptionKind.GachaStatisticsInvalidItemId, message, innerException);
|
}
|
||||||
|
|
||||||
|
[DoesNotReturn]
|
||||||
|
public static HutaoException UserdataCorrupted(string message, Exception? innerException = default)
|
||||||
|
{
|
||||||
|
throw new HutaoException(message, innerException);
|
||||||
|
}
|
||||||
|
|
||||||
|
[DoesNotReturn]
|
||||||
|
public static InvalidCastException InvalidCast<TFrom, TTo>(string name, Exception? innerException = default)
|
||||||
|
{
|
||||||
|
string message = $"This instance of '{typeof(TFrom).FullName}' '{name}' doesn't implement '{typeof(TTo).FullName}'";
|
||||||
|
throw new InvalidCastException(message, innerException);
|
||||||
|
}
|
||||||
|
|
||||||
|
[DoesNotReturn]
|
||||||
|
public static NotSupportedException NotSupported(string? message = default, Exception? innerException = default)
|
||||||
|
{
|
||||||
|
throw new NotSupportedException(message, innerException);
|
||||||
|
}
|
||||||
|
|
||||||
|
[DoesNotReturn]
|
||||||
|
public static OperationCanceledException OperationCanceled(string message, Exception? innerException = default)
|
||||||
|
{
|
||||||
|
return new OperationCanceledException(message, innerException);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -8,8 +8,9 @@ internal enum HutaoExceptionKind
|
|||||||
None,
|
None,
|
||||||
|
|
||||||
// Foundation
|
// Foundation
|
||||||
ServiceTypeCastFailed,
|
|
||||||
ImageCacheInvalidUri,
|
ImageCacheInvalidUri,
|
||||||
|
DatabaseCorrupted,
|
||||||
|
UserdataCorrupted,
|
||||||
|
|
||||||
// IO
|
// IO
|
||||||
FileSystemCreateFileInsufficientPermissions,
|
FileSystemCreateFileInsufficientPermissions,
|
||||||
@@ -18,4 +19,5 @@ internal enum HutaoExceptionKind
|
|||||||
// Service
|
// Service
|
||||||
GachaStatisticsInvalidItemId,
|
GachaStatisticsInvalidItemId,
|
||||||
GameFpsUnlockingFailed,
|
GameFpsUnlockingFailed,
|
||||||
|
GameConfigInvalidChannelOptions,
|
||||||
}
|
}
|
||||||
@@ -1,7 +1,13 @@
|
|||||||
// Copyright (c) DGP Studio. All rights reserved.
|
// Copyright (c) DGP Studio. All rights reserved.
|
||||||
// Licensed under the MIT license.
|
// Licensed under the MIT license.
|
||||||
|
|
||||||
|
using Snap.Hutao.Win32.Foundation;
|
||||||
|
using Snap.Hutao.Win32.System.Com;
|
||||||
|
using Snap.Hutao.Win32.UI.Shell;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
|
using static Snap.Hutao.Win32.Macros;
|
||||||
|
using static Snap.Hutao.Win32.Ole32;
|
||||||
|
using static Snap.Hutao.Win32.Shell32;
|
||||||
|
|
||||||
namespace Snap.Hutao.Core.IO;
|
namespace Snap.Hutao.Core.IO;
|
||||||
|
|
||||||
@@ -39,4 +45,57 @@ internal static class FileOperation
|
|||||||
File.Move(sourceFileName, destFileName, false);
|
File.Move(sourceFileName, destFileName, false);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static unsafe bool UnsafeMove(string sourceFileName, string destFileName)
|
||||||
|
{
|
||||||
|
bool result = false;
|
||||||
|
|
||||||
|
if (SUCCEEDED(CoCreateInstance(in Win32.UI.Shell.FileOperation.CLSID, default, CLSCTX.CLSCTX_INPROC_SERVER, in IFileOperation.IID, out IFileOperation* pFileOperation)))
|
||||||
|
{
|
||||||
|
if (SUCCEEDED(SHCreateItemFromParsingName(sourceFileName, default, in IShellItem.IID, out IShellItem* pSourceShellItem)))
|
||||||
|
{
|
||||||
|
if (SUCCEEDED(SHCreateItemFromParsingName(destFileName, default, in IShellItem.IID, out IShellItem* pDestShellItem)))
|
||||||
|
{
|
||||||
|
pFileOperation->MoveItem(pSourceShellItem, pDestShellItem, default, default);
|
||||||
|
|
||||||
|
if (SUCCEEDED(pFileOperation->PerformOperations()))
|
||||||
|
{
|
||||||
|
result = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
pDestShellItem->Release();
|
||||||
|
}
|
||||||
|
|
||||||
|
pSourceShellItem->Release();
|
||||||
|
}
|
||||||
|
|
||||||
|
pFileOperation->Release();
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static unsafe bool UnsafeDelete(string path)
|
||||||
|
{
|
||||||
|
bool result = false;
|
||||||
|
|
||||||
|
if (SUCCEEDED(CoCreateInstance(in Win32.UI.Shell.FileOperation.CLSID, default, CLSCTX.CLSCTX_INPROC_SERVER, in IFileOperation.IID, out IFileOperation* pFileOperation)))
|
||||||
|
{
|
||||||
|
if (SUCCEEDED(SHCreateItemFromParsingName(path, default, in IShellItem.IID, out IShellItem* pShellItem)))
|
||||||
|
{
|
||||||
|
pFileOperation->DeleteItem(pShellItem, default);
|
||||||
|
|
||||||
|
if (SUCCEEDED(pFileOperation->PerformOperations()))
|
||||||
|
{
|
||||||
|
result = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
pShellItem->Release();
|
||||||
|
}
|
||||||
|
|
||||||
|
pFileOperation->Release();
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -10,7 +10,7 @@ internal static class Hash
|
|||||||
{
|
{
|
||||||
public static string SHA1HexString(string input)
|
public static string SHA1HexString(string input)
|
||||||
{
|
{
|
||||||
return HashCore(BitConverter.ToString, SHA1.HashData, Encoding.UTF8.GetBytes, input);
|
return HashCore(System.Convert.ToHexString, SHA1.HashData, Encoding.UTF8.GetBytes, input);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static TResult HashCore<TInput, TResult>(Func<byte[], TResult> resultConverter, Func<byte[], byte[]> hashMethod, Func<TInput, byte[]> bytesConverter, TInput input)
|
private static TResult HashCore<TInput, TResult>(Func<byte[], TResult> resultConverter, Func<byte[], byte[]> hashMethod, Func<TInput, byte[]> bytesConverter, TInput input)
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
|
|
||||||
using Microsoft.Win32.SafeHandles;
|
using Microsoft.Win32.SafeHandles;
|
||||||
using Snap.Hutao.Core.Diagnostics;
|
using Snap.Hutao.Core.Diagnostics;
|
||||||
|
using System.Buffers;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Net.Http;
|
using System.Net.Http;
|
||||||
|
|
||||||
@@ -77,34 +78,36 @@ internal sealed class HttpShardCopyWorker<TStatus> : IDisposable
|
|||||||
using (HttpResponseMessage response = await httpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, token).ConfigureAwait(false))
|
using (HttpResponseMessage response = await httpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, token).ConfigureAwait(false))
|
||||||
{
|
{
|
||||||
response.EnsureSuccessStatusCode();
|
response.EnsureSuccessStatusCode();
|
||||||
|
using (IMemoryOwner<byte> memoryOwner = MemoryPool<byte>.Shared.Rent())
|
||||||
Memory<byte> buffer = new byte[bufferSize];
|
|
||||||
using (Stream stream = await response.Content.ReadAsStreamAsync(token).ConfigureAwait(false))
|
|
||||||
{
|
{
|
||||||
int totalBytesRead = 0;
|
Memory<byte> buffer = memoryOwner.Memory;
|
||||||
int bytesReadAfterPreviousReport = 0;
|
using (Stream stream = await response.Content.ReadAsStreamAsync(token).ConfigureAwait(false))
|
||||||
do
|
|
||||||
{
|
{
|
||||||
int bytesRead = await stream.ReadAsync(buffer, token).ConfigureAwait(false);
|
int totalBytesRead = 0;
|
||||||
if (bytesRead <= 0)
|
int bytesReadAfterPreviousReport = 0;
|
||||||
|
do
|
||||||
{
|
{
|
||||||
progress.Report(new(bytesReadAfterPreviousReport));
|
int bytesRead = await stream.ReadAsync(buffer, token).ConfigureAwait(false);
|
||||||
bytesReadAfterPreviousReport = 0;
|
if (bytesRead <= 0)
|
||||||
break;
|
{
|
||||||
}
|
progress.Report(new(bytesReadAfterPreviousReport));
|
||||||
|
bytesReadAfterPreviousReport = 0;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
await RandomAccess.WriteAsync(destFileHandle, buffer[..bytesRead], shard.StartOffset + totalBytesRead, token).ConfigureAwait(false);
|
await RandomAccess.WriteAsync(destFileHandle, buffer[..bytesRead], shard.StartOffset + totalBytesRead, token).ConfigureAwait(false);
|
||||||
|
|
||||||
totalBytesRead += bytesRead;
|
totalBytesRead += bytesRead;
|
||||||
bytesReadAfterPreviousReport += bytesRead;
|
bytesReadAfterPreviousReport += bytesRead;
|
||||||
if (stopwatch.GetElapsedTime().TotalMilliseconds > 500)
|
if (stopwatch.GetElapsedTime().TotalMilliseconds > 500)
|
||||||
{
|
{
|
||||||
progress.Report(new(bytesReadAfterPreviousReport));
|
progress.Report(new(bytesReadAfterPreviousReport));
|
||||||
bytesReadAfterPreviousReport = 0;
|
bytesReadAfterPreviousReport = 0;
|
||||||
stopwatch = ValueStopwatch.StartNew();
|
stopwatch = ValueStopwatch.StartNew();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
while (true);
|
||||||
}
|
}
|
||||||
while (true);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
// Licensed under the MIT license.
|
// Licensed under the MIT license.
|
||||||
|
|
||||||
using Snap.Hutao.Core.Diagnostics;
|
using Snap.Hutao.Core.Diagnostics;
|
||||||
|
using System.Buffers;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
|
|
||||||
namespace Snap.Hutao.Core.IO;
|
namespace Snap.Hutao.Core.IO;
|
||||||
@@ -51,26 +52,30 @@ internal class StreamCopyWorker<TStatus>
|
|||||||
|
|
||||||
long totalBytesRead = 0;
|
long totalBytesRead = 0;
|
||||||
int bytesRead;
|
int bytesRead;
|
||||||
Memory<byte> buffer = new byte[bufferSize];
|
|
||||||
|
|
||||||
do
|
using (IMemoryOwner<byte> memoryOwner = MemoryPool<byte>.Shared.Rent(bufferSize))
|
||||||
{
|
{
|
||||||
bytesRead = await source.ReadAsync(buffer).ConfigureAwait(false);
|
Memory<byte> buffer = memoryOwner.Memory;
|
||||||
if (bytesRead == 0)
|
|
||||||
{
|
|
||||||
progress.Report(statusFactory(totalBytesRead));
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
await destination.WriteAsync(buffer[..bytesRead]).ConfigureAwait(false);
|
do
|
||||||
|
|
||||||
totalBytesRead += bytesRead;
|
|
||||||
if (stopwatch.GetElapsedTime().TotalMilliseconds > 1000)
|
|
||||||
{
|
{
|
||||||
progress.Report(statusFactory(totalBytesRead));
|
bytesRead = await source.ReadAsync(buffer).ConfigureAwait(false);
|
||||||
stopwatch = ValueStopwatch.StartNew();
|
if (bytesRead is 0)
|
||||||
|
{
|
||||||
|
progress.Report(statusFactory(totalBytesRead));
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
await destination.WriteAsync(buffer[..bytesRead]).ConfigureAwait(false);
|
||||||
|
|
||||||
|
totalBytesRead += bytesRead;
|
||||||
|
if (stopwatch.GetElapsedTime().TotalMilliseconds > 1000)
|
||||||
|
{
|
||||||
|
progress.Report(statusFactory(totalBytesRead));
|
||||||
|
stopwatch = ValueStopwatch.StartNew();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
while (bytesRead > 0);
|
||||||
}
|
}
|
||||||
while (bytesRead > 0);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
40
src/Snap.Hutao/Snap.Hutao/Core/IO/StreamReaderWriter.cs
Normal file
40
src/Snap.Hutao/Snap.Hutao/Core/IO/StreamReaderWriter.cs
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
// Copyright (c) DGP Studio. All rights reserved.
|
||||||
|
// Licensed under the MIT license.
|
||||||
|
|
||||||
|
using System.IO;
|
||||||
|
|
||||||
|
namespace Snap.Hutao.Core.IO;
|
||||||
|
|
||||||
|
internal sealed class StreamReaderWriter : IDisposable
|
||||||
|
{
|
||||||
|
private readonly StreamReader reader;
|
||||||
|
private readonly StreamWriter writer;
|
||||||
|
|
||||||
|
public StreamReaderWriter(StreamReader reader, StreamWriter writer)
|
||||||
|
{
|
||||||
|
this.reader = reader;
|
||||||
|
this.writer = writer;
|
||||||
|
}
|
||||||
|
|
||||||
|
public StreamReader Reader { get => reader; }
|
||||||
|
|
||||||
|
public StreamWriter Writer { get => writer; }
|
||||||
|
|
||||||
|
/// <inheritdoc cref="StreamReader.ReadLineAsync(CancellationToken)"/>
|
||||||
|
public ValueTask<string?> ReadLineAsync(CancellationToken token)
|
||||||
|
{
|
||||||
|
return reader.ReadLineAsync(token);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc cref="StreamWriter.WriteAsync(string?)"/>
|
||||||
|
public Task WriteAsync(string value)
|
||||||
|
{
|
||||||
|
return writer.WriteAsync(value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Dispose()
|
||||||
|
{
|
||||||
|
writer.Dispose();
|
||||||
|
reader.Dispose();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -29,7 +29,7 @@ internal readonly struct TempFile : IDisposable
|
|||||||
}
|
}
|
||||||
catch (UnauthorizedAccessException ex)
|
catch (UnauthorizedAccessException ex)
|
||||||
{
|
{
|
||||||
HutaoException.Throw(HutaoExceptionKind.FileSystemCreateFileInsufficientPermissions, SH.CoreIOTempFileCreateFail, ex);
|
HutaoException.Throw(SH.CoreIOTempFileCreateFail, ex);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (delete)
|
if (delete)
|
||||||
|
|||||||
@@ -116,15 +116,15 @@ internal sealed partial class Activation : IActivation
|
|||||||
|
|
||||||
// If it's the first time launch, we show the guide window anyway.
|
// If it's the first time launch, we show the guide window anyway.
|
||||||
// Otherwise, we check if there's any unfulfilled resource category present.
|
// Otherwise, we check if there's any unfulfilled resource category present.
|
||||||
if (UnsafeLocalSetting.Get(SettingKeys.Major1Minor7Revision0GuideState, GuideState.Language) >= GuideState.StaticResourceBegin)
|
if (UnsafeLocalSetting.Get(SettingKeys.Major1Minor10Revision0GuideState, GuideState.Language) >= GuideState.StaticResourceBegin)
|
||||||
{
|
{
|
||||||
if (StaticResource.IsAnyUnfulfilledCategoryPresent())
|
if (StaticResource.IsAnyUnfulfilledCategoryPresent())
|
||||||
{
|
{
|
||||||
UnsafeLocalSetting.Set(SettingKeys.Major1Minor7Revision0GuideState, GuideState.StaticResourceBegin);
|
UnsafeLocalSetting.Set(SettingKeys.Major1Minor10Revision0GuideState, GuideState.StaticResourceBegin);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (UnsafeLocalSetting.Get(SettingKeys.Major1Minor7Revision0GuideState, GuideState.Language) < GuideState.Completed)
|
if (UnsafeLocalSetting.Get(SettingKeys.Major1Minor10Revision0GuideState, GuideState.Language) < GuideState.Completed)
|
||||||
{
|
{
|
||||||
await taskContext.SwitchToMainThreadAsync();
|
await taskContext.SwitchToMainThreadAsync();
|
||||||
serviceProvider.GetRequiredService<GuideWindow>();
|
serviceProvider.GetRequiredService<GuideWindow>();
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ internal sealed partial class PrivateNamedPipeServer : IDisposable
|
|||||||
{
|
{
|
||||||
byte[] content = new byte[header->ContentLength];
|
byte[] content = new byte[header->ContentLength];
|
||||||
serverStream.ReadAtLeast(content, header->ContentLength, false);
|
serverStream.ReadAtLeast(content, header->ContentLength, false);
|
||||||
HutaoException.ThrowIf(XxHash64.HashToUInt64(content) != header->Checksum, HutaoExceptionKind.PrivateNamedPipeContentHashIncorrect, "PipePacket Content Hash incorrect");
|
HutaoException.ThrowIf(XxHash64.HashToUInt64(content) != header->Checksum, "PipePacket Content Hash incorrect");
|
||||||
return content;
|
return content;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -21,6 +21,11 @@ internal readonly struct LogArgument
|
|||||||
return new(argument);
|
return new(argument);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static implicit operator LogArgument(double argument)
|
||||||
|
{
|
||||||
|
return new(argument);
|
||||||
|
}
|
||||||
|
|
||||||
public static implicit operator LogArgument((object? Argument, ConsoleColor Foreground) tuple)
|
public static implicit operator LogArgument((object? Argument, ConsoleColor Foreground) tuple)
|
||||||
{
|
{
|
||||||
return new(tuple.Argument, tuple.Foreground);
|
return new(tuple.Argument, tuple.Foreground);
|
||||||
|
|||||||
@@ -9,7 +9,11 @@ internal static class LoggerFactoryExtension
|
|||||||
{
|
{
|
||||||
builder.Services.AddSingleton<ConsoleWindowLifeTime>();
|
builder.Services.AddSingleton<ConsoleWindowLifeTime>();
|
||||||
|
|
||||||
builder.AddSimpleConsole();
|
builder.AddSimpleConsole(options =>
|
||||||
|
{
|
||||||
|
options.TimestampFormat = "yyyy-MM-dd HH:mm:ss.fff ";
|
||||||
|
});
|
||||||
|
|
||||||
return builder;
|
return builder;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -16,11 +16,15 @@ internal static class RuntimeOptionsExtension
|
|||||||
|
|
||||||
public static string GetDataFolderServerCacheFolder(this RuntimeOptions options)
|
public static string GetDataFolderServerCacheFolder(this RuntimeOptions options)
|
||||||
{
|
{
|
||||||
return Path.Combine(options.DataFolder, "ServerCache");
|
string directory = Path.Combine(options.DataFolder, "ServerCache");
|
||||||
|
Directory.CreateDirectory(directory);
|
||||||
|
return directory;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static string GetDataFolderBackgroundFolder(this RuntimeOptions options)
|
public static string GetDataFolderBackgroundFolder(this RuntimeOptions options)
|
||||||
{
|
{
|
||||||
return Path.Combine(options.DataFolder, "Background");
|
string directory = Path.Combine(options.DataFolder, "Background");
|
||||||
|
Directory.CreateDirectory(directory);
|
||||||
|
return directory;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -20,7 +20,9 @@ internal static class SettingKeys
|
|||||||
#region Application
|
#region Application
|
||||||
public const string LaunchTimes = "LaunchTimes";
|
public const string LaunchTimes = "LaunchTimes";
|
||||||
public const string DataFolderPath = "DataFolderPath";
|
public const string DataFolderPath = "DataFolderPath";
|
||||||
public const string Major1Minor7Revision0GuideState = "Major1Minor7Revision0GuideState";
|
public const string Major1Minor10Revision0GuideState = "Major1Minor10Revision0GuideState1";
|
||||||
|
public const string StaticResourceImageQuality = "StaticResourceImageQuality";
|
||||||
|
public const string StaticResourceImageArchive = "StaticResourceImageArchive";
|
||||||
public const string HotKeyMouseClickRepeatForever = "HotKeyMouseClickRepeatForever";
|
public const string HotKeyMouseClickRepeatForever = "HotKeyMouseClickRepeatForever";
|
||||||
public const string IsAllocConsoleDebugModeEnabled = "IsAllocConsoleDebugModeEnabled2";
|
public const string IsAllocConsoleDebugModeEnabled = "IsAllocConsoleDebugModeEnabled2";
|
||||||
#endregion
|
#endregion
|
||||||
@@ -60,6 +62,10 @@ internal static class SettingKeys
|
|||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region Obsolete
|
#region Obsolete
|
||||||
|
|
||||||
|
[Obsolete("重置新手引导状态")]
|
||||||
|
public const string Major1Minor7Revision0GuideState = "Major1Minor7Revision0GuideState";
|
||||||
|
|
||||||
[Obsolete("重置调试控制台开关")]
|
[Obsolete("重置调试控制台开关")]
|
||||||
public const string IsAllocConsoleDebugModeEnabledLegacy1 = "IsAllocConsoleDebugModeEnabled";
|
public const string IsAllocConsoleDebugModeEnabledLegacy1 = "IsAllocConsoleDebugModeEnabled";
|
||||||
#endregion
|
#endregion
|
||||||
|
|||||||
@@ -21,22 +21,27 @@ internal sealed partial class ShellLinkInterop : IShellLinkInterop
|
|||||||
public async ValueTask<bool> TryCreateDesktopShoutcutForElevatedLaunchAsync()
|
public async ValueTask<bool> TryCreateDesktopShoutcutForElevatedLaunchAsync()
|
||||||
{
|
{
|
||||||
string targetLogoPath = Path.Combine(runtimeOptions.DataFolder, "ShellLinkLogo.ico");
|
string targetLogoPath = Path.Combine(runtimeOptions.DataFolder, "ShellLinkLogo.ico");
|
||||||
|
string elevatedLauncherPath = Path.Combine(runtimeOptions.DataFolder, "Snap.Hutao.Elevated.Launcher.exe");
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
Uri sourceLogoUri = "ms-appx:///Assets/Logo.ico".ToUri();
|
Uri sourceLogoUri = "ms-appx:///Assets/Logo.ico".ToUri();
|
||||||
StorageFile iconFile = await StorageFile.GetFileFromApplicationUriAsync(sourceLogoUri);
|
StorageFile iconFile = await StorageFile.GetFileFromApplicationUriAsync(sourceLogoUri);
|
||||||
await iconFile.OverwriteCopyAsync(targetLogoPath).ConfigureAwait(false);
|
await iconFile.OverwriteCopyAsync(targetLogoPath).ConfigureAwait(false);
|
||||||
|
|
||||||
|
Uri elevatedLauncherUri = "ms-appx:///Snap.Hutao.Elevated.Launcher.exe".ToUri();
|
||||||
|
StorageFile launcherFile = await StorageFile.GetFileFromApplicationUriAsync(elevatedLauncherUri);
|
||||||
|
await launcherFile.OverwriteCopyAsync(elevatedLauncherPath).ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
return UnsafeTryCreateDesktopShoutcutForElevatedLaunch(targetLogoPath);
|
return UnsafeTryCreateDesktopShoutcutForElevatedLaunch(targetLogoPath, elevatedLauncherPath);
|
||||||
}
|
}
|
||||||
|
|
||||||
private unsafe bool UnsafeTryCreateDesktopShoutcutForElevatedLaunch(string targetLogoPath)
|
private unsafe bool UnsafeTryCreateDesktopShoutcutForElevatedLaunch(string targetLogoPath, string elevatedLauncherPath)
|
||||||
{
|
{
|
||||||
bool result = false;
|
bool result = false;
|
||||||
|
|
||||||
@@ -44,17 +49,11 @@ internal sealed partial class ShellLinkInterop : IShellLinkInterop
|
|||||||
HRESULT hr = CoCreateInstance(in ShellLink.CLSID, default, CLSCTX.CLSCTX_INPROC_SERVER, in IShellLinkW.IID, out IShellLinkW* pShellLink);
|
HRESULT hr = CoCreateInstance(in ShellLink.CLSID, default, CLSCTX.CLSCTX_INPROC_SERVER, in IShellLinkW.IID, out IShellLinkW* pShellLink);
|
||||||
if (SUCCEEDED(hr))
|
if (SUCCEEDED(hr))
|
||||||
{
|
{
|
||||||
pShellLink->SetPath($"shell:AppsFolder\\{runtimeOptions.FamilyName}!App");
|
pShellLink->SetPath(elevatedLauncherPath);
|
||||||
|
pShellLink->SetArguments(runtimeOptions.FamilyName);
|
||||||
pShellLink->SetShowCmd(SHOW_WINDOW_CMD.SW_NORMAL);
|
pShellLink->SetShowCmd(SHOW_WINDOW_CMD.SW_NORMAL);
|
||||||
pShellLink->SetIconLocation(targetLogoPath, 0);
|
pShellLink->SetIconLocation(targetLogoPath, 0);
|
||||||
|
|
||||||
if (SUCCEEDED(pShellLink->QueryInterface(in IShellLinkDataList.IID, out IShellLinkDataList* pShellLinkDataList)))
|
|
||||||
{
|
|
||||||
pShellLinkDataList->GetFlags(out uint flags);
|
|
||||||
pShellLinkDataList->SetFlags(flags | (uint)SHELL_LINK_DATA_FLAGS.SLDF_RUNAS_USER);
|
|
||||||
pShellLinkDataList->Release();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (SUCCEEDED(pShellLink->QueryInterface(in IPersistFile.IID, out IPersistFile* pPersistFile)))
|
if (SUCCEEDED(pShellLink->QueryInterface(in IPersistFile.IID, out IPersistFile* pPersistFile)))
|
||||||
{
|
{
|
||||||
string desktop = Environment.GetFolderPath(Environment.SpecialFolder.Desktop);
|
string desktop = Environment.GetFolderPath(Environment.SpecialFolder.Desktop);
|
||||||
|
|||||||
@@ -118,14 +118,6 @@ internal static partial class EnumerableExtension
|
|||||||
collection.RemoveAt(collection.Count - 1);
|
collection.RemoveAt(collection.Count - 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 转换到新类型的列表
|
|
||||||
/// </summary>
|
|
||||||
/// <typeparam name="TSource">原始类型</typeparam>
|
|
||||||
/// <typeparam name="TResult">新类型</typeparam>
|
|
||||||
/// <param name="list">列表</param>
|
|
||||||
/// <param name="selector">选择器</param>
|
|
||||||
/// <returns>新类型的列表</returns>
|
|
||||||
[Pure]
|
[Pure]
|
||||||
public static List<TResult> SelectList<TSource, TResult>(this List<TSource> list, Func<TSource, TResult> selector)
|
public static List<TResult> SelectList<TSource, TResult>(this List<TSource> list, Func<TSource, TResult> selector)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
xmlns:shvg="using:Snap.Hutao.View.Guide"
|
xmlns:shvg="using:Snap.Hutao.View.Guide"
|
||||||
mc:Ignorable="d">
|
mc:Ignorable="d">
|
||||||
|
|
||||||
<Grid x:Name="RootGrid">
|
<Grid x:Name="RootGrid" Background="{ThemeResource SolidBackgroundFillColorBaseBrush}">
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="auto"/>
|
<RowDefinition Height="auto"/>
|
||||||
<RowDefinition/>
|
<RowDefinition/>
|
||||||
|
|||||||
@@ -14,10 +14,10 @@ namespace Snap.Hutao;
|
|||||||
internal sealed partial class GuideWindow : Window, IWindowOptionsSource, IMinMaxInfoHandler
|
internal sealed partial class GuideWindow : Window, IWindowOptionsSource, IMinMaxInfoHandler
|
||||||
{
|
{
|
||||||
private const int MinWidth = 1000;
|
private const int MinWidth = 1000;
|
||||||
private const int MinHeight = 600;
|
private const int MinHeight = 650;
|
||||||
|
|
||||||
private const int MaxWidth = 1200;
|
private const int MaxWidth = 1200;
|
||||||
private const int MaxHeight = 750;
|
private const int MaxHeight = 800;
|
||||||
|
|
||||||
private readonly WindowOptions windowOptions;
|
private readonly WindowOptions windowOptions;
|
||||||
|
|
||||||
|
|||||||
@@ -27,4 +27,27 @@ internal sealed partial class IdentifyMonitorWindow : Window
|
|||||||
}
|
}
|
||||||
|
|
||||||
public string Monitor { get; private set; }
|
public string Monitor { get; private set; }
|
||||||
|
|
||||||
|
public static async ValueTask IdentifyAllMonitorsAsync(int secondsDelay)
|
||||||
|
{
|
||||||
|
List<IdentifyMonitorWindow> windows = [];
|
||||||
|
|
||||||
|
IReadOnlyList<DisplayArea> displayAreas = DisplayArea.FindAll();
|
||||||
|
for (int i = 0; i < displayAreas.Count; i++)
|
||||||
|
{
|
||||||
|
windows.Add(new IdentifyMonitorWindow(displayAreas[i], i + 1));
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (IdentifyMonitorWindow window in windows)
|
||||||
|
{
|
||||||
|
window.Activate();
|
||||||
|
}
|
||||||
|
|
||||||
|
await Delay.FromSeconds(secondsDelay).ConfigureAwait(true);
|
||||||
|
|
||||||
|
foreach (IdentifyMonitorWindow window in windows)
|
||||||
|
{
|
||||||
|
window.Close();
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
// Licensed under the MIT license.
|
// Licensed under the MIT license.
|
||||||
|
|
||||||
using Microsoft.UI.Xaml;
|
using Microsoft.UI.Xaml;
|
||||||
|
using Snap.Hutao.Control.Extension;
|
||||||
using Snap.Hutao.Core.Windowing;
|
using Snap.Hutao.Core.Windowing;
|
||||||
using Snap.Hutao.ViewModel.Game;
|
using Snap.Hutao.ViewModel.Game;
|
||||||
using Snap.Hutao.Win32.UI.WindowsAndMessaging;
|
using Snap.Hutao.Win32.UI.WindowsAndMessaging;
|
||||||
@@ -35,7 +36,7 @@ internal sealed partial class LaunchGameWindow : Window, IDisposable, IWindowOpt
|
|||||||
scope = serviceProvider.CreateScope();
|
scope = serviceProvider.CreateScope();
|
||||||
windowOptions = new(this, DragableGrid, new(MaxWidth, MaxHeight));
|
windowOptions = new(this, DragableGrid, new(MaxWidth, MaxHeight));
|
||||||
this.InitializeController(serviceProvider);
|
this.InitializeController(serviceProvider);
|
||||||
RootGrid.DataContext = scope.ServiceProvider.GetRequiredService<LaunchGameViewModel>();
|
RootGrid.InitializeDataContext<LaunchGameViewModel>(scope.ServiceProvider);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc/>
|
/// <inheritdoc/>
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
// Copyright (c) DGP Studio. All rights reserved.
|
||||||
|
// Licensed under the MIT license.
|
||||||
|
|
||||||
|
namespace Snap.Hutao.Model.Entity.Abstraction;
|
||||||
|
|
||||||
|
internal interface IAppDbEntity
|
||||||
|
{
|
||||||
|
Guid InnerId { get; }
|
||||||
|
}
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
// Copyright (c) DGP Studio. All rights reserved.
|
||||||
|
// Licensed under the MIT license.
|
||||||
|
|
||||||
|
namespace Snap.Hutao.Model.Entity.Abstraction;
|
||||||
|
|
||||||
|
internal interface IAppDbEntityHasArchive : IAppDbEntity
|
||||||
|
{
|
||||||
|
Guid ArchiveId { get; }
|
||||||
|
}
|
||||||
@@ -16,8 +16,8 @@ namespace Snap.Hutao.Model.Entity;
|
|||||||
[HighQuality]
|
[HighQuality]
|
||||||
[Table("achievements")]
|
[Table("achievements")]
|
||||||
[SuppressMessage("", "SA1124")]
|
[SuppressMessage("", "SA1124")]
|
||||||
internal sealed class Achievement
|
internal sealed class Achievement : IAppDbEntityHasArchive,
|
||||||
: IEquatable<Achievement>,
|
IEquatable<Achievement>,
|
||||||
IDbMappingForeignKeyFrom<Achievement, AchievementId>,
|
IDbMappingForeignKeyFrom<Achievement, AchievementId>,
|
||||||
IDbMappingForeignKeyFrom<Achievement, UIAFItem>
|
IDbMappingForeignKeyFrom<Achievement, UIAFItem>
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
// Licensed under the MIT license.
|
// Licensed under the MIT license.
|
||||||
|
|
||||||
using Microsoft.EntityFrameworkCore;
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
using Microsoft.EntityFrameworkCore.Infrastructure;
|
||||||
using Snap.Hutao.Core.Logging;
|
using Snap.Hutao.Core.Logging;
|
||||||
using Snap.Hutao.Model.Entity.Configuration;
|
using Snap.Hutao.Model.Entity.Configuration;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
@@ -24,18 +25,8 @@ internal sealed class AppDbContext : DbContext
|
|||||||
public AppDbContext(DbContextOptions<AppDbContext> options)
|
public AppDbContext(DbContextOptions<AppDbContext> options)
|
||||||
: base(options)
|
: base(options)
|
||||||
{
|
{
|
||||||
}
|
logger = this.GetService<ILogger<AppDbContext>>();
|
||||||
|
logger?.LogColorizedInformation("{Name}[{Id}] {Action}", nameof(AppDbContext), (ContextId, ConsoleColor.DarkCyan), ("created", ConsoleColor.Green));
|
||||||
/// <summary>
|
|
||||||
/// 构造一个新的应用程序数据库上下文
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="options">选项</param>
|
|
||||||
/// <param name="logger">日志器</param>
|
|
||||||
public AppDbContext(DbContextOptions<AppDbContext> options, ILogger<AppDbContext> logger)
|
|
||||||
: this(options)
|
|
||||||
{
|
|
||||||
this.logger = logger;
|
|
||||||
logger.LogColorizedInformation("{Name}[{Id}] {Action}", nameof(AppDbContext), (ContextId, ConsoleColor.DarkCyan), ("created", ConsoleColor.Green));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public DbSet<SettingEntry> Settings { get; set; } = default!;
|
public DbSet<SettingEntry> Settings { get; set; } = default!;
|
||||||
@@ -74,14 +65,14 @@ internal sealed class AppDbContext : DbContext
|
|||||||
|
|
||||||
public DbSet<SpiralAbyssEntry> SpiralAbysses { get; set; } = default!;
|
public DbSet<SpiralAbyssEntry> SpiralAbysses { get; set; } = default!;
|
||||||
|
|
||||||
/// <summary>
|
public static AppDbContext Create(IServiceProvider serviceProvider, string sqlConnectionString)
|
||||||
/// 构造一个临时的应用程序数据库上下文
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="sqlConnectionString">连接字符串</param>
|
|
||||||
/// <returns>应用程序数据库上下文</returns>
|
|
||||||
public static AppDbContext Create(string sqlConnectionString)
|
|
||||||
{
|
{
|
||||||
return new(new DbContextOptionsBuilder<AppDbContext>().UseSqlite(sqlConnectionString).Options);
|
DbContextOptions<AppDbContext> options = new DbContextOptionsBuilder<AppDbContext>()
|
||||||
|
.UseApplicationServiceProvider(serviceProvider)
|
||||||
|
.UseSqlite(sqlConnectionString)
|
||||||
|
.Options;
|
||||||
|
|
||||||
|
return new(options);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc/>
|
/// <inheritdoc/>
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ internal sealed class AppDbContextDesignTimeFactory : IDesignTimeDbContextFactor
|
|||||||
#if DEBUG
|
#if DEBUG
|
||||||
// TODO: replace with your own database file path.
|
// TODO: replace with your own database file path.
|
||||||
string userdataDbName = @"D:\Hutao\Userdata.db";
|
string userdataDbName = @"D:\Hutao\Userdata.db";
|
||||||
return AppDbContext.Create($"Data Source={userdataDbName}");
|
return AppDbContext.Create(default!, $"Data Source={userdataDbName}");
|
||||||
#else
|
#else
|
||||||
throw Must.NeverHappen();
|
throw Must.NeverHappen();
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -16,9 +16,13 @@ internal sealed partial class SettingEntry
|
|||||||
public const string ElementTheme = "ElementTheme";
|
public const string ElementTheme = "ElementTheme";
|
||||||
public const string BackgroundImageType = "BackgroundImageType";
|
public const string BackgroundImageType = "BackgroundImageType";
|
||||||
|
|
||||||
|
public const string IsAutoUploadGachaLogEnabled = "IsAutoUploadGachaLogEnabled";
|
||||||
|
public const string IsAutoUploadSpiralAbyssRecordEnabled = "IsAutoUploadSpiralAbyssRecordEnabled";
|
||||||
|
|
||||||
public const string AnnouncementRegion = "AnnouncementRegion";
|
public const string AnnouncementRegion = "AnnouncementRegion";
|
||||||
|
|
||||||
public const string IsEmptyHistoryWishVisible = "IsEmptyHistoryWishVisible";
|
public const string IsEmptyHistoryWishVisible = "IsEmptyHistoryWishVisible";
|
||||||
|
public const string IsUnobtainedWishItemVisible = "IsUnobtainedWishItemVisible";
|
||||||
|
|
||||||
public const string GeetestCustomCompositeUrl = "GeetestCustomCompositeUrl";
|
public const string GeetestCustomCompositeUrl = "GeetestCustomCompositeUrl";
|
||||||
|
|
||||||
|
|||||||
16
src/Snap.Hutao/Snap.Hutao/Model/Intrinsic/QuestType.cs
Normal file
16
src/Snap.Hutao/Snap.Hutao/Model/Intrinsic/QuestType.cs
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
// Copyright (c) DGP Studio. All rights reserved.
|
||||||
|
// Licensed under the MIT license.
|
||||||
|
|
||||||
|
namespace Snap.Hutao.Model.Intrinsic;
|
||||||
|
|
||||||
|
internal enum QuestType
|
||||||
|
{
|
||||||
|
AQ,
|
||||||
|
FQ,
|
||||||
|
LQ,
|
||||||
|
EQ,
|
||||||
|
DQ,
|
||||||
|
IQ,
|
||||||
|
VQ,
|
||||||
|
WQ,
|
||||||
|
}
|
||||||
@@ -11,11 +11,6 @@ namespace Snap.Hutao.Model.Metadata.Converter;
|
|||||||
[HighQuality]
|
[HighQuality]
|
||||||
internal sealed class AvatarNameCardPicConverter : ValueConverter<Avatar.Avatar?, Uri>
|
internal sealed class AvatarNameCardPicConverter : ValueConverter<Avatar.Avatar?, Uri>
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// 从角色转换到名片
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="avatar">角色</param>
|
|
||||||
/// <returns>名片</returns>
|
|
||||||
public static Uri AvatarToUri(Avatar.Avatar? avatar)
|
public static Uri AvatarToUri(Avatar.Avatar? avatar)
|
||||||
{
|
{
|
||||||
if (avatar is null)
|
if (avatar is null)
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
// Licensed under the MIT license.
|
// Licensed under the MIT license.
|
||||||
|
|
||||||
using Microsoft.UI.Xaml;
|
using Microsoft.UI.Xaml;
|
||||||
|
using Snap.Hutao.Core;
|
||||||
using System.Runtime.CompilerServices;
|
using System.Runtime.CompilerServices;
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
using WinRT;
|
using WinRT;
|
||||||
|
|||||||
@@ -60,45 +60,45 @@
|
|||||||
: and then encoded with base64 encoding.
|
: and then encoded with base64 encoding.
|
||||||
-->
|
-->
|
||||||
<xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
|
<xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
|
||||||
<xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
|
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||||
<xsd:element name="root" msdata:IsDataSet="true">
|
<xsd:element name="root" msdata:IsDataSet="true">
|
||||||
<xsd:complexType>
|
<xsd:complexType>
|
||||||
<xsd:choice maxOccurs="unbounded">
|
<xsd:choice maxOccurs="unbounded">
|
||||||
<xsd:element name="metadata">
|
<xsd:element name="metadata">
|
||||||
<xsd:complexType>
|
<xsd:complexType>
|
||||||
<xsd:sequence>
|
<xsd:sequence>
|
||||||
<xsd:element name="value" type="xsd:string" minOccurs="0"/>
|
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||||
</xsd:sequence>
|
</xsd:sequence>
|
||||||
<xsd:attribute name="name" use="required" type="xsd:string"/>
|
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||||
<xsd:attribute name="type" type="xsd:string"/>
|
<xsd:attribute name="type" type="xsd:string" />
|
||||||
<xsd:attribute name="mimetype" type="xsd:string"/>
|
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||||
<xsd:attribute ref="xml:space"/>
|
<xsd:attribute ref="xml:space" />
|
||||||
</xsd:complexType>
|
</xsd:complexType>
|
||||||
</xsd:element>
|
</xsd:element>
|
||||||
<xsd:element name="assembly">
|
<xsd:element name="assembly">
|
||||||
<xsd:complexType>
|
<xsd:complexType>
|
||||||
<xsd:attribute name="alias" type="xsd:string"/>
|
<xsd:attribute name="alias" type="xsd:string" />
|
||||||
<xsd:attribute name="name" type="xsd:string"/>
|
<xsd:attribute name="name" type="xsd:string" />
|
||||||
</xsd:complexType>
|
</xsd:complexType>
|
||||||
</xsd:element>
|
</xsd:element>
|
||||||
<xsd:element name="data">
|
<xsd:element name="data">
|
||||||
<xsd:complexType>
|
<xsd:complexType>
|
||||||
<xsd:sequence>
|
<xsd:sequence>
|
||||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
|
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||||
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
|
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||||
</xsd:sequence>
|
</xsd:sequence>
|
||||||
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
|
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||||
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
|
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||||
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
|
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||||
<xsd:attribute ref="xml:space"/>
|
<xsd:attribute ref="xml:space" />
|
||||||
</xsd:complexType>
|
</xsd:complexType>
|
||||||
</xsd:element>
|
</xsd:element>
|
||||||
<xsd:element name="resheader">
|
<xsd:element name="resheader">
|
||||||
<xsd:complexType>
|
<xsd:complexType>
|
||||||
<xsd:sequence>
|
<xsd:sequence>
|
||||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
|
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||||
</xsd:sequence>
|
</xsd:sequence>
|
||||||
<xsd:attribute name="name" type="xsd:string" use="required"/>
|
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||||
</xsd:complexType>
|
</xsd:complexType>
|
||||||
</xsd:element>
|
</xsd:element>
|
||||||
</xsd:choice>
|
</xsd:choice>
|
||||||
@@ -653,7 +653,7 @@
|
|||||||
<data name="ServiceAchievementUIAFImportPickerTitile" xml:space="preserve">
|
<data name="ServiceAchievementUIAFImportPickerTitile" xml:space="preserve">
|
||||||
<value>Open UIAF Json File</value>
|
<value>Open UIAF Json File</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="ServiceAchievementUserdataCorruptedInnerIdNotUnique" xml:space="preserve">
|
<data name="ServiceAchievementUserdataCorruptedAchievementIdNotUnique" xml:space="preserve">
|
||||||
<value>Multiple identical achievement IDs found in a single achievement archive</value>
|
<value>Multiple identical achievement IDs found in a single achievement archive</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="ServiceAvatarInfoPropertyAtk" xml:space="preserve">
|
<data name="ServiceAvatarInfoPropertyAtk" xml:space="preserve">
|
||||||
@@ -2922,13 +2922,19 @@
|
|||||||
<value>Weapon WIKI</value>
|
<value>Weapon WIKI</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="WebAnnouncementMatchPermanentActivityTime" xml:space="preserve">
|
<data name="WebAnnouncementMatchPermanentActivityTime" xml:space="preserve">
|
||||||
<value>(?:〓Event Duration〓|〓Quest Start Time〓).*?\d\.\dthe Version update(?:after|)Permanently available</value>
|
<value>(?:〓Event Duration〓|〓Quest Start Time〓).*?Permanently.*?Version.*?(\d\.\d).*?update</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="WebAnnouncementMatchPersistentActivityTime" xml:space="preserve">
|
<data name="WebAnnouncementMatchPersistentActivityTime" xml:space="preserve">
|
||||||
<value>〓Event Duration〓.*?\d\.\d Available throughout the entirety of Version</value>
|
<value>〓Event Duration〓.*?Available throughout the entirety of Version (\d\.\d)</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="WebAnnouncementMatchTransientActivityTime" xml:space="preserve">
|
<data name="WebAnnouncementMatchTransientActivityTime" xml:space="preserve">
|
||||||
<value>(?:〓Event Duration〓|Event Wish Duration|【Availability Duration】|〓Discount Period〓).*?(\d\.\dAfter the Version update).*?~.*?&lt;t class="t_(?:gl|lc)".*?&gt;(.*?)&lt;/t&gt;</value>
|
<value>(?:〓Event Duration〓|Event Wish Duration|【Availability Duration】|〓Discount Period〓).*?After.*?(\d\.\d).*?&lt;t class="t_(?:gl|lc)".*?&gt;(.*?)&lt;/t&gt;</value>
|
||||||
|
</data>
|
||||||
|
<data name="WebAnnouncementMatchVersionUpdatePreviewTime" xml:space="preserve">
|
||||||
|
<value>Dear.*?&lt;t class=\"t_(?:gl|lc)\".*?&gt;(.*?)&lt;/t&gt;</value>
|
||||||
|
</data>
|
||||||
|
<data name="WebAnnouncementMatchVersionUpdatePreviewTitle" xml:space="preserve">
|
||||||
|
<value>Version \d\.\d Update Maintenance Preview</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="WebAnnouncementMatchVersionUpdateTime" xml:space="preserve">
|
<data name="WebAnnouncementMatchVersionUpdateTime" xml:space="preserve">
|
||||||
<value>〓Update Maintenance Duration〓.+?&lt;t class=\"t_(?:gl|lc)\".*?&gt;(.*?)&lt;/t&gt;</value>
|
<value>〓Update Maintenance Duration〓.+?&lt;t class=\"t_(?:gl|lc)\".*?&gt;(.*?)&lt;/t&gt;</value>
|
||||||
|
|||||||
@@ -60,45 +60,45 @@
|
|||||||
: and then encoded with base64 encoding.
|
: and then encoded with base64 encoding.
|
||||||
-->
|
-->
|
||||||
<xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
|
<xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
|
||||||
<xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
|
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||||
<xsd:element name="root" msdata:IsDataSet="true">
|
<xsd:element name="root" msdata:IsDataSet="true">
|
||||||
<xsd:complexType>
|
<xsd:complexType>
|
||||||
<xsd:choice maxOccurs="unbounded">
|
<xsd:choice maxOccurs="unbounded">
|
||||||
<xsd:element name="metadata">
|
<xsd:element name="metadata">
|
||||||
<xsd:complexType>
|
<xsd:complexType>
|
||||||
<xsd:sequence>
|
<xsd:sequence>
|
||||||
<xsd:element name="value" type="xsd:string" minOccurs="0"/>
|
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||||
</xsd:sequence>
|
</xsd:sequence>
|
||||||
<xsd:attribute name="name" use="required" type="xsd:string"/>
|
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||||
<xsd:attribute name="type" type="xsd:string"/>
|
<xsd:attribute name="type" type="xsd:string" />
|
||||||
<xsd:attribute name="mimetype" type="xsd:string"/>
|
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||||
<xsd:attribute ref="xml:space"/>
|
<xsd:attribute ref="xml:space" />
|
||||||
</xsd:complexType>
|
</xsd:complexType>
|
||||||
</xsd:element>
|
</xsd:element>
|
||||||
<xsd:element name="assembly">
|
<xsd:element name="assembly">
|
||||||
<xsd:complexType>
|
<xsd:complexType>
|
||||||
<xsd:attribute name="alias" type="xsd:string"/>
|
<xsd:attribute name="alias" type="xsd:string" />
|
||||||
<xsd:attribute name="name" type="xsd:string"/>
|
<xsd:attribute name="name" type="xsd:string" />
|
||||||
</xsd:complexType>
|
</xsd:complexType>
|
||||||
</xsd:element>
|
</xsd:element>
|
||||||
<xsd:element name="data">
|
<xsd:element name="data">
|
||||||
<xsd:complexType>
|
<xsd:complexType>
|
||||||
<xsd:sequence>
|
<xsd:sequence>
|
||||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
|
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||||
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
|
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||||
</xsd:sequence>
|
</xsd:sequence>
|
||||||
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
|
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||||
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
|
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||||
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
|
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||||
<xsd:attribute ref="xml:space"/>
|
<xsd:attribute ref="xml:space" />
|
||||||
</xsd:complexType>
|
</xsd:complexType>
|
||||||
</xsd:element>
|
</xsd:element>
|
||||||
<xsd:element name="resheader">
|
<xsd:element name="resheader">
|
||||||
<xsd:complexType>
|
<xsd:complexType>
|
||||||
<xsd:sequence>
|
<xsd:sequence>
|
||||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
|
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||||
</xsd:sequence>
|
</xsd:sequence>
|
||||||
<xsd:attribute name="name" type="xsd:string" use="required"/>
|
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||||
</xsd:complexType>
|
</xsd:complexType>
|
||||||
</xsd:element>
|
</xsd:element>
|
||||||
</xsd:choice>
|
</xsd:choice>
|
||||||
@@ -653,7 +653,7 @@
|
|||||||
<data name="ServiceAchievementUIAFImportPickerTitile" xml:space="preserve">
|
<data name="ServiceAchievementUIAFImportPickerTitile" xml:space="preserve">
|
||||||
<value>Buka berkas UIAF Json</value>
|
<value>Buka berkas UIAF Json</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="ServiceAchievementUserdataCorruptedInnerIdNotUnique" xml:space="preserve">
|
<data name="ServiceAchievementUserdataCorruptedAchievementIdNotUnique" xml:space="preserve">
|
||||||
<value>Terdapat beberapa ID pencapaian yang identik dalam satu arsip pencapaian</value>
|
<value>Terdapat beberapa ID pencapaian yang identik dalam satu arsip pencapaian</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="ServiceAvatarInfoPropertyAtk" xml:space="preserve">
|
<data name="ServiceAvatarInfoPropertyAtk" xml:space="preserve">
|
||||||
@@ -2922,13 +2922,19 @@
|
|||||||
<value>Senjata WIKI</value>
|
<value>Senjata WIKI</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="WebAnnouncementMatchPermanentActivityTime" xml:space="preserve">
|
<data name="WebAnnouncementMatchPermanentActivityTime" xml:space="preserve">
|
||||||
<value>(?:〓Durasi Event〓|〓Waktu Mulai Misi〓).*?\d\.\dthe Version update(?:after|)Selamanya Tersedia</value>
|
<value>(?:〓Durasi Event〓|〓Waktu Mulai Misi〓).*?(\d\.\d)the Version update(?:after|)Selamanya Tersedia</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="WebAnnouncementMatchPersistentActivityTime" xml:space="preserve">
|
<data name="WebAnnouncementMatchPersistentActivityTime" xml:space="preserve">
|
||||||
<value>〓Durasi Event〓.*?\d\.\d Tersedia selama versi ini</value>
|
<value>〓Durasi Event〓.*?(\d\.\d) Tersedia selama versi ini</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="WebAnnouncementMatchTransientActivityTime" xml:space="preserve">
|
<data name="WebAnnouncementMatchTransientActivityTime" xml:space="preserve">
|
||||||
<value>(?:〓Waktu Acara〓|Waktu Menginginkan|【Waktu Peluncuran】|〓Waktu Diskon〓).*?(\d\.\d Setelah Pembaruan Versi).*?~.*?&lt;t class="t_(?:gl|lc)".*?&gt;(.*?)&lt;/t&gt;</value>
|
<value>(?:〓Waktu Acara〓|Waktu Menginginkan|【Waktu Peluncuran】|〓Waktu Diskon〓).*?(\d\.\d) Setelah Pembaruan Versi.*?~.*?&lt;t class="t_(?:gl|lc)".*?&gt;(.*?)&lt;/t&gt;</value>
|
||||||
|
</data>
|
||||||
|
<data name="WebAnnouncementMatchVersionUpdatePreviewTime" xml:space="preserve">
|
||||||
|
<value>将于&lt;t class=\"t_(?:gl|lc)\".*?&gt;(.*?)&lt;/t&gt;进行版本更新维护</value>
|
||||||
|
</data>
|
||||||
|
<data name="WebAnnouncementMatchVersionUpdatePreviewTitle" xml:space="preserve">
|
||||||
|
<value>\d\.\d版本更新维护预告</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="WebAnnouncementMatchVersionUpdateTime" xml:space="preserve">
|
<data name="WebAnnouncementMatchVersionUpdateTime" xml:space="preserve">
|
||||||
<value>〓Durasi Pemeliharaan Pembaruan.+?&lt;t class=\"t_(?:gl|lc)\".*?&gt;(.*?)&lt;/t&gt;</value>
|
<value>〓Durasi Pemeliharaan Pembaruan.+?&lt;t class=\"t_(?:gl|lc)\".*?&gt;(.*?)&lt;/t&gt;</value>
|
||||||
|
|||||||
@@ -60,45 +60,45 @@
|
|||||||
: and then encoded with base64 encoding.
|
: and then encoded with base64 encoding.
|
||||||
-->
|
-->
|
||||||
<xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
|
<xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
|
||||||
<xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
|
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||||
<xsd:element name="root" msdata:IsDataSet="true">
|
<xsd:element name="root" msdata:IsDataSet="true">
|
||||||
<xsd:complexType>
|
<xsd:complexType>
|
||||||
<xsd:choice maxOccurs="unbounded">
|
<xsd:choice maxOccurs="unbounded">
|
||||||
<xsd:element name="metadata">
|
<xsd:element name="metadata">
|
||||||
<xsd:complexType>
|
<xsd:complexType>
|
||||||
<xsd:sequence>
|
<xsd:sequence>
|
||||||
<xsd:element name="value" type="xsd:string" minOccurs="0"/>
|
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||||
</xsd:sequence>
|
</xsd:sequence>
|
||||||
<xsd:attribute name="name" use="required" type="xsd:string"/>
|
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||||
<xsd:attribute name="type" type="xsd:string"/>
|
<xsd:attribute name="type" type="xsd:string" />
|
||||||
<xsd:attribute name="mimetype" type="xsd:string"/>
|
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||||
<xsd:attribute ref="xml:space"/>
|
<xsd:attribute ref="xml:space" />
|
||||||
</xsd:complexType>
|
</xsd:complexType>
|
||||||
</xsd:element>
|
</xsd:element>
|
||||||
<xsd:element name="assembly">
|
<xsd:element name="assembly">
|
||||||
<xsd:complexType>
|
<xsd:complexType>
|
||||||
<xsd:attribute name="alias" type="xsd:string"/>
|
<xsd:attribute name="alias" type="xsd:string" />
|
||||||
<xsd:attribute name="name" type="xsd:string"/>
|
<xsd:attribute name="name" type="xsd:string" />
|
||||||
</xsd:complexType>
|
</xsd:complexType>
|
||||||
</xsd:element>
|
</xsd:element>
|
||||||
<xsd:element name="data">
|
<xsd:element name="data">
|
||||||
<xsd:complexType>
|
<xsd:complexType>
|
||||||
<xsd:sequence>
|
<xsd:sequence>
|
||||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
|
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||||
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
|
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||||
</xsd:sequence>
|
</xsd:sequence>
|
||||||
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
|
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||||
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
|
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||||
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
|
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||||
<xsd:attribute ref="xml:space"/>
|
<xsd:attribute ref="xml:space" />
|
||||||
</xsd:complexType>
|
</xsd:complexType>
|
||||||
</xsd:element>
|
</xsd:element>
|
||||||
<xsd:element name="resheader">
|
<xsd:element name="resheader">
|
||||||
<xsd:complexType>
|
<xsd:complexType>
|
||||||
<xsd:sequence>
|
<xsd:sequence>
|
||||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
|
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||||
</xsd:sequence>
|
</xsd:sequence>
|
||||||
<xsd:attribute name="name" type="xsd:string" use="required"/>
|
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||||
</xsd:complexType>
|
</xsd:complexType>
|
||||||
</xsd:element>
|
</xsd:element>
|
||||||
</xsd:choice>
|
</xsd:choice>
|
||||||
@@ -653,7 +653,7 @@
|
|||||||
<data name="ServiceAchievementUIAFImportPickerTitile" xml:space="preserve">
|
<data name="ServiceAchievementUIAFImportPickerTitile" xml:space="preserve">
|
||||||
<value>UIAF Json ファイルを開く</value>
|
<value>UIAF Json ファイルを開く</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="ServiceAchievementUserdataCorruptedInnerIdNotUnique" xml:space="preserve">
|
<data name="ServiceAchievementUserdataCorruptedAchievementIdNotUnique" xml:space="preserve">
|
||||||
<value>複数の同一アチーブメント Idがアーカイブに混在しています</value>
|
<value>複数の同一アチーブメント Idがアーカイブに混在しています</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="ServiceAvatarInfoPropertyAtk" xml:space="preserve">
|
<data name="ServiceAvatarInfoPropertyAtk" xml:space="preserve">
|
||||||
@@ -2922,19 +2922,25 @@
|
|||||||
<value>武器一覧</value>
|
<value>武器一覧</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="WebAnnouncementMatchPermanentActivityTime" xml:space="preserve">
|
<data name="WebAnnouncementMatchPermanentActivityTime" xml:space="preserve">
|
||||||
<value>(?:〓イベント期間〓|〓任務開始時間〓).*?\d\.\dバージョンアップ(?:完了|)後常設オープン</value>
|
<value>(?:〓イベント期間〓|〓任務開(?:始|放)時間〓).*?(\d\.\d).*?開放</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="WebAnnouncementMatchPersistentActivityTime" xml:space="preserve">
|
<data name="WebAnnouncementMatchPersistentActivityTime" xml:space="preserve">
|
||||||
<value>〓イベント期間〓.*?\d\.\d当バージョン期間オープン</value>
|
<value>〓イベント期間〓.*?(\d\.\d)バージョン</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="WebAnnouncementMatchTransientActivityTime" xml:space="preserve">
|
<data name="WebAnnouncementMatchTransientActivityTime" xml:space="preserve">
|
||||||
<value>(?:〓イベント期間〓|祈願期間|【開始日時】).*?(\d\.\dバージョンアップ完了後).*?~.*?&lt;t class="t_(?:gl|lc)".*?&gt;(.*?)&lt;/t&gt;</value>
|
<value>(?:〓イベント期間〓|祈願期間|【開始日時】).*?(\d\.\d)バージョンアップ.*?~.*?&lt;t class="t_(?:gl|lc)".*?&gt;(.*?)&lt;/t&gt;</value>
|
||||||
|
</data>
|
||||||
|
<data name="WebAnnouncementMatchVersionUpdatePreviewTime" xml:space="preserve">
|
||||||
|
<value>親愛.*?&lt;t class=\"t_(?:gl|lc)\".*?&gt;(.*?)&lt;/t&gt;</value>
|
||||||
|
</data>
|
||||||
|
<data name="WebAnnouncementMatchVersionUpdatePreviewTitle" xml:space="preserve">
|
||||||
|
<value>Ver\.\d\.\dバージョンアップのお知らせ</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="WebAnnouncementMatchVersionUpdateTime" xml:space="preserve">
|
<data name="WebAnnouncementMatchVersionUpdateTime" xml:space="preserve">
|
||||||
<value>〓メンテナンス時間〓.+?&lt;t class=\"t_(?:gl|lc)\".*?&gt;(.*?)&lt;/t&gt;</value>
|
<value>〓メンテナンス時間〓.+?&lt;t class=\"t_(?:gl|lc)\".*?&gt;(.*?)&lt;/t&gt;</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="WebAnnouncementMatchVersionUpdateTitle" xml:space="preserve">
|
<data name="WebAnnouncementMatchVersionUpdateTitle" xml:space="preserve">
|
||||||
<value>Ver.\d\.\d.+正式リリース</value>
|
<value>Ver\.\d\.\d.*?正式リリース</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="WebAnnouncementTimeDaysBeginFormat" xml:space="preserve">
|
<data name="WebAnnouncementTimeDaysBeginFormat" xml:space="preserve">
|
||||||
<value>{0} 日後に開始</value>
|
<value>{0} 日後に開始</value>
|
||||||
|
|||||||
@@ -60,45 +60,45 @@
|
|||||||
: and then encoded with base64 encoding.
|
: and then encoded with base64 encoding.
|
||||||
-->
|
-->
|
||||||
<xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
|
<xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
|
||||||
<xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
|
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||||
<xsd:element name="root" msdata:IsDataSet="true">
|
<xsd:element name="root" msdata:IsDataSet="true">
|
||||||
<xsd:complexType>
|
<xsd:complexType>
|
||||||
<xsd:choice maxOccurs="unbounded">
|
<xsd:choice maxOccurs="unbounded">
|
||||||
<xsd:element name="metadata">
|
<xsd:element name="metadata">
|
||||||
<xsd:complexType>
|
<xsd:complexType>
|
||||||
<xsd:sequence>
|
<xsd:sequence>
|
||||||
<xsd:element name="value" type="xsd:string" minOccurs="0"/>
|
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||||
</xsd:sequence>
|
</xsd:sequence>
|
||||||
<xsd:attribute name="name" use="required" type="xsd:string"/>
|
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||||
<xsd:attribute name="type" type="xsd:string"/>
|
<xsd:attribute name="type" type="xsd:string" />
|
||||||
<xsd:attribute name="mimetype" type="xsd:string"/>
|
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||||
<xsd:attribute ref="xml:space"/>
|
<xsd:attribute ref="xml:space" />
|
||||||
</xsd:complexType>
|
</xsd:complexType>
|
||||||
</xsd:element>
|
</xsd:element>
|
||||||
<xsd:element name="assembly">
|
<xsd:element name="assembly">
|
||||||
<xsd:complexType>
|
<xsd:complexType>
|
||||||
<xsd:attribute name="alias" type="xsd:string"/>
|
<xsd:attribute name="alias" type="xsd:string" />
|
||||||
<xsd:attribute name="name" type="xsd:string"/>
|
<xsd:attribute name="name" type="xsd:string" />
|
||||||
</xsd:complexType>
|
</xsd:complexType>
|
||||||
</xsd:element>
|
</xsd:element>
|
||||||
<xsd:element name="data">
|
<xsd:element name="data">
|
||||||
<xsd:complexType>
|
<xsd:complexType>
|
||||||
<xsd:sequence>
|
<xsd:sequence>
|
||||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
|
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||||
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
|
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||||
</xsd:sequence>
|
</xsd:sequence>
|
||||||
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
|
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||||
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
|
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||||
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
|
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||||
<xsd:attribute ref="xml:space"/>
|
<xsd:attribute ref="xml:space" />
|
||||||
</xsd:complexType>
|
</xsd:complexType>
|
||||||
</xsd:element>
|
</xsd:element>
|
||||||
<xsd:element name="resheader">
|
<xsd:element name="resheader">
|
||||||
<xsd:complexType>
|
<xsd:complexType>
|
||||||
<xsd:sequence>
|
<xsd:sequence>
|
||||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
|
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||||
</xsd:sequence>
|
</xsd:sequence>
|
||||||
<xsd:attribute name="name" type="xsd:string" use="required"/>
|
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||||
</xsd:complexType>
|
</xsd:complexType>
|
||||||
</xsd:element>
|
</xsd:element>
|
||||||
</xsd:choice>
|
</xsd:choice>
|
||||||
@@ -653,7 +653,7 @@
|
|||||||
<data name="ServiceAchievementUIAFImportPickerTitile" xml:space="preserve">
|
<data name="ServiceAchievementUIAFImportPickerTitile" xml:space="preserve">
|
||||||
<value>打开 UIAF Json 文件</value>
|
<value>打开 UIAF Json 文件</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="ServiceAchievementUserdataCorruptedInnerIdNotUnique" xml:space="preserve">
|
<data name="ServiceAchievementUserdataCorruptedAchievementIdNotUnique" xml:space="preserve">
|
||||||
<value>한 업적 아카이브에서 Id 동일한 업적 발견됨</value>
|
<value>한 업적 아카이브에서 Id 동일한 업적 발견됨</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="ServiceAvatarInfoPropertyAtk" xml:space="preserve">
|
<data name="ServiceAvatarInfoPropertyAtk" xml:space="preserve">
|
||||||
@@ -2922,13 +2922,19 @@
|
|||||||
<value>무기 자료</value>
|
<value>무기 자료</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="WebAnnouncementMatchPermanentActivityTime" xml:space="preserve">
|
<data name="WebAnnouncementMatchPermanentActivityTime" xml:space="preserve">
|
||||||
<value>(?:〓活动时间〓|〓任务开放时间〓).*?\d\.\d版本更新(?:完成|)后永久开放</value>
|
<value>(?:〓活动时间〓|〓任务开放时间〓).*?(\d\.\d)版本更新(?:完成|)后永久开放</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="WebAnnouncementMatchPersistentActivityTime" xml:space="preserve">
|
<data name="WebAnnouncementMatchPersistentActivityTime" xml:space="preserve">
|
||||||
<value>〓活动时间〓.*?\d\.\d版本期间持续开放</value>
|
<value>〓活动时间〓.*?(\d\.\d)版本期间持续开放</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="WebAnnouncementMatchTransientActivityTime" xml:space="preserve">
|
<data name="WebAnnouncementMatchTransientActivityTime" xml:space="preserve">
|
||||||
<value>(?:〓活动时间〓|祈愿时间|【上架时间】).*?(\d\.\d版本更新后).*?~.*?&lt;t class="t_(?:gl|lc)".*?&gt;(.*?)&lt;/t&gt;</value>
|
<value>(?:〓活动时间〓|祈愿时间|【上架时间】|〓折扣时间〓).*?(\d\.\d)版本更新后.*?~.*?&lt;t class="t_(?:gl|lc)".*?&gt;(.*?)&lt;/t&gt;</value>
|
||||||
|
</data>
|
||||||
|
<data name="WebAnnouncementMatchVersionUpdatePreviewTime" xml:space="preserve">
|
||||||
|
<value>将于&lt;t class=\"t_(?:gl|lc)\".*?&gt;(.*?)&lt;/t&gt;进行版本更新维护</value>
|
||||||
|
</data>
|
||||||
|
<data name="WebAnnouncementMatchVersionUpdatePreviewTitle" xml:space="preserve">
|
||||||
|
<value>\d\.\d版本更新维护预告</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="WebAnnouncementMatchVersionUpdateTime" xml:space="preserve">
|
<data name="WebAnnouncementMatchVersionUpdateTime" xml:space="preserve">
|
||||||
<value>〓更新时间〓.+?&lt;t class=\"t_(?:gl|lc)\".*?&gt;(.*?)&lt;/t&gt;</value>
|
<value>〓更新时间〓.+?&lt;t class=\"t_(?:gl|lc)\".*?&gt;(.*?)&lt;/t&gt;</value>
|
||||||
|
|||||||
@@ -60,45 +60,45 @@
|
|||||||
: and then encoded with base64 encoding.
|
: and then encoded with base64 encoding.
|
||||||
-->
|
-->
|
||||||
<xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
|
<xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
|
||||||
<xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
|
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||||
<xsd:element name="root" msdata:IsDataSet="true">
|
<xsd:element name="root" msdata:IsDataSet="true">
|
||||||
<xsd:complexType>
|
<xsd:complexType>
|
||||||
<xsd:choice maxOccurs="unbounded">
|
<xsd:choice maxOccurs="unbounded">
|
||||||
<xsd:element name="metadata">
|
<xsd:element name="metadata">
|
||||||
<xsd:complexType>
|
<xsd:complexType>
|
||||||
<xsd:sequence>
|
<xsd:sequence>
|
||||||
<xsd:element name="value" type="xsd:string" minOccurs="0"/>
|
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||||
</xsd:sequence>
|
</xsd:sequence>
|
||||||
<xsd:attribute name="name" use="required" type="xsd:string"/>
|
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||||
<xsd:attribute name="type" type="xsd:string"/>
|
<xsd:attribute name="type" type="xsd:string" />
|
||||||
<xsd:attribute name="mimetype" type="xsd:string"/>
|
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||||
<xsd:attribute ref="xml:space"/>
|
<xsd:attribute ref="xml:space" />
|
||||||
</xsd:complexType>
|
</xsd:complexType>
|
||||||
</xsd:element>
|
</xsd:element>
|
||||||
<xsd:element name="assembly">
|
<xsd:element name="assembly">
|
||||||
<xsd:complexType>
|
<xsd:complexType>
|
||||||
<xsd:attribute name="alias" type="xsd:string"/>
|
<xsd:attribute name="alias" type="xsd:string" />
|
||||||
<xsd:attribute name="name" type="xsd:string"/>
|
<xsd:attribute name="name" type="xsd:string" />
|
||||||
</xsd:complexType>
|
</xsd:complexType>
|
||||||
</xsd:element>
|
</xsd:element>
|
||||||
<xsd:element name="data">
|
<xsd:element name="data">
|
||||||
<xsd:complexType>
|
<xsd:complexType>
|
||||||
<xsd:sequence>
|
<xsd:sequence>
|
||||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
|
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||||
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
|
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||||
</xsd:sequence>
|
</xsd:sequence>
|
||||||
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
|
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||||
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
|
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||||
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
|
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||||
<xsd:attribute ref="xml:space"/>
|
<xsd:attribute ref="xml:space" />
|
||||||
</xsd:complexType>
|
</xsd:complexType>
|
||||||
</xsd:element>
|
</xsd:element>
|
||||||
<xsd:element name="resheader">
|
<xsd:element name="resheader">
|
||||||
<xsd:complexType>
|
<xsd:complexType>
|
||||||
<xsd:sequence>
|
<xsd:sequence>
|
||||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
|
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||||
</xsd:sequence>
|
</xsd:sequence>
|
||||||
<xsd:attribute name="name" type="xsd:string" use="required"/>
|
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||||
</xsd:complexType>
|
</xsd:complexType>
|
||||||
</xsd:element>
|
</xsd:element>
|
||||||
</xsd:choice>
|
</xsd:choice>
|
||||||
@@ -653,7 +653,7 @@
|
|||||||
<data name="ServiceAchievementUIAFImportPickerTitile" xml:space="preserve">
|
<data name="ServiceAchievementUIAFImportPickerTitile" xml:space="preserve">
|
||||||
<value>Abrir arquivo Json UIAF</value>
|
<value>Abrir arquivo Json UIAF</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="ServiceAchievementUserdataCorruptedInnerIdNotUnique" xml:space="preserve">
|
<data name="ServiceAchievementUserdataCorruptedAchievementIdNotUnique" xml:space="preserve">
|
||||||
<value>Várias IDs de conquistas idênticas encontradas em um único arquivo de conquistas</value>
|
<value>Várias IDs de conquistas idênticas encontradas em um único arquivo de conquistas</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="ServiceAvatarInfoPropertyAtk" xml:space="preserve">
|
<data name="ServiceAvatarInfoPropertyAtk" xml:space="preserve">
|
||||||
@@ -2922,13 +2922,19 @@
|
|||||||
<value>Wiki de armas</value>
|
<value>Wiki de armas</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="WebAnnouncementMatchPermanentActivityTime" xml:space="preserve">
|
<data name="WebAnnouncementMatchPermanentActivityTime" xml:space="preserve">
|
||||||
<value>(?:〓Duração do evento〓|〓Hora de início da missão〓).*?\d\.\da atualização da versão(?:after|)Disponível permanentemente</value>
|
<value>(?:〓Duração do evento〓|〓Hora de início da missão〓).*?(\d\.\d)a atualização da versão(?:after|)Disponível permanentemente</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="WebAnnouncementMatchPersistentActivityTime" xml:space="preserve">
|
<data name="WebAnnouncementMatchPersistentActivityTime" xml:space="preserve">
|
||||||
<value>〓Duração do evento〓.*?\d\.\d Disponível em toda as versões</value>
|
<value>〓Duração do evento〓.*?(\d\.\d) Disponível em toda as versões</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="WebAnnouncementMatchTransientActivityTime" xml:space="preserve">
|
<data name="WebAnnouncementMatchTransientActivityTime" xml:space="preserve">
|
||||||
<value>(?:〓Duração do evento〓|Duração da oração do evento|【Duração da disponibilidade】).*?(\d\.\dApós a atualização da versão).*?~.*?&lt;t class="t_(?:gl|lc)".*?&gt;(.*?)&lt;/t&gt;</value>
|
<value>(?:〓Duração do evento〓|Duração da oração do evento|【Duração da disponibilidade】).*?(\d\.\d)Após a atualização da versão.*?~.*?&lt;t class="t_(?:gl|lc)".*?&gt;(.*?)&lt;/t&gt;</value>
|
||||||
|
</data>
|
||||||
|
<data name="WebAnnouncementMatchVersionUpdatePreviewTime" xml:space="preserve">
|
||||||
|
<value>将于&lt;t class=\"t_(?:gl|lc)\".*?&gt;(.*?)&lt;/t&gt;进行版本更新维护</value>
|
||||||
|
</data>
|
||||||
|
<data name="WebAnnouncementMatchVersionUpdatePreviewTitle" xml:space="preserve">
|
||||||
|
<value>\d\.\d版本更新维护预告</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="WebAnnouncementMatchVersionUpdateTime" xml:space="preserve">
|
<data name="WebAnnouncementMatchVersionUpdateTime" xml:space="preserve">
|
||||||
<value>〓Duração da manutenção da atualização.+?&lt;t class=\"t_(?:gl|lc)\".*?&gt;(.*?)&lt;/t&gt;</value>
|
<value>〓Duração da manutenção da atualização.+?&lt;t class=\"t_(?:gl|lc)\".*?&gt;(.*?)&lt;/t&gt;</value>
|
||||||
|
|||||||
@@ -653,7 +653,7 @@
|
|||||||
<data name="ServiceAchievementUIAFImportPickerTitile" xml:space="preserve">
|
<data name="ServiceAchievementUIAFImportPickerTitile" xml:space="preserve">
|
||||||
<value>打开 UIAF Json 文件</value>
|
<value>打开 UIAF Json 文件</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="ServiceAchievementUserdataCorruptedInnerIdNotUnique" xml:space="preserve">
|
<data name="ServiceAchievementUserdataCorruptedAchievementIdNotUnique" xml:space="preserve">
|
||||||
<value>单个成就存档内发现多个相同的成就 Id</value>
|
<value>单个成就存档内发现多个相同的成就 Id</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="ServiceAvatarInfoPropertyAtk" xml:space="preserve">
|
<data name="ServiceAvatarInfoPropertyAtk" xml:space="preserve">
|
||||||
@@ -1334,6 +1334,12 @@
|
|||||||
<data name="ViewDialogLaunchGameAccountTitle" xml:space="preserve">
|
<data name="ViewDialogLaunchGameAccountTitle" xml:space="preserve">
|
||||||
<value>为账号命名</value>
|
<value>为账号命名</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="ViewDialogLaunchGameConfigurationFixDialogHint" xml:space="preserve">
|
||||||
|
<value>请选择当前游戏路径对应的游戏服务器</value>
|
||||||
|
</data>
|
||||||
|
<data name="ViewDialogLaunchGameConfigurationFixDialogTitle" xml:space="preserve">
|
||||||
|
<value>正在修复配置文件</value>
|
||||||
|
</data>
|
||||||
<data name="ViewDialogLaunchGamePackageConvertHint" xml:space="preserve">
|
<data name="ViewDialogLaunchGamePackageConvertHint" xml:space="preserve">
|
||||||
<value>转换可能需要花费一段时间,请勿关闭胡桃</value>
|
<value>转换可能需要花费一段时间,请勿关闭胡桃</value>
|
||||||
</data>
|
</data>
|
||||||
@@ -1355,6 +1361,9 @@
|
|||||||
<data name="ViewDialogSettingDeleteUserDataTitle" xml:space="preserve">
|
<data name="ViewDialogSettingDeleteUserDataTitle" xml:space="preserve">
|
||||||
<value>是否永久删除用户数据</value>
|
<value>是否永久删除用户数据</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="ViewDialogUpdatePackageDownloadUpdatelogLinkContent" xml:space="preserve">
|
||||||
|
<value>查看更新日志</value>
|
||||||
|
</data>
|
||||||
<data name="ViewDialogUserDocumentAction" xml:space="preserve">
|
<data name="ViewDialogUserDocumentAction" xml:space="preserve">
|
||||||
<value>立即前往</value>
|
<value>立即前往</value>
|
||||||
</data>
|
</data>
|
||||||
@@ -1376,6 +1385,9 @@
|
|||||||
<data name="ViewGachaLogHeader" xml:space="preserve">
|
<data name="ViewGachaLogHeader" xml:space="preserve">
|
||||||
<value>祈愿记录</value>
|
<value>祈愿记录</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="ViewGuideStaticResourceDownloadSize" xml:space="preserve">
|
||||||
|
<value>预计下载大小:{0}</value>
|
||||||
|
</data>
|
||||||
<data name="ViewGuideStepAgreementIHaveReadText" xml:space="preserve">
|
<data name="ViewGuideStepAgreementIHaveReadText" xml:space="preserve">
|
||||||
<value>我已阅读并同意</value>
|
<value>我已阅读并同意</value>
|
||||||
</data>
|
</data>
|
||||||
@@ -1391,6 +1403,12 @@
|
|||||||
<data name="ViewGuideStepAgreementTermOfService" xml:space="preserve">
|
<data name="ViewGuideStepAgreementTermOfService" xml:space="preserve">
|
||||||
<value>用户使用协议与法律声明</value>
|
<value>用户使用协议与法律声明</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="ViewGuideStepCommonSetting" xml:space="preserve">
|
||||||
|
<value>基础设置</value>
|
||||||
|
</data>
|
||||||
|
<data name="ViewGuideStepCommonSettingHint" xml:space="preserve">
|
||||||
|
<value>稍后可以在设置中修改</value>
|
||||||
|
</data>
|
||||||
<data name="ViewGuideStepDocument" xml:space="preserve">
|
<data name="ViewGuideStepDocument" xml:space="preserve">
|
||||||
<value>文档</value>
|
<value>文档</value>
|
||||||
</data>
|
</data>
|
||||||
@@ -1401,7 +1419,7 @@
|
|||||||
<value>安装完成后重启胡桃以查看是否正常生效</value>
|
<value>安装完成后重启胡桃以查看是否正常生效</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="ViewGuideStepEnvironmentFontDescription1" xml:space="preserve">
|
<data name="ViewGuideStepEnvironmentFontDescription1" xml:space="preserve">
|
||||||
<value>如果上方的图标中存在乱码,请前往</value>
|
<value>如果上方的图标中存在乱码或方块字,请前往</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="ViewGuideStepEnvironmentFontDescription2" xml:space="preserve">
|
<data name="ViewGuideStepEnvironmentFontDescription2" xml:space="preserve">
|
||||||
<value>下载并自行安装图标字体</value>
|
<value>下载并自行安装图标字体</value>
|
||||||
@@ -1418,6 +1436,24 @@
|
|||||||
<data name="ViewGuideStepStaticResource" xml:space="preserve">
|
<data name="ViewGuideStepStaticResource" xml:space="preserve">
|
||||||
<value>资源</value>
|
<value>资源</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="ViewGuideStepStaticResourceSetting" xml:space="preserve">
|
||||||
|
<value>图像资源设置</value>
|
||||||
|
</data>
|
||||||
|
<data name="ViewGuideStepStaticResourceSettingHint" xml:space="preserve">
|
||||||
|
<value>* 除非你卸载并重新安装胡桃,否则你将无法更改这些设置</value>
|
||||||
|
</data>
|
||||||
|
<data name="ViewGuideStepStaticResourceSettingMinimumHeader" xml:space="preserve">
|
||||||
|
<value>图片资源包体</value>
|
||||||
|
</data>
|
||||||
|
<data name="ViewGuideStepStaticResourceSettingMinimumOff" xml:space="preserve">
|
||||||
|
<value>完整包体</value>
|
||||||
|
</data>
|
||||||
|
<data name="ViewGuideStepStaticResourceSettingMinimumOn" xml:space="preserve">
|
||||||
|
<value>精简包体</value>
|
||||||
|
</data>
|
||||||
|
<data name="ViewGuideStepStaticResourceSettingQualityHeader" xml:space="preserve">
|
||||||
|
<value>图片资源质量</value>
|
||||||
|
</data>
|
||||||
<data name="ViewHutaoDatabaseHeader" xml:space="preserve">
|
<data name="ViewHutaoDatabaseHeader" xml:space="preserve">
|
||||||
<value>深渊统计</value>
|
<value>深渊统计</value>
|
||||||
</data>
|
</data>
|
||||||
@@ -1607,6 +1643,12 @@
|
|||||||
<data name="ViewModelGuideActionStaticResourceBegin" xml:space="preserve">
|
<data name="ViewModelGuideActionStaticResourceBegin" xml:space="preserve">
|
||||||
<value>下载资源文件中,请稍候</value>
|
<value>下载资源文件中,请稍候</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="ViewModelGuideStaticResourceQualityHigh" xml:space="preserve">
|
||||||
|
<value>高质量</value>
|
||||||
|
</data>
|
||||||
|
<data name="ViewModelGuideStaticResourceQualityRaw" xml:space="preserve">
|
||||||
|
<value>原图</value>
|
||||||
|
</data>
|
||||||
<data name="ViewModelHutaoPassportEmailNotValidHint" xml:space="preserve">
|
<data name="ViewModelHutaoPassportEmailNotValidHint" xml:space="preserve">
|
||||||
<value>请输入正确的邮箱</value>
|
<value>请输入正确的邮箱</value>
|
||||||
</data>
|
</data>
|
||||||
@@ -1625,6 +1667,12 @@
|
|||||||
<data name="ViewModelLaunchGameEnsureGameResourceFail" xml:space="preserve">
|
<data name="ViewModelLaunchGameEnsureGameResourceFail" xml:space="preserve">
|
||||||
<value>切换服务器失败</value>
|
<value>切换服务器失败</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="ViewModelLaunchGameFixConfigurationFileButtonText" xml:space="preserve">
|
||||||
|
<value>修复配置文件</value>
|
||||||
|
</data>
|
||||||
|
<data name="ViewModelLaunchGameFixConfigurationFileSuccess" xml:space="preserve">
|
||||||
|
<value>修复完成</value>
|
||||||
|
</data>
|
||||||
<data name="ViewModelLaunchGameIdentifyMonitorsAction" xml:space="preserve">
|
<data name="ViewModelLaunchGameIdentifyMonitorsAction" xml:space="preserve">
|
||||||
<value>识别显示器</value>
|
<value>识别显示器</value>
|
||||||
</data>
|
</data>
|
||||||
@@ -1637,6 +1685,9 @@
|
|||||||
<data name="ViewModelLaunchGameSchemeNotSelected" xml:space="preserve">
|
<data name="ViewModelLaunchGameSchemeNotSelected" xml:space="preserve">
|
||||||
<value>尚未选择任何服务器</value>
|
<value>尚未选择任何服务器</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="ViewModelLaunchGameSetGamePathButtonText" xml:space="preserve">
|
||||||
|
<value>设置游戏目录</value>
|
||||||
|
</data>
|
||||||
<data name="ViewModelLaunchGameSwitchGameAccountFail" xml:space="preserve">
|
<data name="ViewModelLaunchGameSwitchGameAccountFail" xml:space="preserve">
|
||||||
<value>切换账号失败</value>
|
<value>切换账号失败</value>
|
||||||
</data>
|
</data>
|
||||||
@@ -1673,12 +1724,21 @@
|
|||||||
<data name="ViewModelSettingGeetestCustomUrlSucceed" xml:space="preserve">
|
<data name="ViewModelSettingGeetestCustomUrlSucceed" xml:space="preserve">
|
||||||
<value>无感验证复合 Url 配置成功</value>
|
<value>无感验证复合 Url 配置成功</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="ViewModelSettingResetStaticResourceProgress" xml:space="preserve">
|
||||||
|
<value>正在重置图片资源</value>
|
||||||
|
</data>
|
||||||
<data name="ViewModelSettingSetDataFolderSuccess" xml:space="preserve">
|
<data name="ViewModelSettingSetDataFolderSuccess" xml:space="preserve">
|
||||||
<value>设置数据目录成功,重启以应用更改</value>
|
<value>设置数据目录成功,重启以应用更改</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="ViewModelSettingSetGamePathDatabaseFailedTitle" xml:space="preserve">
|
<data name="ViewModelSettingSetGamePathDatabaseFailedTitle" xml:space="preserve">
|
||||||
<value>保存游戏路径失败</value>
|
<value>保存游戏路径失败</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="ViewModelSpiralAbyssUploadRecordHomaNotLoginContent" xml:space="preserve">
|
||||||
|
<value>当前未登录胡桃账号,上传深渊数据无法获赠胡桃云时长</value>
|
||||||
|
</data>
|
||||||
|
<data name="ViewModelSpiralAbyssUploadRecordHomaNotLoginTitle" xml:space="preserve">
|
||||||
|
<value>上传深渊数据</value>
|
||||||
|
</data>
|
||||||
<data name="ViewModelUserAdded" xml:space="preserve">
|
<data name="ViewModelUserAdded" xml:space="preserve">
|
||||||
<value>用户 [{0}] 添加成功</value>
|
<value>用户 [{0}] 添加成功</value>
|
||||||
</data>
|
</data>
|
||||||
@@ -2528,6 +2588,24 @@
|
|||||||
<data name="ViewpageSettingHomeHeader" xml:space="preserve">
|
<data name="ViewpageSettingHomeHeader" xml:space="preserve">
|
||||||
<value>主页</value>
|
<value>主页</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="ViewPageSettingHutaoCloudAutoUploadDescription" xml:space="preserve">
|
||||||
|
<value>登录胡桃通行证后自动上传至胡桃云</value>
|
||||||
|
</data>
|
||||||
|
<data name="ViewPageSettingHutaoCloudAutoUploadHeader" xml:space="preserve">
|
||||||
|
<value>自动上传</value>
|
||||||
|
</data>
|
||||||
|
<data name="ViewPageSettingHutaoCloudGachaLogAutoUploadDescription" xml:space="preserve">
|
||||||
|
<value>刷新祈愿记录后自动上传至胡桃云,需要有效的胡桃云服务</value>
|
||||||
|
</data>
|
||||||
|
<data name="ViewPageSettingHutaoCloudGachaLogAutoUploadHeader" xml:space="preserve">
|
||||||
|
<value>自动上传祈愿记录</value>
|
||||||
|
</data>
|
||||||
|
<data name="ViewPageSettingHutaoCloudSpiralAbyssAutoUploadDescription" xml:space="preserve">
|
||||||
|
<value>刷新深境螺旋数据后自动上传至胡桃云</value>
|
||||||
|
</data>
|
||||||
|
<data name="ViewPageSettingHutaoCloudSpiralAbyssAutoUploadHeader" xml:space="preserve">
|
||||||
|
<value>自动上传深境螺旋数据</value>
|
||||||
|
</data>
|
||||||
<data name="ViewPageSettingHutaoPassportDangerZoneDescription" xml:space="preserve">
|
<data name="ViewPageSettingHutaoPassportDangerZoneDescription" xml:space="preserve">
|
||||||
<value>三思而后行</value>
|
<value>三思而后行</value>
|
||||||
</data>
|
</data>
|
||||||
@@ -2654,6 +2732,12 @@
|
|||||||
<data name="ViewPageSettingTranslateNavigate" xml:space="preserve">
|
<data name="ViewPageSettingTranslateNavigate" xml:space="preserve">
|
||||||
<value>贡献翻译</value>
|
<value>贡献翻译</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="ViewPageSettingUnobtainedWishItemVisibleDescription" xml:space="preserve">
|
||||||
|
<value>在祈愿记录页面角色与武器页签显示未抽取到的祈愿物品</value>
|
||||||
|
</data>
|
||||||
|
<data name="ViewPageSettingUnobtainedWishItemVisibleHeader" xml:space="preserve">
|
||||||
|
<value>未抽取到的祈愿物品</value>
|
||||||
|
</data>
|
||||||
<data name="ViewPageSettingUpdateCheckAction" xml:space="preserve">
|
<data name="ViewPageSettingUpdateCheckAction" xml:space="preserve">
|
||||||
<value>前往商店</value>
|
<value>前往商店</value>
|
||||||
</data>
|
</data>
|
||||||
@@ -2834,6 +2918,15 @@
|
|||||||
<data name="ViewSpiralAbyssUploadRecord" xml:space="preserve">
|
<data name="ViewSpiralAbyssUploadRecord" xml:space="preserve">
|
||||||
<value>上传数据</value>
|
<value>上传数据</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="ViewTitileUpdatePackageDownloadContent" xml:space="preserve">
|
||||||
|
<value>是否立即下载?</value>
|
||||||
|
</data>
|
||||||
|
<data name="ViewTitileUpdatePackageDownloadFailedMessage" xml:space="preserve">
|
||||||
|
<value>下载更新失败</value>
|
||||||
|
</data>
|
||||||
|
<data name="ViewTitileUpdatePackageDownloadTitle" xml:space="preserve">
|
||||||
|
<value>胡桃 {0} 版本已发布</value>
|
||||||
|
</data>
|
||||||
<data name="ViewTitileUpdatePackageReadyContent" xml:space="preserve">
|
<data name="ViewTitileUpdatePackageReadyContent" xml:space="preserve">
|
||||||
<value>是否立即安装?</value>
|
<value>是否立即安装?</value>
|
||||||
</data>
|
</data>
|
||||||
@@ -2843,6 +2936,9 @@
|
|||||||
<data name="ViewTitleAutoClicking" xml:space="preserve">
|
<data name="ViewTitleAutoClicking" xml:space="preserve">
|
||||||
<value>自动连点</value>
|
<value>自动连点</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="ViewTitleUpdatePackageInstallingContent" xml:space="preserve">
|
||||||
|
<value>正在安装更新</value>
|
||||||
|
</data>
|
||||||
<data name="ViewToolHeader" xml:space="preserve">
|
<data name="ViewToolHeader" xml:space="preserve">
|
||||||
<value>工具</value>
|
<value>工具</value>
|
||||||
</data>
|
</data>
|
||||||
@@ -2922,13 +3018,19 @@
|
|||||||
<value>武器资料</value>
|
<value>武器资料</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="WebAnnouncementMatchPermanentActivityTime" xml:space="preserve">
|
<data name="WebAnnouncementMatchPermanentActivityTime" xml:space="preserve">
|
||||||
<value>(?:〓活动时间〓|〓任务开放时间〓).*?\d\.\d版本更新(?:完成|)后永久开放</value>
|
<value>(?:〓活动时间〓|〓任务开放时间〓).*?(\d\.\d)版本更新(?:完成|)后永久开放</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="WebAnnouncementMatchPersistentActivityTime" xml:space="preserve">
|
<data name="WebAnnouncementMatchPersistentActivityTime" xml:space="preserve">
|
||||||
<value>〓活动时间〓.*?\d\.\d版本期间持续开放</value>
|
<value>〓活动时间〓.*?(\d\.\d)版本期间持续开放</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="WebAnnouncementMatchTransientActivityTime" xml:space="preserve">
|
<data name="WebAnnouncementMatchTransientActivityTime" xml:space="preserve">
|
||||||
<value>(?:〓活动时间〓|祈愿时间|【上架时间】|〓折扣时间〓).*?(\d\.\d版本更新后).*?~.*?&lt;t class="t_(?:gl|lc)".*?&gt;(.*?)&lt;/t&gt;</value>
|
<value>(?:〓活动时间〓|祈愿时间|【上架时间】|〓折扣时间〓).*?(\d\.\d)版本更新后.*?~.*?&lt;t class="t_(?:gl|lc)".*?&gt;(.*?)&lt;/t&gt;</value>
|
||||||
|
</data>
|
||||||
|
<data name="WebAnnouncementMatchVersionUpdatePreviewTime" xml:space="preserve">
|
||||||
|
<value>将于&lt;t class=\"t_(?:gl|lc)\".*?&gt;(.*?)&lt;/t&gt;进行版本更新维护</value>
|
||||||
|
</data>
|
||||||
|
<data name="WebAnnouncementMatchVersionUpdatePreviewTitle" xml:space="preserve">
|
||||||
|
<value>\d\.\d版本更新维护预告</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="WebAnnouncementMatchVersionUpdateTime" xml:space="preserve">
|
<data name="WebAnnouncementMatchVersionUpdateTime" xml:space="preserve">
|
||||||
<value>〓更新时间〓.+?&lt;t class=\"t_(?:gl|lc)\".*?&gt;(.*?)&lt;/t&gt;</value>
|
<value>〓更新时间〓.+?&lt;t class=\"t_(?:gl|lc)\".*?&gt;(.*?)&lt;/t&gt;</value>
|
||||||
|
|||||||
@@ -60,45 +60,45 @@
|
|||||||
: and then encoded with base64 encoding.
|
: and then encoded with base64 encoding.
|
||||||
-->
|
-->
|
||||||
<xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
|
<xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
|
||||||
<xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
|
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||||
<xsd:element name="root" msdata:IsDataSet="true">
|
<xsd:element name="root" msdata:IsDataSet="true">
|
||||||
<xsd:complexType>
|
<xsd:complexType>
|
||||||
<xsd:choice maxOccurs="unbounded">
|
<xsd:choice maxOccurs="unbounded">
|
||||||
<xsd:element name="metadata">
|
<xsd:element name="metadata">
|
||||||
<xsd:complexType>
|
<xsd:complexType>
|
||||||
<xsd:sequence>
|
<xsd:sequence>
|
||||||
<xsd:element name="value" type="xsd:string" minOccurs="0"/>
|
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||||
</xsd:sequence>
|
</xsd:sequence>
|
||||||
<xsd:attribute name="name" use="required" type="xsd:string"/>
|
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||||
<xsd:attribute name="type" type="xsd:string"/>
|
<xsd:attribute name="type" type="xsd:string" />
|
||||||
<xsd:attribute name="mimetype" type="xsd:string"/>
|
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||||
<xsd:attribute ref="xml:space"/>
|
<xsd:attribute ref="xml:space" />
|
||||||
</xsd:complexType>
|
</xsd:complexType>
|
||||||
</xsd:element>
|
</xsd:element>
|
||||||
<xsd:element name="assembly">
|
<xsd:element name="assembly">
|
||||||
<xsd:complexType>
|
<xsd:complexType>
|
||||||
<xsd:attribute name="alias" type="xsd:string"/>
|
<xsd:attribute name="alias" type="xsd:string" />
|
||||||
<xsd:attribute name="name" type="xsd:string"/>
|
<xsd:attribute name="name" type="xsd:string" />
|
||||||
</xsd:complexType>
|
</xsd:complexType>
|
||||||
</xsd:element>
|
</xsd:element>
|
||||||
<xsd:element name="data">
|
<xsd:element name="data">
|
||||||
<xsd:complexType>
|
<xsd:complexType>
|
||||||
<xsd:sequence>
|
<xsd:sequence>
|
||||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
|
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||||
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
|
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||||
</xsd:sequence>
|
</xsd:sequence>
|
||||||
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
|
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||||
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
|
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||||
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
|
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||||
<xsd:attribute ref="xml:space"/>
|
<xsd:attribute ref="xml:space" />
|
||||||
</xsd:complexType>
|
</xsd:complexType>
|
||||||
</xsd:element>
|
</xsd:element>
|
||||||
<xsd:element name="resheader">
|
<xsd:element name="resheader">
|
||||||
<xsd:complexType>
|
<xsd:complexType>
|
||||||
<xsd:sequence>
|
<xsd:sequence>
|
||||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
|
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||||
</xsd:sequence>
|
</xsd:sequence>
|
||||||
<xsd:attribute name="name" type="xsd:string" use="required"/>
|
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||||
</xsd:complexType>
|
</xsd:complexType>
|
||||||
</xsd:element>
|
</xsd:element>
|
||||||
</xsd:choice>
|
</xsd:choice>
|
||||||
@@ -653,7 +653,7 @@
|
|||||||
<data name="ServiceAchievementUIAFImportPickerTitile" xml:space="preserve">
|
<data name="ServiceAchievementUIAFImportPickerTitile" xml:space="preserve">
|
||||||
<value>Открыть UIAF Json файл</value>
|
<value>Открыть UIAF Json файл</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="ServiceAchievementUserdataCorruptedInnerIdNotUnique" xml:space="preserve">
|
<data name="ServiceAchievementUserdataCorruptedAchievementIdNotUnique" xml:space="preserve">
|
||||||
<value>В одном архиве достижений обнаружено несколько одинаковых идентификаторов достижений</value>
|
<value>В одном архиве достижений обнаружено несколько одинаковых идентификаторов достижений</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="ServiceAvatarInfoPropertyAtk" xml:space="preserve">
|
<data name="ServiceAvatarInfoPropertyAtk" xml:space="preserve">
|
||||||
@@ -2922,13 +2922,19 @@
|
|||||||
<value>武器资料</value>
|
<value>武器资料</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="WebAnnouncementMatchPermanentActivityTime" xml:space="preserve">
|
<data name="WebAnnouncementMatchPermanentActivityTime" xml:space="preserve">
|
||||||
<value>(?:〓活动时间〓|〓任务开放时间〓).*?\d\.\d版本更新(?:完成|)后永久开放</value>
|
<value>(?:〓活动时间〓|〓任务开放时间〓).*?(\d\.\d)版本更新(?:完成|)后永久开放</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="WebAnnouncementMatchPersistentActivityTime" xml:space="preserve">
|
<data name="WebAnnouncementMatchPersistentActivityTime" xml:space="preserve">
|
||||||
<value>〓活动时间〓.*?\d\.\d版本期间持续开放</value>
|
<value>〓活动时间〓.*?(\d\.\d)版本期间持续开放</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="WebAnnouncementMatchTransientActivityTime" xml:space="preserve">
|
<data name="WebAnnouncementMatchTransientActivityTime" xml:space="preserve">
|
||||||
<value>(?:〓活动时间〓|祈愿时间|【上架时间】).*?(\d\.\d版本更新后).*?~.*?&lt;t class="t_(?:gl|lc)".*?&gt;(.*?)&lt;/t&gt;</value>
|
<value>(?:〓活动时间〓|祈愿时间|【上架时间】|〓折扣时间〓).*?(\d\.\d)版本更新后.*?~.*?&lt;t class="t_(?:gl|lc)".*?&gt;(.*?)&lt;/t&gt;</value>
|
||||||
|
</data>
|
||||||
|
<data name="WebAnnouncementMatchVersionUpdatePreviewTime" xml:space="preserve">
|
||||||
|
<value>将于&lt;t class=\"t_(?:gl|lc)\".*?&gt;(.*?)&lt;/t&gt;进行版本更新维护</value>
|
||||||
|
</data>
|
||||||
|
<data name="WebAnnouncementMatchVersionUpdatePreviewTitle" xml:space="preserve">
|
||||||
|
<value>\d\.\d版本更新维护预告</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="WebAnnouncementMatchVersionUpdateTime" xml:space="preserve">
|
<data name="WebAnnouncementMatchVersionUpdateTime" xml:space="preserve">
|
||||||
<value>〓更新时间〓.+?&lt;t class=\"t_(?:gl|lc)\".*?&gt;(.*?)&lt;/t&gt;</value>
|
<value>〓更新时间〓.+?&lt;t class=\"t_(?:gl|lc)\".*?&gt;(.*?)&lt;/t&gt;</value>
|
||||||
|
|||||||
@@ -60,45 +60,45 @@
|
|||||||
: and then encoded with base64 encoding.
|
: and then encoded with base64 encoding.
|
||||||
-->
|
-->
|
||||||
<xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
|
<xsd:schema xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" id="root">
|
||||||
<xsd:import namespace="http://www.w3.org/XML/1998/namespace"/>
|
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||||
<xsd:element name="root" msdata:IsDataSet="true">
|
<xsd:element name="root" msdata:IsDataSet="true">
|
||||||
<xsd:complexType>
|
<xsd:complexType>
|
||||||
<xsd:choice maxOccurs="unbounded">
|
<xsd:choice maxOccurs="unbounded">
|
||||||
<xsd:element name="metadata">
|
<xsd:element name="metadata">
|
||||||
<xsd:complexType>
|
<xsd:complexType>
|
||||||
<xsd:sequence>
|
<xsd:sequence>
|
||||||
<xsd:element name="value" type="xsd:string" minOccurs="0"/>
|
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||||
</xsd:sequence>
|
</xsd:sequence>
|
||||||
<xsd:attribute name="name" use="required" type="xsd:string"/>
|
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||||
<xsd:attribute name="type" type="xsd:string"/>
|
<xsd:attribute name="type" type="xsd:string" />
|
||||||
<xsd:attribute name="mimetype" type="xsd:string"/>
|
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||||
<xsd:attribute ref="xml:space"/>
|
<xsd:attribute ref="xml:space" />
|
||||||
</xsd:complexType>
|
</xsd:complexType>
|
||||||
</xsd:element>
|
</xsd:element>
|
||||||
<xsd:element name="assembly">
|
<xsd:element name="assembly">
|
||||||
<xsd:complexType>
|
<xsd:complexType>
|
||||||
<xsd:attribute name="alias" type="xsd:string"/>
|
<xsd:attribute name="alias" type="xsd:string" />
|
||||||
<xsd:attribute name="name" type="xsd:string"/>
|
<xsd:attribute name="name" type="xsd:string" />
|
||||||
</xsd:complexType>
|
</xsd:complexType>
|
||||||
</xsd:element>
|
</xsd:element>
|
||||||
<xsd:element name="data">
|
<xsd:element name="data">
|
||||||
<xsd:complexType>
|
<xsd:complexType>
|
||||||
<xsd:sequence>
|
<xsd:sequence>
|
||||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
|
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||||
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"/>
|
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||||
</xsd:sequence>
|
</xsd:sequence>
|
||||||
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1"/>
|
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||||
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3"/>
|
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||||
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4"/>
|
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||||
<xsd:attribute ref="xml:space"/>
|
<xsd:attribute ref="xml:space" />
|
||||||
</xsd:complexType>
|
</xsd:complexType>
|
||||||
</xsd:element>
|
</xsd:element>
|
||||||
<xsd:element name="resheader">
|
<xsd:element name="resheader">
|
||||||
<xsd:complexType>
|
<xsd:complexType>
|
||||||
<xsd:sequence>
|
<xsd:sequence>
|
||||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"/>
|
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||||
</xsd:sequence>
|
</xsd:sequence>
|
||||||
<xsd:attribute name="name" type="xsd:string" use="required"/>
|
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||||
</xsd:complexType>
|
</xsd:complexType>
|
||||||
</xsd:element>
|
</xsd:element>
|
||||||
</xsd:choice>
|
</xsd:choice>
|
||||||
@@ -653,7 +653,7 @@
|
|||||||
<data name="ServiceAchievementUIAFImportPickerTitile" xml:space="preserve">
|
<data name="ServiceAchievementUIAFImportPickerTitile" xml:space="preserve">
|
||||||
<value>打開 UIAF Json 文件</value>
|
<value>打開 UIAF Json 文件</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="ServiceAchievementUserdataCorruptedInnerIdNotUnique" xml:space="preserve">
|
<data name="ServiceAchievementUserdataCorruptedAchievementIdNotUnique" xml:space="preserve">
|
||||||
<value>單個成就存檔內發現多個相同的成就 Id</value>
|
<value>單個成就存檔內發現多個相同的成就 Id</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="ServiceAvatarInfoPropertyAtk" xml:space="preserve">
|
<data name="ServiceAvatarInfoPropertyAtk" xml:space="preserve">
|
||||||
@@ -2922,13 +2922,19 @@
|
|||||||
<value>武器資料</value>
|
<value>武器資料</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="WebAnnouncementMatchPermanentActivityTime" xml:space="preserve">
|
<data name="WebAnnouncementMatchPermanentActivityTime" xml:space="preserve">
|
||||||
<value>(?:〓活動時間〓|〓任務開放時間〓).*?\d\.\d版本更新(?:完成|)後永久開放</value>
|
<value>(?:〓活動時間〓|〓任務開放時間〓).*?(\d\.\d)版本更新(?:完成|)後永久開放</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="WebAnnouncementMatchPersistentActivityTime" xml:space="preserve">
|
<data name="WebAnnouncementMatchPersistentActivityTime" xml:space="preserve">
|
||||||
<value>〓活動時間〓.*?\d\.\d版本期間持續開放</value>
|
<value>〓活動時間〓.*?(\d\.\d)版本期間持續開放</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="WebAnnouncementMatchTransientActivityTime" xml:space="preserve">
|
<data name="WebAnnouncementMatchTransientActivityTime" xml:space="preserve">
|
||||||
<value>(?:〓活動時間〓|祈願時間|【上架時間】|〓折扣時間〓).*?(\d\.\d版本更新後).*?~.*?&lt;t class="t_(?:gl|lc)".*?&gt;(.*?)&lt;/t&gt;</value>
|
<value>(?:〓活動時間〓|祈願時間|【上架時間】|〓折扣時間〓).*?(\d\.\d).*?版本更新後.*?&lt;t class="t_(?:gl|lc)".*?&gt;(.*?)&lt;/t&gt;</value>
|
||||||
|
</data>
|
||||||
|
<data name="WebAnnouncementMatchVersionUpdatePreviewTime" xml:space="preserve">
|
||||||
|
<value>親愛.*?&lt;t class=\"t_(?:gl|lc)\".*?&gt;(.*?)&lt;/t&gt;</value>
|
||||||
|
</data>
|
||||||
|
<data name="WebAnnouncementMatchVersionUpdatePreviewTitle" xml:space="preserve">
|
||||||
|
<value>\d\.\d版本更新維護預告</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="WebAnnouncementMatchVersionUpdateTime" xml:space="preserve">
|
<data name="WebAnnouncementMatchVersionUpdateTime" xml:space="preserve">
|
||||||
<value>〓更新時間〓.+?&lt;t class=\"t_(?:gl|lc)\".*?&gt;(.*?)&lt;/t&gt;</value>
|
<value>〓更新時間〓.+?&lt;t class=\"t_(?:gl|lc)\".*?&gt;(.*?)&lt;/t&gt;</value>
|
||||||
|
|||||||
@@ -0,0 +1,35 @@
|
|||||||
|
// Copyright (c) DGP Studio. All rights reserved.
|
||||||
|
// Licensed under the MIT license.
|
||||||
|
|
||||||
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
using Snap.Hutao.Core.Database;
|
||||||
|
using Snap.Hutao.Model.Entity.Abstraction;
|
||||||
|
|
||||||
|
namespace Snap.Hutao.Service.Abstraction;
|
||||||
|
|
||||||
|
internal static class AppDbServiceAppDbEntityExtension
|
||||||
|
{
|
||||||
|
public static int DeleteByInnerId<TEntity>(this IAppDbService<TEntity> service, TEntity entity)
|
||||||
|
where TEntity : class, IAppDbEntity
|
||||||
|
{
|
||||||
|
return service.Execute(dbset => dbset.ExecuteDeleteWhere(e => e.InnerId == entity.InnerId));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ValueTask<int> DeleteByInnerIdAsync<TEntity>(this IAppDbService<TEntity> service, TEntity entity, CancellationToken token = default)
|
||||||
|
where TEntity : class, IAppDbEntity
|
||||||
|
{
|
||||||
|
return service.ExecuteAsync((dbset, token) => dbset.ExecuteDeleteWhereAsync(e => e.InnerId == entity.InnerId, token), token);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static List<TEntity> ListByArchiveId<TEntity>(this IAppDbService<TEntity> service, Guid archiveId)
|
||||||
|
where TEntity : class, IAppDbEntityHasArchive
|
||||||
|
{
|
||||||
|
return service.Query(query => query.Where(e => e.ArchiveId == archiveId).ToList());
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ValueTask<List<TEntity>> ListByArchiveIdAsync<TEntity>(this IAppDbService<TEntity> service, Guid archiveId, CancellationToken token = default)
|
||||||
|
where TEntity : class, IAppDbEntityHasArchive
|
||||||
|
{
|
||||||
|
return service.QueryAsync((query, token) => query.Where(e => e.ArchiveId == archiveId).ToListAsync(token), token);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
// Copyright (c) DGP Studio. All rights reserved.
|
||||||
|
// Licensed under the MIT license.
|
||||||
|
|
||||||
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
using System.Collections.ObjectModel;
|
||||||
|
using System.Linq.Expressions;
|
||||||
|
|
||||||
|
namespace Snap.Hutao.Service.Abstraction;
|
||||||
|
|
||||||
|
internal static class AppDbServiceCollectionExtension
|
||||||
|
{
|
||||||
|
public static List<TEntity> List<TEntity>(this IAppDbService<TEntity> service)
|
||||||
|
where TEntity : class
|
||||||
|
{
|
||||||
|
return service.Query(query => query.ToList());
|
||||||
|
}
|
||||||
|
|
||||||
|
public static List<TEntity> List<TEntity>(this IAppDbService<TEntity> service, Expression<Func<TEntity, bool>> predicate)
|
||||||
|
where TEntity : class
|
||||||
|
{
|
||||||
|
return service.Query(query => query.Where(predicate).ToList());
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ValueTask<List<TEntity>> ListAsync<TEntity>(this IAppDbService<TEntity> service, CancellationToken token = default)
|
||||||
|
where TEntity : class
|
||||||
|
{
|
||||||
|
return service.QueryAsync((query, token) => query.ToListAsync(token), token);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ValueTask<List<TEntity>> ListAsync<TEntity>(this IAppDbService<TEntity> service, Expression<Func<TEntity, bool>> predicate, CancellationToken token = default)
|
||||||
|
where TEntity : class
|
||||||
|
{
|
||||||
|
return service.QueryAsync((query, token) => query.Where(predicate).ToListAsync(token), token);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ObservableCollection<TEntity> ObservableCollection<TEntity>(this IAppDbService<TEntity> service)
|
||||||
|
where TEntity : class
|
||||||
|
{
|
||||||
|
return service.Query(query => query.ToObservableCollection());
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ObservableCollection<TEntity> ObservableCollection<TEntity>(this IAppDbService<TEntity> service, Expression<Func<TEntity, bool>> predicate)
|
||||||
|
where TEntity : class
|
||||||
|
{
|
||||||
|
return service.Query(query => query.Where(predicate).ToObservableCollection());
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,152 @@
|
|||||||
|
// Copyright (c) DGP Studio. All rights reserved.
|
||||||
|
// Licensed under the MIT license.
|
||||||
|
|
||||||
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
using Snap.Hutao.Core.Database;
|
||||||
|
using Snap.Hutao.Model.Entity.Database;
|
||||||
|
using System.Linq.Expressions;
|
||||||
|
|
||||||
|
namespace Snap.Hutao.Service.Abstraction;
|
||||||
|
|
||||||
|
internal static class AppDbServiceExtension
|
||||||
|
{
|
||||||
|
public static TResult Execute<TEntity, TResult>(this IAppDbService<TEntity> service, Func<DbSet<TEntity>, TResult> func)
|
||||||
|
where TEntity : class
|
||||||
|
{
|
||||||
|
using (IServiceScope scope = service.ServiceProvider.CreateScope())
|
||||||
|
{
|
||||||
|
AppDbContext appDbContext = scope.GetAppDbContext();
|
||||||
|
return func(appDbContext.Set<TEntity>());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static async ValueTask<TResult> ExecuteAsync<TEntity, TResult>(this IAppDbService<TEntity> service, Func<DbSet<TEntity>, ValueTask<TResult>> asyncFunc)
|
||||||
|
where TEntity : class
|
||||||
|
{
|
||||||
|
using (IServiceScope scope = service.ServiceProvider.CreateScope())
|
||||||
|
{
|
||||||
|
AppDbContext appDbContext = scope.GetAppDbContext();
|
||||||
|
return await asyncFunc(appDbContext.Set<TEntity>()).ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static async ValueTask<TResult> ExecuteAsync<TEntity, TResult>(this IAppDbService<TEntity> service, Func<DbSet<TEntity>, CancellationToken, ValueTask<TResult>> asyncFunc, CancellationToken token)
|
||||||
|
where TEntity : class
|
||||||
|
{
|
||||||
|
using (IServiceScope scope = service.ServiceProvider.CreateScope())
|
||||||
|
{
|
||||||
|
AppDbContext appDbContext = scope.GetAppDbContext();
|
||||||
|
return await asyncFunc(appDbContext.Set<TEntity>(), token).ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static async ValueTask<TResult> ExecuteAsync<TEntity, TResult>(this IAppDbService<TEntity> service, Func<DbSet<TEntity>, Task<TResult>> asyncFunc)
|
||||||
|
where TEntity : class
|
||||||
|
{
|
||||||
|
using (IServiceScope scope = service.ServiceProvider.CreateScope())
|
||||||
|
{
|
||||||
|
AppDbContext appDbContext = scope.GetAppDbContext();
|
||||||
|
return await asyncFunc(appDbContext.Set<TEntity>()).ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static async ValueTask<TResult> ExecuteAsync<TEntity, TResult>(this IAppDbService<TEntity> service, Func<DbSet<TEntity>, CancellationToken, Task<TResult>> asyncFunc, CancellationToken token)
|
||||||
|
where TEntity : class
|
||||||
|
{
|
||||||
|
using (IServiceScope scope = service.ServiceProvider.CreateScope())
|
||||||
|
{
|
||||||
|
AppDbContext appDbContext = scope.GetAppDbContext();
|
||||||
|
return await asyncFunc(appDbContext.Set<TEntity>(), token).ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static int Add<TEntity>(this IAppDbService<TEntity> service, TEntity entity)
|
||||||
|
where TEntity : class
|
||||||
|
{
|
||||||
|
return service.Execute(dbset => dbset.AddAndSave(entity));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ValueTask<int> AddAsync<TEntity>(this IAppDbService<TEntity> service, TEntity entity, CancellationToken token = default)
|
||||||
|
where TEntity : class
|
||||||
|
{
|
||||||
|
return service.ExecuteAsync((dbset, token) => dbset.AddAndSaveAsync(entity, token), token);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static int AddRange<TEntity>(this IAppDbService<TEntity> service, IEnumerable<TEntity> entities)
|
||||||
|
where TEntity : class
|
||||||
|
{
|
||||||
|
return service.Execute(dbset => dbset.AddRangeAndSave(entities));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ValueTask<int> AddRangeAsync<TEntity>(this IAppDbService<TEntity> service, IEnumerable<TEntity> entities, CancellationToken token = default)
|
||||||
|
where TEntity : class
|
||||||
|
{
|
||||||
|
return service.ExecuteAsync((dbset, token) => dbset.AddRangeAndSaveAsync(entities, token), token);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static TResult Query<TEntity, TResult>(this IAppDbService<TEntity> service, Func<IQueryable<TEntity>, TResult> func)
|
||||||
|
where TEntity : class
|
||||||
|
{
|
||||||
|
return service.Execute(dbset => func(dbset.AsNoTracking()));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ValueTask<TResult> QueryAsync<TEntity, TResult>(this IAppDbService<TEntity> service, Func<IQueryable<TEntity>, ValueTask<TResult>> func)
|
||||||
|
where TEntity : class
|
||||||
|
{
|
||||||
|
return service.ExecuteAsync(dbset => func(dbset.AsNoTracking()));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ValueTask<TResult> QueryAsync<TEntity, TResult>(this IAppDbService<TEntity> service, Func<IQueryable<TEntity>, CancellationToken, ValueTask<TResult>> func, CancellationToken token = default)
|
||||||
|
where TEntity : class
|
||||||
|
{
|
||||||
|
return service.ExecuteAsync((dbset, token) => func(dbset.AsNoTracking(), token), token);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ValueTask<TResult> QueryAsync<TEntity, TResult>(this IAppDbService<TEntity> service, Func<IQueryable<TEntity>, Task<TResult>> func)
|
||||||
|
where TEntity : class
|
||||||
|
{
|
||||||
|
return service.ExecuteAsync(dbset => func(dbset.AsNoTracking()));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ValueTask<TResult> QueryAsync<TEntity, TResult>(this IAppDbService<TEntity> service, Func<IQueryable<TEntity>, CancellationToken, Task<TResult>> func, CancellationToken token = default)
|
||||||
|
where TEntity : class
|
||||||
|
{
|
||||||
|
return service.ExecuteAsync((dbset, token) => func(dbset.AsNoTracking(), token), token);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static TEntity Single<TEntity>(this IAppDbService<TEntity> service, Expression<Func<TEntity, bool>> predicate)
|
||||||
|
where TEntity : class
|
||||||
|
{
|
||||||
|
return service.Query(query => query.Single(predicate));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ValueTask<TEntity> SingleAsync<TEntity>(this IAppDbService<TEntity> service, Expression<Func<TEntity, bool>> predicate, CancellationToken token = default)
|
||||||
|
where TEntity : class
|
||||||
|
{
|
||||||
|
return service.QueryAsync((query, token) => query.SingleAsync(predicate, token), token);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static int Update<TEntity>(this IAppDbService<TEntity> service, TEntity entity)
|
||||||
|
where TEntity : class
|
||||||
|
{
|
||||||
|
return service.Execute(dbset => dbset.UpdateAndSave(entity));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ValueTask<int> UpdateAsync<TEntity>(this IAppDbService<TEntity> service, TEntity entity, CancellationToken token = default)
|
||||||
|
where TEntity : class
|
||||||
|
{
|
||||||
|
return service.ExecuteAsync((dbset, token) => dbset.UpdateAndSaveAsync(entity, token), token);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static int Delete<TEntity>(this IAppDbService<TEntity> service, TEntity entity)
|
||||||
|
where TEntity : class
|
||||||
|
{
|
||||||
|
return service.Execute(dbset => dbset.RemoveAndSave(entity));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ValueTask<int> DeleteAsync<TEntity>(this IAppDbService<TEntity> service, TEntity entity, CancellationToken token = default)
|
||||||
|
where TEntity : class
|
||||||
|
{
|
||||||
|
return service.ExecuteAsync((dbset, token) => dbset.RemoveAndSaveAsync(entity, token), token);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -14,20 +14,10 @@ namespace Snap.Hutao.Service.Abstraction;
|
|||||||
/// 数据库存储选项的设置
|
/// 数据库存储选项的设置
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[ConstructorGenerated]
|
[ConstructorGenerated]
|
||||||
internal abstract partial class DbStoreOptions : ObservableObject, IOptions<DbStoreOptions>
|
internal abstract partial class DbStoreOptions : ObservableObject
|
||||||
{
|
{
|
||||||
private readonly IServiceProvider serviceProvider;
|
private readonly IServiceProvider serviceProvider;
|
||||||
|
|
||||||
/// <inheritdoc/>
|
|
||||||
public DbStoreOptions Value { get => this; }
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 从数据库中获取字符串数据
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="storage">存储字段</param>
|
|
||||||
/// <param name="key">键</param>
|
|
||||||
/// <param name="defaultValue">默认值</param>
|
|
||||||
/// <returns>值</returns>
|
|
||||||
protected string GetOption(ref string? storage, string key, string defaultValue = "")
|
protected string GetOption(ref string? storage, string key, string defaultValue = "")
|
||||||
{
|
{
|
||||||
return GetOption(ref storage, key, () => defaultValue);
|
return GetOption(ref storage, key, () => defaultValue);
|
||||||
@@ -49,13 +39,6 @@ internal abstract partial class DbStoreOptions : ObservableObject, IOptions<DbSt
|
|||||||
return storage;
|
return storage;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 从数据库中获取bool数据
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="storage">存储字段</param>
|
|
||||||
/// <param name="key">键</param>
|
|
||||||
/// <param name="defaultValue">默认值</param>
|
|
||||||
/// <returns>值</returns>
|
|
||||||
protected bool GetOption(ref bool? storage, string key, bool defaultValue = false)
|
protected bool GetOption(ref bool? storage, string key, bool defaultValue = false)
|
||||||
{
|
{
|
||||||
return GetOption(ref storage, key, () => defaultValue);
|
return GetOption(ref storage, key, () => defaultValue);
|
||||||
@@ -78,13 +61,6 @@ internal abstract partial class DbStoreOptions : ObservableObject, IOptions<DbSt
|
|||||||
return storage.Value;
|
return storage.Value;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 从数据库中获取int数据
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="storage">存储字段</param>
|
|
||||||
/// <param name="key">键</param>
|
|
||||||
/// <param name="defaultValue">默认值</param>
|
|
||||||
/// <returns>值</returns>
|
|
||||||
protected int GetOption(ref int? storage, string key, int defaultValue = 0)
|
protected int GetOption(ref int? storage, string key, int defaultValue = 0)
|
||||||
{
|
{
|
||||||
return GetOption(ref storage, key, () => defaultValue);
|
return GetOption(ref storage, key, () => defaultValue);
|
||||||
@@ -107,15 +83,6 @@ internal abstract partial class DbStoreOptions : ObservableObject, IOptions<DbSt
|
|||||||
return storage.Value;
|
return storage.Value;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 从数据库中获取任何类型的数据
|
|
||||||
/// </summary>
|
|
||||||
/// <typeparam name="T">数据的类型</typeparam>
|
|
||||||
/// <param name="storage">存储字段</param>
|
|
||||||
/// <param name="key">键</param>
|
|
||||||
/// <param name="deserializer">反序列化器</param>
|
|
||||||
/// <param name="defaultValue">默认值</param>
|
|
||||||
/// <returns>值</returns>
|
|
||||||
[return: NotNull]
|
[return: NotNull]
|
||||||
protected T GetOption<T>(ref T? storage, string key, Func<string, T> deserializer, [DisallowNull] T defaultValue)
|
protected T GetOption<T>(ref T? storage, string key, Func<string, T> deserializer, [DisallowNull] T defaultValue)
|
||||||
{
|
{
|
||||||
@@ -160,13 +127,6 @@ internal abstract partial class DbStoreOptions : ObservableObject, IOptions<DbSt
|
|||||||
return storage;
|
return storage;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 将值存入数据库
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="storage">存储字段</param>
|
|
||||||
/// <param name="key">键</param>
|
|
||||||
/// <param name="value">值</param>
|
|
||||||
/// <param name="propertyName">属性名称</param>
|
|
||||||
protected void SetOption(ref string? storage, string key, string? value, [CallerMemberName] string? propertyName = null)
|
protected void SetOption(ref string? storage, string key, string? value, [CallerMemberName] string? propertyName = null)
|
||||||
{
|
{
|
||||||
if (!SetProperty(ref storage, value, propertyName))
|
if (!SetProperty(ref storage, value, propertyName))
|
||||||
@@ -182,14 +142,6 @@ internal abstract partial class DbStoreOptions : ObservableObject, IOptions<DbSt
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 将值存入数据库
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="storage">存储字段</param>
|
|
||||||
/// <param name="key">键</param>
|
|
||||||
/// <param name="value">值</param>
|
|
||||||
/// <param name="propertyName">属性名称</param>
|
|
||||||
/// <returns>是否设置了值</returns>
|
|
||||||
protected bool SetOption(ref bool? storage, string key, bool value, [CallerMemberName] string? propertyName = null)
|
protected bool SetOption(ref bool? storage, string key, bool value, [CallerMemberName] string? propertyName = null)
|
||||||
{
|
{
|
||||||
bool set = SetProperty(ref storage, value, propertyName);
|
bool set = SetProperty(ref storage, value, propertyName);
|
||||||
@@ -208,13 +160,6 @@ internal abstract partial class DbStoreOptions : ObservableObject, IOptions<DbSt
|
|||||||
return set;
|
return set;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 将值存入数据库
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="storage">存储字段</param>
|
|
||||||
/// <param name="key">键</param>
|
|
||||||
/// <param name="value">值</param>
|
|
||||||
/// <param name="propertyName">属性名称</param>
|
|
||||||
protected void SetOption(ref int? storage, string key, int value, [CallerMemberName] string? propertyName = null)
|
protected void SetOption(ref int? storage, string key, int value, [CallerMemberName] string? propertyName = null)
|
||||||
{
|
{
|
||||||
if (!SetProperty(ref storage, value, propertyName))
|
if (!SetProperty(ref storage, value, propertyName))
|
||||||
@@ -230,15 +175,6 @@ internal abstract partial class DbStoreOptions : ObservableObject, IOptions<DbSt
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 将值存入数据库
|
|
||||||
/// </summary>
|
|
||||||
/// <typeparam name="T">数据的类型</typeparam>
|
|
||||||
/// <param name="storage">存储字段</param>
|
|
||||||
/// <param name="key">键</param>
|
|
||||||
/// <param name="value">值</param>
|
|
||||||
/// <param name="serializer">序列化器</param>
|
|
||||||
/// <param name="propertyName">属性名称</param>
|
|
||||||
protected void SetOption<T>(ref T? storage, string key, T value, Func<T, string> serializer, [CallerMemberName] string? propertyName = null)
|
protected void SetOption<T>(ref T? storage, string key, T value, Func<T, string> serializer, [CallerMemberName] string? propertyName = null)
|
||||||
{
|
{
|
||||||
if (!SetProperty(ref storage, value, propertyName))
|
if (!SetProperty(ref storage, value, propertyName))
|
||||||
|
|||||||
@@ -0,0 +1,9 @@
|
|||||||
|
// Copyright (c) DGP Studio. All rights reserved.
|
||||||
|
// Licensed under the MIT license.
|
||||||
|
|
||||||
|
namespace Snap.Hutao.Service.Abstraction;
|
||||||
|
|
||||||
|
internal interface IAppDbService<TEntity> : IAppInfrastructureService
|
||||||
|
where TEntity : class
|
||||||
|
{
|
||||||
|
}
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
// Copyright (c) DGP Studio. All rights reserved.
|
||||||
|
// Licensed under the MIT license.
|
||||||
|
|
||||||
|
namespace Snap.Hutao.Service.Abstraction;
|
||||||
|
|
||||||
|
internal interface IAppInfrastructureService
|
||||||
|
{
|
||||||
|
IServiceProvider ServiceProvider { get; }
|
||||||
|
}
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
// Copyright (c) DGP Studio. All rights reserved.
|
||||||
|
// Licensed under the MIT license.
|
||||||
|
|
||||||
|
namespace Snap.Hutao.Service.Abstraction;
|
||||||
|
|
||||||
|
internal interface IAppService;
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
// Copyright (c) DGP Studio. All rights reserved.
|
||||||
|
// Licensed under the MIT license.
|
||||||
|
|
||||||
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
using Snap.Hutao.Model.Entity.Database;
|
||||||
|
|
||||||
|
namespace Snap.Hutao.Service.Abstraction;
|
||||||
|
|
||||||
|
internal static class ServiceScopeExtension
|
||||||
|
{
|
||||||
|
public static TService GetRequiredService<TService>(this IServiceScope scope)
|
||||||
|
where TService : class
|
||||||
|
{
|
||||||
|
return scope.ServiceProvider.GetRequiredService<TService>();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static TDbContext GetDbContext<TDbContext>(this IServiceScope scope)
|
||||||
|
where TDbContext : DbContext
|
||||||
|
{
|
||||||
|
return scope.GetRequiredService<TDbContext>();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static AppDbContext GetAppDbContext(this IServiceScope scope)
|
||||||
|
{
|
||||||
|
return scope.GetDbContext<AppDbContext>();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,9 +2,11 @@
|
|||||||
// Licensed under the MIT license.
|
// Licensed under the MIT license.
|
||||||
|
|
||||||
using Microsoft.EntityFrameworkCore;
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
using Snap.Hutao.Core.Collection;
|
||||||
using Snap.Hutao.Core.Database;
|
using Snap.Hutao.Core.Database;
|
||||||
using Snap.Hutao.Model.Entity.Database;
|
using Snap.Hutao.Model.Entity.Database;
|
||||||
using Snap.Hutao.Model.InterChange.Achievement;
|
using Snap.Hutao.Model.InterChange.Achievement;
|
||||||
|
using Snap.Hutao.Service.Abstraction;
|
||||||
using EntityAchievement = Snap.Hutao.Model.Entity.Achievement;
|
using EntityAchievement = Snap.Hutao.Model.Entity.Achievement;
|
||||||
|
|
||||||
namespace Snap.Hutao.Service.Achievement;
|
namespace Snap.Hutao.Service.Achievement;
|
||||||
@@ -21,197 +23,155 @@ internal sealed partial class AchievementDbBulkOperation
|
|||||||
private readonly IServiceProvider serviceProvider;
|
private readonly IServiceProvider serviceProvider;
|
||||||
private readonly ILogger<AchievementDbBulkOperation> logger;
|
private readonly ILogger<AchievementDbBulkOperation> logger;
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 合并
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="archiveId">成就id</param>
|
|
||||||
/// <param name="items">待合并的项</param>
|
|
||||||
/// <param name="aggressive">是否贪婪</param>
|
|
||||||
/// <returns>导入结果</returns>
|
|
||||||
public ImportResult Merge(Guid archiveId, IEnumerable<UIAFItem> items, bool aggressive)
|
public ImportResult Merge(Guid archiveId, IEnumerable<UIAFItem> items, bool aggressive)
|
||||||
{
|
{
|
||||||
logger.LogInformation("Perform {Method} Operation for archive: {Id}, Aggressive: {Aggressive}", nameof(Merge), archiveId, aggressive);
|
logger.LogInformation("Perform merge operation for [Archive: {Id}], [Aggressive: {Aggressive}]", archiveId, aggressive);
|
||||||
using (IServiceScope scope = serviceProvider.CreateScope())
|
using (IServiceScope scope = serviceProvider.CreateScope())
|
||||||
{
|
{
|
||||||
AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
|
AppDbContext appDbContext = scope.GetAppDbContext();
|
||||||
|
|
||||||
IOrderedQueryable<EntityAchievement> oldData = appDbContext.Achievements
|
IOrderedQueryable<EntityAchievement> oldData = appDbContext.Achievements
|
||||||
.AsNoTracking()
|
.AsNoTracking()
|
||||||
.Where(a => a.ArchiveId == archiveId)
|
.Where(a => a.ArchiveId == archiveId)
|
||||||
.OrderBy(a => a.Id);
|
.OrderBy(a => a.Id);
|
||||||
|
|
||||||
int add = 0;
|
(int add, int update) = (0, 0);
|
||||||
int update = 0;
|
|
||||||
|
|
||||||
using (IEnumerator<EntityAchievement> entityEnumerator = oldData.GetEnumerator())
|
using (TwoEnumerbleEnumerator<EntityAchievement, UIAFItem> enumerator = new(oldData, items))
|
||||||
{
|
{
|
||||||
using (IEnumerator<UIAFItem> uiafEnumerator = items.GetEnumerator())
|
(bool moveEntity, bool moveUIAF) = (true, true);
|
||||||
|
|
||||||
|
while (true)
|
||||||
{
|
{
|
||||||
bool moveEntity = true;
|
if (!enumerator.MoveNext(ref moveEntity, ref moveUIAF))
|
||||||
bool moveUIAF = true;
|
|
||||||
|
|
||||||
while (true)
|
|
||||||
{
|
{
|
||||||
bool moveEntityResult = moveEntity && entityEnumerator.MoveNext();
|
break;
|
||||||
bool moveUIAFResult = moveUIAF && uiafEnumerator.MoveNext();
|
}
|
||||||
|
|
||||||
if (!(moveEntityResult || moveUIAFResult))
|
(EntityAchievement? entity, UIAFItem? uiaf) = enumerator.Current;
|
||||||
{
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
EntityAchievement? entity = entityEnumerator.Current;
|
|
||||||
UIAFItem? uiaf = uiafEnumerator.Current;
|
|
||||||
|
|
||||||
if (entity is null && uiaf is not null)
|
|
||||||
{
|
|
||||||
appDbContext.Achievements.AddAndSave(EntityAchievement.From(archiveId, uiaf));
|
|
||||||
add++;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
else if (entity is not null && uiaf is null)
|
|
||||||
{
|
|
||||||
// skip
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
switch (entity, uiaf)
|
||||||
|
{
|
||||||
|
case (null, not null):
|
||||||
|
appDbContext.Achievements.AddAndSave(EntityAchievement.From(archiveId, uiaf));
|
||||||
|
add++;
|
||||||
|
continue;
|
||||||
|
case (not null, null):
|
||||||
|
continue; // Skipped
|
||||||
|
default:
|
||||||
ArgumentNullException.ThrowIfNull(entity);
|
ArgumentNullException.ThrowIfNull(entity);
|
||||||
ArgumentNullException.ThrowIfNull(uiaf);
|
ArgumentNullException.ThrowIfNull(uiaf);
|
||||||
|
|
||||||
if (entity.Id < uiaf.Id)
|
switch (entity.Id.CompareTo(uiaf.Id))
|
||||||
{
|
{
|
||||||
moveEntity = true;
|
case < 0:
|
||||||
moveUIAF = false;
|
(moveEntity, moveUIAF) = (true, false);
|
||||||
}
|
break;
|
||||||
else if (entity.Id == uiaf.Id)
|
case 0:
|
||||||
{
|
(moveEntity, moveUIAF) = (true, true);
|
||||||
moveEntity = true;
|
|
||||||
moveUIAF = true;
|
if (aggressive)
|
||||||
|
{
|
||||||
|
appDbContext.Achievements.RemoveAndSave(entity);
|
||||||
|
appDbContext.Achievements.AddAndSave(EntityAchievement.From(archiveId, uiaf));
|
||||||
|
update++;
|
||||||
|
}
|
||||||
|
|
||||||
|
break;
|
||||||
|
case > 0:
|
||||||
|
(moveEntity, moveUIAF) = (false, true);
|
||||||
|
|
||||||
if (aggressive)
|
|
||||||
{
|
|
||||||
appDbContext.Achievements.RemoveAndSave(entity);
|
|
||||||
appDbContext.Achievements.AddAndSave(EntityAchievement.From(archiveId, uiaf));
|
appDbContext.Achievements.AddAndSave(EntityAchievement.From(archiveId, uiaf));
|
||||||
update++;
|
add++;
|
||||||
}
|
break;
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
// entity.Id > uiaf.Id
|
|
||||||
moveEntity = false;
|
|
||||||
moveUIAF = true;
|
|
||||||
|
|
||||||
appDbContext.Achievements.AddAndSave(EntityAchievement.From(archiveId, uiaf));
|
break;
|
||||||
add++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
logger.LogInformation("{Method} Operation Complete, Add: {Add}, Update: {Update}", nameof(Merge), add, update);
|
logger.LogInformation("Merge operation complete, [Add: {Add}], [Update: {Update}]", add, update);
|
||||||
return new(add, update, 0);
|
return new(add, update, 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 覆盖
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="archiveId">成就id</param>
|
|
||||||
/// <param name="items">待覆盖的项</param>
|
|
||||||
/// <returns>导入结果</returns>
|
|
||||||
public ImportResult Overwrite(Guid archiveId, IEnumerable<EntityAchievement> items)
|
public ImportResult Overwrite(Guid archiveId, IEnumerable<EntityAchievement> items)
|
||||||
{
|
{
|
||||||
logger.LogInformation("Perform {Method} Operation for archive: {Id}", nameof(Overwrite), archiveId);
|
logger.LogInformation("Perform Overwrite Operation for [Archive: {Id}]", archiveId);
|
||||||
using (IServiceScope scope = serviceProvider.CreateScope())
|
using (IServiceScope scope = serviceProvider.CreateScope())
|
||||||
{
|
{
|
||||||
AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
|
AppDbContext appDbContext = scope.GetAppDbContext();
|
||||||
|
|
||||||
IOrderedQueryable<EntityAchievement> oldData = appDbContext.Achievements
|
IOrderedQueryable<EntityAchievement> oldData = appDbContext.Achievements
|
||||||
.AsNoTracking()
|
.AsNoTracking()
|
||||||
.Where(a => a.ArchiveId == archiveId)
|
.Where(a => a.ArchiveId == archiveId)
|
||||||
.OrderBy(a => a.Id);
|
.OrderBy(a => a.Id);
|
||||||
|
|
||||||
int add = 0;
|
(int add, int update, int remove) = (0, 0, 0);
|
||||||
int update = 0;
|
|
||||||
int remove = 0;
|
|
||||||
|
|
||||||
using (IEnumerator<EntityAchievement> oldDataEnumerator = oldData.GetEnumerator())
|
using (TwoEnumerbleEnumerator<EntityAchievement, EntityAchievement> enumerator = new(oldData, items))
|
||||||
{
|
{
|
||||||
using (IEnumerator<EntityAchievement> newDataEnumerator = items.GetEnumerator())
|
(bool moveOld, bool moveNew) = (true, true);
|
||||||
|
|
||||||
|
while (true)
|
||||||
{
|
{
|
||||||
bool moveOld = true;
|
if (!enumerator.MoveNext(ref moveOld, ref moveNew))
|
||||||
bool moveNew = true;
|
|
||||||
|
|
||||||
while (true)
|
|
||||||
{
|
{
|
||||||
bool moveOldResult = moveOld && oldDataEnumerator.MoveNext();
|
break;
|
||||||
bool moveNewResult = moveNew && newDataEnumerator.MoveNext();
|
}
|
||||||
|
|
||||||
if (moveOldResult || moveNewResult)
|
(EntityAchievement? oldEntity, EntityAchievement? newEntity) = enumerator.Current;
|
||||||
{
|
|
||||||
EntityAchievement? oldEntity = oldDataEnumerator.Current;
|
|
||||||
EntityAchievement? newEntity = newDataEnumerator.Current;
|
|
||||||
|
|
||||||
if (oldEntity is null && newEntity is not null)
|
|
||||||
{
|
|
||||||
appDbContext.Achievements.AddAndSave(newEntity);
|
|
||||||
add++;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
else if (oldEntity is not null && newEntity is null)
|
|
||||||
{
|
|
||||||
appDbContext.Achievements.RemoveAndSave(oldEntity);
|
|
||||||
remove++;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
switch (oldEntity, newEntity)
|
||||||
|
{
|
||||||
|
case (null, not null):
|
||||||
|
appDbContext.Achievements.AddAndSave(newEntity);
|
||||||
|
add++;
|
||||||
|
continue;
|
||||||
|
case (not null, null):
|
||||||
|
appDbContext.Achievements.RemoveAndSave(oldEntity);
|
||||||
|
remove++;
|
||||||
|
continue;
|
||||||
|
default:
|
||||||
ArgumentNullException.ThrowIfNull(oldEntity);
|
ArgumentNullException.ThrowIfNull(oldEntity);
|
||||||
ArgumentNullException.ThrowIfNull(newEntity);
|
ArgumentNullException.ThrowIfNull(newEntity);
|
||||||
|
|
||||||
if (oldEntity.Id < newEntity.Id)
|
switch (oldEntity.Id.CompareTo(newEntity.Id))
|
||||||
{
|
{
|
||||||
moveOld = true;
|
case < 0:
|
||||||
moveNew = false;
|
(moveOld, moveNew) = (true, false);
|
||||||
appDbContext.Achievements.RemoveAndSave(oldEntity);
|
break;
|
||||||
remove++;
|
case 0:
|
||||||
}
|
(moveOld, moveNew) = (true, true);
|
||||||
else if (oldEntity.Id == newEntity.Id)
|
|
||||||
{
|
if (oldEntity.Equals(newEntity))
|
||||||
moveOld = true;
|
{
|
||||||
moveNew = true;
|
// Skip same entry, reduce write operation.
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
appDbContext.Achievements.RemoveAndSave(oldEntity);
|
||||||
|
appDbContext.Achievements.AddAndSave(newEntity);
|
||||||
|
update++;
|
||||||
|
}
|
||||||
|
|
||||||
|
break;
|
||||||
|
case > 0:
|
||||||
|
(moveOld, moveNew) = (false, true);
|
||||||
|
|
||||||
if (oldEntity.Equals(newEntity))
|
|
||||||
{
|
|
||||||
// skip same entry.
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
appDbContext.Achievements.RemoveAndSave(oldEntity);
|
|
||||||
appDbContext.Achievements.AddAndSave(newEntity);
|
appDbContext.Achievements.AddAndSave(newEntity);
|
||||||
update++;
|
add++;
|
||||||
}
|
break;
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
// entity.Id > uiaf.Id
|
|
||||||
moveOld = false;
|
|
||||||
moveNew = true;
|
|
||||||
appDbContext.Achievements.AddAndSave(newEntity);
|
|
||||||
add++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
break;
|
break;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
logger.LogInformation("{Method} Operation Complete, Add: {Add}, Update: {Update}, Remove: {Remove}", nameof(Overwrite), add, update, remove);
|
logger.LogInformation("Overwrite Operation Complete, Add: {Add}, Update: {Update}, Remove: {Remove}", add, update, remove);
|
||||||
return new(add, update, remove);
|
return new(add, update, remove);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,167 +2,106 @@
|
|||||||
// Licensed under the MIT license.
|
// Licensed under the MIT license.
|
||||||
|
|
||||||
using Microsoft.EntityFrameworkCore;
|
using Microsoft.EntityFrameworkCore;
|
||||||
using Snap.Hutao.Core.Database;
|
|
||||||
using Snap.Hutao.Core.ExceptionService;
|
using Snap.Hutao.Core.ExceptionService;
|
||||||
using Snap.Hutao.Model.Entity;
|
using Snap.Hutao.Model.Entity;
|
||||||
using Snap.Hutao.Model.Entity.Database;
|
|
||||||
using Snap.Hutao.Model.Primitive;
|
using Snap.Hutao.Model.Primitive;
|
||||||
|
using Snap.Hutao.Service.Abstraction;
|
||||||
using System.Collections.ObjectModel;
|
using System.Collections.ObjectModel;
|
||||||
using EntityAchievement = Snap.Hutao.Model.Entity.Achievement;
|
using EntityAchievement = Snap.Hutao.Model.Entity.Achievement;
|
||||||
|
|
||||||
namespace Snap.Hutao.Service.Achievement;
|
namespace Snap.Hutao.Service.Achievement;
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 成就数据库服务
|
|
||||||
/// </summary>
|
|
||||||
[ConstructorGenerated]
|
[ConstructorGenerated]
|
||||||
[Injection(InjectAs.Singleton, typeof(IAchievementDbService))]
|
[Injection(InjectAs.Singleton, typeof(IAchievementDbService))]
|
||||||
internal sealed partial class AchievementDbService : IAchievementDbService
|
internal sealed partial class AchievementDbService : IAchievementDbService
|
||||||
{
|
{
|
||||||
private readonly IServiceProvider serviceProvider;
|
private readonly IServiceProvider serviceProvider;
|
||||||
|
|
||||||
|
public IServiceProvider ServiceProvider { get => serviceProvider; }
|
||||||
|
|
||||||
public Dictionary<AchievementId, EntityAchievement> GetAchievementMapByArchiveId(Guid archiveId)
|
public Dictionary<AchievementId, EntityAchievement> GetAchievementMapByArchiveId(Guid archiveId)
|
||||||
{
|
{
|
||||||
Dictionary<AchievementId, EntityAchievement> entities;
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
using (IServiceScope scope = serviceProvider.CreateScope())
|
return this.Query<EntityAchievement, Dictionary<AchievementId, EntityAchievement>>(query => query
|
||||||
{
|
.Where(a => a.ArchiveId == archiveId)
|
||||||
AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
|
.ToDictionary(a => (AchievementId)a.Id));
|
||||||
entities = appDbContext.Achievements
|
|
||||||
.AsNoTracking()
|
|
||||||
.Where(a => a.ArchiveId == archiveId)
|
|
||||||
.ToDictionary(a => (AchievementId)a.Id);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
catch (ArgumentException ex)
|
catch (ArgumentException ex)
|
||||||
{
|
{
|
||||||
throw ThrowHelper.DatabaseCorrupted(SH.ServiceAchievementUserdataCorruptedInnerIdNotUnique, ex);
|
throw HutaoException.UserdataCorrupted(SH.ServiceAchievementUserdataCorruptedAchievementIdNotUnique, ex);
|
||||||
}
|
}
|
||||||
|
|
||||||
return entities;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public async ValueTask<int> GetFinishedAchievementCountByArchiveIdAsync(Guid archiveId)
|
public ValueTask<int> GetFinishedAchievementCountByArchiveIdAsync(Guid archiveId, CancellationToken token = default)
|
||||||
{
|
{
|
||||||
using (IServiceScope scope = serviceProvider.CreateScope())
|
return this.QueryAsync<EntityAchievement, int>(
|
||||||
{
|
(query, token) => query
|
||||||
AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
|
|
||||||
return await appDbContext.Achievements
|
|
||||||
.AsNoTracking()
|
|
||||||
.Where(a => a.ArchiveId == archiveId)
|
.Where(a => a.ArchiveId == archiveId)
|
||||||
.Where(a => a.Status >= Model.Intrinsic.AchievementStatus.STATUS_FINISHED)
|
.Where(a => a.Status >= Model.Intrinsic.AchievementStatus.STATUS_FINISHED)
|
||||||
.CountAsync()
|
.CountAsync(token),
|
||||||
.ConfigureAwait(false);
|
token);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
[SuppressMessage("", "CA1305")]
|
[SuppressMessage("", "CA1305")]
|
||||||
public async ValueTask<List<EntityAchievement>> GetLatestFinishedAchievementListByArchiveIdAsync(Guid archiveId, int take)
|
public ValueTask<List<EntityAchievement>> GetLatestFinishedAchievementListByArchiveIdAsync(Guid archiveId, int take, CancellationToken token = default)
|
||||||
{
|
{
|
||||||
using (IServiceScope scope = serviceProvider.CreateScope())
|
return this.QueryAsync<EntityAchievement, List<EntityAchievement>>(
|
||||||
{
|
(query, token) => query
|
||||||
AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
|
|
||||||
return await appDbContext.Achievements
|
|
||||||
.AsNoTracking()
|
|
||||||
.Where(a => a.ArchiveId == archiveId)
|
.Where(a => a.ArchiveId == archiveId)
|
||||||
.Where(a => a.Status >= Model.Intrinsic.AchievementStatus.STATUS_FINISHED)
|
.Where(a => a.Status >= Model.Intrinsic.AchievementStatus.STATUS_FINISHED)
|
||||||
.OrderByDescending(a => a.Time.ToString())
|
.OrderByDescending(a => a.Time.ToString())
|
||||||
.Take(take)
|
.Take(take)
|
||||||
.ToListAsync()
|
.ToListAsync(token),
|
||||||
.ConfigureAwait(false);
|
token);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void OverwriteAchievement(EntityAchievement achievement)
|
public void OverwriteAchievement(EntityAchievement achievement)
|
||||||
{
|
{
|
||||||
using (IServiceScope scope = serviceProvider.CreateScope())
|
this.DeleteByInnerId(achievement);
|
||||||
|
if (achievement.Status >= Model.Intrinsic.AchievementStatus.STATUS_FINISHED)
|
||||||
{
|
{
|
||||||
AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
|
this.Add(achievement);
|
||||||
|
|
||||||
// Delete exists one.
|
|
||||||
appDbContext.Achievements.ExecuteDeleteWhere(e => e.InnerId == achievement.InnerId);
|
|
||||||
if (achievement.Status >= Model.Intrinsic.AchievementStatus.STATUS_FINISHED)
|
|
||||||
{
|
|
||||||
appDbContext.Achievements.AddAndSave(achievement);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public async ValueTask OverwriteAchievementAsync(EntityAchievement achievement)
|
public async ValueTask OverwriteAchievementAsync(EntityAchievement achievement, CancellationToken token = default)
|
||||||
{
|
{
|
||||||
using (IServiceScope scope = serviceProvider.CreateScope())
|
await this.DeleteByInnerIdAsync(achievement, token).ConfigureAwait(false);
|
||||||
|
if (achievement.Status >= Model.Intrinsic.AchievementStatus.STATUS_FINISHED)
|
||||||
{
|
{
|
||||||
AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
|
await this.AddAsync(achievement, token).ConfigureAwait(false);
|
||||||
|
|
||||||
// Delete exists one.
|
|
||||||
await appDbContext.Achievements.ExecuteDeleteWhereAsync(e => e.InnerId == achievement.InnerId).ConfigureAwait(false);
|
|
||||||
if (achievement.Status >= Model.Intrinsic.AchievementStatus.STATUS_FINISHED)
|
|
||||||
{
|
|
||||||
await appDbContext.Achievements.AddAndSaveAsync(achievement).ConfigureAwait(false);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public ObservableCollection<AchievementArchive> GetAchievementArchiveCollection()
|
public ObservableCollection<AchievementArchive> GetAchievementArchiveCollection()
|
||||||
{
|
{
|
||||||
using (IServiceScope scope = serviceProvider.CreateScope())
|
return this.ObservableCollection<AchievementArchive>();
|
||||||
{
|
|
||||||
AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
|
|
||||||
return appDbContext.AchievementArchives.AsNoTracking().ToObservableCollection();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public async ValueTask RemoveAchievementArchiveAsync(AchievementArchive archive)
|
public async ValueTask RemoveAchievementArchiveAsync(AchievementArchive archive, CancellationToken token = default)
|
||||||
{
|
{
|
||||||
using (IServiceScope scope = serviceProvider.CreateScope())
|
// It will cascade deleted the achievements.
|
||||||
{
|
await this.DeleteAsync(archive, token).ConfigureAwait(false);
|
||||||
AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
|
|
||||||
|
|
||||||
// It will cascade deleted the achievements.
|
|
||||||
await appDbContext.AchievementArchives.RemoveAndSaveAsync(archive).ConfigureAwait(false);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<EntityAchievement> GetAchievementListByArchiveId(Guid archiveId)
|
public List<EntityAchievement> GetAchievementListByArchiveId(Guid archiveId)
|
||||||
{
|
{
|
||||||
using (IServiceScope scope = serviceProvider.CreateScope())
|
return this.ListByArchiveId<EntityAchievement>(archiveId);
|
||||||
{
|
|
||||||
AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
|
|
||||||
IQueryable<EntityAchievement> result = appDbContext.Achievements.AsNoTracking().Where(i => i.ArchiveId == archiveId);
|
|
||||||
return [.. result];
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public async ValueTask<List<EntityAchievement>> GetAchievementListByArchiveIdAsync(Guid archiveId)
|
public ValueTask<List<EntityAchievement>> GetAchievementListByArchiveIdAsync(Guid archiveId, CancellationToken token = default)
|
||||||
{
|
{
|
||||||
using (IServiceScope scope = serviceProvider.CreateScope())
|
return this.ListByArchiveIdAsync<EntityAchievement>(archiveId, token);
|
||||||
{
|
|
||||||
AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
|
|
||||||
return await appDbContext.Achievements
|
|
||||||
.AsNoTracking()
|
|
||||||
.Where(i => i.ArchiveId == archiveId)
|
|
||||||
.ToListAsync()
|
|
||||||
.ConfigureAwait(false);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<AchievementArchive> GetAchievementArchiveList()
|
public List<AchievementArchive> GetAchievementArchiveList()
|
||||||
{
|
{
|
||||||
using (IServiceScope scope = serviceProvider.CreateScope())
|
return this.List<AchievementArchive>();
|
||||||
{
|
|
||||||
AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
|
|
||||||
IQueryable<AchievementArchive> result = appDbContext.AchievementArchives.AsNoTracking();
|
|
||||||
return [.. result];
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public async ValueTask<List<AchievementArchive>> GetAchievementArchiveListAsync()
|
public ValueTask<List<AchievementArchive>> GetAchievementArchiveListAsync(CancellationToken token = default)
|
||||||
{
|
{
|
||||||
using (IServiceScope scope = serviceProvider.CreateScope())
|
return this.ListAsync<AchievementArchive>(token);
|
||||||
{
|
|
||||||
AppDbContext appDbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
|
|
||||||
return await appDbContext.AchievementArchives.AsNoTracking().ToListAsync().ConfigureAwait(false);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,79 +0,0 @@
|
|||||||
// Copyright (c) DGP Studio. All rights reserved.
|
|
||||||
// Licensed under the MIT license.
|
|
||||||
|
|
||||||
using Snap.Hutao.Core.Database;
|
|
||||||
using Snap.Hutao.Model.Entity;
|
|
||||||
using System.Collections.ObjectModel;
|
|
||||||
|
|
||||||
namespace Snap.Hutao.Service.Achievement;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 集合部分
|
|
||||||
/// </summary>
|
|
||||||
internal sealed partial class AchievementService
|
|
||||||
{
|
|
||||||
private ObservableCollection<AchievementArchive>? archiveCollection;
|
|
||||||
|
|
||||||
/// <inheritdoc/>
|
|
||||||
public AchievementArchive? CurrentArchive
|
|
||||||
{
|
|
||||||
get => dbCurrent.Current;
|
|
||||||
set => dbCurrent.Current = value;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc/>
|
|
||||||
public ObservableCollection<AchievementArchive> ArchiveCollection
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
if (archiveCollection is null)
|
|
||||||
{
|
|
||||||
archiveCollection = achievementDbService.GetAchievementArchiveCollection();
|
|
||||||
CurrentArchive = archiveCollection.SelectedOrDefault();
|
|
||||||
}
|
|
||||||
|
|
||||||
return archiveCollection;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc/>
|
|
||||||
public async ValueTask<ArchiveAddResult> AddArchiveAsync(AchievementArchive newArchive)
|
|
||||||
{
|
|
||||||
if (string.IsNullOrWhiteSpace(newArchive.Name))
|
|
||||||
{
|
|
||||||
return ArchiveAddResult.InvalidName;
|
|
||||||
}
|
|
||||||
|
|
||||||
ArgumentNullException.ThrowIfNull(archiveCollection);
|
|
||||||
|
|
||||||
// 查找是否有相同的名称
|
|
||||||
if (archiveCollection.Any(a => a.Name == newArchive.Name))
|
|
||||||
{
|
|
||||||
return ArchiveAddResult.AlreadyExists;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Sync cache
|
|
||||||
await taskContext.SwitchToMainThreadAsync();
|
|
||||||
archiveCollection.Add(newArchive);
|
|
||||||
|
|
||||||
// Sync database
|
|
||||||
await taskContext.SwitchToBackgroundAsync();
|
|
||||||
CurrentArchive = newArchive;
|
|
||||||
|
|
||||||
return ArchiveAddResult.Added;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc/>
|
|
||||||
public async ValueTask RemoveArchiveAsync(AchievementArchive archive)
|
|
||||||
{
|
|
||||||
ArgumentNullException.ThrowIfNull(archiveCollection);
|
|
||||||
|
|
||||||
// Sync cache
|
|
||||||
await taskContext.SwitchToMainThreadAsync();
|
|
||||||
archiveCollection.Remove(archive);
|
|
||||||
|
|
||||||
// Sync database
|
|
||||||
await taskContext.SwitchToBackgroundAsync();
|
|
||||||
await achievementDbService.RemoveAchievementArchiveAsync(archive).ConfigureAwait(false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,64 +0,0 @@
|
|||||||
// Copyright (c) DGP Studio. All rights reserved.
|
|
||||||
// Licensed under the MIT license.
|
|
||||||
|
|
||||||
using Snap.Hutao.Model.Entity;
|
|
||||||
using Snap.Hutao.Model.InterChange.Achievement;
|
|
||||||
using EntityAchievement = Snap.Hutao.Model.Entity.Achievement;
|
|
||||||
|
|
||||||
namespace Snap.Hutao.Service.Achievement;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 数据交换部分
|
|
||||||
/// </summary>
|
|
||||||
internal sealed partial class AchievementService
|
|
||||||
{
|
|
||||||
/// <inheritdoc/>
|
|
||||||
public async ValueTask<ImportResult> ImportFromUIAFAsync(AchievementArchive archive, List<UIAFItem> list, ImportStrategy strategy)
|
|
||||||
{
|
|
||||||
await taskContext.SwitchToBackgroundAsync();
|
|
||||||
|
|
||||||
Guid archiveId = archive.InnerId;
|
|
||||||
|
|
||||||
switch (strategy)
|
|
||||||
{
|
|
||||||
case ImportStrategy.AggressiveMerge:
|
|
||||||
{
|
|
||||||
IOrderedEnumerable<UIAFItem> orederedUIAF = list.OrderBy(a => a.Id);
|
|
||||||
return achievementDbBulkOperation.Merge(archiveId, orederedUIAF, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
case ImportStrategy.LazyMerge:
|
|
||||||
{
|
|
||||||
IOrderedEnumerable<UIAFItem> orederedUIAF = list.OrderBy(a => a.Id);
|
|
||||||
return achievementDbBulkOperation.Merge(archiveId, orederedUIAF, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
case ImportStrategy.Overwrite:
|
|
||||||
{
|
|
||||||
IEnumerable<EntityAchievement> orederedUIAF = list
|
|
||||||
.Select(uiaf => EntityAchievement.From(archiveId, uiaf))
|
|
||||||
.OrderBy(a => a.Id);
|
|
||||||
return achievementDbBulkOperation.Overwrite(archiveId, orederedUIAF);
|
|
||||||
}
|
|
||||||
|
|
||||||
default:
|
|
||||||
throw Must.NeverHappen();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc/>
|
|
||||||
public async ValueTask<UIAF> ExportToUIAFAsync(AchievementArchive archive)
|
|
||||||
{
|
|
||||||
await taskContext.SwitchToBackgroundAsync();
|
|
||||||
List<EntityAchievement> entities = await achievementDbService
|
|
||||||
.GetAchievementListByArchiveIdAsync(archive.InnerId)
|
|
||||||
.ConfigureAwait(false);
|
|
||||||
List<UIAFItem> list = entities.SelectList(UIAFItem.From);
|
|
||||||
|
|
||||||
return new()
|
|
||||||
{
|
|
||||||
Info = UIAFInfo.From(runtimeOptions),
|
|
||||||
List = list,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -3,17 +3,16 @@
|
|||||||
|
|
||||||
using Snap.Hutao.Core;
|
using Snap.Hutao.Core;
|
||||||
using Snap.Hutao.Core.Database;
|
using Snap.Hutao.Core.Database;
|
||||||
|
using Snap.Hutao.Core.ExceptionService;
|
||||||
using Snap.Hutao.Model.Entity;
|
using Snap.Hutao.Model.Entity;
|
||||||
|
using Snap.Hutao.Model.InterChange.Achievement;
|
||||||
using Snap.Hutao.Model.Primitive;
|
using Snap.Hutao.Model.Primitive;
|
||||||
using Snap.Hutao.ViewModel.Achievement;
|
using Snap.Hutao.ViewModel.Achievement;
|
||||||
|
using System.Collections.ObjectModel;
|
||||||
using EntityAchievement = Snap.Hutao.Model.Entity.Achievement;
|
using EntityAchievement = Snap.Hutao.Model.Entity.Achievement;
|
||||||
using MetadataAchievement = Snap.Hutao.Model.Metadata.Achievement.Achievement;
|
|
||||||
|
|
||||||
namespace Snap.Hutao.Service.Achievement;
|
namespace Snap.Hutao.Service.Achievement;
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// 成就服务
|
|
||||||
/// </summary>
|
|
||||||
[HighQuality]
|
[HighQuality]
|
||||||
[ConstructorGenerated]
|
[ConstructorGenerated]
|
||||||
[Injection(InjectAs.Scoped, typeof(IAchievementService))]
|
[Injection(InjectAs.Scoped, typeof(IAchievementService))]
|
||||||
@@ -25,21 +24,127 @@ internal sealed partial class AchievementService : IAchievementService
|
|||||||
private readonly RuntimeOptions runtimeOptions;
|
private readonly RuntimeOptions runtimeOptions;
|
||||||
private readonly ITaskContext taskContext;
|
private readonly ITaskContext taskContext;
|
||||||
|
|
||||||
/// <inheritdoc/>
|
private ObservableCollection<AchievementArchive>? archiveCollection;
|
||||||
public List<AchievementView> GetAchievementViewList(AchievementArchive archive, List<MetadataAchievement> metadata)
|
|
||||||
|
public AchievementArchive? CurrentArchive
|
||||||
|
{
|
||||||
|
get => dbCurrent.Current;
|
||||||
|
set => dbCurrent.Current = value;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ObservableCollection<AchievementArchive> ArchiveCollection
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
if (archiveCollection is null)
|
||||||
|
{
|
||||||
|
archiveCollection = achievementDbService.GetAchievementArchiveCollection();
|
||||||
|
CurrentArchive = archiveCollection.SelectedOrDefault();
|
||||||
|
}
|
||||||
|
|
||||||
|
return archiveCollection;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public List<AchievementView> GetAchievementViewList(AchievementArchive archive, AchievementServiceMetadataContext context)
|
||||||
{
|
{
|
||||||
Dictionary<AchievementId, EntityAchievement> entities = achievementDbService.GetAchievementMapByArchiveId(archive.InnerId);
|
Dictionary<AchievementId, EntityAchievement> entities = achievementDbService.GetAchievementMapByArchiveId(archive.InnerId);
|
||||||
|
|
||||||
return metadata.SelectList(meta =>
|
return context.Achievements.SelectList(meta =>
|
||||||
{
|
{
|
||||||
EntityAchievement entity = entities.GetValueOrDefault(meta.Id) ?? EntityAchievement.From(archive.InnerId, meta.Id);
|
EntityAchievement entity = entities.GetValueOrDefault(meta.Id) ?? EntityAchievement.From(archive.InnerId, meta.Id);
|
||||||
return new AchievementView(entity, meta);
|
return new AchievementView(entity, meta);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc/>
|
|
||||||
public void SaveAchievement(AchievementView achievement)
|
public void SaveAchievement(AchievementView achievement)
|
||||||
{
|
{
|
||||||
achievementDbService.OverwriteAchievement(achievement.Entity);
|
achievementDbService.OverwriteAchievement(achievement.Entity);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async ValueTask<ArchiveAddResultKind> AddArchiveAsync(AchievementArchive newArchive)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(newArchive.Name))
|
||||||
|
{
|
||||||
|
return ArchiveAddResultKind.InvalidName;
|
||||||
|
}
|
||||||
|
|
||||||
|
ArgumentNullException.ThrowIfNull(archiveCollection);
|
||||||
|
|
||||||
|
if (archiveCollection.Any(a => a.Name == newArchive.Name))
|
||||||
|
{
|
||||||
|
return ArchiveAddResultKind.AlreadyExists;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Sync cache
|
||||||
|
await taskContext.SwitchToMainThreadAsync();
|
||||||
|
archiveCollection.Add(newArchive);
|
||||||
|
|
||||||
|
// Sync database
|
||||||
|
await taskContext.SwitchToBackgroundAsync();
|
||||||
|
CurrentArchive = newArchive;
|
||||||
|
|
||||||
|
return ArchiveAddResultKind.Added;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask RemoveArchiveAsync(AchievementArchive archive)
|
||||||
|
{
|
||||||
|
ArgumentNullException.ThrowIfNull(archiveCollection);
|
||||||
|
|
||||||
|
// Sync cache
|
||||||
|
await taskContext.SwitchToMainThreadAsync();
|
||||||
|
archiveCollection.Remove(archive);
|
||||||
|
|
||||||
|
// Sync database
|
||||||
|
await taskContext.SwitchToBackgroundAsync();
|
||||||
|
await achievementDbService.RemoveAchievementArchiveAsync(archive).ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<ImportResult> ImportFromUIAFAsync(AchievementArchive archive, List<UIAFItem> list, ImportStrategyKind strategy)
|
||||||
|
{
|
||||||
|
await taskContext.SwitchToBackgroundAsync();
|
||||||
|
|
||||||
|
Guid archiveId = archive.InnerId;
|
||||||
|
|
||||||
|
switch (strategy)
|
||||||
|
{
|
||||||
|
case ImportStrategyKind.AggressiveMerge:
|
||||||
|
{
|
||||||
|
IOrderedEnumerable<UIAFItem> orederedUIAF = list.OrderBy(a => a.Id);
|
||||||
|
return achievementDbBulkOperation.Merge(archiveId, orederedUIAF, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
case ImportStrategyKind.LazyMerge:
|
||||||
|
{
|
||||||
|
IOrderedEnumerable<UIAFItem> orederedUIAF = list.OrderBy(a => a.Id);
|
||||||
|
return achievementDbBulkOperation.Merge(archiveId, orederedUIAF, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
case ImportStrategyKind.Overwrite:
|
||||||
|
{
|
||||||
|
IEnumerable<EntityAchievement> orederedUIAF = list
|
||||||
|
.SelectList(uiaf => EntityAchievement.From(archiveId, uiaf))
|
||||||
|
.SortBy(a => a.Id);
|
||||||
|
return achievementDbBulkOperation.Overwrite(archiveId, orederedUIAF);
|
||||||
|
}
|
||||||
|
|
||||||
|
default:
|
||||||
|
throw HutaoException.NotSupported();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask<UIAF> ExportToUIAFAsync(AchievementArchive archive)
|
||||||
|
{
|
||||||
|
await taskContext.SwitchToBackgroundAsync();
|
||||||
|
List<EntityAchievement> entities = await achievementDbService
|
||||||
|
.GetAchievementListByArchiveIdAsync(archive.InnerId)
|
||||||
|
.ConfigureAwait(false);
|
||||||
|
List<UIAFItem> list = entities.SelectList(UIAFItem.From);
|
||||||
|
|
||||||
|
return new()
|
||||||
|
{
|
||||||
|
Info = UIAFInfo.From(runtimeOptions),
|
||||||
|
List = list,
|
||||||
|
};
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
// Copyright (c) DGP Studio. All rights reserved.
|
||||||
|
// Licensed under the MIT license.
|
||||||
|
|
||||||
|
using Snap.Hutao.Model.Primitive;
|
||||||
|
using Snap.Hutao.Service.Metadata.ContextAbstraction;
|
||||||
|
using MetadataAchievement = Snap.Hutao.Model.Metadata.Achievement.Achievement;
|
||||||
|
|
||||||
|
namespace Snap.Hutao.Service.Achievement;
|
||||||
|
|
||||||
|
internal sealed class AchievementServiceMetadataContext : IMetadataContext,
|
||||||
|
IMetadataListAchievementSource,
|
||||||
|
IMetadataDictionaryIdAchievementSource
|
||||||
|
{
|
||||||
|
public List<MetadataAchievement> Achievements { get; set; } = default!;
|
||||||
|
|
||||||
|
public Dictionary<AchievementId, MetadataAchievement> IdAchievementMap { get; set; } = default!;
|
||||||
|
}
|
||||||
@@ -13,32 +13,34 @@ namespace Snap.Hutao.Service.Achievement;
|
|||||||
[Injection(InjectAs.Scoped, typeof(IAchievementStatisticsService))]
|
[Injection(InjectAs.Scoped, typeof(IAchievementStatisticsService))]
|
||||||
internal sealed partial class AchievementStatisticsService : IAchievementStatisticsService
|
internal sealed partial class AchievementStatisticsService : IAchievementStatisticsService
|
||||||
{
|
{
|
||||||
|
private const int AchievementCardTakeCount = 2;
|
||||||
|
|
||||||
private readonly IAchievementDbService achievementDbService;
|
private readonly IAchievementDbService achievementDbService;
|
||||||
private readonly ITaskContext taskContext;
|
private readonly ITaskContext taskContext;
|
||||||
|
|
||||||
/// <inheritdoc/>
|
/// <inheritdoc/>
|
||||||
public async ValueTask<List<AchievementStatistics>> GetAchievementStatisticsAsync(Dictionary<AchievementId, MetadataAchievement> achievementMap)
|
public async ValueTask<List<AchievementStatistics>> GetAchievementStatisticsAsync(AchievementServiceMetadataContext context, CancellationToken token = default)
|
||||||
{
|
{
|
||||||
await taskContext.SwitchToBackgroundAsync();
|
await taskContext.SwitchToBackgroundAsync();
|
||||||
|
|
||||||
List<AchievementStatistics> results = [];
|
List<AchievementStatistics> results = [];
|
||||||
foreach (AchievementArchive archive in await achievementDbService.GetAchievementArchiveListAsync().ConfigureAwait(false))
|
foreach (AchievementArchive archive in await achievementDbService.GetAchievementArchiveListAsync(token).ConfigureAwait(false))
|
||||||
{
|
{
|
||||||
int finishedCount = await achievementDbService
|
int finishedCount = await achievementDbService
|
||||||
.GetFinishedAchievementCountByArchiveIdAsync(archive.InnerId)
|
.GetFinishedAchievementCountByArchiveIdAsync(archive.InnerId, token)
|
||||||
.ConfigureAwait(false);
|
.ConfigureAwait(false);
|
||||||
|
|
||||||
int totalCount = achievementMap.Count;
|
int totalCount = context.IdAchievementMap.Count;
|
||||||
|
|
||||||
List<EntityAchievement> achievements = await achievementDbService
|
List<EntityAchievement> achievements = await achievementDbService
|
||||||
.GetLatestFinishedAchievementListByArchiveIdAsync(archive.InnerId, 2)
|
.GetLatestFinishedAchievementListByArchiveIdAsync(archive.InnerId, AchievementCardTakeCount, token)
|
||||||
.ConfigureAwait(false);
|
.ConfigureAwait(false);
|
||||||
|
|
||||||
results.Add(new()
|
results.Add(new()
|
||||||
{
|
{
|
||||||
DisplayName = archive.Name,
|
DisplayName = archive.Name,
|
||||||
FinishDescription = AchievementStatistics.Format(finishedCount, totalCount, out _),
|
FinishDescription = AchievementStatistics.Format(finishedCount, totalCount, out _),
|
||||||
Achievements = achievements.SelectList(entity => new AchievementView(entity, achievementMap[entity.Id])),
|
Achievements = achievements.SelectList(entity => new AchievementView(entity, context.IdAchievementMap[entity.Id])),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ namespace Snap.Hutao.Service.Achievement;
|
|||||||
/// 存档添加结果
|
/// 存档添加结果
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[HighQuality]
|
[HighQuality]
|
||||||
internal enum ArchiveAddResult
|
internal enum ArchiveAddResultKind
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 添加成功
|
/// 添加成功
|
||||||
@@ -2,32 +2,33 @@
|
|||||||
// Licensed under the MIT license.
|
// Licensed under the MIT license.
|
||||||
|
|
||||||
using Snap.Hutao.Model.Primitive;
|
using Snap.Hutao.Model.Primitive;
|
||||||
|
using Snap.Hutao.Service.Abstraction;
|
||||||
using System.Collections.ObjectModel;
|
using System.Collections.ObjectModel;
|
||||||
using EntityAchievement = Snap.Hutao.Model.Entity.Achievement;
|
using EntityAchievement = Snap.Hutao.Model.Entity.Achievement;
|
||||||
|
|
||||||
namespace Snap.Hutao.Service.Achievement;
|
namespace Snap.Hutao.Service.Achievement;
|
||||||
|
|
||||||
internal interface IAchievementDbService
|
internal interface IAchievementDbService : IAppDbService<Model.Entity.AchievementArchive>, IAppDbService<EntityAchievement>
|
||||||
{
|
{
|
||||||
ValueTask RemoveAchievementArchiveAsync(Model.Entity.AchievementArchive archive);
|
ValueTask RemoveAchievementArchiveAsync(Model.Entity.AchievementArchive archive, CancellationToken token = default);
|
||||||
|
|
||||||
ObservableCollection<Model.Entity.AchievementArchive> GetAchievementArchiveCollection();
|
ObservableCollection<Model.Entity.AchievementArchive> GetAchievementArchiveCollection();
|
||||||
|
|
||||||
List<Model.Entity.AchievementArchive> GetAchievementArchiveList();
|
List<Model.Entity.AchievementArchive> GetAchievementArchiveList();
|
||||||
|
|
||||||
ValueTask<List<Model.Entity.AchievementArchive>> GetAchievementArchiveListAsync();
|
ValueTask<List<Model.Entity.AchievementArchive>> GetAchievementArchiveListAsync(CancellationToken token = default);
|
||||||
|
|
||||||
List<EntityAchievement> GetAchievementListByArchiveId(Guid archiveId);
|
List<EntityAchievement> GetAchievementListByArchiveId(Guid archiveId);
|
||||||
|
|
||||||
ValueTask<List<EntityAchievement>> GetAchievementListByArchiveIdAsync(Guid archiveId);
|
ValueTask<List<EntityAchievement>> GetAchievementListByArchiveIdAsync(Guid archiveId, CancellationToken token = default);
|
||||||
|
|
||||||
Dictionary<AchievementId, EntityAchievement> GetAchievementMapByArchiveId(Guid archiveId);
|
Dictionary<AchievementId, EntityAchievement> GetAchievementMapByArchiveId(Guid archiveId);
|
||||||
|
|
||||||
ValueTask<int> GetFinishedAchievementCountByArchiveIdAsync(Guid archiveId);
|
ValueTask<int> GetFinishedAchievementCountByArchiveIdAsync(Guid archiveId, CancellationToken token = default);
|
||||||
|
|
||||||
ValueTask<List<EntityAchievement>> GetLatestFinishedAchievementListByArchiveIdAsync(Guid archiveId, int take);
|
ValueTask<List<EntityAchievement>> GetLatestFinishedAchievementListByArchiveIdAsync(Guid archiveId, int take, CancellationToken token = default);
|
||||||
|
|
||||||
void OverwriteAchievement(EntityAchievement achievement);
|
void OverwriteAchievement(EntityAchievement achievement);
|
||||||
|
|
||||||
ValueTask OverwriteAchievementAsync(EntityAchievement achievement);
|
ValueTask OverwriteAchievementAsync(EntityAchievement achievement, CancellationToken token = default);
|
||||||
}
|
}
|
||||||
@@ -32,13 +32,7 @@ internal interface IAchievementService
|
|||||||
/// <returns>UIAF</returns>
|
/// <returns>UIAF</returns>
|
||||||
ValueTask<UIAF> ExportToUIAFAsync(EntityArchive selectedArchive);
|
ValueTask<UIAF> ExportToUIAFAsync(EntityArchive selectedArchive);
|
||||||
|
|
||||||
/// <summary>
|
List<AchievementView> GetAchievementViewList(EntityArchive archive, AchievementServiceMetadataContext context);
|
||||||
/// 获取整合的成就
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="archive">用户</param>
|
|
||||||
/// <param name="metadata">元数据</param>
|
|
||||||
/// <returns>整合的成就</returns>
|
|
||||||
List<AchievementView> GetAchievementViewList(EntityArchive archive, List<MetadataAchievement> metadata);
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 异步导入UIAF数据
|
/// 异步导入UIAF数据
|
||||||
@@ -47,7 +41,7 @@ internal interface IAchievementService
|
|||||||
/// <param name="list">UIAF数据</param>
|
/// <param name="list">UIAF数据</param>
|
||||||
/// <param name="strategy">选项</param>
|
/// <param name="strategy">选项</param>
|
||||||
/// <returns>导入结果</returns>
|
/// <returns>导入结果</returns>
|
||||||
ValueTask<ImportResult> ImportFromUIAFAsync(EntityArchive archive, List<UIAFItem> list, ImportStrategy strategy);
|
ValueTask<ImportResult> ImportFromUIAFAsync(EntityArchive archive, List<UIAFItem> list, ImportStrategyKind strategy);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 异步移除存档
|
/// 异步移除存档
|
||||||
@@ -67,5 +61,5 @@ internal interface IAchievementService
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="newArchive">新存档</param>
|
/// <param name="newArchive">新存档</param>
|
||||||
/// <returns>存档添加结果</returns>
|
/// <returns>存档添加结果</returns>
|
||||||
ValueTask<ArchiveAddResult> AddArchiveAsync(EntityArchive newArchive);
|
ValueTask<ArchiveAddResultKind> AddArchiveAsync(EntityArchive newArchive);
|
||||||
}
|
}
|
||||||
@@ -9,5 +9,5 @@ namespace Snap.Hutao.Service.Achievement;
|
|||||||
|
|
||||||
internal interface IAchievementStatisticsService
|
internal interface IAchievementStatisticsService
|
||||||
{
|
{
|
||||||
ValueTask<List<AchievementStatistics>> GetAchievementStatisticsAsync(Dictionary<AchievementId, MetadataAchievement> achievementMap);
|
ValueTask<List<AchievementStatistics>> GetAchievementStatisticsAsync(AchievementServiceMetadataContext context, CancellationToken token = default);
|
||||||
}
|
}
|
||||||
@@ -7,7 +7,7 @@ namespace Snap.Hutao.Service.Achievement;
|
|||||||
/// 导入策略
|
/// 导入策略
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[HighQuality]
|
[HighQuality]
|
||||||
internal enum ImportStrategy
|
internal enum ImportStrategyKind
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 贪婪合并
|
/// 贪婪合并
|
||||||
@@ -0,0 +1,213 @@
|
|||||||
|
// Copyright (c) DGP Studio. All rights reserved.
|
||||||
|
// Licensed under the MIT license.
|
||||||
|
|
||||||
|
using Microsoft.Extensions.Caching.Memory;
|
||||||
|
using Snap.Hutao.Core;
|
||||||
|
using Snap.Hutao.Service.Announcement;
|
||||||
|
using Snap.Hutao.Web.Hoyolab;
|
||||||
|
using Snap.Hutao.Web.Hoyolab.Hk4e.Common.Announcement;
|
||||||
|
using Snap.Hutao.Web.Response;
|
||||||
|
using System.Collections.Specialized;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
using System.Text;
|
||||||
|
using System.Text.RegularExpressions;
|
||||||
|
using WebAnnouncement = Snap.Hutao.Web.Hoyolab.Hk4e.Common.Announcement.Announcement;
|
||||||
|
|
||||||
|
namespace Snap.Hutao.Service;
|
||||||
|
|
||||||
|
/// <inheritdoc/>
|
||||||
|
[HighQuality]
|
||||||
|
[ConstructorGenerated]
|
||||||
|
[Injection(InjectAs.Scoped, typeof(IAnnouncementService))]
|
||||||
|
internal sealed partial class AnnouncementService : IAnnouncementService
|
||||||
|
{
|
||||||
|
private static readonly string CacheKey = $"{nameof(AnnouncementService)}.Cache.{nameof(AnnouncementWrapper)}";
|
||||||
|
|
||||||
|
private readonly IServiceScopeFactory serviceScopeFactory;
|
||||||
|
private readonly ITaskContext taskContext;
|
||||||
|
private readonly IMemoryCache memoryCache;
|
||||||
|
|
||||||
|
public async ValueTask<AnnouncementWrapper> GetAnnouncementWrapperAsync(string languageCode, Region region, CancellationToken cancellationToken = default)
|
||||||
|
{
|
||||||
|
// 缓存中存在记录,直接返回
|
||||||
|
if (memoryCache.TryGetRequiredValue($"{CacheKey}.{languageCode}.{region}", out AnnouncementWrapper? cache))
|
||||||
|
{
|
||||||
|
return cache;
|
||||||
|
}
|
||||||
|
|
||||||
|
await taskContext.SwitchToBackgroundAsync();
|
||||||
|
|
||||||
|
List<AnnouncementContent>? contents;
|
||||||
|
AnnouncementWrapper wrapper;
|
||||||
|
using (IServiceScope scope = serviceScopeFactory.CreateScope())
|
||||||
|
{
|
||||||
|
AnnouncementClient announcementClient = scope.ServiceProvider.GetRequiredService<AnnouncementClient>();
|
||||||
|
|
||||||
|
Response<AnnouncementWrapper> announcementWrapperResponse = await announcementClient
|
||||||
|
.GetAnnouncementsAsync(languageCode, region, cancellationToken)
|
||||||
|
.ConfigureAwait(false);
|
||||||
|
|
||||||
|
if (!announcementWrapperResponse.IsOk())
|
||||||
|
{
|
||||||
|
return default!;
|
||||||
|
}
|
||||||
|
|
||||||
|
wrapper = announcementWrapperResponse.Data;
|
||||||
|
|
||||||
|
Response<ListWrapper<AnnouncementContent>> announcementContentResponse = await announcementClient
|
||||||
|
.GetAnnouncementContentsAsync(languageCode, region, cancellationToken)
|
||||||
|
.ConfigureAwait(false);
|
||||||
|
|
||||||
|
if (!announcementContentResponse.IsOk())
|
||||||
|
{
|
||||||
|
return default!;
|
||||||
|
}
|
||||||
|
|
||||||
|
contents = announcementContentResponse.Data.List;
|
||||||
|
}
|
||||||
|
|
||||||
|
Dictionary<int, string> contentMap = contents.ToDictionary(id => id.AnnId, content => content.Content);
|
||||||
|
|
||||||
|
// 将活动公告置于前方
|
||||||
|
wrapper.List.Reverse();
|
||||||
|
|
||||||
|
PreprocessAnnouncements(contentMap, wrapper.List, new(wrapper.TimeZone, 0, 0));
|
||||||
|
|
||||||
|
return memoryCache.Set(CacheKey, wrapper, TimeSpan.FromMinutes(30));
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void PreprocessAnnouncements(Dictionary<int, string> contentMap, List<AnnouncementListWrapper> announcementListWrappers, in TimeSpan offset)
|
||||||
|
{
|
||||||
|
// 将公告内容联入公告列表
|
||||||
|
foreach (ref readonly AnnouncementListWrapper listWrapper in CollectionsMarshal.AsSpan(announcementListWrappers))
|
||||||
|
{
|
||||||
|
foreach (ref readonly WebAnnouncement item in CollectionsMarshal.AsSpan(listWrapper.List))
|
||||||
|
{
|
||||||
|
item.Content = contentMap.GetValueOrDefault(item.AnnId, string.Empty);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
AdjustAnnouncementTime(announcementListWrappers, offset);
|
||||||
|
|
||||||
|
foreach (ref readonly AnnouncementListWrapper listWrapper in CollectionsMarshal.AsSpan(announcementListWrappers))
|
||||||
|
{
|
||||||
|
foreach (ref readonly WebAnnouncement item in CollectionsMarshal.AsSpan(listWrapper.List))
|
||||||
|
{
|
||||||
|
item.Subtitle = new StringBuilder(item.Subtitle)
|
||||||
|
.Replace("\r<br>", string.Empty)
|
||||||
|
.Replace("<br />", string.Empty)
|
||||||
|
.ToString();
|
||||||
|
item.Content = AnnouncementRegex
|
||||||
|
.XmlTimeTagRegex()
|
||||||
|
.Replace(item.Content, x => x.Groups[1].Value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void AdjustAnnouncementTime(List<AnnouncementListWrapper> announcementListWrappers, in TimeSpan offset)
|
||||||
|
{
|
||||||
|
// 活动公告
|
||||||
|
List<WebAnnouncement> activities = announcementListWrappers
|
||||||
|
.Single(wrapper => wrapper.TypeId == 1)
|
||||||
|
.List;
|
||||||
|
|
||||||
|
// 游戏公告
|
||||||
|
List<WebAnnouncement> announcements = announcementListWrappers
|
||||||
|
.Single(wrapper => wrapper.TypeId == 2)
|
||||||
|
.List;
|
||||||
|
|
||||||
|
Dictionary<string, DateTimeOffset> versionStartTimes = [];
|
||||||
|
|
||||||
|
// 更新公告
|
||||||
|
if (announcements.SingleOrDefault(ann => AnnouncementRegex.VersionUpdateTitleRegex.IsMatch(ann.Title)) is { } versionUpdate)
|
||||||
|
{
|
||||||
|
if (AnnouncementRegex.VersionUpdateTimeRegex.Match(versionUpdate.Content) is not { Success: true } versionUpdateMatch)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
DateTimeOffset versionUpdateTime = UnsafeDateTimeOffset.ParseDateTime(versionUpdateMatch.Groups[1].ValueSpan, offset);
|
||||||
|
versionStartTimes.TryAdd(VersionRegex().Match(versionUpdate.Title).Groups[1].Value, versionUpdateTime);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 更新预告
|
||||||
|
if (announcements.SingleOrDefault(ann => AnnouncementRegex.VersionUpdatePreviewTitleRegex.IsMatch(ann.Title)) is { } versionUpdatePreview)
|
||||||
|
{
|
||||||
|
if (AnnouncementRegex.VersionUpdatePreviewTimeRegex.Match(versionUpdatePreview.Content) is not { Success: true } versionUpdatePreviewMatch)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
DateTimeOffset versionUpdatePreviewTime = UnsafeDateTimeOffset.ParseDateTime(versionUpdatePreviewMatch.Groups[1].ValueSpan, offset);
|
||||||
|
versionStartTimes.TryAdd(VersionRegex().Match(versionUpdatePreview.Title).Groups[1].Value, versionUpdatePreviewTime);
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (ref readonly WebAnnouncement announcement in CollectionsMarshal.AsSpan(activities))
|
||||||
|
{
|
||||||
|
DateTimeOffset versionStartTime;
|
||||||
|
|
||||||
|
if (AnnouncementRegex.PermanentActivityAfterUpdateTimeRegex.Match(announcement.Content) is { Success: true } permanent)
|
||||||
|
{
|
||||||
|
if (versionStartTimes.TryGetValue(permanent.Groups[1].Value, out versionStartTime))
|
||||||
|
{
|
||||||
|
announcement.StartTime = versionStartTime;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (AnnouncementRegex.PersistentActivityAfterUpdateTimeRegex.Match(announcement.Content) is { Success: true } persistent)
|
||||||
|
{
|
||||||
|
if (versionStartTimes.TryGetValue(persistent.Groups[1].Value, out versionStartTime))
|
||||||
|
{
|
||||||
|
announcement.StartTime = versionStartTime;
|
||||||
|
announcement.EndTime = versionStartTime + TimeSpan.FromDays(42);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (AnnouncementRegex.TransientActivityAfterUpdateTimeRegex.Match(announcement.Content) is { Success: true } transient)
|
||||||
|
{
|
||||||
|
if (versionStartTimes.TryGetValue(transient.Groups[1].Value, out versionStartTime))
|
||||||
|
{
|
||||||
|
announcement.StartTime = versionStartTime;
|
||||||
|
announcement.EndTime = UnsafeDateTimeOffset.ParseDateTime(transient.Groups[2].ValueSpan, offset);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
MatchCollection matches = AnnouncementRegex.XmlTimeTagRegex().Matches(announcement.Content);
|
||||||
|
if (matches.Count < 2)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
List<DateTimeOffset> dateTimes = [];
|
||||||
|
foreach (Match timeMatch in (IList<Match>)matches)
|
||||||
|
{
|
||||||
|
dateTimes.Add(UnsafeDateTimeOffset.ParseDateTime(timeMatch.Groups[1].ValueSpan, offset));
|
||||||
|
}
|
||||||
|
|
||||||
|
DateTimeOffset min = DateTimeOffset.MaxValue;
|
||||||
|
DateTimeOffset max = DateTimeOffset.MinValue;
|
||||||
|
|
||||||
|
foreach (DateTimeOffset time in dateTimes)
|
||||||
|
{
|
||||||
|
if (time < min)
|
||||||
|
{
|
||||||
|
min = time;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (time > max)
|
||||||
|
{
|
||||||
|
max = time;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
announcement.StartTime = min;
|
||||||
|
announcement.EndTime = max;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
[GeneratedRegex("(\\d\\.\\d)")]
|
||||||
|
private static partial Regex VersionRegex();
|
||||||
|
}
|
||||||
@@ -4,7 +4,7 @@
|
|||||||
using Snap.Hutao.Web.Hoyolab;
|
using Snap.Hutao.Web.Hoyolab;
|
||||||
using Snap.Hutao.Web.Hoyolab.Hk4e.Common.Announcement;
|
using Snap.Hutao.Web.Hoyolab.Hk4e.Common.Announcement;
|
||||||
|
|
||||||
namespace Snap.Hutao.Service.Abstraction;
|
namespace Snap.Hutao.Service.Announcement;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 公告服务
|
/// 公告服务
|
||||||
@@ -1,173 +0,0 @@
|
|||||||
// Copyright (c) DGP Studio. All rights reserved.
|
|
||||||
// Licensed under the MIT license.
|
|
||||||
|
|
||||||
using Microsoft.Extensions.Caching.Memory;
|
|
||||||
using Snap.Hutao.Core;
|
|
||||||
using Snap.Hutao.Service.Abstraction;
|
|
||||||
using Snap.Hutao.Web.Hoyolab;
|
|
||||||
using Snap.Hutao.Web.Hoyolab.Hk4e.Common.Announcement;
|
|
||||||
using Snap.Hutao.Web.Response;
|
|
||||||
using System.Runtime.InteropServices;
|
|
||||||
using System.Text;
|
|
||||||
using System.Text.RegularExpressions;
|
|
||||||
|
|
||||||
namespace Snap.Hutao.Service;
|
|
||||||
|
|
||||||
/// <inheritdoc/>
|
|
||||||
[HighQuality]
|
|
||||||
[ConstructorGenerated]
|
|
||||||
[Injection(InjectAs.Transient, typeof(IAnnouncementService))]
|
|
||||||
internal sealed partial class AnnouncementService : IAnnouncementService
|
|
||||||
{
|
|
||||||
private static readonly string CacheKey = $"{nameof(AnnouncementService)}.Cache.{nameof(AnnouncementWrapper)}";
|
|
||||||
|
|
||||||
private readonly AnnouncementClient announcementClient;
|
|
||||||
private readonly ITaskContext taskContext;
|
|
||||||
private readonly IMemoryCache memoryCache;
|
|
||||||
|
|
||||||
/// <inheritdoc/>
|
|
||||||
public async ValueTask<AnnouncementWrapper> GetAnnouncementWrapperAsync(string languageCode, Region region, CancellationToken cancellationToken = default)
|
|
||||||
{
|
|
||||||
// 缓存中存在记录,直接返回
|
|
||||||
if (memoryCache.TryGetRequiredValue($"{CacheKey}.{languageCode}.{region}", out AnnouncementWrapper? cache))
|
|
||||||
{
|
|
||||||
return cache;
|
|
||||||
}
|
|
||||||
|
|
||||||
await taskContext.SwitchToBackgroundAsync();
|
|
||||||
Response<AnnouncementWrapper> announcementWrapperResponse = await announcementClient
|
|
||||||
.GetAnnouncementsAsync(languageCode, region, cancellationToken)
|
|
||||||
.ConfigureAwait(false);
|
|
||||||
|
|
||||||
if (!announcementWrapperResponse.IsOk())
|
|
||||||
{
|
|
||||||
return default!;
|
|
||||||
}
|
|
||||||
|
|
||||||
AnnouncementWrapper wrapper = announcementWrapperResponse.Data;
|
|
||||||
Response<ListWrapper<AnnouncementContent>> announcementContentResponse = await announcementClient
|
|
||||||
.GetAnnouncementContentsAsync(languageCode, region, cancellationToken)
|
|
||||||
.ConfigureAwait(false);
|
|
||||||
|
|
||||||
if (!announcementContentResponse.IsOk())
|
|
||||||
{
|
|
||||||
return default!;
|
|
||||||
}
|
|
||||||
|
|
||||||
List<AnnouncementContent> contents = announcementContentResponse.Data.List;
|
|
||||||
|
|
||||||
Dictionary<int, string> contentMap = contents
|
|
||||||
.ToDictionary(id => id.AnnId, content => content.Content);
|
|
||||||
|
|
||||||
// 将活动公告置于前方
|
|
||||||
wrapper.List.Reverse();
|
|
||||||
|
|
||||||
PreprocessAnnouncements(contentMap, wrapper.List, new(wrapper.TimeZone, 0, 0));
|
|
||||||
|
|
||||||
return memoryCache.Set(CacheKey, wrapper, TimeSpan.FromMinutes(30));
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void PreprocessAnnouncements(Dictionary<int, string> contentMap, List<AnnouncementListWrapper> announcementListWrappers, in TimeSpan offset)
|
|
||||||
{
|
|
||||||
// 将公告内容联入公告列表
|
|
||||||
foreach (ref readonly AnnouncementListWrapper listWrapper in CollectionsMarshal.AsSpan(announcementListWrappers))
|
|
||||||
{
|
|
||||||
foreach (ref readonly Announcement item in CollectionsMarshal.AsSpan(listWrapper.List))
|
|
||||||
{
|
|
||||||
contentMap.TryGetValue(item.AnnId, out string? rawContent);
|
|
||||||
item.Content = rawContent ?? string.Empty;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
AdjustAnnouncementTime(announcementListWrappers, offset);
|
|
||||||
|
|
||||||
foreach (ref readonly AnnouncementListWrapper listWrapper in CollectionsMarshal.AsSpan(announcementListWrappers))
|
|
||||||
{
|
|
||||||
foreach (ref readonly Announcement item in CollectionsMarshal.AsSpan(listWrapper.List))
|
|
||||||
{
|
|
||||||
item.Subtitle = new StringBuilder(item.Subtitle)
|
|
||||||
.Replace("\r<br>", string.Empty)
|
|
||||||
.Replace("<br />", string.Empty)
|
|
||||||
.ToString();
|
|
||||||
item.Content = AnnouncementRegex
|
|
||||||
.XmlTimeTagRegex()
|
|
||||||
.Replace(item.Content, x => x.Groups[1].Value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void AdjustAnnouncementTime(List<AnnouncementListWrapper> announcementListWrappers, in TimeSpan offset)
|
|
||||||
{
|
|
||||||
// 活动公告
|
|
||||||
List<Announcement> activities = announcementListWrappers
|
|
||||||
.Single(wrapper => wrapper.TypeId == 1)
|
|
||||||
.List;
|
|
||||||
|
|
||||||
// 更新公告
|
|
||||||
Announcement versionUpdate = announcementListWrappers
|
|
||||||
.Single(wrapper => wrapper.TypeId == 2)
|
|
||||||
.List
|
|
||||||
.Single(ann => AnnouncementRegex.VersionUpdateTitleRegex.IsMatch(ann.Title));
|
|
||||||
|
|
||||||
if (AnnouncementRegex.VersionUpdateTimeRegex.Match(versionUpdate.Content) is not { Success: true } versionMatch)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
DateTimeOffset versionUpdateTime = UnsafeDateTimeOffset.ParseDateTime(versionMatch.Groups[1].ValueSpan, offset);
|
|
||||||
|
|
||||||
foreach (ref readonly Announcement announcement in CollectionsMarshal.AsSpan(activities))
|
|
||||||
{
|
|
||||||
if (AnnouncementRegex.PermanentActivityAfterUpdateTimeRegex.Match(announcement.Content) is { Success: true } permanent)
|
|
||||||
{
|
|
||||||
announcement.StartTime = versionUpdateTime;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (AnnouncementRegex.PersistentActivityAfterUpdateTimeRegex.Match(announcement.Content) is { Success: true } persistent)
|
|
||||||
{
|
|
||||||
announcement.StartTime = versionUpdateTime;
|
|
||||||
announcement.EndTime = versionUpdateTime + TimeSpan.FromDays(42);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (AnnouncementRegex.TransientActivityAfterUpdateTimeRegex.Match(announcement.Content) is { Success: true } transient)
|
|
||||||
{
|
|
||||||
announcement.StartTime = versionUpdateTime;
|
|
||||||
announcement.EndTime = UnsafeDateTimeOffset.ParseDateTime(transient.Groups[2].ValueSpan, offset);
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
MatchCollection matches = AnnouncementRegex.XmlTimeTagRegex().Matches(announcement.Content);
|
|
||||||
if (matches.Count < 2)
|
|
||||||
{
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
List<DateTimeOffset> dateTimes = [];
|
|
||||||
foreach (Match timeMatch in (IList<Match>)matches)
|
|
||||||
{
|
|
||||||
dateTimes.Add(UnsafeDateTimeOffset.ParseDateTime(timeMatch.Groups[1].ValueSpan, offset));
|
|
||||||
}
|
|
||||||
|
|
||||||
DateTimeOffset min = DateTimeOffset.MaxValue;
|
|
||||||
DateTimeOffset max = DateTimeOffset.MinValue;
|
|
||||||
|
|
||||||
foreach (DateTimeOffset time in dateTimes)
|
|
||||||
{
|
|
||||||
if (time < min)
|
|
||||||
{
|
|
||||||
min = time;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (time > max)
|
|
||||||
{
|
|
||||||
max = time;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
announcement.StartTime = min;
|
|
||||||
announcement.EndTime = max;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -15,19 +15,40 @@ namespace Snap.Hutao.Service;
|
|||||||
[Injection(InjectAs.Singleton)]
|
[Injection(InjectAs.Singleton)]
|
||||||
internal sealed partial class AppOptions : DbStoreOptions
|
internal sealed partial class AppOptions : DbStoreOptions
|
||||||
{
|
{
|
||||||
|
private bool? isAutoUploadGachaLogEnabled;
|
||||||
|
private bool? isAutoUploadSpiralAbyssRecordEnabled;
|
||||||
private bool? isEmptyHistoryWishVisible;
|
private bool? isEmptyHistoryWishVisible;
|
||||||
|
private bool? isUnobtainedWishItemVisible;
|
||||||
private BackdropType? backdropType;
|
private BackdropType? backdropType;
|
||||||
private ElementTheme? elementTheme;
|
private ElementTheme? elementTheme;
|
||||||
private BackgroundImageType? backgroundImageType;
|
private BackgroundImageType? backgroundImageType;
|
||||||
private Region? region;
|
private Region? region;
|
||||||
private string? geetestCustomCompositeUrl;
|
private string? geetestCustomCompositeUrl;
|
||||||
|
|
||||||
|
public bool IsAutoUploadGachaLogEnabled
|
||||||
|
{
|
||||||
|
get => GetOption(ref isAutoUploadGachaLogEnabled, SettingEntry.IsAutoUploadGachaLogEnabled, false);
|
||||||
|
set => SetOption(ref isAutoUploadGachaLogEnabled, SettingEntry.IsAutoUploadGachaLogEnabled, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool IsAutoUploadSpiralAbyssRecordEnabled
|
||||||
|
{
|
||||||
|
get => GetOption(ref isAutoUploadSpiralAbyssRecordEnabled, SettingEntry.IsAutoUploadSpiralAbyssRecordEnabled, false);
|
||||||
|
set => SetOption(ref isAutoUploadSpiralAbyssRecordEnabled, SettingEntry.IsAutoUploadSpiralAbyssRecordEnabled, value);
|
||||||
|
}
|
||||||
|
|
||||||
public bool IsEmptyHistoryWishVisible
|
public bool IsEmptyHistoryWishVisible
|
||||||
{
|
{
|
||||||
get => GetOption(ref isEmptyHistoryWishVisible, SettingEntry.IsEmptyHistoryWishVisible);
|
get => GetOption(ref isEmptyHistoryWishVisible, SettingEntry.IsEmptyHistoryWishVisible, false);
|
||||||
set => SetOption(ref isEmptyHistoryWishVisible, SettingEntry.IsEmptyHistoryWishVisible, value);
|
set => SetOption(ref isEmptyHistoryWishVisible, SettingEntry.IsEmptyHistoryWishVisible, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public bool IsUnobtainedWishItemVisible
|
||||||
|
{
|
||||||
|
get => GetOption(ref isUnobtainedWishItemVisible, SettingEntry.IsUnobtainedWishItemVisible, false);
|
||||||
|
set => SetOption(ref isUnobtainedWishItemVisible, SettingEntry.IsUnobtainedWishItemVisible, value);
|
||||||
|
}
|
||||||
|
|
||||||
public List<NameValue<BackdropType>> BackdropTypes { get; } = CollectionsNameValue.FromEnum<BackdropType>(type => type >= 0);
|
public List<NameValue<BackdropType>> BackdropTypes { get; } = CollectionsNameValue.FromEnum<BackdropType>(type => type >= 0);
|
||||||
|
|
||||||
public BackdropType BackdropType
|
public BackdropType BackdropType
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user