fix merge

This commit is contained in:
辉鸭蛋 2024-05-28 18:02:56 +08:00
parent 08fbd6e2a2
commit fe2fd5d67c
2 changed files with 3 additions and 6 deletions

View File

@ -50,12 +50,6 @@ public class AutoDomainTask
_predictor = new(Global.Absolute("Assets\\Model\\Domain\\bgi_tree.onnx"), BgiSessionOption.Instance.Options);
var captureArea = TaskContext.Instance().SystemInfo.CaptureAreaRect;
var assetScale = TaskContext.Instance().SystemInfo.AssetScale;
_clickOffset = new ClickOffset(captureArea.X, captureArea.Y, assetScale);
_combatCommands = CombatScriptParser.Parse(_taskParam.CombatStrategyContent);
_config = TaskContext.Instance().Config.AutoDomainConfig;
_combatScriptBag = CombatScriptParser.ReadAndParse(_taskParam.CombatStrategyPath);
}

View File

@ -45,6 +45,9 @@ public partial class HomePageViewModel : ObservableObject, INavigationAware, IVi
private readonly TaskTriggerDispatcher _taskDispatcher;
private readonly MouseKeyMonitor _mouseKeyMonitor = new();
// 记录上次使用原神的句柄
private IntPtr _hWnd;
[ObservableProperty] private string[] _inferenceDevices = ["CPU", "GPU"];
public HomePageViewModel(IConfigService configService, TaskTriggerDispatcher taskTriggerDispatcher)