Merge branch 'master' of http://101.33.225.95:3000/chenanghui/AdLike2048

assets/res/battleMap/texture/木/上遮.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "bbfddcd6-22a3-4425-a6f5-aa95dc8f6f9a",
+  "uuid": "ae0d00cf-8e27-4542-b622-a905e1e2e718",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "bbfddcd6-22a3-4425-a6f5-aa95dc8f6f9a@6c48a",
+      "uuid": "ae0d00cf-8e27-4542-b622-a905e1e2e718@6c48a",
-      "displayName": "盖在上面",
+      "displayName": "上遮",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "bbfddcd6-22a3-4425-a6f5-aa95dc8f6f9a",
+        "imageUuidOrDatabaseUri": "ae0d00cf-8e27-4542-b622-a905e1e2e718",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,8 +34,8 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "bbfddcd6-22a3-4425-a6f5-aa95dc8f6f9a@f9941",
+      "uuid": "ae0d00cf-8e27-4542-b622-a905e1e2e718@f9941",
-      "displayName": "盖在上面",
+      "displayName": "上遮",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {
@@ -45,9 +45,9 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 713,
+        "width": 730,
         "height": 99,
-        "rawWidth": 713,
+        "rawWidth": 730,
         "rawHeight": 99,
         "borderTop": 0,
         "borderBottom": 0,
@@ -60,16 +60,16 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -356.5,
+            -365,
             -49.5,
             0,
-            356.5,
+            365,
             -49.5,
             0,
-            -356.5,
+            -365,
             49.5,
             0,
-            356.5,
+            365,
             49.5,
             0
           ],
@@ -84,11 +84,11 @@
           "uv": [
             0,
             99,
-            713,
+            730,
             99,
             0,
             0,
-            713,
+            730,
             0
           ],
           "nuv": [
@@ -102,18 +102,18 @@
             1
           ],
           "minPos": [
-            -356.5,
+            -365,
             -49.5,
             0
           ],
           "maxPos": [
-            356.5,
+            365,
             49.5,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "bbfddcd6-22a3-4425-a6f5-aa95dc8f6f9a@6c48a",
+        "imageUuidOrDatabaseUri": "ae0d00cf-8e27-4542-b622-a905e1e2e718@6c48a",
         "atlasUuid": "",
         "trimType": "auto"
       },
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "fixAlphaTransparencyArtifacts": false,
     "hasAlpha": true,
-    "redirect": "bbfddcd6-22a3-4425-a6f5-aa95dc8f6f9a@6c48a"
+    "redirect": "ae0d00cf-8e27-4542-b622-a905e1e2e718@6c48a"
   }
 }

assets/res/battleMap/texture/木/下遮.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "f40a4ac9-e52b-4c46-ad53-0fdcf303a275",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "f40a4ac9-e52b-4c46-ad53-0fdcf303a275@6c48a",
+      "displayName": "下遮",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "f40a4ac9-e52b-4c46-ad53-0fdcf303a275",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "f40a4ac9-e52b-4c46-ad53-0fdcf303a275@f9941",
+      "displayName": "下遮",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 735,
+        "height": 132,
+        "rawWidth": 735,
+        "rawHeight": 132,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -367.5,
+            -66,
+            0,
+            367.5,
+            -66,
+            0,
+            -367.5,
+            66,
+            0,
+            367.5,
+            66,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            132,
+            735,
+            132,
+            0,
+            0,
+            735,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -367.5,
+            -66,
+            0
+          ],
+          "maxPos": [
+            367.5,
+            66,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "f40a4ac9-e52b-4c46-ad53-0fdcf303a275@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "fixAlphaTransparencyArtifacts": false,
+    "hasAlpha": true,
+    "redirect": "f40a4ac9-e52b-4c46-ad53-0fdcf303a275@6c48a"
+  }
+}

assets/res/battleMap/texture/水/盖在上面.png.meta

@@ -46,9 +46,9 @@
         "trimX": 0,
         "trimY": 0,
         "width": 733,
-        "height": 103,
+        "height": 124,
         "rawWidth": 733,
