From 1af0b6b523c4f6aff20f284fd176e4454752be3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89=E9=B8=AD=E8=9B=8B?= Date: Sat, 6 Sep 2025 22:27:17 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=8F=AF=E7=94=A8=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E7=B1=BB=E5=9E=8B=E4=B8=8B=E6=8B=89=E6=A1=86=EF=BC=8C?= =?UTF-8?q?=E7=AE=80=E5=8C=96=E7=95=8C=E9=9D=A2=E8=AE=BE=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../View/Pages/GearTaskListPage.xaml | 4 --- .../Pages/GearTaskListPageViewModel.cs | 26 ++----------------- 2 files changed, 2 insertions(+), 28 deletions(-) diff --git a/BetterGenshinImpact/View/Pages/GearTaskListPage.xaml b/BetterGenshinImpact/View/Pages/GearTaskListPage.xaml index a9b4f093..5a80b2d8 100644 --- a/BetterGenshinImpact/View/Pages/GearTaskListPage.xaml +++ b/BetterGenshinImpact/View/Pages/GearTaskListPage.xaml @@ -221,10 +221,6 @@ Content="添加组" Icon="{ui:SymbolIcon Folder24}" Margin="0,0,4,0" /> - diff --git a/BetterGenshinImpact/ViewModel/Pages/GearTaskListPageViewModel.cs b/BetterGenshinImpact/ViewModel/Pages/GearTaskListPageViewModel.cs index 8658ec11..1700022f 100644 --- a/BetterGenshinImpact/ViewModel/Pages/GearTaskListPageViewModel.cs +++ b/BetterGenshinImpact/ViewModel/Pages/GearTaskListPageViewModel.cs @@ -1,11 +1,7 @@ using System.Collections.ObjectModel; -using System.Text.Json; -using BetterGenshinImpact.Model; -using BetterGenshinImpact.ViewModel; using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; using Microsoft.Extensions.Logging; -using System.IO; using System.Windows; using System.Linq; using System; @@ -13,10 +9,8 @@ using BetterGenshinImpact.ViewModel.Pages.Component; using BetterGenshinImpact.Service; using System.Threading.Tasks; using System.Collections.Specialized; -using GongSolutions.Wpf.DragDrop; using BetterGenshinImpact.View.Windows; using BetterGenshinImpact.ViewModel.Windows; -using Microsoft.Extensions.DependencyInjection; using Wpf.Ui.Violeta.Controls; namespace BetterGenshinImpact.ViewModel.Pages; @@ -52,23 +46,7 @@ public partial class GearTaskListPageViewModel : ViewModel /// [ObservableProperty] private GearTaskViewModel? _selectedTaskNode; - - /// - /// 可用的任务类型 - /// - public ObservableCollection AvailableTaskTypes { get; } = new() - { - "采集任务", - "战斗任务", - "传送任务", - "交互任务", - "等待任务", - "脚本任务", - "条件任务", - "循环任务", - "组合任务" - }; - + public GearTaskListPageViewModel(ILogger logger, GearTaskStorageService storageService) { _logger = logger; @@ -354,7 +332,7 @@ public partial class GearTaskListPageViewModel : ViewModel var newTask = new GearTaskViewModel($"新任务 {DateTime.Now:HHmmss}") { - TaskType = taskType ?? AvailableTaskTypes.First(), + TaskType = "任务类型", Description = "新创建的任务" };