diff --git a/legend/城镇#L449,887.png b/legend/城镇#L449,887.png
deleted file mode 100644
index fe0660b..0000000
Binary files a/legend/城镇#L449,887.png and /dev/null differ
diff --git a/src/main/java/com/example/jmacro/wjdr/JMainApplication.java b/src/main/java/com/example/jmacro/wjdr/JMainApplication.java
index b0ba4b3..b219c63 100644
--- a/src/main/java/com/example/jmacro/wjdr/JMainApplication.java
+++ b/src/main/java/com/example/jmacro/wjdr/JMainApplication.java
@@ -1,6 +1,6 @@
 package com.example.jmacro.wjdr;
 
-import com.example.jmacro.wjdr.demo.MacroForWJDR;
+import com.example.jmacro.wjdr.wjdr.MacroForWJDR;
 import com.example.jmacro.wjdr.ui.FXMLUtil;
 import com.example.jmacro.wjdr.util.Logger;
 import com.example.jmacro.wjdr.util.ResourceUtil;
diff --git a/src/main/java/com/example/jmacro/wjdr/JMainService.java b/src/main/java/com/example/jmacro/wjdr/JMainService.java
index 67b23ff..1265f14 100644
--- a/src/main/java/com/example/jmacro/wjdr/JMainService.java
+++ b/src/main/java/com/example/jmacro/wjdr/JMainService.java
@@ -2,7 +2,7 @@ package com.example.jmacro.wjdr;
 
 import cn.hutool.core.thread.ThreadUtil;
 import com.example.jmacro.wjdr.base.Legend;
-import com.example.jmacro.wjdr.demo.MacroForWJDR;
+import com.example.jmacro.wjdr.wjdr.MacroForWJDR;
 import com.example.jmacro.wjdr.util.DialogUtil;
 import com.example.jmacro.wjdr.util.Logger;
 
diff --git a/src/main/java/com/example/jmacro/wjdr/demo/MacroForWJDR.java b/src/main/java/com/example/jmacro/wjdr/wjdr/MacroForWJDR.java
similarity index 88%
rename from src/main/java/com/example/jmacro/wjdr/demo/MacroForWJDR.java
rename to src/main/java/com/example/jmacro/wjdr/wjdr/MacroForWJDR.java
index 5b1faee..5c4824f 100644
--- a/src/main/java/com/example/jmacro/wjdr/demo/MacroForWJDR.java
+++ b/src/main/java/com/example/jmacro/wjdr/wjdr/MacroForWJDR.java
@@ -1,4 +1,4 @@
-package com.example.jmacro.wjdr.demo;
+package com.example.jmacro.wjdr.wjdr;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
@@ -6,10 +6,10 @@ import com.example.jmacro.wjdr.JMacro;
 import com.example.jmacro.wjdr.JMainService;
 import com.example.jmacro.wjdr.base.Legend;
 import com.example.jmacro.wjdr.base.ViewRect;
-import com.example.jmacro.wjdr.demo.task.Task_探险领取;
-import com.example.jmacro.wjdr.demo.task.Task_收留避难者;
-import com.example.jmacro.wjdr.demo.task.Task_离线收益;
-import com.example.jmacro.wjdr.demo.task.Task_采矿被攻击;
+import com.example.jmacro.wjdr.wjdr.task.Task_探险领取;
+import com.example.jmacro.wjdr.wjdr.task.Task_收留避难者;
+import com.example.jmacro.wjdr.wjdr.task.Task_离线收益;
+import com.example.jmacro.wjdr.wjdr.task.Task_采矿被攻击;
 import com.example.jmacro.wjdr.util.Logger;
 import com.example.jmacro.wjdr.util.TaskUtil;
 
