From 179535dad0982b28b3633220b43e3ab86718103a Mon Sep 17 00:00:00 2001
From: wangbing <Wb295490665>
Date: Mon, 16 Sep 2024 11:01:35 +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

---
 src/main/java/xyz/wbsite/jmacro/wjdr/MacroForWJDR.java     | 2 +-
 .../xyz/wbsite/jmacro/wjdr/task/Task_定位城镇.java     | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/xyz/wbsite/jmacro/wjdr/MacroForWJDR.java b/src/main/java/xyz/wbsite/jmacro/wjdr/MacroForWJDR.java
index 9ce980b..62d5ce9 100644
--- a/src/main/java/xyz/wbsite/jmacro/wjdr/MacroForWJDR.java
+++ b/src/main/java/xyz/wbsite/jmacro/wjdr/MacroForWJDR.java
@@ -95,8 +95,8 @@ 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();
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 fbce08e..751b68f 100644
--- a/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_定位城镇.java
+++ b/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_定位城镇.java
@@ -63,6 +63,13 @@ public class Task_定位城镇 extends BaseTask {
                     Logger.info("关闭侧面板");
                 }
             }
+            { // 定位弹框，关闭弹框
+                ViewRect rect = macro.findLegend(macro.of(450,36,484,76), "城镇_礼包", 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) {