From bc5ae1177c6a52a9c0f5c59966dbc8124bd85714 Mon Sep 17 00:00:00 2001
From: Takaranoao <takaranoao@gmail.com>
Date: Sat, 5 Apr 2025 12:15:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DUseSkill=E8=B0=83=E7=94=A8?=
 =?UTF-8?q?=E4=B9=8B=E5=90=8E=E6=B2=A1=E6=9C=89=E6=AD=A3=E7=A1=AE=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8cd=E8=AE=A1=E7=AE=97=E5=87=BD=E6=95=B0=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=B3=A8=E9=87=8A?=
 =?UTF-8?q?=20(#1400)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BetterGenshinImpact/GameTask/AutoFight/Model/Avatar.cs   | 9 +++++----
 .../AutoPathing/Handler/ElementalCollectHandler.cs       | 3 ---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/BetterGenshinImpact/GameTask/AutoFight/Model/Avatar.cs b/BetterGenshinImpact/GameTask/AutoFight/Model/Avatar.cs
index cc18afaa..1fbfb9ff 100644
--- a/BetterGenshinImpact/GameTask/AutoFight/Model/Avatar.cs
+++ b/BetterGenshinImpact/GameTask/AutoFight/Model/Avatar.cs
@@ -83,8 +83,8 @@ public class Avatar
     public CombatScenes CombatScenes { get; set; }
 
     public static string? LastActiveAvatar { get; internal set; } = null;
-    
-    
+
+
     public Avatar(CombatScenes combatScenes, string name, int index, Rect nameRect, double manualSkillCd = -1)
     {
         CombatScenes = combatScenes;
@@ -427,7 +427,7 @@ public class Avatar
 
             var region = CaptureToRectArea();
             ThrowWhenDefeated(region, Ct); // 检测是不是要跑神像
-            var cd = GetSkillCurrentCd(region);
+            var cd = AfterUseSkill(region);
             if (cd > 0)
             {
                 Logger.LogInformation(hold ? "{Name} 长按元素战技，cd:{Cd}" : "{Name} 点按元素战技，cd:{Cd}", Name, cd);
@@ -437,7 +437,8 @@ public class Avatar
     }
 
     /// <summary>
-    /// 使用完元素战技的回调,注意,不会在这里检测是不是需要跑七天神像
+    /// 使用完元素战技的回调,注意,不会在这里检测是不是需要跑七天神像 <br/>
+    /// UseSkill 方法内会调用，如果没有使用UseSkill但是释放了技能之后记得调用一下这个方法
     /// </summary>
     /// <returns>当前技能CD</returns>
     public double AfterUseSkill(ImageRegion? givenRegion = null)
diff --git a/BetterGenshinImpact/GameTask/AutoPathing/Handler/ElementalCollectHandler.cs b/BetterGenshinImpact/GameTask/AutoPathing/Handler/ElementalCollectHandler.cs
index bff7de2d..4deeecfe 100644
--- a/BetterGenshinImpact/GameTask/AutoPathing/Handler/ElementalCollectHandler.cs
+++ b/BetterGenshinImpact/GameTask/AutoPathing/Handler/ElementalCollectHandler.cs
@@ -3,8 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using BetterGenshinImpact.Core.Config;
-using BetterGenshinImpact.GameTask.AutoFight.Config;
 using BetterGenshinImpact.GameTask.AutoGeniusInvokation.Model;
 using BetterGenshinImpact.GameTask.AutoPathing.Model;
 using Microsoft.Extensions.Logging;
@@ -50,7 +48,6 @@ public class ElementalCollectHandler(ElementalType elementalType) : IActionHandl
 
                     await combatScenesAvatar.WaitSkillCd(ct);
                     combatScenesAvatar.UseSkill();
-                    elementalCollectAvatar.LastUseSkillTime = DateTime.UtcNow;
                 }
             }
             else