ICe 4 mēneši atpakaļ
vecāks
revīzija
dd0fbc5914

+ 45 - 45
conf/config.properties

@@ -1,52 +1,52 @@
 []
-windowX = 278
-windowY = 332
+windowX = -74
+windowY = 49
 windowWidth = 1351.0
-windowHeight = 717.0
+windowHeight = 454.0
 extendedState = 0
 appTheme = Darcula Theme
 [robot]
 selectedWindowTitle = sencorsta - sencorsta.com - 远程桌面连接
-lastUpdateTime = 1715681805987
+lastUpdateTime = 1715738488764
 [SceneData]
-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"}
+SceneMain = {"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1715806800000,"resetType":"DAILY"}
+SceneMain_Challenge = {"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1715806800000,"resetType":"DAILY"}
+SceneMain_Challenge_Extreme = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715806800000,"resetType":"DAILY"}
+SceneMain_Energy = {"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1715806800000,"resetType":"DAILY"}
+SceneMain_Energy_Free = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715760000000,"resetType":"SPECIAL_RULES"}
+SceneMain_Energy_Friend = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715806800000,"resetType":"DAILY"}
+SceneMain_Energy_Home = {"data":{"isDone":false,"count":2,"done":false},"nextResetTime":1715806800000,"resetType":"DAILY"}
+SceneMain_Energy_Home_Select = {"data":{"isDone":false,"count":6,"done":false},"nextResetTime":1715806800000,"resetType":"DAILY"}
+SceneMain_Energy_Home_SelectRes = {"data":{"isDone":false,"count":4,"done":false},"nextResetTime":1715806800000,"resetType":"DAILY"}
+SceneMain_Energy_buy = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715806800000,"resetType":"DAILY"}
+SceneMain_Explore = {"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1715806800000,"resetType":"DAILY"}
+SceneMain_Explore_Gift = {"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1715806800000,"resetType":"DAILY"}
+SceneMain_Explore_Gift_Evil = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715806800000,"resetType":"DAILY"}
+SceneMain_Explore_King = {"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1715806800000,"resetType":"DAILY"}
+SceneMain_Explore_King_hell = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715806800000,"resetType":"DAILY"}
+SceneMain_Explore_King_kings = {"data":{"isDone":false,"count":9,"done":false},"nextResetTime":1715806800000,"resetType":"DAILY"}
+SceneMain_Explore_Leader = {"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1715806800000,"resetType":"DAILY"}
+SceneMain_Explore_Leader_quick = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715806800000,"resetType":"DAILY"}
+SceneMain_Family = {"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1715806800000,"resetType":"DAILY"}
+SceneMain_Family_Help = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715806800000,"resetType":"DAILY"}
+SceneMain_Family_Info = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715806800000,"resetType":"DAILY"}
+SceneMain_Family_Out = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715806800000,"resetType":"DAILY"}
+SceneMain_Family_Out_BigBoss = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715806800000,"resetType":"DAILY"}
+SceneMain_Family_Out_Boss = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715806800000,"resetType":"DAILY"}
+SceneMain_Family_Out_Fight = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715806800000,"resetType":"DAILY"}
+SceneMain_Family_Task = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715806800000,"resetType":"DAILY"}
+SceneMain_Fight = {"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1715806800000,"resetType":"DAILY"}
+SceneMain_Fight_Endless = {"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1715806800000,"resetType":"DAILY"}
+SceneMain_Fight_Endless_Quick = {"data":{"isDone":false,"count":2,"done":false},"nextResetTime":1715806800000,"resetType":"DAILY"}
+SceneMain_Fight_Endless_Reward = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715806800000,"resetType":"DAILY"}
+SceneMain_Fight_Gym = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715806800000,"resetType":"DAILY"}
+SceneMain_Fight_Gym_Dragon = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715806800000,"resetType":"DAILY"}
+SceneMain_Fight_VS = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715806800000,"resetType":"DAILY"}
+SceneMain_Fight_VS_Quick = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715806800000,"resetType":"DAILY"}
+SceneMain_Mail = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715806800000,"resetType":"DAILY"}
+SceneMain_Qiyu = {"data":{"isDone":false,"count":0,"done":false},"nextResetTime":1715806800000,"resetType":"DAILY"}
+SceneMain_Qiyu_find = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715806800000,"resetType":"DAILY"}
+SceneMain_Qiyu_helper = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715806800000,"resetType":"DAILY"}
+SceneMain_Qiyu_quest = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715806800000,"resetType":"DAILY"}
+SceneMain_Role = {"data":{"isDone":true,"count":99,"done":true},"nextResetTime":1715806800000,"resetType":"DAILY"}
+SceneMain_Welfare = {"data":{"isDone":true,"count":0,"done":true},"nextResetTime":1715806800000,"resetType":"DAILY"}

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


