diff --git a/legend/任务奖励_点击退出#L190,864.png b/legend/任务奖励_点击退出#L190,864.png new file mode 100644 index 0000000..b0c8ca6 Binary files /dev/null and b/legend/任务奖励_点击退出#L190,864.png differ diff --git a/legend/任务奖励_点击退出#L191,863.png b/legend/任务奖励_点击退出#L191,863.png deleted file mode 100644 index 02b58d3..0000000 Binary files a/legend/任务奖励_点击退出#L191,863.png and /dev/null differ diff --git a/legend/探险_获得奖励#L196,218.png b/legend/探险_获得奖励#L196,218.png deleted file mode 100644 index 29019d0..0000000 Binary files a/legend/探险_获得奖励#L196,218.png and /dev/null differ diff --git a/legend/探险_获得奖励#L200,221.png b/legend/探险_获得奖励#L200,221.png new file mode 100644 index 0000000..2638b0d Binary files /dev/null and b/legend/探险_获得奖励#L200,221.png differ diff --git a/legend/邮件_获得奖励#L198,220.png b/legend/邮件_获得奖励#L198,220.png new file mode 100644 index 0000000..90b3509 Binary files /dev/null and b/legend/邮件_获得奖励#L198,220.png differ diff --git a/legend/野外#L456,870.png b/legend/野外#L456,870.png new file mode 100644 index 0000000..e61dcc8 Binary files /dev/null and b/legend/野外#L456,870.png differ diff --git a/src/main/java/xyz/wbsite/jmacro/wjdr/MacroForWJDR.java b/src/main/java/xyz/wbsite/jmacro/wjdr/MacroForWJDR.java index c2ffd9e..bb084ab 100644 --- a/src/main/java/xyz/wbsite/jmacro/wjdr/MacroForWJDR.java +++ b/src/main/java/xyz/wbsite/jmacro/wjdr/MacroForWJDR.java @@ -84,11 +84,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(); } } else { 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 3b80592..25b97d6 100644 --- a/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_探险奖励领取.java +++ b/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_探险奖励领取.java @@ -37,7 +37,7 @@ public class Task_探险奖励领取 extends BaseTask { } macro.mouseLeftClick(探险_领取2); - ViewRect 探险_获得奖励 = macro.waitAndMatchLegend("探险_获得奖励", 0.8); + ViewRect 探险_获得奖励 = macro.waitAndMatchLegend("探险_获得奖励", 0.5); if (探险_获得奖励 == null) { Logger.error("任务终止"); 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 index 03741c0..108b746 100644 --- a/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_邮件奖励领取.java +++ b/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_邮件奖励领取.java @@ -84,9 +84,9 @@ public class Task_邮件奖励领取 extends BaseTask { } macro.mouseLeftClick(一键已读领取); - ViewRect 点击任意位置退出 = macro.waitAndMatchLegend("点击任意位置退出", 0.5, 2); + ViewRect 点击任意位置退出 = macro.waitAndMatchLegend("邮件_获得奖励", 0.5, 5); if (点击任意位置退出 != null) { - Logger.info("点击任意位置退出"); + Logger.info("点击获得奖励退出"); macro.mouseLeftClick(点击任意位置退出); macro.delay(500); } @@ -104,9 +104,9 @@ public class Task_邮件奖励领取 extends BaseTask { } macro.mouseLeftClick(一键已读领取); - ViewRect 点击任意位置退出 = macro.waitAndMatchLegend("邮件_点击任意位置退出", 0.5, 2); + ViewRect 点击任意位置退出 = macro.waitAndMatchLegend("邮件_获得奖励", 0.5, 5); if (点击任意位置退出 != null) { - Logger.info("点击任意位置退出"); + Logger.info("点击获得奖励退出"); macro.mouseLeftClick(点击任意位置退出); macro.delay(500); } @@ -124,9 +124,9 @@ public class Task_邮件奖励领取 extends BaseTask { } macro.mouseLeftClick(一键已读领取); - ViewRect 点击任意位置退出 = macro.waitAndMatchLegend("点击任意位置退出", 0.5, 2); + ViewRect 点击任意位置退出 = macro.waitAndMatchLegend("邮件_获得奖励", 0.5, 5); if (点击任意位置退出 != null) { - Logger.info("点击任意位置退出"); + Logger.info("点击获得奖励退出"); macro.mouseLeftClick(点击任意位置退出); macro.delay(500); } @@ -144,9 +144,9 @@ public class Task_邮件奖励领取 extends BaseTask { } macro.mouseLeftClick(一键已读领取); - ViewRect 点击任意位置退出 = macro.waitAndMatchLegend("点击任意位置退出", 0.5, 2); + ViewRect 点击任意位置退出 = macro.waitAndMatchLegend("邮件_获得奖励", 0.5, 5); if (点击任意位置退出 != null) { - Logger.info("点击任意位置退出"); + Logger.info("点击获得奖励退出"); macro.mouseLeftClick(点击任意位置退出); macro.delay(500); }