From a06ec71b4e43c5cb207fa0a4b99221c094330aa2 Mon Sep 17 00:00:00 2001
From: wangbing <wangbing@wbsite.xyz>
Date: Fri, 20 Sep 2024 09:09:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/xyz/wbsite/jmacro/JMacro.java           |  5 +++--
 .../jmacro/util/{AnimateUtil.java => ValueUtil.java}  | 11 ++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)
 rename src/main/java/xyz/wbsite/jmacro/util/{AnimateUtil.java => ValueUtil.java} (81%)

diff --git a/src/main/java/xyz/wbsite/jmacro/JMacro.java b/src/main/java/xyz/wbsite/jmacro/JMacro.java
index 5c7fb52..dc609dd 100644
--- a/src/main/java/xyz/wbsite/jmacro/JMacro.java
+++ b/src/main/java/xyz/wbsite/jmacro/JMacro.java
@@ -7,6 +7,7 @@ import xyz.wbsite.jmacro.base.Legend;
 import xyz.wbsite.jmacro.base.ViewColor;
 import xyz.wbsite.jmacro.base.ViewPoint;
 import xyz.wbsite.jmacro.base.ViewRect;
+import xyz.wbsite.jmacro.util.ValueUtil;
 import xyz.wbsite.jmacro.util.ColorUtil;
 import xyz.wbsite.jmacro.util.ImageUtil;
 import xyz.wbsite.jmacro.util.Logger;
@@ -146,11 +147,11 @@ public abstract class JMacro {
             times = Math.min(times, 10);
             // 分times次移动到指定点
             for (int i = 1; i <= times; i++) {
-                float d = i * 1.0f / times;
+                double d = ValueUtil.easeOut(i * 1.0D / times);
                 int dx = (int) (startX + (endX - startX) * d);
                 int dy = (int) (startY + (endY - startY) * d);
                 robot.mouseMove(dx, dy);
-                delay(RandomUtil.randomInt(interval - 5, interval + 5));
+                delay(RandomUtil.randomInt(interval - 3, interval + 3));
             }
         } else {
             robot.mouseMove(endX, endY);
diff --git a/src/main/java/xyz/wbsite/jmacro/util/AnimateUtil.java b/src/main/java/xyz/wbsite/jmacro/util/ValueUtil.java
similarity index 81%
rename from src/main/java/xyz/wbsite/jmacro/util/AnimateUtil.java
rename to src/main/java/xyz/wbsite/jmacro/util/ValueUtil.java
index 4da008a..c97b956 100644
--- a/src/main/java/xyz/wbsite/jmacro/util/AnimateUtil.java
+++ b/src/main/java/xyz/wbsite/jmacro/util/ValueUtil.java
@@ -1,6 +1,15 @@
 package xyz.wbsite.jmacro.util;
 
-public class AnimateUtil {
+/**
+ * 值计算工具
+ * <p>
+ * 一般有缓动变化才需要值计算
+ *
+ * @author wangbing
+ * @version 0.0.1
+ * @since 1.8
+ */
+public class ValueUtil {
 
     /**
      * 由快到慢