+ 3 - 3
src/main/java/com/sencorsta/rabs/obj/ai/scene/explore/SceneMain_Explore_King_kings.java

@@ -101,11 +101,11 @@ public class SceneMain_Explore_King_kings extends BaseScene implements Scene {
             moveToClick(PathClose, 0.9);
             ThreadUtil.sleep(2000);
         }
-        ThreadUtil.sleep(2000);
+        ThreadUtil.sleep(4000);
         moveToClick(PathFight, 0.9);
-        ThreadUtil.sleep(2000);
+        ThreadUtil.sleep(4000);
         moveToClick(PathStart, 0.9);
-        ThreadUtil.sleep(2000);
+        ThreadUtil.sleep(4000);
 
         if (checkHas(PathCancle, 0.9)) {
             ThreadUtil.sleep(2000);

+ 2 - 2
src/main/java/com/sencorsta/rabs/obj/ai/scene/family/SceneMain_Family_Info.java

@@ -75,8 +75,8 @@ public class SceneMain_Family_Info extends BaseScene implements Scene {
             moveToClick(PathReward2, 0.9,new Point(0,-50));
             ThreadUtil.sleep(2000);
             randomToClick();
-        }else if (checkHas(PathReward2, 0.9)) {
-            moveToClick(PathReward2, 0.9,new Point(0,-50));
+        }else if (checkHas(PathReward3, 0.9)) {
+            moveToClick(PathReward3, 0.9,new Point(0,-50));
             ThreadUtil.sleep(2000);
             randomToClick();
         }

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

@@ -69,9 +69,9 @@ public class SceneMain_Family_Out_Boss extends BaseScene implements Scene {
                 }
                 ThreadUtil.sleep(1000);
             }
-            ThreadUtil.sleep(2000);
+            ThreadUtil.sleep(4000);
             moveToClick(PathStart, 0.9);
