From 95bbb55eff96ad6d95b3b49312c6f742c23dbbcb Mon Sep 17 00:00:00 2001 From: huiyadanli Date: Thu, 5 Oct 2023 00:47:03 +0800 Subject: [PATCH] Init main window UI --- BetterGenshinImpact/App.xaml | 10 +- .../BetterGenshinImpact.csproj | 7 +- .../Core/Config/ApplicationConfiguration.cs | 6 +- .../{ScriptConfig.cs => MacroConfig.cs} | 2 +- .../AutoGeniusInvokationTask.cs | 12 + .../UseActiveCode/UseActiveCodeTask.cs | 12 + BetterGenshinImpact/View/MainWindow.xaml | 107 ++++++- BetterGenshinImpact/View/MainWindow.xaml.cs | 10 +- BetterGenshinImpact/View/Pages/HomePage.xaml | 25 ++ .../View/Pages/HomePage.xaml.cs | 24 ++ .../View/Pages/MacroSettingsPage.xaml | 75 +++++ .../View/Pages/MacroSettingsPage.xaml.cs | 28 ++ .../View/Pages/TriggerSettingsPage.xaml | 267 ++++++++++++++++++ .../View/Pages/TriggerSettingsPage.xaml.cs | 24 ++ 14 files changed, 587 insertions(+), 22 deletions(-) rename BetterGenshinImpact/Core/Config/{ScriptConfig.cs => MacroConfig.cs} (96%) create mode 100644 BetterGenshinImpact/GameTask/AutoGeniusInvokation/AutoGeniusInvokationTask.cs create mode 100644 BetterGenshinImpact/GameTask/UseActiveCode/UseActiveCodeTask.cs create mode 100644 BetterGenshinImpact/View/Pages/HomePage.xaml create mode 100644 BetterGenshinImpact/View/Pages/HomePage.xaml.cs create mode 100644 BetterGenshinImpact/View/Pages/MacroSettingsPage.xaml create mode 100644 BetterGenshinImpact/View/Pages/MacroSettingsPage.xaml.cs create mode 100644 BetterGenshinImpact/View/Pages/TriggerSettingsPage.xaml create mode 100644 BetterGenshinImpact/View/Pages/TriggerSettingsPage.xaml.cs diff --git a/BetterGenshinImpact/App.xaml b/BetterGenshinImpact/App.xaml index f4a556e4..b228b8c9 100644 --- a/BetterGenshinImpact/App.xaml +++ b/BetterGenshinImpact/App.xaml @@ -2,8 +2,14 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="clr-namespace:BetterGenshinImpact" - StartupUri="/View/MainWindow.xaml"> + StartupUri="/View/MainWindow.xaml" + xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"> - + + + + + + diff --git a/BetterGenshinImpact/BetterGenshinImpact.csproj b/BetterGenshinImpact/BetterGenshinImpact.csproj index 193314dc..96597385 100644 --- a/BetterGenshinImpact/BetterGenshinImpact.csproj +++ b/BetterGenshinImpact/BetterGenshinImpact.csproj @@ -13,6 +13,7 @@ + @@ -26,11 +27,10 @@ + - - @@ -42,6 +42,9 @@ Code + + Code + diff --git a/BetterGenshinImpact/Core/Config/ApplicationConfiguration.cs b/BetterGenshinImpact/Core/Config/ApplicationConfiguration.cs index 5b73b99a..384e443d 100644 --- a/BetterGenshinImpact/Core/Config/ApplicationConfiguration.cs +++ b/BetterGenshinImpact/Core/Config/ApplicationConfiguration.cs @@ -41,5 +41,9 @@ namespace BetterGenshinImpact.Core.Config /// public AutoFishingConfig AutoFishingConfig { get; set; } = new(); + /// + /// 脚本类配置 + /// + public MacroConfig ScriptConfig { get; set; } = new(); } -} +} \ No newline at end of file diff --git a/BetterGenshinImpact/Core/Config/ScriptConfig.cs b/BetterGenshinImpact/Core/Config/MacroConfig.cs similarity index 96% rename from BetterGenshinImpact/Core/Config/ScriptConfig.cs rename to BetterGenshinImpact/Core/Config/MacroConfig.cs index f7525754..f920bf52 100644 --- a/BetterGenshinImpact/Core/Config/ScriptConfig.cs +++ b/BetterGenshinImpact/Core/Config/MacroConfig.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace BetterGenshinImpact.Core.Config { - public class ScriptConfig + public class MacroConfig { /// /// 长按空格变空格连发 diff --git a/BetterGenshinImpact/GameTask/AutoGeniusInvokation/AutoGeniusInvokationTask.cs b/BetterGenshinImpact/GameTask/AutoGeniusInvokation/AutoGeniusInvokationTask.cs new file mode 100644 index 00000000..8f905280 --- /dev/null +++ b/BetterGenshinImpact/GameTask/AutoGeniusInvokation/AutoGeniusInvokationTask.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BetterGenshinImpact.GameTask.AutoGeniusInvokation +{ + internal class AutoGeniusInvokationTask + { + } +} diff --git a/BetterGenshinImpact/GameTask/UseActiveCode/UseActiveCodeTask.cs b/BetterGenshinImpact/GameTask/UseActiveCode/UseActiveCodeTask.cs new file mode 100644 index 00000000..0b7830fd --- /dev/null +++ b/BetterGenshinImpact/GameTask/UseActiveCode/UseActiveCodeTask.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BetterGenshinImpact.GameTask.UseActiveCode +{ + internal class UseActiveCodeTask + { + } +} diff --git a/BetterGenshinImpact/View/MainWindow.xaml b/BetterGenshinImpact/View/MainWindow.xaml index 3de0c4de..b2cb0c8f 100644 --- a/BetterGenshinImpact/View/MainWindow.xaml +++ b/BetterGenshinImpact/View/MainWindow.xaml @@ -1,15 +1,17 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/BetterGenshinImpact/View/MainWindow.xaml.cs b/BetterGenshinImpact/View/MainWindow.xaml.cs index ffcb05bf..10dcab4a 100644 --- a/BetterGenshinImpact/View/MainWindow.xaml.cs +++ b/BetterGenshinImpact/View/MainWindow.xaml.cs @@ -1,12 +1,18 @@ -namespace BetterGenshinImpact.View +using BetterGenshinImpact.ViewModel; + +namespace BetterGenshinImpact.View { /// /// Interaction logic for MainWindow.xaml /// - public partial class MainWindow : System.Windows.Window + public partial class MainWindow { + + public MainWindowViewModel ViewModel { get; } + public MainWindow() { + DataContext = ViewModel = new(); InitializeComponent(); } diff --git a/BetterGenshinImpact/View/Pages/HomePage.xaml b/BetterGenshinImpact/View/Pages/HomePage.xaml new file mode 100644 index 00000000..785ae226 --- /dev/null +++ b/BetterGenshinImpact/View/Pages/HomePage.xaml @@ -0,0 +1,25 @@ + + + + + + diff --git a/BetterGenshinImpact/View/Pages/HomePage.xaml.cs b/BetterGenshinImpact/View/Pages/HomePage.xaml.cs new file mode 100644 index 00000000..1f264ebc --- /dev/null +++ b/BetterGenshinImpact/View/Pages/HomePage.xaml.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Shapes; + +namespace BetterGenshinImpact.View.Pages +{ + public partial class HomePage + { + public HomePage() + { + InitializeComponent(); + } + } +} diff --git a/BetterGenshinImpact/View/Pages/MacroSettingsPage.xaml b/BetterGenshinImpact/View/Pages/MacroSettingsPage.xaml new file mode 100644 index 00000000..7c2e8e93 --- /dev/null +++ b/BetterGenshinImpact/View/Pages/MacroSettingsPage.xaml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/BetterGenshinImpact/View/Pages/MacroSettingsPage.xaml.cs b/BetterGenshinImpact/View/Pages/MacroSettingsPage.xaml.cs new file mode 100644 index 00000000..a7c035d2 --- /dev/null +++ b/BetterGenshinImpact/View/Pages/MacroSettingsPage.xaml.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace BetterGenshinImpact.View.Pages +{ + /// + /// MacroSettingsPage.xaml 的交互逻辑 + /// + public partial class MacroSettingsPage : Page + { + public MacroSettingsPage() + { + InitializeComponent(); + } + } +} diff --git a/BetterGenshinImpact/View/Pages/TriggerSettingsPage.xaml b/BetterGenshinImpact/View/Pages/TriggerSettingsPage.xaml new file mode 100644 index 00000000..aababdf2 --- /dev/null +++ b/BetterGenshinImpact/View/Pages/TriggerSettingsPage.xaml @@ -0,0 +1,267 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/BetterGenshinImpact/View/Pages/TriggerSettingsPage.xaml.cs b/BetterGenshinImpact/View/Pages/TriggerSettingsPage.xaml.cs new file mode 100644 index 00000000..4425dc33 --- /dev/null +++ b/BetterGenshinImpact/View/Pages/TriggerSettingsPage.xaml.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Shapes; + +namespace BetterGenshinImpact.View.Pages +{ + public partial class TriggerSettingsPage + { + public TriggerSettingsPage() + { + InitializeComponent(); + } + } +}