From 192b1f538ce2b81c4ab3b2b975b281a4904a2ca5 Mon Sep 17 00:00:00 2001
From: wangbing <Wb295490665>
Date: Mon, 9 Sep 2024 22:46:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E9=87=87=E9=9B=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 legend/仓库_距离下个包裹#L205,786.png | Bin 0 -> 3100 bytes
 .../xyz/wbsite/jmacro/wjdr/MacroForWJDR.java  |  14 ++++++++---
 .../wjdr/task/Task_仓库奖励领取.java    |  23 +++++++++++++++++-
 3 files changed, 32 insertions(+), 5 deletions(-)
 create mode 100644 legend/仓库_距离下个包裹#L205,786.png

diff --git a/legend/仓库_距离下个包裹#L205,786.png b/legend/仓库_距离下个包裹#L205,786.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7f8809977026b8aec721e580c782417e8019a42
GIT binary patch
literal 3100
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

literal 0
HcmV?d00001

diff --git a/src/main/java/xyz/wbsite/jmacro/wjdr/MacroForWJDR.java b/src/main/java/xyz/wbsite/jmacro/wjdr/MacroForWJDR.java
index 81e1087..3fa01e4 100644
--- a/src/main/java/xyz/wbsite/jmacro/wjdr/MacroForWJDR.java
+++ b/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分钟...");
diff --git a/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_仓库奖励领取.java b/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_仓库奖励领取.java
index 4d5996e..9ea8e45 100644
--- a/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_仓库奖励领取.java
+++ b/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);
     }
 }