From 1d8ee4cee52aa1f1c605e89a922ed17c852c70ef Mon Sep 17 00:00:00 2001 From: DismissedLight <1686188646@qq.com> Date: Sat, 26 Aug 2023 17:08:18 +0800 Subject: [PATCH] remove redundant attribute --- .../Core/LifeCycle/AppInstanceExtension.cs | 1 - .../Snap.Hutao/Core/Threading/Delay.cs | 3 --- .../Core/Threading/DispatcherQueueProgress.cs | 1 - .../Snap.Hutao/Service/Game/GameService.cs | 18 +++--------------- .../Snap.Hutao/Service/Game/LaunchOptions.cs | 10 ---------- .../Snap.Hutao/View/Page/LaunchGamePage.xaml | 11 ----------- .../View/Page/LoginHoyoverseUserPage.xaml.cs | 1 - .../View/Page/LoginMihoyoUserPage.xaml.cs | 1 - .../Snap.Hutao/Web/Bridge/MiHoYoJSInterface.cs | 1 - .../Snap.Hutao/Web/Hoyolab/PlayerUid.cs | 2 +- .../BbsSignReward/SignInRewardReSignInfo.cs | 2 +- 11 files changed, 5 insertions(+), 46 deletions(-) diff --git a/src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/AppInstanceExtension.cs b/src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/AppInstanceExtension.cs index c1cdbd0b..06f24566 100644 --- a/src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/AppInstanceExtension.cs +++ b/src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/AppInstanceExtension.cs @@ -25,7 +25,6 @@ internal static class AppInstanceExtension /// /// app实例 /// 参数 - [SuppressMessage("", "VSTHRD002")] public static unsafe void RedirectActivationTo(this AppInstance appInstance, AppActivationArguments args) { redirectEventHandle = CreateEvent(default(SECURITY_ATTRIBUTES*), true, false, null); diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Threading/Delay.cs b/src/Snap.Hutao/Snap.Hutao/Core/Threading/Delay.cs index b87abc2f..ac3c1d4e 100644 --- a/src/Snap.Hutao/Snap.Hutao/Core/Threading/Delay.cs +++ b/src/Snap.Hutao/Snap.Hutao/Core/Threading/Delay.cs @@ -11,19 +11,16 @@ internal readonly struct Delay /// 最小，闭 /// 最小，开 /// 任务 - [SuppressMessage("", "VSTHRD200")] public static ValueTask Random(int minMilliSeconds, int maxMilliSeconds) { return Task.Delay((int)(System.Random.Shared.NextDouble() * (maxMilliSeconds - minMilliSeconds)) + minMilliSeconds).AsValueTask(); } - [SuppressMessage("", "VSTHRD200")] public static ValueTask FromSeconds(int seconds) { return Task.Delay(TimeSpan.FromSeconds(seconds)).AsValueTask(); } - [SuppressMessage("", "VSTHRD200")] public static ValueTask FromMilliSeconds(int seconds) { return Task.Delay(TimeSpan.FromMilliseconds(seconds)).AsValueTask(); diff --git a/src/Snap.Hutao/Snap.Hutao/Core/Threading/DispatcherQueueProgress.cs b/src/Snap.Hutao/Snap.Hutao/Core/Threading/DispatcherQueueProgress.cs index c4b9b1b1..d6869b52 100644 --- a/src/Snap.Hutao/Snap.Hutao/Core/Threading/DispatcherQueueProgress.cs +++ b/src/Snap.Hutao/Snap.Hutao/Core/Threading/DispatcherQueueProgress.cs @@ -21,7 +21,6 @@ internal class DispatcherQueueProgress : IProgress public event EventHandler? ProgressChanged; - [SuppressMessage("", "VSTHRD001")] public void Report(T value) { Action? handler = this.handler; diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Game/GameService.cs b/src/Snap.Hutao/Snap.Hutao/Service/Game/GameService.cs index 8a0cea37..ff23744e 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/Game/GameService.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/Game/GameService.cs @@ -225,14 +225,8 @@ internal sealed partial class GameService : IGameService return false; } - if (launchOptions.MultipleInstances) - { - // If multiple instances is enabled, always treat as not running. - return false; - } - - return Process.GetProcessesByName(YuanShenProcessName).Any() - || Process.GetProcessesByName(GenshinImpactProcessName).Any(); + return Process.GetProcessesByName(YuanShenProcessName) is [_, ..] + || Process.GetProcessesByName(GenshinImpactProcessName) is [_, ..]; } /// @@ -254,13 +248,7 @@ internal sealed partial class GameService : IGameService game.Start(); - bool isAdvancedOptionsAllowed = runtimeOptions.IsElevated && appOptions.IsAdvancedLaunchOptionsEnabled; - if (isAdvancedOptionsAllowed && launchOptions.MultipleInstances && !isFirstInstance) - { - ProcessInterop.DisableProtection(game, gamePath); - } - - if (isAdvancedOptionsAllowed && launchOptions.UnlockFps) + if (runtimeOptions.IsElevated && appOptions.IsAdvancedLaunchOptionsEnabled && launchOptions.UnlockFps) { await ProcessInterop.UnlockFpsAsync(serviceProvider, game, default).ConfigureAwait(false); } diff --git a/src/Snap.Hutao/Snap.Hutao/Service/Game/LaunchOptions.cs b/src/Snap.Hutao/Snap.Hutao/Service/Game/LaunchOptions.cs index b2813d54..9e9ac01e 100644 --- a/src/Snap.Hutao/Snap.Hutao/Service/Game/LaunchOptions.cs +++ b/src/Snap.Hutao/Snap.Hutao/Service/Game/LaunchOptions.cs @@ -31,7 +31,6 @@ internal sealed class LaunchOptions : DbStoreOptions private bool? unlockFps; private int? targetFps; private NameValue? monitor; - private bool? multipleInstances; /// /// 构造一个新的启动游戏选项 @@ -151,15 +150,6 @@ internal sealed class LaunchOptions : DbStoreOptions } } - /// - /// 多开启动原神 - /// - public bool MultipleInstances - { - get => GetOption(ref multipleInstances, SettingEntry.MultipleInstances); - set => SetOption(ref multipleInstances, SettingEntry.MultipleInstances, value); - } - private static void InitializeMonitors(List> monitors) { // This list can't use foreach diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml index 4a8b69c5..d246fe86 100644 --- a/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml +++ b/src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml @@ -214,17 +214,6 @@ - - - - - - - /// 补签说明 /// -public class SignInRewardReSignInfo +internal sealed class SignInRewardReSignInfo { /// /// 当日补签次数