From a3f40a9683c217221f10938611f5f90ac7a1f624 Mon Sep 17 00:00:00 2001 From: wangbing Date: Fri, 11 Oct 2024 23:35:37 +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/城镇_面板1选中#L19,187.png | Bin 0 -> 2072 bytes legend/城镇_面板1选中#L59,188.png | Bin 1871 -> 0 bytes legend/城镇_面板2选中#L181,187.png | Bin 0 -> 2159 bytes legend/城镇_面板2选中#L226,190.png | Bin 1648 -> 0 bytes legend/英雄招募_奖励清单#L238,169.png | Bin 0 -> 3149 bytes src/main/java/xyz/wbsite/jmacro/JMacro.java | 15 ++++-- .../java/xyz/wbsite/jmacro/JMainService.java | 6 +-- .../java/xyz/wbsite/jmacro/base/Legend.java | 2 +- .../xyz/wbsite/jmacro/tool/PickLegend.java | 2 +- .../wjdr/task/Task_仓库奖励领取.java | 2 +- .../wjdr/task/Task_英雄招募领取.java | 50 +++++++++++++----- 11 files changed, 54 insertions(+), 23 deletions(-) create mode 100644 legend/城镇_面板1选中#L19,187.png delete mode 100644 legend/城镇_面板1选中#L59,188.png create mode 100644 legend/城镇_面板2选中#L181,187.png delete mode 100644 legend/城镇_面板2选中#L226,190.png create mode 100644 legend/英雄招募_奖励清单#L238,169.png diff --git a/legend/城镇_面板1选中#L19,187.png b/legend/城镇_面板1选中#L19,187.png new file mode 100644 index 0000000000000000000000000000000000000000..9993ce421bda1a916b266d78d230552cd5960fe1 GIT binary patch literal 2072 zcmV+z2~w=<)cTjSjnlW53O5MNKS|Es`z+Y{saVy`z1jr`95qJOu z95yuY;t}xjhrqix48H=)S}@3%zho3V(ExbDUijp8!6&bm%o&1z;V2m=4v~zpYk2u4 z_B^*XkUC3jhCf-$LgoaJe{J9a`OI^yE(vf#pcgPf@(BdVCl46%Fo#4yff>Bi`?!={ zi%WtA_-8f4zhIcP!7r~1K}ltZ%qmAnvH}-wYjHN+2;Z#72q+wZFBuO^twCsZ4K8F< z!+<9wnNA-5z*%qm1<^JBDkcH@`KLY)0Yh|4Kj zTu85izn~R?5)1a?%i{@2kTc3Dc+2T6xSe0L5A0|Ud8pjyNJzSa7cX95+&Y0Yp#tZA zmmn-vi-=o7sEbSS_3KxB`SJxHKYqmI)HJfB5mSJ@~??z0T62{s(Hn8vBy@SnWV?Vi|QXGR!=M54ikjRv1 zXne>j1UE(#geH*V8t$M9M3p36RD{!M)i@)wc=1eLqB>w4?!{cv%-|$&kz{>{=o#*c z)mT_qaGDUGK7HB)Dj;;;0p$S08U%h(eHbJf?OAwUPwzDsaUD)l)ubY@Te6(vY zp(Qq~F^iC063SxRXJ$QO!w&5l^r0>m_L6|fpiq}$d3hOjyB(dKooqsIL8Xa9KdF+i zJqGz*YN$mB|34^@YuK{E&814@DnaNqM@UZ-P7>t%ymq(G;%KKQgl=GS_`Zdb!+{Aa zwSnWxE(tqAoY@mnJcaW)kMPrPsqDXhVqyYyb@dxN7OD>14u(^eWuhb^l>xl)Um=v0 zZZxrUjFuNpQCua+)uaM;=M+}5J6pF=@;715I3hnYSIg#b68M28h-wVy?=&JIF_qos z(qK~sp$W0Hv_wk6C|hQ@K7^`CU;h9S(!@CPVzzAVF-h2x&QmFbxf}iNW)iYZ_tyqM?v{^!nIaJ=Ne(W-vm2J2Cnbm{_V6>(1f4?rwPERipgX`|9}a9 zDs%{rON3He&Z-Z$&E>Ye&JKE=?w&sIGqnhj4tQj5=T<+nJ~e zJB}aoyC$N0g$% zDF~++wE1;xdTH5;N|E4lL6=u{dxwX9EO)@eHT-qBI55!$J6yAH1lYYIN;i#b!iUI^ zS3{z^Po!Uukr4|USlY1m_4O0QSW^aCV(2+eNtTyiL#VFCsUL1aqA{=u!zBRM)Y|O} zs5aK4w!Q&Y>jc}!ti3FoK{QE_V3Huav6sIE@1FZ$Vi4mH3nsR50VjbN1Cd|N2x8>j zh`C30G8sxVw>%+gVngkNNBD2bUFZx(vhx^4BT*Smi4FsUCN{ur9X&`C>EQQsE(Fpt z43a)%e0-dJpF-7WXxI#GMIGY*D8P*j1w=)9Jbm7dajTW|EM~-}t8hiyx3i5qa9n(O z-QhbESG54wEPhj5ue2k!Vh;S0aYPFnk*hYMsHz3OS zQq(}IZ$g@)7E!_nxSZ37c%c#L$~t7r4Um@ALrT;rm8jD7+$w~Lo*=BC15vqkxJj;= zS6qjC`esDjH6lV|+1b7wIF3GL;%k=h?Xb9=>g~i4HHlUaBVOK)pOu}6R`eoLJpw*a zm{@Y2uNuZRc|W3MorqU-AVx_VP3;(BbyJAZj)Je~N0j&}Zb(`YFMWncSvR7{`8dNI z;wtA6L*`vm4j@+Efgjbq CNahCs literal 0 HcmV?d00001 diff --git a/legend/城镇_面板1选中#L59,188.png b/legend/城镇_面板1选中#L59,188.png deleted file mode 100644 index 8209ba40d07d2c4b3fe6638b83c0a7e9ba5d6d86..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1871 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 literal 0 HcmV?d00001 diff --git a/src/main/java/xyz/wbsite/jmacro/JMacro.java b/src/main/java/xyz/wbsite/jmacro/JMacro.java index 1c55b56..06f2a44 100644 --- a/src/main/java/xyz/wbsite/jmacro/JMacro.java +++ b/src/main/java/xyz/wbsite/jmacro/JMacro.java @@ -151,6 +151,7 @@ public abstract class JMacro { } } else { robot.mouseMove(endX, endY); + delay(10); } } @@ -187,7 +188,13 @@ public abstract class JMacro { * @param rect 点 */ public void mouseLeftClick(ViewPoint rect, long delay) { - mouseMove(rect); + + // 获取当前鼠标位置 + Point mousePoint = MouseInfo.getPointerInfo().getLocation(); + if (mousePoint.x != rect.getX() || mousePoint.y != rect.getY()) { + Logger.info("鼠标移动至[{},{}]", rect.getX(), rect.getY()); + mouseMove(rect); + } robot.mousePress(InputEvent.BUTTON1_DOWN_MASK); delay(delay); robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK); @@ -380,11 +387,11 @@ public abstract class JMacro { */ public ViewRect findPic(ViewRect viewRect, File pic, double minSimilar) { if (!pic.exists()) { - Logger.error("[{}] does not exist!", pic.getAbsolutePath()); + Logger.info("[{}] does not exist!", pic.getAbsolutePath()); return null; } if (!pic.isFile()) { - Logger.error("[{}] is not a file!", pic.getAbsolutePath()); + Logger.info("[{}] is not a file!", pic.getAbsolutePath()); return null; } Logger.info("查找图片：{}", pic.getAbsolutePath()); @@ -408,7 +415,7 @@ public abstract class JMacro { } // 当查找区域比图片还小时，直接返回失败 if (viewRect.getWidth() < pic.getWidth() || viewRect.getHeight() < pic.getHeight()) { - Logger.error("视口尺寸小于图片"); + Logger.info("视口尺寸小于图片"); return null; } if (minSimilar > 1) { diff --git a/src/main/java/xyz/wbsite/jmacro/JMainService.java b/src/main/java/xyz/wbsite/jmacro/JMainService.java index e3c5932..583e442 100644 --- a/src/main/java/xyz/wbsite/jmacro/JMainService.java +++ b/src/main/java/xyz/wbsite/jmacro/JMainService.java @@ -77,7 +77,7 @@ public class JMainService { return false; } if (JMainService.getInstance().run) { - Logger.error("服务已启动"); + Logger.info("服务已启动"); return false; } @@ -90,7 +90,7 @@ public class JMainService { public static boolean stop() { if (!JMainService.getInstance().run) { - Logger.error("服务未启动"); + Logger.info("服务未启动"); return false; } // 停止服务 @@ -109,7 +109,7 @@ public class JMainService { @Override public void run() { if (macro == null) { - Logger.error("脚本未设置"); + Logger.info("脚本未设置"); return; } while (run) { diff --git a/src/main/java/xyz/wbsite/jmacro/base/Legend.java b/src/main/java/xyz/wbsite/jmacro/base/Legend.java index 0e8627e..fc10a76 100644 --- a/src/main/java/xyz/wbsite/jmacro/base/Legend.java +++ b/src/main/java/xyz/wbsite/jmacro/base/Legend.java @@ -84,7 +84,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); + Logger.info(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 0d1358d..e37452f 100644 --- a/src/main/java/xyz/wbsite/jmacro/tool/PickLegend.java +++ b/src/main/java/xyz/wbsite/jmacro/tool/PickLegend.java @@ -224,7 +224,7 @@ public class PickLegend extends JFrame { for (File file1 : files) { boolean delete = file1.delete(); if (!delete) { - Logger.error("删除失败,{}", file1.getAbsolutePath()); + Logger.info("删除失败,{}", file1.getAbsolutePath()); } } } 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 7a11d9b..ff13934 100644 --- a/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_仓库奖励领取.java +++ b/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_仓库奖励领取.java @@ -15,7 +15,7 @@ public class Task_仓库奖励领取 extends BaseTask { isReady(); Logger.info("打开面板"); - ViewRect[] viewRects = macro.matchLegends(macro.of("城镇_面板1选中", "城镇_面板2选中"), 0.9); + ViewRect[] viewRects = macro.matchLegends(macro.of("城镇_面板1选中", "城镇_面板2选中"), 0.7); if (viewRects[0] == null && viewRects[1] == null) { Logger.info("面板未打开"); 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 index 63f17ac..5e9fd8f 100644 --- a/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_英雄招募领取.java +++ b/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_英雄招募领取.java @@ -46,28 +46,52 @@ public class Task_英雄招募领取 extends BaseTask { macro.mouseLeftClick(macro.getFocusRect()); macro.delay(1000); - Logger.info("检测任意位置继续"); - ViewRect 点击任意位置退出 = macro.waitAndMatchLegend("英雄招募_奖励清单", 0.9, 3); - if (点击任意位置退出 != null) { - Logger.info("点击任意位置退出"); - macro.mouseLeftClick(点击任意位置退出); - macro.delay(1500); + { + Logger.info("检测奖励清单"); + ViewRect 点击任意位置退出 = macro.waitAndMatchLegend("英雄招募_奖励清单", 0.8, 4); + if (点击任意位置退出 != null) { + Logger.info("点击任意位置退出"); + macro.mouseLeftClick(点击任意位置退出); + macro.delay(1500); + } + } + + { + Logger.info("检测奖励清单"); + ViewRect 点击任意位置退出 = macro.waitAndMatchLegend("英雄招募_奖励清单", 0.8, 4); + if (点击任意位置退出 != null) { + Logger.info("点击任意位置退出"); + macro.mouseLeftClick(点击任意位置退出); + macro.delay(1500); + } } } } { - boolean 英雄招募_史诗招募 = macro.matchLegendAndClick("英雄招募_史诗招募", 0.9); + boolean 英雄招募_史诗招募 = macro.matchLegendAndClick("英雄招募_史诗招募", 0.8); if (英雄招募_史诗招募) { macro.delay(500); macro.mouseLeftClick(macro.getFocusRect()); macro.delay(1000); - Logger.info("检测任意位置继续"); - ViewRect 点击任意位置退出 = macro.waitAndMatchLegend("英雄招募_奖励清单", 0.9, 3); - if (点击任意位置退出 != null) { - Logger.info("点击任意位置退出"); - macro.mouseLeftClick(点击任意位置退出); - macro.delay(1500); + { + Logger.info("检测任意位置继续"); + ViewRect 点击任意位置退出 = macro.waitAndMatchLegend("英雄招募_奖励清单", 0.9, 4); + if (点击任意位置退出 != null) { + Logger.info("点击任意位置退出"); + macro.mouseLeftClick(点击任意位置退出); + macro.delay(1500); + } + } + + { + Logger.info("检测任意位置继续"); + ViewRect 点击任意位置退出 = macro.waitAndMatchLegend("英雄招募_奖励清单", 0.9, 4); + if (点击任意位置退出 != null) { + Logger.info("点击任意位置退出"); + macro.mouseLeftClick(点击任意位置退出); + macro.delay(1500); + } } } }