From ee3aadaa7f7eb27930a22041a738a189fddd2103 Mon Sep 17 00:00:00 2001 From: wangbing Date: Fri, 6 Sep 2024 00:02:58 +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 --- legend/一键领取#L215,744.png | Bin 0 -> 3620 bytes legend/启动图标#L438,485.png | Bin 0 -> 3489 bytes legend/启动图标.png | Bin 9895 -> 0 bytes legend/每日任务关闭#L496,80.png | Bin 0 -> 1081 bytes legend/点击任意位置退出#L190,862.png | Bin 0 -> 4198 bytes legend/返回#L4,4.png | Bin 0 -> 3476 bytes src/main/java/xyz/wbsite/jmacro/JMacro.java | 12 ++- .../xyz/wbsite/jmacro/JMainApplication.java | 23 +---- .../java/xyz/wbsite/jmacro/base/Legend.java | 2 + .../xyz/wbsite/jmacro/tool/PickLegend.java | 2 +- .../xyz/wbsite/jmacro/wjdr/MacroForWJDR.java | 81 +++------------ .../xyz/wbsite/jmacro/wjdr/task/BaseTask.java | 1 + .../jmacro/wjdr/task/Task_离线收益.java | 2 +- .../jmacro/wjdr/task/Task_返回城镇.java | 93 ++++++++++++++++++ 14 files changed, 124 insertions(+), 92 deletions(-) create mode 100644 legend/一键领取#L215,744.png create mode 100644 legend/启动图标#L438,485.png delete mode 100644 legend/启动图标.png create mode 100644 legend/每日任务关闭#L496,80.png create mode 100644 legend/点击任意位置退出#L190,862.png create mode 100644 legend/返回#L4,4.png create mode 100644 src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_返回城镇.java diff --git a/legend/一键领取#L215,744.png b/legend/一键领取#L215,744.png new file mode 100644 index 0000000000000000000000000000000000000000..706eb60e9c80d39cc65032b6c60b4fb342139c85 GIT binary patch literal 3620 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 Z`v0T_NiirYlP&-N002ovPDHLkV1hAPQzrlb diff --git a/legend/每日任务关闭#L496,80.png b/legend/每日任务关闭#L496,80.png new file mode 100644 index 0000000000000000000000000000000000000000..4901c62ddaf07a02537d42aaf1ea42bbaae46994 GIT binary patch literal 1081 zcmV-91jhS`P)WY3%Xesk}A=RQeiu%Xvz!PMe5l>IznnIayn$I)Z5;^RRX zdZQcNCIxySV@o%<)@g9y!yh&<@@D|9=n>rE9Hbi~8yH^*!jn8jvQ$U9P)F>jg1NOg z^kXtQhOAAX{t8ex;zY;bChnNMkeNWLq9I+@AWaga5Oh#&Ai;(BX$`5fI)VoUj6V&a zYj_=b&o{J5X;F;+;Ll?!+h)nGrpg!x65)FGeW5@-pe@%4-ox2GL= zXh~o@TgG0w4Y~>&SUkk6N5jh`vnw_(UIeHZm0|Evv4-dFB$ixh>|`s5lv`!_+VXOr zw?J6$k1F~Xv-nl5QVxQ4#vLv&3l=-|F4 ztapO$W>z{Hvd_GQSGzgv(!8PS`(Zmg(crO$c{zn!Q!+ic$@#q;-KTfKgdJ3#ZkUQ>OL$^`Lo>S|b#l&b^47S!6ymKxP^mQ{{{I0~mh5epEzIqt z$=xS}v4VKMidFXkq|YW~nEwvLmpDO^8HL{ga?y}4QfzoyYyS5#PGQg7)D~gUGY$K> zDx_6UlBpJ(rA69vDF9nEs*BFHG4Oe^j5%)wvtA9)Vj8S8sZwlZD&hk4Wt5U)oW0jf zJ5v6 zX=~He-JFyTg9W$l`C(emVChW-4jzDq`-J`jvuj?lwUXp000000NkvXXu0mjf0y6|9 literal 0 HcmV?d00001 diff --git a/legend/点击任意位置退出#L190,862.png b/legend/点击任意位置退出#L190,862.png new file mode 100644 index 0000000000000000000000000000000000000000..f9986f29acfd51d799862c0243d476bff3ee1ac9 GIT binary patch literal 4198 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 minSimilar) { return new ViewRect(x, y, x + pic.getWidth(), y + pic.getHeight(), similar); } } } } + if (maxSimilar > 0.5D) { + Logger.info("最大相似度{}", NumberUtil.formatPercent(maxSimilar, 0)); + } return null; } @@ -462,7 +468,7 @@ public abstract class JMacro { * @return 匹配图片区域 */ public ViewRect findLegend(Legend legend, double minSimilar) { - return findPic(legend.getFile(), minSimilar); + return findLegend(getFocusRect(), legend, minSimilar); } /** @@ -484,6 +490,7 @@ public abstract class JMacro { * @return 匹配图片区域 */ public ViewRect findLegend(ViewRect rect, Legend legend, double minSimilar) { + Logger.info("查找图例：{}", legend.getName()); return findPic(rect, legend.getFile(), minSimilar); } @@ -616,7 +623,6 @@ public abstract class JMacro { if (result != null) { return result; } - delayUnstable(); } return null; }, seconds, TimeUnit.SECONDS); @@ -787,7 +793,7 @@ public abstract class JMacro { BufferedImage image = ImageUtil.load(legend.getFile()); viewRect.setRight(viewRect.getLeft() + image.getWidth()); viewRect.setBottom(viewRect.getTop() + image.getHeight()); - ImageUtil.show(viewRect); + //ImageUtil.show(viewRect); return findPic(viewRect, image, minSimilar); } diff --git a/src/main/java/xyz/wbsite/jmacro/JMainApplication.java b/src/main/java/xyz/wbsite/jmacro/JMainApplication.java index 2d26658..777b86d 100644 --- a/src/main/java/xyz/wbsite/jmacro/JMainApplication.java +++ b/src/main/java/xyz/wbsite/jmacro/JMainApplication.java @@ -10,6 +10,7 @@ import javafx.fxml.FXMLLoader; import javafx.scene.Scene; import javafx.scene.image.Image; import javafx.stage.Stage; +import xyz.wbsite.jmacro.wjdr.MacroForWJDR; import java.awt.event.KeyEvent; import java.io.File; @@ -66,27 +67,7 @@ public class JMainApplication extends Application { }); // 服务初始化 - JMainService.init(new JMacro() { - @Override - public ViewRect focus() { - return new ViewRect(0, 0, 1920, 1080); - } - - @Override - public void run() { - ViewRect 电脑 = findLegend(of(0, 0, 159, 168), "电脑", 0.99); - if (电脑 == null) { - return; - } - mouseLeftDoubleClick(电脑); - ViewRect 关闭 = waitAndFindLegend(of("关闭"), 0.99, 10); - - if (关闭 == null) { - return; - } - mouseLeftClick(关闭); - } - }, new File("legend")); + JMainService.init(new MacroForWJDR(), new File("legend")); } public static void main(String[] args) { diff --git a/src/main/java/xyz/wbsite/jmacro/base/Legend.java b/src/main/java/xyz/wbsite/jmacro/base/Legend.java index 30d93b2..0ffdc3b 100644 --- a/src/main/java/xyz/wbsite/jmacro/base/Legend.java +++ b/src/main/java/xyz/wbsite/jmacro/base/Legend.java @@ -5,6 +5,7 @@ import cn.hutool.cache.CacheUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.ReUtil; +import xyz.wbsite.jmacro.util.Logger; import java.io.File; import java.util.List; @@ -81,6 +82,7 @@ public class Legend { List files = FileUtil.loopFiles(defaultBase, pathname -> pathname.getName().startsWith(name)); if (files.size() == 0) { + Logger.error(defaultBase.getAbsolutePath() + " not found the legend of " + name); throw new RuntimeException(defaultBase.getAbsolutePath() + " not found the legend of " + name); } File file = files.get(0); diff --git a/src/main/java/xyz/wbsite/jmacro/tool/PickLegend.java b/src/main/java/xyz/wbsite/jmacro/tool/PickLegend.java index ee432cb..f437bcd 100644 --- a/src/main/java/xyz/wbsite/jmacro/tool/PickLegend.java +++ b/src/main/java/xyz/wbsite/jmacro/tool/PickLegend.java @@ -219,7 +219,7 @@ public class PickLegend extends JFrame { if (returnVal == JFileChooser.APPROVE_OPTION) { // 默认文件 File file = jFileChooser.getSelectedFile(); - String name = file.getName(); + String name = file.getName().replaceAll("\\.png",""); String legendName = name.split("#")[0]; String prefix = legendName + "#"; diff --git a/src/main/java/xyz/wbsite/jmacro/wjdr/MacroForWJDR.java b/src/main/java/xyz/wbsite/jmacro/wjdr/MacroForWJDR.java index 6f0670c..c49eeba 100644 --- a/src/main/java/xyz/wbsite/jmacro/wjdr/MacroForWJDR.java +++ b/src/main/java/xyz/wbsite/jmacro/wjdr/MacroForWJDR.java @@ -1,21 +1,16 @@ package xyz.wbsite.jmacro.wjdr; -import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateUtil; import xyz.wbsite.jmacro.JMacro; import xyz.wbsite.jmacro.JMainService; import xyz.wbsite.jmacro.base.Legend; import xyz.wbsite.jmacro.base.ViewRect; import xyz.wbsite.jmacro.util.Logger; -import xyz.wbsite.jmacro.util.TaskUtil; -import xyz.wbsite.jmacro.wjdr.task.Task_探险领取; import xyz.wbsite.jmacro.wjdr.task.Task_收留避难者; -import xyz.wbsite.jmacro.wjdr.task.Task_离线收益; import xyz.wbsite.jmacro.wjdr.task.Task_自动采矿; +import xyz.wbsite.jmacro.wjdr.task.Task_返回城镇; import xyz.wbsite.jmacro.wjdr.task.Task_采矿被攻击; -import java.util.concurrent.TimeUnit; - /** * 无尽冬日脚本 * @@ -67,77 +62,31 @@ public class MacroForWJDR extends JMacro { Logger.info("任务线程开始", DateUtil.date(startTime).toString("yyyy-MM-dd HH:mm:ss")); // 获取启动图标 Logger.info("定位启动图标"); - ViewRect launch = waitAndFindPic(Legend.inflate("启动图标").getFile(), 0.9, 5); + ViewRect launch = waitAndFindPic(of("启动图标").getFile(), 0.9, 10); if (launch != null) { Logger.info("启动图标坐标：", launch.toString()); Logger.info("启动程序"); - delayUnstable(); mouseLeftClick(launch); + delay(10 * 1000); } Logger.info("定位城镇"); - - // 定位城镇 - Boolean inMain = TaskUtil.timeTask(() -> { - { // 定位弹框，关闭弹框 - delayUnstable(); - ViewRect rect = findLegend(of(437, 28, 491, 106), "城镇_礼包", 0.7); - if (rect != null) { - mouseLeftClick(rect); - Logger.info("检测到充值广告弹框，关闭弹框"); - } - } - {// 定位离线收益 - delayUnstable(); - ViewRect rect = matchLegend("城镇_离线收益", 0.9); - if (rect != null) { - mouseLeftClick(rect); - Logger.info("检测到离线收益弹框，关闭弹框"); - } - } - - {// 定位城镇 - delayUnstable(); - ViewRect rect = matchLegend("城镇", 0.9); - if (rect != null) { - Logger.info("当前区域【野外】"); - Logger.info("返回区域【城镇】"); - mouseLeftClick(rect); - return false; - } - } - {// 定位野外 - delayUnstable(); - ViewRect rect = matchLegend("野外", 0.9); - if (rect != null) { - Logger.info("当前区域【城镇】"); - return true; - } - } - return false; - }, 60, TimeUnit.SECONDS); - - if (!Convert.toBool(inMain, false)) { - Logger.info("未进入城镇：退出线程"); - return; - } - - Logger.info("进入城镇成功"); - - delayUnstable(); - new Task_离线收益(this, focusRect).run(); - - delayUnstable(); - new Task_收留避难者(this, focusRect).run(); - - // 矿场攻击检测任务 - delayUnstable(1000); - new Task_探险领取(this, focusRect).run(); +// +// delayUnstable(); +// new Task_离线收益(this, focusRect).run(); +// +// delayUnstable(); +// new Task_收留避难者(this, focusRect).run(); +// +// // 矿场攻击检测任务 +// delayUnstable(1000); +// new Task_探险领取(this, focusRect).run(); Logger.info("启动循环任务"); while (JMainService.getInstance().run) { + new Task_返回城镇(this, focusRect).run(); + // 矿场攻击检测任务 - delayUnstable(1000); new Task_采矿被攻击(this, focusRect).run(); // 避难者 diff --git a/src/main/java/xyz/wbsite/jmacro/wjdr/task/BaseTask.java b/src/main/java/xyz/wbsite/jmacro/wjdr/task/BaseTask.java index 60e5064..15f34fa 100644 --- a/src/main/java/xyz/wbsite/jmacro/wjdr/task/BaseTask.java +++ b/src/main/java/xyz/wbsite/jmacro/wjdr/task/BaseTask.java @@ -36,6 +36,7 @@ public abstract class BaseTask { this.task(macro, viewRect); Logger.info("》》》任务[{}]结束》》》", name); } catch (Exception e) { + e.printStackTrace(); Logger.info("》》》任务[{}]异常中断》》》", name); throw e; } 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 716866e..05bdd18 100644 --- a/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_离线收益.java +++ b/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_离线收益.java @@ -14,7 +14,7 @@ public class Task_离线收益 extends BaseTask { public void task(JMacro macro, ViewRect viewRect) { macro.delayUnstable(); // 定位离线收益弹框，关闭弹框 - ViewRect rect = macro.waitAndMatchLegend("城镇_离线收益", 0.9); + ViewRect rect = macro.matchLegend("城镇_离线收益", 0.9); if (rect != null) { macro.mouseLeftClick(rect); Logger.info("检测到离线收益弹框，关闭弹框"); diff --git a/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_返回城镇.java b/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_返回城镇.java new file mode 100644 index 0000000..5b848b9 --- /dev/null +++ b/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_返回城镇.java @@ -0,0 +1,93 @@ +package xyz.wbsite.jmacro.wjdr.task; + +import xyz.wbsite.jmacro.JMacro; +import xyz.wbsite.jmacro.base.ViewRect; +import xyz.wbsite.jmacro.util.Logger; + +public class Task_返回城镇 extends BaseTask { + + public Task_返回城镇(JMacro macro, ViewRect viewRect) { + super(macro, viewRect); + } + + @Override + public void task(JMacro macro, ViewRect viewRect) { + while (true) { + {// 野外返回 + ViewRect rect = macro.matchLegend("野外", 0.9); + if (rect != null) { + macro.mouseLeftClick(rect); + Logger.info("当前位置：城镇"); + return; + } + } + {// 野外返回 + ViewRect rect = macro.matchLegend("城镇", 0.9); + if (rect != null) { + macro.mouseLeftClick(rect); + Logger.info("返回城镇"); + } + } + {// 其他页面返回 + ViewRect rect = macro.matchLegend("返回", 0.9); + 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("关闭充值广告弹框"); + } + } + {// 定位离线收益 + ViewRect rect = macro.matchLegend("城镇_离线收益", 0.9); + if (rect != null) { + macro.mouseLeftClick(rect); + Logger.info("关闭离线收益弹框"); + } + } + {// 无行军队列弹框 + ViewRect rect = macro.matchLegend("野外_资源无对队列", 0.9); + if (rect != null) { + macro.mouseLeftClick(macro.of(471, 250)); + Logger.info("关闭弹框无对队列弹框"); + } + } + {// 无行军队列弹框 + ViewRect rect = macro.matchLegend("野外_搜索", 0.9); + if (rect != null) { + macro.mouseLeftClick(macro.of(253, 426)); + Logger.info("关闭野外搜索弹框"); + } + } + {// 一键领取弹框 + ViewRect rect = macro.matchLegend("一键领取", 0.9); + if (rect != null) { + macro.mouseLeftClick(rect); + Logger.info("一键领取"); + macro.delay(500); + continue; + } + } + {// 点击任务位置退出 + ViewRect rect = macro.matchLegend("点击任意位置退出", 0.9); + if (rect != null) { + macro.mouseLeftClick(rect); + Logger.info("点击任意位置退出"); + macro.delay(500); + continue; + } + } + {// 每日任务 + ViewRect rect = macro.matchLegend("每日任务关闭", 0.9); + if (rect != null) { + macro.mouseLeftClick(rect); + Logger.info("关闭每日任务关闭弹框"); + } + } + } + } +}