Merge branch 'master' of http://www.sencorsta.com:2203/ice/rabs

src/main/java/com/sencorsta/rabs/obj/ai/scene/emblem/SceneMain_Emblem.java

@@ -32,6 +32,7 @@ public class SceneMain_Emblem extends BaseScene implements Scene {
     private static String PathStart2 = System.getProperty("user.dir") + "\\opencv\\scene\\tactic\\emblem\\start2.png";
     private static String PathSkip = System.getProperty("user.dir") + "\\opencv\\scene\\tactic\\emblem\\skip.png";
     private static String PathOver = System.getProperty("user.dir") + "\\opencv\\scene\\tactic\\emblem\\over.png";
+    private static String PathChoose = System.getProperty("user.dir") + "\\opencv\\scene\\tactic\\emblem\\choese.png";
 
     @Override
     public void back() throws AWTException {
@@ -67,10 +68,15 @@ public class SceneMain_Emblem extends BaseScene implements Scene {
                 moveToClick(PathPick1, AiManage.getInstance().getCheckPoint());
                 ThreadUtil.sleep(2000);
             }
+            if (checkHas(PathChoose, AiManage.getInstance().getCheckPoint())) {
+                moveToClick(PathChoose, AiManage.getInstance().getCheckPoint());
+                ThreadUtil.sleep(2000);
+            }
             if (checkHas(PathEnter5, AiManage.getInstance().getCheckPoint())) {
                 moveToClick(PathEnter5, AiManage.getInstance().getCheckPoint());
                 ThreadUtil.sleep(2000);
             }
+
         }
     }
 

src/main/java/com/sencorsta/rabs/obj/ai/scene/family/SceneMain_Family_Task.java

@@ -95,7 +95,7 @@ public class SceneMain_Family_Task extends BaseScene implements Scene {
             }
 
             if (checkHas(PathCancle, AiManage.getInstance().getCheckPoint())) {
-                moveToClick(PathCancle, AiManage.getInstance().getCheckPoint(),new Point(0,270));
+                moveToClick(PathCancle, AiManage.getInstance().getCheckPoint());
                 ThreadUtil.sleep(2000);
             }
         }