From 8323b3e0fcf7e72baa8e02f8a2c8b995f153a08e Mon Sep 17 00:00:00 2001 From: wangbing Date: Sat, 14 Sep 2024 15:22:18 +0800 Subject: [PATCH 1/2] =?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 | 36 ++++++++++++++----- 1 file changed, 27 insertions(+), 9 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 7cbe7db..84ec11b 100644 --- a/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_自动练兵.java +++ b/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_自动练兵.java @@ -48,6 +48,7 @@ public class Task_自动练兵 extends BaseTask { Logger.info("训练完成，去领取"); macro.mouseLeftClick(viewRects2[0]); macro.delay(1000); + Logger.info("点击领取"); macro.mouseLeftClick(macro.of(268, 431)); macro.delay(1000); @@ -63,7 +64,7 @@ public class Task_自动练兵 extends BaseTask { Logger.info("检测任意位置继续"); ViewRect 兵营_任意位置继续 = macro.waitAndMatchLegend("兵营_任意位置继续", 0.9, 2); if (兵营_任意位置继续 != null) { - Logger.error("点击继续"); + Logger.info("点击继续"); macro.mouseLeftClick(兵营_任意位置继续); macro.delay(1500); } @@ -71,14 +72,16 @@ public class Task_自动练兵 extends BaseTask { ViewRect 兵营_训练 = macro.waitAndMatchLegend("兵营_训练", 0.9, 2); if (兵营_训练 == null) { Logger.error("训练失败，未检测到兵营训练"); + return; } - Logger.error("确认训练"); + Logger.info("确认训练"); macro.mouseLeftClick(兵营_训练); macro.delay(1000); ViewRect 兵营_返回 = macro.matchLegend("兵营_返回", 0.9D); if (兵营_返回 == null) { Logger.error("兵营返回失败"); + return; } macro.mouseLeftClick(兵营_返回); macro.delay(1000); @@ -86,18 +89,20 @@ public class Task_自动练兵 extends BaseTask { if (viewRects2[1] != null) { Logger.info("兵营空闲，去练兵"); macro.mouseLeftClick(viewRects2[1]); + macro.delay(1000); Logger.info("点击训练"); macro.mouseLeftClick(macro.of(355, 632)); macro.delay(1000); - Logger.error("确认训练"); + Logger.info("确认训练"); macro.mouseLeftClick(macro.of(396, 885)); macro.delay(1000); ViewRect 兵营_返回 = macro.matchLegend("兵营_返回", 0.9D); if (兵营_返回 == null) { Logger.error("兵营返回失败"); + return; } macro.mouseLeftClick(兵营_返回); macro.delay(1000); @@ -109,6 +114,7 @@ public class Task_自动练兵 extends BaseTask { return; } macro.mouseLeftClick(rect); + macro.delay(1000); } } @@ -143,6 +149,7 @@ public class Task_自动练兵 extends BaseTask { Logger.info("训练完成，去领取"); macro.mouseLeftClick(viewRects2[0]); macro.delay(1000); + Logger.info("点击领取"); macro.mouseLeftClick(macro.of(268, 431)); macro.delay(1000); @@ -158,7 +165,7 @@ public class Task_自动练兵 extends BaseTask { Logger.info("检测任意位置继续"); ViewRect 兵营_任意位置继续 = macro.waitAndMatchLegend("兵营_任意位置继续", 0.9, 2); if (兵营_任意位置继续 != null) { - Logger.error("点击继续"); + Logger.info("点击继续"); macro.mouseLeftClick(兵营_任意位置继续); macro.delay(1500); } @@ -166,14 +173,16 @@ public class Task_自动练兵 extends BaseTask { ViewRect 兵营_训练 = macro.waitAndMatchLegend("兵营_训练", 0.9, 2); if (兵营_训练 == null) { Logger.error("训练失败，未检测到兵营训练"); + return; } - Logger.error("确认训练"); + Logger.info("确认训练"); macro.mouseLeftClick(兵营_训练); macro.delay(1000); ViewRect 兵营_返回 = macro.matchLegend("兵营_返回", 0.9D); if (兵营_返回 == null) { Logger.error("兵营返回失败"); + return; } macro.mouseLeftClick(兵营_返回); macro.delay(1000); @@ -181,18 +190,20 @@ public class Task_自动练兵 extends BaseTask { if (viewRects2[1] != null) { Logger.info("兵营空闲，去练兵"); macro.mouseLeftClick(viewRects2[1]); + macro.delay(1000); Logger.info("点击训练"); macro.mouseLeftClick(macro.of(355, 632)); macro.delay(1000); - Logger.error("确认训练"); + Logger.info("确认训练"); macro.mouseLeftClick(macro.of(396, 885)); macro.delay(1000); ViewRect 兵营_返回 = macro.matchLegend("兵营_返回", 0.9D); if (兵营_返回 == null) { Logger.error("兵营返回失败"); + return; } macro.mouseLeftClick(兵营_返回); macro.delay(1000); @@ -201,9 +212,11 @@ public class Task_自动练兵 extends BaseTask { Logger.info("关闭面板"); ViewRect rect = macro.matchLegend("城镇_关闭面板", 0.6); if (rect == null) { + Logger.error("关闭面板失败"); return; } macro.mouseLeftClick(rect); + macro.delay(1000); } } @@ -238,6 +251,7 @@ public class Task_自动练兵 extends BaseTask { Logger.info("训练完成，去领取"); macro.mouseLeftClick(viewRects2[0]); macro.delay(1000); + Logger.info("点击领取"); macro.mouseLeftClick(macro.of(268, 431)); macro.delay(1000); @@ -253,7 +267,7 @@ public class Task_自动练兵 extends BaseTask { Logger.info("检测任意位置继续"); ViewRect 兵营_任意位置继续 = macro.waitAndMatchLegend("兵营_任意位置继续", 0.9, 2); if (兵营_任意位置继续 != null) { - Logger.error("点击继续"); + Logger.info("点击继续"); macro.mouseLeftClick(兵营_任意位置继续); macro.delay(1500); } @@ -262,13 +276,14 @@ public class Task_自动练兵 extends BaseTask { if (兵营_训练 == null) { Logger.error("训练失败，未检测到兵营训练"); } - Logger.error("确认训练"); + Logger.info("确认训练"); macro.mouseLeftClick(兵营_训练); macro.delay(1000); ViewRect 兵营_返回 = macro.matchLegend("兵营_返回", 0.9D); if (兵营_返回 == null) { Logger.error("兵营返回失败"); + return; } macro.mouseLeftClick(兵营_返回); macro.delay(1000); @@ -276,18 +291,20 @@ public class Task_自动练兵 extends BaseTask { if (viewRects2[1] != null) { Logger.info("兵营空闲，去练兵"); macro.mouseLeftClick(viewRects2[1]); + macro.delay(1000); Logger.info("点击训练"); macro.mouseLeftClick(macro.of(355, 632)); macro.delay(1000); - Logger.error("确认训练"); + Logger.info("确认训练"); macro.mouseLeftClick(macro.of(396, 885)); macro.delay(1000); ViewRect 兵营_返回 = macro.matchLegend("兵营_返回", 0.9D); if (兵营_返回 == null) { Logger.error("兵营返回失败"); + return; } macro.mouseLeftClick(兵营_返回); macro.delay(1000); @@ -299,6 +316,7 @@ public class Task_自动练兵 extends BaseTask { return; } macro.mouseLeftClick(rect); + macro.delay(1000); } } } From c103ce8350890a4928c309acec4ed8c268c76365 Mon Sep 17 00:00:00 2001 From: wangbing Date: Sat, 14 Sep 2024 15:28:32 +0800 Subject: [PATCH 2/2] =?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 | 57 ++++++++++++++++++- 1 file changed, 54 insertions(+), 3 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 84ec11b..7feeaf8 100644 --- a/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_自动练兵.java +++ b/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_自动练兵.java @@ -91,12 +91,29 @@ public class Task_自动练兵 extends BaseTask { macro.mouseLeftClick(viewRects2[1]); macro.delay(1000); + Logger.info("点击兵营"); + macro.mouseLeftClick(macro.of(268, 431)); + macro.delay(1000); + Logger.info("点击训练"); macro.mouseLeftClick(macro.of(355, 632)); macro.delay(1000); + Logger.info("检测任意位置继续"); + ViewRect 兵营_任意位置继续 = macro.waitAndMatchLegend("兵营_任意位置继续", 0.9, 2); + if (兵营_任意位置继续 != null) { + Logger.info("点击继续"); + macro.mouseLeftClick(兵营_任意位置继续); + macro.delay(1500); + } + + ViewRect 兵营_训练 = macro.waitAndMatchLegend("兵营_训练", 0.9, 2); + if (兵营_训练 == null) { + Logger.error("训练失败，未检测到兵营训练"); + return; + } Logger.info("确认训练"); - macro.mouseLeftClick(macro.of(396, 885)); + macro.mouseLeftClick(兵营_训练); macro.delay(1000); ViewRect 兵营_返回 = macro.matchLegend("兵营_返回", 0.9D); @@ -192,12 +209,29 @@ public class Task_自动练兵 extends BaseTask { macro.mouseLeftClick(viewRects2[1]); macro.delay(1000); + Logger.info("点击兵营"); + macro.mouseLeftClick(macro.of(268, 431)); + macro.delay(1000); + Logger.info("点击训练"); macro.mouseLeftClick(macro.of(355, 632)); macro.delay(1000); + Logger.info("检测任意位置继续"); + ViewRect 兵营_任意位置继续 = macro.waitAndMatchLegend("兵营_任意位置继续", 0.9, 2); + if (兵营_任意位置继续 != null) { + Logger.info("点击继续"); + macro.mouseLeftClick(兵营_任意位置继续); + macro.delay(1500); + } + + ViewRect 兵营_训练 = macro.waitAndMatchLegend("兵营_训练", 0.9, 2); + if (兵营_训练 == null) { + Logger.error("训练失败，未检测到兵营训练"); + return; + } Logger.info("确认训练"); - macro.mouseLeftClick(macro.of(396, 885)); + macro.mouseLeftClick(兵营_训练); macro.delay(1000); ViewRect 兵营_返回 = macro.matchLegend("兵营_返回", 0.9D); @@ -293,12 +327,29 @@ public class Task_自动练兵 extends BaseTask { macro.mouseLeftClick(viewRects2[1]); macro.delay(1000); + Logger.info("点击兵营"); + macro.mouseLeftClick(macro.of(268, 431)); + macro.delay(1000); + Logger.info("点击训练"); macro.mouseLeftClick(macro.of(355, 632)); macro.delay(1000); + Logger.info("检测任意位置继续"); + ViewRect 兵营_任意位置继续 = macro.waitAndMatchLegend("兵营_任意位置继续", 0.9, 2); + if (兵营_任意位置继续 != null) { + Logger.info("点击继续"); + macro.mouseLeftClick(兵营_任意位置继续); + macro.delay(1500); + } + + ViewRect 兵营_训练 = macro.waitAndMatchLegend("兵营_训练", 0.9, 2); + if (兵营_训练 == null) { + Logger.error("训练失败，未检测到兵营训练"); + return; + } Logger.info("确认训练"); - macro.mouseLeftClick(macro.of(396, 885)); + macro.mouseLeftClick(兵营_训练); macro.delay(1000); ViewRect 兵营_返回 = macro.matchLegend("兵营_返回", 0.9D);