上传备份

src/main/java/xyz/wbsite/jmacro/JMacro.java

@@ -202,8 +202,8 @@ public abstract class JMacro {
      * @param region 区域
      */
     public void mouseLeftClick(Region region) {
-        Mouse.move(region.getCenter());
+        mouseMove(region.getCenter());
-        Mouse.at().click();
+        mouseLeftClick();
     }
 
     /**
@@ -212,8 +212,8 @@ public abstract class JMacro {
      * @param location 坐标点
      */
     public void mouseLeftClick(Location location) {
-        Mouse.move(location);
+        mouseMove(location);
-        Mouse.at().click();
+        mouseLeftClick();
     }
 
     /**
@@ -227,43 +227,50 @@ public abstract class JMacro {
      * 鼠标左键双击
      */
     public void mouseLeftDoubleClick(Region region) {
-        Mouse.move(region.getCenter());
+        mouseMove(region.getCenter());
-        Mouse.at().doubleClick();
+        mouseLeftDoubleClick();
     }
 
     /**
      * 鼠标左键双击
      */
     public void mouseLeftDoubleClick(Location location) {
-        Mouse.move(location);
+        mouseMove(location);
-        Mouse.at().doubleClick();
+        mouseLeftDoubleClick();
     }
 
     /**
      * 鼠标右键单击
-     *
-     * @param region 区域
      */
-    public void mouseRightClick(Region region) {
+    public void mouseRightClick() {
-        region.getCenter().rightClick();
+        mouseRightClick(Mouse.at());
     }
 
     /**
      * 鼠标右键单击
      *
-     * @param location 坐标点
+     * @param region 区域
      */
-    public void mouseRightClick(Location location) {
+    public void mouseRightClick(Region region) {
-        location.rightClick();
+        // 随机移动到区域中心附近（而非直接移动到中心）
+        Location center = region.getCenter();
+        // 得到随机移动到区域中心附近的半径
+        int radius = (int) (Math.min(region.getW(), region.getH()) / 2 * 0.9f);
+        int x = center.getX() + RandomUtil.randomInt(-radius, radius);
+        int y = center.getY() + RandomUtil.randomInt(-radius, radius);
+        mouseMove(new Location(x, y));
+        mouseRightClick();
     }
 
     /**
      * 鼠标右键单击
+     *
+     * @param location 坐标点
      */
-    public void mouseRightClick() {
+    public void mouseRightClick(Location location) {
-        mouseRightClick(Mouse.at());
+        mouseMove(location);
+        mouseRightClick();
     }
-
     /**
      * 插入剪贴板
      */