Fun/better-genshin-impact
1
0
Fork 0
mirror of https://github.com/babalae/better-genshin-impact.git synced 2026-05-21 09:45:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

重构任务节点对话框和JS脚本选择窗口，调整命名空间，优化代码结构

Browse Source
This commit is contained in:
辉鸭蛋
2025-09-07 07:24:03 +08:00
parent 549fc03009
commit b11cdc7411
8 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
BetterGenshinImpact/BetterGenshinImpact.csproj
View File

@@ -215,6 +215,16 @@
<XamlRuntime>Wpf</XamlRuntime>
<SubType>Designer</SubType>
</Page>
<Page Update="View\Windows\GearTask\AddTaskNodeDialog.xaml">
<Generator>MSBuild:Compile</Generator>
<XamlRuntime>Wpf</XamlRuntime>
<SubType>Designer</SubType>
</Page>
<Page Update="View\Windows\GearTask\JsScriptSelectionWindow.xaml">
<Generator>MSBuild:Compile</Generator>
<XamlRuntime>Wpf</XamlRuntime>
<SubType>Designer</SubType>
</Page>
</ItemGroup>
<ItemGroup>

5
BetterGenshinImpact/View/Windows/AddTaskNodeDialog.xaml → BetterGenshinImpact/View/Windows/GearTask/AddTaskNodeDialog.xaml
View File

@@ -1,11 +1,12 @@
<ui:FluentWindow x:Class="BetterGenshinImpact.View.Windows.AddTaskNodeDialog"
<ui:FluentWindow x:Class="BetterGenshinImpact.View.Windows.GearTask.AddTaskNodeDialog"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
xmlns:windows="clr-namespace:BetterGenshinImpact.ViewModel.Windows"
d:DataContext="{d:DesignInstance Type=windows:AddTaskNodeDialogViewModel}"
xmlns:gearTask="clr-namespace:BetterGenshinImpact.ViewModel.Windows.GearTask"
d:DataContext="{d:DesignInstance Type=gearTask:AddTaskNodeDialogViewModel}"
Width="450"
Height="300"
MinWidth="400"

4
BetterGenshinImpact/View/Windows/AddTaskNodeDialog.xaml.cs → BetterGenshinImpact/View/Windows/GearTask/AddTaskNodeDialog.xaml.cs
View File

@@ -1,9 +1,9 @@
using System;
using System.Windows;
using BetterGenshinImpact.Helpers.Ui;
using BetterGenshinImpact.ViewModel.Windows;
using AddTaskNodeDialogViewModel = BetterGenshinImpact.ViewModel.Windows.GearTask.AddTaskNodeDialogViewModel;
namespace BetterGenshinImpact.View.Windows;
namespace BetterGenshinImpact.View.Windows.GearTask;
public partial class AddTaskNodeDialog
{

6
BetterGenshinImpact/View/Windows/JsScriptSelectionWindow.xaml → BetterGenshinImpact/View/Windows/GearTask/JsScriptSelectionWindow.xaml
View File

@@ -1,4 +1,4 @@
<ui:FluentWindow x:Class="BetterGenshinImpact.View.Windows.JsScriptSelectionWindow"
<ui:FluentWindow x:Class="BetterGenshinImpact.View.Windows.GearTask.JsScriptSelectionWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -6,6 +6,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
xmlns:vio="http://schemas.lepo.co/wpfui/2022/xaml/violeta"
xmlns:gearTask="clr-namespace:BetterGenshinImpact.ViewModel.Windows.GearTask"
Title="选择JS脚本"
Width="900"
Height="600"
@@ -14,6 +15,7 @@
Background="#202020"
ExtendsContentIntoTitleBar="True"
FontFamily="{DynamicResource TextThemeFontFamily}"
d:DataContext="{d:DesignInstance Type=gearTask:JsScriptSelectionViewModel}"
WindowBackdropType="None"
WindowStartupLocation="CenterOwner"
mc:Ignorable="d">
@@ -35,7 +37,7 @@
</ui:TitleBar>
<!-- 主内容区域 -->
<Grid Grid.Row="1" Margin="12">
<Grid Grid.Row="1" Margin="4">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="300" />
<ColumnDefinition Width="5" />

5
BetterGenshinImpact/View/Windows/JsScriptSelectionWindow.xaml.cs → BetterGenshinImpact/View/Windows/GearTask/JsScriptSelectionWindow.xaml.cs
View File

@@ -1,8 +1,9 @@
using System.Windows;
using BetterGenshinImpact.ViewModel.Windows;
using BetterGenshinImpact.ViewModel.Windows.GearTask;
using Wpf.Ui.Controls;
using JsScriptSelectionViewModel = BetterGenshinImpact.ViewModel.Windows.GearTask.JsScriptSelectionViewModel;
namespace BetterGenshinImpact.View.Windows;
namespace BetterGenshinImpact.View.Windows.GearTask;
public partial class JsScriptSelectionWindow : FluentWindow
{

1
BetterGenshinImpact/ViewModel/Pages/GearTaskListPageViewModel.cs
View File

@@ -10,6 +10,7 @@ using System.Threading.Tasks;
using System.Collections.Specialized;
using System.Windows;
using BetterGenshinImpact.View.Windows;
using BetterGenshinImpact.View.Windows.GearTask;
using BetterGenshinImpact.ViewModel.Windows;
using Wpf.Ui.Violeta.Controls;

2
BetterGenshinImpact/ViewModel/Windows/AddTaskNodeDialogViewModel.cs → BetterGenshinImpact/ViewModel/Windows/GearTask/AddTaskNodeDialogViewModel.cs
View File

@@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
namespace BetterGenshinImpact.ViewModel.Windows;
namespace BetterGenshinImpact.ViewModel.Windows.GearTask;
public partial class AddTaskNodeDialogViewModel : ObservableValidator
{

4
BetterGenshinImpact/ViewModel/Windows/JsScriptSelectionViewModel.cs → BetterGenshinImpact/ViewModel/Windows/GearTask/JsScriptSelectionViewModel.cs
View File

@@ -1,16 +1,14 @@
using System;
using System.Collections.ObjectModel;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using BetterGenshinImpact.Core.Script;
using BetterGenshinImpact.Core.Script.Project;
using BetterGenshinImpact.ViewModel;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using Microsoft.Extensions.Logging;
namespace BetterGenshinImpact.ViewModel.Windows;
namespace BetterGenshinImpact.ViewModel.Windows.GearTask;
public partial class JsScriptSelectionViewModel : ViewModel
{