From 7c561196475eb46cb33e40831ab0871533def16c Mon Sep 17 00:00:00 2001 From: wangbing Date: Mon, 2 Sep 2024 17:29:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- legend/城镇#L449,887.png | Bin 6614 -> 0 bytes .../example/jmacro/wjdr/JMainApplication.java | 2 +- .../com/example/jmacro/wjdr/JMainService.java | 2 +- .../wjdr/{demo => wjdr}/MacroForWJDR.java | 20 +++++++++--------- .../wjdr/{demo => wjdr}/task/BaseTask.java | 2 +- .../task/Task_探险领取.java | 8 +++---- .../task/Task_收留避难者.java | 4 ++-- .../task/Task_离线收益.java | 5 +++-- .../task/Task_自动采矿.java | 20 +++++++++--------- .../task/Task_采矿被攻击.java | 2 +- 10 files changed, 33 insertions(+), 32 deletions(-) delete mode 100644 legend/城镇#L449,887.png rename src/main/java/com/example/jmacro/wjdr/{demo => wjdr}/MacroForWJDR.java (88%) rename src/main/java/com/example/jmacro/wjdr/{demo => wjdr}/task/BaseTask.java (96%) rename src/main/java/com/example/jmacro/wjdr/{demo => wjdr}/task/Task_探险领取.java (91%) rename src/main/java/com/example/jmacro/wjdr/{demo => wjdr}/task/Task_收留避难者.java (89%) rename src/main/java/com/example/jmacro/wjdr/{demo => wjdr}/task/Task_离线收益.java (85%) rename src/main/java/com/example/jmacro/wjdr/{demo => wjdr}/task/Task_自动采矿.java (90%) rename src/main/java/com/example/jmacro/wjdr/{demo => wjdr}/task/Task_采矿被攻击.java (90%) diff --git a/legend/城镇#L449,887.png b/legend/城镇#L449,887.png deleted file mode 100644 index fe0660bc7902e60bc84aa715c506deb2d0e43b12..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6614 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 UWkK-l_W%F@07*qoM6N<$f=v8(_y7O^ diff --git a/src/main/java/com/example/jmacro/wjdr/JMainApplication.java b/src/main/java/com/example/jmacro/wjdr/JMainApplication.java index b0ba4b3..b219c63 100644 --- a/src/main/java/com/example/jmacro/wjdr/JMainApplication.java +++ b/src/main/java/com/example/jmacro/wjdr/JMainApplication.java @@ -1,6 +1,6 @@ package com.example.jmacro.wjdr; -import com.example.jmacro.wjdr.demo.MacroForWJDR; +import com.example.jmacro.wjdr.wjdr.MacroForWJDR; import com.example.jmacro.wjdr.ui.FXMLUtil; import com.example.jmacro.wjdr.util.Logger; import com.example.jmacro.wjdr.util.ResourceUtil; diff --git a/src/main/java/com/example/jmacro/wjdr/JMainService.java b/src/main/java/com/example/jmacro/wjdr/JMainService.java index 67b23ff..1265f14 100644 --- a/src/main/java/com/example/jmacro/wjdr/JMainService.java +++ b/src/main/java/com/example/jmacro/wjdr/JMainService.java @@ -2,7 +2,7 @@ package com.example.jmacro.wjdr; import cn.hutool.core.thread.ThreadUtil; import com.example.jmacro.wjdr.base.Legend; -import com.example.jmacro.wjdr.demo.MacroForWJDR; +import com.example.jmacro.wjdr.wjdr.MacroForWJDR; import com.example.jmacro.wjdr.util.DialogUtil; import com.example.jmacro.wjdr.util.Logger; diff --git a/src/main/java/com/example/jmacro/wjdr/demo/MacroForWJDR.java b/src/main/java/com/example/jmacro/wjdr/wjdr/MacroForWJDR.java similarity index 88% rename from src/main/java/com/example/jmacro/wjdr/demo/MacroForWJDR.java rename to src/main/java/com/example/jmacro/wjdr/wjdr/MacroForWJDR.java index 5b1faee..5c4824f 100644 --- a/src/main/java/com/example/jmacro/wjdr/demo/MacroForWJDR.java +++ b/src/main/java/com/example/jmacro/wjdr/wjdr/MacroForWJDR.java @@ -1,4 +1,4 @@ -package com.example.jmacro.wjdr.demo; +package com.example.jmacro.wjdr.wjdr; import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateUtil; @@ -6,10 +6,10 @@ import com.example.jmacro.wjdr.JMacro; import com.example.jmacro.wjdr.JMainService; import com.example.jmacro.wjdr.base.Legend; import com.example.jmacro.wjdr.base.ViewRect; -import com.example.jmacro.wjdr.demo.task.Task_探险领取; -import com.example.jmacro.wjdr.demo.task.Task_收留避难者; -import com.example.jmacro.wjdr.demo.task.Task_离线收益; -import com.example.jmacro.wjdr.demo.task.Task_采矿被攻击; +import com.example.jmacro.wjdr.wjdr.task.Task_探险领取; +import com.example.jmacro.wjdr.wjdr.task.Task_收留避难者; +import com.example.jmacro.wjdr.wjdr.task.Task_离线收益; +import com.example.jmacro.wjdr.wjdr.task.Task_采矿被攻击; import com.example.jmacro.wjdr.util.Logger; import com.example.jmacro.wjdr.util.TaskUtil; @@ -80,14 +80,14 @@ public class MacroForWJDR extends JMacro { // 定位城镇 Boolean inMain = TaskUtil.retryTask(() -> { { // 定位弹框，关闭弹框 - ViewRect rect = waitAndMatchLegend("城镇_充值", 0.8d); + ViewRect rect = matchLegend("城镇_充值", 0.8d); if (rect != null) { mouseLeftClick(rect); Logger.info("检测到充值广告弹框，关闭弹框"); } } {// 定位离线收益 - ViewRect rect = waitAndMatchLegend("城镇_离线收益", 0.9); + ViewRect rect = matchLegend("城镇_离线收益", 0.9); if (rect != null) { mouseLeftClick(rect); Logger.info("检测到离线收益弹框，关闭弹框"); @@ -95,7 +95,7 @@ public class MacroForWJDR extends JMacro { } // 定位城镇 { - ViewRect rect = waitAndMatchLegend("城镇", 0.9); + ViewRect rect = matchLegend("城镇", 0.9); if (rect != null) { Logger.info("当前区域【野外】"); Logger.info("返回区域【城镇】"); @@ -104,14 +104,14 @@ public class MacroForWJDR extends JMacro { } } {// 定位野外 - ViewRect rect = waitAndMatchLegend("野外", 0.9); + ViewRect rect = matchLegend("野外", 0.9); if (rect != null) { Logger.info("当前区域【城镇】"); return true; } } return false; - }, 10, 10); + }, 10, 1000); if (!Convert.toBool(inMain, false)) { Logger.info("未进入城镇：退出线程"); diff --git a/src/main/java/com/example/jmacro/wjdr/demo/task/BaseTask.java b/src/main/java/com/example/jmacro/wjdr/wjdr/task/BaseTask.java similarity index 96% rename from src/main/java/com/example/jmacro/wjdr/demo/task/BaseTask.java rename to src/main/java/com/example/jmacro/wjdr/wjdr/task/BaseTask.java index d16a2bd..934c6a6 100644 --- a/src/main/java/com/example/jmacro/wjdr/demo/task/BaseTask.java +++ b/src/main/java/com/example/jmacro/wjdr/wjdr/task/BaseTask.java @@ -1,4 +1,4 @@ -package com.example.jmacro.wjdr.demo.task; +package com.example.jmacro.wjdr.wjdr.task; import com.example.jmacro.wjdr.JMacro; import com.example.jmacro.wjdr.JMainService; diff --git a/src/main/java/com/example/jmacro/wjdr/demo/task/Task_探险领取.java b/src/main/java/com/example/jmacro/wjdr/wjdr/task/Task_探险领取.java similarity index 91% rename from src/main/java/com/example/jmacro/wjdr/demo/task/Task_探险领取.java rename to src/main/java/com/example/jmacro/wjdr/wjdr/task/Task_探险领取.java index 72a510c..c818a8b 100644 --- a/src/main/java/com/example/jmacro/wjdr/demo/task/Task_探险领取.java +++ b/src/main/java/com/example/jmacro/wjdr/wjdr/task/Task_探险领取.java @@ -1,4 +1,4 @@ -package com.example.jmacro.wjdr.demo.task; +package com.example.jmacro.wjdr.wjdr.task; import com.example.jmacro.wjdr.JMacro; import com.example.jmacro.wjdr.base.ViewRect; @@ -13,13 +13,13 @@ public class Task_探险领取 extends BaseTask { @Override public void task(JMacro macro, ViewRect viewRect) { Logger.info("定位【探险】按钮"); - ViewRect TAB_探险 = macro.waitAndMatchLegend("城镇_探险", 0.9); - if (TAB_探险 == null) { + ViewRect 城镇_探险 = macro.waitAndMatchLegend("城镇_探险", 0.9); + if (城镇_探险 == null) { return; } Logger.info("点击【探险】按钮"); - macro.mouseLeftClick(TAB_探险); + macro.mouseLeftClick(城镇_探险); ViewRect 探险_按钮 = macro.waitAndMatchLegend("探险_按钮", 0.9); if (探险_按钮 == null) { diff --git a/src/main/java/com/example/jmacro/wjdr/demo/task/Task_收留避难者.java b/src/main/java/com/example/jmacro/wjdr/wjdr/task/Task_收留避难者.java similarity index 89% rename from src/main/java/com/example/jmacro/wjdr/demo/task/Task_收留避难者.java rename to src/main/java/com/example/jmacro/wjdr/wjdr/task/Task_收留避难者.java index 79ad7ea..c62f1f7 100644 --- a/src/main/java/com/example/jmacro/wjdr/demo/task/Task_收留避难者.java +++ b/src/main/java/com/example/jmacro/wjdr/wjdr/task/Task_收留避难者.java @@ -1,4 +1,4 @@ -package com.example.jmacro.wjdr.demo.task; +package com.example.jmacro.wjdr.wjdr.task; import com.example.jmacro.wjdr.JMacro; import com.example.jmacro.wjdr.base.ViewRect; @@ -12,7 +12,7 @@ public class Task_收留避难者 extends BaseTask { @Override public void task(JMacro macro, ViewRect viewRect) { - ViewRect rect = macro.waitAndMatchLegend("城镇_避难者", 0.9); + ViewRect rect = macro.matchLegend("城镇_避难者", 0.9); if (rect == null) { Logger.info("未发现避难者"); return; diff --git a/src/main/java/com/example/jmacro/wjdr/demo/task/Task_离线收益.java b/src/main/java/com/example/jmacro/wjdr/wjdr/task/Task_离线收益.java similarity index 85% rename from src/main/java/com/example/jmacro/wjdr/demo/task/Task_离线收益.java rename to src/main/java/com/example/jmacro/wjdr/wjdr/task/Task_离线收益.java index 72a9237..590db0d 100644 --- a/src/main/java/com/example/jmacro/wjdr/demo/task/Task_离线收益.java +++ b/src/main/java/com/example/jmacro/wjdr/wjdr/task/Task_离线收益.java @@ -1,4 +1,4 @@ -package com.example.jmacro.wjdr.demo.task; +package com.example.jmacro.wjdr.wjdr.task; import com.example.jmacro.wjdr.JMacro; import com.example.jmacro.wjdr.base.ViewRect; @@ -12,12 +12,13 @@ public class Task_离线收益 extends BaseTask { @Override public void task(JMacro macro, ViewRect viewRect) { - macro.delay(); + macro.delayUnstable(); // 定位离线收益弹框，关闭弹框 ViewRect rect = macro.waitAndMatchLegend("城镇_离线收益", 0.9); if (rect != null) { macro.mouseLeftClick(rect); Logger.info("检测到离线收益弹框，关闭弹框"); } + macro.delayUnstable(); } } diff --git a/src/main/java/com/example/jmacro/wjdr/demo/task/Task_自动采矿.java b/src/main/java/com/example/jmacro/wjdr/wjdr/task/Task_自动采矿.java similarity index 90% rename from src/main/java/com/example/jmacro/wjdr/demo/task/Task_自动采矿.java rename to src/main/java/com/example/jmacro/wjdr/wjdr/task/Task_自动采矿.java index 6212005..fc67f28 100644 --- a/src/main/java/com/example/jmacro/wjdr/demo/task/Task_自动采矿.java +++ b/src/main/java/com/example/jmacro/wjdr/wjdr/task/Task_自动采矿.java @@ -1,4 +1,4 @@ -package com.example.jmacro.wjdr.demo.task; +package com.example.jmacro.wjdr.wjdr.task; import cn.hutool.json.JSONUtil; import com.example.jmacro.wjdr.JMacro; @@ -16,13 +16,14 @@ public class Task_自动采矿 extends BaseTask { @Override public void task(JMacro macro, ViewRect viewRect) { + macro.delayUnstable(); Logger.info("判断是否在野外"); - ViewRect 城镇 = macro.waitAndMatchLegend( "城镇", 0.9); + ViewRect 城镇 = macro.matchLegend("城镇", 0.9); if (城镇 != null) { Logger.info("当前界面【野外】"); } else { Logger.info("定位【野外】"); - ViewRect 野外 = macro.waitAndMatchLegend( "野外", 0.99); + ViewRect 野外 = macro.matchLegend("野外", 0.99); if (野外 == null) { Logger.error("定位【野外】失败，采矿终止"); return; @@ -31,12 +32,13 @@ public class Task_自动采矿 extends BaseTask { Logger.info("点击【野外】，坐标{}", JSONUtil.toJsonStr(野外.getCenter())); macro.mouseLeftClick(野外); + macro.delayUnstable(); Logger.info("定位野外按钮成功"); } Logger.info("定位资源搜索按钮"); // 因为搜索按钮透明，不好比对，通过定位其下面的任务图标定位 - ViewRect 野外_任务 = macro.waitAndMatchLegend( "野外_任务", 0.9); + ViewRect 野外_任务 = macro.waitAndMatchLegend("野外_任务", 0.9); if (野外_任务 == null) { Logger.error("未检测到【资源搜索按钮】，采矿终止"); return; @@ -45,11 +47,8 @@ public class Task_自动采矿 extends BaseTask { Logger.info("定位资源搜索按钮成功：{}", 野外搜索.toString()); macro.mouseLeftClick(野外搜索); - // 定位木材 - - // 因为搜索按钮透明，不好比对，通过定位其下面的任务图标定位 - ViewRect 野外_搜索 = macro.waitAndMatchLegend( "野外_搜索#L226,879.png", 0.9); + ViewRect 野外_搜索 = macro.waitAndMatchLegend("野外_搜索#L226,879.png", 0.9); if (野外_搜索 == null) { Logger.error("未检测到【野外_搜索】，采矿终止"); return; @@ -68,18 +67,19 @@ public class Task_自动采矿 extends BaseTask { } // 检测是否是搜索界面 - ViewRect 野外_任务2 = macro.waitAndMatchLegend( "野外_任务", 9); + ViewRect 野外_任务2 = macro.waitAndMatchLegend("野外_任务", 9); if (野外_任务2 != null) { Logger.info("退出资源搜索界面"); macro.mouseLeftClick(this.viewRect); } - ViewRect 城1 = macro.waitAndMatchLegend( "城镇", 0.9); + ViewRect 城1 = macro.waitAndMatchLegend("城镇", 0.9); if (城1 == null) { Logger.error("未检测到【城镇】，采矿终止"); return; } Logger.info("返回城镇"); + macro.delayUnstable(); } /** diff --git a/src/main/java/com/example/jmacro/wjdr/demo/task/Task_采矿被攻击.java b/src/main/java/com/example/jmacro/wjdr/wjdr/task/Task_采矿被攻击.java similarity index 90% rename from src/main/java/com/example/jmacro/wjdr/demo/task/Task_采矿被攻击.java rename to src/main/java/com/example/jmacro/wjdr/wjdr/task/Task_采矿被攻击.java index 1fd6948..990d1c5 100644 --- a/src/main/java/com/example/jmacro/wjdr/demo/task/Task_采矿被攻击.java +++ b/src/main/java/com/example/jmacro/wjdr/wjdr/task/Task_采矿被攻击.java @@ -1,4 +1,4 @@ -package com.example.jmacro.wjdr.demo.task; +package com.example.jmacro.wjdr.wjdr.task; import com.example.jmacro.wjdr.JMacro; import com.example.jmacro.wjdr.base.ViewRect;