diff --git a/legend/一键已读领取#L321,905.png b/legend/一键已读领取#L321,905.png new file mode 100644 index 0000000..b369ffe Binary files /dev/null and b/legend/一键已读领取#L321,905.png differ diff --git a/legend/一键已读领取#L360,908.png b/legend/一键已读领取#L360,908.png deleted file mode 100644 index 7d43ff9..0000000 Binary files a/legend/一键已读领取#L360,908.png and /dev/null differ diff --git a/legend/仓库_体力罐头领取#L235,690.png b/legend/仓库_体力罐头领取#L235,690.png deleted file mode 100644 index 3e7519d..0000000 Binary files a/legend/仓库_体力罐头领取#L235,690.png and /dev/null differ diff --git a/legend/仓库_体力罐头领取#L241,692.png b/legend/仓库_体力罐头领取#L241,692.png new file mode 100644 index 0000000..465d343 Binary files /dev/null and b/legend/仓库_体力罐头领取#L241,692.png differ diff --git a/legend/任务奖励_领取按钮#L399,415.png b/legend/任务奖励_领取按钮#L399,415.png new file mode 100644 index 0000000..8fc20ab Binary files /dev/null and b/legend/任务奖励_领取按钮#L399,415.png differ diff --git a/legend/任务奖励_领取按钮#L405,411.png b/legend/任务奖励_领取按钮#L405,411.png deleted file mode 100644 index c515006..0000000 Binary files a/legend/任务奖励_领取按钮#L405,411.png and /dev/null differ diff --git a/legend/城镇_面板_空闲1#L144,280.png b/legend/城镇_面板_空闲1#L144,280.png deleted file mode 100644 index 03303a2..0000000 Binary files a/legend/城镇_面板_空闲1#L144,280.png and /dev/null differ diff --git a/legend/城镇_面板_空闲1#L144,281.png b/legend/城镇_面板_空闲1#L144,281.png new file mode 100644 index 0000000..e17a44c Binary files /dev/null and b/legend/城镇_面板_空闲1#L144,281.png differ diff --git a/legend/城镇_面板_空闲2#L144,334.png b/legend/城镇_面板_空闲2#L144,334.png deleted file mode 100644 index 03303a2..0000000 Binary files a/legend/城镇_面板_空闲2#L144,334.png and /dev/null differ diff --git a/legend/城镇_面板_空闲2#L145,335.png b/legend/城镇_面板_空闲2#L145,335.png new file mode 100644 index 0000000..9a469ac Binary files /dev/null and b/legend/城镇_面板_空闲2#L145,335.png differ diff --git a/legend/城镇_面板_空闲3#L143,389.png b/legend/城镇_面板_空闲3#L143,389.png new file mode 100644 index 0000000..49436fc Binary files /dev/null and b/legend/城镇_面板_空闲3#L143,389.png differ diff --git a/legend/城镇_面板_空闲3#L144,388.png b/legend/城镇_面板_空闲3#L144,388.png deleted file mode 100644 index 03303a2..0000000 Binary files a/legend/城镇_面板_空闲3#L144,388.png and /dev/null differ diff --git a/legend/城镇_面板_空闲4#L144,443.png b/legend/城镇_面板_空闲4#L144,443.png deleted file mode 100644 index c6692fa..0000000 Binary files a/legend/城镇_面板_空闲4#L144,443.png and /dev/null differ diff --git a/legend/城镇_面板_空闲4#L144,444.png b/legend/城镇_面板_空闲4#L144,444.png new file mode 100644 index 0000000..cf2c2ff Binary files /dev/null and b/legend/城镇_面板_空闲4#L144,444.png differ diff --git a/legend/探险_不可领取#L417,672.png b/legend/探险_不可领取#L417,672.png new file mode 100644 index 0000000..ef84830 Binary files /dev/null and b/legend/探险_不可领取#L417,672.png differ diff --git a/legend/探险_不可领取#L420,667.png b/legend/探险_不可领取#L420,667.png deleted file mode 100644 index 6a73cff..0000000 Binary files a/legend/探险_不可领取#L420,667.png and /dev/null differ diff --git a/legend/探险_领取#L416,669.png b/legend/探险_领取#L416,669.png new file mode 100644 index 0000000..1759658 Binary files /dev/null and b/legend/探险_领取#L416,669.png differ diff --git a/legend/探险_领取#L426,667.png b/legend/探险_领取#L426,667.png deleted file mode 100644 index 50b7b45..0000000 Binary files a/legend/探险_领取#L426,667.png and /dev/null differ diff --git a/legend/探险_领取2#L217,683.png b/legend/探险_领取2#L217,683.png new file mode 100644 index 0000000..732f4c1 Binary files /dev/null and b/legend/探险_领取2#L217,683.png differ diff --git a/legend/探险_领取2#L230,664.png b/legend/探险_领取2#L230,664.png deleted file mode 100644 index 6d1bb95..0000000 Binary files a/legend/探险_领取2#L230,664.png and /dev/null differ diff --git a/legend/点击任意位置退出#L189,899.png b/legend/点击任意位置退出#L189,899.png new file mode 100644 index 0000000..dc30d64 Binary files /dev/null and b/legend/点击任意位置退出#L189,899.png differ diff --git a/legend/点击任意位置退出#L190,868.png b/legend/点击任意位置退出#L190,868.png deleted file mode 100644 index a71e43d..0000000 Binary files a/legend/点击任意位置退出#L190,868.png and /dev/null differ diff --git a/legend/英雄招募_免费招募#L136,475.png b/legend/英雄招募_免费招募#L136,475.png deleted file mode 100644 index 1e2cfbd..0000000 Binary files a/legend/英雄招募_免费招募#L136,475.png and /dev/null differ diff --git a/legend/英雄招募_免费招募#L137,532.png b/legend/英雄招募_免费招募#L137,532.png new file mode 100644 index 0000000..81f577f Binary files /dev/null and b/legend/英雄招募_免费招募#L137,532.png differ diff --git a/legend/英雄招募_史诗招募#L116,888.png b/legend/英雄招募_史诗招募#L116,888.png deleted file mode 100644 index 910fbbd..0000000 Binary files a/legend/英雄招募_史诗招募#L116,888.png and /dev/null differ diff --git a/legend/英雄招募_史诗招募#L122,891.png b/legend/英雄招募_史诗招募#L122,891.png new file mode 100644 index 0000000..7055c45 Binary files /dev/null and b/legend/英雄招募_史诗招募#L122,891.png differ diff --git a/legend/英雄招募_返回#L6,12.png b/legend/英雄招募_返回#L6,12.png deleted file mode 100644 index 0c443c9..0000000 Binary files a/legend/英雄招募_返回#L6,12.png and /dev/null differ diff --git a/legend/英雄招募_返回#L8,16.png b/legend/英雄招募_返回#L8,16.png new file mode 100644 index 0000000..3481c85 Binary files /dev/null and b/legend/英雄招募_返回#L8,16.png differ diff --git a/legend/英雄招募_高级招募#L117,624.png b/legend/英雄招募_高级招募#L117,624.png deleted file mode 100644 index b28967b..0000000 Binary files a/legend/英雄招募_高级招募#L117,624.png and /dev/null differ diff --git a/legend/英雄招募_高级招募#L122,626.png b/legend/英雄招募_高级招募#L122,626.png new file mode 100644 index 0000000..a1071d8 Binary files /dev/null and b/legend/英雄招募_高级招募#L122,626.png differ diff --git a/legend/邮件_点击任意位置退出#L187,863.png b/legend/邮件_点击任意位置退出#L187,863.png new file mode 100644 index 0000000..4b91dca Binary files /dev/null and b/legend/邮件_点击任意位置退出#L187,863.png differ diff --git a/legend/野外#L444,888.png b/legend/野外#L444,888.png deleted file mode 100644 index ea2d297..0000000 Binary files a/legend/野外#L444,888.png and /dev/null differ diff --git a/legend/野外#L453,887.png b/legend/野外#L453,887.png new file mode 100644 index 0000000..89c03f8 Binary files /dev/null and b/legend/野外#L453,887.png differ diff --git a/legend/野外_搜索面板_搜索按钮#L172,874.png b/legend/野外_搜索面板_搜索按钮#L172,874.png new file mode 100644 index 0000000..d360866 Binary files /dev/null and b/legend/野外_搜索面板_搜索按钮#L172,874.png differ diff --git a/legend/野外_搜索面板_搜索按钮#L226,879.png b/legend/野外_搜索面板_搜索按钮#L226,879.png deleted file mode 100644 index 6a2a982..0000000 Binary files a/legend/野外_搜索面板_搜索按钮#L226,879.png and /dev/null differ diff --git a/legend/野外_攻击#L243,435.png b/legend/野外_攻击#L243,435.png new file mode 100644 index 0000000..c8c8d90 Binary files /dev/null and b/legend/野外_攻击#L243,435.png differ diff --git a/legend/野外_攻击#L252,434.png b/legend/野外_攻击#L252,434.png deleted file mode 100644 index 90f26ef..0000000 Binary files a/legend/野外_攻击#L252,434.png and /dev/null differ diff --git a/legend/野外_攻击出征#L385,872.png b/legend/野外_攻击出征#L385,872.png deleted file mode 100644 index 3efad89..0000000 Binary files a/legend/野外_攻击出征#L385,872.png and /dev/null differ diff --git a/legend/野外_攻击出征#L389,874.png b/legend/野外_攻击出征#L389,874.png new file mode 100644 index 0000000..c383122 Binary files /dev/null and b/legend/野外_攻击出征#L389,874.png differ diff --git a/legend/野外_资源出征#L357,879.png b/legend/野外_资源出征#L357,879.png new file mode 100644 index 0000000..fe585c1 Binary files /dev/null and b/legend/野外_资源出征#L357,879.png differ diff --git a/legend/野外_资源出征#L378,881.png b/legend/野外_资源出征#L378,881.png deleted file mode 100644 index 5c01383..0000000 Binary files a/legend/野外_资源出征#L378,881.png and /dev/null differ diff --git a/legend/野外_资源搜索_木材#L204,648.png b/legend/野外_资源搜索_木材#L204,648.png deleted file mode 100644 index 297e932..0000000 Binary files a/legend/野外_资源搜索_木材#L204,648.png and /dev/null differ diff --git a/legend/野外_资源搜索_木材#L212,649.png b/legend/野外_资源搜索_木材#L212,649.png new file mode 100644 index 0000000..b143a3c Binary files /dev/null and b/legend/野外_资源搜索_木材#L212,649.png differ diff --git a/legend/野外_资源搜索_煤矿#L325,646.png b/legend/野外_资源搜索_煤矿#L325,646.png deleted file mode 100644 index 11f1a9c..0000000 Binary files a/legend/野外_资源搜索_煤矿#L325,646.png and /dev/null differ diff --git a/legend/野外_资源搜索_煤矿#L332,651.png b/legend/野外_资源搜索_煤矿#L332,651.png new file mode 100644 index 0000000..ef5fc09 Binary files /dev/null and b/legend/野外_资源搜索_煤矿#L332,651.png differ diff --git a/legend/野外_资源搜索_铁矿#L438,649.png b/legend/野外_资源搜索_铁矿#L438,649.png deleted file mode 100644 index c615afb..0000000 Binary files a/legend/野外_资源搜索_铁矿#L438,649.png and /dev/null differ diff --git a/legend/野外_资源搜索_铁矿#L446,651.png b/legend/野外_资源搜索_铁矿#L446,651.png new file mode 100644 index 0000000..8cdb87f Binary files /dev/null and b/legend/野外_资源搜索_铁矿#L446,651.png differ diff --git a/legend/野外_资源采集#L218,453.png b/legend/野外_资源采集#L218,453.png new file mode 100644 index 0000000..793da22 Binary files /dev/null and b/legend/野外_资源采集#L218,453.png differ diff --git a/legend/野外_资源采集#L241,452.png b/legend/野外_资源采集#L241,452.png deleted file mode 100644 index a335c3d..0000000 Binary files a/legend/野外_资源采集#L241,452.png and /dev/null differ diff --git a/src/main/java/xyz/wbsite/jmacro/JMacro.java b/src/main/java/xyz/wbsite/jmacro/JMacro.java index dc609dd..fa0e7e6 100644 --- a/src/main/java/xyz/wbsite/jmacro/JMacro.java +++ b/src/main/java/xyz/wbsite/jmacro/JMacro.java @@ -863,7 +863,7 @@ public abstract class JMacro { } } } - return null; + return new ViewRect[legends.length]; }, seconds, TimeUnit.SECONDS); } diff --git a/src/main/java/xyz/wbsite/jmacro/wjdr/MacroForWJDR.java b/src/main/java/xyz/wbsite/jmacro/wjdr/MacroForWJDR.java index f2f346e..62802ad 100644 --- a/src/main/java/xyz/wbsite/jmacro/wjdr/MacroForWJDR.java +++ b/src/main/java/xyz/wbsite/jmacro/wjdr/MacroForWJDR.java @@ -80,15 +80,15 @@ 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 { 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 d8a0372..c246bac 100644 --- a/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_任务奖励领取.java +++ b/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_任务奖励领取.java @@ -146,7 +146,7 @@ public class Task_任务奖励领取 extends BaseTask { macro.delay(500); ViewRect 领取; do { - 领取 = macro.matchLegend("任务奖励_领取按钮", 0.9); + 领取 = macro.matchLegend("任务奖励_领取按钮", 0.5); if (领取 != null) { macro.mouseLeftClick(领取); macro.delay(1000); @@ -162,7 +162,7 @@ public class Task_任务奖励领取 extends BaseTask { macro.delay(500); ViewRect 领取; do { - 领取 = macro.matchLegend("任务奖励_领取按钮", 0.9); + 领取 = macro.matchLegend("任务奖励_领取按钮", 0.5); if (领取 != null) { macro.mouseLeftClick(领取); ViewRect 任务奖励_点击退出 = macro.waitAndMatchLegend("任务奖励_点击退出", 0.5, 5); 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 222dfe3..f000d76 100644 --- a/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_自动采矿.java +++ b/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_自动采矿.java @@ -224,8 +224,9 @@ public class Task_自动采矿 extends BaseTask { macro.mouseLeftClick(野外_资源搜索); macro.delayUnstable(1500); - ViewRect 采集 = macro.waitAndMatchLegend("野外_资源采集", 0.9); + ViewRect 采集 = macro.waitAndMatchLegend("野外_资源采集", 0.8); if (采集 != null) { + Logger.info("点击采集"); macro.mouseLeftClick(采集); ViewRect[] viewRects = macro.waitAndMatchLegends(macro.of("野外_资源出征", "野外_资源无对队列", "野外_资源无士兵"), 0.9); 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 9ebba7d..2acfdf3 100644 --- a/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_英雄招募领取.java +++ b/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_英雄招募领取.java @@ -61,7 +61,7 @@ public class Task_英雄招募领取 extends BaseTask { macro.delay(1000); Logger.info("检测任意位置继续"); - ViewRect 点击任意位置退出 = macro.waitAndMatchLegend("英雄招募_点击任意位置退出", 0.5, 3); + ViewRect 点击任意位置退出 = macro.waitAndMatchLegend("英雄招募_点击任意位置退出", 0.25, 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 a253dae..03741c0 100644 --- a/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_邮件奖励领取.java +++ b/src/main/java/xyz/wbsite/jmacro/wjdr/task/Task_邮件奖励领取.java @@ -73,8 +73,8 @@ public class Task_邮件奖励领取 extends BaseTask { macro.delay(1000); // 战争 - if (macro.hasColor(macro.of(84,65,106,78), numColor)) { - macro.mouseLeftClick(macro.of(198,71)); + if (macro.hasColor(macro.of(92,64,111,77), numColor)) { + macro.mouseLeftClick(macro.of(99,71)); macro.delay(500); ViewRect 一键已读领取 = macro.waitAndMatchLegend("一键已读领取", 0.9, 2); @@ -104,7 +104,7 @@ public class Task_邮件奖励领取 extends BaseTask { } macro.mouseLeftClick(一键已读领取); - ViewRect 点击任意位置退出 = macro.waitAndMatchLegend("点击任意位置退出", 0.5, 2); + ViewRect 点击任意位置退出 = macro.waitAndMatchLegend("邮件_点击任意位置退出", 0.5, 2); if (点击任意位置退出 != null) { Logger.info("点击任意位置退出"); macro.mouseLeftClick(点击任意位置退出);