自动采集

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

@@ -65,14 +65,15 @@ public class Task_仓库奖励领取 extends BaseTask {
             macro.delay(1000);
         }
 
-        Logger.info("检测体力宝箱");
-        ViewRect 仓库_体力宝箱 = macro.matchLegend("仓库_体力宝箱", 0.5);
-        if (仓库_体力宝箱 == null) {
+        Logger.info("检测体力宝箱/罐头");
+        ViewRect 仓库_体力罐头 = macro.matchLegend("仓库_体力罐头", 0.5);
+        if (仓库_体力罐头 == null) {
             Logger.info("无体力宝箱");
             return;
+        } else {
+            Logger.info("领取体力罐头");
+            macro.mouseLeftClick(仓库_体力罐头);
         }
-        Logger.info("领取体力宝箱");
-        macro.mouseLeftClick(仓库_体力宝箱);
         macro.delay(1000);
     }
 }

src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_定位城镇.java

@@ -56,6 +56,13 @@ public class Task_定位城镇 extends BaseTask {
                     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) {

src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_自动练兵.java

@@ -39,7 +39,7 @@ public class Task_自动练兵 extends BaseTask {
         macro.delay(1000);
 
         Logger.info("检测盾兵");
-        ViewRect[] viewRects2 = macro.waitAndMatchLegends(0.9D, 3, "城镇_完成盾兵", "城镇_空闲盾兵");
+        ViewRect[] viewRects2 = macro.waitAndMatchLegends(0.8D, 3, "城镇_完成盾兵", "城镇_空闲盾兵");
         if (viewRects2 == null) {
             Logger.info("检测失败");
             return;
@@ -134,7 +134,7 @@ public class Task_自动练兵 extends BaseTask {
         macro.delay(1000);
 
         Logger.info("检测矛兵");
-        ViewRect[] viewRects2 = macro.waitAndMatchLegends(0.9D, 3, "城镇_完成矛兵", "城镇_空闲矛兵");
+        ViewRect[] viewRects2 = macro.waitAndMatchLegends(0.8D, 3, "城镇_完成矛兵", "城镇_空闲矛兵");
         if (viewRects2 == null) {
             Logger.info("检测失败");
             return;
@@ -229,7 +229,7 @@ public class Task_自动练兵 extends BaseTask {
         macro.delay(1000);
 
         Logger.info("检测矛兵");
-        ViewRect[] viewRects2 = macro.waitAndMatchLegends(0.9D, 3, "城镇_完成射手", "城镇_空闲射手");
+        ViewRect[] viewRects2 = macro.waitAndMatchLegends(0.8D, 3, "城镇_完成射手", "城镇_空闲射手");
         if (viewRects2 == null) {
             Logger.info("检测失败");
             return;