ICe il y a 4 mois
Parent
commit
a3d98df125

+ 42 - 40
conf/config.properties

@@ -7,44 +7,46 @@ extendedState = 0
 appTheme = Darcula Theme
 [robot]
 selectedWindowTitle = sencorsta - sencorsta.com - 远程桌面连接
-lastUpdateTime = 1715563688297
+lastUpdateTime = 1715681805987
 [SceneData]
-SceneMain = {"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1715634000000,"resetType":"DAILY"}
-SceneMain_Challenge = {"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1715634000000,"resetType":"DAILY"}
-SceneMain_Challenge_Extreme = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715634000000,"resetType":"DAILY"}
-SceneMain_Energy = {"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1715634000000,"resetType":"DAILY"}
-SceneMain_Energy_Free = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715601600000,"resetType":"SPECIAL_RULES"}
-SceneMain_Energy_Friend = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715634000000,"resetType":"DAILY"}
-SceneMain_Energy_Home = {"data":{"isDone":false,"count":2,"done":false},"nextResetTime":1715634000000,"resetType":"DAILY"}
-SceneMain_Energy_Home_Select = {"data":{"isDone":false,"count":6,"done":false},"nextResetTime":1715634000000,"resetType":"DAILY"}
-SceneMain_Energy_Home_SelectRes = {"data":{"isDone":false,"count":4,"done":false},"nextResetTime":1715634000000,"resetType":"DAILY"}
-SceneMain_Energy_buy = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715634000000,"resetType":"DAILY"}
-SceneMain_Explore = {"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1715634000000,"resetType":"DAILY"}
-SceneMain_Explore_Gift = {"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1715634000000,"resetType":"DAILY"}
-SceneMain_Explore_Gift_Evil = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715634000000,"resetType":"DAILY"}
-SceneMain_Explore_King = {"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1715634000000,"resetType":"DAILY"}
-SceneMain_Explore_King_hell = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715634000000,"resetType":"DAILY"}
-SceneMain_Explore_King_kings = {"data":{"isDone":false,"count":9,"done":false},"nextResetTime":1715634000000,"resetType":"DAILY"}
-SceneMain_Explore_Leader = {"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1715634000000,"resetType":"DAILY"}
-SceneMain_Explore_Leader_quick = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715634000000,"resetType":"DAILY"}
-SceneMain_Family = {"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1715634000000,"resetType":"DAILY"}
-SceneMain_Family_Help = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715634000000,"resetType":"DAILY"}
-SceneMain_Family_Info = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715634000000,"resetType":"DAILY"}
-SceneMain_Family_Out = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715634000000,"resetType":"DAILY"}
-SceneMain_Family_Out_BigBoss = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715634000000,"resetType":"DAILY"}
-SceneMain_Family_Out_Boss = {"data":{"isDone":false,"count":3,"done":false},"nextResetTime":1715634000000,"resetType":"DAILY"}
-SceneMain_Family_Out_Fight = {"data":{"isDone":false,"count":3,"done":false},"nextResetTime":1715634000000,"resetType":"DAILY"}
-SceneMain_Family_Task = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715634000000,"resetType":"DAILY"}
-SceneMain_Fight = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715634000000,"resetType":"DAILY"}
-SceneMain_Fight_Endless = {"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1715634000000,"resetType":"DAILY"}
-SceneMain_Fight_Endless_Quick = {"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1715634000000,"resetType":"DAILY"}
-SceneMain_Fight_Endless_Reward = {"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1715634000000,"resetType":"DAILY"}
-SceneMain_Fight_VS = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715634000000,"resetType":"DAILY"}
-SceneMain_Fight_VS_Quick = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715634000000,"resetType":"DAILY"}
-SceneMain_Mail = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715634000000,"resetType":"DAILY"}
-SceneMain_Qiyu = {"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1715634000000,"resetType":"DAILY"}
-SceneMain_Qiyu_find = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715634000000,"resetType":"DAILY"}
-SceneMain_Qiyu_helper = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715634000000,"resetType":"DAILY"}
-SceneMain_Qiyu_quest = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715634000000,"resetType":"DAILY"}
-SceneMain_Role = {"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1715634000000,"resetType":"DAILY"}
-SceneMain_Welfare = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715634000000,"resetType":"DAILY"}
+SceneMain = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715720400000,"resetType":"DAILY"}
+SceneMain_Challenge = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715720400000,"resetType":"DAILY"}
+SceneMain_Challenge_Extreme = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715720400000,"resetType":"DAILY"}
+SceneMain_Energy = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715720400000,"resetType":"DAILY"}
+SceneMain_Energy_Free = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715688000000,"resetType":"SPECIAL_RULES"}
+SceneMain_Energy_Friend = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715720400000,"resetType":"DAILY"}
+SceneMain_Energy_Home = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715720400000,"resetType":"DAILY"}
+SceneMain_Energy_Home_Select = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715720400000,"resetType":"DAILY"}
+SceneMain_Energy_Home_SelectRes = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715720400000,"resetType":"DAILY"}
+SceneMain_Energy_buy = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715720400000,"resetType":"DAILY"}
+SceneMain_Explore = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715720400000,"resetType":"DAILY"}
+SceneMain_Explore_Gift = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715720400000,"resetType":"DAILY"}
+SceneMain_Explore_Gift_Evil = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715720400000,"resetType":"DAILY"}
+SceneMain_Explore_King = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715720400000,"resetType":"DAILY"}
+SceneMain_Explore_King_hell = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715720400000,"resetType":"DAILY"}
+SceneMain_Explore_King_kings = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715720400000,"resetType":"DAILY"}
+SceneMain_Explore_Leader = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715720400000,"resetType":"DAILY"}
+SceneMain_Explore_Leader_quick = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715720400000,"resetType":"DAILY"}
+SceneMain_Family = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715720400000,"resetType":"DAILY"}
+SceneMain_Family_Help = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715720400000,"resetType":"DAILY"}
+SceneMain_Family_Info = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715720400000,"resetType":"DAILY"}
+SceneMain_Family_Out = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715720400000,"resetType":"DAILY"}
+SceneMain_Family_Out_BigBoss = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715720400000,"resetType":"DAILY"}
+SceneMain_Family_Out_Boss = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715720400000,"resetType":"DAILY"}
+SceneMain_Family_Out_Fight = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715720400000,"resetType":"DAILY"}
+SceneMain_Family_Task = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715720400000,"resetType":"DAILY"}
+SceneMain_Fight = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715720400000,"resetType":"DAILY"}
+SceneMain_Fight_Endless = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715720400000,"resetType":"DAILY"}
+SceneMain_Fight_Endless_Quick = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715720400000,"resetType":"DAILY"}
+SceneMain_Fight_Endless_Reward = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715720400000,"resetType":"DAILY"}
+SceneMain_Fight_Gym = {"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1715720400000,"resetType":"DAILY"}
+SceneMain_Fight_Gym_Dragon = {"data":{"isDone":false,"count":1,"done":false},"nextResetTime":1715720400000,"resetType":"DAILY"}
+SceneMain_Fight_VS = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715720400000,"resetType":"DAILY"}
+SceneMain_Fight_VS_Quick = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715720400000,"resetType":"DAILY"}
+SceneMain_Mail = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715720400000,"resetType":"DAILY"}
+SceneMain_Qiyu = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715720400000,"resetType":"DAILY"}
+SceneMain_Qiyu_find = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715720400000,"resetType":"DAILY"}
+SceneMain_Qiyu_helper = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715720400000,"resetType":"DAILY"}
+SceneMain_Qiyu_quest = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715720400000,"resetType":"DAILY"}
+SceneMain_Role = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715720400000,"resetType":"DAILY"}
+SceneMain_Welfare = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715720400000,"resetType":"DAILY"}

