From ebc2b7b42ee482fbc6370bb9ff93994c6c13670d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=89=E9=B8=AD=E8=9B=8B?= Date: Sun, 10 Nov 2024 01:24:35 +0800 Subject: [PATCH] edit fight end judge 2 --- .../GameTask/AutoFight/AutoFightTask.cs | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/BetterGenshinImpact/GameTask/AutoFight/AutoFightTask.cs b/BetterGenshinImpact/GameTask/AutoFight/AutoFightTask.cs index 9633ae96..331e3911 100644 --- a/BetterGenshinImpact/GameTask/AutoFight/AutoFightTask.cs +++ b/BetterGenshinImpact/GameTask/AutoFight/AutoFightTask.cs @@ -131,13 +131,6 @@ public class AutoFightTask : ISoloTask private async Task CheckFightFinish() { - // 小道具判断 - if (HasFightFlagByGadget(CaptureToRectArea())) - { - _lastFightFlagTime = DateTime.Now; - return false; - } - // YOLO 判断血条和怪物位置 if (HasFightFlagByYolo(CaptureToRectArea())) { @@ -180,12 +173,14 @@ public class AutoFightTask : ISoloTask return dict.ContainsKey("health_bar") || dict.ContainsKey("enemy_identify"); } - private bool HasFightFlagByGadget(ImageRegion imageRegion) - { - // 小道具位置 1920-133,800,60,50 - var gadgetMat = imageRegion.DeriveCrop(AutoFightAssets.Instance.GadgetRect).SrcMat; - var list = ContoursHelper.FindSpecifyColorRects(gadgetMat, new Scalar(225, 220, 225), new Scalar(255, 255, 255)); - // 要大于 gadgetMat 的 1/2 - return list.Any(r => r.Width > gadgetMat.Width / 2 && r.Height > gadgetMat.Height / 2); - } + // 无用 + // [Obsolete] + // private bool HasFightFlagByGadget(ImageRegion imageRegion) + // { + // // 小道具位置 1920-133,800,60,50 + // var gadgetMat = imageRegion.DeriveCrop(AutoFightAssets.Instance.GadgetRect).SrcMat; + // var list = ContoursHelper.FindSpecifyColorRects(gadgetMat, new Scalar(225, 220, 225), new Scalar(255, 255, 255)); + // // 要大于 gadgetMat 的 1/2 + // return list.Any(r => r.Width > gadgetMat.Width / 2 && r.Height > gadgetMat.Height / 2); + // } }