diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 7208d6e..19c25a3 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -7,6 +7,7 @@
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
         <module name="starter-jmacro" />
+        <module name="starter-jmacro-wjdr" />
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel>
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index d2b8c0c..63574ec 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -3,7 +3,6 @@
   <component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8">
     <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/resources/lib" charset="UTF-8" />
     <file url="PROJECT" charset="UTF-8" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index e7b50fd..674aca4 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://repo.maven.apache.org/maven2" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
       <option name="name" value="Central Repository" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 911d29d..6aecfa7 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>
diff --git a/.idea/starter-jmacro.iml b/.idea/starter-jmacro.iml
new file mode 100644
index 0000000..78b2cc5
--- /dev/null
+++ b/.idea/starter-jmacro.iml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4" />
\ No newline at end of file
diff --git a/legend/anchor/野外.png b/legend/anchor/野外.png
deleted file mode 100644
index 3033477..0000000
Binary files a/legend/anchor/野外.png and /dev/null differ
diff --git a/legend/main/主页.png b/legend/main/主页.png
deleted file mode 100644
index ca9c28f..0000000
Binary files a/legend/main/主页.png and /dev/null differ
diff --git a/legend/启动图标.png b/legend/启动图标.png
new file mode 100644
index 0000000..b9c5f98
Binary files /dev/null and b/legend/启动图标.png differ
diff --git a/legend/城镇.png b/legend/城镇.png
new file mode 100644
index 0000000..0af3413
Binary files /dev/null and b/legend/城镇.png differ
diff --git a/legend/城镇_广告.png b/legend/城镇_广告.png
new file mode 100644
index 0000000..1d6dfc6
Binary files /dev/null and b/legend/城镇_广告.png differ
diff --git a/legend/城镇_野外.png b/legend/城镇_野外.png
new file mode 100644
index 0000000..d65e02d
Binary files /dev/null and b/legend/城镇_野外.png differ
diff --git a/legend/慕慕_工具栏.png b/legend/慕慕_工具栏.png
new file mode 100644
index 0000000..99d6d14
Binary files /dev/null and b/legend/慕慕_工具栏.png differ
diff --git a/legend/野外_搜索.png b/legend/野外_搜索.png
new file mode 100644
index 0000000..47857ec
Binary files /dev/null and b/legend/野外_搜索.png differ
diff --git a/legend/野外_木材.png b/legend/野外_木材.png
new file mode 100644
index 0000000..bf77b43
Binary files /dev/null and b/legend/野外_木材.png differ
diff --git a/legend/野外_煤矿.png b/legend/野外_煤矿.png
new file mode 100644
index 0000000..72a73a3
Binary files /dev/null and b/legend/野外_煤矿.png differ
diff --git a/legend/野外_生肉.png b/legend/野外_生肉.png
new file mode 100644
index 0000000..8f05f7e
Binary files /dev/null and b/legend/野外_生肉.png differ
diff --git a/legend/野外_资源_+.png b/legend/野外_资源_+.png
new file mode 100644
index 0000000..047491c
Binary files /dev/null and b/legend/野外_资源_+.png differ
diff --git a/legend/野外_资源_-.png b/legend/野外_资源_-.png
new file mode 100644
index 0000000..f01387e
Binary files /dev/null and b/legend/野外_资源_-.png differ
diff --git a/legend/野外_资源_出征.png b/legend/野外_资源_出征.png
new file mode 100644
index 0000000..cca1085
Binary files /dev/null and b/legend/野外_资源_出征.png differ
diff --git a/legend/野外_资源_搜索.png b/legend/野外_资源_搜索.png
new file mode 100644
index 0000000..ee340d5
Binary files /dev/null and b/legend/野外_资源_搜索.png differ
diff --git a/legend/野外_资源_等级1.png b/legend/野外_资源_等级1.png
new file mode 100644
index 0000000..3e66563
Binary files /dev/null and b/legend/野外_资源_等级1.png differ
diff --git a/legend/野外_资源_等级2.png b/legend/野外_资源_等级2.png
new file mode 100644
index 0000000..8a58e9a
Binary files /dev/null and b/legend/野外_资源_等级2.png differ
diff --git a/legend/野外_资源_等级3.png b/legend/野外_资源_等级3.png
new file mode 100644
index 0000000..bb12912
Binary files /dev/null and b/legend/野外_资源_等级3.png differ
diff --git a/legend/野外_资源_等级4.png b/legend/野外_资源_等级4.png
new file mode 100644
index 0000000..89b19a8
Binary files /dev/null and b/legend/野外_资源_等级4.png differ
diff --git a/legend/野外_资源_等级5.png b/legend/野外_资源_等级5.png
new file mode 100644
index 0000000..c256544
Binary files /dev/null and b/legend/野外_资源_等级5.png differ
diff --git a/legend/野外_资源_等级6.png b/legend/野外_资源_等级6.png
new file mode 100644
index 0000000..8eeda1e
Binary files /dev/null and b/legend/野外_资源_等级6.png differ
diff --git a/legend/野外_资源_等级7.png b/legend/野外_资源_等级7.png
new file mode 100644
index 0000000..db07cfe
Binary files /dev/null and b/legend/野外_资源_等级7.png differ
diff --git a/legend/野外_资源_等级8.png b/legend/野外_资源_等级8.png
new file mode 100644
index 0000000..373608c
Binary files /dev/null and b/legend/野外_资源_等级8.png differ
diff --git a/legend/野外_资源_采集.png b/legend/野外_资源_采集.png
new file mode 100644
index 0000000..3624116
Binary files /dev/null and b/legend/野外_资源_采集.png differ
diff --git a/legend/野外_铁矿.png b/legend/野外_铁矿.png
new file mode 100644
index 0000000..2957c35
Binary files /dev/null and b/legend/野外_铁矿.png differ
diff --git a/legend/首页_广告关闭按钮.png b/legend/首页_广告关闭按钮.png
new file mode 100644
index 0000000..6b2f95e
Binary files /dev/null and b/legend/首页_广告关闭按钮.png differ
diff --git a/pom.xml b/pom.xml
index 97c50ae..f84cbf8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,11 +3,11 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.example</groupId>
-    <artifactId>starter-jmacro</artifactId>
+    <artifactId>starter-jmacro-wjdr</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
     <!--<packaging>war</packaging>--><!--需要打包成war时放开-->
