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

# Conflicts:
#	assets/script/game/data/AdData.ts
#	build/jsb-link/assets/main/index.jsc
#	build/jsb-link/assets/resources/config.json
#	build/jsb-link/assets/resources/import/18/18e0b7f8-059f-4a52-9e57-690fe778a31a.json
#	build/jsb-link/assets/resources/import/23/2301f946-ef9d-4d93-b296-1f8ff5b307d3.json
#	build/jsb-link/assets/resources/import/65/65c9ca7e-c2c7-4b6c-85cb-11c7ebb15e6c.json
#	build/jsb-link/assets/resources/import/a2/a2f8ad6a-6054-4b3e-8202-7e9e1975fad9.json
#	build/jsb-link/assets/resources/import/b4/b4dea4a9-29c8-46bc-a50d-5754afa7a2bd.json
#	build/jsb-link/js backups (useful for debugging)/main.index.js
#	packages-hot-update/cfg.json

assets/resources/animation/Main.meta

@@ -1,12 +0,0 @@
-{
-  "ver": "1.1.2",
-  "uuid": "4e4c7e27-6fce-4142-bde1-d4e0cea5b72e",
-  "isBundle": false,
-  "bundleName": "",
-  "priority": 1,
-  "compressionType": {},
-  "optimizeHotUpdate": {},
-  "inlineSpriteFrames": {},
-  "isRemoteBundle": {},
-  "subMetas": {}
-}

assets/resources/module/gradeReward/gradeReward.prefab

@@ -967,7 +967,7 @@
         "__uuid__": "d51cece8-b476-4297-9b9e-2e09bdd99a18"
       }
     ],
-    "playOnLoad": false,
+    "playOnLoad": true,
     "_id": ""
   },
   {
@@ -1043,7 +1043,7 @@
       "ctor": "Float64Array",
       "array": [
         -226.897,
-        -51.039,
+        -57.039,
         0,
         0,
         0,

assets/resources/module/guide/texture/btnSkip.png.meta

@@ -7,8 +7,8 @@
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 142,
-  "height": 46,
+  "width": 177,
+  "height": 56,
   "platformSettings": {},
   "subMetas": {
     "btnSkip": {

assets/resources/module/newCashUI/walletCashOut.prefab

@@ -24,9 +24,6 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 313
-      },
-      {
         "__id__": 314
       },
       {
@@ -34,10 +31,13 @@
       },
       {
         "__id__": 316
+      },
+      {
+        "__id__": 317
       }
     ],
     "_prefab": {
-      "__id__": 317
+      "__id__": 318
     },
     "_opacity": 255,
     "_color": {
@@ -101,7 +101,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 312
+      "__id__": 313
     },
     "_opacity": 255,
     "_color": {
@@ -168,11 +168,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 310
+        "__id__": 311
       }
     ],
     "_prefab": {
-      "__id__": 311
+      "__id__": 312
     },
     "_opacity": 255,
     "_color": {
@@ -462,11 +462,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 308
+        "__id__": 309
       }
     ],
     "_prefab": {
-      "__id__": 309
+      "__id__": 310
     },
     "_opacity": 255,
     "_color": {
@@ -1127,7 +1127,7 @@
     "asset": {
       "__uuid__": "e3718e3b-b05d-4d23-9195-924548d5c740"
     },
-    "fileId": "94xblEPX5I6IX6aNE8yYHB",
+    "fileId": "7bl5j9IK9AaoJrLB++ZMEi",
     "sync": false
   },
   {
@@ -1336,7 +1336,7 @@
     "asset": {
       "__uuid__": "e3718e3b-b05d-4d23-9195-924548d5c740"
     },
-    "fileId": "d1ZdU8GSxNHrEbHSWoZdvY",
+    "fileId": "52PfU+1LhDOrt7C9CMFogt",
     "sync": false
   },
   {
@@ -9196,14 +9196,14 @@
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
-      "x": 1,
+      "x": 0,
       "y": 0.5
     },
     "_trs": {
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        74.71,
+        -246.945,
         -22.575,
         0,
         0,
@@ -9983,10 +9983,13 @@
       },
       {
         "__id__": 302
+      },
+      {
+        "__id__": 307
       }
     ],
     "_prefab": {
-      "__id__": 307
+      "__id__": 308
     },
     "_opacity": 255,
     "_color": {
@@ -10353,6 +10356,23 @@
     "customEventData": ""
   },
   {
+    "__type__": "f67a9SEPlBL8rHHpVX6g1ZW",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 294
+    },
+    "_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
@@ -10522,6 +10542,9 @@
       "__id__": 1
     },
     "_enabled": true,
