diff --git a/legend/仓库_体力宝箱#L245,406.png b/legend/仓库_体力宝箱#L245,406.png new file mode 100644 index 0000000..20b40cc Binary files /dev/null and b/legend/仓库_体力宝箱#L245,406.png differ 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..4d5996e --- /dev/null +++ b/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_仓库奖励领取.java @@ -0,0 +1,38 @@ +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.6, "城镇_打开面板", "城镇_关闭面板"); + if (viewRects == null) { + Logger.info("检测面板状态检测失败"); + return; + } + if (viewRects[0] != null) { + Logger.info("打开面板"); + macro.mouseLeftClick(viewRects[0]); + macro.delay(1000); + } + + if (viewRects[1] != null) { + Logger.info("面板已打开"); + } + + Logger.info("选中城镇"); + macro.mouseLeftClick(macro.of(85, 200)); + macro.delay(1000); + + Logger.info("滑动到底部"); + macro.mouseLeftDrag(macro.of(158,626), macro.of(163,231), true); + } +} 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 f1afbe9..1a2b7bf 100644 --- a/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_自动采矿.java +++ b/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_自动采矿.java @@ -20,12 +20,11 @@ public class Task_自动采矿 extends BaseTask { @Override public void task(JMacro macro, ViewRect viewRect) { - Logger.info("读取行军状态"); { - Logger.info("检测面板状态"); + Logger.info("打开面板,读取行军状态"); ViewRect[] viewRects = macro.matchLegends(0.6, "城镇_打开面板", "城镇_关闭面板"); if (viewRects[0] == null && viewRects[1] == null) { - Logger.info("检测面板状态失败"); + Logger.error("检测面板状态失败"); return; }