diff --git a/src/BD.WTTS.Client.Plugins.Accelerator/BD.WTTS.Client.Plugins.Accelerator.csproj b/src/BD.WTTS.Client.Plugins.Accelerator/BD.WTTS.Client.Plugins.Accelerator.csproj index c9c6227a0..62c6ac126 100644 --- a/src/BD.WTTS.Client.Plugins.Accelerator/BD.WTTS.Client.Plugins.Accelerator.csproj +++ b/src/BD.WTTS.Client.Plugins.Accelerator/BD.WTTS.Client.Plugins.Accelerator.csproj @@ -92,4 +92,8 @@ + + + + diff --git a/src/BD.WTTS.Client.Plugins.Accelerator/Plugins/Plugin.cs b/src/BD.WTTS.Client.Plugins.Accelerator/Plugins/Plugin.cs index 0cf173066..3040c6ec7 100644 --- a/src/BD.WTTS.Client.Plugins.Accelerator/Plugins/Plugin.cs +++ b/src/BD.WTTS.Client.Plugins.Accelerator/Plugins/Plugin.cs @@ -24,7 +24,7 @@ sealed class Plugin : PluginBase yield return new MenuTabItemViewModel() { ResourceKeyOrName = "ScriptConfig", - PageType = typeof(DemoPage), + PageType = typeof(ScriptPage), IsResourceGet = true, IconKey = "DuplexPortraitOneSided", }; diff --git a/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Pages/DemoPage.axaml.cs b/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Pages/DemoPage.axaml.cs deleted file mode 100644 index f3756b80d..000000000 --- a/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Pages/DemoPage.axaml.cs +++ /dev/null @@ -1,18 +0,0 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; - -namespace BD.WTTS.UI.Views.Pages; - -public partial class DemoPage : UserControl -{ - public DemoPage() - { - InitializeComponent(); - } - - private void InitializeComponent() - { - AvaloniaXamlLoader.Load(this); - } -} diff --git a/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Pages/DemoPage.axaml b/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Pages/ScriptPage.axaml similarity index 79% rename from src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Pages/DemoPage.axaml rename to src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Pages/ScriptPage.axaml index 4f13ce86d..0762ae8d1 100644 --- a/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Pages/DemoPage.axaml +++ b/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Pages/ScriptPage.axaml @@ -3,6 +3,6 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" - x:Class="BD.WTTS.UI.Views.Pages.DemoPage"> - BD.WTTS.Client.Plugins.Accelerator + x:Class="BD.WTTS.UI.Views.Pages.ScriptPage"> + Welcome to Avalonia! diff --git a/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Pages/ScriptPage.axaml.cs b/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Pages/ScriptPage.axaml.cs new file mode 100644 index 000000000..be7af1b75 --- /dev/null +++ b/src/BD.WTTS.Client.Plugins.Accelerator/UI/Views/Pages/ScriptPage.axaml.cs @@ -0,0 +1,11 @@ +using Avalonia.Controls; + +namespace BD.WTTS.UI.Views.Pages; + +public partial class ScriptPage : UserControl +{ + public ScriptPage() + { + InitializeComponent(); + } +} diff --git a/src/BD.WTTS.Client.Plugins.GameAccount/BD.WTTS.Client.Plugins.GameAccount.csproj b/src/BD.WTTS.Client.Plugins.GameAccount/BD.WTTS.Client.Plugins.GameAccount.csproj index 2dbc5e94b..88fbddffd 100644 --- a/src/BD.WTTS.Client.Plugins.GameAccount/BD.WTTS.Client.Plugins.GameAccount.csproj +++ b/src/BD.WTTS.Client.Plugins.GameAccount/BD.WTTS.Client.Plugins.GameAccount.csproj @@ -87,4 +87,6 @@ + + diff --git a/src/BD.WTTS.Client.Plugins.GameAccount/Models/PlatformAccount.props.cs b/src/BD.WTTS.Client.Plugins.GameAccount/Models/PlatformAccount.props.cs index a464940bf..bde690943 100644 --- a/src/BD.WTTS.Client.Plugins.GameAccount/Models/PlatformAccount.props.cs +++ b/src/BD.WTTS.Client.Plugins.GameAccount/Models/PlatformAccount.props.cs @@ -8,12 +8,15 @@ public sealed partial class PlatformAccount : ReactiveObject public ThirdpartyPlatform Platform { get; init; } - [Reactive] + [Reactive, S_JsonIgnore, MP2Ignore, N_JsonIgnore] public ObservableCollection? Accounts { get; set; } - [Reactive] + [Reactive, S_JsonIgnore, MP2Ignore, N_JsonIgnore] public bool IsEnable { get; set; } + [Reactive, S_JsonIgnore, MP2Ignore, N_JsonIgnore] + public bool IsLoading { get; set; } + public bool IsExitBeforeInteract { get; set; } public string? ExeExtraArgs { get; set; } diff --git a/src/BD.WTTS.Client.Plugins.GameAccount/Plugins/Plugin.cs b/src/BD.WTTS.Client.Plugins.GameAccount/Plugins/Plugin.cs index ef3b73084..f9192cf7f 100644 --- a/src/BD.WTTS.Client.Plugins.GameAccount/Plugins/Plugin.cs +++ b/src/BD.WTTS.Client.Plugins.GameAccount/Plugins/Plugin.cs @@ -1,5 +1,4 @@ -using BD.WTTS.UI.Views; -using Microsoft.Extensions.DependencyInjection; +using BD.WTTS.UI.Views.Pages; namespace BD.WTTS.Plugins; diff --git a/src/BD.WTTS.Client.Plugins.GameAccount/UI/Assets/Platforms.json b/src/BD.WTTS.Client.Plugins.GameAccount/UI/Assets/Platforms.json index 6f637ea5f..154bbf5ac 100644 --- a/src/BD.WTTS.Client.Plugins.GameAccount/UI/Assets/Platforms.json +++ b/src/BD.WTTS.Client.Plugins.GameAccount/UI/Assets/Platforms.json @@ -90,5 +90,43 @@ "UniqueIdPath": "%LocalAppData%\\Electronic Arts\\EA Desktop\\telemetry.ini", "UniqueIdRegex": "(?<=\\=).*", "UniqueIdType": 3 + }, + { + "FullName": "Origin", + "Icon": "Origin", + "Platform": 8, + "IsExitBeforeInteract": true, + "DefaultExePath": "%ProgramFiles(x86)%\\Origin\\Origin.exe", + "ExeExtraArgs": null, + "PlatformIds": [ "o", "origin" ], + "ExesToEnd": [ "Origin.exe", "OriginWebHelperService.exe" ], + "ClearPaths": [ "SAME_AS_LOGIN_FILES" ], + "LoginFiles": [ + "%AppData%\\Origin\\ConsolidatedCache\\", + "%AppData%\\Origin\\Logs\\", + "%AppData%\\Origin\\NucleusCache\\", + "%AppData%\\Origin\\*.xml", + "%AppData%\\Origin\\Logs\\dserrors.data", + "%ProgramData%\\Origin\\AchievementCache\\", + "%ProgramData%\\Origin\\Subscription\\", + "%ProgramData%\\Origin\\local.xml", + "%ProgramData%\\Origin\\*.olc", + "%ProgramData%\\Origin\\TcNoAccSwitcher-ID.instance" + ], + "CachePaths": [ + "%ProgramData%\\Origin\\DownloadCache", + "%LocalAppData%\\Origin\\Origin\\cache\\QtWebEngine\\Default\\Cache", + "%LocalAppData%\\Origin\\Origin\\QtWebEngine\\Default\\Application Cache\\Cache" + ], + "BackupPaths": [ + "%ProgramData%\\Origin\\LocalContent\\", + "%ProgramData%\\Origin\\local.xml" + ], + "BackupFileTypesIgnore": null, + "BackupFileTypesInclude": null, + "ClosingMethod": null, + "StartingMethod": null, + "UniqueIdPath": "%ProgramData%\\Origin\\TcNoAccSwitcher-ID.instance", + "UniqueIdType": 1 } ] diff --git a/src/BD.WTTS.Client.Plugins.GameAccount/UI/Views/Controls/AccountItems.axaml b/src/BD.WTTS.Client.Plugins.GameAccount/UI/Views/Controls/AccountItems.axaml index 303c3ea95..b15320bf0 100644 --- a/src/BD.WTTS.Client.Plugins.GameAccount/UI/Views/Controls/AccountItems.axaml +++ b/src/BD.WTTS.Client.Plugins.GameAccount/UI/Views/Controls/AccountItems.axaml @@ -1,9 +1,10 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/src/BD.WTTS.Client.Plugins.GameAccount/UI/Views/GameAccountPage.axaml.cs b/src/BD.WTTS.Client.Plugins.GameAccount/UI/Views/Pages/GameAccountPage.axaml.cs similarity index 62% rename from src/BD.WTTS.Client.Plugins.GameAccount/UI/Views/GameAccountPage.axaml.cs rename to src/BD.WTTS.Client.Plugins.GameAccount/UI/Views/Pages/GameAccountPage.axaml.cs index c6e554efa..eb609a5c8 100644 --- a/src/BD.WTTS.Client.Plugins.GameAccount/UI/Views/GameAccountPage.axaml.cs +++ b/src/BD.WTTS.Client.Plugins.GameAccount/UI/Views/Pages/GameAccountPage.axaml.cs @@ -1,14 +1,18 @@ -using Avalonia.Controls; -using Avalonia.ReactiveUI; using FluentAvalonia.UI.Controls; +using BD.WTTS.Client.Resources; -namespace BD.WTTS.UI.Views; -public partial class GameAccountPage : ReactiveUserControl +namespace BD.WTTS.UI.Views.Pages; + +public partial class GameAccountPage : PageBase { public GameAccountPage() { InitializeComponent(); DataContext = new GameAccountPageViewModel(); + + Title = Strings.UserFastChange; + Subtitle = "插件作者: Steam++ 官方"; + Description = "可支持自行添加多平台账号快速切换功能，Steam 可自动读取账号信息，其它平台请手动添加账号信息。 "; } private void TabView_TabCloseRequested(TabView sender, TabViewTabCloseRequestedEventArgs args) diff --git a/src/BD.WTTS.Client.Plugins.GameList/UI/Views/GameListPage.axaml b/src/BD.WTTS.Client.Plugins.GameList/UI/Views/Pages/GameListPage.axaml similarity index 87% rename from src/BD.WTTS.Client.Plugins.GameList/UI/Views/GameListPage.axaml rename to src/BD.WTTS.Client.Plugins.GameList/UI/Views/Pages/GameListPage.axaml index c8c082161..60850dc36 100644 --- a/src/BD.WTTS.Client.Plugins.GameList/UI/Views/GameListPage.axaml +++ b/src/BD.WTTS.Client.Plugins.GameList/UI/Views/Pages/GameListPage.axaml @@ -1,5 +1,5 @@