ICe 4 months ago
parent
commit
84aeff76a8

+ 46 - 46
conf/config.properties

@@ -1,53 +1,53 @@
 []
 []
-windowX = -74
-windowY = 49
-windowWidth = 1351.0
+windowX = 145
+windowY = 80
+windowWidth = 1091.0
 windowHeight = 454.0
 windowHeight = 454.0
 extendedState = 0
 extendedState = 0
 appTheme = Darcula Theme
 appTheme = Darcula Theme
 [robot]
 [robot]
 selectedWindowTitle = sencorsta - sencorsta.com - 远程桌面连接
 selectedWindowTitle = sencorsta - sencorsta.com - 远程桌面连接
-lastUpdateTime = 1715825183799
+lastUpdateTime = 1715910554964
 [SceneData]
 [SceneData]
-SceneMain = {"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1715893200000,"resetType":"DAILY"}
-SceneMain_Challenge = {"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1715893200000,"resetType":"DAILY"}
-SceneMain_Challenge_Extreme = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715893200000,"resetType":"DAILY"}
-SceneMain_Energy = {"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1715893200000,"resetType":"DAILY"}
-SceneMain_Energy_Free = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715860800000,"resetType":"SPECIAL_RULES"}
-SceneMain_Energy_Friend = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715893200000,"resetType":"DAILY"}
-SceneMain_Energy_Home = {"data":{"isDone":false,"count":2,"done":false},"nextResetTime":1715893200000,"resetType":"DAILY"}
-SceneMain_Energy_Home_Select = {"data":{"isDone":false,"count":6,"done":false},"nextResetTime":1715893200000,"resetType":"DAILY"}
-SceneMain_Energy_Home_SelectRes = {"data":{"isDone":false,"count":4,"done":false},"nextResetTime":1715893200000,"resetType":"DAILY"}
-SceneMain_Energy_buy = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715893200000,"resetType":"DAILY"}
-SceneMain_Explore = {"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1715893200000,"resetType":"DAILY"}
-SceneMain_Explore_Gift = {"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1715893200000,"resetType":"DAILY"}
-SceneMain_Explore_Gift_Evil = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715893200000,"resetType":"DAILY"}
-SceneMain_Explore_King = {"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1715893200000,"resetType":"DAILY"}
-SceneMain_Explore_King_hell = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715893200000,"resetType":"DAILY"}
-SceneMain_Explore_King_kings = {"data":{"isDone":false,"count":9,"done":false},"nextResetTime":1715893200000,"resetType":"DAILY"}
-SceneMain_Explore_Leader = {"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1715893200000,"resetType":"DAILY"}
-SceneMain_Explore_Leader_quick = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715893200000,"resetType":"DAILY"}
-SceneMain_Family = {"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1715893200000,"resetType":"DAILY"}
-SceneMain_Family_Help = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715893200000,"resetType":"DAILY"}
-SceneMain_Family_Info = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715893200000,"resetType":"DAILY"}
-SceneMain_Family_Out = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715893200000,"resetType":"DAILY"}
-SceneMain_Family_Out_BigBoss = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715893200000,"resetType":"DAILY"}
-SceneMain_Family_Out_Boss = {"data":{"isDone":false,"count":3,"done":false},"nextResetTime":1715893200000,"resetType":"DAILY"}
-SceneMain_Family_Out_Fight = {"data":{"isDone":false,"count":3,"done":false},"nextResetTime":1715893200000,"resetType":"DAILY"}
-SceneMain_Family_Task = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715893200000,"resetType":"DAILY"}
-SceneMain_Fight = {"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1715893200000,"resetType":"DAILY"}
-SceneMain_Fight_Endless = {"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1715893200000,"resetType":"DAILY"}
-SceneMain_Fight_Endless_Quick = {"data":{"isDone":false,"count":2,"done":false},"nextResetTime":1715893200000,"resetType":"DAILY"}
-SceneMain_Fight_Endless_Reward = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715893200000,"resetType":"DAILY"}
-SceneMain_Fight_Gym = {"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1715893200000,"resetType":"DAILY"}
-SceneMain_Fight_Gym_Dragon = {"record":{"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1716757200000,"resetType":"WEEKLY_DOUBLE"},"recordSub":{"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715893200000,"resetType":"DAILY"}}
-SceneMain_Fight_Gym_Wind = {"record":{"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1716757200000,"resetType":"WEEKLY_DOUBLE"},"recordSub":{"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715893200000,"resetType":"DAILY"}}
-SceneMain_Fight_VS = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715893200000,"resetType":"DAILY"}
-SceneMain_Fight_VS_Quick = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715893200000,"resetType":"DAILY"}
-SceneMain_Mail = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715893200000,"resetType":"DAILY"}
-SceneMain_Qiyu = {"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1715893200000,"resetType":"DAILY"}
-SceneMain_Qiyu_find = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715893200000,"resetType":"DAILY"}
-SceneMain_Qiyu_helper = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715893200000,"resetType":"DAILY"}
-SceneMain_Qiyu_quest = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715860800000,"resetType":"SPECIAL_RULES"}
-SceneMain_Role = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715893200000,"resetType":"DAILY"}
-SceneMain_Welfare = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715893200000,"resetType":"DAILY"}
+SceneMain = {"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1715979600000,"resetType":"DAILY"}
+SceneMain_Challenge = {"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1715979600000,"resetType":"DAILY"}
+SceneMain_Challenge_Extreme = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715979600000,"resetType":"DAILY"}
+SceneMain_Energy = {"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1715979600000,"resetType":"DAILY"}
+SceneMain_Energy_Free = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715932800000,"resetType":"SPECIAL_RULES"}
+SceneMain_Energy_Friend = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715979600000,"resetType":"DAILY"}
+SceneMain_Energy_Home = {"data":{"isDone":false,"count":2,"done":false},"nextResetTime":1715979600000,"resetType":"DAILY"}
+SceneMain_Energy_Home_Select = {"data":{"isDone":false,"count":6,"done":false},"nextResetTime":1715979600000,"resetType":"DAILY"}
+SceneMain_Energy_Home_SelectRes = {"data":{"isDone":false,"count":4,"done":false},"nextResetTime":1715979600000,"resetType":"DAILY"}
+SceneMain_Energy_buy = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715979600000,"resetType":"DAILY"}
+SceneMain_Explore = {"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1715979600000,"resetType":"DAILY"}
+SceneMain_Explore_Gift = {"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1715979600000,"resetType":"DAILY"}
+SceneMain_Explore_Gift_Evil = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715979600000,"resetType":"DAILY"}
+SceneMain_Explore_King = {"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1715979600000,"resetType":"DAILY"}
+SceneMain_Explore_King_hell = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715979600000,"resetType":"DAILY"}
+SceneMain_Explore_King_kings = {"data":{"isDone":false,"count":9,"done":false},"nextResetTime":1715979600000,"resetType":"DAILY"}
+SceneMain_Explore_Leader = {"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1715979600000,"resetType":"DAILY"}
+SceneMain_Explore_Leader_quick = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715979600000,"resetType":"DAILY"}
+SceneMain_Family = {"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1715979600000,"resetType":"DAILY"}
+SceneMain_Family_Help = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715979600000,"resetType":"DAILY"}
+SceneMain_Family_Info = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715979600000,"resetType":"DAILY"}
+SceneMain_Family_Out = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715979600000,"resetType":"DAILY"}
+SceneMain_Family_Out_BigBoss = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715979600000,"resetType":"DAILY"}
+SceneMain_Family_Out_Boss = {"data":{"isDone":false,"count":3,"done":false},"nextResetTime":1715979600000,"resetType":"DAILY"}
+SceneMain_Family_Out_Fight = {"data":{"isDone":false,"count":3,"done":false},"nextResetTime":1715979600000,"resetType":"DAILY"}
+SceneMain_Family_Task = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715979600000,"resetType":"DAILY"}
+SceneMain_Fight = {"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1715979600000,"resetType":"DAILY"}
+SceneMain_Fight_Endless = {"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1715979600000,"resetType":"DAILY"}
+SceneMain_Fight_Endless_Quick = {"data":{"isDone":false,"count":2,"done":false},"nextResetTime":1715979600000,"resetType":"DAILY"}
+SceneMain_Fight_Endless_Reward = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715979600000,"resetType":"DAILY"}
+SceneMain_Fight_Gym = {"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1715979600000,"resetType":"DAILY"}
+SceneMain_Fight_Gym_Dragon = {"record":{"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1716757200000,"resetType":"WEEKLY_DOUBLE"},"recordSub":{"data":{"isDone":false,"count":20,"done":false},"nextResetTime":1715979600000,"resetType":"DAILY"}}
+SceneMain_Fight_Gym_Wind = {"record":{"data":{"isDone":false,"count":5,"done":false},"nextResetTime":1716757200000,"resetType":"WEEKLY_DOUBLE"},"recordSub":{"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715979600000,"resetType":"DAILY"}}
+SceneMain_Fight_VS = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715979600000,"resetType":"DAILY"}
+SceneMain_Fight_VS_Quick = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715979600000,"resetType":"DAILY"}
+SceneMain_Mail = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715979600000,"resetType":"DAILY"}
+SceneMain_Qiyu = {"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1715979600000,"resetType":"DAILY"}
+SceneMain_Qiyu_find = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715979600000,"resetType":"DAILY"}
+SceneMain_Qiyu_helper = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715979600000,"resetType":"DAILY"}
+SceneMain_Qiyu_quest = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715932800000,"resetType":"SPECIAL_RULES"}
+SceneMain_Role = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715979600000,"resetType":"DAILY"}
+SceneMain_Welfare = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715979600000,"resetType":"DAILY"}

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


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