-            ThreadUtil.sleep(2000);
+            ThreadUtil.sleep(3000);
 
             if (checkHas(PathCancel,0.9)){
                 getRecord().getData().setCount(count+1);

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

@@ -13,7 +13,7 @@ import java.awt.AWTException;
 import java.util.Calendar;
 
 /**
- * 无尽 TODO ice 调整规则只有周2-6
+ * 无尽
  */
 @SceneAnnotation("SceneMain_Fight")
 public class SceneMain_Fight_Endless extends BaseScene implements Scene {

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

@@ -53,7 +53,7 @@ public class SceneMain_Fight_Gym extends BaseScene implements Scene {
 
     @Override
     public boolean isDone() {
-        return getRecord().getData().isDone();
+        return hasChildDone();
     }
 
 }

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

@@ -22,6 +22,7 @@ public class SceneMain_Fight_Gym_Dragon extends BaseScene implements Scene {
     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 static String PathLose = System.getProperty("user.dir") + "\\opencv\\scene\\fight\\gym\\dragon\\lose.png";
     private int maxTime = 20;
 
 
@@ -67,20 +68,30 @@ public class SceneMain_Fight_Gym_Dragon extends BaseScene implements Scene {
     public void think() throws AWTException {
         int count = getRecord().getData().getCount();
         if (count < maxTime) {
-            ThreadUtil.sleep(2000);
+            ThreadUtil.sleep(4000);
             moveToClick(PathStart, 0.9);
             ThreadUtil.sleep(2000);
+            while (!checkHas(PathStart2, 0.9)){
+                moveToClick(PathStart, 0.9);
+                ThreadUtil.sleep(2000);
+            }
             moveToClick(PathStart2, 0.9);
             ThreadUtil.sleep(2000);
 
             while (!checkHas(PathOver, 0.9)) {
+                if (checkHas(PathLose, 0.9)){
+                    //发现失败 直接放弃
+
+                    getRecord().getData().setCount(maxTime);
+                    return;
+                }
                 moveToClick(PathSkip, 0.9);
                 ThreadUtil.sleep(4000);
             }
-            ThreadUtil.sleep(8000);
+            ThreadUtil.sleep(6000);
             randomToClick();
 
-            ThreadUtil.sleep(8000);
+            ThreadUtil.sleep(12000);
 
             getRecord().getData().setCount(count + 1);
         }

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

@@ -12,7 +12,7 @@ import java.awt.AWTException;
 import java.util.Calendar;
 
 /**
- * 对决赛 TODO ice 调整规则只有周1-5
+ * 对决赛
  */
 @SceneAnnotation("SceneMain_Fight")
 public class SceneMain_Fight_VS extends BaseScene implements Scene {

+ 2 - 2
src/main/java/com/sencorsta/rabs/obj/ai/scene/qiyi/SceneMain_Qiyu.java

@@ -46,9 +46,9 @@ public class SceneMain_Qiyu extends BaseScene implements Scene {
 
             if (checkHas(PathBigbox, 0.9)) {
                 moveToClick(PathBigbox, 0.9,new Point(0,20));
-                ThreadUtil.sleep(3000);
+                ThreadUtil.sleep(5000);
                 java.awt.Point lastClickPoint = AiManage.getInstance().getLastClickPoint();
-                lastClickPoint.setLocation(lastClickPoint.x,lastClickPoint.y+100);
+                lastClickPoint.setLocation(lastClickPoint.x+300,lastClickPoint.y+200);
                 randomToClick();
             }
         }

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

@@ -84,7 +84,7 @@ public class SceneMain_Role extends BaseScene implements Scene {
         }
 
         //依次点击4个位置快速完成一遍
-        moveToClick(PathDropPoint,0.9,new Point(-130, -274));
+        moveToClick(PathCanLvup,0.9,new Point(-130, -274));
         ThreadUtil.sleep(2000);
         moveToClick(PathQuick,0.9);
         ThreadUtil.sleep(2000);
@@ -98,7 +98,7 @@ public class SceneMain_Role extends BaseScene implements Scene {
         ThreadUtil.sleep(2000);
 
         //第二个位置
-        moveToClick(PathDropPoint,0.9,new Point(-46, -274));
+        moveToClick(PathCanLvup,0.9,new Point(-46, -274));
         ThreadUtil.sleep(2000);
         moveToClick(PathOb,0.9);
         ThreadUtil.sleep(2000);
@@ -110,9 +110,11 @@ public class SceneMain_Role extends BaseScene implements Scene {
         ThreadUtil.sleep(2000);
         moveToClick(PathClose,0.9);
         ThreadUtil.sleep(2000);
+        moveToClick(PathClose,0.9);
+        ThreadUtil.sleep(2000);
 
         //第三个位置
-        moveToClick(PathDropPoint,0.9,new Point(42, -274));
+        moveToClick(PathCanLvup,0.9,new Point(42, -274));
         ThreadUtil.sleep(2000);
         moveToClick(PathOb,0.9);
         ThreadUtil.sleep(2000);
@@ -124,9 +126,11 @@ public class SceneMain_Role extends BaseScene implements Scene {
         ThreadUtil.sleep(2000);
         moveToClick(PathClose,0.9);
         ThreadUtil.sleep(2000);
+        moveToClick(PathClose,0.9);
+        ThreadUtil.sleep(2000);
 
         //第四个位置
-        moveToClick(PathDropPoint,0.9,new Point(122, -274));
+        moveToClick(PathCanLvup,0.9,new Point(122, -274));
         ThreadUtil.sleep(2000);
         moveToClick(PathOb,0.9);
         ThreadUtil.sleep(2000);
@@ -138,6 +142,8 @@ public class SceneMain_Role extends BaseScene implements Scene {
         ThreadUtil.sleep(2000);
         moveToClick(PathClose,0.9);
         ThreadUtil.sleep(2000);
+        moveToClick(PathClose,0.9);
+        ThreadUtil.sleep(2000);
 
 
         moveToClick(PathCanLvup,0.9);