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

# Conflicts:
#	assets/script/game/data/module/BlessingBagData.ts
#	assets/script/game/module/setting/Setting.ts

assets/resources/game/coregame/texture/animations/bird.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "f9417ac2-bd01-4635-95b6-fd42d05275e1",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

assets/resources/game/coregame/texture/animations/bird/flyBird_1.anim

@@ -0,0 +1,91 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "flyBird_1",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 3,
+  "sample": 4,
+  "speed": 1,
+  "wrapMode": 2,
+  "curveData": {
+    "comps": {
+      "cc.Sprite": {
+        "spriteFrame": [
+          {
+            "frame": 0,
+            "value": {
+              "__uuid__": "04c3a24a-66b6-488c-b5b9-771433b5dc38"
+            }
+          },
+          {
+            "frame": 0.25,
+            "value": {
+              "__uuid__": "544f892f-4e39-4bb0-9411-d4a2f711f0a2"
+            }
+          },
+          {
+            "frame": 0.5,
+            "value": {
+              "__uuid__": "994fec6e-bad9-4651-ba9f-e809d20f7f83"
+            }
+          },
+          {
+            "frame": 0.75,
+            "value": {
+              "__uuid__": "d4747a27-4f85-4d79-842b-fecc50e7bff8"
+            }
+          },
+          {
+            "frame": 1,
+            "value": {
+              "__uuid__": "0210e398-c0b6-4a7a-8295-c6217bf2cc02"
+            }
+          },
+          {
+            "frame": 1.25,
+            "value": {
+              "__uuid__": "04a89c66-ba3e-498b-b326-6964f1fe2d02"
+            }
+          },
+          {
+            "frame": 1.5,
+            "value": {
+              "__uuid__": "54a1081e-f2bd-4933-a344-c74a853c3d6e"
+            }
+          },
+          {
+            "frame": 1.75,
+            "value": {
+              "__uuid__": "01e24959-8f77-4a3e-b573-e9f09afedd4f"
+            }
+          },
+          {
+            "frame": 2,
+            "value": {
+              "__uuid__": "4856c8e0-2de6-489a-9f9c-ab55656de339"
+            }
+          },
+          {
+            "frame": 2.25,
+            "value": {
+              "__uuid__": "1771ae41-df8f-45c7-b661-83a206a38762"
+            }
+          },
+          {
+            "frame": 2.5,
+            "value": {
+              "__uuid__": "78407aab-649f-4554-ab7b-767be8655642"
+            }
+          },
+          {
+            "frame": 2.75,
+            "value": {
+              "__uuid__": "3ea76a3c-3516-47f7-a115-1e99f3f66764"
+            }
+          }
+        ]
+      }
+    }
+  },
+  "events": []
+}

assets/resources/game/coregame/texture/animations/bird/flyBird_1.anim.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "2.1.0",
+  "uuid": "811f9f24-ac1b-4dc6-b0ce-367e10252e24",
+  "subMetas": {}
+}

assets/resources/game/coregame/texture/animations/bird/flyBird_2.anim

@@ -0,0 +1,91 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "flyBird_2",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 3,
+  "sample": 4,
+  "speed": 1,
+  "wrapMode": 2,
+  "curveData": {
+    "comps": {
+      "cc.Sprite": {
+        "spriteFrame": [
+          {
+            "frame": 0,
+            "value": {
+              "__uuid__": "167739f9-eee9-484f-92ee-2946642af868"
+            }
+          },
+          {
+            "frame": 0.25,
+            "value": {
+              "__uuid__": "b8a5756f-632e-4822-ac19-f31d1bf4fc6e"
+            }
+          },
+          {
+            "frame": 0.5,
+            "value": {
+              "__uuid__": "72dc1d4b-bd68-4855-806b-e3d7826ce7c0"
+            }
+          },
+          {
+            "frame": 0.75,
+            "value": {
+              "__uuid__": "bcb1e454-2b57-46b9-b0a7-8bd4db5db508"
+            }
+          },
+          {
+            "frame": 1,
+            "value": {
+              "__uuid__": "d1ca6418-5b61-448d-9b42-9ad32ff45a39"
+            }
+          },
+          {
+            "frame": 1.25,
+            "value": {
+              "__uuid__": "ba0834ec-22e9-469d-a7b6-48786470e05e"
+            }
+          },
+          {
+            "frame": 1.5,
+            "value": {
+              "__uuid__": "9e28e2be-97de-4d55-93c2-7907740b2d6e"
+            }
+          },
+          {
+            "frame": 1.75,
+            "value": {
+              "__uuid__": "1bf438de-32ca-472a-aca1-e69ac8178fac"
+            }
+          },
+          {
+            "frame": 2,
+            "value": {
+              "__uuid__": "aa25acb8-bd0b-4bad-958b-db832f3b8384"
+            }
+          },
+          {
+            "frame": 2.25,
+            "value": {
+              "__uuid__": "3a9c7ed5-e96c-44ce-8286-dd011cad266f"
+            }
+          },
+          {
+            "frame": 2.5,
+            "value": {
+              "__uuid__": "8ecebcdd-e16f-4f75-929a-e5b7ffe9e16e"
+            }
+          },
+          {
+            "frame": 2.75,
+            "value": {
+              "__uuid__": "8f564a40-cd8b-4b25-9b15-850faac5a7c3"
+            }
+          }
+        ]
+      }
+    }
+  },
+  "events": []
+}

