自动采集

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

@@ -89,6 +89,12 @@ 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();
 
@@ -98,11 +104,11 @@ 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();
             }
 
             Logger.info("休眠1分钟...");

src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_仓库奖励领取.java

@@ -33,6 +33,27 @@ public class Task_仓库奖励领取 extends BaseTask {
         macro.delay(1000);
 
         Logger.info("滑动到底部");
-        macro.mouseLeftDrag(macro.of(158,626), macro.of(163,231), true);
+        macro.mouseLeftDrag(macro.of(158, 626), macro.of(163, 231), true);
+
+        ViewRect 仓库_补给完成 = macro.matchLegend("仓库_补给完成", 0.9);
+        if (仓库_补给完成 != null) {
+            Logger.info("仓库补给完成，去领取");
+            macro.mouseLeftClick(仓库_补给完成);
+
+
+            ViewRect 仓库_距离下个包裹 = macro.matchLegend("仓库_距离下个包裹", 0.5);
+
+            if (仓库_距离下个包裹 != null) {
+                macro.mouseLeftClick(仓库_距离下个包裹);
+            }
+            return;
+        }
+
+        Logger.info("关闭面板");
+        ViewRect rect = macro.matchLegend("城镇_关闭面板", 0.6);
+        if (rect == null) {
+            return;
+        }
+        macro.mouseLeftClick(rect);
     }
 }