From 8b17ee21114d896e323cf5cfbcb7a981c5f4ce4c Mon Sep 17 00:00:00 2001 From: wangbing Date: Wed, 28 Aug 2024 00:22:53 +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/L454,41-城镇_充值.png | Bin 1476 -> 0 bytes ...-TAB_探险.png => TAB_探险_L35,881.png} | Bin ...449,887-城镇.png => 城镇_L449,887.png} | Bin ...456,887-城镇.png => 城镇_L456,887.png} | Bin legend/城镇_充值_L448,36.png | Bin 0 -> 2771 bytes ....png => 城镇_离线收益_L204,734.png} | Bin legend/城镇_野外.png | Bin 8650 -> 0 bytes legend/探险_不可领取_L420,667.png | Bin 0 -> 2355 bytes ..._按钮.png => 探险_按钮_L240,854.png} | Bin ....png => 探险_获得奖励_L196,218.png} | Bin ...险_返回.png => 探险_返回_L4,4.png} | Bin ...取2.png => 探险_领取2_L230,664.png} | Bin ..._领取.png => 探险_领取_L426,667.png} | Bin ...444,888-野外.png => 野外_L444,888.png} | Bin legend/野外_L449,885.png | Bin 0 -> 7230 bytes ..._搜索.png => 野外_搜索_L15,632.png} | Bin ..._搜索.png => 野外_搜索_L233,881.png} | Bin .../java/com/example/jmacro/wjdr/JMacro.java | 6 +-- .../com/example/jmacro/wjdr/MainTask.java | 7 +-- .../example/jmacro/wjdr/task/TaskMining.java | 10 ++-- .../example/jmacro/wjdr/task/TaskRewards.java | 47 ++++++++++-------- .../com/example/jmacro/wjdr/util/Capture.java | 14 ++---- 22 files changed, 43 insertions(+), 41 deletions(-) delete mode 100644 legend/L454,41-城镇_充值.png rename legend/{L35,881-TAB_探险.png => TAB_探险_L35,881.png} (100%) rename legend/{L449,887-城镇.png => 城镇_L449,887.png} (100%) rename legend/{L456,887-城镇.png => 城镇_L456,887.png} (100%) create mode 100644 legend/城镇_充值_L448,36.png rename legend/{L204,734-城镇_离线收益.png => 城镇_离线收益_L204,734.png} (100%) delete mode 100644 legend/城镇_野外.png create mode 100644 legend/探险_不可领取_L420,667.png rename legend/{L240,854-探险_按钮.png => 探险_按钮_L240,854.png} (100%) rename legend/{L196,218-探险_获得奖励.png => 探险_获得奖励_L196,218.png} (100%) rename legend/{L4,4-探险_返回.png => 探险_返回_L4,4.png} (100%) rename legend/{L230,664-探险_领取2.png => 探险_领取2_L230,664.png} (100%) rename legend/{L426,667-探险_领取.png => 探险_领取_L426,667.png} (100%) rename legend/{L444,888-野外.png => 野外_L444,888.png} (100%) create mode 100644 legend/野外_L449,885.png rename legend/{L15,632-野外_搜索.png => 野外_搜索_L15,632.png} (100%) rename legend/{L233,881-野外_搜索.png => 野外_搜索_L233,881.png} (100%) diff --git a/legend/L454,41-城镇_充值.png b/legend/L454,41-城镇_充值.png deleted file mode 100644 index 19b4a495cf1aed500833e4e55225a2ebc14f03ea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1476 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 Z{{y=rky2+G71jU%002ovPDHLkV1hftPf!2= literal 0 HcmV?d00001 diff --git a/legend/L204,734-城镇_离线收益.png b/legend/城镇_离线收益_L204,734.png similarity index 100% rename from legend/L204,734-城镇_离线收益.png rename to legend/城镇_离线收益_L204,734.png diff --git a/legend/城镇_野外.png b/legend/城镇_野外.png deleted file mode 100644 index d65e02df2c2b62797f41f8d113dd5eca349fafb1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8650 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 diff --git a/legend/探险_不可领取_L420,667.png b/legend/探险_不可领取_L420,667.png new file mode 100644 index 0000000000000000000000000000000000000000..6a73cff5bbb1d935933cd10820b12205029464aa GIT binary patch literal 2355 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 Z{tFf}{+XNZ;zj@f002ovPDHLkV1kJ5V*LOB literal 0 HcmV?d00001 diff --git a/legend/L240,854-探险_按钮.png b/legend/探险_按钮_L240,854.png similarity index 100% rename from legend/L240,854-探险_按钮.png rename to legend/探险_按钮_L240,854.png diff --git a/legend/L196,218-探险_获得奖励.png b/legend/探险_获得奖励_L196,218.png similarity index 100% rename from legend/L196,218-探险_获得奖励.png rename to legend/探险_获得奖励_L196,218.png diff --git a/legend/L4,4-探险_返回.png b/legend/探险_返回_L4,4.png similarity index 100% rename from legend/L4,4-探险_返回.png rename to legend/探险_返回_L4,4.png diff --git a/legend/L230,664-探险_领取2.png b/legend/探险_领取2_L230,664.png similarity index 100% rename from legend/L230,664-探险_领取2.png rename to legend/探险_领取2_L230,664.png diff --git a/legend/L426,667-探险_领取.png b/legend/探险_领取_L426,667.png similarity index 100% rename from legend/L426,667-探险_领取.png rename to legend/探险_领取_L426,667.png diff --git a/legend/L444,888-野外.png b/legend/野外_L444,888.png similarity index 100% rename from legend/L444,888-野外.png rename to legend/野外_L444,888.png diff --git a/legend/野外_L449,885.png b/legend/野外_L449,885.png new file mode 100644 index 0000000000000000000000000000000000000000..562fa75128dbe0dfb037c02de95e24658b1c4041 GIT binary patch literal 7230 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 M07*qoM6N<$g0+;icmMzZ literal 0 HcmV?d00001 diff --git a/legend/L15,632-野外_搜索.png b/legend/野外_搜索_L15,632.png similarity index 100% rename from legend/L15,632-野外_搜索.png rename to legend/野外_搜索_L15,632.png diff --git a/legend/L233,881-野外_搜索.png b/legend/野外_搜索_L233,881.png similarity index 100% rename from legend/L233,881-野外_搜索.png rename to legend/野外_搜索_L233,881.png diff --git a/src/main/java/com/example/jmacro/wjdr/JMacro.java b/src/main/java/com/example/jmacro/wjdr/JMacro.java index 091dd5f..0bd888a 100644 --- a/src/main/java/com/example/jmacro/wjdr/JMacro.java +++ b/src/main/java/com/example/jmacro/wjdr/JMacro.java @@ -532,9 +532,9 @@ public class JMacro { String name = file.getName(); int offsetX = 0; int offsetY = 0; - if (name.matches("L[0-9]+,[0-9]+-[\\S\\s]+")) { - offsetX = Convert.toInt(ReUtil.get("L([0-9]+),[0-9]+-[\\S\\s]+", name, 1), 0); - offsetY = Convert.toInt(ReUtil.get("L[0-9]+,([0-9]+)-[\\S\\s]+", name, 1), 0); + if (name.matches("[\\S\\s]+_L[0-9]+,[0-9]+\\.png")) { + offsetX = Convert.toInt(ReUtil.get("[\\S\\s]+_L([0-9]+),[0-9]+\\.png", name, 1), 0); + offsetY = Convert.toInt(ReUtil.get("[\\S\\s]+_L[0-9]+,([0-9]+)\\.png", name, 1), 0); } ScreenRect screenRect = new ScreenRect(); screenRect.setLeft(rect.getLeft() + offsetX); diff --git a/src/main/java/com/example/jmacro/wjdr/MainTask.java b/src/main/java/com/example/jmacro/wjdr/MainTask.java index 457c70c..8d6a407 100644 --- a/src/main/java/com/example/jmacro/wjdr/MainTask.java +++ b/src/main/java/com/example/jmacro/wjdr/MainTask.java @@ -191,7 +191,8 @@ public class MainTask extends JFrame { while (true) { jMacro.delay(); { // 定位弹框,关闭弹框 - ScreenRect rect = jMacro.matchPic(gameScreen, "L454,41-城镇_充值", 0.1d); + Logger.info("检测到广告弹框"); + ScreenRect rect = jMacro.matchPic(gameScreen, "城镇_充值_L448,36", 0.8d); if (rect != null) { jMacro.mouseLeftClick(rect); Logger.info("检测到广告弹框,关闭弹框"); @@ -200,7 +201,7 @@ public class MainTask extends JFrame { jMacro.delay(); { // 定位离线收益弹框,关闭弹框 - ScreenRect rect = jMacro.matchPic(gameScreen, "L204,734-城镇_离线收益", 0.9); + ScreenRect rect = jMacro.matchPic(gameScreen, "城镇_离线收益_L204,734", 0.9); if (rect != null) { jMacro.mouseLeftClick(rect); Logger.info("检测到离线收益弹框,关闭弹框"); @@ -209,7 +210,7 @@ public class MainTask extends JFrame { jMacro.delay(); // 定位主程序 - ScreenRect rect = jMacro.matchPic(gameScreen, "L444,888-野外", 0.9); + ScreenRect rect = jMacro.matchPic(gameScreen, "野外_L444,888", 0.9); if (rect != null) { Logger.info("程序主界面已就绪"); return rect; diff --git a/src/main/java/com/example/jmacro/wjdr/task/TaskMining.java b/src/main/java/com/example/jmacro/wjdr/task/TaskMining.java index 571a898..8e93f72 100644 --- a/src/main/java/com/example/jmacro/wjdr/task/TaskMining.java +++ b/src/main/java/com/example/jmacro/wjdr/task/TaskMining.java @@ -19,12 +19,12 @@ public class TaskMining extends BaseTask { Logger.info("》》》自动采矿开始》》》"); Logger.info("判断是否在野外"); - ScreenRect 城镇 = jMacro.waitAndMatchPic(this.screenRect, "L449,887-城镇", 0.9); + ScreenRect 城镇 = jMacro.waitAndMatchPic(this.screenRect, "城镇_L449,887", 0.9); if (城镇 != null) { Logger.info("当前界面【野外】"); } else { Logger.info("定位【野外】"); - ScreenRect 野外 = jMacro.waitAndMatchPic(this.screenRect, "城镇_野外", 0.99); + ScreenRect 野外 = jMacro.waitAndMatchPic(this.screenRect, "野外_L449,885", 0.99); if (野外 == null) { Logger.error("定位【野外】失败,采矿终止"); return; @@ -37,7 +37,7 @@ public class TaskMining extends BaseTask { } Logger.info("定位资源搜索按钮"); - ScreenRect 野外搜索 = jMacro.waitAndMatchPic(this.screenRect, "L15,632-野外_搜索", 0.8); + ScreenRect 野外搜索 = jMacro.waitAndMatchPic(this.screenRect, "野外_搜索_L15,632", 0.8); if (野外搜索 == null) { Logger.error("未检测到【资源搜索按钮】,采矿终止"); return; @@ -57,13 +57,13 @@ public class TaskMining extends BaseTask { } // 检测是否是搜索界面 - ScreenRect 搜索 = jMacro.waitAndMatchPic(this.screenRect, "L233,881-野外_搜索", 0.98); + ScreenRect 搜索 = jMacro.waitAndMatchPic(this.screenRect, "野外_搜索_L233,881", 0.98); if (搜索 != null) { Logger.info("退出资源搜索界面"); jMacro.mouseLeftClick(this.screenRect); } - ScreenRect 城1 = jMacro.waitAndMatchPic(this.screenRect, "L456,887-城镇", 0.9); + ScreenRect 城1 = jMacro.waitAndMatchPic(this.screenRect, "城镇_L456,887", 0.9); if (城1 == null) { Logger.error("未检测到【城镇】,采矿终止"); return; diff --git a/src/main/java/com/example/jmacro/wjdr/task/TaskRewards.java b/src/main/java/com/example/jmacro/wjdr/task/TaskRewards.java index 7f88572..229aeb8 100644 --- a/src/main/java/com/example/jmacro/wjdr/task/TaskRewards.java +++ b/src/main/java/com/example/jmacro/wjdr/task/TaskRewards.java @@ -15,7 +15,7 @@ public class TaskRewards extends BaseTask { Logger.info("》》》探险奖励领取开始》》》"); Logger.info("定位【探险】按钮"); - ScreenRect TAB_探险 = jMacro.waitAndMatchPic(this.screenRect, "L35,881-TAB_探险", 0.9); + ScreenRect TAB_探险 = jMacro.waitAndMatchPic(this.screenRect, "TAB_探险_L35,881", 0.9); if (TAB_探险 == null) { return; } @@ -23,7 +23,7 @@ public class TaskRewards extends BaseTask { Logger.info("点击【探险】按钮"); jMacro.mouseLeftClick(TAB_探险); - ScreenRect 探险_按钮 = jMacro.waitAndMatchPic(this.screenRect, "L240,854-探险_按钮", 0.9); + ScreenRect 探险_按钮 = jMacro.waitAndMatchPic(this.screenRect, "探险_按钮_L240,854", 0.9); if (探险_按钮 == null) { Logger.info("进入探险界面失败"); return; @@ -31,28 +31,35 @@ public class TaskRewards extends BaseTask { Logger.info("进入探险界面成功"); Logger.info("定位领取按钮"); - ScreenRect 探险_领取 = jMacro.waitAndMatchPic(this.screenRect, "L426,667-探险_领取", 0.8); - if (探险_领取 == null) { - Logger.error("未检测到【探险_领取】,领取终止"); + ScreenRect 探险_不可领取 = jMacro.waitAndMatchPic(this.screenRect, "探险_不可领取_L420,667", 0.8); + if (探险_不可领取 != null) { + Logger.info("探险不可领取"); return; - } - Logger.info("定位领取按钮成功,准备领取:{}", 探险_领取.toString()); - jMacro.mouseLeftClick(探险_领取); - ScreenRect 探险_领取2 = jMacro.waitAndMatchPic(this.screenRect, "L230,664-探险_领取2", 0.8); - if (探险_领取2 == null) { - Logger.error("任务终止"); - return; - } - jMacro.mouseLeftClick(探险_领取2); + } else { + Logger.info("定位领取按钮"); + ScreenRect 探险_领取 = jMacro.waitAndMatchPic(this.screenRect, "探险_领取_L426,667", 0.8); + if (探险_领取 == null) { + Logger.error("未检测到【探险_领取】,领取终止"); + return; + } + Logger.info("定位领取按钮成功,准备领取:{}", 探险_领取.toString()); + jMacro.mouseLeftClick(探险_领取); + ScreenRect 探险_领取2 = jMacro.waitAndMatchPic(this.screenRect, "探险_领取2_L230,664", 0.8); + if (探险_领取2 == null) { + Logger.error("任务终止"); + return; + } + jMacro.mouseLeftClick(探险_领取2); - ScreenRect 探险_获得奖励 = jMacro.waitAndMatchPic(this.screenRect, "L196,218-探险_获得奖励", 0.8); - if (探险_获得奖励 == null) { - Logger.error("任务终止"); - return; + ScreenRect 探险_获得奖励 = jMacro.waitAndMatchPic(this.screenRect, "探险_获得奖励_L196,218", 0.8); + if (探险_获得奖励 == null) { + Logger.error("任务终止"); + return; + } + jMacro.mouseLeftClick(探险_获得奖励); } - jMacro.mouseLeftClick(探险_获得奖励); - ScreenRect 探险_返回 = jMacro.waitAndMatchPic(this.screenRect, "L4,4-探险_返回", 0.8); + ScreenRect 探险_返回 = jMacro.waitAndMatchPic(this.screenRect, "探险_返回_L4,4", 0.8); if (探险_返回 == null) { Logger.error("任务终止"); return; diff --git a/src/main/java/com/example/jmacro/wjdr/util/Capture.java b/src/main/java/com/example/jmacro/wjdr/util/Capture.java index 6bcb3d7..0c0e8f7 100644 --- a/src/main/java/com/example/jmacro/wjdr/util/Capture.java +++ b/src/main/java/com/example/jmacro/wjdr/util/Capture.java @@ -6,13 +6,7 @@ import cn.hutool.log.StaticLog; import javax.swing.*; import javax.swing.filechooser.FileNameExtensionFilter; import java.awt.*; -import java.awt.event.KeyAdapter; -import java.awt.event.KeyEvent; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.awt.event.MouseMotionAdapter; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; +import java.awt.event.*; import java.awt.image.BufferedImage; import java.io.File; import java.util.prefs.Preferences; @@ -193,8 +187,8 @@ public class Capture extends JFrame { // 上一次保存目录 String lastPath = preferences.get(LAST_PATH, ""); // 默认文件名 - String prefix = "L" + (getCaptureX() - originX) + "," + (getCaptureY() - originY) + "-"; - String filename = prefix + System.currentTimeMillis() + ".png"; + String location = "_L" + (getCaptureX() - originX) + "," + (getCaptureY() - originY); + String filename = System.currentTimeMillis() + location + ".png"; JFileChooser jFileChooser = new JFileChooser(); jFileChooser.setFileFilter(new FileNameExtensionFilter("png", "png")); @@ -206,7 +200,7 @@ public class Capture extends JFrame { // 默认文件 File file = jFileChooser.getSelectedFile(); // 修正坐标 - filename = prefix + file.getName().replaceAll("L[0-9]+,[0-9]+-", ""); + filename = file.getName().replaceAll("(_L[0-9]+,[0-9]+)?.png", "") + location + ".png"; file = new File(file.getParent(), filename); Logger.info("保存路径" + file);