diff --git a/BetterGenshinImpact/BetterGenshinImpact.csproj b/BetterGenshinImpact/BetterGenshinImpact.csproj
index 1ea68496..922184e1 100644
--- a/BetterGenshinImpact/BetterGenshinImpact.csproj
+++ b/BetterGenshinImpact/BetterGenshinImpact.csproj
@@ -34,35 +34,35 @@
-
-
-
-
-
+
+
+
+
+
-
+
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
diff --git a/BetterGenshinImpact/GameTask/AutoDomain/AutoDomainTask.cs b/BetterGenshinImpact/GameTask/AutoDomain/AutoDomainTask.cs
index 230638ce..bca51e6a 100644
--- a/BetterGenshinImpact/GameTask/AutoDomain/AutoDomainTask.cs
+++ b/BetterGenshinImpact/GameTask/AutoDomain/AutoDomainTask.cs
@@ -37,7 +37,7 @@ public class AutoDomainTask
private readonly PostMessageSimulator _simulator;
- private readonly YoloV8 _predictor;
+ private readonly YoloV8Predictor _predictor;
private readonly AutoDomainConfig _config;
@@ -48,7 +48,10 @@ public class AutoDomainTask
_taskParam = taskParam;
_simulator = AutoFightContext.Instance.Simulator;
- _predictor = new YoloV8(Global.Absolute("Assets\\Model\\Domain\\bgi_tree.onnx"), BgiSessionOption.Instance.Options);
+ _predictor = YoloV8Builder.CreateDefaultBuilder()
+ .UseOnnxModel(Global.Absolute("Assets\\Model\\Domain\\bgi_tree.onnx"))
+ .WithSessionOptions(BgiSessionOption.Instance.Options)
+ .Build();
_config = TaskContext.Instance().Config.AutoDomainConfig;
diff --git a/BetterGenshinImpact/GameTask/AutoFight/Model/CombatScenes.cs b/BetterGenshinImpact/GameTask/AutoFight/Model/CombatScenes.cs
index b94280c7..4676d276 100644
--- a/BetterGenshinImpact/GameTask/AutoFight/Model/CombatScenes.cs
+++ b/BetterGenshinImpact/GameTask/AutoFight/Model/CombatScenes.cs
@@ -38,7 +38,11 @@ public class CombatScenes : IDisposable
public int AvatarCount { get; set; }
- private readonly YoloV8 _predictor = new(Global.Absolute("Assets\\Model\\Common\\avatar_side_classify_sim.onnx"), BgiSessionOption.Instance.Options);
+ private readonly YoloV8Predictor _predictor =
+ YoloV8Builder.CreateDefaultBuilder()
+ .UseOnnxModel(Global.Absolute("Assets\\Model\\Common\\avatar_side_classify_sim.onnx"))
+ .WithSessionOptions(BgiSessionOption.Instance.Options)
+ .Build();
///
/// 通过YOLO分类器识别队伍内角色
@@ -117,13 +121,13 @@ public class CombatScenes : IDisposable
speedTimer.Record("角色侧面头像分类识别");
Debug.WriteLine($"角色侧面头像识别结果：{result}");
speedTimer.DebugPrint();
- if (result.Confidence < 0.8)
+ if (result.TopClass.Confidence < 0.8)
{
Cv2.ImWrite(@"log\avatar_side_classify_error.png", src.ToMat());
- throw new Exception($"无法识别第{index}位角色，置信度{result.Confidence}，结果：{result.Class.Name}");
+ throw new Exception($"无法识别第{index}位角色，置信度{result.TopClass.Confidence}，结果：{result.TopClass.Name.Name}");
}
- return result.Class.Name;
+ return result.TopClass.Name.Name;
}
private void InitializeTeamFromConfig(string teamNames)
diff --git a/BetterGenshinImpact/GameTask/AutoFishing/AutoFishingTrigger.cs b/BetterGenshinImpact/GameTask/AutoFishing/AutoFishingTrigger.cs
index 28226ff1..88ffa3fc 100644
--- a/BetterGenshinImpact/GameTask/AutoFishing/AutoFishingTrigger.cs
+++ b/BetterGenshinImpact/GameTask/AutoFishing/AutoFishingTrigger.cs
@@ -36,7 +36,7 @@ namespace BetterGenshinImpact.GameTask.AutoFishing
{
private readonly ILogger _logger = App.GetLogger();
private readonly IOcrService _ocrService = OcrFactory.Paddle;
- private readonly YoloV8 _predictor = new(Global.Absolute("Assets\\Model\\Fish\\bgi_fish.onnx"), BgiSessionOption.Instance.Options);
+ private readonly YoloV8Predictor _predictor = YoloV8Builder.CreateDefaultBuilder().UseOnnxModel(Global.Absolute("Assets\\Model\\Fish\\bgi_fish.onnx")).WithSessionOptions(BgiSessionOption.Instance.Options).Build();
public string Name => "自动钓鱼";
public bool IsEnabled { get; set; }
diff --git a/BetterGenshinImpact/GameTask/AutoFishing/Model/Fishpond.cs b/BetterGenshinImpact/GameTask/AutoFishing/Model/Fishpond.cs
index 9eedb60c..25eddd56 100644
--- a/BetterGenshinImpact/GameTask/AutoFishing/Model/Fishpond.cs
+++ b/BetterGenshinImpact/GameTask/AutoFishing/Model/Fishpond.cs
@@ -25,8 +25,7 @@ public class Fishpond
///
public List Fishes { get; set; } = new();
-
- public Fishpond(IDetectionResult result)
+ public Fishpond(DetectionResult result)
{
foreach (var box in result.Boxes)
{
@@ -159,4 +158,4 @@ public class Fishpond
return result;
}
-}
\ No newline at end of file
+}
diff --git a/BetterGenshinImpact/View/Pages/KeyMouseRecordPage.xaml b/BetterGenshinImpact/View/Pages/KeyMouseRecordPage.xaml
index cd59b044..3f82c7ec 100644
--- a/BetterGenshinImpact/View/Pages/KeyMouseRecordPage.xaml
+++ b/BetterGenshinImpact/View/Pages/KeyMouseRecordPage.xaml
@@ -16,13 +16,13 @@
FontFamily="{StaticResource TextThemeFontFamily}"
Foreground="{DynamicResource TextFillColorPrimaryBrush}"
mc:Ignorable="d">
-
+
-->
-
+
-
+
\ No newline at end of file
diff --git a/Fischless.GameCapture/BitBlt/BitBltCapture.cs b/Fischless.GameCapture/BitBlt/BitBltCapture.cs
index 454a224f..e529c92e 100644
--- a/Fischless.GameCapture/BitBlt/BitBltCapture.cs
+++ b/Fischless.GameCapture/BitBlt/BitBltCapture.cs
@@ -36,7 +36,7 @@ public class BitBltCapture : IGameCapture
Bitmap bitmap = new(width, height);
using System.Drawing.Graphics g = System.Drawing.Graphics.FromImage(bitmap);
var hdcDest = g.GetHdc();
- Gdi32.SafeHDC hdcSrc = User32.GetDC(_hWnd == IntPtr.Zero ? User32.GetDesktopWindow() : _hWnd);
+ var hdcSrc = User32.GetDC(_hWnd == IntPtr.Zero ? User32.GetDesktopWindow() : _hWnd);
Gdi32.StretchBlt(hdcDest, 0, 0, width, height, hdcSrc, x, y, width, height, Gdi32.RasterOperationMode.SRCCOPY);
g.ReleaseHdc();
Gdi32.DeleteDC(hdcDest);
@@ -56,4 +56,4 @@ public class BitBltCapture : IGameCapture
_hWnd = IntPtr.Zero;
IsCapturing = false;
}
-}
\ No newline at end of file
+}
diff --git a/Fischless.GameCapture/Fischless.GameCapture.csproj b/Fischless.GameCapture/Fischless.GameCapture.csproj
index ffa3897d..7b895bae 100644
--- a/Fischless.GameCapture/Fischless.GameCapture.csproj
+++ b/Fischless.GameCapture/Fischless.GameCapture.csproj
@@ -14,11 +14,11 @@
-
-
-
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/Fischless.HotkeyCapture/Fischless.HotkeyCapture.csproj b/Fischless.HotkeyCapture/Fischless.HotkeyCapture.csproj
index 91e6710c..bd52b9cd 100644
--- a/Fischless.HotkeyCapture/Fischless.HotkeyCapture.csproj
+++ b/Fischless.HotkeyCapture/Fischless.HotkeyCapture.csproj
@@ -11,7 +11,7 @@
-
+
diff --git a/Fischless.KeyboardCapture/Fischless.KeyboardCapture.csproj b/Fischless.KeyboardCapture/Fischless.KeyboardCapture.csproj
index 3f8ffa14..c8eaf74b 100644
--- a/Fischless.KeyboardCapture/Fischless.KeyboardCapture.csproj
+++ b/Fischless.KeyboardCapture/Fischless.KeyboardCapture.csproj
@@ -10,8 +10,8 @@
-
-
+
+
diff --git a/Fischless.WindowsInput/Fischless.WindowsInput.csproj b/Fischless.WindowsInput/Fischless.WindowsInput.csproj
index fbb6a48a..81ef8f50 100644
--- a/Fischless.WindowsInput/Fischless.WindowsInput.csproj
+++ b/Fischless.WindowsInput/Fischless.WindowsInput.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/Vision.WindowCapture/Vision.WindowCapture.csproj b/Vision.WindowCapture/Vision.WindowCapture.csproj
index 73f9196f..e4ed849d 100644
--- a/Vision.WindowCapture/Vision.WindowCapture.csproj
+++ b/Vision.WindowCapture/Vision.WindowCapture.csproj
@@ -1,4 +1,4 @@
-
+
net8.0-windows10.0.22621.0
@@ -14,7 +14,7 @@
-
+