BIN
opencv/scene/family/help/goLeft.png


BIN
opencv/scene/family/help/rightDoor.png


BIN
opencv/scene/family/out/boss/reward.png


BIN
opencv/scene/fight/gym/back.png


BIN
opencv/scene/fight/gym/check.png


BIN
opencv/scene/fight/gym/dragon/back.png


BIN
opencv/scene/fight/gym/dragon/check.png


BIN
opencv/scene/fight/gym/dragon/enter.png


BIN
opencv/scene/fight/gym/dragon/movePoint.png


BIN
opencv/scene/fight/gym/dragon/over.png


BIN
opencv/scene/fight/gym/dragon/skip.png


BIN
opencv/scene/fight/gym/dragon/start.png


BIN
opencv/scene/fight/gym/dragon/start2.png


BIN
opencv/scene/fight/gym/enter.png


+ 11 - 0
src/main/java/com/sencorsta/rabs/obj/ai/scene/family/SceneMain_Family_Help.java

@@ -33,6 +33,9 @@ public class SceneMain_Family_Help extends BaseScene implements Scene {
     private static String PathPiece2 = System.getProperty("user.dir") + "\\opencv\\scene\\family\\help\\piece2.png";
     private static String PathPaper = System.getProperty("user.dir") + "\\opencv\\scene\\family\\help\\paper.png";
 
+    private static String PathRightdoor = System.getProperty("user.dir") + "\\opencv\\scene\\family\\help\\rightDoor.png";
+    private static String PathGoLeft = System.getProperty("user.dir") + "\\opencv\\scene\\family\\help\\goLeft.png";
+
 
     @Override
     public void back() throws AWTException {
@@ -55,6 +58,14 @@ public class SceneMain_Family_Help extends BaseScene implements Scene {
                 ThreadUtil.sleep(2000);
             }
 
+            if (checkHas(PathRightdoor, 0.9)) {
+                moveToClick(PathGoLeft, 0.9, new Point(-100, -70));
+                ThreadUtil.sleep(5000);
+            }else {
+                moveToClick(PathGoLeft, 0.9, new Point(430, -70));
+                ThreadUtil.sleep(5000);
+            }
+
         }
     }
 