+    "tc": {
+      "__id__": 41
+    },
     "sp_progress": {
       "__id__": 88
     },
@@ -10546,6 +10569,9 @@
     "lbl_tipUp": {
       "__id__": 108
     },
+    "btn_cashOut": {
+      "__id__": 307
+    },
     "check_button": [
       {
         "__id__": 155

assets/resources/module/newNotice/lineUpUI.prefab

@@ -0,0 +1,1128 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "",
+    "_objFlags": 0,
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "asyncLoadAssets": false,
+    "readonly": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "lineUpUI",
+    "_objFlags": 0,
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 28
+      },
+      {
+        "__id__": 29
+      },
+      {
+        "__id__": 30
+      },
+      {
+        "__id__": 31
+      }
+    ],
+    "_prefab": {
+      "__id__": 32
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 750,
+      "height": 1334
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        375,
+        667,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "动画节点",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [
+      {
+        "__id__": 3
+      }
+    ],
+    "_active": true,
+    "_components": [],
+    "_prefab": {
+      "__id__": 27
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 0,
+      "height": 0
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "bg",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [
+      {
+        "__id__": 4
+      },
+      {
+        "__id__": 7
+      },
+      {
+        "__id__": 12
+      },
+      {
+        "__id__": 15
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 25
+      }
+    ],
+    "_prefab": {
+      "__id__": 26
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 640,
+      "height": 380
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "title",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 3
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 5
+      }
+    ],
+    "_prefab": {
+      "__id__": 6
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 368,
+      "height": 33
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        134,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1.2,
+        1.2,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 4
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "ec7941ac-857a-4e7d-98f7-3fd79882d599"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "4f28d7f3-1d28-4320-bf91-516bb05e0c01"
+    },
+    "fileId": "deIpL6YWRHnYefCM861K/1",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "关闭按钮",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 3
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 8
+      },
+      {
+        "__id__": 9
+      }
+    ],
+    "_prefab": {
+      "__id__": 11
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 82,
+      "height": 87
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        311.106,
+        179.122,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 7
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "af2a7472-1f78-414a-8307-5ac0edead809"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cdc50kCRVVBa5gcp4XXxVO+",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 7
+    },
+    "_enabled": true,
+    "node_panel": {
+      "__id__": 1
+    },
+    "transition_type": 3,
+    "onComplete": [
+      {
+        "__id__": 10
+      }
+    ],
+    "_id": ""
+  },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": null,
+    "component": "",
+    "_componentId": "",
+    "handler": "",
+    "customEventData": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "4f28d7f3-1d28-4320-bf91-516bb05e0c01"
+    },
+    "fileId": "0eeyZBmgdBApHSFjURiAic",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "New Label",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 3
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 13
+      }
+    ],
+    "_prefab": {
+      "__id__": 14
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 138,
+      "g": 67,
+      "b": 18,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 492.06,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        15,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 12
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "提现排队中，你前面还有100人",
+    "_N$string": "提现排队中，你前面还有100人",
+    "_fontSize": 36,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 0,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 1,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "4f28d7f3-1d28-4320-bf91-516bb05e0c01"
+    },
+    "fileId": "86yt7r64RBxKnnp5JCt3jn",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "视频按钮",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 3
+    },
+    "_children": [
+      {
+        "__id__": 16
+      },
+      {
+        "__id__": 19
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 22
+      },
+      {
+        "__id__": 23
+      }
+    ],
+    "_prefab": {
+      "__id__": 24
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 283,
+      "height": 112
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -3.882,
+        -139.759,
+        0,
+        0,
+        0,
+        0,
+        1,
+        0.6,
+        0.6,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "New Label",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 15
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 17
+      }
+    ],
+    "_prefab": {
+      "__id__": 18
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 118,
+      "g": 70,
+      "b": 70,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 200,
+      "height": 63
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        5,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 16
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "免费插队",
+    "_N$string": "免费插队",
+    "_fontSize": 50,
+    "_lineHeight": 50,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 0,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 1,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "4f28d7f3-1d28-4320-bf91-516bb05e0c01"
+    },
+    "fileId": "89PjL1gwVDtJonpd3pJ3IP",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "video",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 15
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 20
+      }
+    ],
+    "_prefab": {
+      "__id__": 21
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 57,
+      "height": 62
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        122.595,
+        48.054,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 19
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "48b63ac2-149c-415c-9f34-eab7a86be1a7"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "4f28d7f3-1d28-4320-bf91-516bb05e0c01"
+    },
+    "fileId": "31IRdkqLRMHLa2j9NcxtLU",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 15
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "c3f3ce70-5592-4b5a-bb79-363c0338d77f"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 15
+    },
+    "_enabled": true,
+    "_normalMaterial": null,
+    "_grayMaterial": null,
+    "duration": 0.1,
+    "zoomScale": 1.2,
+    "clickEvents": [],
+    "_N$interactable": true,
+    "_N$enableAutoGrayEffect": false,
+    "_N$transition": 0,
+    "transition": 0,
+    "_N$normalColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "_N$hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$disabledColor": {
+      "__type__": "cc.Color",
+      "r": 124,
+      "g": 124,
+      "b": 124,
+      "a": 255
+    },
+    "_N$normalSprite": null,
+    "_N$pressedSprite": null,
+    "pressedSprite": null,
+    "_N$hoverSprite": null,
+    "hoverSprite": null,
+    "_N$disabledSprite": null,
+    "_N$target": {
+      "__id__": 15
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "4f28d7f3-1d28-4320-bf91-516bb05e0c01"
+    },
+    "fileId": "c914LvBORBc4nuXxpErCzN",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 3
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "583e8dba-cff4-4047-b497-9a963c4f8f8c"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "4f28d7f3-1d28-4320-bf91-516bb05e0c01"
+    },
+    "fileId": "3aDHUWdXdFsqUq8Pt8TbfW",
+    "sync": false
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "4f28d7f3-1d28-4320-bf91-516bb05e0c01"
+    },
+    "fileId": "bfZmc8NhZLmqu8BJnFLEvm",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": null,
+    "_alignFlags": 45,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_verticalCenter": 0,
+    "_horizontalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 750,
+    "_originalHeight": 1334,
+    "_id": ""
+  },
+  {
+    "__type__": "58495/rJOBNGoxELFSp8G2a",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 180
+    },
+    "design_block_node": null,
+    "bClickClose": false,
+    "onComplete": [],
+    "_id": ""
+  },
+  {
+    "__type__": "ac053zwqaRD6IJmTlQWmefZ",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "effect_par": {
+      "__id__": 2
+    },
+    "open_effect": 1,
+    "isOpenCloseEffect": true,
+    "close_effect": 1,
+    "close_toPoint": "",
+    "close_uibg": false,
+    "isDelayOneFrame": false,
+    "_id": ""
+  },
+  {
+    "__type__": "1c78dTYnjVE95q2lNCW1t1a",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "lbl_tip": {
+      "__id__": 13
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "4f28d7f3-1d28-4320-bf91-516bb05e0c01"
+    },
+    "fileId": "",
+    "sync": false
+  }
+]

