From 818b94c662a8a8e81b38bf32d7de2de51322d96b Mon Sep 17 00:00:00 2001
From: wangbing <Wb295490665>
Date: Fri, 20 Sep 2024 23:23:17 +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

---
 .../xyz/wbsite/jmacro/wjdr/MacroForWJDR.java  |  7 +++---
 .../jmacro/wjdr/task/Task_定位城镇.java   |  1 +
 .../jmacro/wjdr/task/Task_联盟互助.java   | 23 +++++++++++++++++++
 3 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_联盟互助.java

diff --git a/src/main/java/xyz/wbsite/jmacro/wjdr/MacroForWJDR.java b/src/main/java/xyz/wbsite/jmacro/wjdr/MacroForWJDR.java
index 2fe0c6a..c7bced7 100644
--- a/src/main/java/xyz/wbsite/jmacro/wjdr/MacroForWJDR.java
+++ b/src/main/java/xyz/wbsite/jmacro/wjdr/MacroForWJDR.java
@@ -74,15 +74,14 @@ public class MacroForWJDR extends JMacro {
             }
 
             Logger.info("启动循环任务");
-            int count = 1;
+            int count = 10;
             while (JMainService.getInstance().run && count > 0) {
                 count--;
                 // 任意界面优先返回城镇
                 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();
@@ -105,7 +104,7 @@ public class MacroForWJDR extends JMacro {
             mouseLeftClick(无尽);
         }
 
-        int randomInt = RandomUtil.randomInt(5, 20);
+        int randomInt = RandomUtil.randomInt(5, 10);
         Logger.info("休眠中{}分钟", randomInt);
         delay(randomInt * 60 * 1000);
     }
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 dad12ed..389a81c 100644
--- a/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_定位城镇.java
+++ b/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_定位城镇.java
@@ -91,6 +91,7 @@ public class Task_定位城镇 extends BaseTask {
                     Logger.info("关闭离线收益弹框");
                 }
             }
+            macro.matchLegendAndClick("城镇_欢迎回来",0.9);
             {// 无行军队列弹框
                 ViewRect rect = macro.matchLegend("野外_资源无对队列", 0.9);
                 if (rect != null) {
diff --git a/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_联盟互助.java b/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_联盟互助.java
new file mode 100644
index 0000000..80a7c9b
--- /dev/null
+++ b/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_联盟互助.java
@@ -0,0 +1,23 @@
+package xyz.wbsite.jmacro.wjdr.task;
+
+import xyz.wbsite.jmacro.JMacro;
+import xyz.wbsite.jmacro.base.ViewRect;
+import xyz.wbsite.jmacro.util.Logger;
+
+public class Task_联盟互助 extends BaseTask {
+
+    public Task_联盟互助(JMacro macro, ViewRect viewRect) {
+        super(macro, viewRect);
+    }
+
+    @Override
+    public void task(JMacro macro, ViewRect viewRect) {
+        {// 联盟互助
+            ViewRect rect = macro.matchLegend("城镇_互助", 0.9);
+            if (rect != null) {
+                macro.mouseLeftClick(rect);
+                Logger.info("互助");
+            }
+        }
+    }
+}