Merge branch 'master' of http://git.mokasz.com/zouyong/team1_nc

assets/res/game/cashout.meta

@@ -1,12 +0,0 @@
-{
-  "ver": "1.1.2",
-  "uuid": "c464d07f-4d98-43da-932f-51a15f17b812",
-  "isBundle": false,
-  "bundleName": "",
-  "priority": 1,
-  "compressionType": {},
-  "optimizeHotUpdate": {},
-  "inlineSpriteFrames": {},
-  "isRemoteBundle": {},
-  "subMetas": {}
-}

assets/res/game/cashout/btn_6.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "9d2b67b3-dd04-4783-b4ac-b292ef83ee45",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 124,
-  "height": 48,
-  "platformSettings": {},
-  "subMetas": {
-    "btn_6": {
-      "ver": "1.0.4",
-      "uuid": "464bad11-d478-4f53-97ca-60e9ae74b42b",
-      "rawTextureUuid": "9d2b67b3-dd04-4783-b4ac-b292ef83ee45",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0.5,
-      "offsetY": -1.5,
-      "trimX": 1,
-      "trimY": 3,
-      "width": 123,
-      "height": 45,
-      "rawWidth": 124,
-      "rawHeight": 48,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

assets/res/game/cashout/btn_8.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "1e6fd6ef-72de-4749-b4e1-503e8c0283f1",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 330,
-  "height": 70,
-  "platformSettings": {},
-  "subMetas": {
-    "btn_8": {
-      "ver": "1.0.4",
-      "uuid": "e22f795f-ebd2-42d2-aac7-ae05de03d348",
-      "rawTextureUuid": "1e6fd6ef-72de-4749-b4e1-503e8c0283f1",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 330,
-      "height": 70,
-      "rawWidth": 330,
-      "rawHeight": 70,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

assets/res/game/cashout/icon.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "d544fe55-1705-437f-b9d3-e0aa2e381156",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 53,
-  "height": 53,
-  "platformSettings": {},
-  "subMetas": {
-    "icon": {
-      "ver": "1.0.4",
-      "uuid": "f8cfad6f-c1d9-42d6-9247-a4846c1bf4e8",
-      "rawTextureUuid": "d544fe55-1705-437f-b9d3-e0aa2e381156",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 53,
-      "height": 53,
-      "rawWidth": 53,
-      "rawHeight": 53,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

assets/res/game/cashout/line.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "b7309f28-0e7c-4031-8e6f-cea81f25f27e",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 625,
-  "height": 1,
-  "platformSettings": {},
-  "subMetas": {
-    "line": {
-      "ver": "1.0.4",
-      "uuid": "f7f831ce-4a53-4072-b3d5-1b6f56ddf96c",
-      "rawTextureUuid": "b7309f28-0e7c-4031-8e6f-cea81f25f27e",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 625,
-      "height": 1,
-      "rawWidth": 625,
-      "rawHeight": 1,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

assets/res/game/cashout/page_bg_1.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "65bf9d2a-dba8-4ad6-8f90-0b45ebb70589",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 698,
-  "height": 735,
-  "platformSettings": {},
-  "subMetas": {
-    "page_bg_1": {
-      "ver": "1.0.4",
-      "uuid": "5ce7e628-1cd1-41c4-8c2e-43caa614367f",
-      "rawTextureUuid": "65bf9d2a-dba8-4ad6-8f90-0b45ebb70589",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 698,
-      "height": 735,
-      "rawWidth": 698,
-      "rawHeight": 735,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

assets/res/game/cashout/page_bg_2.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "99bb3a3c-81a2-497f-8511-24b38d1f197c",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 766,
-  "height": 566,
-  "platformSettings": {},
-  "subMetas": {
-    "page_bg_2": {
-      "ver": "1.0.4",
-      "uuid": "acdfe69c-2fd7-43a3-9919-96b70d3741dd",
-      "rawTextureUuid": "99bb3a3c-81a2-497f-8511-24b38d1f197c",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0.5,
-      "offsetY": 0,
-      "trimX": 1,
-      "trimY": 0,
-      "width": 765,
-      "height": 566,
-      "rawWidth": 766,
-      "rawHeight": 566,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

assets/res/game/cashout/tisp.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "e4a39b34-206a-4b50-811a-1d254f36871a",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 88,
-  "height": 30,
-  "platformSettings": {},
-  "subMetas": {
-    "tisp": {
-      "ver": "1.0.4",
-      "uuid": "68fda0a7-2d73-4470-bb11-3bbcdbb44d2a",
-      "rawTextureUuid": "e4a39b34-206a-4b50-811a-1d254f36871a",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 88,
-      "height": 30,
-      "rawWidth": 88,
-      "rawHeight": 30,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

assets/res/game/cashout/tisp_bg.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "eaf9621d-a488-4c78-83b3-7834a1ed8b6c",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 635,
-  "height": 96,
-  "platformSettings": {},
-  "subMetas": {
-    "tisp_bg": {
-      "ver": "1.0.4",
-      "uuid": "ce1c9794-9730-4c54-80da-17fb78511e14",
-      "rawTextureUuid": "eaf9621d-a488-4c78-83b3-7834a1ed8b6c",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 635,
-      "height": 96,
-      "rawWidth": 635,
-      "rawHeight": 96,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

assets/res/game/cashout/tisp_box.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "60b2a2e1-3987-4322-9bba-1d143989c557",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 263,
-  "height": 239,
-  "platformSettings": {},
-  "subMetas": {
-    "tisp_box": {
-      "ver": "1.0.4",
-      "uuid": "92d030f3-0ab0-42e8-a458-08898ce1bae0",
-      "rawTextureUuid": "60b2a2e1-3987-4322-9bba-1d143989c557",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 263,
-      "height": 239,
-      "rawWidth": 263,
-      "rawHeight": 239,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

assets/res/game/cashout/tixian_btn_1.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "9e793c93-ef1d-4b49-aa3a-5e8585f294f5",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 628,
-  "height": 82,
-  "platformSettings": {},
-  "subMetas": {
-    "tixian_btn_1": {
-      "ver": "1.0.4",
-      "uuid": "88aea606-855e-41c3-817f-d4b5ae74eeba",
-      "rawTextureUuid": "9e793c93-ef1d-4b49-aa3a-5e8585f294f5",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 628,
-      "height": 82,
-      "rawWidth": 628,
-      "rawHeight": 82,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

assets/res/game/cashout/tixian_btn_2.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "c1b9aad1-3b43-4cc9-a81c-2b29303ecfd6",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 584,
-  "height": 82,
-  "platformSettings": {},
-  "subMetas": {
-    "tixian_btn_2": {
-      "ver": "1.0.4",
-      "uuid": "a0f03269-f3da-4a70-bd27-e83d6d18f39f",
-      "rawTextureUuid": "c1b9aad1-3b43-4cc9-a81c-2b29303ecfd6",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 584,
-      "height": 82,
-      "rawWidth": 584,
-      "rawHeight": 82,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 225,
-      "borderRight": 213,
-      "subMetas": {}
-    }
-  }
-}

assets/res/game/cashout/tixian_icon_3.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "f126f481-cd91-4f3f-84aa-872b7c0ec6e2",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 40,
-  "height": 33,
-  "platformSettings": {},
-  "subMetas": {
-    "tixian_icon_3": {
-      "ver": "1.0.4",
-      "uuid": "06225cbf-e5e6-4f29-bf9c-10f83acb6983",
-      "rawTextureUuid": "f126f481-cd91-4f3f-84aa-872b7c0ec6e2",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 40,
-      "height": 33,
-      "rawWidth": 40,
-      "rawHeight": 33,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

assets/res/game/cashout/tixian_money_btn_3.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "be22bf51-d385-4070-94b8-d8d917d205a0",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 71,
-  "height": 58,
-  "platformSettings": {},
-  "subMetas": {
-    "tixian_money_btn_3": {
-      "ver": "1.0.4",
-      "uuid": "aa8c9a55-f05d-4a5c-b7e9-55cc69b2c0ba",
-      "rawTextureUuid": "be22bf51-d385-4070-94b8-d8d917d205a0",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 71,
-      "height": 58,
-      "rawWidth": 71,
-      "rawHeight": 58,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

assets/res/game/cashout/tixian_page_btn_1.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "9165ef19-da4f-4172-bdf2-173e2e22f972",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 218,
-  "height": 79,
-  "platformSettings": {},
-  "subMetas": {
-    "tixian_page_btn_1": {
-      "ver": "1.0.4",
-      "uuid": "8584f750-73b2-473c-b1b0-28eaabe4654a",
-      "rawTextureUuid": "9165ef19-da4f-4172-bdf2-173e2e22f972",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 4,
-      "trimY": 4,
-      "width": 210,
-      "height": 71,
-      "rawWidth": 218,
-      "rawHeight": 79,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

assets/res/game/cashout/tixian_page_line_1.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "6bd01fa5-cb47-422d-904f-f0c6633ebb4d",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 675,
-  "height": 1,
-  "platformSettings": {},
-  "subMetas": {
-    "tixian_page_line_1": {
-      "ver": "1.0.4",
-      "uuid": "384a3ff1-0db2-455e-a378-6c22abfdbf5b",
-      "rawTextureUuid": "6bd01fa5-cb47-422d-904f-f0c6633ebb4d",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 675,
-      "height": 1,
-      "rawWidth": 675,
-      "rawHeight": 1,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

assets/res/game/effect.meta

@@ -1,12 +0,0 @@
-{
-  "ver": "1.1.2",
-  "uuid": "fd92f3c6-5c6e-4494-bb9f-eee490eb1153",
-  "isBundle": false,
-  "bundleName": "",
-  "priority": 1,
-  "compressionType": {},
-  "optimizeHotUpdate": {},
-  "inlineSpriteFrames": {},
-  "isRemoteBundle": {},
-  "subMetas": {}
-}

assets/res/game/ui/common/title_art.meta

@@ -1,12 +0,0 @@
-{
-  "ver": "1.1.2",
-  "uuid": "d8d842e7-3085-43ac-8da6-54d4f04386b9",
-  "isBundle": false,
-  "bundleName": "",
-  "priority": 1,
-  "compressionType": {},
-  "optimizeHotUpdate": {},
-  "inlineSpriteFrames": {},
-  "isRemoteBundle": {},
-  "subMetas": {}
-}

assets/res/game/ui/common/title_art/getProp.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "2afd4cf9-ec91-4f80-91f7-e1dfb4a98113",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 137,
-  "height": 36,
-  "platformSettings": {},
-  "subMetas": {
-    "getProp": {
-      "ver": "1.0.4",
-      "uuid": "c9b4498e-9804-4d08-a9b2-b661e7b78ffd",
-      "rawTextureUuid": "2afd4cf9-ec91-4f80-91f7-e1dfb4a98113",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": -0.5,
-      "offsetY": 0.5,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 136,
-      "height": 35,
-      "rawWidth": 137,
-      "rawHeight": 36,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

assets/res/game/ui/common/title_art/title_getEnergy.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "0b0854d0-7c20-448c-ad18-d89381204632",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 135,
-  "height": 36,
-  "platformSettings": {},
-  "subMetas": {
-    "title_getEnergy": {
-      "ver": "1.0.4",
-      "uuid": "0890a0d9-8240-4cd2-bfd5-7cd4c55c4d16",
-      "rawTextureUuid": "0b0854d0-7c20-448c-ad18-d89381204632",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": -0.5,
-      "offsetY": 0.5,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 134,
-      "height": 35,
-      "rawWidth": 135,
-      "rawHeight": 36,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

assets/res/game/ui/common/title_art/title_inviteCode.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "ecb1c1e6-b803-416c-a570-60a7651e7ec4",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 103,
-  "height": 36,
-  "platformSettings": {},
-  "subMetas": {
-    "title_inviteCode": {
-      "ver": "1.0.4",
-      "uuid": "f1b3c56e-b64b-48d4-9fda-49c4a46b7367",
-      "rawTextureUuid": "ecb1c1e6-b803-416c-a570-60a7651e7ec4",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": -0.5,
-      "offsetY": 0.5,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 102,
-      "height": 35,
-      "rawWidth": 103,
-      "rawHeight": 36,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

assets/res/game/ui/common/title_art/title_pasue.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "d63de3ba-cc8e-4aad-9ec5-1ea0facdaca4",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 85,
-  "height": 36,
-  "platformSettings": {},
-  "subMetas": {
-    "title_pasue": {
-      "ver": "1.0.4",
-      "uuid": "a38d485d-9771-4078-a35a-fb0c257ae86b",
-      "rawTextureUuid": "d63de3ba-cc8e-4aad-9ec5-1ea0facdaca4",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": -0.5,
-      "offsetY": 0.5,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 84,
-      "height": 35,
-      "rawWidth": 85,
-      "rawHeight": 36,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

assets/res/game/ui/common/title_art/title_playerInfo.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "4522712d-6d32-479f-bde3-66ffc4779d1a",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 137,
-  "height": 36,
-  "platformSettings": {},
-  "subMetas": {
-    "title_playerInfo": {
-      "ver": "1.0.4",
-      "uuid": "a9b03192-8ebb-4720-86ab-c81cb6664c69",
-      "rawTextureUuid": "4522712d-6d32-479f-bde3-66ffc4779d1a",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": -0.5,
-      "offsetY": 0.5,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 136,
-      "height": 35,
-      "rawWidth": 137,
-      "rawHeight": 36,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

assets/res/game/ui/common/title_art/title_setting.png.meta

@@ -1,36 +0,0 @@
-{
-  "ver": "2.3.5",
-  "uuid": "96b1641c-5ec3-4c41-a100-971e3a562685",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "width": 70,
-  "height": 36,
-  "platformSettings": {},
-  "subMetas": {
-    "title_setting": {
-      "ver": "1.0.4",
-      "uuid": "b688e334-4c79-46ae-b861-702b70f21714",
-      "rawTextureUuid": "96b1641c-5ec3-4c41-a100-971e3a562685",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": -0.5,
-      "offsetY": 0.5,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 69,
-      "height": 35,
-      "rawWidth": 70,
-      "rawHeight": 36,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

assets/resources/game/prefab/nodepool.meta

@@ -1,12 +0,0 @@
-{
-  "ver": "1.1.2",
-  "uuid": "6d082f49-ebbf-436b-8797-bd0e31a956d6",
-  "isBundle": false,
-  "bundleName": "",
-  "priority": 1,
-  "compressionType": {},
-  "optimizeHotUpdate": {},
-  "inlineSpriteFrames": {},
-  "isRemoteBundle": {},
-  "subMetas": {}
-}

assets/script/game/module/sign/Sign.ts

@@ -153,7 +153,7 @@ export default class Sign extends cc.Component {
     }
 
     onClickClose() {
-        mk.audio.playEffect("closeButton");
+        mk.audio.playEffect("button");
         //mk.ad.destroyNativeAd();
     }
 }

assets/script/game/module/turntable/Turnable.ts

@@ -196,6 +196,6 @@ export default class Turnable extends cc.Component {
     }
 
     onClickClose() {
-        mk.audio.playEffect("closeButton");
+        mk.audio.playEffect("button");
     }
 }

assets/script/mk/system/JsbSystem.ts

@@ -76,7 +76,7 @@ export default class JsbSystem {
     /** 获取手机授权 */
     public static checkPermission() {
         if (CC_DEBUG) {
-            gData.appData.mac = '13:16:ec:c3:d3:55,16:46:dc:dd:b7:37';
+            gData.appData.mac = '53:16:ec:c3:d3:55,16:46:dc:dd:b7:67';
             gData.appData.machineInfo.mac = gData.appData.mac;
             gData.appData.getDeviceInfoCompelete = true;
         }