自动采集

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

@@ -140,8 +140,8 @@ public abstract class JMacro {
             double absX = Math.abs(startX - endX);
             double absY = Math.abs(startY - endY);
             double absZ = Math.sqrt(Math.pow(absX, 2) + Math.pow(absY, 2));
-            int times = (int) (absZ / 10 + (absZ % 10 > 0 ? 1 : 0));
-            int interval = Math.max(500 / times, 10);
+            int times = (int) (absZ / 15 + (absZ % 15 > 0 ? 1 : 0));
+            int interval = (int) Math.max((absZ/4) / times, 10);
 
             times = Math.min(times, 10);
             // 分times次移动到指定点

src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_定位城镇.java

@@ -63,20 +63,20 @@ public class Task_定位城镇 extends BaseTask {
                     Logger.info("关闭侧面板");
                 }
             }
-//            { // 定位弹框，关闭弹框
-//                ViewRect rect = macro.findLegend(macro.of(437, 28, 491, 106), "城镇_礼包", 0.7);
-//                if (rect != null) {
-//                    macro.mouseLeftClick(rect);
-//                    Logger.info("关闭充值广告弹框");
-//                }
-//            }
-//            { // 定位弹框2
-//                ViewRect rect = macro.findLegend(macro.of(368,6, 524,191), "城镇_礼包2", 0.7);
-//                if (rect != null) {
-//                    macro.mouseLeftClick(rect);
-//                    Logger.info("关闭充值广告弹框");
-//                }
-//            }
+            { // 定位弹框，关闭弹框
+                ViewRect rect = macro.findLegend(macro.of(436,54,465,162), "城镇_礼包", 0.7);
+                if (rect != null) {
+                    macro.mouseLeftClick(rect);
+                    Logger.info("关闭充值广告弹框");
+                }
+            }
+            { // 定位弹框2
+                ViewRect rect = macro.findLegend(macro.of(436,54,465,162), "城镇_礼包2", 0.7);
+                if (rect != null) {
+                    macro.mouseLeftClick(rect);
+                    Logger.info("关闭充值广告弹框");
+                }
+            }
             {// 定位离线收益
                 ViewRect rect = macro.matchLegend("城镇_离线收益", 0.9);
                 if (rect != null) {