From b11cdc7411b84c3cc429d88e678c455ce8ec16a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89=E9=B8=AD=E8=9B=8B?= Date: Sun, 7 Sep 2025 07:24:03 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E4=BB=BB=E5=8A=A1=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E5=AF=B9=E8=AF=9D=E6=A1=86=E5=92=8CJS=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=E9=80=89=E6=8B=A9=E7=AA=97=E5=8F=A3=EF=BC=8C=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E5=91=BD=E5=90=8D=E7=A9=BA=E9=97=B4=EF=BC=8C=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BetterGenshinImpact/BetterGenshinImpact.csproj | 10 ++++++++++ .../View/Windows/{ => GearTask}/AddTaskNodeDialog.xaml | 5 +++-- .../Windows/{ => GearTask}/AddTaskNodeDialog.xaml.cs | 4 ++-- .../{ => GearTask}/JsScriptSelectionWindow.xaml | 6 ++++-- .../{ => GearTask}/JsScriptSelectionWindow.xaml.cs | 5 +++-- .../ViewModel/Pages/GearTaskListPageViewModel.cs | 1 + .../{ => GearTask}/AddTaskNodeDialogViewModel.cs | 2 +- .../{ => GearTask}/JsScriptSelectionViewModel.cs | 4 +--- 8 files changed, 25 insertions(+), 12 deletions(-) rename BetterGenshinImpact/View/Windows/{ => GearTask}/AddTaskNodeDialog.xaml (93%) rename BetterGenshinImpact/View/Windows/{ => GearTask}/AddTaskNodeDialog.xaml.cs (89%) rename BetterGenshinImpact/View/Windows/{ => GearTask}/JsScriptSelectionWindow.xaml (97%) rename BetterGenshinImpact/View/Windows/{ => GearTask}/JsScriptSelectionWindow.xaml.cs (80%) rename BetterGenshinImpact/ViewModel/Windows/{ => GearTask}/AddTaskNodeDialogViewModel.cs (96%) rename BetterGenshinImpact/ViewModel/Windows/{ => GearTask}/JsScriptSelectionViewModel.cs (98%) diff --git a/BetterGenshinImpact/BetterGenshinImpact.csproj b/BetterGenshinImpact/BetterGenshinImpact.csproj index 15a6eae5..62d9d881 100644 --- a/BetterGenshinImpact/BetterGenshinImpact.csproj +++ b/BetterGenshinImpact/BetterGenshinImpact.csproj @@ -215,6 +215,16 @@ Wpf Designer + + MSBuild:Compile + Wpf + Designer + + + MSBuild:Compile + Wpf + Designer + diff --git a/BetterGenshinImpact/View/Windows/AddTaskNodeDialog.xaml b/BetterGenshinImpact/View/Windows/GearTask/AddTaskNodeDialog.xaml similarity index 93% rename from BetterGenshinImpact/View/Windows/AddTaskNodeDialog.xaml rename to BetterGenshinImpact/View/Windows/GearTask/AddTaskNodeDialog.xaml index bef0d7e2..18da0870 100644 --- a/BetterGenshinImpact/View/Windows/AddTaskNodeDialog.xaml +++ b/BetterGenshinImpact/View/Windows/GearTask/AddTaskNodeDialog.xaml @@ -1,11 +1,12 @@ - @@ -35,7 +37,7 @@ - + diff --git a/BetterGenshinImpact/View/Windows/JsScriptSelectionWindow.xaml.cs b/BetterGenshinImpact/View/Windows/GearTask/JsScriptSelectionWindow.xaml.cs similarity index 80% rename from BetterGenshinImpact/View/Windows/JsScriptSelectionWindow.xaml.cs rename to BetterGenshinImpact/View/Windows/GearTask/JsScriptSelectionWindow.xaml.cs index aab74a08..ec61f607 100644 --- a/BetterGenshinImpact/View/Windows/JsScriptSelectionWindow.xaml.cs +++ b/BetterGenshinImpact/View/Windows/GearTask/JsScriptSelectionWindow.xaml.cs @@ -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 { diff --git a/BetterGenshinImpact/ViewModel/Pages/GearTaskListPageViewModel.cs b/BetterGenshinImpact/ViewModel/Pages/GearTaskListPageViewModel.cs index f777b19c..69097763 100644 --- a/BetterGenshinImpact/ViewModel/Pages/GearTaskListPageViewModel.cs +++ b/BetterGenshinImpact/ViewModel/Pages/GearTaskListPageViewModel.cs @@ -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; diff --git a/BetterGenshinImpact/ViewModel/Windows/AddTaskNodeDialogViewModel.cs b/BetterGenshinImpact/ViewModel/Windows/GearTask/AddTaskNodeDialogViewModel.cs similarity index 96% rename from BetterGenshinImpact/ViewModel/Windows/AddTaskNodeDialogViewModel.cs rename to BetterGenshinImpact/ViewModel/Windows/GearTask/AddTaskNodeDialogViewModel.cs index 792ce1e7..bc9456d9 100644 --- a/BetterGenshinImpact/ViewModel/Windows/AddTaskNodeDialogViewModel.cs +++ b/BetterGenshinImpact/ViewModel/Windows/GearTask/AddTaskNodeDialogViewModel.cs @@ -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 { diff --git a/BetterGenshinImpact/ViewModel/Windows/JsScriptSelectionViewModel.cs b/BetterGenshinImpact/ViewModel/Windows/GearTask/JsScriptSelectionViewModel.cs similarity index 98% rename from BetterGenshinImpact/ViewModel/Windows/JsScriptSelectionViewModel.cs rename to BetterGenshinImpact/ViewModel/Windows/GearTask/JsScriptSelectionViewModel.cs index 06e3916f..3fa3e768 100644 --- a/BetterGenshinImpact/ViewModel/Windows/JsScriptSelectionViewModel.cs +++ b/BetterGenshinImpact/ViewModel/Windows/GearTask/JsScriptSelectionViewModel.cs @@ -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 {