update:重构脚本执行方式

src/main/java/com/yutou/qqbot/data/jianr/AndroidDevice.java

@@ -0,0 +1,35 @@
+package com.yutou.qqbot.data.jianr;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class AndroidDevice {
+    String title;
+    String deviceId;
+    DeviceDisplay androidDevice;
+    List<GameDisplay> deviceDisplay;
+
+
+    @Data
+    public static class DeviceDisplay {
+        int width, height;
+    }
+
+    @Data
+    public static class GameDisplay {
+        String title;
+        double width, height;
+        Vector2D start, end;
+
+        public double getWidth() {
+            return end.getX() - start.getX();
+        }
+
+        public double getHeight() {
+            return end.getY() - start.getY();
+        }
+    }
+
+}

src/main/java/com/yutou/qqbot/data/jianr/JianRScriptData.java

@@ -1,4 +1,4 @@
-package com.yutou.qqbot.data;
+package com.yutou.qqbot.data.jianr;
 
 import lombok.Data;
 

src/main/java/com/yutou/qqbot/data/jianr/JianRScriptV2Data.java

@@ -0,0 +1,26 @@
+package com.yutou.qqbot.data.jianr;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class JianRScriptV2Data {
+    private String title;
+    private List<Script> script;
+
+    @Data
+    public static class Script {
+        private String title;
+        private String activity;
+        private int nextWaitTime;
+        private int randomNextWaitTime;
+    }
+    public static class ScriptModel {
+        public static final String MAP = "map";
+        public static final String attack = "attack";
+        public static final String formationType = "formationType";
+        public static final String dialog_go = "dialog_go";
+        public static final String dialog_back = "dialog_back";
+    }
+}

src/main/java/com/yutou/qqbot/data/jianr/Vector2D.java

@@ -0,0 +1,38 @@
+package com.yutou.qqbot.data.jianr;
+
+import lombok.Data;
+
+import java.util.Random;
+
+@Data
+public class Vector2D {
+    double x, y;
+    boolean enableRandomX, enableRandomY;
+    boolean absRandomX, absRandomY;
+    int randomNumX, randomNumY;
+
+
+    public double getX() {
+        if (isEnableRandomX()) {
+            double tmp = new Random().nextDouble(-randomNumX, randomNumX);
+            if (isAbsRandomX()) {
+                return Math.abs(tmp) + x;
+            } else {
+                return tmp + x;
+            }
+        }
+        return x;
+    }
+
+    public double getY() {
+        if(isEnableRandomY()){
+            double tmp = new Random().nextDouble(-randomNumY, randomNumY);
+            if (isAbsRandomY()) {
+                return Math.abs(tmp) + y;
+            } else {
+                return tmp + y;
+            }
+        }
+        return y;
+    }
+}