@@ -80,14 +80,14 @@ public class MacroForWJDR extends JMacro {
         // 定位城镇
         Boolean inMain = TaskUtil.retryTask(() -> {
             { // 定位弹框，关闭弹框
-                ViewRect rect = waitAndMatchLegend("城镇_充值", 0.8d);
+                ViewRect rect = matchLegend("城镇_充值", 0.8d);
                 if (rect != null) {
                     mouseLeftClick(rect);
                     Logger.info("检测到充值广告弹框，关闭弹框");
                 }
             }
             {// 定位离线收益
-                ViewRect rect = waitAndMatchLegend("城镇_离线收益", 0.9);
+                ViewRect rect = matchLegend("城镇_离线收益", 0.9);
                 if (rect != null) {
                     mouseLeftClick(rect);
                     Logger.info("检测到离线收益弹框，关闭弹框");
@@ -95,7 +95,7 @@ public class MacroForWJDR extends JMacro {
             }
             // 定位城镇
             {
-                ViewRect rect = waitAndMatchLegend("城镇", 0.9);
+                ViewRect rect = matchLegend("城镇", 0.9);
                 if (rect != null) {
                     Logger.info("当前区域【野外】");
                     Logger.info("返回区域【城镇】");
@@ -104,14 +104,14 @@ public class MacroForWJDR extends JMacro {
                 }
             }
             {// 定位野外
-                ViewRect rect = waitAndMatchLegend("野外", 0.9);
+                ViewRect rect = matchLegend("野外", 0.9);
                 if (rect != null) {
                     Logger.info("当前区域【城镇】");
                     return true;
                 }
             }
             return false;
-        }, 10, 10);
+        }, 10, 1000);
 
         if (!Convert.toBool(inMain, false)) {
             Logger.info("未进入城镇：退出线程");
diff --git a/src/main/java/com/example/jmacro/wjdr/demo/task/BaseTask.java b/src/main/java/com/example/jmacro/wjdr/wjdr/task/BaseTask.java
similarity index 96%
rename from src/main/java/com/example/jmacro/wjdr/demo/task/BaseTask.java
rename to src/main/java/com/example/jmacro/wjdr/wjdr/task/BaseTask.java
index d16a2bd..934c6a6 100644
--- a/src/main/java/com/example/jmacro/wjdr/demo/task/BaseTask.java
+++ b/src/main/java/com/example/jmacro/wjdr/wjdr/task/BaseTask.java
@@ -1,4 +1,4 @@
-package com.example.jmacro.wjdr.demo.task;
+package com.example.jmacro.wjdr.wjdr.task;
 
 import com.example.jmacro.wjdr.JMacro;
 import com.example.jmacro.wjdr.JMainService;
diff --git a/src/main/java/com/example/jmacro/wjdr/demo/task/Task_探险领取.java b/src/main/java/com/example/jmacro/wjdr/wjdr/task/Task_探险领取.java
similarity index 91%
rename from src/main/java/com/example/jmacro/wjdr/demo/task/Task_探险领取.java
rename to src/main/java/com/example/jmacro/wjdr/wjdr/task/Task_探险领取.java
index 72a510c..c818a8b 100644
--- a/src/main/java/com/example/jmacro/wjdr/demo/task/Task_探险领取.java
+++ b/src/main/java/com/example/jmacro/wjdr/wjdr/task/Task_探险领取.java
@@ -1,4 +1,4 @@
-package com.example.jmacro.wjdr.demo.task;
+package com.example.jmacro.wjdr.wjdr.task;
 
 import com.example.jmacro.wjdr.JMacro;
 import com.example.jmacro.wjdr.base.ViewRect;
@@ -13,13 +13,13 @@ public class Task_探险领取 extends BaseTask {
     @Override
     public void task(JMacro macro, ViewRect viewRect) {
         Logger.info("定位【探险】按钮");
-        ViewRect TAB_探险 = macro.waitAndMatchLegend("城镇_探险", 0.9);
-        if (TAB_探险 == null) {
+        ViewRect 城镇_探险 = macro.waitAndMatchLegend("城镇_探险", 0.9);
+        if (城镇_探险 == null) {
             return;
         }
 
         Logger.info("点击【探险】按钮");
-        macro.mouseLeftClick(TAB_探险);
+        macro.mouseLeftClick(城镇_探险);
 
         ViewRect 探险_按钮 = macro.waitAndMatchLegend("探险_按钮", 0.9);
         if (探险_按钮 == null) {
diff --git a/src/main/java/com/example/jmacro/wjdr/demo/task/Task_收留避难者.java b/src/main/java/com/example/jmacro/wjdr/wjdr/task/Task_收留避难者.java
similarity index 89%
rename from src/main/java/com/example/jmacro/wjdr/demo/task/Task_收留避难者.java
rename to src/main/java/com/example/jmacro/wjdr/wjdr/task/Task_收留避难者.java
index 79ad7ea..c62f1f7 100644
--- a/src/main/java/com/example/jmacro/wjdr/demo/task/Task_收留避难者.java
+++ b/src/main/java/com/example/jmacro/wjdr/wjdr/task/Task_收留避难者.java
@@ -1,4 +1,4 @@
-package com.example.jmacro.wjdr.demo.task;
+package com.example.jmacro.wjdr.wjdr.task;
 
 import com.example.jmacro.wjdr.JMacro;
 import com.example.jmacro.wjdr.base.ViewRect;
@@ -12,7 +12,7 @@ public class Task_收留避难者 extends BaseTask {
 
     @Override
     public void task(JMacro macro, ViewRect viewRect) {
-        ViewRect rect = macro.waitAndMatchLegend("城镇_避难者", 0.9);
+        ViewRect rect = macro.matchLegend("城镇_避难者", 0.9);
         if (rect == null) {
             Logger.info("未发现避难者");
             return;
diff --git a/src/main/java/com/example/jmacro/wjdr/demo/task/Task_离线收益.java b/src/main/java/com/example/jmacro/wjdr/wjdr/task/Task_离线收益.java
similarity index 85%
rename from src/main/java/com/example/jmacro/wjdr/demo/task/Task_离线收益.java
rename to src/main/java/com/example/jmacro/wjdr/wjdr/task/Task_离线收益.java
index 72a9237..590db0d 100644
--- a/src/main/java/com/example/jmacro/wjdr/demo/task/Task_离线收益.java
+++ b/src/main/java/com/example/jmacro/wjdr/wjdr/task/Task_离线收益.java
@@ -1,4 +1,4 @@
-package com.example.jmacro.wjdr.demo.task;
+package com.example.jmacro.wjdr.wjdr.task;
 
 import com.example.jmacro.wjdr.JMacro;
 import com.example.jmacro.wjdr.base.ViewRect;
@@ -12,12 +12,13 @@ public class Task_离线收益 extends BaseTask {
 
     @Override
     public void task(JMacro macro, ViewRect viewRect) {
-        macro.delay();
+        macro.delayUnstable();
         // 定位离线收益弹框，关闭弹框
         ViewRect rect = macro.waitAndMatchLegend("城镇_离线收益", 0.9);
         if (rect != null) {
             macro.mouseLeftClick(rect);
             Logger.info("检测到离线收益弹框，关闭弹框");
         }
+        macro.delayUnstable();
     }
 }
diff --git a/src/main/java/com/example/jmacro/wjdr/demo/task/Task_自动采矿.java b/src/main/java/com/example/jmacro/wjdr/wjdr/task/Task_自动采矿.java
similarity index 90%
rename from src/main/java/com/example/jmacro/wjdr/demo/task/Task_自动采矿.java
rename to src/main/java/com/example/jmacro/wjdr/wjdr/task/Task_自动采矿.java
index 6212005..fc67f28 100644
--- a/src/main/java/com/example/jmacro/wjdr/demo/task/Task_自动采矿.java
+++ b/src/main/java/com/example/jmacro/wjdr/wjdr/task/Task_自动采矿.java
@@ -1,4 +1,4 @@
-package com.example.jmacro.wjdr.demo.task;
+package com.example.jmacro.wjdr.wjdr.task;
 
 import cn.hutool.json.JSONUtil;
 import com.example.jmacro.wjdr.JMacro;
@@ -16,13 +16,14 @@ public class Task_自动采矿 extends BaseTask {
 
     @Override
     public void task(JMacro macro, ViewRect viewRect) {
+        macro.delayUnstable();
         Logger.info("判断是否在野外");
-        ViewRect 城镇 = macro.waitAndMatchLegend( "城镇", 0.9);
+        ViewRect 城镇 = macro.matchLegend("城镇", 0.9);
         if (城镇 != null) {
             Logger.info("当前界面【野外】");
         } else {
             Logger.info("定位【野外】");
-            ViewRect 野外 = macro.waitAndMatchLegend( "野外", 0.99);
+            ViewRect 野外 = macro.matchLegend("野外", 0.99);
             if (野外 == null) {
                 Logger.error("定位【野外】失败，采矿终止");
                 return;
@@ -31,12 +32,13 @@ public class Task_自动采矿 extends BaseTask {
 
             Logger.info("点击【野外】，坐标{}", JSONUtil.toJsonStr(野外.getCenter()));
             macro.mouseLeftClick(野外);
+            macro.delayUnstable();
             Logger.info("定位野外按钮成功");
         }
 
         Logger.info("定位资源搜索按钮");
         // 因为搜索按钮透明，不好比对，通过定位其下面的任务图标定位
-        ViewRect 野外_任务 = macro.waitAndMatchLegend( "野外_任务", 0.9);
+        ViewRect 野外_任务 = macro.waitAndMatchLegend("野外_任务", 0.9);
         if (野外_任务 == null) {
             Logger.error("未检测到【资源搜索按钮】，采矿终止");
             return;
@@ -45,11 +47,8 @@ public class Task_自动采矿 extends BaseTask {
         Logger.info("定位资源搜索按钮成功：{}", 野外搜索.toString());
         macro.mouseLeftClick(野外搜索);
 
-        // 定位木材
-
-
         // 因为搜索按钮透明，不好比对，通过定位其下面的任务图标定位
-        ViewRect 野外_搜索 = macro.waitAndMatchLegend( "野外_搜索#L226,879.png", 0.9);
+        ViewRect 野外_搜索 = macro.waitAndMatchLegend("野外_搜索#L226,879.png", 0.9);
         if (野外_搜索 == null) {
             Logger.error("未检测到【野外_搜索】，采矿终止");
             return;
@@ -68,18 +67,19 @@ public class Task_自动采矿 extends BaseTask {
         }
 
         // 检测是否是搜索界面
-        ViewRect 野外_任务2 = macro.waitAndMatchLegend( "野外_任务", 9);
+        ViewRect 野外_任务2 = macro.waitAndMatchLegend("野外_任务", 9);
         if (野外_任务2 != null) {
             Logger.info("退出资源搜索界面");
             macro.mouseLeftClick(this.viewRect);
         }
 
-        ViewRect 城1 = macro.waitAndMatchLegend( "城镇", 0.9);
+        ViewRect 城1 = macro.waitAndMatchLegend("城镇", 0.9);
         if (城1 == null) {
             Logger.error("未检测到【城镇】，采矿终止");
             return;
         }
         Logger.info("返回城镇");
+        macro.delayUnstable();
     }
 
     /**
diff --git a/src/main/java/com/example/jmacro/wjdr/demo/task/Task_采矿被攻击.java b/src/main/java/com/example/jmacro/wjdr/wjdr/task/Task_采矿被攻击.java
similarity index 90%
rename from src/main/java/com/example/jmacro/wjdr/demo/task/Task_采矿被攻击.java
rename to src/main/java/com/example/jmacro/wjdr/wjdr/task/Task_采矿被攻击.java
index 1fd6948..990d1c5 100644
--- a/src/main/java/com/example/jmacro/wjdr/demo/task/Task_采矿被攻击.java
+++ b/src/main/java/com/example/jmacro/wjdr/wjdr/task/Task_采矿被攻击.java
@@ -1,4 +1,4 @@
-package com.example.jmacro.wjdr.demo.task;
+package com.example.jmacro.wjdr.wjdr.task;
 
 import com.example.jmacro.wjdr.JMacro;
 import com.example.jmacro.wjdr.base.ViewRect;