-        "rawHeight": 103,
+        "rawHeight": 124,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -61,16 +61,16 @@
         "vertices": {
           "rawPosition": [
             -366.5,
-            -51.5,
+            -62,
             0,
             366.5,
-            -51.5,
+            -62,
             0,
             -366.5,
-            51.5,
+            62,
             0,
             366.5,
-            51.5,
+            62,
             0
           ],
           "indexes": [
@@ -83,9 +83,9 @@
           ],
           "uv": [
             0,
-            103,
+            124,
             733,
-            103,
+            124,
             0,
             0,
             733,
@@ -103,12 +103,12 @@
           ],
           "minPos": [
             -366.5,
-            -51.5,
+            -62,
             0
           ],
           "maxPos": [
             366.5,
-            51.5,
+            62,
             0
           ]
         },

assets/res/battleMap/texture/火/盖在上面.png.meta

@@ -45,9 +45,9 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 741,
+        "width": 732,
         "height": 109,
-        "rawWidth": 741,
+        "rawWidth": 732,
         "rawHeight": 109,
         "borderTop": 0,
         "borderBottom": 0,
@@ -60,16 +60,16 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -370.5,
+            -366,
             -54.5,
             0,
-            370.5,
+            366,
             -54.5,
             0,
-            -370.5,
+            -366,
             54.5,
             0,
-            370.5,
+            366,
             54.5,
             0
           ],
@@ -84,11 +84,11 @@
           "uv": [
             0,
             109,
-            741,
+            732,
             109,
             0,
             0,
-            741,
+            732,
             0
           ],
           "nuv": [
@@ -102,12 +102,12 @@
             1
           ],
           "minPos": [
-            -370.5,
+            -366,
             -54.5,
             0
           ],
           "maxPos": [
-            370.5,
+            366,
             54.5,
             0
           ]

assets/res/battleMap/texture/金/地图金.jpg.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "01d01725-cf5a-4360-8f5b-191a0e870fef",
+  "uuid": "89e07bd8-bbb8-42fd-a6d6-4151f674073a",
   "files": [
     ".jpg",
     ".json"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "01d01725-cf5a-4360-8f5b-191a0e870fef@6c48a",
+      "uuid": "89e07bd8-bbb8-42fd-a6d6-4151f674073a@6c48a",
       "displayName": "地图金",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "01d01725-cf5a-4360-8f5b-191a0e870fef",
+        "imageUuidOrDatabaseUri": "89e07bd8-bbb8-42fd-a6d6-4151f674073a",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,7 +34,7 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "01d01725-cf5a-4360-8f5b-191a0e870fef@f9941",
+      "uuid": "89e07bd8-bbb8-42fd-a6d6-4151f674073a@f9941",
       "displayName": "地图金",
       "id": "f9941",
       "name": "spriteFrame",
@@ -113,7 +113,7 @@
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "01d01725-cf5a-4360-8f5b-191a0e870fef@6c48a",
+        "imageUuidOrDatabaseUri": "89e07bd8-bbb8-42fd-a6d6-4151f674073a@6c48a",
         "atlasUuid": "",
         "trimType": "auto"
       },
@@ -129,6 +129,6 @@
     "type": "sprite-frame",
     "fixAlphaTransparencyArtifacts": false,
     "hasAlpha": false,
-    "redirect": "01d01725-cf5a-4360-8f5b-191a0e870fef@6c48a"
+    "redirect": "89e07bd8-bbb8-42fd-a6d6-4151f674073a@6c48a"
   }
 }

assets/res/battleMap/texture/金/盖在上面.png.meta

@@ -45,10 +45,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 760,
+        "width": 745,
-        "height": 84,
+        "height": 122,
-        "rawWidth": 760,
+        "rawWidth": 745,
-        "rawHeight": 84,
+        "rawHeight": 122,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -60,17 +60,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -380,
+            -372.5,
-            -42,
+            -61,
             0,
-            380,
+            372.5,
-            -42,
+            -61,
             0,
-            -380,
+            -372.5,
-            42,
+            61,
             0,
-            380,
+            372.5,
-            42,
+            61,
             0
           ],
           "indexes": [
@@ -83,12 +83,12 @@
           ],
           "uv": [
             0,
-            84,
+            122,
-            760,
+            745,
-            84,
+            122,
             0,
             0,
-            760,
+            745,
             0
           ],
           "nuv": [
@@ -102,13 +102,13 @@
             1
           ],
           "minPos": [
-            -380,
+            -372.5,
-            -42,
+            -61,
             0
           ],
           "maxPos": [
-            380,
+            372.5,
-            42,
+            61,
             0
           ]
         },