fix trigger point

babalae · Nov 20, 2023 · 70c1339 · 70c1339
1 parent 6a7123f
commit 70c1339
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 3 deletions.
diff --git a/BetterGenshinImpact/GameTask/AutoFishing/AutoFishingTrigger.cs b/BetterGenshinImpact/GameTask/AutoFishing/AutoFishingTrigger.cs
@@ -74,15 +74,18 @@ public void Init()
 
         private Rect _fishBoxRect = Rect.Empty;
 
+        private DateTime _prevExecute = DateTime.MinValue;
+
         public void OnCapture(CaptureContent content)
         {
             // 进入独占的判定
             if (!IsExclusive)
             {
-                if (!content.IsReachInterval(TimeSpan.FromMilliseconds(300)))
+                if ((DateTime.Now - _prevExecute).TotalMilliseconds <= 200)
                 {
                     return;
                 }
+                _prevExecute = DateTime.Now;
 
                 // 进入独占模式判断
                 CheckFishingUserInterface(content);
@@ -96,10 +99,11 @@ public void OnCapture(CaptureContent content)
                 // 进入钓鱼界面先尝试获取钓鱼框的位置
                 if (_fishBoxRect.Width == 0)
                 {
-                    if (!content.IsReachInterval(TimeSpan.FromMilliseconds(200)))
+                    if ((DateTime.Now - _prevExecute).TotalMilliseconds <= 200)
                     {
                         return;
                     }
+                    _prevExecute = DateTime.Now;
 
                     _fishBoxRect = GetFishBoxArea(content.CaptureRectArea.SrcMat);
                     CheckFishingUserInterface(content);

diff --git a/BetterGenshinImpact/GameTask/AutoSkip/AutoSkipTrigger.cs b/BetterGenshinImpact/GameTask/AutoSkip/AutoSkipTrigger.cs
@@ -50,12 +50,15 @@ public void Init()
     /// </summary>
     private DateTime _prevPlayingTime = DateTime.MinValue;
 
+    private DateTime _prevExecute = DateTime.MinValue;
+
     public void OnCapture(CaptureContent content)
     {
-        if (content.IsReachInterval(TimeSpan.FromMilliseconds(200)))
+        if ((DateTime.Now - _prevExecute).TotalMilliseconds <= 200)
         {
             return;
         }
+        _prevExecute = DateTime.Now;
 
         var config = TaskContext.Instance().Config.AutoSkipConfig;
         var assetScale = TaskContext.Instance().SystemInfo.AssetScale;

diff --git a/BetterGenshinImpact/GameTask/CaptureContent.cs b/BetterGenshinImpact/GameTask/CaptureContent.cs
@@ -37,9 +37,16 @@ public CaptureContent(Bitmap srcBitmap, int frameIndex, double interval, TaskTri
     /// <summary>
     /// 达到了什么时间间隔
     /// 最大MaxFrameIndexSecond秒
+    ///
+    /// 这代码有bug
+    /// 这代码有bug
+    /// 这代码有bug
+    ///
+    /// 不用了
     /// </summary>
     /// <param name="interval"></param>
     /// <returns></returns>
+    [Obsolete]
     public bool IsReachInterval(TimeSpan interval)
     {
         if (interval.TotalSeconds > MaxFrameIndexSecond)

diff --git a/BetterGenshinImpact/GameTask/Macro/QuickEnhanceArtifactMacro.cs b/BetterGenshinImpact/GameTask/Macro/QuickEnhanceArtifactMacro.cs
@@ -34,6 +34,7 @@ public static void Done()
         Thread.Sleep(100);
         // 强化菜单 150x220
         clickOffset.Click(150, 220);
+        Thread.Sleep(100);
         // 移动回快捷放入 #30
         clickOffset.Move(1760, 770);
     }

diff --git a/BetterGenshinImpact/User/pick_black_lists.json b/BetterGenshinImpact/User/pick_black_lists.json
@@ -1,5 +1,6 @@
 [
     "钓莓",
+    "钓查",
     "调蟹",
     "查",
     "子",