From ab00ae6faad8994e6c9090d0a68825a375097cc9 Mon Sep 17 00:00:00 2001 From: wangbing Date: Sun, 8 Sep 2024 17:23:27 +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/任务奖励_关闭#L494,79.png | Bin 0 -> 1660 bytes legend/任务奖励_待领取#L40,751.png | Bin 0 -> 809 bytes legend/任务奖励_待领取2#L41,752.png | Bin 0 -> 533 bytes legend/任务奖励_成长任务#L328,846.png | Bin 0 -> 686 bytes legend/任务奖励_每日任务#L500,846.png | Bin 0 -> 748 bytes legend/任务奖励_点击退出#L191,863.png | Bin 0 -> 4107 bytes legend/任务奖励_章节任务#L157,846.png | Bin 0 -> 686 bytes ...励_章节任务领取按钮#L415,378.png | Bin 0 -> 2337 bytes legend/任务奖励_领取按钮#L405,411.png | Bin 0 -> 2461 bytes .../xyz/wbsite/jmacro/wjdr/MacroForWJDR.java | 26 ++-- .../wjdr/task/Task_任务奖励领取.java | 81 ++++++++++ ...取.java => Task_探险奖励领取.java} | 6 +- .../jmacro/wjdr/task/Task_状态检测.java | 108 -------------- .../jmacro/wjdr/task/Task_自动采矿.java | 140 +++++++++++++++--- ...取.java => Task_邮件奖励领取.java} | 52 ++++++- 15 files changed, 257 insertions(+), 156 deletions(-) create mode 100644 legend/任务奖励_关闭#L494,79.png create mode 100644 legend/任务奖励_待领取#L40,751.png create mode 100644 legend/任务奖励_待领取2#L41,752.png create mode 100644 legend/任务奖励_成长任务#L328,846.png create mode 100644 legend/任务奖励_每日任务#L500,846.png create mode 100644 legend/任务奖励_点击退出#L191,863.png create mode 100644 legend/任务奖励_章节任务#L157,846.png create mode 100644 legend/任务奖励_章节任务领取按钮#L415,378.png create mode 100644 legend/任务奖励_领取按钮#L405,411.png create mode 100644 src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_任务奖励领取.java rename src/main/java/xyz/wbsite/jmacro/wjdr/task/{Task_探险领取.java => Task_探险奖励领取.java} (90%) delete mode 100644 src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_状态检测.java rename src/main/java/xyz/wbsite/jmacro/wjdr/task/{Task_邮箱礼包领取.java => Task_邮件奖励领取.java} (53%) diff --git a/legend/任务奖励_关闭#L494,79.png b/legend/任务奖励_关闭#L494,79.png new file mode 100644 index 0000000000000000000000000000000000000000..edca354b294a89a707560f66470720f540474c69 GIT binary patch literal 1660 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 X!r+C4Er^_D00000NkvXXu0mjfR!91t literal 0 HcmV?d00001 diff --git a/legend/任务奖励_成长任务#L328,846.png b/legend/任务奖励_成长任务#L328,846.png new file mode 100644 index 0000000000000000000000000000000000000000..19625170409f7e72514df2c5f82d6cc60fa14eee GIT binary patch literal 686 zcmV;f0#W^mP)7>0j;g`h;BD3eakIJ?f`sFSHvjOCb1nrqs{7%ih>5Ljdsq+KXkByG}il}llv zX5*F)G+9Dr5vJBfiVLQbl8{el47&E><6L~_dEf86=aUjjZ;(`aovi!@>QXCc*QYY5 zHZh_yFr?BjqS4`1>ljhT;n7;TZ^`7;fipM?8<7HVPF_6?wo*J+J7bP?d^x#zi%S?N zKZeg;g}3A=lle!O5jByPMwf06XZN|0_7^pA$y!9eaQjhE$W-oO1`CSluDi&>dB zL7_l$rJm%eOv9W~$>uiUO^b!8$VjBjj9TtS8Tl%cu`ZxLLg2SJ+YLtE2zW)ny#n^e zi@@}TEd#$!$5?0tQd0g^+{SErLS@Xz<*bS3h8XKv!1=)==BKCWZEWIQf^93*RT0)? zSQu@>P_mXZlj1y2tu~z(;R>eY3YJ6|JyA-!vhwhruBOA`WL&K1toY|o5xeM&h@sM6 z@ozn?#n*5+&rxN{qczHmH(bte$WHo#LKqC*!ONgvUI&NZ36G{(y_e$xbQIO|7vsa) UU|5#c`v3p{07*qoM6N<$f~>kregFUf literal 0 HcmV?d00001 diff --git a/legend/任务奖励_每日任务#L500,846.png b/legend/任务奖励_每日任务#L500,846.png new file mode 100644 index 0000000000000000000000000000000000000000..b5cff1d51314f2ef4fbc01ec7e04ac63f9c63a5d GIT binary patch literal 748 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 JPDHLkV1hhj#K8an literal 0 HcmV?d00001 diff --git a/legend/任务奖励_章节任务#L157,846.png b/legend/任务奖励_章节任务#L157,846.png new file mode 100644 index 0000000000000000000000000000000000000000..d8b2fc1a8d29714646d09581d2410e44430b6342 GIT binary patch literal 686 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 Hu0mjf+UHz_ literal 0 HcmV?d00001 diff --git a/legend/任务奖励_领取按钮#L405,411.png b/legend/任务奖励_领取按钮#L405,411.png new file mode 100644 index 0000000000000000000000000000000000000000..c515006c9937a598342c929e673cb6c238b80da5 GIT binary patch literal 2461 zcmV;O31aq%P){000SONkl|UwDLip|!>yR_-=%5B7w2kT1Ob|2UTCyh43o8|VnbC_5M?cZBhj z&cXyZ30fmTn-&L3^-|3Z3P-&n0wx81XwlOdx%qjx|KL9E+_{6ok|MZ;dcyr5eyIKT z4m^AI3~%1N`J~;tbqgh>CCJXr!KKTW@#@v9&yIci^eL7vUyhjA7z73d!oQ3EI|~Vb zm(~Y%y*k1yxf4tm1VK$TH3%FbVY5ZSFdXItUu^)69zBW|FJ4GHa^whx|2!PwJ+#=p zd-oUN5NPFZmB^oykBb*Cei07s_3PJi%*&TAKQNxVcI_G#Rs4$JQQcsX7f>(tG^%$v zjdz26fHTU=%kk*ZBb@`!pFhXGefyA=m4&Tax8ml_n|S>AvCeTi!}0g;-^aOg=P;*W z4w90Rux;Bm-MEJjA4+HM-MgoQ!Fm51y#4$4V@OIIT4n`8y*&Ku!!chP4x?$EVHskN z2@}(#1B%lR9z2l041qm+_F(qx*(fO~!Hyj}@Z`x8Iqt@d8`!dC3zjTdf{e@z1c!#e zNM(fnvHfxC)F}yO_3G6aGGqwK%F5*Ymo8nxfddC{_3BlfT5jLIjk9OZO85k)z!^Mh zD6BGta;m;I91%{Y^SeMD*%omlhvV{ld4l<4{rdItVJUwF(wA17%9)Ze6}B$+=s!4C z!r}iu9>@D+W@cjP(xp;yckkXsc6K(bt*w!kmWB%#F3A7Y)YKp}IvnchJ`JE8mdlc0 zgv55$IYQ@|R|tg4Ie74(T-EoX5E7l@IVwmwmT-O%a5}d||F{7kz~OwKgTreKXBQV2 zsV+saMMXtu7v2%7Ebj)$IRcKlI0ylKLvZ562^j+C&!5Nk?b~IgqQeXuD(Kj;V{(Q0 z&?irx#Hv-R8C z)~t~aPN#WHAaw3aaCm;hh7CwaNI*qJg;WaXB%G+IC^-+6$WY>SrBZTHCQeF6%VF-K zQ4DE-K1Wn4)3PAw1*_4*(Hgtzc73u`v+6K`Qc;AXsEfx8JN7GF=}*C-Qk0UdgqBo} zP=$@14d%|BE9c>L<~PFR@tU=35Z+s~7^B@}HEob4(0plE{4lNqtOD(272+z=iT85^ z9puXH+__Ua!m>=oa4ahdE7j-VPzB0-AH!*7*9sXkGIU8_xgQrOPc))!f7-C#SJ~WdqVX${0oGVwZ$m>+pu3fvZXwf2FpCjS8 z+UwxZQNkod0wyfNnVB^c4(%P#t!FpX*4FCEH|@-sGZ>RJ1{Sd$pqf{|d{gfx&~#xi z48pC@*0C)jyG25))nd?~L9*{q5-4*K`xU}rvZkYi#_(FWaN#>R)2E`Ht0M*tA1vW; zJo8F?d^{>EE2YBNCahSo0&&CRpz+qAY{A?9hYLYStXy7QykQ*Y0<+4{2HbeELlzI9 z9_5bFVzsCcCSxjtVM73$Hf=)u$av`xomI*+f2j!eBUBk-PMba*k=-Mao0qHWo0wb) zQ&FO#kiC2NA~iKt!lk-6mhcJ-3(?-s6^28d#KP5YUsdnDm3moMSj`B)`1A=<74PR7 zmUx2E_-as4P=Mpdk4r#`lT-}DjOCi!i$t+?V92ohReGb3bB^-A&6_u4@#4iYj2Ldp zHCC*Yaj9_V>j{&|9`gN?MMG^o3CAMS7tsUz$oN+(7L`MXwUH5M(WWJ0Vq#ELRi*1! z6o(0c8_jve^U%FVcchCFtZWUaJi=qOW7silc&@IlPR_;thhTV5o>x@4Z~s1wotOfr zSPfJ&G;g1=LEwni+$hr%O`TPU=oKk}C|d=`#!ohCm39IgOANKvZc$%4oD6tC6Aq zzrOrxRNps%rlnn=KfqQ8sCGxK1jI7CapOkW+bCt3A;BcecQH}XQL?M0({yUPP+mmu zZZK$NgzqfB$9EROS~tbtRC=70)k*>jV*2 zm0=A8hgPisvO}}>=IGsDIK8qO%a$!ePEL+&_PDA{qD93;2rh%YA3ptp(Y&7>41RKe!OxCpHpUrxfodd97%SC6=Lv+WTeofsL2BrQSfWW+OEev5hvsQ+PzjJKp|<8}u4p=} z?OUacazgWoZt~5d;taoB7*6SoCOxd77ix*d8dLnevk97rWBpj6)X{|LBdSs`j50jX zEWugAG!XaZv2l(!%&WrxBHyh<4q|msixuZ*8Pz}iU^2&7K=YShA>=zAHI^{D-;1zE#{MR@OO!Lj^)~V beTn!FIolE^hOCXM00000NkvXXu0mjfQkA!~ literal 0 HcmV?d00001 diff --git a/src/main/java/xyz/wbsite/jmacro/wjdr/MacroForWJDR.java b/src/main/java/xyz/wbsite/jmacro/wjdr/MacroForWJDR.java index 48c1da7..29a1b57 100644 --- a/src/main/java/xyz/wbsite/jmacro/wjdr/MacroForWJDR.java +++ b/src/main/java/xyz/wbsite/jmacro/wjdr/MacroForWJDR.java @@ -34,9 +34,10 @@ public class MacroForWJDR extends JMacro { @Override public synchronized ViewRect focus() { - Logger.info("聚焦窗口"); - ViewRect mumu = findLegend("慕慕_工具栏", 0.95d); + Logger.info("请确保MuMu显示分辨率为540 x 960(DPI 240)"); ViewRect rect = getScreenRect(); + Logger.info("查找定位MuMu工具栏"); + ViewRect mumu = findLegend("慕慕_工具栏", 0.95d); if (mumu == null) { Logger.info("聚焦窗口失败，默认全屏"); } else { @@ -80,10 +81,6 @@ public class MacroForWJDR extends JMacro { // 任意界面优先返回城镇 new Task_定位城镇(this, focusRect).run(); - // 检测状态 - Task_状态检测 task_状态检测 = new Task_状态检测(this, focusRect); - task_状态检测.run(); - // 可按优先级排序以下任务 { // 矿场攻击检测任务 @@ -92,23 +89,20 @@ public class MacroForWJDR extends JMacro { // 避难者 new Task_收留避难者(this, focusRect).run(); - // 邮箱礼包领取 - if (task_状态检测.有邮件奖励) { - new Task_邮箱礼包领取(this, focusRect).run(); - } + // 探险领取 + new Task_任务奖励领取(this, focusRect).run(); // 探险领取 - if (task_状态检测.有探险奖励) { - new Task_探险领取(this, focusRect).run(); - } + new Task_探险奖励领取(this, focusRect).run(); + + // 邮箱礼包领取 + new Task_邮件奖励领取(this, focusRect).run(); // 自动练兵 new Task_自动练兵(this, focusRect).run(); // 自动采矿任务 - if (task_状态检测.有空闲队列()) { - new Task_自动采矿(this, focusRect).run(); - } + new Task_自动采矿(this, focusRect).run(); } Logger.info("休眠1分钟..."); 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..5f6ea2b --- /dev/null +++ b/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_任务奖励领取.java @@ -0,0 +1,81 @@ +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) { + Logger.info("检测任务奖励"); + ViewRect[] viewRects = macro.matchLegends(0.3, "任务奖励_待领取", "任务奖励_待领取2"); + if (viewRects[0] == null && viewRects[1] == null) { + Logger.info("无任务奖励，跳过"); + return; + } + Logger.info("进入任务页面，领取奖励"); + macro.mouseLeftClick(macro.of(43, 758)); + + Logger.info("检测章节任务"); + ViewRect 章节任务 = macro.matchLegend("任务奖励_章节任务", 0.5); + if (章节任务 != null) { + Logger.info("领取章节任务"); + macro.mouseLeftClick(章节任务); + macro.delay(500); + ViewRect 领取; + do { + 领取 = macro.matchLegend("任务奖励_章节任务领取按钮", 0.9); + if (领取 != null) { + macro.mouseLeftClick(领取); + } + } while (领取 != null); + } + + Logger.info("检测成长任务"); + ViewRect 成长任务 = macro.matchLegend("任务奖励_成长任务", 0.5); + if (成长任务 != null) { + Logger.info("领取成长任务"); + macro.mouseLeftClick(成长任务); + macro.delay(500); + ViewRect 领取; + do { + 领取 = macro.matchLegend("任务奖励_领取按钮", 0.9); + if (领取 != null) { + macro.mouseLeftClick(领取); + macro.delay(1000); + } + } while (领取 != null); + } + + Logger.info("检测每日任务"); + ViewRect 每日任务 = macro.matchLegend("任务奖励_每日任务", 0.5); + if (每日任务 != null) { + Logger.info("领取每日任务"); + macro.mouseLeftClick(每日任务); + macro.delay(500); + ViewRect 领取; + do { + 领取 = macro.matchLegend("任务奖励_领取按钮", 0.9); + if (领取 != null) { + macro.mouseLeftClick(领取); + ViewRect 任务奖励_点击退出 = macro.waitAndMatchLegend("任务奖励_点击退出", 0.5, 2); + if (任务奖励_点击退出 != null) { + macro.mouseLeftClick(任务奖励_点击退出); + macro.delay(500); + } + } + } while (领取 != null); + } + + ViewRect legend = macro.matchLegend("任务奖励_关闭", 0.9); + if (legend != null) { + Logger.info("关闭任务奖励面板"); + macro.mouseLeftClick(legend); + } + } +} diff --git a/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_探险领取.java b/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_探险奖励领取.java similarity index 90% rename from src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_探险领取.java rename to src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_探险奖励领取.java index 88f2195..779dd7b 100644 --- a/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_探险领取.java +++ b/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_探险奖励领取.java @@ -4,15 +4,15 @@ import xyz.wbsite.jmacro.JMacro; import xyz.wbsite.jmacro.base.ViewRect; import xyz.wbsite.jmacro.util.Logger; -public class Task_探险领取 extends BaseTask { +public class Task_探险奖励领取 extends BaseTask { - public Task_探险领取(JMacro macro, ViewRect viewRect) { + public Task_探险奖励领取(JMacro macro, ViewRect viewRect) { super(macro, viewRect); } @Override public void task(JMacro macro, ViewRect viewRect) { - boolean 有探险奖励 = macro.matchColor(macro.of(71, 877, "#ff1e1f")); + boolean 有探险奖励 = macro.matchColor(macro.of(71,877,"#ff1e1f")); if (!有探险奖励) { Logger.info("探险奖励未满，跳过"); return; diff --git a/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_状态检测.java b/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_状态检测.java deleted file mode 100644 index 172c53c..0000000 --- a/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_状态检测.java +++ /dev/null @@ -1,108 +0,0 @@ -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 boolean 队列1空闲; - public boolean 队列2空闲; - public boolean 队列3空闲; - public boolean 队列4空闲; - public boolean 队列5空闲; - public boolean 队列6空闲; - - public boolean 满体力; - public boolean 有任务奖励; - public boolean 有邮件奖励; - public boolean 有探险奖励; - - public Task_状态检测(JMacro macro, ViewRect viewRect) { - super(macro, viewRect); - } - - @Override - public void task(JMacro macro, ViewRect viewRect) { - Logger.info("读取行军状态"); - { - Logger.info("检测面板状态"); - ViewRect[] viewRects = macro.matchLegends(0.6, "城镇_打开面板", "城镇_关闭面板"); - if (viewRects[0] == null && viewRects[1] == null) { - Logger.info("检测面板状态失败"); - return; - } - - if (viewRects[0] != null) { - Logger.info("打开面板"); - macro.mouseLeftClick(viewRects[0]); - macro.delay(1000); - } - - Logger.info("选中城镇"); - macro.mouseLeftClick(macro.of(85,200)); - macro.delay(1000); - // todo - - Logger.info("选中野外"); - macro.mouseLeftClick(macro.of(245,200)); - macro.delay(1000); - - ViewRect[] viewRects1 = macro.matchLegends(0.6D, - "城镇_面板_空闲1", - "城镇_面板_空闲2", - "城镇_面板_空闲3", - "城镇_面板_空闲4", - "城镇_面板_空闲5", - "城镇_面板_空闲6" - ); - - if (null != macro.matchLegend("城镇_面板_空闲1", 0.6D)) { - 队列1空闲 = true; - Logger.info("队列1空闲"); - } - if (null != macro.matchLegend("城镇_面板_空闲2", 0.6D)) { - 队列2空闲 = true; - Logger.info("队列2空闲"); - } - if (null != macro.matchLegend("城镇_面板_空闲3", 0.6D)) { - 队列3空闲 = true; - Logger.info("队列3空闲"); - } - if (null != macro.matchLegend("城镇_面板_空闲4", 0.6D)) { - 队列4空闲 = true; - Logger.info("队列4空闲"); - } - if (null != macro.matchLegend("城镇_面板_空闲5", 0.6D)) { - 队列5空闲 = true; - Logger.info("队列5空闲"); - } - if (null != macro.matchLegend("城镇_面板_空闲6", 0.6D)) { - 队列6空闲 = true; - Logger.info("队列6空闲"); - } - } - - ViewRect 城镇_关闭面板 = macro.matchLegend("城镇_关闭面板", 0.6); - if (城镇_关闭面板 == null) { - Logger.info("关闭面板异常"); - return; - } - Logger.info("关闭面板"); - macro.mouseLeftClick(城镇_关闭面板); - - {// 任务奖励 - 有任务奖励 = macro.matchColor(macro.of(43, 759, "#ff3939")); - } - {// 邮件奖励 - 有邮件奖励 = macro.matchColor(macro.of(506, 751, "#fe3939")); - } - {// 探险奖励 - 有探险奖励 = macro.matchColor(macro.of(71,877,"#ff1e1f")); - } - } - - public boolean 有空闲队列() { - return 队列1空闲 || 队列2空闲 || 队列3空闲 || 队列4空闲 || 队列5空闲 || 队列6空闲; - } -} 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 9a85f17..f1afbe9 100644 --- a/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_自动采矿.java +++ b/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_自动采矿.java @@ -7,41 +7,136 @@ import xyz.wbsite.jmacro.util.Logger; public class Task_自动采矿 extends BaseTask { + public boolean 队列1空闲; + public boolean 队列2空闲; + public boolean 队列3空闲; + public boolean 队列4空闲; + public boolean 队列5空闲; + public boolean 队列6空闲; + public Task_自动采矿(JMacro macro, ViewRect viewRect) { super(macro, viewRect); } @Override public void task(JMacro macro, ViewRect viewRect) { + Logger.info("读取行军状态"); + { + Logger.info("检测面板状态"); + ViewRect[] viewRects = macro.matchLegends(0.6, "城镇_打开面板", "城镇_关闭面板"); + if (viewRects[0] == null && viewRects[1] == null) { + Logger.info("检测面板状态失败"); + return; + } + + if (viewRects[0] != null) { + Logger.info("打开面板"); + macro.mouseLeftClick(viewRects[0]); + macro.delay(1000); + } + + Logger.info("选中野外"); + macro.mouseLeftClick(macro.of(245,200)); + macro.delay(1000); + + ViewRect[] viewRects1 = macro.matchLegends(0.6D, + "城镇_面板_空闲1", + "城镇_面板_空闲2", + "城镇_面板_空闲3", + "城镇_面板_空闲4", + "城镇_面板_空闲5", + "城镇_面板_空闲6" + ); + + if (null != macro.matchLegend("城镇_面板_空闲1", 0.6D)) { + 队列1空闲 = true; + Logger.info("队列1空闲"); + } + if (null != macro.matchLegend("城镇_面板_空闲2", 0.6D)) { + 队列2空闲 = true; + Logger.info("队列2空闲"); + } + if (null != macro.matchLegend("城镇_面板_空闲3", 0.6D)) { + 队列3空闲 = true; + Logger.info("队列3空闲"); + } + if (null != macro.matchLegend("城镇_面板_空闲4", 0.6D)) { + 队列4空闲 = true; + Logger.info("队列4空闲"); + } + if (null != macro.matchLegend("城镇_面板_空闲5", 0.6D)) { + 队列5空闲 = true; + Logger.info("队列5空闲"); + } + if (null != macro.matchLegend("城镇_面板_空闲6", 0.6D)) { + 队列6空闲 = true; + Logger.info("队列6空闲"); + } + } + + ViewRect 城镇_关闭面板 = macro.matchLegend("城镇_关闭面板", 0.6); + if (城镇_关闭面板 == null) { + Logger.info("关闭面板异常"); + return; + } + Logger.info("关闭面板"); + macro.mouseLeftClick(城镇_关闭面板); + + Logger.info("定位【野外】"); + ViewRect 野外 = macro.matchLegend("野外", 0.99); + if (野外 == null) { + Logger.error("定位【野外】失败，采矿终止"); + return; + } + Logger.info("定位【野外】成功，{}", 野外.toString()); + + Logger.info("点击【野外】，坐标{}", JSONUtil.toJsonStr(野外.getCenter())); + macro.mouseLeftClick(野外); macro.delayUnstable(); - Logger.info("判断是否在野外"); - ViewRect 城镇 = macro.matchLegend("城镇", 0.9); - if (城镇 != null) { - Logger.info("当前界面【野外】"); - } else { - Logger.info("定位【野外】"); - ViewRect 野外 = macro.matchLegend("野外", 0.99); - if (野外 == null) { - Logger.error("定位【野外】失败，采矿终止"); + Logger.info("定位野外按钮成功"); + + if (队列1空闲) { + Logger.info("队列一空闲资源，派去采集生肉"); + boolean success = collect("生肉", 3); + if (!success) { // 中断采集 return; } - Logger.info("定位【野外】成功，{}", 野外.toString()); + } - Logger.info("点击【野外】，坐标{}", JSONUtil.toJsonStr(野外.getCenter())); - macro.mouseLeftClick(野外); - macro.delayUnstable(); - Logger.info("定位野外按钮成功"); + if (队列2空闲) { + Logger.info("队列一空闲资源，派去采集木材"); + boolean success = collect("木材", 3); + if (!success) { // 中断采集 + return; + } + } + if (队列3空闲) { + Logger.info("队列一空闲资源，派去采集煤矿"); + boolean success = collect("煤矿", 3); + if (!success) { // 中断采集 + return; + } + } + if (队列4空闲) { + Logger.info("队列一空闲资源，派去采集铁矿"); + boolean success = collect("铁矿", 3); + if (!success) { // 中断采集 + return; + } } - Logger.info("开始采集资源"); - String[] types = new String[]{ - "生肉", "木材", "煤矿", "铁矿" - }; - for (String type : types) { - Logger.info("搜索资源【{}】", type); - boolean success = collect(type, 3); + if (队列5空闲) { + Logger.info("队列一空闲资源，派去采集煤矿"); + boolean success = collect("生肉", 3); if (!success) { // 中断采集 - break; + return; + } + } + if (队列6空闲) { + Logger.info("队列一空闲资源，派去采集铁矿"); + boolean success = collect("木材", 3); + if (!success) { // 中断采集 + return; } } @@ -57,6 +152,7 @@ public class Task_自动采矿 extends BaseTask { Logger.error("未检测到【城镇】，异常终止"); return; } + macro.mouseLeftClick(城1); 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 similarity index 53% rename from src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_邮箱礼包领取.java rename to src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_邮件奖励领取.java index a2b808b..16a3afb 100644 --- a/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_邮箱礼包领取.java +++ b/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_邮件奖励领取.java @@ -4,16 +4,16 @@ import xyz.wbsite.jmacro.JMacro; import xyz.wbsite.jmacro.base.ViewRect; import xyz.wbsite.jmacro.util.Logger; -public class Task_邮箱礼包领取 extends BaseTask { +public class Task_邮件奖励领取 extends BaseTask { - public Task_邮箱礼包领取(JMacro macro, ViewRect viewRect) { + public Task_邮件奖励领取(JMacro macro, ViewRect viewRect) { super(macro, viewRect); } @Override public void task(JMacro macro, ViewRect viewRect) { Logger.info("检测邮箱待领取礼包"); - boolean b = macro.matchColor(macro.of(506, 751, "#fe3939")); + boolean b = macro.matchColor(macro.of(504,751,"#f93838")); if (!b) { Logger.info("邮箱无待领取礼包"); return; @@ -23,10 +23,48 @@ public class Task_邮箱礼包领取 extends BaseTask { macro.mouseLeftClick(macro.of(505, 750)); macro.delay(1000); - // todo 战争 - // todo 联盟 + // 战争 + if (!macro.matchColor(macro.of(98,71,"#6c9fd8"))) { + macro.mouseLeftClick(macro.of(198,71)); + macro.delay(500); + + ViewRect 一键已读领取 = macro.waitAndMatchLegend("一键已读领取", 0.9, 2); + if (一键已读领取 == null) { + Logger.info("异常结束"); + return; + } + macro.mouseLeftClick(一键已读领取); + + ViewRect 点击任意位置退出 = macro.waitAndMatchLegend("点击任意位置退出", 0.5, 2); + if (点击任意位置退出 != null) { + Logger.info("点击任意位置退出"); + macro.mouseLeftClick(点击任意位置退出); + macro.delay(500); + } + } + + // 联盟 + if (!macro.matchColor(macro.of(198,71,"#6c9fd8"))) { + macro.mouseLeftClick(macro.of(198,71)); + macro.delay(500); + + ViewRect 一键已读领取 = macro.waitAndMatchLegend("一键已读领取", 0.9, 2); + if (一键已读领取 == null) { + Logger.info("异常结束"); + return; + } + macro.mouseLeftClick(一键已读领取); + + ViewRect 点击任意位置退出 = macro.waitAndMatchLegend("点击任意位置退出", 0.5, 2); + if (点击任意位置退出 != null) { + Logger.info("点击任意位置退出"); + macro.mouseLeftClick(点击任意位置退出); + macro.delay(500); + } + } + // 系统 - if (macro.matchColor(macro.of(297, 70, "#fe3939"))) { + if (!macro.matchColor(macro.of(297, 70, "#6c9fd8"))) { macro.mouseLeftClick(macro.of(297, 70)); macro.delay(500); @@ -46,7 +84,7 @@ public class Task_邮箱礼包领取 extends BaseTask { } // 报告 - if (macro.matchColor(macro.of(398, 71, "#fe3939"))) { + if (!macro.matchColor(macro.of(398, 71, "#6c9fd8"))) { macro.mouseLeftClick(macro.of(398, 71)); macro.delay(500);