自动采集

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

@@ -863,7 +863,7 @@ public abstract class JMacro {
                     }
                 }
             }
-            return null;
+            return new ViewRect[legends.length];
         }, seconds, TimeUnit.SECONDS);
     }
 

src/main/java/xyz/wbsite/jmacro/wjdr/MacroForWJDR.java

@@ -80,15 +80,15 @@ public class MacroForWJDR extends JMacro {
                 // 任意界面优先返回城镇
                 new Task_定位城镇(this, focusRect).run();
                 // 可按优先级排序以下任务
-                new Task_联盟互助(this, focusRect).run();
-                new Task_收留避难者(this, focusRect).run();
+//                new Task_联盟互助(this, focusRect).run();
+//                new Task_收留避难者(this, focusRect).run();
                 new Task_自动野怪(this, focusRect).run();
-//                new Task_自动采矿(this, focusRect).run();
+                new Task_自动采矿(this, focusRect).run();
 //                new Task_英雄招募领取(this, focusRect).run();
 //                new Task_任务奖励领取(this, focusRect).run();
 //                new Task_探险奖励领取(this, focusRect).run();
 //                new Task_邮件奖励领取(this, focusRect).run();
-                new Task_仓库奖励领取(this, focusRect).run();
+//                new Task_仓库奖励领取(this, focusRect).run();
             }
         } else {
             Logger.info("当前时间为非工作时间，休眠待命！");

src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_任务奖励领取.java

@@ -146,7 +146,7 @@ public class Task_任务奖励领取 extends BaseTask {
             macro.delay(500);
             ViewRect 领取;
             do {
-                领取 = macro.matchLegend("任务奖励_领取按钮", 0.9);
+                领取 = macro.matchLegend("任务奖励_领取按钮", 0.5);
                 if (领取 != null) {
                     macro.mouseLeftClick(领取);
                     macro.delay(1000);
@@ -162,7 +162,7 @@ public class Task_任务奖励领取 extends BaseTask {
             macro.delay(500);
             ViewRect 领取;
             do {
-                领取 = macro.matchLegend("任务奖励_领取按钮", 0.9);
+                领取 = macro.matchLegend("任务奖励_领取按钮", 0.5);
                 if (领取 != null) {
                     macro.mouseLeftClick(领取);
                     ViewRect 任务奖励_点击退出 = macro.waitAndMatchLegend("任务奖励_点击退出", 0.5, 5);

src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_自动采矿.java

@@ -224,8 +224,9 @@ public class Task_自动采矿 extends BaseTask {
         macro.mouseLeftClick(野外_资源搜索);
 
         macro.delayUnstable(1500);
-        ViewRect 采集 = macro.waitAndMatchLegend("野外_资源采集", 0.9);
+        ViewRect 采集 = macro.waitAndMatchLegend("野外_资源采集", 0.8);
         if (采集 != null) {
+            Logger.info("点击采集");
             macro.mouseLeftClick(采集);
 
             ViewRect[] viewRects = macro.waitAndMatchLegends(macro.of("野外_资源出征", "野外_资源无对队列", "野外_资源无士兵"), 0.9);

src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_英雄招募领取.java

@@ -61,7 +61,7 @@ public class Task_英雄招募领取 extends BaseTask {
                 macro.delay(1000);
 
                 Logger.info("检测任意位置继续");
-                ViewRect 点击任意位置退出 = macro.waitAndMatchLegend("英雄招募_点击任意位置退出", 0.5, 3);
+                ViewRect 点击任意位置退出 = macro.waitAndMatchLegend("英雄招募_点击任意位置退出", 0.25, 3);
                 if (点击任意位置退出 != null) {
                     Logger.info("点击任意位置退出");
                     macro.mouseLeftClick(点击任意位置退出);

src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_邮件奖励领取.java

@@ -73,8 +73,8 @@ public class Task_邮件奖励领取 extends BaseTask {
         macro.delay(1000);
 
         // 战争
-        if (macro.hasColor(macro.of(84,65,106,78), numColor)) {
-            macro.mouseLeftClick(macro.of(198,71));
+        if (macro.hasColor(macro.of(92,64,111,77), numColor)) {
+            macro.mouseLeftClick(macro.of(99,71));
             macro.delay(500);
 
             ViewRect 一键已读领取 = macro.waitAndMatchLegend("一键已读领取", 0.9, 2);
@@ -104,7 +104,7 @@ public class Task_邮件奖励领取 extends BaseTask {
             }
             macro.mouseLeftClick(一键已读领取);
 
-            ViewRect 点击任意位置退出 = macro.waitAndMatchLegend("点击任意位置退出", 0.5, 2);
+            ViewRect 点击任意位置退出 = macro.waitAndMatchLegend("邮件_点击任意位置退出", 0.5, 2);
             if (点击任意位置退出 != null) {
                 Logger.info("点击任意位置退出");
                 macro.mouseLeftClick(点击任意位置退出);