assets/resources/module/newNotice/lineUpUI.prefab.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "1.2.9",
+  "uuid": "4f28d7f3-1d28-4320-bf91-516bb05e0c01",
+  "optimizationPolicy": "AUTO",
+  "asyncLoadAssets": false,
+  "readonly": false,
+  "subMetas": {}
+}

assets/resources/module/newNotice/texture/cashout.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "45d03740-7e9a-4556-aa0a-d79f0499e452",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 368,
+  "height": 33,
+  "platformSettings": {},
+  "subMetas": {
+    "cashout": {
+      "ver": "1.0.4",
+      "uuid": "ec7941ac-857a-4e7d-98f7-3fd79882d599",
+      "rawTextureUuid": "45d03740-7e9a-4556-aa0a-d79f0499e452",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 368,
+      "height": 33,
+      "rawWidth": 368,
+      "rawHeight": 33,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/module/newOpenRedBag/newOpenRedBag.prefab

@@ -635,9 +635,7 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_spriteFrame": {
-      "__uuid__": "eb2a6b74-0d0f-4cf4-9e3f-fc187a8d1b00"
-    },
+    "_spriteFrame": null,
     "_type": 0,
     "_sizeMode": 1,
     "_fillType": 0,
@@ -3757,8 +3755,11 @@
     "sp_icon": {
       "__id__": 14
     },
-    "node_video": {
-      "__id__": 22
+    "node_openBtn": {
+      "__id__": 21
+    },
+    "node_getBtn": {
+      "__id__": 30
     },
     "_id": ""
   },

assets/script/game/component/tween/TweenCast.ts

@@ -153,4 +153,17 @@ export default class TweenCast extends cc.Component {
             this.rich_text_2.string = this.getContent();
         }
     }
