Merge branch '1018' of gitlab2.dui88.com:wanghongyuan/xiaoxiaole into 1018

egret/src/something/Tool.ts

@@ -13,15 +13,15 @@ export class Tool {
     /**
      * 格子宽度
      */
-    public static width = 81.5;
+    public static width = 80// 81.5;
     /**
      * 格子高度
      */
-    public static height = 81.5;
+    public static height = 80// 81.5;
     //整体偏移X
-    public static offsetX = 8.25;
+    public static offsetX = 15// 8.25;
     //整体偏移Y
-    public static offsetY = 260;
+    public static offsetY = 275 //260;
     /**
      * 圆角半径
      */
@@ -52,7 +52,7 @@ export class Tool {
      * 初始化数据
      */
     public static init(isTwo: boolean = false) {
-        this.offsetX = isTwo ? 49 : 8.25
+        this.offsetX = isTwo ? 55 : 15// 49 : 8.25
         //都是9*9
         //位置信息
         var spaceX = this.width,
@@ -863,7 +863,7 @@ export class Tool {
         }
         return shuffled.slice(min);
     }
-    public static getRandomArrayElementsEx(arr: any[], count: number):any[] {
+    public static getRandomArrayElementsEx(arr: any[], count: number): any[] {
         //如果count大于等于数组长度，返回所有数组
         if (arr.length <= count) return arr.slice();
         if (count <= 0) return [];