-    <name>starter-jmacro</name>
+    <name>starter-jmacro-wjdr</name>
     <description>project for Spring Boot</description>
 
     <properties>
diff --git a/src/main/java/com/example/jmacro/Main.java b/src/main/java/com/example/jmacro/Main.java
deleted file mode 100644
index 7b03084..0000000
--- a/src/main/java/com/example/jmacro/Main.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.example.jmacro;
-
-import cn.hutool.core.io.FileUtil;
-import com.example.jmacro.base.ScreenRect;
-import com.example.jmacro.util.Imager;
-import com.example.jmacro.util.Logger;
-
-import java.awt.*;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.util.List;
-
-public class Main {
-
-    public static void main(String[] args) throws AWTException {
-        Logger.info("启动脚本");
-
-        Logger.info("初始化脚本...");
-        JMacro jMacro = new JMacro();
-
-        // 开始定位App,好让后续的图片查找限定在一定范围内提高效率（如果过程中移动过App窗口需要重新定位，否则无法具体部件位置）
-        Logger.info("开始定位程序...");
-        List<BufferedImage> load = Imager.load(FileUtil.loopFiles(new File("legend", "main")));
-        ScreenRect appRect = null;
-        for (BufferedImage bufferedImage : load) {
-            appRect = jMacro.findPic(bufferedImage, 0.99d);
-            if (appRect != null) {
-                break;
-            }
-        }
-        if (appRect == null) {
-            Logger.error("定位主程序失败");
-            return;
-        }
-        Logger.info("定位图片成功，位置{},{},宽{}，高{}", appRect.getLeft(), appRect.getTop(), appRect.getWidth(), appRect.getHeight());
-
-        // 移动鼠标
-        jMacro.mouseRightClick(appRect);
-    }
-}
diff --git a/src/main/java/com/example/jmacro/util/Logger.java b/src/main/java/com/example/jmacro/util/Logger.java
deleted file mode 100644
index 4daebba..0000000
--- a/src/main/java/com/example/jmacro/util/Logger.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.example.jmacro.util;
-
-import cn.hutool.core.util.StrUtil;
-
-public class Logger {
-
-    public static void info(String log, Object... arg) {
-        System.out.println(StrUtil.format(log, arg));
-    }
-
-    public static void error(String log, Object... arg) {
-
-        System.err.println(StrUtil.format(log, arg));
-    }
-}
diff --git a/src/main/java/com/example/jmacro/wjdr/JGameThread.java b/src/main/java/com/example/jmacro/wjdr/JGameThread.java
new file mode 100644
index 0000000..1282a5f
--- /dev/null
+++ b/src/main/java/com/example/jmacro/wjdr/JGameThread.java
@@ -0,0 +1,13 @@
+package com.example.jmacro.wjdr;
+
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+
+public abstract class JGameThread implements Runnable {
+
+    protected JMacro jMacro;
+
+    public JGameThread(JMacro jMacro) {
+        this.jMacro = jMacro;
+    }
+}
diff --git a/src/main/java/com/example/jmacro/JMacro.java b/src/main/java/com/example/jmacro/wjdr/JMacro.java
similarity index 57%
rename from src/main/java/com/example/jmacro/JMacro.java
rename to src/main/java/com/example/jmacro/wjdr/JMacro.java
index cad8b00..9f5442f 100644
--- a/src/main/java/com/example/jmacro/JMacro.java
+++ b/src/main/java/com/example/jmacro/wjdr/JMacro.java
@@ -1,15 +1,17 @@
-package com.example.jmacro;
+package com.example.jmacro.wjdr;
 
 import cn.hutool.core.util.RandomUtil;
-import com.example.jmacro.base.ScreenPoint;
-import com.example.jmacro.base.ScreenRect;
-import com.example.jmacro.util.ColorUtil;
-import com.example.jmacro.util.Imager;
+import com.example.jmacro.wjdr.base.ScreenPoint;
+import com.example.jmacro.wjdr.base.ScreenRect;
+import com.example.jmacro.wjdr.util.ColorUtil;
+import com.example.jmacro.wjdr.util.Imager;
+import com.example.jmacro.wjdr.util.TaskUtil;
 
 import java.awt.*;
 import java.awt.event.InputEvent;
 import java.awt.image.BufferedImage;
 import java.io.File;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Java脚本
