From bb091ababd791a46991b5217fcd19a64c6c2c081 Mon Sep 17 00:00:00 2001 From: wangbing Date: Tue, 10 Sep 2024 23:36:07 +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/仓库_体力罐头#L245,406.png | Bin 0 -> 3747 bytes legend/城镇_礼包2#L446,77.png | Bin 0 -> 303 bytes .../wjdr/task/Task_仓库奖励领取.java | 11 ++++++----- .../jmacro/wjdr/task/Task_定位城镇.java | 7 +++++++ .../jmacro/wjdr/task/Task_自动练兵.java | 6 +++--- 5 files changed, 16 insertions(+), 8 deletions(-) create mode 100644 legend/仓库_体力罐头#L245,406.png create mode 100644 legend/城镇_礼包2#L446,77.png diff --git a/legend/仓库_体力罐头#L245,406.png b/legend/仓库_体力罐头#L245,406.png new file mode 100644 index 0000000000000000000000000000000000000000..ed7292e62402c71fa612e6795aa760b50013499c GIT binary patch literal 3747 zcmV;U4qWkxP)000hZNkl{>G14W=&0In`!mSY8o?9Q&UkY;Iv0#Or>6%LBxel?&^)<7TN|>?K!u%L5G4VQ9B$`Q3r;ub?i`uaPovRFc z=4P^TN+~QXp|~Iqm(@se{Bq(J&1X{ZU_$(SDau{TmD=l%Fev{Gb?e^m?5Zqhd{9>^ zH|LRV*WxfGvuu@~iE*V&T2aD;NELGzE<=@^j6s0)>Ld(qX_7H&RhV=dOnMy_gMk#g zgPb+_Y$)A8<+d{R?yh8eSt(AFj^q__#6(6gylZ=Aj}PV8@gM&JcK@DSi0*rJ{_;hv zI&o)gFuS&|Bg3IXuhlYjv6avT=}ZleCvJJXKqO+;C1VkpwO*MXO7%c$EP5?AqnB!jvhY1_um|#th7jePQ%KW7)Ay4WV|?7bEHPhx%&X@FZ#NAH^CqLgLF$G zJGYgP;nbtj=ovfD&csL^OP0jSKb9mnREd(kpZ^2Us7ZbZXBG#o1|4>jf$TIV2lnpZ z%*k&!f93~{9^6Z+%_8xxV!|h%(C3}ze7U>oQLx(*WA)BTg4@4EQMQGH)!WEQF`(5M znJ`yN`1}OVjjRG=GkE2`w*CRB`>S(*y5^O}>z=?lt!B1uS;x84N4b9aXDSv00B^rzd*3#tSAecGF+vfpfc-B-5sr^`ggV)(NOq0JUDHw7LgidM}v4 zgwgxzeA z-6bv<#3477xZ;L$2xMNigUa$^oEf=D&RVj$49u^%6D| zWeW5@iPVhKBC)F7-4Y-Hb4TX>%*#&UnEV2}_v}C=u^BXG>5&DKxRR2R!j8)A?5)~{ z%aJL2(I#M40kdH-Ij~urq&iZlt}5rI3q;`jBP zIBXwA!m|13lVd60l+WIs6=bD~{bs$~*u6M)o@<9VnQAvvv1L6!e1C{7n>Jz;XRJoA zY|^E|ye#%rm64vFPm;=xL2nZ?+^f5aa_e?2`*&`q_iHZ@ z7ut*Z3STI151U(ac1;)T%ciqpNhGS((Q?ClcJJCMOHwA)Vw3{wJ$uP+HhOkbmMqW8 zicK7@sivqPUnbEcu9>Be7SbIS*5_qlb>t9};E<(l7bq7Nb1GI#Iu3i9C(g4cj&S43 zNtENqzGdPkgGrh{gL4%sf$9KdKCtnhP|}iP*3QJvnad;}#wBZUb;zMMW#Nd5M{u(h4XElS^k;@7#8)`IGojzon|A#%<%BEqK% zke2;>wz4+MNk)oIZY-{t%^ufW@_5P1cFBXfh{9X}Gub>c8^s}G3aeBZ(!q4;UOHw= zhJa-XSQaj4CZ&bB9IM$w_3m<%vHg3qWv!iy-rg99fE1DYbj_EdpmHLn7V2Z6g~?OC%;ICIPZYZ0^YH z_8g4XT#P1xwr0uq+2U3MuxNvl%6{hYy#RpRH|zYS?Sr7Z!DpzVl(O4GC1j#DDe?fxOM$3 zchB#EO%mY-cembzLV?O}4(TsZZ-1U!s%JSJ(U`o^uQ55e51$Mh!r-Ap7%*rMLxYDh zZ(g`Krjy5)>^td{Lw1u}cAHDO5fDVrz&;Ef7Q&3# z^NCAPOX;m5r^K30k}e08sSvfTlw`*ilART(GWTIAKZddF7^4CTvpPnqIVc7=D@)@5{LTGF*17@1( z8WKadVT!0D*oW`88 zHRO=00ehD!RE$+98K96AsF2*bA))Uzp|{UJ=-s6ge!ku4;@guCy9bB@ML~4x-dFSy z9eWO-qyG>(288fo?=f`iJC2}%Qy3aDjedc{87VI)O4z8u7!sp7a&V8FI&M>cri%JC z9jKSm-_Lr1yV(-sCUL9qY0jlL;(Nnme6>npZ=AyRNQLzy6mt41r1VnIbXACMr!ckE zlMH$HW&GcN2fq(|=-KH5{5o}_duLy|b?HG5-vIo(_aVstWBTkCi@wS9~DrE}!i63=g!e&PQ0^W5EI<#$Ib?&+Iw+xQH%xqsu=Tye|(IERuO zP`yH7SB%28#R{bp1+0&P%U{9RO(F3^g&2X0Xx)IYe>P<5yA7G}PD94L-H4EPpX1Z_ zUgGoi%?a!B8qv~G&ERG@M!iM$`3I~(ZolGQVofz?QdHSme`y zxvd*AqL3b-VE0qdOO%P7ykJpn8xYy1A+y^wVx~`HX0>~oxt;#bLf_|!@qdYgk6uMH z|@>~b7DI}2M#BE+AL1|@U0i@=8daVe^J569vzt& zGLZ1F@kGrFWAnN!&Ky6?rQ_dlFlQC}=Cz|dSmGNhg_lVz_(-}X5vGY-Hn&^8-WXSO zP*~co0SkN@64B-f0c%Wn`@b=_9KKMX_Q9vBLCB76!%xi zlS#~!HQ^MuOn-4}na8ciJZ{bLX~gWdUa*JaLF*YHp`wPSdyv)je%~1`09qs46 zSP_-TXY<$K*SbAh5pJ zl&#P4{O?b~jFBV{Z_n~xuM*ekDH1v~@Ve#mpj%Szj4`7L9~i*gKJA&*wI$=*G-Xn&Moez?I8)wh#MJj2 z6V~==!hPRhzMM*8XHO#`R>R7S14N`9Vc5KEdbIB;uZ>9(d}=xpZz51k%9M^mu%|2IoK^F9Y1 zHnz|`YGXE>fQ?@}U1d4wVs{Ut>pS>Dua6`i8wVQS-pkT@qO$_(Er-ul2_^+)@eNE_?LpRHU>pDd002ovPDHLkV1f>B BgyH}I literal 0 HcmV?d00001 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 2c13c15..141b652 100644 --- a/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_仓库奖励领取.java +++ b/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_仓库奖励领取.java @@ -65,14 +65,15 @@ public class Task_仓库奖励领取 extends BaseTask { macro.delay(1000); } - Logger.info("检测体力宝箱"); - ViewRect 仓库_体力宝箱 = macro.matchLegend("仓库_体力宝箱", 0.5); - if (仓库_体力宝箱 == null) { + Logger.info("检测体力宝箱/罐头"); + ViewRect 仓库_体力罐头 = macro.matchLegend("仓库_体力罐头", 0.5); + if (仓库_体力罐头 == null) { Logger.info("无体力宝箱"); return; + } else { + Logger.info("领取体力罐头"); + macro.mouseLeftClick(仓库_体力罐头); } - Logger.info("领取体力宝箱"); - macro.mouseLeftClick(仓库_体力宝箱); macro.delay(1000); } } 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 7cbcc3b..a1f72a5 100644 --- a/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_定位城镇.java +++ b/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_定位城镇.java @@ -56,6 +56,13 @@ public class Task_定位城镇 extends BaseTask { Logger.info("关闭充值广告弹框"); } } + { // 定位弹框2 + ViewRect rect = macro.findLegend(macro.of(368,6, 524,191), "城镇_礼包2", 0.7); + if (rect != null) { + macro.mouseLeftClick(rect); + Logger.info("关闭充值广告弹框"); + } + } {// 定位离线收益 ViewRect rect = macro.matchLegend("城镇_离线收益", 0.9); if (rect != null) { 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 85d7851..eaf64a8 100644 --- a/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_自动练兵.java +++ b/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_自动练兵.java @@ -39,7 +39,7 @@ public class Task_自动练兵 extends BaseTask { macro.delay(1000); Logger.info("检测盾兵"); - ViewRect[] viewRects2 = macro.waitAndMatchLegends(0.9D, 3, "城镇_完成盾兵", "城镇_空闲盾兵"); + ViewRect[] viewRects2 = macro.waitAndMatchLegends(0.8D, 3, "城镇_完成盾兵", "城镇_空闲盾兵"); if (viewRects2 == null) { Logger.info("检测失败"); return; @@ -134,7 +134,7 @@ public class Task_自动练兵 extends BaseTask { macro.delay(1000); Logger.info("检测矛兵"); - ViewRect[] viewRects2 = macro.waitAndMatchLegends(0.9D, 3, "城镇_完成矛兵", "城镇_空闲矛兵"); + ViewRect[] viewRects2 = macro.waitAndMatchLegends(0.8D, 3, "城镇_完成矛兵", "城镇_空闲矛兵"); if (viewRects2 == null) { Logger.info("检测失败"); return; @@ -229,7 +229,7 @@ public class Task_自动练兵 extends BaseTask { macro.delay(1000); Logger.info("检测矛兵"); - ViewRect[] viewRects2 = macro.waitAndMatchLegends(0.9D, 3, "城镇_完成射手", "城镇_空闲射手"); + ViewRect[] viewRects2 = macro.waitAndMatchLegends(0.8D, 3, "城镇_完成射手", "城镇_空闲射手"); if (viewRects2 == null) { Logger.info("检测失败"); return;