ICe 4 月之前
父節點
當前提交
2a630b5e65

+ 3 - 3
src/main/java/com/sencorsta/rabs/obj/ai/scene/challenge/SceneMain_Challenge_Extreme.java

@@ -12,7 +12,7 @@ import java.awt.AWTException;
 /**
  * 挑战界面
  */
-@SceneAnnotation("SceneMain")
+@SceneAnnotation("SceneMain_Challenge")
 public class SceneMain_Challenge_Extreme extends BaseScene implements Scene {
     private static String PathEnter = System.getProperty("user.dir") + "\\opencv\\scene\\challenge\\extreme\\enter.png";
     private static String PathCheck = System.getProperty("user.dir") + "\\opencv\\scene\\challenge\\extreme\\check.png";
@@ -88,10 +88,10 @@ public class SceneMain_Challenge_Extreme extends BaseScene implements Scene {
         ThreadUtil.sleep(3000);
 
         randomToClick();
-        ThreadUtil.sleep(3000);
+        ThreadUtil.sleep(6000);
 
         moveToClick(PathOb, 0.9);
-        ThreadUtil.sleep(2000);
+        ThreadUtil.sleep(4000);
 
         moveToClick(PathOk, 0.9);
         ThreadUtil.sleep(2000);

+ 1 - 0
src/main/java/com/sencorsta/rabs/obj/ai/scene/explore/SceneMain_Explore_King_hell.java

@@ -74,6 +74,7 @@ public class SceneMain_Explore_King_hell extends BaseScene implements Scene {
         while (!checkHas(PathOver, 0.9)) {
             ThreadUtil.sleep(2000);
         }
+        ThreadUtil.sleep(3000);
         moveToClick(PathClose, 0.9);
         ThreadUtil.sleep(2000);
 

+ 7 - 0
src/main/java/com/sencorsta/rabs/obj/ai/scene/family/SceneMain_Family.java

@@ -29,6 +29,7 @@ public class SceneMain_Family extends BaseScene implements Scene {
     private static String PathRightdoor2 = System.getProperty("user.dir") + "\\opencv\\scene\\family\\rightDoor2.png";
     private static String PathGoLeft = System.getProperty("user.dir") + "\\opencv\\scene\\family\\goLeft.png";
     private static String PathGoRight = System.getProperty("user.dir") + "\\opencv\\scene\\family\\goRight.png";
+    private static String PathPaper = System.getProperty("user.dir") + "\\opencv\\scene\\family\\paper.png";
 
     @Override
     public void back() throws AWTException {
@@ -44,6 +45,12 @@ public class SceneMain_Family extends BaseScene implements Scene {
                 moveToClick(PathEnter, 0.9);
                 continue;
             }
+
+            if (checkHas(PathPaper, 0.9)) {
+                moveToClick(PathPaper, 0.9, new Point(300, 0));
+                ThreadUtil.sleep(2000);
+            }
+
             if (checkHas(PathRightdoor, 0.9)||checkHas(PathRightdoor2, 0.9)) {
                 System.out.println("发现右边的门...");
                 moveToClick(PathGoLeft, 0.9, new Point(0, -50));

+ 3 - 1
src/main/java/com/sencorsta/rabs/obj/ai/scene/family/SceneMain_Family_Out.java

@@ -79,9 +79,11 @@ public class SceneMain_Family_Out extends BaseScene implements Scene {
         moveToClick(PathFind, 0.9);
         ThreadUtil.sleep(6000);
 
-        moveToClick(PathTake, 0.9);
+        moveToClick(PathTake, 0.9,new Point(0,-180));
         ThreadUtil.sleep(4000);
 
+        java.awt.Point lastClickPoint = AiManage.getInstance().getLastClickPoint();
+        lastClickPoint.setLocation(lastClickPoint.getX(),lastClickPoint.getY()+180);
         randomToClick();
         ThreadUtil.sleep(4000);
 

+ 7 - 0
src/main/java/com/sencorsta/rabs/obj/ai/scene/fight/SceneMain_Fight_Endless_Quick.java

@@ -1,6 +1,7 @@
 package com.sencorsta.rabs.obj.ai.scene.fight;
 
 import cn.hutool.core.thread.ThreadUtil;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.sencorsta.rabs.annotation.SceneAnnotation;
 import com.sencorsta.rabs.obj.ai.AiManage;
 import com.sencorsta.rabs.obj.ai.api.BaseScene;
@@ -13,6 +14,12 @@ import java.awt.AWTException;
  */
 @SceneAnnotation("SceneMain_Fight_Endless")
 public class SceneMain_Fight_Endless_Quick extends BaseScene implements Scene {
+    @JsonIgnore
+    @Override
+    public float getPriority() {
+        return 2.0f;
+    }
+
     private static String PathEnter = System.getProperty("user.dir") + "\\opencv\\scene\\fight\\endless\\quick\\enter.png";
     private static String PathCheck = System.getProperty("user.dir") + "\\opencv\\scene\\fight\\endless\\quick\\check.png";
     private static String PathBack = System.getProperty("user.dir") + "\\opencv\\scene\\fight\\endless\\quick\\back.png";

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

@@ -1,6 +1,7 @@
 package com.sencorsta.rabs.obj.ai.scene.fight;
 
 import cn.hutool.core.thread.ThreadUtil;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.sencorsta.rabs.annotation.SceneAnnotation;
 import com.sencorsta.rabs.obj.ai.AiManage;
 import com.sencorsta.rabs.obj.ai.api.BaseScene;
@@ -13,6 +14,11 @@ import java.awt.AWTException;
  */
 @SceneAnnotation("SceneMain_Fight_Endless")
 public class SceneMain_Fight_Endless_Reward extends BaseScene implements Scene {
+    @JsonIgnore
+    @Override
+    public float getPriority() {
+        return 1.0f;
+    }
     private static String PathEnter = System.getProperty("user.dir") + "\\opencv\\scene\\fight\\endless\\reward\\enter.png";
     private static String PathCheck = System.getProperty("user.dir") + "\\opencv\\scene\\fight\\endless\\reward\\check.png";
     private static String PathBack = System.getProperty("user.dir") + "\\opencv\\scene\\fight\\endless\\reward\\back.png";

+ 2 - 2
src/main/java/com/sencorsta/rabs/obj/ai/scene/mail/SceneMain_Mail.java

@@ -55,9 +55,9 @@ public class SceneMain_Mail extends BaseScene implements Scene {
     public void think() throws AWTException {
         if (checkHas(PathOneButton, 0.9)) {
             moveToClick(PathOneButton, 0.9);
-            ThreadUtil.sleep(2000);
+            ThreadUtil.sleep(3000);
             randomToClick();
-            ThreadUtil.sleep(2000);
+            ThreadUtil.sleep(3000);
 
             getDailyRecord().getData().setDone(true);
         }