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

无用代码优化

Browse Source
This commit is contained in:
辉鸭蛋
2026-05-09 03:49:28 +08:00
parent 769e08edfd
commit ed3ee2c392
6 changed files with 11 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
BetterGenshinImpact/Model/Gear/Triggers/GearBaseTrigger.cs
View File

@@ -24,13 +24,4 @@ public abstract class GearBaseTrigger
/// </summary>
public string TaskDefinitionName { get; set; } = string.Empty;
/// <summary>
/// 执行任务
/// </summary>
public async Task Trigger()
{
var gearTaskExecutor = App.GetRequiredService<GearTaskExecutor>();
await gearTaskExecutor.ExecuteTaskDefinitionAsync(TaskDefinitionName);
}
}

54
BetterGenshinImpact/Service/GearTask/GearTaskExecutor.cs
View File

@@ -5,6 +5,7 @@ using System.Threading;
using System.Threading.Tasks;
using BetterGenshinImpact.Model.Gear;
using BetterGenshinImpact.Model.Gear.Tasks;
using BetterGenshinImpact.Service.GearTask;
using BetterGenshinImpact.ViewModel.Pages.Component;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.DependencyInjection;
@@ -115,59 +116,6 @@ public partial class GearTaskExecutor : ObservableObject
}
}
/// <summary>
/// 直接执行 GearTaskData
/// </summary>
/// <param name="taskData">任务数据</param>
/// <param name="ct">取消令牌</param>
/// <returns></returns>
public async Task ExecuteTaskDataAsync(GearTaskData taskData, CancellationToken ct = default)
{
if (IsExecuting)
{
throw new InvalidOperationException("任务执行器正在运行中，请等待当前任务完成");
}
try
{
IsExecuting = true;
StatusMessage = "正在执行任务...";
Progress = 0;
_logger.LogInformation("开始执行任务: {TaskName}", taskData.Name);
// 转换为可执行的任务
var executableTask = await _taskConverter.ConvertTaskDataAsync(taskData);
// 使用执行管理器执行任务
await _executionManager.ExecuteWithTrackingAsync(executableTask, ct);
StatusMessage = "任务执行完成";
Progress = 100;
_logger.LogInformation("任务执行完成: {TaskName}", taskData.Name);
}
catch (OperationCanceledException)
{
StatusMessage = "任务执行已取消";
_logger.LogInformation("任务执行已取消: {TaskName}", taskData.Name);
throw;
}
catch (Exception ex)
{
StatusMessage = $"任务执行失败: {ex.Message}";
_logger.LogError(ex, "执行任务时发生错误: {TaskName}", taskData.Name);
throw;
}
finally
{
IsExecuting = false;
}
}
/// <summary>
/// 停止当前执行的任务
/// </summary>

13
BetterGenshinImpact/Service/GearTask/GearTaskStorageService.cs
View File

@@ -1,16 +1,15 @@
using BetterGenshinImpact.Model.Gear;
using BetterGenshinImpact.ViewModel.Pages.Component;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using BetterGenshinImpact.Core.Config;
using BetterGenshinImpact.Model.Gear;
using BetterGenshinImpact.Service.GearTask.Model;
using BetterGenshinImpact.ViewModel.Pages.Component;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
namespace BetterGenshinImpact.Service;
namespace BetterGenshinImpact.Service.GearTask;
/// <summary>
/// 齿轮任务存储服务，负责任务定义的 JSON 持久化
@@ -89,7 +88,7 @@ public class GearTaskStorageService
}
var viewModel = ConvertToViewModel(data);
_logger.LogInformation("任务定义 '{TaskName}' 已从 {FilePath} 加载", data.Name, filePath);
_logger.LogInformation("任务定义 '{TaskName}' 已加载", data.Name);
return viewModel;
}

1
BetterGenshinImpact/View/Windows/GearTask/AddTriggerDialog.xaml.cs
View File

@@ -5,6 +5,7 @@ using BetterGenshinImpact.ViewModel.Windows.GearTask;
using BetterGenshinImpact.ViewModel.Pages.Component;
using Microsoft.Extensions.DependencyInjection;
using BetterGenshinImpact.Service;
using BetterGenshinImpact.Service.GearTask;
using Microsoft.Extensions.Logging;
namespace BetterGenshinImpact.View.Windows.GearTask;

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

@@ -13,6 +13,8 @@ using System.IO;
using System.Windows;
using System.Windows.Controls;
using BetterGenshinImpact.Core.Config;
using BetterGenshinImpact.Core.Script;
using BetterGenshinImpact.Service.GearTask;
using BetterGenshinImpact.View.Windows;
using BetterGenshinImpact.View.Windows.GearTask;
using BetterGenshinImpact.ViewModel.Windows;

1
BetterGenshinImpact/ViewModel/Windows/GearTask/AddTriggerDialogViewModel.cs
View File

@@ -7,6 +7,7 @@ using BetterGenshinImpact.Helpers.Extensions;
using BetterGenshinImpact.Model;
using BetterGenshinImpact.Model.Gear.Triggers;
using BetterGenshinImpact.Service;
using BetterGenshinImpact.Service.GearTask;
using BetterGenshinImpact.View.Windows;
using BetterGenshinImpact.ViewModel.Pages.Component;
using Microsoft.Extensions.Logging;