协议调整

assets/bundle/gridMap/mergeEquip.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.3",
+  "uuid": "c6065c52-7cf4-449c-9f70-5e656df34ce3",
+  "importer": "folder",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

assets/bundle/gridMap/mergeProp/merge_101.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "b5896a15-9e62-422f-a650-8d80f7cc52df",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 124,
+  "height": 124,
+  "platformSettings": {},
+  "subMetas": {
+    "merge_101": {
+      "ver": "1.0.6",
+      "uuid": "58246aa4-c361-430c-8f47-cfd2dccdc2e2",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "b5896a15-9e62-422f-a650-8d80f7cc52df",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 28,
+      "trimY": 25,
+      "width": 68,
+      "height": 74,
+      "rawWidth": 124,
+      "rawHeight": 124,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/bundle/gridMap/mergeProp/merge_10101.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "41f3c9e1-276a-45ac-9b08-306fcce94a92",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 124,
+  "height": 124,
+  "platformSettings": {},
+  "subMetas": {
+    "merge_10101": {
+      "ver": "1.0.6",
+      "uuid": "8105012d-e5bb-4115-8056-0e62655a3df1",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "41f3c9e1-276a-45ac-9b08-306fcce94a92",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 1,
+      "offsetY": -3,
+      "trimX": 17,
+      "trimY": 29,
+      "width": 92,
+      "height": 72,
+      "rawWidth": 124,
+      "rawHeight": 124,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/bundle/gridMap/mergeProp/merge_10102.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "29e002d6-1fe0-4cae-9235-3be33e0f7cc5",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 124,
+  "height": 124,
+  "platformSettings": {},
+  "subMetas": {
+    "merge_10102": {
+      "ver": "1.0.6",
+      "uuid": "66ff5d11-9d9b-4109-ac6e-2bf170fe2163",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "29e002d6-1fe0-4cae-9235-3be33e0f7cc5",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 1.5,
+      "offsetY": -4.5,
+      "trimX": 16,
+      "trimY": 30,
+      "width": 95,
+      "height": 73,
+      "rawWidth": 124,
+      "rawHeight": 124,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/bundle/gridMap/mergeProp/merge_10103.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "5e71d195-aac1-4f98-b53b-47c451fa815c",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 124,
+  "height": 124,
+  "platformSettings": {},
+  "subMetas": {
+    "merge_10103": {
+      "ver": "1.0.6",
+      "uuid": "2d66dd78-07db-47ee-a673-a8924003d31f",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "5e71d195-aac1-4f98-b53b-47c451fa815c",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 1.5,
+      "offsetY": -4.5,
+      "trimX": 16,
+      "trimY": 30,
+      "width": 95,
+      "height": 73,
+      "rawWidth": 124,
+      "rawHeight": 124,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/bundle/gridMap/mergeProp/merge_10104.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "faaea24f-5cb0-40fb-b608-4441dfc5f96e",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 124,
+  "height": 124,
+  "platformSettings": {},
+  "subMetas": {
+    "merge_10104": {
+      "ver": "1.0.6",
+      "uuid": "8243c9da-1915-472f-a7d4-14e75dba2cbb",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "faaea24f-5cb0-40fb-b608-4441dfc5f96e",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 1.5,
+      "offsetY": -4,
+      "trimX": 16,
+      "trimY": 29,
+      "width": 95,
+      "height": 74,
+      "rawWidth": 124,
+      "rawHeight": 124,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/bundle/gridMap/mergeProp/merge_10105.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "9b1d63a1-cec2-4b36-bd3d-6b8b06d1f0e4",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 124,
+  "height": 124,
+  "platformSettings": {},
+  "subMetas": {
+    "merge_10105": {
+      "ver": "1.0.6",
+      "uuid": "b83c4f12-80f0-4df7-80b3-e776616e6d0d",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "9b1d63a1-cec2-4b36-bd3d-6b8b06d1f0e4",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0.5,
+      "offsetY": 2,
+      "trimX": 15,
+      "trimY": 16,
+      "width": 95,
+      "height": 88,
+      "rawWidth": 124,
+      "rawHeight": 124,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/bundle/gridMap/mergeProp/merge_10106.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "a7aea29b-6a46-46b5-8989-17f87f1629bf",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 124,
+  "height": 124,
+  "platformSettings": {},
+  "subMetas": {
+    "merge_10106": {
+      "ver": "1.0.6",
+      "uuid": "bd1c50cb-e842-4106-8b97-dd60634bb80d",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "a7aea29b-6a46-46b5-8989-17f87f1629bf",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 2.5,
+      "offsetY": -2.5,
+      "trimX": 18,
+      "trimY": 26,
+      "width": 93,
+      "height": 77,
+      "rawWidth": 124,
+      "rawHeight": 124,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/bundle/gridMap/mergeProp/merge_10107.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "5d61bc83-18b7-488a-9d29-4a53e61cdfde",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 124,
+  "height": 124,
+  "platformSettings": {},
+  "subMetas": {
+    "merge_10107": {
+      "ver": "1.0.6",
+      "uuid": "d4dc4d10-ee18-4ef2-93fd-9bc9679cf179",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "5d61bc83-18b7-488a-9d29-4a53e61cdfde",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 2,
+      "offsetY": -3,
+      "trimX": 18,
+      "trimY": 27,
+      "width": 92,
+      "height": 76,
+      "rawWidth": 124,
+      "rawHeight": 124,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/bundle/gridMap/mergeProp/merge_10108.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "fcc8d6e3-cc5e-4b26-a2fd-4980ac32c31c",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 124,
+  "height": 124,
+  "platformSettings": {},
+  "subMetas": {
+    "merge_10108": {
+      "ver": "1.0.6",
+      "uuid": "e3d89999-c29f-4ff7-befd-3607f4cb75cd",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "fcc8d6e3-cc5e-4b26-a2fd-4980ac32c31c",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 1,
+      "offsetY": -4.5,
+      "trimX": 19,
+      "trimY": 23,
+      "width": 88,
+      "height": 87,
+      "rawWidth": 124,
+      "rawHeight": 124,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/bundle/gridMap/mergeProp/merge_10109.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "07f8f28d-c85f-4774-9c67-de706960623d",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 124,
+  "height": 124,
+  "platformSettings": {},
+  "subMetas": {
+    "merge_10109": {
+      "ver": "1.0.6",
+      "uuid": "c08427b3-cd80-4737-b0b1-1cc4661c9aba",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "07f8f28d-c85f-4774-9c67-de706960623d",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 1.5,
+      "offsetY": -4.5,
+      "trimX": 19,
+      "trimY": 22,
+      "width": 89,
+      "height": 89,
+      "rawWidth": 124,
+      "rawHeight": 124,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/bundle/gridMap/mergeProp/merge_10110.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "8e45aa17-354d-4172-8ce7-b03850f95ee8",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 124,
+  "height": 124,
+  "platformSettings": {},
+  "subMetas": {
+    "merge_10110": {
+      "ver": "1.0.6",
+      "uuid": "cd9df694-a5b7-4b5a-bad0-16947064a01b",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "8e45aa17-354d-4172-8ce7-b03850f95ee8",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 1,
+      "offsetY": -2,
+      "trimX": 19,
+      "trimY": 18,
+      "width": 88,
+      "height": 92,
+      "rawWidth": 124,
+      "rawHeight": 124,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/bundle/gridMap/mergeProp/merge_102.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "3e79be9e-65fd-48c6-b277-2e47378db872",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 124,
+  "height": 124,
+  "platformSettings": {},
+  "subMetas": {
+    "merge_102": {
+      "ver": "1.0.6",
+      "uuid": "021880fd-791f-4d2b-a81f-e9a0d0133278",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "3e79be9e-65fd-48c6-b277-2e47378db872",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": -0.5,
+      "trimX": 12,
+      "trimY": 27,
+      "width": 100,
+      "height": 71,
+      "rawWidth": 124,
+      "rawHeight": 124,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/bundle/gridMap/mergeProp/merge_10201.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "16d698a3-c679-45c9-8c6a-e17802adb416",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 124,
+  "height": 124,
+  "platformSettings": {},
+  "subMetas": {
+    "merge_10201": {
+      "ver": "1.0.6",
+      "uuid": "6ae11fdd-bdc5-49f7-9961-be72b6d2d955",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "16d698a3-c679-45c9-8c6a-e17802adb416",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 2,
+      "offsetY": -1.5,
+      "trimX": 17,
+      "trimY": 28,
+      "width": 94,
+      "height": 71,
+      "rawWidth": 124,
+      "rawHeight": 124,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/bundle/gridMap/mergeProp/merge_10202.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "99817b5b-49b3-4c43-aabb-993f8f105a6a",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 124,
+  "height": 124,
+  "platformSettings": {},
+  "subMetas": {
+    "merge_10202": {
+      "ver": "1.0.6",
+      "uuid": "f39a3929-2348-4172-a72f-2b45a73f8bea",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "99817b5b-49b3-4c43-aabb-993f8f105a6a",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 1,
+      "offsetY": 1,
+      "trimX": 17,
+      "trimY": 30,
+      "width": 92,
+      "height": 62,
+      "rawWidth": 124,
+      "rawHeight": 124,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/bundle/gridMap/mergeProp/merge_11101.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "92eebf92-3e11-4ba4-8beb-0cb0c45e4c31",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 124,
+  "height": 124,
+  "platformSettings": {},
+  "subMetas": {
+    "merge_11101": {
+      "ver": "1.0.6",
+      "uuid": "f2c4537a-c3d9-4a03-8c9e-80bd5eca1dc0",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "92eebf92-3e11-4ba4-8beb-0cb0c45e4c31",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -1.5,
+      "offsetY": -4,
+      "trimX": 21,
+      "trimY": 22,
+      "width": 79,
+      "height": 88,
+      "rawWidth": 124,
+      "rawHeight": 124,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/bundle/gridMap/mergeProp/merge_11102.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "9ddbdd52-42aa-4d19-a9bd-0fb431bf1a81",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 124,
+  "height": 124,
+  "platformSettings": {},
+  "subMetas": {
+    "merge_11102": {
+      "ver": "1.0.6",
+      "uuid": "b27dfcaa-fabb-48ae-899c-553aab02329b",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "9ddbdd52-42aa-4d19-a9bd-0fb431bf1a81",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 3,
+      "offsetY": -2.5,
+      "trimX": 30,
+      "trimY": 24,
+      "width": 70,
+      "height": 81,
+      "rawWidth": 124,
+      "rawHeight": 124,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/bundle/gridMap/mergeProp/merge_11103.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "4bd80378-58fb-471c-8f0d-2c4707ef248a",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 124,
+  "height": 124,
+  "platformSettings": {},
+  "subMetas": {
+    "merge_11103": {
+      "ver": "1.0.6",
+      "uuid": "5d32d140-9250-4a5a-863a-c11d93ebfb4e",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "4bd80378-58fb-471c-8f0d-2c4707ef248a",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 3,
+      "offsetY": -1,
+      "trimX": 27,
+      "trimY": 25,
+      "width": 76,
+      "height": 76,
+      "rawWidth": 124,
+      "rawHeight": 124,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/bundle/gridMap/mergeProp/merge_11104.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "3e8e3af0-ead2-46d7-9f39-ffc3ee14df0e",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 124,
+  "height": 124,
+  "platformSettings": {},
+  "subMetas": {
+    "merge_11104": {
+      "ver": "1.0.6",
+      "uuid": "afa945d4-60fb-42d4-81b4-e17098821f67",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "3e8e3af0-ead2-46d7-9f39-ffc3ee14df0e",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 1.5,
+      "offsetY": 2,
+      "trimX": 32,
+      "trimY": 29,
+      "width": 63,
+      "height": 62,
+      "rawWidth": 124,
+      "rawHeight": 124,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/bundle/gridMap/mergeProp/merge_11105.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "c485bd76-2343-4293-a73d-c6f17df0753e",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 124,
+  "height": 124,
+  "platformSettings": {},
+  "subMetas": {
+    "merge_11105": {
+      "ver": "1.0.6",
+      "uuid": "dcced62e-4b9d-4388-b1ea-caebef8eaa4b",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "c485bd76-2343-4293-a73d-c6f17df0753e",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 1,
+      "offsetY": 0.5,
+      "trimX": 22,
+      "trimY": 32,
+      "width": 82,
+      "height": 59,
+      "rawWidth": 124,
+      "rawHeight": 124,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/bundle/gridMap/mergeProp/merge_11106.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "1ef2609d-8eff-4d9e-bb38-5b2d9c94353f",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 124,
+  "height": 124,
+  "platformSettings": {},
+  "subMetas": {
+    "merge_11106": {
+      "ver": "1.0.6",
+      "uuid": "a33f1402-1487-4957-ad20-935dd41ed4f1",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "1ef2609d-8eff-4d9e-bb38-5b2d9c94353f",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 34,
+      "trimY": 23,
+      "width": 56,
+      "height": 78,
+      "rawWidth": 124,
+      "rawHeight": 124,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/bundle/gridMap/mergeProp/merge_11107.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "b1c056fd-1109-408a-a64b-7245bf8150bb",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 124,
+  "height": 124,
+  "platformSettings": {},
+  "subMetas": {
+    "merge_11107": {
+      "ver": "1.0.6",
+      "uuid": "6a2141c7-c6e7-4c2b-b3ca-ee0570fa4ff3",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "b1c056fd-1109-408a-a64b-7245bf8150bb",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -1.5,
+      "offsetY": -2,
+      "trimX": 20,
+      "trimY": 22,
+      "width": 81,
+      "height": 84,
+      "rawWidth": 124,
+      "rawHeight": 124,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/bundle/gridMap/mergeProp/merge_11108.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "a32f8f85-dfcc-4306-912f-10184f931ce9",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 124,
+  "height": 124,
+  "platformSettings": {},
+  "subMetas": {
+    "merge_11108": {
+      "ver": "1.0.6",
+      "uuid": "feb11e8e-5f65-47ce-9778-1dc35410172c",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "a32f8f85-dfcc-4306-912f-10184f931ce9",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 5,
+      "offsetY": 1,
+      "trimX": 30,
+      "trimY": 22,
+      "width": 74,
+      "height": 78,
+      "rawWidth": 124,
+      "rawHeight": 124,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/bundle/gridMap/mergeProp/merge_11109.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "285c474c-4dfd-4453-b9ab-a70b4eba0677",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 124,
+  "height": 124,
+  "platformSettings": {},
+  "subMetas": {
+    "merge_11109": {
+      "ver": "1.0.6",
+      "uuid": "680c86ee-0df9-4c18-88ac-6a9009d16763",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "285c474c-4dfd-4453-b9ab-a70b4eba0677",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 1.5,
+      "offsetY": 3.5,
+      "trimX": 26,
+      "trimY": 20,
+      "width": 75,
+      "height": 77,
+      "rawWidth": 124,
+      "rawHeight": 124,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/bundle/gridMap/mergeProp/merge_11110.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "1bb01cf3-6074-4c52-b4f5-4dfc549545b0",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 124,
+  "height": 124,
+  "platformSettings": {},
+  "subMetas": {
+    "merge_11110": {
+      "ver": "1.0.6",
+      "uuid": "926446a0-ffdf-4853-862b-8ef947433c6b",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "1bb01cf3-6074-4c52-b4f5-4dfc549545b0",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 1,
+      "offsetY": -3.5,
+      "trimX": 23,
+      "trimY": 32,
+      "width": 80,
+      "height": 67,
+      "rawWidth": 124,
+      "rawHeight": 124,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/bundle/gridMap/mergeProp/merge_11111.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "e85282e0-e9a3-4ee5-8ca9-0807518d48d0",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 124,
+  "height": 124,
+  "platformSettings": {},
+  "subMetas": {
+    "merge_11111": {
+      "ver": "1.0.6",
+      "uuid": "80ee1a0d-3813-48d3-bff6-5707495950d0",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "e85282e0-e9a3-4ee5-8ca9-0807518d48d0",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 3,
+      "offsetY": -2,
+      "trimX": 26,
+      "trimY": 26,
+      "width": 78,
+      "height": 76,
+      "rawWidth": 124,
+      "rawHeight": 124,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/bundle/gridMap/mergeProp/merge_11112.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "bff1b6a3-c6d5-4fb7-8637-152a5835c17b",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 124,
+  "height": 124,
+  "platformSettings": {},
+  "subMetas": {
+    "merge_11112": {
+      "ver": "1.0.6",
+      "uuid": "4bd84c22-7792-412a-96d7-fd8cc4d5cdb2",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "bff1b6a3-c6d5-4fb7-8637-152a5835c17b",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 4,
+      "offsetY": -2.5,
+      "trimX": 26,
+      "trimY": 24,
+      "width": 80,
+      "height": 81,
+      "rawWidth": 124,
+      "rawHeight": 124,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/bundle/gridMap/mergeProp/merge_11201.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "2ab9aca2-64d8-48e9-8ede-b55414c5e852",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 124,
+  "height": 124,
+  "platformSettings": {},
+  "subMetas": {
+    "merge_11201": {
+      "ver": "1.0.6",
+      "uuid": "f5f983a0-8f02-45fc-b638-71cb4a8907cf",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "2ab9aca2-64d8-48e9-8ede-b55414c5e852",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0.5,
+      "offsetY": -3.5,
+      "trimX": 20,
+      "trimY": 28,
+      "width": 85,
+      "height": 75,
+      "rawWidth": 124,
+      "rawHeight": 124,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/bundle/gridMap/mergeProp/merge_11202.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "c757d0c7-4c16-4909-9d81-0e2a64565ca8",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 124,
+  "height": 124,
+  "platformSettings": {},
+  "subMetas": {
+    "merge_11202": {
+      "ver": "1.0.6",
+      "uuid": "bbebbefc-2c3b-4b9a-8790-f6d2f7f4c522",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "c757d0c7-4c16-4909-9d81-0e2a64565ca8",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0.5,
+      "offsetY": -3,
+      "trimX": 19,
+      "trimY": 29,
+      "width": 87,
+      "height": 72,
+      "rawWidth": 124,
+      "rawHeight": 124,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/bundle/gridMap/mergeProp/merge_11203.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "f1ffd013-119a-406e-b33c-56e7dae7e1e7",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 124,
+  "height": 124,
+  "platformSettings": {},
+  "subMetas": {
+    "merge_11203": {
+      "ver": "1.0.6",
+      "uuid": "de31319f-d0a9-4ff5-9376-5efdf03ded17",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "f1ffd013-119a-406e-b33c-56e7dae7e1e7",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": -3,
+      "trimX": 17,
+      "trimY": 31,
+      "width": 90,
+      "height": 68,
+      "rawWidth": 124,
+      "rawHeight": 124,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}