From 4cb8a08854aef4e6deb7c422aee582e9ac78ce0a Mon Sep 17 00:00:00 2001 From: wangbing Date: Sat, 21 Sep 2024 09:33:33 +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/城镇#L456,887.png | Bin 5170 -> 0 bytes legend/城镇#L461,902.png | Bin 0 -> 2753 bytes legend/野外_攻击#L249,433.png | Bin 1414 -> 0 bytes legend/野外_攻击#L252,434.png | Bin 0 -> 986 bytes legend/野外_攻击平均配置#L186,914.png | Bin 2762 -> 0 bytes legend/野外_攻击平均配置#L200,858.png | Bin 0 -> 2913 bytes legend/野外_资源搜索#L235,883.png | Bin 2957 -> 0 bytes legend/野外_资源搜索#L241,887.png | Bin 0 -> 1728 bytes .../java/xyz/wbsite/jmacro/tool/PickLegend.java | 2 +- .../xyz/wbsite/jmacro/wjdr/MacroForWJDR.java | 10 +++++----- .../wjdr/task/Task_仓库奖励领取.java | 2 +- .../jmacro/wjdr/task/Task_定位城镇.java | 2 +- .../jmacro/wjdr/task/Task_自动野怪.java | 14 +++++++------- 13 files changed, 15 insertions(+), 15 deletions(-) delete mode 100644 legend/城镇#L456,887.png create mode 100644 legend/城镇#L461,902.png delete mode 100644 legend/野外_攻击#L249,433.png create mode 100644 legend/野外_攻击#L252,434.png delete mode 100644 legend/野外_攻击平均配置#L186,914.png create mode 100644 legend/野外_攻击平均配置#L200,858.png delete mode 100644 legend/野外_资源搜索#L235,883.png create mode 100644 legend/野外_资源搜索#L241,887.png diff --git a/legend/城镇#L456,887.png b/legend/城镇#L456,887.png deleted file mode 100644 index e67ed8eddf480ab44457b288a3e5ec542ca864c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5170 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 IM6N<$g8rc11poj5 literal 0 HcmV?d00001 diff --git a/legend/野外_攻击平均配置#L186,914.png b/legend/野外_攻击平均配置#L186,914.png deleted file mode 100644 index efc0b76dab54f705840bfa0babc2e68ab2a031c0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2762 zcmV;*3N`hKP)=*|;pIThKDPfs0>k@5cO7iYFMn`4a7y??Dik3qN@i{@@dfzNHuFruWS5 z>oE6U=g+Wt*|qi3P4q23gPZ1OV-~vZntcEd*UT1d<7=>ut)Y|tUw!ZojIaFw`@}lG z=a}3;_ti(}yz&60&6DsKS3{WELLar_)01hC=GWrV^{*i>X@OUK363Ue;TxNeGRrU~ z)_;VRK9;R@Kw05HW@S4vbuK6ftmCq39F8nRjH&_hVl(PGuh4?Ofopmb!(V=j3uZUc z%WVjVQ6fXrjy!!Qa;u%lt#Tr#vX!3s4r6zIfG8#dJ~A^t`YZ&q_x}zzZL+d?7~0km zOyBz}254=S%|ocNjq!O$SH7pQVd&b%2;@ibsO!9n1Z4#x6&gr#^%%eN29Al1xA)4C zQdozU;oGRRO(G&q53e&?_(_d8AvYjGu0d&IA4X^~#l}9mu7K!t0mKE3JQFjUf5X6y zZ}|W2xhE8l;9h#pGoF}d#^LZ>_@6FBtfGuBx^H0{w$T;Ng8V8wV$&;dFer(DRl_Ht z6h8Fp9an@;d?V35d6zcxX9&Y(@Jy=3N1umaX zzr+wRi~+~S%CIyzH2ygQj9~v3P|z|=)e8~MW!M6 zo~?jyiWNa=R;25CV7|0Wi`~K8!+#P>9zx$fO__3WdiBgdhOTuCxjH*?v=llAvMF;m zS`7P!w8(*fLsU;90QLt-kZ0)S{-QQs85_Ft}#nQDvVb z>MY}Uyb=+~d0fwIF!YQHs!AK7wGLUK5dm@8I3}$k2WK=iz*lC%r<6fyo}SZ}RRizH zOhjdwaY|7QnYtN{sZFByU8HNf5Gd8-kD_xZF%NMUKa)cMknHjdeQ*%~`t~U_^eoT@ z7ikmoT%+!5FAyA;LUMRP`hE>&*v$EvF*BKr5(E6Bl{iAidotaGz%xbAlDRP>eFwlr zlH!%EpUGQRIWUa=OeTyC=j(dlVQ^jH$d@$qa;KcxB>fTc<(5l46Rdn(uneHM!Hp8j z2;>!A5Qu9aOt;}+XclDes({*xqfzvs1#yWT-k~yD;5e1H zhe*h-!~Wwk4nP-GnGRaCrg@YHE5U5D12^~t#UR@u#G1L8hoXx663{`{+)f(~Er`o9!s~Pyyv6l6NQkGGm@vNjh9l1!rh zBB$C#R9xYuP;Knt<%^Zs7-bCspx_?hUV28Rxqvja3DSaku?Ln_JJ#iXqPG zt9{}wRJsntr0by6x=?>{k=*(b+NbWJh|DkaOeSxPm=+___1I4UG6@WmzL{3p`}T>i zcqL)kXLUU!_O}3tGM(6eDhpEGAWl+4mNb~XcL)nf1g$W9ci#Ie(Hmt!ZGWH@or5tgYHGE>$vNCN~ zl7lCb;rYcEQkj(zEpJoTH;WLt4hKS%$ma~$;hkHSrWu*#O~@=WQ(0W*$hfx1)dvxks)aC7O=o}-#OF1kzGn%wo%1+H3}L1Iz!XH0zFBWxYH}kWxf};VRU81;7gV*erpZQ4lZ_gt77oCrw*ZW;ye4D3iJ&;@ zC#Vzjj3qF`k}?0}-zcu{fhXMyqUz)oBBAVV@WzZ)0rn0*)BGxKqJ3hQ0X1audjR-I z8X$_z<^Y)bm*Ge5DkP+T4*(xJ^aM(Dh|VE~Bvrth4mEx$WPa3>`%7yPrn2CK!T_)6 zT!hm>NUCmuxUdnGQ~{V&lo}iS&T4Ro&H@F-0V-#2-X2`GDV|Xm`GmVPyB`uS=Z4JM z)*{+$c9jcRRUJH&i`)O95?zl&1Z1{hkawZXPnZX=c9+TX!!S}Xa2Np0kM;oYO|c;G zteU91jhe1S_$8K-yV`yO01I}X8IUlwmCM9G!+`)g9Wr^aMu`E(*b|g$LMfg0x@b;z z7GSz|(Frdhr{Qg-s6bXtFV*$CD6Hu~a!wVJva~ptSpn9c*r`Q679&R;HC96e9Fs)< z+u$e0h35#2&%x)^3O9{@MLohMv1x~x^Ab+#7o3;3xJ-W?TfD-sXBZp*4|Fn_h!c(2 QYXATM07*qoM6N<$f><>#WB>pF diff --git a/legend/野外_攻击平均配置#L200,858.png b/legend/野外_攻击平均配置#L200,858.png new file mode 100644 index 0000000000000000000000000000000000000000..a307e8d5249142e9051e9be129aeb9a31aac3412 GIT binary patch literal 2913 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 DbAO+V diff --git a/legend/野外_资源搜索#L241,887.png b/legend/野外_资源搜索#L241,887.png new file mode 100644 index 0000000000000000000000000000000000000000..33eb01dc20b50bb49e7c2a804222a82d43c9511c GIT binary patch literal 1728 zcmV;x20!_UP)D6rS63I_zI}@uH*O##Bm}#6?}n7uuV0Jx2M-?L)vH%x?#-Jw;&1Me($dm`py+gr z4%`E`+$V5JZiPo+687vZ)^z(DedT?6yz}PGn@~pkB*1Lhffg0)a50qobok%+r|b*RKoRXV0FAIesq*i-V1S0gTx_aENJy-JCTr#m3?4 z)vID}f8+V{=b8~upFS05_NRCE?p@^P=R>jaUXAAFYyDcUpQFbJs<^lqhYugt45gPD zokNEXiFFBn@#=S76rC^~lP~7W>P}%K9Cxt*yeVl*^Ydg8|NjuhFk>yeex8TO z==I3U%fri;FU7*Wd-sr;nJKK7La#8KPo6x{JVbp);l+y=f@*!iPfmY;5x*uQGNfZ9cv!w7$Qc$jQa1X!ry2|LFz4+3&9G`sS2!mm`;5Ze@&AD^uA~!czQ|9Jt z*RG+dsYx@E(YbW#l8Bt7k{-Nk+C3O%#UePuq=A3<@F6Z-xF81eNS;L@P*Ud1nKPnj zP?r&-V`^$@#NRT~ic8Whj1RAb!8;0L#!b``w5O*B)z#Iwa^*@d@Z_aTRth~t;B9Sf z8pV2fUIjn=m(2)?j1$r1#Z^^RNJvN!xxzWU(7?jNLZqdo;o`-Mnqf3*!h{JpcI=p# zV+0h(b$?+}XbC*$hpE*d_8pE>iR0hOTHi9(+}w;M;qkCpv<;IpI$-6SgTORv17Ea7d^0CtRZrF)_MFj~+#6XsGBtscGq06SW>n zMDzv`lD6Bdg_ zYd#+$Y+7p~H(-d99~?}LaL<1Zmy|Y)4=jS)tR+|(9D_ZDDfsU-N% z2M@uj@CZ@T^dM<{U0t2fxpnK77A^j=TC9rLh+#7#F-7G&!8>ib0-p#os;X-=uIuYH z=cFU#S(5YmoRGO9b4~enc07i9hT*eO(_k23-3$CjAAgF$Bkkeqw@}bXZoG5n4svpG zU^1C-^5jYF5>lX~vSvjbgzDgV>g`wBi zdw$c9pXT^t;OOaUrP-%enr^t|^uTW2d5rln7=8guuyf~5k<_g3(iz*gZ-=$DwRqLa zKEtVmWfhZ{{figvXI60}c-f?LzT#Y|y9qj!1Iv7SxguTxnnBX=W zehd6XPP|WeNp^NNT&H?ryjKt=uiOFGb+zD=+iuwo%v>0O^&4VPu6kJiQYC-+STnl0 ztIv~sErE|8KQ10$^e`!+r%yvegJ@)mOJWO*{&6rRWMbE@U0Rq(4U;Jr`CAIGO;w~< z^`4gRco}+@Rvx-%&t9=7DZ`9;At|u(T8r7g#b94)xuA<4G|yuKmzS4|%ED48rM9*f zzpo5Ia!RV`sx files = FileUtil.loopFiles(Legend.getDefaultBase(), pathname -> pathname.getName().startsWith(legendName)); + List files = FileUtil.loopFiles(Legend.getDefaultBase(), pathname -> pathname.getName().startsWith(prefix)); if (files.size() > 0) { DialogUtil.confirm("提示", "存在相同图例,是否旧的删除?", result -> { if (result) { diff --git a/src/main/java/xyz/wbsite/jmacro/wjdr/MacroForWJDR.java b/src/main/java/xyz/wbsite/jmacro/wjdr/MacroForWJDR.java index c7bced7..f2f346e 100644 --- a/src/main/java/xyz/wbsite/jmacro/wjdr/MacroForWJDR.java +++ b/src/main/java/xyz/wbsite/jmacro/wjdr/MacroForWJDR.java @@ -83,11 +83,11 @@ public class MacroForWJDR extends JMacro { new Task_联盟互助(this, focusRect).run(); new Task_收留避难者(this, focusRect).run(); new Task_自动野怪(this, focusRect).run(); - new Task_自动采矿(this, focusRect).run(); - new Task_英雄招募领取(this, focusRect).run(); - new Task_任务奖励领取(this, focusRect).run(); - new Task_探险奖励领取(this, focusRect).run(); - new Task_邮件奖励领取(this, focusRect).run(); +// new Task_自动采矿(this, focusRect).run(); +// new Task_英雄招募领取(this, focusRect).run(); +// new Task_任务奖励领取(this, focusRect).run(); +// new Task_探险奖励领取(this, focusRect).run(); +// new Task_邮件奖励领取(this, focusRect).run(); new Task_仓库奖励领取(this, focusRect).run(); } } else { 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 6cace50..3954711 100644 --- a/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_仓库奖励领取.java +++ b/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_仓库奖励领取.java @@ -64,7 +64,7 @@ public class Task_仓库奖励领取 extends BaseTask { macro.delay(1000); Logger.info("检测下个包裹提示"); - ViewRect 仓库_距离下个包裹 = macro.matchLegend("仓库_距离下个包裹", 0.5); + ViewRect 仓库_距离下个包裹 = macro.matchLegend("仓库_距离下个包裹", 0.3); if (仓库_距离下个包裹 != null) { Logger.info("关闭下个包裹提示"); macro.mouseLeftClick(仓库_距离下个包裹); 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 389a81c..279ecd2 100644 --- a/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_定位城镇.java +++ b/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_定位城镇.java @@ -43,7 +43,7 @@ public class Task_定位城镇 extends BaseTask { } } {// 野外返回 - ViewRect rect = macro.matchLegend("城镇", 0.9); + ViewRect rect = macro.matchLegend("城镇", 0.8); 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 index 1ce4a47..223986f 100644 --- a/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_自动野怪.java +++ b/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_自动野怪.java @@ -89,7 +89,7 @@ public class Task_自动野怪 extends BaseTask { macro.mouseLeftClick(城镇_关闭面板); Logger.info("定位【野外】"); - ViewRect 野外 = macro.matchLegend("野外", 0.99); + ViewRect 野外 = macro.matchLegend("野外", 0.8); if (野外 == null) { Logger.error("定位【野外】失败,刷怪终止"); return; @@ -178,7 +178,7 @@ public class Task_自动野怪 extends BaseTask { macro.mouseLeftClick(野外_放大镜搜索); Logger.info("等待搜索面板"); - ViewRect 野外_搜索面板_搜索按钮 = macro.waitAndMatchLegend("野外_搜索面板_搜索按钮", 0.9); + ViewRect 野外_搜索面板_搜索按钮 = macro.waitAndMatchLegend("野外_搜索面板_搜索按钮", 0.6); if (野外_搜索面板_搜索按钮 == null) { Logger.error("未检测到【待搜索面板】,采矿终止"); return false; @@ -283,7 +283,7 @@ public class Task_自动野怪 extends BaseTask { break; } - ViewRect 野外_资源搜索 = macro.matchLegend("野外_资源搜索", 0.9); + ViewRect 野外_资源搜索 = macro.matchLegend("野外_资源搜索", 0.6); if (野外_资源搜索 == null) { Logger.error("定位【野外_资源搜索】失败,挑战终止"); return false; @@ -293,22 +293,22 @@ public class Task_自动野怪 extends BaseTask { macro.mouseLeftClick(野外_资源搜索); macro.delay(1500); - ViewRect 野外_攻击 = macro.waitAndMatchLegend("野外_攻击", 0.9); + ViewRect 野外_攻击 = macro.waitAndMatchLegend("野外_攻击", 0.6); if (野外_攻击 != null) { macro.mouseLeftClick(野外_攻击); macro.delay(1000); - macro.matchLegendAndClick("野外_攻击平均配置", 0.9); + macro.matchLegendAndClick("野外_攻击平均配置", 0.6); macro.delay(1000); boolean 体力不足 = macro.hasColor(macro.of(405, 899, 427, 915), "#f43b3b"); if (体力不足) { Logger.info("体力不足,取消"); - macro.matchLegendAndClick("自动野怪_返回", 0.9); + macro.matchLegendAndClick("自动野怪_返回", 0.6); return false; } - ViewRect[] viewRects = macro.waitAndMatchLegends(macro.of("野外_攻击出征", "野外_资源无对队列"), 0.9); + ViewRect[] viewRects = macro.waitAndMatchLegends(macro.of("野外_攻击出征", "野外_资源无对队列"), 0.6); if (viewRects[0] != null) { Logger.info("出征"); macro.mouseLeftClick(viewRects[0]);