BIN
opencv/scene/role/back2.png


BIN
opencv/scene/role/shop.png


BIN
opencv/scene/welfare/tatic_dark.png


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

@@ -67,7 +67,7 @@ public class SceneMain_Challenge_Extreme extends BaseScene implements Scene {
             ThreadUtil.sleep(2000);
             ThreadUtil.sleep(2000);
         }
         }
         moveToClick(PathStart2, 0.9);
         moveToClick(PathStart2, 0.9);
-        ThreadUtil.sleep(3000);
+        ThreadUtil.sleep(6000);
 
 
         moveToClick(PathStart2, 0.9);
         moveToClick(PathStart2, 0.9);
         ThreadUtil.sleep(3000);
         ThreadUtil.sleep(3000);

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

@@ -17,7 +17,7 @@ public class SceneMain_Family_Out_BigBoss extends BaseScene implements Scene {
     @JsonIgnore
     @JsonIgnore
     @Override
     @Override
     public float getPriority() {
     public float getPriority() {
-        return 3.0f;
+        return 1.0f;
     }
     }
 
 
     private static String PathEnter = System.getProperty("user.dir") + "\\opencv\\scene\\family\\out\\bigBoss\\enter.png";
     private static String PathEnter = System.getProperty("user.dir") + "\\opencv\\scene\\family\\out\\bigBoss\\enter.png";

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

@@ -17,7 +17,7 @@ public class SceneMain_Family_Out_Boss extends BaseScene implements Scene {
     @JsonIgnore
     @JsonIgnore
     @Override
     @Override
     public float getPriority() {
     public float getPriority() {
-        return 3.0f;
+        return 2.0f;
     }
     }
 
 
     private static String PathEnter = System.getProperty("user.dir") + "\\opencv\\scene\\family\\out\\boss\\enter.png";
     private static String PathEnter = System.getProperty("user.dir") + "\\opencv\\scene\\family\\out\\boss\\enter.png";

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

@@ -29,10 +29,14 @@ public class SceneMain_Family_Task extends BaseScene implements Scene {
     private static String PathTask3 = System.getProperty("user.dir") + "\\opencv\\scene\\family\\task\\task3.png";
     private static String PathTask3 = System.getProperty("user.dir") + "\\opencv\\scene\\family\\task\\task3.png";
     private static String PathTask4 = System.getProperty("user.dir") + "\\opencv\\scene\\family\\task\\task4.png";
     private static String PathTask4 = System.getProperty("user.dir") + "\\opencv\\scene\\family\\task\\task4.png";
 
 
+    private static String PathRightdoor = System.getProperty("user.dir") + "\\opencv\\scene\\family\\task\\rightDoor.png";
+    private static String PathGoLeft = System.getProperty("user.dir") + "\\opencv\\scene\\family\\task\\goLeft.png";
+
 
 
     @Override
     @Override
     public void back() throws AWTException {
     public void back() throws AWTException {
         moveToClick(PathBack, 0.9);
         moveToClick(PathBack, 0.9);
+        ThreadUtil.sleep(2000);
     }
     }
 
 
     @Override
     @Override
@@ -45,6 +49,13 @@ public class SceneMain_Family_Task extends BaseScene implements Scene {
                 ThreadUtil.sleep(2000);
                 ThreadUtil.sleep(2000);
                 continue;
                 continue;
             }
             }
+            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);
+            }
         }
         }
     }
     }
 
 

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

