From ee358ddd370a30f793a2765189da0c425084517e Mon Sep 17 00:00:00 2001
From: wangbing <Wb295490665>
Date: Sun, 15 Sep 2024 10:09:09 +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

---
 .../jmacro/wjdr/task/Task_定位城镇.java   | 35 +++++++++++--------
 1 file changed, 21 insertions(+), 14 deletions(-)

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 ca77b3c..96b7dff 100644
--- a/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_定位城镇.java
+++ b/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_定位城镇.java
@@ -28,6 +28,13 @@ public class Task_定位城镇 extends BaseTask {
                     Logger.info("返回城镇");
                 }
             }
+            {// 城镇_挂机收益
+                ViewRect rect = macro.matchLegend("城镇_挂机收益", 0.9);
+                if (rect != null) {
+                    macro.mouseLeftClick(rect);
+                    Logger.info("返回城镇");
+                }
+            }
             {// 探险返回
                 ViewRect rect = macro.matchLegend("探险_返回", 0.9);
                 if (rect != null) {
@@ -56,20 +63,20 @@ public class Task_定位城镇 extends BaseTask {
                     Logger.info("关闭侧面板");
                 }
             }
-            { // 定位弹框，关闭弹框
-                ViewRect rect = macro.findLegend(macro.of(437, 28, 491, 106), "城镇_礼包", 0.7);
-                if (rect != null) {
-                    macro.mouseLeftClick(rect);
-                    Logger.info("关闭充值广告弹框");
-                }
-            }
-            { // 定位弹框2
-                ViewRect rect = macro.findLegend(macro.of(368,6, 524,191), "城镇_礼包2", 0.7);
-                if (rect != null) {
-                    macro.mouseLeftClick(rect);
-                    Logger.info("关闭充值广告弹框");
-                }
-            }
+//            { // 定位弹框，关闭弹框
+//                ViewRect rect = macro.findLegend(macro.of(437, 28, 491, 106), "城镇_礼包", 0.7);
+//                if (rect != null) {
+//                    macro.mouseLeftClick(rect);
+//                    Logger.info("关闭充值广告弹框");
+//                }
+//            }
+//            { // 定位弹框2
+//                ViewRect rect = macro.findLegend(macro.of(368,6, 524,191), "城镇_礼包2", 0.7);
+//                if (rect != null) {
+//                    macro.mouseLeftClick(rect);
+//                    Logger.info("关闭充值广告弹框");
+//                }
+//            }
             {// 定位离线收益
                 ViewRect rect = macro.matchLegend("城镇_离线收益", 0.9);
                 if (rect != null) {