@@ -21,18 +23,39 @@ public class JMacro {
      */
     private Robot robot;
 
+    private JGameThread thread;
+
     public JMacro() throws AWTException {
         this.robot = new Robot();
     }
 
+    public JGameThread getThread() {
+        return thread;
+    }
+
+    public void setThread(JGameThread thread) {
+        this.thread = thread;
+    }
+
     /**
-     * 鼠标左键单击
+     * 鼠标移动
      *
      * @param point 屏幕点
      */
     public void mouseMove(ScreenPoint point) {
-        waitTap();
-        robot.mouseMove(point.getX(), point.getY());
+        // 获取当前鼠标位置
+        Point mousePoint = MouseInfo.getPointerInfo().getLocation();
+
+        int startX = mousePoint.x;
+        int startY = mousePoint.y;
+        // 分10次移动到指定点
+        for (int i = 1; i <= 10; i++) {
+            float d = i / 10f;
+            int dx = (int) (startX + (point.getX() - startX) * d);
+            int dy = (int) (startY + (point.getY() - startY) * d);
+            robot.mouseMove(dx, dy);
+            robot.delay(RandomUtil.randomInt(30, 70));
+        }
     }
 
     /**
@@ -41,9 +64,7 @@ public class JMacro {
      * @param rect 矩形区域
      */
     public void mouseLeftClick(ScreenRect rect) {
-        waitTap();
-        robot.mouseMove(rect.getCenter()[0], rect.getCenter()[1]);
-        waitTap();
+        mouseMove(new ScreenPoint(rect.getCenter()[0], rect.getCenter()[1]));
         robot.mousePress(InputEvent.BUTTON1_MASK);
         waitTap();
         robot.mouseRelease(InputEvent.BUTTON1_MASK);
@@ -145,7 +166,7 @@ public class JMacro {
      */
     public ScreenRect findPic(ScreenRect screenRect, BufferedImage pic, double minSimilar) {
         // 当查找区域比图片还小时，直接返回失败
-        if (screenRect.getWidth() < pic.getHeight() || screenRect.getHeight() < pic.getHeight()) {
+        if (screenRect.getWidth() < pic.getWidth() || screenRect.getHeight() < pic.getHeight()) {
             return null;
         }
 
@@ -156,28 +177,30 @@ public class JMacro {
 
         // 得到图片左上角范围
         int xMin = screenRect.getLeft();
-        int xMax = screenRect.getRight() - pic.getWidth();
+        // 因为坐标取像素点是从0开始，因此需要-1
+        int xMax = screenRect.getRight() - 1 - pic.getWidth();
         int yMin = screenRect.getTop();
-        int yMax = screenRect.getBottom() - pic.getHeight();
+        // 因为坐标取像素点是从0开始，因此需要-1
+        int yMax = screenRect.getBottom() - 1 - pic.getHeight();
 
         for (int y = yMin; y <= yMax; y++) {
             for (int x = xMin; x <= xMax; x++) {
                 // 对关键点进行先期匹配，降低运算复杂度。如果关键点本身就不匹配，就没必要再去匹配小图的每一个像素点
                 // 左上角
-                boolean lt = ColorUtil.isSimilar(screenData[x][y], picData[0][0]);
+                boolean lt = ColorUtil.isSimilar(screenData[x - xMin][y - yMin], picData[0][0]);
                 // 右上角
-                boolean rt = ColorUtil.isSimilar(screenData[x + pic.getWidth() - 1][y], picData[pic.getWidth() - 1][0]);
+                boolean rt = ColorUtil.isSimilar(screenData[x - xMin + pic.getWidth() - 1][y - yMin], picData[pic.getWidth() - 1][0]);
                 // 左下角
-                boolean lb = ColorUtil.isSimilar(screenData[x][y + pic.getHeight() - 1], picData[0][pic.getHeight() - 1]);
+                boolean lb = ColorUtil.isSimilar(screenData[x - xMin][y - yMin + pic.getHeight() - 1], picData[0][pic.getHeight() - 1]);
                 // 右下角
-                boolean rb = ColorUtil.isSimilar(screenData[x + pic.getWidth() - 1][y + pic.getHeight() - 1], picData[pic.getWidth() - 1][pic.getHeight() - 1]);
+                boolean rb = ColorUtil.isSimilar(screenData[x - xMin + pic.getWidth() - 1][y - yMin + pic.getHeight() - 1], picData[pic.getWidth() - 1][pic.getHeight() - 1]);
                 //中心点
-                boolean cc = ColorUtil.isSimilar(screenData[x + pic.getWidth() / 2][y + pic.getHeight() / 2], picData[pic.getWidth() / 2][pic.getHeight() / 2]);
+                boolean cc = ColorUtil.isSimilar(screenData[x - xMin + pic.getWidth() / 2][y - yMin + pic.getHeight() / 2], picData[pic.getWidth() / 2][pic.getHeight() / 2]);
                 if (lt && rt && lb && rb && cc) {
                     // 进行全像素匹配
-                    double similar = Imager.calcSimilar(x, y, pic.getHeight(), pic.getWidth(), screenData, picData);
+                    double similar = Imager.calcSimilar(x - xMin, y - yMin, pic.getHeight(), pic.getWidth(), screenData, picData);
                     if (similar >= minSimilar) {
-                        return new ScreenRect(x, y, x + pic.getWidth(), y + pic.getHeight());
+                        return new ScreenRect(x - xMin, y - yMin, x + pic.getWidth(), y + pic.getHeight());
                     }
                 }
             }
@@ -186,14 +209,36 @@ public class JMacro {
     }
 
     public void waitTap() {
-        robot.delay(RandomUtil.randomInt(100, 200));
+        int i = RandomUtil.randomInt(100, 200);
+//        Logger.info("随机等待{}ms", i);
+        robot.delay(i);
     }
 
     public void waitNormal() {
-        robot.delay(RandomUtil.randomInt(500, 1500));
+        int i = RandomUtil.randomInt(500, 1500);
+//        Logger.info("随机等待{}ms", i);
+        robot.delay(i);
     }
 
     public void waitLong() {
-        robot.delay(RandomUtil.randomInt(2000, 5000));
+        int i = RandomUtil.randomInt(2000, 5000);
+//        Logger.info("随机等待{}ms", i);
+        robot.delay(i);
+    }
+
+    public ScreenRect waitAndFindPic(ScreenRect rect, File file, double minSimilar) {
+        return waitAndFindPic(rect, file, minSimilar, 20, TimeUnit.SECONDS);
+    }
+
+    public ScreenRect waitAndFindPic(ScreenRect rect, File file, double minSimilar, long time, TimeUnit unit) {
+        return TaskUtil.timeTask(() -> {
+            while (true) {
+                waitTap();
+                ScreenRect pic = findPic(rect, Imager.load(file), minSimilar);
+                if (pic != null) {
+                    return pic;
+                }
+            }
+        }, time, unit);
     }
 }
diff --git a/src/main/java/com/example/jmacro/wjdr/Main.java b/src/main/java/com/example/jmacro/wjdr/Main.java
new file mode 100644
index 0000000..7b0e768
--- /dev/null
+++ b/src/main/java/com/example/jmacro/wjdr/Main.java
@@ -0,0 +1,154 @@
+package com.example.jmacro.wjdr;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.thread.ThreadUtil;
+import cn.hutool.core.util.RandomUtil;
+import com.example.jmacro.wjdr.base.ScreenRect;
+import com.example.jmacro.wjdr.task.TaskMining;
+import com.example.jmacro.wjdr.util.Imager;
+import com.example.jmacro.wjdr.util.Logger;
+import com.example.jmacro.wjdr.util.TaskUtil;
+
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.util.concurrent.TimeUnit;
+
+public class Main {
+
+    public static void main(String[] args) throws AWTException {
+        Logger.info("启动脚本");
+        Logger.setDebug(true);
+
+        boolean first = true;
+        Logger.info("初始化脚本...");
+        JMacro jMacro = new JMacro();
+
+        String workStart = "08:00:00";
+        String workEnd = "24:00:00";
+
+        while (true) {
+            ThreadUtil.sleep(1000);
+
+            // 首次启动直接执行游戏线程
+            if (first) {
+                first = false;
+                jMacro.setThread(new GameThread(jMacro));
+                TaskUtil.schedule(jMacro.getThread(), 0, TimeUnit.SECONDS);
+                continue;
+            }
+            if (jMacro.getThread() != null) {
+//                Logger.debug("待机中...");
+                continue;
+            }
+
+            if (DateUtil.isIn(DateUtil.date(), DateUtil.parse(workStart), DateUtil.parse(workEnd))) {
+                int anInt = RandomUtil.randomInt(5, 20);
+                Logger.info("等待{}分钟后，重新启动游戏线程");
+                jMacro.setThread(new GameThread(jMacro));
+                TaskUtil.schedule(jMacro.getThread(), anInt, TimeUnit.MINUTES);
+            }
+        }
+    }
+
+    public static class GameThread extends JGameThread {
+
+        private ScreenRect gameScreen;
+
+        public GameThread(JMacro jMacro) {
+            super(jMacro);
+            // 定位mumu bar
+            ScreenRect mumu = locationMuMu(jMacro);
+            if (mumu == null) {
+                throw new IllegalStateException("未检测到MuMu，请开启MuMu模拟器");
+            }
+            Logger.info("游戏线程启动成功");
+            // 获取游戏窗口返回
+            gameScreen = new ScreenRect();
+            gameScreen.setLeft(mumu.getLeft() - 190);
+            gameScreen.setTop(mumu.getTop() - 7);
+            gameScreen.setRight(mumu.getRight() + 194);
+            gameScreen.setBottom(mumu.getBottom() + 950);
+            Logger.info("游戏窗口位置：" + gameScreen.toString());
+        }
+
+        @Override
+        public void run() {
+            // 获取启动图标
+            ScreenRect launch = jMacro.waitAndFindPic(gameScreen, new File("legend", "启动图标.png"), 0.8, 5, TimeUnit.SECONDS);
+            if (launch != null) {
+                Logger.info("启动图标坐标：", launch.toString());
+                Logger.info("启动程序");
+                jMacro.mouseLeftClick(launch);
+            }
+            Logger.info("扫描游戏主界面：");
+            ScreenRect 城镇 = TaskUtil.timeTask(() -> {
+                while (true) {
+                    ScreenRect screenRect1 = locationHome(jMacro);
+                    if (screenRect1 != null) {
+                        return screenRect1;
+                    }
+                    ThreadUtil.sleep(1000);
+                }
+            }, 30 * 1000, TimeUnit.MILLISECONDS);
+
+            if (城镇 == null) {
+                jMacro.setThread(null);
+                Logger.info("未扫描到游戏主界：退出线程");
+                return;
+            }
+
+            Logger.info("进入游戏主界面");
+
+            Logger.info("进入任务线程");
+            TaskUtil.timeTask((Runnable) () -> {
+                while (true) {
+                    jMacro.waitNormal();
+
+                    Logger.info("检测矿场攻击状态开始");
+                    taskMineAttack(jMacro, gameScreen);
+                    Logger.info("检测矿场攻击状态结束");
+
+                    // 自动采矿
+                    Logger.info("自动采矿开始");
+                    new TaskMining(jMacro, gameScreen).start();
+                    Logger.info("自动采矿结束");
+
+                }
+            }, 10, TimeUnit.MINUTES);
+        }
+    }
+
+    public static ScreenRect locationHome(JMacro jMacro) {
+        { // 定位弹框，关闭弹框
+            BufferedImage image = Imager.load(new File("legend", "首页_广告关闭按钮.png"));
+            ScreenRect rect = jMacro.findPic(image, 0.80d);
+            if (rect != null) {
+                jMacro.mouseLeftClick(rect);
+                Logger.info("检测到弹框，关闭弹框");
+            }
+        }
+
+        { // 定位主程序
+            BufferedImage legend = Imager.load(new File("legend", "城镇.png"));
+            ScreenRect rect = jMacro.findPic(legend, 0.80d);
+            if (rect != null) {
+                Logger.info("程序主界面已就绪");
+                return rect;
+            }
+        }
+        return null;
+    }
+
+    public static ScreenRect locationMuMu(JMacro jMacro) {
+        BufferedImage image = Imager.load(new File("legend", "慕慕_工具栏.png"));
+        return jMacro.findPic(image, 0.99d);
+    }
+
+    /**
+     * 检测矿场被攻击
+     */
+    public static void taskMineAttack(JMacro jMacro, ScreenRect screenRect) {
+
+    }
+}
diff --git a/src/main/java/com/example/jmacro/base/ScreenPoint.java b/src/main/java/com/example/jmacro/wjdr/base/ScreenPoint.java
similarity index 73%
rename from src/main/java/com/example/jmacro/base/ScreenPoint.java
rename to src/main/java/com/example/jmacro/wjdr/base/ScreenPoint.java
index ebd4e25..df67a62 100644
--- a/src/main/java/com/example/jmacro/base/ScreenPoint.java
+++ b/src/main/java/com/example/jmacro/wjdr/base/ScreenPoint.java
@@ -1,4 +1,4 @@
-package com.example.jmacro.base;
+package com.example.jmacro.wjdr.base;
 
 /**
  * 屏幕点
@@ -11,6 +11,10 @@ public class ScreenPoint {
     public ScreenPoint() {
     }
 
+    public ScreenPoint(int x, int y) {
+        this.x = x;
+        this.y = y;
+    }
 
     public int getX() {
         return x;
diff --git a/src/main/java/com/example/jmacro/base/ScreenRect.java b/src/main/java/com/example/jmacro/wjdr/base/ScreenRect.java
similarity index 79%
rename from src/main/java/com/example/jmacro/base/ScreenRect.java
rename to src/main/java/com/example/jmacro/wjdr/base/ScreenRect.java
index 7de8e10..8339d6e 100644
--- a/src/main/java/com/example/jmacro/base/ScreenRect.java
+++ b/src/main/java/com/example/jmacro/wjdr/base/ScreenRect.java
@@ -1,4 +1,4 @@
-package com.example.jmacro.base;
+package com.example.jmacro.wjdr.base;
 
 /**
  * 屏幕区域
@@ -63,4 +63,14 @@ public class ScreenRect {
     public int[] getCenter() {
         return new int[]{(left + right) / 2, (top + bottom) / 2};
     }
+
+    @Override
+    public String toString() {
+        return "ScreenRect{" +
+                "left=" + left +
+                ", top=" + top +
+                ", right=" + right +
+                ", bottom=" + bottom +
+                '}';
+    }
 }
diff --git a/src/main/java/com/example/jmacro/wjdr/task/TaskMining.java b/src/main/java/com/example/jmacro/wjdr/task/TaskMining.java
new file mode 100644
index 0000000..a4a99a0
--- /dev/null
+++ b/src/main/java/com/example/jmacro/wjdr/task/TaskMining.java
@@ -0,0 +1,95 @@
+package com.example.jmacro.wjdr.task;
+
+import com.example.jmacro.wjdr.JMacro;
+import com.example.jmacro.wjdr.base.ScreenRect;
+import com.example.jmacro.wjdr.util.Logger;
+
+import java.io.File;
+
+public class TaskMining {
+
+    private JMacro jMacro;
+    private ScreenRect screenRect;
+
+    public TaskMining(JMacro jMacro, ScreenRect screenRect) {
+        this.jMacro = jMacro;
+        this.screenRect = screenRect;
+    }
+
+    public void start() {
+        Logger.info("自动采矿");
+        ScreenRect 野外 = jMacro.waitAndFindPic(screenRect, new File("legend", "城镇_野外.png"), 0.99);
+        if (野外 == null) {
+            Logger.error("未检测到【野外】，采矿终止");
+            return;
+        }
+
+        Logger.info("城镇_野外坐标：" + 野外.toString());
+        Logger.info("进入野外成功");
+        jMacro.mouseLeftClick(野外);
+        Logger.info("定位野外按钮成功");
+
+        ScreenRect 野外搜索 = jMacro.waitAndFindPic(screenRect, new File("legend", "野外_搜索.png"), 0.9);
+        jMacro.mouseLeftClick(野外搜索);
+
+
+        boolean collect = false;
+
+        while (!collect) {
+
+        }
+
+        collect("生肉", 0);
+        collect("木材", 0);
+        collect("煤矿", 0);
+        collect("铁矿", 0);
+
+        ScreenRect 城镇 = jMacro.waitAndFindPic(screenRect, new File("legend", "城镇.png"), 0.9);
+        if (城镇 == null) {
+            Logger.error("未检测到【城镇】，采矿终止");
+            return;
+        }
+    }
+
+    /**
+     * @param level
+     * @return
+     */
+    private boolean collect(String type, int level) {
+        ScreenRect typeRect = jMacro.waitAndFindPic(screenRect, new File("legend", "野外_" + type + ".png"), 0.9);
+        jMacro.mouseLeftClick(typeRect);
+
+        if (level == 0) {
+            ScreenRect 等级减 = jMacro.waitAndFindPic(screenRect, new File("legend", "野外_资源_-.png"), 0.98);
+            while (等级减 != null) {
+                jMacro.waitTap();
+                jMacro.mouseLeftClick(等级减);
+                等级减 = jMacro.waitAndFindPic(screenRect, new File("legend", "野外_资源_-.png"), 0.98);
+            }
+            Logger.info("矿等级重置为1");
+            level = 1;
+        }
+
+        Logger.info("搜索{}{}级矿", type, level);
+        ScreenRect 搜索 = jMacro.waitAndFindPic(screenRect, new File("legend", "野外_资源_搜索.png"), 0.98);
+        jMacro.mouseLeftClick(搜索);
+        ScreenRect 采集 = jMacro.waitAndFindPic(screenRect, new File("legend", "野外_资源_采集.png"), 0.98);
+        if (采集 == null) {
+            Logger.info("未搜索到{}{}级矿！", type, level);
+            ScreenRect 等级加 = jMacro.waitAndFindPic(screenRect, new File("legend", "野外_资源_+.png"), 0.98);
+            jMacro.mouseLeftClick(等级加);
+            return collect(type, level + 1);
+        }
+        Logger.info("搜索到{}{}级矿", type, level);
+        Logger.info("采集{}{}级矿", type, level);
+        jMacro.mouseLeftClick(采集);
+        ScreenRect 出征 = jMacro.waitAndFindPic(screenRect, new File("legend", "野外_资源_出征.png"), 0.98);
+        if (出征 == null) {
+            Logger.info("出征{}{}级矿失败！", type, level);
+            return false;
+        }
+        Logger.info("出征{}{}级矿", type, level);
+        jMacro.mouseLeftClick(采集);
+        return true;
+    }
+}
diff --git a/src/main/java/com/example/jmacro/util/ColorUtil.java b/src/main/java/com/example/jmacro/wjdr/util/ColorUtil.java
similarity index 97%
rename from src/main/java/com/example/jmacro/util/ColorUtil.java
rename to src/main/java/com/example/jmacro/wjdr/util/ColorUtil.java
index c43f684..32c4a5b 100644
--- a/src/main/java/com/example/jmacro/util/ColorUtil.java
+++ b/src/main/java/com/example/jmacro/wjdr/util/ColorUtil.java
@@ -1,4 +1,4 @@
-package com.example.jmacro.util;
+package com.example.jmacro.wjdr.util;
 
 public class ColorUtil {
 
diff --git a/src/main/java/com/example/jmacro/util/Imager.java b/src/main/java/com/example/jmacro/wjdr/util/Imager.java
similarity index 98%
rename from src/main/java/com/example/jmacro/util/Imager.java
rename to src/main/java/com/example/jmacro/wjdr/util/Imager.java
index 141534b..11394f9 100644
--- a/src/main/java/com/example/jmacro/util/Imager.java
+++ b/src/main/java/com/example/jmacro/wjdr/util/Imager.java
@@ -1,4 +1,4 @@
-package com.example.jmacro.util;
+package com.example.jmacro.wjdr.util;
 
 import cn.hutool.core.img.ImgUtil;
 
diff --git a/src/main/java/com/example/jmacro/wjdr/util/Logger.java b/src/main/java/com/example/jmacro/wjdr/util/Logger.java
new file mode 100644
index 0000000..8b305d1
--- /dev/null
+++ b/src/main/java/com/example/jmacro/wjdr/util/Logger.java
@@ -0,0 +1,27 @@
+package com.example.jmacro.wjdr.util;
+
+import cn.hutool.core.util.StrUtil;
+
+public class Logger {
+
+    private static boolean isDebug = false;
+
+    public static void setDebug(boolean isDebug) {
+        Logger.isDebug = isDebug;
+    }
+
+    public static void debug(String log, Object... arg) {
+        if (isDebug) {
+            System.out.println(StrUtil.format(log, arg));
+        }
+    }
+
+    public static void info(String log, Object... arg) {
+        System.out.println(StrUtil.format(log, arg));
+    }
+
+    public static void error(String log, Object... arg) {
+
+        System.err.println(StrUtil.format(log, arg));
+    }
+}
diff --git a/src/main/java/com/example/jmacro/wjdr/util/TaskUtil.java b/src/main/java/com/example/jmacro/wjdr/util/TaskUtil.java
new file mode 100644
index 0000000..e2fe93e
--- /dev/null
+++ b/src/main/java/com/example/jmacro/wjdr/util/TaskUtil.java
@@ -0,0 +1,318 @@
+package com.example.jmacro.wjdr.util;
+
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.thread.ThreadUtil;
+import cn.hutool.cron.CronUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Queue;
+import java.util.concurrent.*;
+
+/**
+ * 任务/定时任务工具
+ *
+ * @author wangbing
+ * @version 0.0.1
+ * @since 1.8
+ */
+public class TaskUtil extends CronUtil {
+
+    private static ScheduledExecutorService service;
+
+    public static ScheduledExecutorService getService() {
+        return service;
+    }
+
+    public static void setService(ScheduledExecutorService service) {
+        TaskUtil.service = service;
+    }
+
+    /**
+     * 执行Runnable任务
+     *
+     * @param runnable Runnable任务
+     * @param delay    延时(ms)
+     */
+    public static void schedule(Runnable runnable, long delay, TimeUnit unit) {
+        if (service == null) {
+            service = new ScheduledThreadPoolExecutor(1);
+        }
+        service.schedule(runnable, delay, unit);
+    }
+
+    /**
+     * 执行Runnable任务
+     *
+     * @param callable Callable任务
+     * @param delay    延时(ms)
+     */
+    public static <V> ScheduledFuture<V> schedule(Callable<V> callable, long delay) {
+        if (service == null) {
+            service = new ScheduledThreadPoolExecutor(1);
+        }
+        return service.schedule(callable, delay, TimeUnit.MILLISECONDS);
+    }
+
+    /**
+     * 执行Runnable任务
+     *
+     * @param callable Callable任务
+     * @param delay    延时
+     * @param unit     时间单位
+     */
+    public static <V> ScheduledFuture<V> schedule(Callable<V> callable, long delay, TimeUnit unit) {
+        if (service == null) {
+            service = new ScheduledThreadPoolExecutor(1);
+        }
+        return service.schedule(callable, delay, unit);
+    }
+
+    /**
+     * 执行Runnable任务
+     *
+     * @param runnable     Runnable任务
+     * @param initialDelay 延迟执行时间
+     * @param period       循环周期（前任务开始-新任务开始）
+     * @param unit         时间单位
+     */
+    public static ScheduledFuture<?> scheduleAtFixedRate(Runnable runnable, long initialDelay, long period, TimeUnit unit) {
+        if (service == null) {
+            service = new ScheduledThreadPoolExecutor(1);
+        }
+        return service.scheduleAtFixedRate(runnable, initialDelay, period, unit);
+    }
+
+    /**
+     * 执行Runnable任务
+     *
+     * @param runnable     Runnable任务
+     * @param initialDelay 延迟执行时间
+     * @param period       循环周期（前任务开始-新任务开始）ms
+     */
+    public static ScheduledFuture<?> scheduleAtFixedRate(Runnable runnable, long initialDelay, long period) {
+        if (service == null) {
+            service = new ScheduledThreadPoolExecutor(1);
+        }
+        return service.scheduleAtFixedRate(runnable, initialDelay, period, TimeUnit.MILLISECONDS);
+    }
+
+    /**
+     * 执行Runnable任务
+     *
+     * @param runnable     Runnable任务
+     * @param initialDelay 延迟执行时间
+     * @param delay        循环周期（前任务结束-新任务开始）
+     * @param unit         时间单位
+     */
+    public static ScheduledFuture<?> scheduleWithFixedDelay(Runnable runnable, long initialDelay, long delay, TimeUnit unit) {
+        if (service == null) {
+            service = new ScheduledThreadPoolExecutor(1);
+        }
+        return service.scheduleAtFixedRate(runnable, initialDelay, delay, unit);
+    }
+
+    /**
+     * 执行Runnable任务
+     *
+     * @param runnable     Runnable任务
+     * @param initialDelay 延迟执行时间
+     * @param delay        循环周期（前任务结束-新任务开始）ms
+     */
+    public static ScheduledFuture<?> scheduleWithFixedDelay(Runnable runnable, long initialDelay, long delay) {
+        if (service == null) {
+            service = new ScheduledThreadPoolExecutor(1);
+        }
+        return service.scheduleAtFixedRate(runnable, initialDelay, delay, TimeUnit.MILLISECONDS);
+    }
+
+    /**
+     * 以获取结果为目的并支持重试的任务，通常为有失败风险的IO或异步操作
+     *
+     * @param runnable    任务
+     * @param maxTryCount 最大重试次数
+     * @param interval    重试时间间隔
+     * @param <T>         结果
+     */
+    public static <T> T retryTask(Callable<T> runnable, int maxTryCount, long interval) {
+        for (int i = 0; i < maxTryCount; i++) {
+            T t = null;
+            try {
+                t = runnable.call();
+                if (t != null) {
+                    return t;
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            } finally {
+                // 控制重试时间间隔
+                if (t == null && i < maxTryCount - 1) {
+                    ThreadUtil.sleep(interval);
+                }
+            }
+        }
+
+        return null;
+    }
+
+    public static <T> T retryTask(Callable<T> runnable) {
+        return retryTask(runnable, 3, 3000);
+    }
+
+    public static <T> T retryTask(Callable<T> runnable, int maxTryCount) {
+        return retryTask(runnable, maxTryCount, 3000);
+    }
+
+    /**
+     * 执限时任务
+     *
+     * @param callable 任务
+     * @param time     毫秒
+     */
+    public static <T> T timeTask(Callable<T> callable, long time, TimeUnit unit) {
+        try {
+            CompletionService<T> completionService = ThreadUtil.newCompletionService();
+            Future<T> submit = completionService.submit(callable);
+            return submit.get(time, unit);
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    /**
+     * 执限时任务
+     *
+     * @param callable 任务
+     * @param time     毫秒
+     */
+    public static void timeTask(Runnable callable, long time, TimeUnit unit) {
+        try {
+            CompletionService<Void> completionService = ThreadUtil.newCompletionService();
+            Future<Void> submit = completionService.submit(callable, null);
+            submit.get(time, unit);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * 执行异步任务
+     */
+    public static void asyncTask(Runnable runnable) {
+        ThreadUtil.execAsync(runnable);
+    }
+
+    /**
+     * 执行异步任务
+     */
+    public static <T> Future<T> asyncTask(Callable<T> callables) {
+        return ThreadUtil.execAsync(callables);
+    }
+
+    /**
+     * 并行任务（多线程）
+     */
+    public static void parallelTasks(Runnable... runnables) {
+        Assert.notEmpty(runnables, "callable can not empty");
+        CompletionService<Object> completionService = ThreadUtil.newCompletionService();
+        for (Runnable runnable : runnables) {
+            completionService.submit(runnable, null);
+        }
+    }
+
+    /**
+     * 并行任务（多线程）
+     * 可以保证结果也是按添加顺序返回
+     */
+    public static Object[] parallelTasks(Callable<Object>... callables) {
+        Assert.notEmpty(callables, "callable can not empty");
+        CompletionService<Object> completionService = ThreadUtil.newCompletionService();
+        Object[] result = new Object[callables.length];
+        List<Future> futures = new ArrayList<>();
+        for (Callable<Object> callable : callables) {
+            futures.add(completionService.submit(callable));
+        }
+
+        try {
+            for (int i = 0; i < result.length; i++) {
+                Future<Object> take = completionService.take();
+                int indexOf = futures.indexOf(take);
+                result[indexOf] = take.get();
+                System.out.println("result=" + result[indexOf]);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return result;
+    }
+
+    /**
+     * 并行任务/任务流.
+     * 可以依次运行任务，通过回调事件传递，能够保证任务中存在异步操作时也能按顺序执行
+     */
+    public static TaskStack flowTask(FlowTask task) {
+        return new TaskStack(task);
+    }
+
+    /**
+     * 并行任务/任务流任务栈
+     */
+    public static class TaskStack {
+        private final Queue<FlowTask> taskFlowQueue = new ConcurrentLinkedQueue();
+        private final TaskEvent event = new TaskEvent() {
+            @Override
+            public void next(Object[] arg) {
+                FlowTask next = taskFlowQueue.poll();
+                if (next == null) {
+                    return;
+                }
+                next.onTask(event, arg);
+            }
+        };
+
+        public TaskStack(FlowTask first) {
+            this.taskFlowQueue.add(first);
+        }
+
+        public void start(Object... arg) {
+            FlowTask first = this.taskFlowQueue.poll();
+            if (first == null) {
+                return;
+            }
+            first.onTask(event, arg);
+        }
+
+        public TaskStack then(FlowTask task) {
+            this.taskFlowQueue.add(task);
+            return this;
+        }
+
+    }
+
+    /**
+     * 并行任务/任务流事件
+     */
+    public interface TaskEvent {
+
+        /**
+         * 执行下一步
+         *
+         * @param arg 参数
+         */
+        void next(Object... arg);
+    }
+
+    /**
+     * 任务
+     */
+    public interface FlowTask {
+
+        /**
+         * 公式任务
+         *
+         * @param flow 流
+         * @param arg  参数
+         */
+        void onTask(TaskEvent flow, Object... arg);
+    }
+}