+ 8 - 0
src/main/java/com/sencorsta/rabs/obj/ai/scene/family/SceneMain_Family_Out_Boss.java

@@ -28,6 +28,7 @@ public class SceneMain_Family_Out_Boss extends BaseScene implements Scene {
     private static String PathSkip = System.getProperty("user.dir") + "\\opencv\\scene\\family\\out\\boss\\skip.png";
     private static String PathOver = System.getProperty("user.dir") + "\\opencv\\scene\\family\\out\\boss\\over.png";
     private static String PathCancel = System.getProperty("user.dir") + "\\opencv\\scene\\family\\out\\boss\\cancel.png";
+    private static String PathReward = System.getProperty("user.dir") + "\\opencv\\scene\\family\\out\\boss\\reward.png";
 
 
     @Override
@@ -61,6 +62,13 @@ public class SceneMain_Family_Out_Boss extends BaseScene implements Scene {
         int count = getRecord().getData().getCount();
 
         if (count<maxTime){
+            while (!checkHas(PathStart, 0.9)) {
+                if (checkHas(PathReward, 0.9)) {
+                    moveToClick(PathReward, 0.9);
+                    ThreadUtil.sleep(2000);
+                }
+                ThreadUtil.sleep(1000);
+            }
             ThreadUtil.sleep(2000);
             moveToClick(PathStart, 0.9);
             ThreadUtil.sleep(2000);

+ 5 - 4
src/main/java/com/sencorsta/rabs/obj/ai/scene/fight/SceneMain_Fight_Endless_Quick.java

@@ -27,14 +27,15 @@ public class SceneMain_Fight_Endless_Quick extends BaseScene implements Scene {
     private static String PathMax = System.getProperty("user.dir") + "\\opencv\\scene\\fight\\endless\\quick\\max.png";
     private static String PathStart = System.getProperty("user.dir") + "\\opencv\\scene\\fight\\endless\\quick\\start.png";
     private static String PathOk = System.getProperty("user.dir") + "\\opencv\\scene\\fight\\endless\\quick\\ok.png";
-    private int maxCount = 2;;
+    private int maxCount = 2;
+    ;
 
     @Override
     public void back() throws AWTException {
         moveToClick(PathBack, 0.9);
         int count = getRecord().getData().getCount();
         if (count < maxCount) {
-            isTempDone =false;
+            isTempDone = false;
         }
     }
 
@@ -74,13 +75,13 @@ public class SceneMain_Fight_Endless_Quick extends BaseScene implements Scene {
             }
             getRecord().getData().setCount(count + 1);
         }
-        isTempDone =true;
+        isTempDone = true;
     }
 
 
     @Override
     public boolean isDone() {
-        if (getRecord().getData().getCount()>=maxCount){
+        if (getRecord().getData().getCount() >= maxCount) {
             return true;
         }
         return isTempDone;

+ 1 - 1
src/main/java/com/sencorsta/rabs/obj/ai/scene/fight/SceneMain_Fight_Endless_Reward.java

@@ -64,7 +64,7 @@ public class SceneMain_Fight_Endless_Reward extends BaseScene implements Scene {
         moveToClick(PathEverweek, 0.9);
         ThreadUtil.sleep(2000);
 
-        moveToClick(PathCoin, 0.9);
+        moveToClick(PathCoin, 0.9);//TODO ice 这里优化一下 图片会动 改成固定图
         ThreadUtil.sleep(2000);
 
         moveToClick(PathCup, 0.9);

+ 59 - 0
src/main/java/com/sencorsta/rabs/obj/ai/scene/fight/SceneMain_Fight_Gym.java

@@ -0,0 +1,59 @@
+package com.sencorsta.rabs.obj.ai.scene.fight;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.thread.ThreadUtil;
+import com.sencorsta.rabs.annotation.SceneAnnotation;
+import com.sencorsta.rabs.obj.ai.AiManage;
+import com.sencorsta.rabs.obj.ai.api.BaseScene;
+import com.sencorsta.rabs.obj.ai.api.Scene;
+import org.opencv.core.Point;
+
+import java.awt.AWTException;
+import java.util.Calendar;
+
+/**
+ * 对决赛
+ */
+@SceneAnnotation("SceneMain_Fight")
+public class SceneMain_Fight_Gym extends BaseScene implements Scene {
+    private static String PathEnter = System.getProperty("user.dir") + "\\opencv\\scene\\fight\\gym\\enter.png";
+    private static String PathCheck = System.getProperty("user.dir") + "\\opencv\\scene\\fight\\gym\\check.png";
+    private static String PathBack = System.getProperty("user.dir") + "\\opencv\\scene\\fight\\gym\\back.png";
+
+    @Override
+    public void back() throws AWTException {
+        moveToClick(PathBack, 0.9);
+    }
+
+    @Override
+    public void open() throws AWTException {
+        while (!check()) {
+            AiManage.getInstance().updateWindow();
+            ThreadUtil.sleep(2000);
+            if (checkHas(PathEnter, 0.9)) {
+                moveToClick(PathEnter, 0.9);
+                continue;
+            }
+        }
+    }
+
+    @Override
+    public boolean check() throws AWTException {
+        if (checkHas(PathCheck, 0.9)) {
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public void think() throws AWTException {
+
+    }
+
+
+    @Override
+    public boolean isDone() {
+        return getRecord().getData().isDone();
+    }
+
+}

+ 95 - 0
src/main/java/com/sencorsta/rabs/obj/ai/scene/fight/SceneMain_Fight_Gym_Dragon.java

@@ -0,0 +1,95 @@
+package com.sencorsta.rabs.obj.ai.scene.fight;
+
+import cn.hutool.core.thread.ThreadUtil;
+import com.sencorsta.rabs.annotation.SceneAnnotation;
+import com.sencorsta.rabs.obj.ai.AiManage;
+import com.sencorsta.rabs.obj.ai.api.BaseScene;
+import com.sencorsta.rabs.obj.ai.api.Scene;
+import org.opencv.core.Point;
+
+import java.awt.AWTException;
+
+/**
+ * 对决赛
+ */
+@SceneAnnotation("SceneMain_Fight_Gym")
+public class SceneMain_Fight_Gym_Dragon extends BaseScene implements Scene {
+    private static String PathEnter = System.getProperty("user.dir") + "\\opencv\\scene\\fight\\gym\\dragon\\enter.png";
+    private static String PathCheck = System.getProperty("user.dir") + "\\opencv\\scene\\fight\\gym\\dragon\\check.png";
+    private static String PathBack = System.getProperty("user.dir") + "\\opencv\\scene\\fight\\gym\\dragon\\back.png";
+    private static String PathMovePoint = System.getProperty("user.dir") + "\\opencv\\scene\\fight\\gym\\dragon\\movePoint.png";
+    private static String PathStart = System.getProperty("user.dir") + "\\opencv\\scene\\fight\\gym\\dragon\\start.png";
+    private static String PathStart2 = System.getProperty("user.dir") + "\\opencv\\scene\\fight\\gym\\dragon\\start2.png";
+    private static String PathSkip = System.getProperty("user.dir") + "\\opencv\\scene\\fight\\gym\\dragon\\skip.png";
+    private static String PathOver = System.getProperty("user.dir") + "\\opencv\\scene\\fight\\gym\\dragon\\over.png";
+    private int maxTime = 20;
+
+
+    @Override
+    public void back() throws AWTException {
+        moveToClick(PathBack, 0.9);
+    }
+
+    int moveCount = 0;
+    boolean goRight = true;
+
+    @Override
+    public void open() throws AWTException {
+        while (!check()) {
+            AiManage.getInstance().updateWindow();
+            ThreadUtil.sleep(2000);
+            if (checkHas(PathEnter, 0.9)) {
+                moveToClick(PathEnter, 0.9);
+                continue;
+            }
+            if (goRight) {
+                moveToClick(PathMovePoint, 0.9, new Point(0, -50));
+            } else {
+                moveToClick(PathMovePoint, 0.9, new Point(-666, -50));
+            }
+            moveCount++;
+            if (moveCount > 5) {
+                moveCount = 0;
+                goRight = !goRight;
+            }
+        }
+    }
+
+    @Override
+    public boolean check() throws AWTException {
+        if (checkHas(PathCheck, 0.9)) {
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public void think() throws AWTException {
+        int count = getRecord().getData().getCount();
+        if (count < maxTime) {
+            ThreadUtil.sleep(2000);
+            moveToClick(PathStart, 0.9);
+            ThreadUtil.sleep(2000);
+            moveToClick(PathStart2, 0.9);
+            ThreadUtil.sleep(2000);
+
+            while (!checkHas(PathOver, 0.9)) {
+                moveToClick(PathSkip, 0.9);
+                ThreadUtil.sleep(4000);
+            }
+            ThreadUtil.sleep(8000);
+            randomToClick();
+
+            ThreadUtil.sleep(8000);
+
+            getRecord().getData().setCount(count + 1);
+        }
+    }
+
+
+    @Override
+    public boolean isDone() {
+        return getRecord().getData().getCount()>=maxTime;
+    }
+
+}

+ 14 - 9
src/main/java/com/sencorsta/rabs/obj/ai/scene/qiyi/SceneMain_Qiyu_find.java

@@ -34,14 +34,19 @@ public class SceneMain_Qiyu_find extends BaseScene implements Scene {
 
     @Override
     public void back() throws AWTException {
-        while (!checkHas(PathOk,0.9)){
+        while (!checkHas(PathOk, 0.9)) {
             moveToClick(PathBack, 0.9);
             ThreadUtil.sleep(2000);
         }
         ThreadUtil.sleep(2000);
         moveToClick(PathOk, 0.9);
-        while (!checkHas(PathRewrad,0.9)){
+        int countTemp = 0;
+        while (!checkHas(PathRewrad, 0.9)) {
+            countTemp++;
             ThreadUtil.sleep(2000);
+            if (countTemp % 5 == 0) {
+                moveToClick(PathOk, 0.9);
+            }
         }
         if (checkHas(PathOk, 0.9)) {
             moveToClick(PathOk, 0.9);
@@ -84,20 +89,20 @@ public class SceneMain_Qiyu_find extends BaseScene implements Scene {
     public void think() throws AWTException {
 
         ThreadUtil.sleep(4000);
-        moveToClick(PathInfo,0.9);
+        moveToClick(PathInfo, 0.9);
         ThreadUtil.sleep(2000);
 
-        if(checkHas(PathGoon,0.9)){
-            moveToClick(PathGoon,0.9);
+        if (checkHas(PathGoon, 0.9)) {
+            moveToClick(PathGoon, 0.9);
             ThreadUtil.sleep(2000);
         }
 
-        if(checkHas(PathStart,0.9)){
-            moveToClick(PathStart,0.9);
+        if (checkHas(PathStart, 0.9)) {
+            moveToClick(PathStart, 0.9);
             ThreadUtil.sleep(2000);
         }
 
-        while (!checkHas(PathStart,0.9)){
+        while (!checkHas(PathStart, 0.9)) {
             ThreadUtil.sleep(1000);
         }
 
@@ -106,7 +111,7 @@ public class SceneMain_Qiyu_find extends BaseScene implements Scene {
 
     @Override
     public boolean isDone() {
-        return  getRecord().getData().isDone();
+        return getRecord().getData().isDone();
     }
 
 }

+ 2 - 2
src/main/java/com/sencorsta/rabs/obj/ai/scene/role/SceneMain_Role.java

@@ -154,7 +154,7 @@ public class SceneMain_Role extends BaseScene implements Scene {
             moveToClick(PathSkillUp,0.9);
             ThreadUtil.sleep(3000);
         }
-
+        getRecord().getData().setDone(true);
         //关闭退出
         moveToClick(PathBack, 0.9);
     }
@@ -163,7 +163,7 @@ public class SceneMain_Role extends BaseScene implements Scene {
 
     public boolean isDone() {
         //return hasChildDone();
-        return false;
+        return getRecord().getData().isDone();
     }
 
 }