From 9ae326ce9fc2f1c50ac2d5d168b35eb8f8d6444b Mon Sep 17 00:00:00 2001 From: RMBGAME Date: Tue, 21 Jan 2025 00:42:01 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=F0=9F=90=9B=20=E4=B8=B4=E6=97=B6=E5=A4=84?= =?UTF-8?q?=E7=90=86=20Avalonia=2011.2.3=20=E5=AF=BC=E8=87=B4=E7=9A=84=20F?= =?UTF-8?q?luentAvalonia=20Icon=20=E5=AE=BD=E5=BA=A6=E4=B8=8D=E6=AD=A3?= =?UTF-8?q?=E7=A1=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/BD.WTTS.Client.Avalonia/UI/Styling/Controls.axaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/BD.WTTS.Client.Avalonia/UI/Styling/Controls.axaml b/src/BD.WTTS.Client.Avalonia/UI/Styling/Controls.axaml index f4cb52ab594..ddd35a642e7 100644 --- a/src/BD.WTTS.Client.Avalonia/UI/Styling/Controls.axaml +++ b/src/BD.WTTS.Client.Avalonia/UI/Styling/Controls.axaml @@ -3,6 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:ms="https://steampp.net/settings" xmlns:sys="using:System" + xmlns:ui="using:FluentAvalonia.UI.Controls" x:CompileBindings="True"> @@ -39,6 +40,14 @@ + + + + From 1480b5d4dfcb70692519506c83f4ae51b7bc0a60 Mon Sep 17 00:00:00 2001 From: RMBGAME Date: Tue, 21 Jan 2025 16:45:43 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=F0=9F=90=9B=20=E6=96=B0=E5=A2=9E=E5=90=AF?= =?UTF-8?q?=E7=94=A8=E6=97=B6=E6=A3=80=E6=9F=A5=20DNS=20=E5=8F=AF=E7=94=A8?= =?UTF-8?q?=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/settings_v4_app.json | 9 ++ .../NetworkTestService.cs | 5 +- .../Services/Mvvm/GameAcceleratorService.cs | 117 ++++++++++++------ .../Services/Mvvm/ProxyService.Operate.cs | 78 ++++++++++++ .../Settings/Abstractions/IProxySettings.cs | 10 ++ .../Settings/ProxySettings.cs | 12 ++ .../UI/Views/Pages/ProxySettingsPage.axaml | 6 + 7 files changed, 198 insertions(+), 39 deletions(-) diff --git a/build/settings_v4_app.json b/build/settings_v4_app.json index 1a24958c976..1ccdc65c18a 100644 --- a/build/settings_v4_app.json +++ b/build/settings_v4_app.json @@ -997,6 +997,15 @@ "Summary": "加速后自动唤起 Watt 加速器界面", "IsRegionOrEndregion": null, "IsValueType": null + }, + { + "TypeName": "bool", + "PropertyName": "ProxyBeforeDNSCheck", + "DefaultValue": "true", + "DefaultValueIsConst": true, + "Summary": "加速前进行 DNS 可用性检查", + "IsRegionOrEndregion": null, + "IsValueType": null } ], "Usings": "" diff --git a/src/BD.WTTS.Client.Plugins.Accelerator/Services.Implementation/NetworkTestService.cs b/src/BD.WTTS.Client.Plugins.Accelerator/Services.Implementation/NetworkTestService.cs index 18130b1853b..287c850cd41 100644 --- a/src/BD.WTTS.Client.Plugins.Accelerator/Services.Implementation/NetworkTestService.cs +++ b/src/BD.WTTS.Client.Plugins.Accelerator/Services.Implementation/NetworkTestService.cs @@ -345,7 +345,8 @@ private async ValueTask GetStunClient5389Async(TransportProtoco ) { using UdpClient udpClient = new UdpClient(dnsServerIp, dnsServerPort); - + udpClient.Client.SendTimeout = 3000; + udpClient.Client.ReceiveTimeout = 3000; var query = new DnsQueryUdpRequest(testDomain, dnsRecordType); Stopwatch watch = Stopwatch.StartNew(); @@ -382,7 +383,7 @@ private async ValueTask GetStunClient5389Async(TransportProtoco Proxy = HttpNoProxy.Instance, }; using HttpClient client = new HttpClient(handler); - + client.Timeout = TimeSpan.FromSeconds(3); string queryUrl = $"{dohServer}?name={testDomain}&type={dnsRecordType}"; Stopwatch watch = Stopwatch.StartNew(); diff --git a/src/BD.WTTS.Client.Plugins.Accelerator/Services/Mvvm/GameAcceleratorService.cs b/src/BD.WTTS.Client.Plugins.Accelerator/Services/Mvvm/GameAcceleratorService.cs index f4a87eb66d4..28794962383 100644 --- a/src/BD.WTTS.Client.Plugins.Accelerator/Services/Mvvm/GameAcceleratorService.cs +++ b/src/BD.WTTS.Client.Plugins.Accelerator/Services/Mvvm/GameAcceleratorService.cs @@ -307,6 +307,7 @@ async void SetGameStatus(XunYouGameViewModel game, int areaId = 0, int serverId Games.AddOrUpdate(CurrentAcceleratorGame); //加速后 + TracepointHelper.TrackEvent("AcceleratorGameSuccess"); Toast.Show(ToastIcon.Success, "加速成功"); if (ProxySettings.AutoShowWattAcceleratorWindow.Value) { @@ -628,44 +629,45 @@ public static async Task InstallAccelerator() }; var install = Ioc.Get().XY_Install(GameAcceleratorSettings.WattAcceleratorDirPath.Value!); - td.Opened += async (s, e) => + td.Opened += (s, e) => { - await foreach (var item in install) - { - if (item.HandleUI(out var content)) - { - switch (content) - { - case < 100: - Dispatcher.UIThread.Post(() => { td.Content = $"正在下载 {item.Content}%"; }); - td.SetProgressBarState(item.Content, TaskDialogProgressState.Normal); - break; - case 100: - td.SetProgressBarState(item.Content, TaskDialogProgressState.Indeterminate); - Dispatcher.UIThread.Post(() => { td.Content = $"下载完成，正在安装..."; }); - break; - case (int)XunYouDownLoadCode.安装成功: - //处理成功 - //Dispatcher.UIThread.Post(() => { td.Content = $"安装完成"; }); - Dispatcher.UIThread.Post(() => { td.Hide(TaskDialogStandardResult.OK); }); - td.Hide(); - break; - case int n when n > 101 && n < (int)XunYouDownLoadCode.启动安装程序失败: - //处理失败 - break; - // Code 和进度重叠 递进 1000 XunYouInstallOrStartCode.默认 XunYouInstallOrStartCode.已安装 - case 1000: - Dispatcher.UIThread.Post(() => { td.Content = $"默认"; }); - // XunYouInstallOrStartCode.默认 - break; - case 1001: - Dispatcher.UIThread.Post(() => { td.Content = $"已安装"; }); - // XunYouInstallOrStartCode.已安装 - Dispatcher.UIThread.Post(() => { td.Hide(TaskDialogStandardResult.OK); }); - break; - } - } - } + DownloadCallbackAsync(td, install).Wait(); + //await foreach (var item in install) + //{ + // if (item.HandleUI(out var content)) + // { + // switch (content) + // { + // case < 100: + // Dispatcher.UIThread.Post(() => { td.Content = $"正在下载 {item.Content}%"; }); + // td.SetProgressBarState(item.Content, TaskDialogProgressState.Normal); + // break; + // case 100: + // td.SetProgressBarState(item.Content, TaskDialogProgressState.Indeterminate); + // Dispatcher.UIThread.Post(() => { td.Content = $"下载完成，正在安装..."; }); + // break; + // case (int)XunYouDownLoadCode.安装成功: + // //处理成功 + // //Dispatcher.UIThread.Post(() => { td.Content = $"安装完成"; }); + // Dispatcher.UIThread.Post(() => { td.Hide(TaskDialogStandardResult.OK); }); + // td.Hide(); + // break; + // case int n when n > 101 && n < (int)XunYouDownLoadCode.启动安装程序失败: + // //处理失败 + // break; + // // Code 和进度重叠 递进 1000 XunYouInstallOrStartCode.默认 XunYouInstallOrStartCode.已安装 + // case 1000: + // Dispatcher.UIThread.Post(() => { td.Content = $"默认"; }); + // // XunYouInstallOrStartCode.默认 + // break; + // case 1001: + // Dispatcher.UIThread.Post(() => { td.Content = $"已安装"; }); + // // XunYouInstallOrStartCode.已安装 + // Dispatcher.UIThread.Post(() => { td.Hide(TaskDialogStandardResult.OK); }); + // break; + // } + // } + //} }; //_ = Task.Run(() => { XunYouSDK.InstallAsync(progress, Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "WattAccelerator")); }); @@ -674,6 +676,47 @@ public static async Task InstallAccelerator() } } + private static async Task DownloadCallbackAsync(TaskDialog td, IAsyncEnumerable> install) + { + await foreach (var item in install) + { + if (item.HandleUI(out var content)) + { + switch (content) + { + case < 100: + Dispatcher.UIThread.Post(() => { td.Content = $"正在下载 {item.Content}%"; }); + td.SetProgressBarState(item.Content, TaskDialogProgressState.Normal); + break; + case 100: + td.SetProgressBarState(item.Content, TaskDialogProgressState.Indeterminate); + Dispatcher.UIThread.Post(() => { td.Content = $"下载完成，正在安装..."; }); + break; + case (int)XunYouDownLoadCode.安装成功: + //处理成功 + //Dispatcher.UIThread.Post(() => { td.Content = $"安装完成"; }); + TracepointHelper.TrackEvent("DownloadInstallSuccess"); + Dispatcher.UIThread.Post(() => { td.Hide(TaskDialogStandardResult.OK); }); + td.Hide(); + break; + case int n when n > 101 && n < (int)XunYouDownLoadCode.启动安装程序失败: + //处理失败 + break; + // Code 和进度重叠 递进 1000 XunYouInstallOrStartCode.默认 XunYouInstallOrStartCode.已安装 + case 1000: + Dispatcher.UIThread.Post(() => { td.Content = $"默认"; }); + // XunYouInstallOrStartCode.默认 + break; + case 1001: + Dispatcher.UIThread.Post(() => { td.Content = $"已安装"; }); + // XunYouInstallOrStartCode.已安装 + Dispatcher.UIThread.Post(() => { td.Hide(TaskDialogStandardResult.OK); }); + break; + } + } + } + } + public static async void UninstallAccelerator() { var xunYouIsInstall = await Ioc.Get().XY_IsInstall(); diff --git a/src/BD.WTTS.Client.Plugins.Accelerator/Services/Mvvm/ProxyService.Operate.cs b/src/BD.WTTS.Client.Plugins.Accelerator/Services/Mvvm/ProxyService.Operate.cs index 72a8f9e5414..31c20d3e61b 100644 --- a/src/BD.WTTS.Client.Plugins.Accelerator/Services/Mvvm/ProxyService.Operate.cs +++ b/src/BD.WTTS.Client.Plugins.Accelerator/Services/Mvvm/ProxyService.Operate.cs @@ -1,5 +1,6 @@ // ReSharper disable once CheckNamespace using BD.WTTS.Helpers; +using BD.WTTS.Services.Implementation; namespace BD.WTTS.Services; @@ -73,6 +74,18 @@ async Task StartProxyServiceCoreAsync() bool useDoh = ProxySettings.UseDoh.Value; string? customDohAddres = ProxySettings.CustomDohAddres2.Value; + if (ProxySettings.ProxyBeforeDNSCheck.Value) + { + if (useDoh) + { + customDohAddres = await GetFastestDNSAsync(ProxySettingsWindowViewModel.DohAddress); + } + else + { + proxyDNS = await GetFastestDNSAsync(ProxySettingsWindowViewModel.ProxyDNSs.Skip(1)); + } + } + Lazy proxyIp_ = new(() => ReverseProxySettings.GetProxyIp(proxyIp)); void SetProxyIp(IPAddress proxyIPAddress) { @@ -463,4 +476,69 @@ public bool OnStopedShowToastReturnProxyStatus() return proxyStatus; } } + + async Task<(long delayMs, string dns)> GetValidDNSAsync(string dns, CancellationToken cancellationToken = default) + { + var testDomain = "dnscheck-test.steampp.net"; + try + { + long delayMs; + IPAddress[] address; + if (ProxySettings.UseDoh.Value) + { + (delayMs, address) = await INetworkTestService.Instance.TestDNSOverHttpsAsync(testDomain, dns, cancellationToken: cancellationToken); + } + else + { + (delayMs, address) = await INetworkTestService.Instance.TestDNSAsync(testDomain, dns, 53, cancellationToken: cancellationToken); + } + if (address.Length == 0) + throw new Exception("Parsing failed. Return empty ip address."); + + return (delayMs, dns); + } + catch (Exception ex) + { + Log.Error(nameof(StartOrStopProxyService), ex.ToString(), "DNS检测出错"); + return (0, dns); + } + } + + async Task GetFastestDNSAsync(IEnumerable dnsAddresses, CancellationToken cancellationToken = default) + { + var cts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken); + var tasks = new List>(); + + foreach (var dns in dnsAddresses) + { + tasks.Add(GetValidDNSAsync(dns, cts.Token)); + } + + try + { + // 等待任意一个任务完成 + var completedTask = await Task.WhenAny(tasks); + + // 获取任务结果 + var (delayMs, dns) = await completedTask; + _ = cts.CancelAsync(); // 取消其他任务 + + // 如果任务成功完成（假设 delayMs > 0 表示成功） + if (delayMs > 0) + { + return dns; // 返回第一个成功的 DNS 地址 + } + } + catch (OperationCanceledException) + { + // 任务被取消，忽略 + } + catch (Exception ex) + { + Log.Error(nameof(StartOrStopProxyService), ex.ToString(), "DNS检测出错"); + } + + // 如果没有有效结果,返回默认值 + return null; + } } \ No newline at end of file diff --git a/src/BD.WTTS.Client.Plugins.Accelerator/Settings/Abstractions/IProxySettings.cs b/src/BD.WTTS.Client.Plugins.Accelerator/Settings/Abstractions/IProxySettings.cs index 481412001c3..3fd16a83b19 100644 --- a/src/BD.WTTS.Client.Plugins.Accelerator/Settings/Abstractions/IProxySettings.cs +++ b/src/BD.WTTS.Client.Plugins.Accelerator/Settings/Abstractions/IProxySettings.cs @@ -165,6 +165,11 @@ static IProxySettings? Instance /// bool AutoShowWattAcceleratorWindow { get; set; } + /// + /// 加速前进行 DNS 可用性检查 + /// + bool ProxyBeforeDNSCheck { get; set; } + /// /// 启用脚本自动检查更新的默认值 /// @@ -290,4 +295,9 @@ static IProxySettings? Instance /// const bool DefaultAutoShowWattAcceleratorWindow = true; + /// + /// 加速前进行 DNS 可用性检查的默认值 + /// + const bool DefaultProxyBeforeDNSCheck = true; + } diff --git a/src/BD.WTTS.Client.Plugins.Accelerator/Settings/ProxySettings.cs b/src/BD.WTTS.Client.Plugins.Accelerator/Settings/ProxySettings.cs index 61a842b2286..7edd68ebce2 100644 --- a/src/BD.WTTS.Client.Plugins.Accelerator/Settings/ProxySettings.cs +++ b/src/BD.WTTS.Client.Plugins.Accelerator/Settings/ProxySettings.cs @@ -209,6 +209,12 @@ static JsonTypeInfo ISettings.JsonTypeInfo [MPKey(24), MP2Key(24), JsonPropertyOrder(24)] public bool AutoShowWattAcceleratorWindow { get; set; } = IProxySettings.DefaultAutoShowWattAcceleratorWindow; + /// + /// 加速前进行 DNS 可用性检查 + /// + [MPKey(25), MP2Key(25), JsonPropertyOrder(25)] + public bool ProxyBeforeDNSCheck { get; set; } = IProxySettings.DefaultProxyBeforeDNSCheck; + } public static partial class ProxySettings @@ -383,4 +389,10 @@ public static partial class ProxySettings public static SettingsStructProperty AutoShowWattAcceleratorWindow { get; } = new(DefaultAutoShowWattAcceleratorWindow); + /// + /// 加速前进行 DNS 可用性检查 + /// + public static SettingsStructProperty ProxyBeforeDNSCheck { get; } + = new(DefaultProxyBeforeDNSCheck); + } diff --git a/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Pages/ProxySettingsPage.axaml b/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Pages/ProxySettingsPage.axaml index 9d3eb85797f..42cf580b531 100644 --- a/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Pages/ProxySettingsPage.axaml +++ b/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Pages/ProxySettingsPage.axaml @@ -88,6 +88,12 @@ + + + + + + + + + 1.25.10122.11624 + + + 1.23.10626.11400 + + + 1.23.10616.11526 + + + 1.23.10616.11526 + + + 8.24.10411.11524 + + + + 19.4.1 + + + + 11.2.3 + + + 11.2.0.6 + + + 11.1.0 + + + 11.1.0 + + + 11.0.3-a1 + + + 105.3.22248.142 + + + 3.9.0 + + + 2.2.0 + + + 2.0.0-rc4.5 + + + + + 8.3.1-preview.2.3 + + + + + 3.118.0-preview.2.3 + + + + 2.0.0-beta4.22272.1 + + + + 5.0.2 + + + 4.5.3 + + + 5.0.2 + + + 5.0.6.1 + + + + 5.2.6.3-preview.220608 + + + + 0.7.124 + + + + 3.4.16 + + + 14.7.1 + + + 9.0.0 + + + + 6.0.0 + + + + 2.14.1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 7c554190af722e3ea0be2e018404d8081d3386e8 Mon Sep 17 00:00:00 2001 From: lxy829 <3346435289@qq.com> Date: Thu, 23 Jan 2025 11:18:19 +0800 Subject: [PATCH 4/8] =?UTF-8?q?Revert=20"=F0=9F=8E=A8=20Version=5FBDCommon?= =?UTF-8?q?"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 2f2065e45354ba129933e271470ecc37e30b6043. --- ref/DirectoryPackages | 1 + .../Directory.Packages.props | 1090 ----------------- 2 files changed, 1 insertion(+), 1090 deletions(-) create mode 160000 ref/DirectoryPackages delete mode 100644 ref/DirectoryPackages/Directory.Packages.props diff --git a/ref/DirectoryPackages b/ref/DirectoryPackages new file mode 160000 index 00000000000..139b9ac1782 --- /dev/null +++ b/ref/DirectoryPackages @@ -0,0 +1 @@ +Subproject commit 139b9ac1782d20f7cb81978d7dc428522fe469d8 diff --git a/ref/DirectoryPackages/Directory.Packages.props b/ref/DirectoryPackages/Directory.Packages.props deleted file mode 100644 index 6459767d713..00000000000 --- a/ref/DirectoryPackages/Directory.Packages.props +++ /dev/null @@ -1,1090 +0,0 @@ - - - - - 1.25.10122.11624 - - - 1.23.10626.11400 - - - 1.23.10616.11526 - - - 1.23.10616.11526 - - - 8.24.10411.11524 - - - - 19.4.1 - - - - 11.2.3 - - - 11.2.0.6 - - - 11.1.0 - - - 11.1.0 - - - 11.0.3-a1 - - - 105.3.22248.142 - - - 3.9.0 - - - 2.2.0 - - - 2.0.0-rc4.5 - - - - - 8.3.1-preview.2.3 - - - - - 3.118.0-preview.2.3 - - - - 2.0.0-beta4.22272.1 - - - - 5.0.2 - - - 4.5.3 - - - 5.0.2 - - - 5.0.6.1 - - - - 5.2.6.3-preview.220608 - - - - 0.7.124 - - - - 3.4.16 - - - 14.7.1 - - - 9.0.0 - - - - 6.0.0 - - - - 2.14.1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From 23932298fcc3bed31fb3168dcfccf5161b33a121 Mon Sep 17 00:00:00 2001 From: lxy829 <3346435289@qq.com> Date: Thu, 23 Jan 2025 11:54:06 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Common=201.25.10122.11?= =?UTF-8?q?624?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ref/DirectoryPackages | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ref/DirectoryPackages b/ref/DirectoryPackages index 139b9ac1782..8f5b07fa7eb 160000 --- a/ref/DirectoryPackages +++ b/ref/DirectoryPackages @@ -1 +1 @@ -Subproject commit 139b9ac1782d20f7cb81978d7dc428522fe469d8 +Subproject commit 8f5b07fa7ebe3586efc22e15ff4dc12c82648937 From 408911de4a80f54005fcc1300908c52d8eb812e0 Mon Sep 17 00:00:00 2001 From: RMBGAME Date: Thu, 23 Jan 2025 14:15:02 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8D=20MacOS?= =?UTF-8?q?=20=E4=B8=AD=20=E6=8C=82=E6=97=B6=E9=95=BF=E6=B8=B8=E6=88=8F?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Views/Pages/IdleAppsPage.axaml | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/BD.WTTS.Client.Plugins.GameList/UI/Views/Pages/IdleAppsPage.axaml b/src/BD.WTTS.Client.Plugins.GameList/UI/Views/Pages/IdleAppsPage.axaml index 574b9260074..dfac9d76fe2 100644 --- a/src/BD.WTTS.Client.Plugins.GameList/UI/Views/Pages/IdleAppsPage.axaml +++ b/src/BD.WTTS.Client.Plugins.GameList/UI/Views/Pages/IdleAppsPage.axaml @@ -3,8 +3,6 @@ xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:i="using:Avalonia.Xaml.Interactivity" - xmlns:ia="using:Avalonia.Xaml.Interactions.Core" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:ms="https://steampp.net/settings" xmlns:s="https://steampp.net/services" @@ -190,7 +188,15 @@ --> - + + + + + - +