+
+    public setMoneyArr(v:number[])
+    {
+        this.moneys = v;
+        if(this.isShowFirstNotice)
+        {
+            if(!this.rich_text_2)
+            {
+                console.log('sss');
+            }
+            this.rich_text_2.string = this.getContent();
+        }
+    }
 }

assets/script/game/data/AdData.ts

@@ -61,6 +61,7 @@ export class AdData {
         this.adMap.set(AdFun.turntable, gData.turnable)
         this.adMap.set(AdFun.sign, gData.sign)
         this.adMap.set(AdFun.bigCash, gData.blessingBag)
+        this.adMap.set(AdFun.cashOutAddCash, gData.walletCashOutData);
     }
 
     /**
@@ -313,6 +314,7 @@ export class AdData {
 
     //定时弹出计时
     private timeAd = 0;
+    private test = true;
     /** 定时弹出红包 */
     startPopRed(dt) {
         if (mk.guide.isGuiding() || mk.ui.getCurOnPanel('redBagTask') || mk.ui.getCurOnPanel('productReward2')) {

assets/script/game/data/GData.ts

@@ -36,6 +36,7 @@ import { FarmMapData } from "./module/FarmMapData";
 import { GradeRewardData } from "./module/GradeRewardData";
 import WalletCashOut from "../module/newCashUI/WalletCashOut";
 import { WalletCashOutData } from "./module/WalletCashOutData";
+import { LineUpUIData } from "./module/LineUpUIData";
 
 /**
  * 数据集合全局类
@@ -95,6 +96,7 @@ class GData {
     public farmMapData: FarmMapData;
     public farmGradeData: GradeRewardData;
     public walletCashOutData: WalletCashOutData;
+    public lineUpUIData: LineUpUIData;
 
     public moduleData: Map<number, Data>;
 
@@ -138,6 +140,7 @@ class GData {
         this.farmMapData = new FarmMapData();
         this.farmGradeData = new GradeRewardData();
         this.walletCashOutData = new WalletCashOutData();
+        this.lineUpUIData = new LineUpUIData();
 
         this.moduleData = new Map<number, Data>();
         this.moduleData.set(Fun.moreGame, this.moreGame);

assets/script/game/data/GameData.ts

@@ -39,6 +39,8 @@ export class GameData {
 
     /** 标志位：刷新主界面红点 */
     public init_red_point: boolean = true;
+    //标志位，刷新提现界面的红包币
+    public init_wallet_redMoney = false;
 
     /** 属性存储字典 */
     public props: Map<number, any> = new Map<number, any>();
@@ -1064,6 +1066,7 @@ class PlayerProp {
         this._redMoney = value;
         gData.gameData.init_coin = true;
         gData.gameData.init_red_point = true;
+        gData.gameData.init_wallet_redMoney = true;
     }
     get redMoney(): number {
         return this._redMoney;

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

@@ -102,7 +102,7 @@ export class BlessingBagData extends Data {
         let data = { Id: this.taskRbId };
         let response = await mk.http.sendData('welFare/welFareCash', data);
 
-        mk.console.logSingle("'welFare/welFareCash", response.data);
+        mk.console.logSingle("'welFare/welFareCash", response);
         if (response.errcode != 0) {
             return null;
         }

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

@@ -0,0 +1,7 @@
+import { Data } from "../../../mk/data/Data";
+
+
+export class LineUpUIData extends Data {
+
+    public personCount = 0;
+}

assets/script/game/data/module/LineUpUIData.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "97e45826-c0ba-4b54-a9df-5fa01ba161a8",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

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

@@ -137,11 +137,12 @@ export class SignData extends Data {
             // let response = await mk.http.sendRequest('readyCash', 'POST', JSON.stringify(data));
             let response = await mk.http.sendData('readyCash', {});
 
+            mk.console.logSingle('sign=>', response);
             if (response.errcode != 0) {
                 mk.tip.pop('系统异常');
-                // return;
+                return;
             }
-
+ 
             if (response.CashMode == 0) {//星云打款
             } else if (response.CashMode == 1) {//公众号打款
             }
@@ -151,7 +152,7 @@ export class SignData extends Data {
             gData.cashNormal.receip_total_rmb += gData.receiptNotice.receip_rmb;
             //mk.ui.openPanel('module/receiptNotice/receiptNotice');
             mk.ui.openPanel('module/newNotice/newNotice', OpenActionType.closeLast);
-            gData.cashNormal.getRecord();// 请求新的提现记录
+            //gData.cashNormal.getRecord();// 请求新的提现记录
         } else if (reward_data.rewardType === RewardType.pigRmb) {
             // 金猪现金
             // gData.reward.data = [{ rewardNum: reward_data.rewardNum, rewardType: reward_data.rewardType }]

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

@@ -36,4 +36,20 @@
         this.init_novice = true;
     }
 
+    async HttpCashOut2(id: number)
+    {
+        let data = {index: id}; 
+        let response = await mk.http.sendData('redMoney/cashPay', data);
+
+        mk.console.logSingle('wallet=>', response);
+        if (response.errcode != 0) {
+            if(response.count > 0)
+            {
+                gData.lineUpUIData.personCount = response.count;
+                mk.ui.openPanel("module/newNotice/LineUpUI");
+            }
+            return null;
+        }     
+    }
+
  }

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

@@ -138,10 +138,10 @@ export default class BlessingBag extends cc.Component {
         }
         {
             if (!this.video_btn.interactable) {
-                this.video_btn.interactable = false;
+                this.video_btn.interactable = true;
                 let cmp = this.video_btn.getComponent(SetGray);
                 if (cmp) {
-                    cmp.setGray(true);
+                    cmp.setGray(false);
                 }
             }
         }

assets/script/game/module/gradeReward/GradeReward.ts

@@ -177,7 +177,7 @@ export class GradeReward extends cc.Component {
         mk.ad.watchAd((success: boolean) => {
             mk.console.log("watchAD:" + success);
             if (success) {
-                gData.farmGradeData.addGradeExp(ExpAddType.EAT_video, true);            
+                gData.farmGradeData.addGradeExp(ExpAddType.EAT_video);            
             }
         });
     }

assets/script/game/module/newCashUI/CheckButton.ts

@@ -17,10 +17,14 @@ export default class Turnable extends cc.Component {
 
     private isCanNotChoose: boolean = false;
 
+    private data = null;
+
    
     public setShowUI(data)
     {
-
+        this.data = data;
+        this.lbl_times.string = data.cashFrequency.toString();
+        this.lbl_value.string = (data.money/100).toString();
     }
 
     public setIsChoose(isChoose: boolean)

assets/script/game/module/newCashUI/WalletCashOut.ts

@@ -1,3 +1,5 @@
+import SetGray from "../../component/SetGray";
+import TweenCast from "../../component/tween/TweenCast";
 import { AdFun } from "../../data/AdData";
 import { VideoAdType } from "../../data/GameData";
 import CheckButton from "./CheckButton";
@@ -8,6 +10,9 @@ const { ccclass, property } = cc._decorator;
 @ccclass
 export default class WalletCashOut extends cc.Component {
 
+    @property({displayName:'公告组件', type: TweenCast})
+    private tc: TweenCast = null;
+
     @property({ displayName: '进度条', type: cc.Sprite })
     private sp_progress: cc.Sprite = null;
 
@@ -27,6 +32,9 @@ export default class WalletCashOut extends cc.Component {
     @property({ displayName: '上提示', type: cc.Label })
     private lbl_tipUp: cc.Label = null;
 
+    @property(SetGray)
+    btn_cashOut: SetGray = null;
+
     @property({ displayName: '6个选择按钮', type: CheckButton })
     private check_button: CheckButton[] = [];
 
@@ -34,19 +42,22 @@ export default class WalletCashOut extends cc.Component {
 
     private intV: number = 0;
 
+    private isCanCash = false;
+
     start() {
         // mk.ad.showNative(4);
 
         this.initNoviceUI();
+        this.initCashOutUI();
 
-        let data = [{}, {}, {}, {}, {}, {}];
-        for (let i = 0; i != this.check_button.length; ++i) {
-            if (i < data.length) {
-                this.check_button[i].setShowUI(data[i]);
-            } else {
-                this.check_button[i].setShowUI(null);
-            }
-        }
+        // let data = [{}, {}, {}, {}, {}, {}];
+        // for (let i = 0; i != this.check_button.length; ++i) {
+        //     if (i < data.length) {
+        //         this.check_button[i].setShowUI(data[i]);
+        //     } else {
+        //         this.check_button[i].setShowUI(null);
+        //     }
+        // }
     }
 
     private initNoviceUI() {
@@ -62,11 +73,64 @@ export default class WalletCashOut extends cc.Component {
         }
     }
 
+    private initCashOutUI()
+    {
+        if(gData.gameData.configs.CashCfg)
+        {
+            let arr = [];
+            let data = gData.gameData.configs.CashCfg
+            for (let i = 0; i != this.check_button.length; ++i) {
+                if (i < data.length) {
+                    this.check_button[i].setShowUI(data[i]);
+                    arr.push(data[i].money/100);
+                } else {
+                    this.check_button[i].setShowUI(null);
+                }
+            }
+
+            this.tc.setMoneyArr(arr);
+            this.initTip();
+        }
+    }
+
+    private initTip()
+    {
+        let data = gData.gameData.configs.CashCfg[this.curChooseIndex];
+        let isEnough = gData.gameData.gameData.redMoney - data.redMoney;
+        if(isEnough >= 0)
+        {
+            this.isCanCash = true;
+            this.btn_cashOut.setGray(false);
+            let needV = data.money/100;
+            let haveV = (gData.gameData.gameData.redMoney/10000).toFixed(2) + '元';
+            this.lbl_tip.string =`需要${needV}元，当前有` + haveV;
+        }else{          
+            this.isCanCash = false;
+            this.btn_cashOut.setGray(true);
+            let needV = data.money/100;
+            let haveV = (gData.gameData.gameData.redMoney/10000).toFixed(2) + '元';
+            this.lbl_tip.string =`需要${needV}元，当前只有` + haveV;
+        }
+    }
+
     update(dt) {
         if (gData.walletCashOutData.init_novice) {
             this.initNoviceUI();
             gData.walletCashOutData.init_novice = false;
         }
+        
+        if(gData.walletCashOutData.adData)
+        {
+            gData.reward.data = gData.walletCashOutData.adData.videoRedMoney.videoRewardList;
+            mk.ui.openPanel("module/reward/reward");
+            gData.walletCashOutData.adData = null;
+        }
+
+        if(gData.gameData.init_wallet_redMoney)
+        {
+            this.initTip();
+            gData.gameData.init_wallet_redMoney = false;
+        }
     }
 
     private clickChooseBtn(event, customEvenData) {
@@ -86,6 +150,8 @@ export default class WalletCashOut extends cc.Component {
         this.check_button[this.curChooseIndex].setIsChoose(false);
 
         this.curChooseIndex = id;
+
+        this.initTip();
         // for (let i = 0; i != this.check_button.length; ++i) {
         //     if (i == this.curChooseIndex) {
         //         this.check_button[i].setIsChoose(true);
@@ -97,8 +163,12 @@ export default class WalletCashOut extends cc.Component {
 
     private clickCashOutBtn() {
         mk.audio.playEffect("button");
-        gData.adData.checkPopCashFull();
-        //this.check_button[this.curChooseIndex].setIsCanNotChoose();
+        if(this.isCanCash)
+        {
+            gData.adData.checkPopCashFull();
+            //this.check_button[this.curChooseIndex].setIsCanNotChoose();
+            gData.walletCashOutData.HttpCashOut2(this.curChooseIndex + 1);
+        }
     }
 
     private clickAddProgressBtn() {

assets/script/game/module/newNotice/LineUpUI.ts

@@ -0,0 +1,25 @@
+
+
+const { ccclass, property } = cc._decorator;
+@ccclass
+export default class LineUpUI extends cc.Component {
+
+    @property(cc.Label)
+    private lbl_tip: cc.Label = null;
+
+
+    start(){
+        this.lbl_tip.string = gData.lineUpUIData.personCount.toString();
+    }
+
+    private clickVideoBtn()
+    {
+        mk.audio.playEffect("button");
+        mk.tip.pop('插队成功');
+
+    }
+    private clickCloseBtn(){
+
+        mk.audio.playEffect("closeButton");
+    }
+}

assets/script/game/module/newNotice/LineUpUI.ts.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "1c78d4d8-9e35-44f7-9ab6-94d096d6dd5a",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

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

@@ -1,4 +1,5 @@
 import BtnClosePanel from "../../component/BtnClosePanel";
+import SetGray from "../../component/SetGray";
 import { AdFun } from "../../data/AdData";
 import { VideoAdType } from "../../data/GameData";
 import TurnableItem from "./TurnableItem";
@@ -14,8 +15,8 @@ export default class Turnable extends cc.Component {
     node_turn: cc.Node = null;
     @property(cc.Node)
     node_items: cc.Node[] = [];
-    @property(cc.Node)
-    btn_draw: cc.Node = null;
+    @property(SetGray)
+    btn_draw: SetGray = null;
     @property(cc.Sprite)
     btn_close: cc.Sprite = null;
     @property(cc.RichText)
@@ -137,6 +138,10 @@ export default class Turnable extends cc.Component {
     updateLeftTimes() {
         this.lbl_left.string = `剩余：<color=#FFED99>${gData.turnable.leftTimes}</color>次`;
 
+        if(gData.turnable.leftTimes <= 0)
+        {
+            this.btn_draw.setGray(true)
+        }
         //已抽奖次数
         let times = 10-gData.turnable.leftTimes;
         if(times == 0)

build/jsb-link/assets/internal/config.json

@@ -1 +1 @@
-{"paths":{"0":["effects/builtin-2d-graphics",0],"1":["effects/builtin-2d-gray-sprite",0],"2":["effects/builtin-2d-label",0],"3":["effects/builtin-2d-spine",0],"4":["effects/builtin-2d-sprite",0],"5":["effects/builtin-3d-particle",0],"6":["effects/builtin-3d-trail",0],"7":["effects/builtin-clear-stencil",0],"8":["effects/builtin-unlit",0],"9":["materials/builtin-2d-base",1],"10":["materials/builtin-2d-graphics",1],"11":["materials/builtin-2d-gray-sprite",1],"12":["materials/builtin-2d-label",1],"13":["materials/builtin-2d-spine",1],"14":["materials/builtin-2d-sprite",1],"15":["materials/builtin-3d-particle",1],"16":["materials/builtin-3d-trail",1],"17":["materials/builtin-clear-stencil",1],"18":["materials/builtin-unlit",1]},"types":["cc.EffectAsset","cc.Material"],"uuids":["30aC+Hnw1PF4pEcoY3kUYb","14TDKXr2NJ6LjvHPops74o","f1h0LXVtJOta5JLZ1xCzfI","0ek66qC1NOQLjgYmi04HvX","28dPjdQWxEQIG3VVl1Qm6T","82migssElAGb04Ws6NimQX","2afAA24LNP4YmYiaVLiivs","c0BAyVxX9JzZy8EjFrc9DU","6dkeWRTOBGXICfYQ7JUBnG","6fgBCSDDdPMInvyNlggls2","a1U5RdJRFMFL57BdJC9H1X","3ae7efMv1CLq2ilvUY/tQi","e0LYfU5ZlNFoAB4UiRrGUG","7a/QZLET9IDreTiBfRn2PD","ecpdLyjvZBwrvm+cedCcQy","43L6CczwNM/6GGmCYEQIoH","46bU+b5fROqIXVPG6aZWWK","cffgu4qBxEqa150o1DmRAy","2aKWBXJHxKHLvrBUi2yYZQ","60AwGqM1dKELCGhPAR+jK6","02delMVqdBD70a/HSD99FK"],"scenes":{},"redirect":[],"deps":[],"packs":{"0b6c4470e":[20,3,1,4,18,6,0,11,15,16,19,8,9,13,5,10,7,17,12,14,2]},"name":"internal","importBase":"import","nativeBase":"native","debug":false,"isZip":false,"encrypted":true}
+{"paths":{"0":["effects/builtin-2d-graphics",0],"1":["effects/builtin-2d-gray-sprite",0],"2":["effects/builtin-2d-label",0],"3":["effects/builtin-2d-spine",0],"4":["effects/builtin-2d-sprite",0],"5":["effects/builtin-3d-particle",0],"6":["effects/builtin-3d-trail",0],"7":["effects/builtin-clear-stencil",0],"8":["effects/builtin-unlit",0],"9":["materials/builtin-2d-base",1],"10":["materials/builtin-2d-graphics",1],"11":["materials/builtin-2d-gray-sprite",1],"12":["materials/builtin-2d-label",1],"13":["materials/builtin-2d-spine",1],"14":["materials/builtin-2d-sprite",1],"15":["materials/builtin-3d-particle",1],"16":["materials/builtin-3d-trail",1],"17":["materials/builtin-clear-stencil",1],"18":["materials/builtin-unlit",1]},"types":["cc.EffectAsset","cc.Material"],"uuids":["30aC+Hnw1PF4pEcoY3kUYb","14TDKXr2NJ6LjvHPops74o","f1h0LXVtJOta5JLZ1xCzfI","0ek66qC1NOQLjgYmi04HvX","28dPjdQWxEQIG3VVl1Qm6T","82migssElAGb04Ws6NimQX","2afAA24LNP4YmYiaVLiivs","c0BAyVxX9JzZy8EjFrc9DU","6dkeWRTOBGXICfYQ7JUBnG","6fgBCSDDdPMInvyNlggls2","a1U5RdJRFMFL57BdJC9H1X","3ae7efMv1CLq2ilvUY/tQi","e0LYfU5ZlNFoAB4UiRrGUG","7a/QZLET9IDreTiBfRn2PD","ecpdLyjvZBwrvm+cedCcQy","43L6CczwNM/6GGmCYEQIoH","46bU+b5fROqIXVPG6aZWWK","cffgu4qBxEqa150o1DmRAy","2aKWBXJHxKHLvrBUi2yYZQ","02delMVqdBD70a/HSD99FK","60AwGqM1dKELCGhPAR+jK6"],"scenes":{},"redirect":[],"deps":[],"packs":{"0b6c4470e":[19,3,1,4,18,6,0,11,15,16,20,8,9,13,5,10,7,17,12,14,2]},"name":"internal","importBase":"import","nativeBase":"native","debug":false,"isZip":false,"encrypted":true}