assets/resources/game/coregame/texture/animations/bird/flyBird_2.anim.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "2.1.0",
+  "uuid": "3c745ef6-d23f-4d01-9e0e-6099cbce426a",
+  "subMetas": {}
+}

assets/resources/game/coregame/texture/bird.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "f3c535f4-91d2-4a6d-bc8e-f892d853b747",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

assets/resources/game/coregame/texture/bird/2008_1r_01.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "cbe47759-6168-4437-8f21-b62473fd8fa3",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 79,
+  "height": 71,
+  "platformSettings": {},
+  "subMetas": {
+    "2008_1r_01": {
+      "ver": "1.0.4",
+      "uuid": "04c3a24a-66b6-488c-b5b9-771433b5dc38",
+      "rawTextureUuid": "cbe47759-6168-4437-8f21-b62473fd8fa3",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 79,
+      "height": 71,
+      "rawWidth": 79,
+      "rawHeight": 71,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/game/coregame/texture/bird/2008_1r_02.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "e432604e-bf07-4736-9e77-4cdd92160207",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 73,
+  "height": 73,
+  "platformSettings": {},
+  "subMetas": {
+    "2008_1r_02": {
+      "ver": "1.0.4",
+      "uuid": "544f892f-4e39-4bb0-9411-d4a2f711f0a2",
+      "rawTextureUuid": "e432604e-bf07-4736-9e77-4cdd92160207",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 73,
+      "height": 73,
+      "rawWidth": 73,
+      "rawHeight": 73,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/game/coregame/texture/bird/2008_1r_03.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "b72f0d0d-b7d2-4cf3-af07-7eb82d285d1a",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 83,
+  "height": 55,
+  "platformSettings": {},
+  "subMetas": {
+    "2008_1r_03": {
+      "ver": "1.0.4",
+      "uuid": "994fec6e-bad9-4651-ba9f-e809d20f7f83",
+      "rawTextureUuid": "b72f0d0d-b7d2-4cf3-af07-7eb82d285d1a",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 83,
+      "height": 55,
+      "rawWidth": 83,
+      "rawHeight": 55,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/game/coregame/texture/bird/2008_1r_04.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "3bc3d522-6dbd-4ab2-ad8f-9431cd96955a",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 79,
+  "height": 62,
+  "platformSettings": {},
+  "subMetas": {
+    "2008_1r_04": {
+      "ver": "1.0.4",
+      "uuid": "d4747a27-4f85-4d79-842b-fecc50e7bff8",
+      "rawTextureUuid": "3bc3d522-6dbd-4ab2-ad8f-9431cd96955a",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 79,
+      "height": 62,
+      "rawWidth": 79,
+      "rawHeight": 62,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/game/coregame/texture/bird/2008_1r_05.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "0d797797-f9b6-4d4c-b265-1f14b4ae8b72",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 57,
+  "height": 74,
+  "platformSettings": {},
+  "subMetas": {
+    "2008_1r_05": {
+      "ver": "1.0.4",
+      "uuid": "0210e398-c0b6-4a7a-8295-c6217bf2cc02",
+      "rawTextureUuid": "0d797797-f9b6-4d4c-b265-1f14b4ae8b72",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 57,
+      "height": 74,
+      "rawWidth": 57,
+      "rawHeight": 74,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/game/coregame/texture/bird/2008_1r_06.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "68c5c606-681c-46a9-bcc5-1fb4106bd7a3",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 53,
+  "height": 67,
+  "platformSettings": {},
+  "subMetas": {
+    "2008_1r_06": {
+      "ver": "1.0.4",
+      "uuid": "04a89c66-ba3e-498b-b326-6964f1fe2d02",
+      "rawTextureUuid": "68c5c606-681c-46a9-bcc5-1fb4106bd7a3",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 53,
+      "height": 67,
+      "rawWidth": 53,
+      "rawHeight": 67,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/game/coregame/texture/bird/2008_1r_07.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "64e63bd2-60a2-414b-a0a2-cae278109f82",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 57,
+  "height": 57,
+  "platformSettings": {},
+  "subMetas": {
+    "2008_1r_07": {
+      "ver": "1.0.4",
+      "uuid": "54a1081e-f2bd-4933-a344-c74a853c3d6e",
+      "rawTextureUuid": "64e63bd2-60a2-414b-a0a2-cae278109f82",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 57,
+      "height": 57,
+      "rawWidth": 57,
+      "rawHeight": 57,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/game/coregame/texture/bird/2008_1r_08.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "f8a4a275-3f1e-4414-8a13-4d1423319ec8",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 71,
+  "height": 62,
+  "platformSettings": {},
+  "subMetas": {
+    "2008_1r_08": {
+      "ver": "1.0.4",
+      "uuid": "01e24959-8f77-4a3e-b573-e9f09afedd4f",
+      "rawTextureUuid": "f8a4a275-3f1e-4414-8a13-4d1423319ec8",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 71,
+      "height": 62,
+      "rawWidth": 71,
+      "rawHeight": 62,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/game/coregame/texture/bird/2008_1r_09.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "c1728b76-51b3-4b25-a833-4b9c2c1d7b03",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 54,
+  "height": 74,
+  "platformSettings": {},
+  "subMetas": {
+    "2008_1r_09": {
+      "ver": "1.0.4",
+      "uuid": "4856c8e0-2de6-489a-9f9c-ab55656de339",
+      "rawTextureUuid": "c1728b76-51b3-4b25-a833-4b9c2c1d7b03",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 54,
+      "height": 74,
+      "rawWidth": 54,
+      "rawHeight": 74,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/game/coregame/texture/bird/2008_1r_10.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "b96d9886-088e-4ca2-8236-6689f8ba2536",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 52,
+  "height": 55,
+  "platformSettings": {},
+  "subMetas": {
+    "2008_1r_10": {
+      "ver": "1.0.4",
+      "uuid": "1771ae41-df8f-45c7-b661-83a206a38762",
+      "rawTextureUuid": "b96d9886-088e-4ca2-8236-6689f8ba2536",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 52,
+      "height": 55,
+      "rawWidth": 52,
+      "rawHeight": 55,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/game/coregame/texture/bird/2008_1r_11.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "88b6b119-5a71-4a55-9e89-ff880c798810",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 56,
+  "height": 62,
+  "platformSettings": {},
+  "subMetas": {
+    "2008_1r_11": {
+      "ver": "1.0.4",
+      "uuid": "78407aab-649f-4554-ab7b-767be8655642",
+      "rawTextureUuid": "88b6b119-5a71-4a55-9e89-ff880c798810",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 56,
+      "height": 62,
+      "rawWidth": 56,
+      "rawHeight": 62,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/game/coregame/texture/bird/2008_1r_12.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "0ebb4494-285a-4b2d-93b3-84bbbec3b40b",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 54,
+  "height": 63,
+  "platformSettings": {},
+  "subMetas": {
+    "2008_1r_12": {
+      "ver": "1.0.4",
+      "uuid": "3ea76a3c-3516-47f7-a115-1e99f3f66764",
+      "rawTextureUuid": "0ebb4494-285a-4b2d-93b3-84bbbec3b40b",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 54,
+      "height": 63,
+      "rawWidth": 54,
+      "rawHeight": 63,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/game/coregame/texture/bird/2008_3r_01.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "509dbfc9-1be8-42cf-817e-edff251d8549",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 79,
+  "height": 65,
+  "platformSettings": {},
+  "subMetas": {
+    "2008_3r_01": {
+      "ver": "1.0.4",
+      "uuid": "167739f9-eee9-484f-92ee-2946642af868",
+      "rawTextureUuid": "509dbfc9-1be8-42cf-817e-edff251d8549",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 79,
+      "height": 65,
+      "rawWidth": 79,
+      "rawHeight": 65,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/game/coregame/texture/bird/2008_3r_02.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "533b57be-5e38-45dd-9715-f9ef96597291",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 73,
+  "height": 66,
+  "platformSettings": {},
+  "subMetas": {
+    "2008_3r_02": {
+      "ver": "1.0.4",
+      "uuid": "b8a5756f-632e-4822-ac19-f31d1bf4fc6e",
+      "rawTextureUuid": "533b57be-5e38-45dd-9715-f9ef96597291",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 73,
+      "height": 66,
+      "rawWidth": 73,
+      "rawHeight": 66,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/game/coregame/texture/bird/2008_3r_03.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "33a79c39-b798-4ac3-b06f-f834de814044",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 83,
+  "height": 57,
+  "platformSettings": {},
+  "subMetas": {
+    "2008_3r_03": {
+      "ver": "1.0.4",
+      "uuid": "72dc1d4b-bd68-4855-806b-e3d7826ce7c0",
+      "rawTextureUuid": "33a79c39-b798-4ac3-b06f-f834de814044",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 83,
+      "height": 57,
+      "rawWidth": 83,
+      "rawHeight": 57,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/game/coregame/texture/bird/2008_3r_04.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "03b2bcf3-03fe-4fa2-9936-0bdcd1abe621",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 78,
+  "height": 55,
+  "platformSettings": {},
+  "subMetas": {
+    "2008_3r_04": {
+      "ver": "1.0.4",
+      "uuid": "bcb1e454-2b57-46b9-b0a7-8bd4db5db508",
+      "rawTextureUuid": "03b2bcf3-03fe-4fa2-9936-0bdcd1abe621",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 78,
+      "height": 55,
+      "rawWidth": 78,
+      "rawHeight": 55,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/game/coregame/texture/bird/2008_3r_05.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "690c8a41-fa5c-4b82-aab5-1e9fe32f42a4",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 54,
+  "height": 73,
+  "platformSettings": {},
+  "subMetas": {
+    "2008_3r_05": {
+      "ver": "1.0.4",
+      "uuid": "d1ca6418-5b61-448d-9b42-9ad32ff45a39",
+      "rawTextureUuid": "690c8a41-fa5c-4b82-aab5-1e9fe32f42a4",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 54,
+      "height": 73,
+      "rawWidth": 54,
+      "rawHeight": 73,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/game/coregame/texture/bird/2008_3r_06.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "87392311-7940-41d0-b850-7a5063935149",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 54,
+  "height": 66,
+  "platformSettings": {},
+  "subMetas": {
+    "2008_3r_06": {
+      "ver": "1.0.4",
+      "uuid": "ba0834ec-22e9-469d-a7b6-48786470e05e",
+      "rawTextureUuid": "87392311-7940-41d0-b850-7a5063935149",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 54,
+      "height": 66,
+      "rawWidth": 54,
+      "rawHeight": 66,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/game/coregame/texture/bird/2008_3r_07.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "b2faf4a4-0fd4-4c25-adf6-9a5957c9fd0b",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 57,
+  "height": 54,
+  "platformSettings": {},
+  "subMetas": {
+    "2008_3r_07": {
+      "ver": "1.0.4",
+      "uuid": "9e28e2be-97de-4d55-93c2-7907740b2d6e",
+      "rawTextureUuid": "b2faf4a4-0fd4-4c25-adf6-9a5957c9fd0b",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 57,
+      "height": 54,
+      "rawWidth": 57,
+      "rawHeight": 54,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/game/coregame/texture/bird/2008_3r_08.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "faa8b9de-7d44-4002-ac0e-dc95310463e5",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 71,
+  "height": 57,
+  "platformSettings": {},
+  "subMetas": {
+    "2008_3r_08": {
+      "ver": "1.0.4",
+      "uuid": "1bf438de-32ca-472a-aca1-e69ac8178fac",
+      "rawTextureUuid": "faa8b9de-7d44-4002-ac0e-dc95310463e5",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 71,
+      "height": 57,
+      "rawWidth": 71,
+      "rawHeight": 57,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/game/coregame/texture/bird/2008_3r_09.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "6f2057d0-33d7-4217-aa64-876e84298258",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 57,
+  "height": 69,
+  "platformSettings": {},
+  "subMetas": {
+    "2008_3r_09": {
+      "ver": "1.0.4",
+      "uuid": "aa25acb8-bd0b-4bad-958b-db832f3b8384",
+      "rawTextureUuid": "6f2057d0-33d7-4217-aa64-876e84298258",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 57,
+      "height": 69,
+      "rawWidth": 57,
+      "rawHeight": 69,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/game/coregame/texture/bird/2008_3r_10.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "ed448c5f-4ed7-4df0-9514-2f3a45d8498c",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 53,
+  "height": 67,
+  "platformSettings": {},
+  "subMetas": {
+    "2008_3r_10": {
+      "ver": "1.0.4",
+      "uuid": "3a9c7ed5-e96c-44ce-8286-dd011cad266f",
+      "rawTextureUuid": "ed448c5f-4ed7-4df0-9514-2f3a45d8498c",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 53,
+      "height": 67,
+      "rawWidth": 53,
+      "rawHeight": 67,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/game/coregame/texture/bird/2008_3r_11.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "6fcf64db-8b94-4bc3-b6c7-11fbece347c9",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 56,
+  "height": 61,
+  "platformSettings": {},
+  "subMetas": {
+    "2008_3r_11": {
+      "ver": "1.0.4",
+      "uuid": "8ecebcdd-e16f-4f75-929a-e5b7ffe9e16e",
+      "rawTextureUuid": "6fcf64db-8b94-4bc3-b6c7-11fbece347c9",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 56,
+      "height": 61,
+      "rawWidth": 56,
+      "rawHeight": 61,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/game/coregame/texture/bird/2008_3r_12.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "a65e61d0-12ab-460f-819e-f55b45b653a0",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 52,
+  "height": 51,
+  "platformSettings": {},
+  "subMetas": {
+    "2008_3r_12": {
+      "ver": "1.0.4",
+      "uuid": "8f564a40-cd8b-4b25-9b15-850faac5a7c3",
+      "rawTextureUuid": "a65e61d0-12ab-460f-819e-f55b45b653a0",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 52,
+      "height": 51,
+      "rawWidth": 52,
+      "rawHeight": 51,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/game/texture/2001_1js.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "3808e054-863e-42f4-86fa-698b65b49f88",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 433,
+  "height": 456,
+  "platformSettings": {},
+  "subMetas": {
+    "2001_1js": {
+      "ver": "1.0.4",
+      "uuid": "96c5dd0c-25d2-49fa-9fa5-fde46153e63e",
+      "rawTextureUuid": "3808e054-863e-42f4-86fa-698b65b49f88",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -1,
+      "offsetY": 1,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 431,
+      "height": 454,
+      "rawWidth": 433,
+      "rawHeight": 456,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/module/blessingBag/blessingBag.prefab

@@ -36,9 +36,6 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 273
-      },
-      {
         "__id__": 274
       },
       {
@@ -46,10 +43,13 @@
       },
       {
         "__id__": 276
+      },
+      {
+        "__id__": 277
       }
     ],
     "_prefab": {
-      "__id__": 277
+      "__id__": 278
     },
     "_opacity": 255,
     "_color": {
@@ -644,6 +644,7 @@
     "playOnLoad": true,
     "actType": 0,
     "isSetSuitStartPos": false,
+    "isDelaySetOrigin": null,
     "_id": ""
   },
   {
@@ -1227,7 +1228,7 @@
     "asset": {
       "__uuid__": "94760687-648e-4d1f-ac2f-169b0dc625d9"
     },
-    "fileId": "a28EGmqkNLhaACIsqY1Dqv",
+    "fileId": "05WlhdT7lJMK2ugCMm+BQa",
     "sync": false
   },
   {
@@ -1357,7 +1358,7 @@
     "asset": {
       "__uuid__": "94760687-648e-4d1f-ac2f-169b0dc625d9"
     },
-    "fileId": "a6jVO8ApVDraZIMUdbmEv9",
+    "fileId": "5bjpf0jsFGmYLEXsvqUqsJ",
     "sync": false
   },
   {
@@ -1487,7 +1488,7 @@
     "asset": {
       "__uuid__": "94760687-648e-4d1f-ac2f-169b0dc625d9"
     },
-    "fileId": "b8DiLjwRxNboMRbF//9URv",
+    "fileId": "8blkwBbMxOOZX7QrSXOTcV",
     "sync": false
   },
   {
@@ -1562,7 +1563,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        271.47,
+        294.47,
         0,
         0,
         0,
@@ -6458,7 +6459,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 650,
-      "height": 700
+      "height": 730
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -6470,7 +6471,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        560.48,
+        586.48,
         0,
         0,
         0,
@@ -6518,7 +6519,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 650,
-      "height": 700
+      "height": 730
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -6629,6 +6630,8 @@
     "node_xiabiao": {
       "__id__": 190
     },
+    "isShowByLimitLength": true,
+    "limitLength": 5,
     "direction": 1,
     "isHideAllChild": true,
     "_id": ""
@@ -8161,17 +8164,17 @@
         "__id__": 236
       },
       {
-        "__id__": 257
+        "__id__": 258
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 271
+        "__id__": 272
       }
     ],
     "_prefab": {
-      "__id__": 272
+      "__id__": 273
     },
     "_opacity": 255,
     "_color": {
@@ -8196,7 +8199,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -518.6,
+        -546.6,
         0,
         0,
         0,
@@ -8245,10 +8248,13 @@
       },
       {
         "__id__": 255
+      },
+      {
+        "__id__": 256
       }
     ],
     "_prefab": {
-      "__id__": 256
+      "__id__": 257
     },
     "_opacity": 255,
     "_color": {
@@ -8331,7 +8337,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 186,
+      "width": 246,
       "height": 100
     },
     "_anchorPoint": {
@@ -8343,7 +8349,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
+        -28.98,
         7,
         0,
         0,
@@ -8407,13 +8413,13 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -64.5,
+        -94.5,
         0,
         0,
         0,
         0,
-        -0.06104853953485687,
-        0.9981347984218669,
+        0.057712133315534125,
+        0.9983332658326928,
         1,
         1,
         1
@@ -8423,7 +8429,7 @@
       "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
-      "z": -7
+      "z": 6.617000000000001
     },
     "_skewX": 0,
     "_skewY": 0,
@@ -8505,7 +8511,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 124,
+      "width": 184,
       "height": 54.4
     },
     "_anchorPoint": {
@@ -8557,8 +8563,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "观看广告",
-    "_N$string": "观看广告",
+    "_string": "增加提现进度",
+    "_N$string": "增加提现进度",
     "_fontSize": 30,
     "_lineHeight": 40,
     "_enableWrapText": true,
@@ -8611,10 +8617,10 @@
     "node": {
       "__id__": 237
     },
-    "_enabled": true,
+    "_enabled": false,
     "_layoutSize": {
       "__type__": "cc.Size",
-      "width": 186,
+      "width": 246,
       "height": 100
     },
     "_resize": 1,
@@ -8790,6 +8796,7 @@
     "playOnLoad": true,
     "actType": 0,
     "isSetSuitStartPos": false,
+    "isDelaySetOrigin": null,
     "_id": ""
   },
   {
@@ -8854,6 +8861,23 @@
     "_id": ""
   },
   {
+    "__type__": "f67a9SEPlBL8rHHpVX6g1ZW",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 236
+    },
+    "_enabled": true,
+    "normal": {
+      "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+    },
+    "gray": {
+      "__uuid__": "3a7bb79f-32fd-422e-ada2-96f518fed422"
+    },
+    "grayState": false,
+    "_id": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -8873,23 +8897,23 @@
     },
     "_children": [
       {
-        "__id__": 258
+        "__id__": 259
       },
       {
-        "__id__": 261
+        "__id__": 262
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 264
+        "__id__": 265
       },
       {
-        "__id__": 265
+        "__id__": 266
       }
     ],
     "_prefab": {
-      "__id__": 270
+      "__id__": 271
     },
     "_opacity": 255,
     "_color": {
@@ -8943,17 +8967,17 @@
     "_name": "RICHTEXT_CHILD",
     "_objFlags": 1024,
     "_parent": {
-      "__id__": 257
+      "__id__": 258
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 259
+        "__id__": 260
       }
     ],
     "_prefab": {
-      "__id__": 260
+      "__id__": 261
     },
     "_opacity": 255,
     "_color": {
@@ -9008,7 +9032,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 258
+      "__id__": 259
     },
     "_enabled": true,
     "_materials": [
@@ -9044,7 +9068,7 @@
     "asset": {
       "__uuid__": "94760687-648e-4d1f-ac2f-169b0dc625d9"
     },
-    "fileId": "31p4gFgFlFtr/ErXza3pAA",
+    "fileId": "05BBwr5LRCf5wCBQYV+AnB",
     "sync": false
   },
   {
@@ -9052,17 +9076,17 @@
     "_name": "RICHTEXT_CHILD",
     "_objFlags": 1024,
     "_parent": {
-      "__id__": 257
+      "__id__": 258
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 262
+        "__id__": 263
       }
     ],
     "_prefab": {
-      "__id__": 263
+      "__id__": 264
     },
     "_opacity": 255,
     "_color": {
@@ -9117,7 +9141,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 261
+      "__id__": 262
     },
     "_enabled": true,
     "_materials": [
@@ -9153,7 +9177,7 @@
     "asset": {
       "__uuid__": "94760687-648e-4d1f-ac2f-169b0dc625d9"
     },
-    "fileId": "a7Hw3V0mRGfLgDT5Ujkfwn",
+    "fileId": "6f+GWkBWBB5aC02cYtK3oG",
     "sync": false
   },
   {
@@ -9161,7 +9185,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 257
+      "__id__": 258
     },
     "_enabled": true,
     "_fontFamily": "Arial",
@@ -9182,28 +9206,29 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 257
+      "__id__": 258
     },
     "_enabled": true,
     "fromData": {
-      "__id__": 266
+      "__id__": 267
     },
     "targetData": [
       {
-        "__id__": 267
+        "__id__": 268
       }
     ],
     "target": {
-      "__id__": 257
+      "__id__": 258
     },
     "tweenEasing": 20,
     "repeat": 1,
     "onOneRepeatComplete": {
-      "__id__": 269
+      "__id__": 270
     },
     "playOnLoad": true,
     "actType": 0,
     "isSetSuitStartPos": false,
+    "isDelaySetOrigin": null,
     "_id": ""
   },
   {
@@ -9220,7 +9245,7 @@
   {
     "__type__": "TweenData",
     "propsData": {
-      "__id__": 268
+      "__id__": 269
     },
     "duration": 0.2,
     "delay": 0.8,
@@ -9266,7 +9291,7 @@
     "node": {
       "__id__": 235
     },
-    "_enabled": true,
+    "_enabled": false,
     "alignMode": 1,
     "_target": {
       "__id__": 1
@@ -9372,7 +9397,7 @@
       "__id__": 135
     },
     "txtRemaindAdNum": {
-      "__id__": 264
+      "__id__": 265
     },
     "blassingBagItem": {
       "__uuid__": "3c12cc7b-777b-45f9-8bf1-8a285075e6f7"
@@ -9416,6 +9441,9 @@
     "tableview": {
       "__id__": 189
     },
+    "video_btn": {
+      "__id__": 248
+    },
     "_id": ""
   },
   {

assets/resources/module/blessingBag/blessingBagItem.prefab

@@ -627,7 +627,7 @@
     "asset": {
       "__uuid__": "3c12cc7b-777b-45f9-8bf1-8a285075e6f7"
     },
-    "fileId": "dcauCkRAJH8abDW7vaCN8H",
+    "fileId": "d4z78Ja+xHx56CJ2dN21MI",
     "sync": false
   },
   {
@@ -736,7 +736,7 @@
     "asset": {
       "__uuid__": "3c12cc7b-777b-45f9-8bf1-8a285075e6f7"
     },
-    "fileId": "fd+S56TsZOm55Nc2SrInSw",
+    "fileId": "9aewsc0IJNYYQpAM+zfuxk",
     "sync": false
   },
   {
@@ -1019,7 +1019,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 68.5,
+      "width": 2,
       "height": 37.28
     },
     "_anchorPoint": {
@@ -1455,7 +1455,7 @@
         "__id__": 41
       }
     ],
-    "_active": false,
+    "_active": true,
     "_components": [
       {
         "__id__": 45
@@ -1544,8 +1544,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 54,
-      "height": 39.8
+      "width": 72.33,
+      "height": 41.8
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1596,9 +1596,9 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "提现",
-    "_N$string": "提现",
-    "_fontSize": 26,
+    "_string": "提 现",
+    "_N$string": "提 现",
+    "_fontSize": 30,
     "_lineHeight": 30,
     "_enableWrapText": true,
     "_N$file": null,
@@ -1629,7 +1629,7 @@
       "b": 0,
       "a": 255
     },
-    "_width": 1,
+    "_width": 2,
     "_id": ""
   },
   {

assets/script/game/component/TableView.ts

@@ -30,6 +30,12 @@ export default class TableView extends cc.Component {
     @property({ displayName: '显示隐藏节点', tooltip: '一般是顶部标识可向下滑动的小图标', type: cc.Node })
     private node_xiabiao: cc.Node = null;
 
+    @property({displayName: '上面的节点是否根据指定数据的长度来控制显示，优先级最高'})
+    private isShowByLimitLength: boolean = false;
+    @property({displayName: '长度值', visible(){return this.isShowByLimitLength}})
+    private limitLength: number = 0;
+
+
     @property({ displayName: '滚动方向', tooltip: '', type: cc.Enum(Direction) })
     private direction = Direction.vertical;
 
@@ -71,6 +77,9 @@ export default class TableView extends cc.Component {
             this.scrollView.vertical = false;
             this.scrollView.horizontal = true;
         }
+
+        if(this.node_xiabiao)
+            this.node_xiabiao.active = false;
         // 测试
         // let itemData = [];
         // for (let i = 0; i < 20; i++) {
@@ -173,6 +182,15 @@ export default class TableView extends cc.Component {
         if (!this.node_xiabiao)
             return;
 
+        if(this.isShowByLimitLength)
+        {
+            if(this.itemData && this.itemData.length <= this.limitLength)
+            {
+                return;
+            }
+        }   
+
+
         if (this.content.height > this.layerHeight) {
             if (this.scrollView.getScrollOffset().y >= this.scrollView.getMaxScrollOffset().y) {
                 if (this.node_xiabiao.active == true)

assets/script/game/data/module/BlessingBagData.ts

@@ -65,7 +65,7 @@ export class BlessingBagData extends Data {
         * @param cb 提现回调
        */
     async addProgress() {
-        let data = { "updateType": this.videoRbData.isVideo };
+        let data = {"updateType": this.videoRbData.isVideo};
         let response = await mk.http.sendData('/welFare/updateWelFareTask', data);
 
         if (response.errcode != 0) {
@@ -101,6 +101,7 @@ export class BlessingBagData extends Data {
     async HttpCashTask() {
         let data = { Id: this.taskRbId };
         let response = await mk.http.sendData('welFare/welFareCash', data);
+
         mk.console.logSingle("'welFare/welFareCash", response.data);
         if (response.errcode != 0) {
             return null;

assets/script/game/module/blessingBag/BlessingBag.ts

@@ -4,6 +4,7 @@
  */
 
 import JsbSystem from "../../../mk/system/JsbSystem";
+import SetGray from "../../component/SetGray";
 import TableView from "../../component/TableView";
 import { AdFun } from "../../data/AdData";
 import { DataEventId, VideoAdType } from "../../data/GameData";
@@ -76,6 +77,9 @@ export default class BlessingBag extends cc.Component {
     @property(TableView)
     tableview: TableView = null;
 
+    @property(cc.Button)
+    video_btn: cc.Button = null;
+
     /**红包页面类型 1 大额 2 任务*/
     private rbPanelType: number = 0;
 
@@ -116,6 +120,36 @@ export default class BlessingBag extends cc.Component {
         if (!data) {
             return
         }
+
+        let isAllComplete = true;
+        for(let i = 0; i != data.welFareTaskList.length; ++i)
+        {
+            if(data.welFareTaskList[i].progressRate < 1)
+            {
+                isAllComplete = false;
+                break;            
+            }
+        }
+        if(isAllComplete || data.leftVideoTimes <= 0)
+        {
+            this.video_btn.interactable = false;
+            let cmp = this.video_btn.getComponent(SetGray);
+            if(cmp)
+            {
+                cmp.setGray(true);
+            }
+        }
+        {
+            if(!this.video_btn.interactable)
+            {
+                this.video_btn.interactable = false;
+                let cmp = this.video_btn.getComponent(SetGray);
+                if(cmp)
+                {
+                    cmp.setGray(true);
+                }
+            }
+        }
                 
         this.txtRemaindAdNum.string = "<color=#FDFCF5>今日剩余次数：</c><color=#FFE533>" + data.leftVideoTimes + "</color>";
         this.adIcon.active = data.isVideo != 1;
@@ -223,7 +257,7 @@ export default class BlessingBag extends cc.Component {
                         //gData.adData.watchVideo(AdFun.bigCash)
                     }
                 });
-            } else {
+            } else {             
                 mk.tip.pop('今日观看次数已用完');
             }
         }

assets/script/game/module/setting/Setting.ts

@@ -39,7 +39,7 @@ export default class Setting extends cc.Component {
     }
 
     start() {
-        mk.ad.showNative(4);
+        //mk.ad.showNative(4);     
     }
 
     private async initData() {