@@ -23,6 +23,7 @@ public class SceneMain_Fight_Gym extends BaseScene implements Scene {
     @Override
     @Override
     public void back() throws AWTException {
     public void back() throws AWTException {
         moveToClick(PathBack, 0.9);
         moveToClick(PathBack, 0.9);
+        ThreadUtil.sleep(2000);
     }
     }
 
 
     @Override
     @Override

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

@@ -98,7 +98,7 @@ public class SceneMain_Fight_Gym_Dragon extends SceneWhitSubRecord implements Sc
             while (!checkHas(PathOver, 0.9)) {
             while (!checkHas(PathOver, 0.9)) {
                 if (checkHas(PathLose, 0.9)) {
                 if (checkHas(PathLose, 0.9)) {
                     //发现失败 直接放弃
                     //发现失败 直接放弃
-                    getRecordSub().getData().setCount(maxTime);
+                    getRecord().getData().setCount(maxTime);
                     randomToClick();
                     randomToClick();
                     ThreadUtil.sleep(2000);
                     ThreadUtil.sleep(2000);
                     return;
                     return;

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

@@ -24,6 +24,7 @@ public class SceneMain_Role extends BaseScene implements Scene {
     private static String PathEnter = System.getProperty("user.dir") + "\\opencv\\scene\\role\\enter.png";
     private static String PathEnter = System.getProperty("user.dir") + "\\opencv\\scene\\role\\enter.png";
     private static String PathCheck = System.getProperty("user.dir") + "\\opencv\\scene\\role\\check.png";
     private static String PathCheck = System.getProperty("user.dir") + "\\opencv\\scene\\role\\check.png";
     private static String PathBack = System.getProperty("user.dir") + "\\opencv\\scene\\role\\back.png";
     private static String PathBack = System.getProperty("user.dir") + "\\opencv\\scene\\role\\back.png";
+    private static String PathBack2 = System.getProperty("user.dir") + "\\opencv\\scene\\role\\back2.png";
     private static String PathDropPoint = System.getProperty("user.dir") + "\\opencv\\scene\\role\\dropPoint.png";
     private static String PathDropPoint = System.getProperty("user.dir") + "\\opencv\\scene\\role\\dropPoint.png";
     private static String PathLevel = System.getProperty("user.dir") + "\\opencv\\scene\\role\\level.png";
     private static String PathLevel = System.getProperty("user.dir") + "\\opencv\\scene\\role\\level.png";
     private static String PathCanLvup = System.getProperty("user.dir") + "\\opencv\\scene\\role\\canLvup.png";
     private static String PathCanLvup = System.getProperty("user.dir") + "\\opencv\\scene\\role\\canLvup.png";
@@ -36,6 +37,7 @@ public class SceneMain_Role extends BaseScene implements Scene {
     private static String PathOb = System.getProperty("user.dir") + "\\opencv\\scene\\role\\ob.png";
     private static String PathOb = System.getProperty("user.dir") + "\\opencv\\scene\\role\\ob.png";
     private static String PathSkill = System.getProperty("user.dir") + "\\opencv\\scene\\role\\skill.png";
     private static String PathSkill = System.getProperty("user.dir") + "\\opencv\\scene\\role\\skill.png";
     private static String PathSkillUp = System.getProperty("user.dir") + "\\opencv\\scene\\role\\skillUp.png";
     private static String PathSkillUp = System.getProperty("user.dir") + "\\opencv\\scene\\role\\skillUp.png";
+    private static String PathShop = System.getProperty("user.dir") + "\\opencv\\scene\\role\\shop.png";
 
 
 
 
     @Override
     @Override
@@ -80,7 +82,7 @@ public class SceneMain_Role extends BaseScene implements Scene {
         ThreadUtil.sleep(2000);
         ThreadUtil.sleep(2000);
 
 
         while(!checkHas(PathCanLvup, 0.9)){
         while(!checkHas(PathCanLvup, 0.9)){
-            moveToHold(PathExp,0.9,new Point(0,0),10);
+            moveToHold(PathExp,0.9,new Point(0,0),10000);
             ThreadUtil.sleep(2000);
             ThreadUtil.sleep(2000);
         }
         }
 
 
@@ -97,6 +99,8 @@ public class SceneMain_Role extends BaseScene implements Scene {
         ThreadUtil.sleep(2000);
         ThreadUtil.sleep(2000);
         moveToClick(PathClose,0.9);
         moveToClick(PathClose,0.9);
         ThreadUtil.sleep(2000);
         ThreadUtil.sleep(2000);
+        moveToClick(PathClose,0.9);
+        ThreadUtil.sleep(2000);
 
 
         //第二个位置
         //第二个位置
         moveToClick(PathCanLvup,0.9,new Point(-46, -274));
         moveToClick(PathCanLvup,0.9,new Point(-46, -274));
@@ -163,7 +167,7 @@ public class SceneMain_Role extends BaseScene implements Scene {
         }
         }
         getRecord().getData().setDone(true);
         getRecord().getData().setDone(true);
         //关闭退出
         //关闭退出
-        moveToClick(PathBack, 0.9);
+        moveToClick(PathBack2, 0.9);
     }
     }
 
 
     @Override
     @Override