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

# Conflicts:
#	build/jsb-link/frameworks/runtime-src/proj.android-studio/.idea/caches/build_file_checksums.ser
#	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": "a2fbd08b-ba7a-4f7c-9dd9-ea5ded6e984d",
-  "isBundle": false,
-  "bundleName": "",
-  "priority": 1,
-  "compressionType": {},
-  "optimizeHotUpdate": {},
-  "inlineSpriteFrames": {},
-  "isRemoteBundle": {},
-  "subMetas": {}
-}

assets/resources/module/blessingBag/blessingBag.prefab

@@ -1228,7 +1228,7 @@
     "asset": {
       "__uuid__": "94760687-648e-4d1f-ac2f-169b0dc625d9"
     },
-    "fileId": "05WlhdT7lJMK2ugCMm+BQa",
+    "fileId": "2ebjjcAQpAaZnU5PB1Xj2T",
     "sync": false
   },
   {
@@ -1358,7 +1358,7 @@
     "asset": {
       "__uuid__": "94760687-648e-4d1f-ac2f-169b0dc625d9"
     },
-    "fileId": "5bjpf0jsFGmYLEXsvqUqsJ",
+    "fileId": "0e4/uOVVBCEo0WPPIWQhrW",
     "sync": false
   },
   {
@@ -1488,7 +1488,7 @@
     "asset": {
       "__uuid__": "94760687-648e-4d1f-ac2f-169b0dc625d9"
     },
-    "fileId": "8blkwBbMxOOZX7QrSXOTcV",
+    "fileId": "c84RPF2pJLL6THlZ9RY1Ou",
     "sync": false
   },
   {
@@ -6634,6 +6634,8 @@
     "limitLength": 5,
     "direction": 1,
     "isHideAllChild": true,
+    "limitDataLen": -1,
+    "addOffset": 10,
     "_id": ""
   },
   {
@@ -8903,7 +8905,7 @@
         "__id__": 262
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 265
@@ -8970,7 +8972,7 @@
       "__id__": 258
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 260
@@ -9068,7 +9070,7 @@
     "asset": {
       "__uuid__": "94760687-648e-4d1f-ac2f-169b0dc625d9"
     },
-    "fileId": "05BBwr5LRCf5wCBQYV+AnB",
+    "fileId": "5bITGwTVVJ77YQrgByJvxH",
     "sync": false
   },
   {
@@ -9079,7 +9081,7 @@
       "__id__": 258
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 263
@@ -9177,7 +9179,7 @@
     "asset": {
       "__uuid__": "94760687-648e-4d1f-ac2f-169b0dc625d9"
     },
-    "fileId": "6f+GWkBWBB5aC02cYtK3oG",
+    "fileId": "a9tYVdKIFGZYhFcKllZJBj",
     "sync": false
   },
   {

assets/resources/module/farmMap/farmItem.prefab

@@ -24,32 +24,29 @@
         "__id__": 8
       },
       {
-        "__id__": 11
-      },
-      {
-        "__id__": 14
+        "__id__": 17
       },
       {
-        "__id__": 26
+        "__id__": 29
       },
       {
-        "__id__": 35
+        "__id__": 38
       },
       {
-        "__id__": 43
+        "__id__": 46
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 46
+        "__id__": 49
       },
       {
-        "__id__": 47
+        "__id__": 50
       }
     ],
     "_prefab": {
-      "__id__": 48
+      "__id__": 51
     },
     "_opacity": 255,
     "_color": {
@@ -318,20 +315,91 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "title",
+    "_name": "New Node",
     "_objFlags": 0,
     "_parent": {
       "__id__": 1
     },
+    "_children": [
+      {
+        "__id__": 9
+      },
+      {
+        "__id__": 12
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 15
+      }
+    ],
+    "_prefab": {
+      "__id__": 16
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 200,
+      "height": 80.8
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -129.31,
+        -50.996,
+        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__": 8
+    },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 9
+        "__id__": 10
       }
     ],
     "_prefab": {
-      "__id__": 10
+      "__id__": 11
     },
     "_opacity": 255,
     "_color": {
@@ -355,8 +423,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -125.675,
-        -34,
+        0,
+        15.2,
         0,
         0,
         0,
@@ -385,7 +453,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 8
+      "__id__": 9
     },
     "_enabled": true,
     "_materials": [
@@ -421,7 +489,7 @@
     "asset": {
       "__uuid__": "c92ee1bb-0e83-4868-97e3-d71b8b58fae0"
     },
-    "fileId": "f6qmcTR/JK1q0Cpur8j6yB",
+    "fileId": "bd+gnMaAlPdowQHGl8DD7k",
     "sync": false
   },
   {
@@ -429,17 +497,17 @@
     "_name": "描述",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 1
+      "__id__": 8
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 12
+        "__id__": 13
       }
     ],
     "_prefab": {
-      "__id__": 13
+      "__id__": 14
     },
     "_opacity": 255,
     "_color": {
@@ -451,7 +519,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 208.94,
+      "width": 64,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -463,8 +531,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -125.675,
-        -65,
+        0,
+        -15.200000000000003,
         0,
         0,
         0,
@@ -493,7 +561,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 11
+      "__id__": 12
     },
     "_enabled": true,
     "_materials": [
@@ -503,8 +571,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "产出10个红包币，每秒0.02个",
-    "_N$string": "产出10个红包币，每秒0.02个",
+    "_string": "种植玉米",
+    "_N$string": "种植玉米",
     "_fontSize": 16,
     "_lineHeight": 40,
     "_enableWrapText": true,
@@ -529,7 +597,50 @@
     "asset": {
       "__uuid__": "c92ee1bb-0e83-4868-97e3-d71b8b58fae0"
     },
-    "fileId": "aaRCUrFv9JhKOHRPhXdjNj",
+    "fileId": "a4vAAY2IxPw4voEzenRlOH",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Layout",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 8
+    },
+    "_enabled": true,
+    "_layoutSize": {
+      "__type__": "cc.Size",
+      "width": 200,
+      "height": 80.8
+    },
+    "_resize": 1,
+    "_N$layoutType": 2,
+    "_N$cellSize": {
+      "__type__": "cc.Size",
+      "width": 40,
+      "height": 40
+    },
+    "_N$startAxis": 0,
+    "_N$paddingLeft": 0,
+    "_N$paddingRight": 0,
+    "_N$paddingTop": 0,
+    "_N$paddingBottom": 0,
+    "_N$spacingX": 0,
+    "_N$spacingY": -20,
+    "_N$verticalDirection": 1,
+    "_N$horizontalDirection": 0,
+    "_N$affectedByScale": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "c92ee1bb-0e83-4868-97e3-d71b8b58fae0"
+    },
+    "fileId": "16FnbvSa9C9IrdJsaL7ekb",
     "sync": false
   },
   {
@@ -541,23 +652,23 @@
     },
     "_children": [
       {
-        "__id__": 15
+        "__id__": 18
       },
       {
-        "__id__": 19
+        "__id__": 22
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 22
+        "__id__": 25
       },
       {
-        "__id__": 23
+        "__id__": 26
       }
     ],
     "_prefab": {
-      "__id__": 25
+      "__id__": 28
     },
     "_opacity": 255,
     "_color": {
@@ -611,20 +722,20 @@
     "_name": "文字",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 14
+      "__id__": 17
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 16
+        "__id__": 19
       },
       {
-        "__id__": 17
+        "__id__": 20
       }
     ],
     "_prefab": {
-      "__id__": 18
+      "__id__": 21
     },
     "_opacity": 255,
     "_color": {
@@ -678,7 +789,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 15
+      "__id__": 18
     },
     "_enabled": true,
     "_materials": [
@@ -711,7 +822,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 15
+      "__id__": 18
     },
     "_enabled": true,
     "_color": {
@@ -740,17 +851,17 @@
     "_name": "video",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 14
+      "__id__": 17
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 20
+        "__id__": 23
       }
     ],
     "_prefab": {
-      "__id__": 21
+      "__id__": 24
     },
     "_opacity": 255,
     "_color": {
@@ -804,7 +915,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 19
+      "__id__": 22
     },
     "_enabled": true,
     "_materials": [
@@ -847,7 +958,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 14
+      "__id__": 17
     },
     "_enabled": true,
     "_materials": [
@@ -879,7 +990,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 14
+      "__id__": 17
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -888,7 +999,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 24
+        "__id__": 27
       }
     ],
     "_N$interactable": true,
@@ -944,7 +1055,7 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 14
+      "__id__": 17
     },
     "_id": ""
   },
@@ -978,20 +1089,20 @@
     },
     "_children": [
       {
-        "__id__": 27
+        "__id__": 30
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 31
+        "__id__": 34
       },
       {
-        "__id__": 32
+        "__id__": 35
       }
     ],
     "_prefab": {
-      "__id__": 34
+      "__id__": 37
     },
     "_opacity": 255,
     "_color": {
@@ -1045,20 +1156,20 @@
     "_name": "文字",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 26
+      "__id__": 29
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 28
+        "__id__": 31
       },
       {
-        "__id__": 29
+        "__id__": 32
       }
     ],
     "_prefab": {
-      "__id__": 30
+      "__id__": 33
     },
     "_opacity": 255,
     "_color": {
@@ -1112,7 +1223,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 27
+      "__id__": 30
     },
     "_enabled": true,
     "_materials": [
@@ -1145,7 +1256,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 27
+      "__id__": 30
     },
     "_enabled": true,
     "_color": {
@@ -1174,7 +1285,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 26
+      "__id__": 29
     },
     "_enabled": true,
     "_materials": [
@@ -1206,7 +1317,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 26
+      "__id__": 29
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -1215,7 +1326,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 33
+        "__id__": 36
       }
     ],
     "_N$interactable": true,
@@ -1271,7 +1382,7 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 26
+      "__id__": 29
     },
     "_id": ""
   },
@@ -1305,20 +1416,20 @@
     },
     "_children": [
       {
-        "__id__": 36
+        "__id__": 39
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 39
+        "__id__": 42
       },
       {
-        "__id__": 40
+        "__id__": 43
       }
     ],
     "_prefab": {
-      "__id__": 42
+      "__id__": 45
     },
     "_opacity": 255,
     "_color": {
@@ -1372,17 +1483,17 @@
     "_name": "锁",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 35
+      "__id__": 38
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 37
+        "__id__": 40
       }
     ],
     "_prefab": {
-      "__id__": 38
+      "__id__": 41
     },
     "_opacity": 255,
     "_color": {
@@ -1436,7 +1547,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 36
+      "__id__": 39
     },
     "_enabled": true,
     "_materials": [
@@ -1479,7 +1590,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 35
+      "__id__": 38
     },
     "_enabled": true,
     "_materials": [
@@ -1511,7 +1622,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 35
+      "__id__": 38
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -1520,7 +1631,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 41
+        "__id__": 44
       }
     ],
     "_N$interactable": true,
@@ -1576,7 +1687,7 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 35
+      "__id__": 38
     },
     "_id": ""
   },
@@ -1612,11 +1723,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 44
+        "__id__": 47
       }
     ],
     "_prefab": {
-      "__id__": 45
+      "__id__": 48
     },
     "_opacity": 255,
     "_color": {
@@ -1670,7 +1781,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 43
+      "__id__": 46
     },
     "_enabled": true,
     "_materials": [
@@ -1752,22 +1863,22 @@
       "__id__": 4
     },
     "lbl_nameDes": {
-      "__id__": 9
+      "__id__": 10
     },
     "lbl_des": {
-      "__id__": 12
+      "__id__": 13
     },
     "node_ungetBtn": {
-      "__id__": 14
+      "__id__": 17
     },
     "node_getBtn": {
-      "__id__": 26
+      "__id__": 29
     },
     "node_unluckBtn": {
-      "__id__": 35
+      "__id__": 38
     },
     "node_redPoint": {
-      "__id__": 43
+      "__id__": 46
     },
     "_id": ""
   },

assets/resources/module/farmMap/farmMap.prefab

@@ -578,7 +578,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "9e3987bc-14ea-471f-aae7-b2d470bf632f"
+      "__uuid__": "9874c989-7d77-4fcc-9bb3-04b27ba32b5c"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -765,7 +765,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -11,
+        0,
         0,
         0,
         0,
@@ -817,8 +817,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 1080,
-      "height": 85
+      "width": 1180,
+      "height": 80
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -829,7 +829,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        324.419,
+        369.419,
         0,
         0,
         0,
@@ -909,7 +909,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 1050,
+      "width": 1138,
       "height": 80
     },
     "_anchorPoint": {
@@ -1001,7 +1001,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -467,
+        -511,
         3,
         0,
         0,
@@ -1781,7 +1781,7 @@
       "__id__": 35
     },
     "sp_luck": {
-      "__id__": 32
+      "__id__": 31
     },
     "node_redPoint": {
       "__id__": 39
@@ -1854,7 +1854,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -331,
+        -365,
         3,
         0,
         0,
@@ -2634,7 +2634,7 @@
       "__id__": 58
     },
     "sp_luck": {
-      "__id__": 55
+      "__id__": 54
     },
     "node_redPoint": {
       "__id__": 62
@@ -2707,7 +2707,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -195,
+        -219,
         3,
         0,
         0,
@@ -3487,7 +3487,7 @@
       "__id__": 81
     },
     "sp_luck": {
-      "__id__": 78
+      "__id__": 77
     },
     "node_redPoint": {
       "__id__": 85
@@ -3560,7 +3560,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -59,
+        -73,
         3,
         0,
         0,
@@ -4340,7 +4340,7 @@
       "__id__": 104
     },
     "sp_luck": {
-      "__id__": 101
+      "__id__": 100
     },
     "node_redPoint": {
       "__id__": 108
@@ -4413,7 +4413,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        77,
+        73,
         3,
         0,
         0,
@@ -5193,7 +5193,7 @@
       "__id__": 127
     },
     "sp_luck": {
-      "__id__": 124
+      "__id__": 123
     },
     "node_redPoint": {
       "__id__": 131
@@ -5266,7 +5266,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        213,
+        219,
         3,
         0,
         0,
@@ -6046,7 +6046,7 @@
       "__id__": 150
     },
     "sp_luck": {
-      "__id__": 147
+      "__id__": 146
     },
     "node_redPoint": {
       "__id__": 154
@@ -6119,7 +6119,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        349,
+        365,
         3,
         0,
         0,
@@ -6899,7 +6899,7 @@
       "__id__": 173
     },
     "sp_luck": {
-      "__id__": 170
+      "__id__": 169
     },
     "node_redPoint": {
       "__id__": 177
@@ -6972,7 +6972,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        485,
+        511,
         3,
         0,
         0,
@@ -7752,7 +7752,7 @@
       "__id__": 196
     },
     "sp_luck": {
-      "__id__": 193
+      "__id__": 192
     },
     "node_redPoint": {
       "__id__": 200
@@ -7792,10 +7792,10 @@
     "_enabled": true,
     "_layoutSize": {
       "__type__": "cc.Size",
-      "width": 1050,
+      "width": 1138,
       "height": 80
     },
-    "_resize": 0,
+    "_resize": 1,
     "_N$layoutType": 1,
     "_N$cellSize": {
       "__type__": "cc.Size",
@@ -7807,7 +7807,7 @@
     "_N$paddingRight": 0,
     "_N$paddingTop": 0,
     "_N$paddingBottom": 0,
-    "_N$spacingX": 20,
+    "_N$spacingX": 30,
     "_N$spacingY": 0,
     "_N$verticalDirection": 1,
     "_N$horizontalDirection": 0,
@@ -7887,7 +7887,7 @@
     "node": {
       "__id__": 20
     },
-    "_enabled": true,
+    "_enabled": false,
     "fromData": {
       "__id__": 214
     },
@@ -7919,7 +7919,7 @@
     },
     "angle": 0,
     "scale": 1,
-    "active": false
+    "active": true
   },
   {
     "__type__": "TweenData",
@@ -8212,6 +8212,8 @@
     "limitLength": 0,
     "direction": 1,
     "isHideAllChild": true,
+    "limitDataLen": -1,
+    "addOffset": 10,
     "_id": ""
   },
   {

assets/resources/module/farmMap/texture/农场图鉴.png.meta → assets/resources/module/farmMap/texture/farmMap.png.meta

@@ -1,6 +1,6 @@
 {
   "ver": "2.3.5",
-  "uuid": "5f9365df-42be-4d06-85fd-974f13c91c3d",
+  "uuid": "5f97d5c0-fdae-4018-b3f5-6d47deca8bb5",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
@@ -11,10 +11,10 @@
   "height": 49,
   "platformSettings": {},
   "subMetas": {
-    "农场图鉴": {
+    "farmMap": {
       "ver": "1.0.4",
-      "uuid": "9e3987bc-14ea-471f-aae7-b2d470bf632f",
-      "rawTextureUuid": "5f9365df-42be-4d06-85fd-974f13c91c3d",
+      "uuid": "9874c989-7d77-4fcc-9bb3-04b27ba32b5c",
+      "rawTextureUuid": "5f97d5c0-fdae-4018-b3f5-6d47deca8bb5",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,

assets/resources/module/farmMap/texture/gift.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "82cf8240-3dc8-4ce1-857f-7a70500b175f",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 136,
+  "height": 136,
+  "platformSettings": {},
+  "subMetas": {
+    "gift": {
+      "ver": "1.0.4",
+      "uuid": "57e0c5d9-afa2-4b4f-b52e-07809be0427b",
+      "rawTextureUuid": "82cf8240-3dc8-4ce1-857f-7a70500b175f",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 1.5,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 136,
+      "height": 133,
+      "rawWidth": 136,
+      "rawHeight": 136,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/module/newOpenRedBag/newOpenRedBag.prefab

@@ -24,20 +24,20 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 93
+        "__id__": 96
       },
       {
-        "__id__": 94
+        "__id__": 97
       },
       {
-        "__id__": 95
+        "__id__": 98
       },
       {
-        "__id__": 96
+        "__id__": 99
       }
     ],
     "_prefab": {
-      "__id__": 97
+      "__id__": 100
     },
     "_opacity": 255,
     "_color": {
@@ -101,7 +101,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 92
+      "__id__": 95
     },
     "_opacity": 255,
     "_color": {
@@ -186,11 +186,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 90
+        "__id__": 93
       }
     ],
     "_prefab": {
-      "__id__": 91
+      "__id__": 94
     },
     "_opacity": 255,
     "_color": {
@@ -2199,7 +2199,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 89
+      "__id__": 92
     },
     "_opacity": 255,
     "_color": {
@@ -2263,23 +2263,20 @@
         "__id__": 65
       },
       {
-        "__id__": 69
-      },
-      {
-        "__id__": 72
+        "__id__": 75
       },
       {
-        "__id__": 82
+        "__id__": 80
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 87
+        "__id__": 90
       }
     ],
     "_prefab": {
-      "__id__": 88
+      "__id__": 91
     },
     "_opacity": 255,
     "_color": {
@@ -2437,36 +2434,40 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "提现金额",
+    "_name": "进度条背景",
     "_objFlags": 0,
     "_parent": {
       "__id__": 61
     },
-    "_children": [],
-    "_active": true,
-    "_components": [
+    "_children": [
       {
         "__id__": 66
       },
       {
-        "__id__": 67
+        "__id__": 69
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 73
       }
     ],
     "_prefab": {
-      "__id__": 68
+      "__id__": 74
     },
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 251,
-      "g": 240,
-      "b": 110,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 75.7,
-      "height": 54.4
+      "width": 234,
+      "height": 30
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2477,8 +2478,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -92.075,
-        21.989,
+        -32.515,
+        -21.677,
         0,
         0,
         0,
@@ -2503,96 +2504,34 @@
     "_id": ""
   },
   {
-    "__type__": "cc.Label",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 65
-    },
-    "_enabled": true,
-    "_materials": [
-      {
-        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
-      }
-    ],
-    "_srcBlendFactor": 770,
-    "_dstBlendFactor": 771,
-    "_string": "0.5元",
-    "_N$string": "0.5元",
-    "_fontSize": 30,
-    "_lineHeight": 40,
-    "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
-    "_spacingX": 0,
-    "_batchAsBitmap": false,
-    "_styleFlags": 1,
-    "_underlineHeight": 0,
-    "_N$horizontalAlign": 1,
-    "_N$verticalAlign": 1,
-    "_N$fontFamily": "Arial",
-    "_N$overflow": 0,
-    "_N$cacheMode": 0,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.LabelOutline",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 65
-    },
-    "_enabled": true,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 151,
-      "g": 19,
-      "b": 8,
-      "a": 255
-    },
-    "_width": 2,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__uuid__": "65c9ca7e-c2c7-4b6c-85cb-11c7ebb15e6c"
-    },
-    "fileId": "42xVGhMFpPy5jYzeNxLc0h",
-    "sync": false
-  },
-  {
     "__type__": "cc.Node",
-    "_name": "提现进度",
+    "_name": "进度条",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 61
+      "__id__": 65
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 70
+        "__id__": 67
       }
     ],
     "_prefab": {
-      "__id__": 71
+      "__id__": 68
     },
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 151,
-      "g": 19,
-      "b": 8,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 104,
-      "height": 50.4
+      "width": 230,
+      "height": 26
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2603,8 +2542,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        13.743,
-        19.239,
+        0,
+        0,
         0,
         0,
         0,
@@ -2629,11 +2568,11 @@
     "_id": ""
   },
   {
-    "__type__": "cc.Label",
+    "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 69
+      "__id__": 66
     },
     "_enabled": true,
     "_materials": [
@@ -2643,22 +2582,21 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "提现进度",
-    "_N$string": "提现进度",
-    "_fontSize": 26,
-    "_lineHeight": 40,
-    "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
-    "_spacingX": 0,
-    "_batchAsBitmap": false,
-    "_styleFlags": 1,
-    "_underlineHeight": 0,
-    "_N$horizontalAlign": 1,
-    "_N$verticalAlign": 1,
-    "_N$fontFamily": "Arial",
-    "_N$overflow": 0,
-    "_N$cacheMode": 0,
+    "_spriteFrame": {
+      "__uuid__": "9ae7b17e-12eb-4496-9746-ee4ab69b7680"
+    },
+    "_type": 3,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
     "_id": ""
   },
   {
@@ -2669,96 +2607,28 @@
     "asset": {
       "__uuid__": "65c9ca7e-c2c7-4b6c-85cb-11c7ebb15e6c"
     },
-    "fileId": "5epUa18BRMzaP+SdZmlK2w",
+    "fileId": "b2EwgPgK1A9ZZ/g/7Aa0AW",
     "sync": false
   },
   {
     "__type__": "cc.Node",
-    "_name": "进度条背景",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 61
-    },
-    "_children": [
-      {
-        "__id__": 73
-      },
-      {
-        "__id__": 76
-      }
-    ],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 80
-      }
-    ],
-    "_prefab": {
-      "__id__": 81
-    },
-    "_opacity": 255,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 234,
-      "height": 30
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_trs": {
-      "__type__": "TypedArray",
-      "ctor": "Float64Array",
-      "array": [
-        -32.515,
-        -21.677,
-        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": "进度条",
+    "_name": "进度",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 72
+      "__id__": 65
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 74
+        "__id__": 70
+      },
+      {
+        "__id__": 71
       }
     ],
     "_prefab": {
-      "__id__": 75
+      "__id__": 72
     },
     "_opacity": 255,
     "_color": {
@@ -2770,8 +2640,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 230,
-      "height": 26
+      "width": 85.42,
+      "height": 52.4
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2782,8 +2652,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        0,
+        2.367,
+        1.323,
         0,
         0,
         0,
@@ -2808,121 +2678,11 @@
     "_id": ""
   },
   {
-    "__type__": "cc.Sprite",
+    "__type__": "cc.Label",
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 73
-    },
-    "_enabled": true,
-    "_materials": [
-      {
-        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
-      }
-    ],
-    "_srcBlendFactor": 770,
-    "_dstBlendFactor": 771,
-    "_spriteFrame": {
-      "__uuid__": "9ae7b17e-12eb-4496-9746-ee4ab69b7680"
-    },
-    "_type": 3,
-    "_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__": "65c9ca7e-c2c7-4b6c-85cb-11c7ebb15e6c"
-    },
-    "fileId": "b2EwgPgK1A9ZZ/g/7Aa0AW",
-    "sync": false
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "进度",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 72
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 77
-      },
-      {
-        "__id__": 78
-      }
-    ],
-    "_prefab": {
-      "__id__": 79
-    },
-    "_opacity": 255,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 85.42,
-      "height": 52.4
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_trs": {
-      "__type__": "TypedArray",
-      "ctor": "Float64Array",
-      "array": [
-        2.367,
-        1.323,
-        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__": 76
+      "__id__": 69
     },
     "_enabled": true,
     "_materials": [
@@ -2955,7 +2715,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 76
+      "__id__": 69
     },
     "_enabled": true,
     "_color": {
@@ -2984,7 +2744,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 72
+      "__id__": 65
     },
     "_enabled": true,
     "_materials": [
@@ -3033,17 +2793,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 83
+        "__id__": 76
       },
       {
-        "__id__": 84
+        "__id__": 77
       },
       {
-        "__id__": 85
+        "__id__": 78
       }
     ],
     "_prefab": {
-      "__id__": 86
+      "__id__": 79
     },
     "_opacity": 255,
     "_color": {
@@ -3097,7 +2857,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 82
+      "__id__": 75
     },
     "_enabled": true,
     "_materials": [
@@ -3129,7 +2889,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 82
+      "__id__": 75
     },
     "_enabled": true,
     "_defaultClip": {
@@ -3148,7 +2908,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 82
+      "__id__": 75
     },
     "_enabled": true,
     "panel_name": "module/newCashUI/walletCashOut",
@@ -3170,6 +2930,357 @@
     "sync": false
   },
   {
+    "__type__": "cc.Node",
+    "_name": "New Node",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 61
+    },
+    "_children": [
+      {
+        "__id__": 81
+      },
+      {
+        "__id__": 85
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 88
+      }
+    ],
+    "_prefab": {
+      "__id__": 89
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 200,
+      "height": 50
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -20.239,
+        23.524,
+        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__": 80
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 82
+      },
+      {
+        "__id__": 83
+      }
+    ],
+    "_prefab": {
+      "__id__": 84
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 251,
+      "g": 240,
+      "b": 110,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 50.68,
+      "height": 54.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -74.66,
+        -1.535,
+        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__": 81
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "1元",
+    "_N$string": "1元",
+    "_fontSize": 30,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 1,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 1,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.LabelOutline",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 81
+    },
+    "_enabled": true,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 151,
+      "g": 19,
+      "b": 8,
+      "a": 255
+    },
+    "_width": 2,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "65c9ca7e-c2c7-4b6c-85cb-11c7ebb15e6c"
+    },
+    "fileId": "eboi82sUVB3aS3AZCQ3SQ2",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "提现进度",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 80
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 86
+      }
+    ],
+    "_prefab": {
+      "__id__": 87
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 151,
+      "g": 19,
+      "b": 8,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 104,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        10.680000000000007,
+        -4.285,
+        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__": 85
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "提现进度",
+    "_N$string": "提现进度",
+    "_fontSize": 26,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 1,
+    "_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__": "65c9ca7e-c2c7-4b6c-85cb-11c7ebb15e6c"
+    },
+    "fileId": "5eh36DxPlBG5U3i0RGt7Y2",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Layout",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 80
+    },
+    "_enabled": true,
+    "_layoutSize": {
+      "__type__": "cc.Size",
+      "width": 200,
+      "height": 50
+    },
+    "_resize": 0,
+    "_N$layoutType": 1,
+    "_N$cellSize": {
+      "__type__": "cc.Size",
+      "width": 40,
+      "height": 40
+    },
+    "_N$startAxis": 0,
+    "_N$paddingLeft": 0,
+    "_N$paddingRight": 0,
+    "_N$paddingTop": 0,
+    "_N$paddingBottom": 0,
+    "_N$spacingX": 8,
+    "_N$spacingY": 0,
+    "_N$verticalDirection": 1,
+    "_N$horizontalDirection": 0,
+    "_N$affectedByScale": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "65c9ca7e-c2c7-4b6c-85cb-11c7ebb15e6c"
+    },
+    "fileId": "04bukJUYxFWJ/fqnQgyHbz",
+    "sync": false
+  },
+  {
     "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
@@ -3362,6 +3473,18 @@
         "__id__": 55
       }
     ],
+    "lbl_reward_value": {
+      "__id__": 82
+    },
+    "spr_cash_out": {
+      "__id__": 67
+    },
+    "lbl_progress": {
+      "__id__": 70
+    },
+    "node_cash": {
+      "__id__": 77
+    },
     "_id": ""
   },
   {

assets/resources/module/reward/reward.prefab

@@ -24,6 +24,9 @@
     "_active": true,
     "_components": [
       {
+        "__id__": 155
+      },
+      {
         "__id__": 156
       },
       {
@@ -31,13 +34,10 @@
       },
       {
         "__id__": 158
-      },
-      {
-        "__id__": 159
       }
     ],
     "_prefab": {
-      "__id__": 160
+      "__id__": 159
     },
     "_opacity": 255,
     "_color": {
@@ -104,20 +104,20 @@
         "__id__": 104
       },
       {
-        "__id__": 134
+        "__id__": 133
       },
       {
-        "__id__": 151
+        "__id__": 150
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 154
+        "__id__": 153
       }
     ],
     "_prefab": {
-      "__id__": 155
+      "__id__": 154
     },
     "_opacity": 255,
     "_color": {
@@ -2745,7 +2745,7 @@
     "node": {
       "__id__": 72
     },
-    "_enabled": true,
+    "_enabled": false,
     "_materials": [
       {
         "__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3"
@@ -2769,9 +2769,7 @@
     "_headAniInfo": null,
     "_playTimes": 0,
     "_isAniComplete": true,
-    "_N$skeletonData": {
-      "__uuid__": "8f090d5d-cfa1-40d6-bcce-014cc1aa881e"
-    },
+    "_N$skeletonData": null,
     "_N$_defaultCacheMode": 0,
     "_N$debugSlots": false,
     "_N$debugBones": false,
@@ -3053,7 +3051,7 @@
     "node": {
       "__id__": 80
     },
-    "_enabled": true,
+    "_enabled": false,
     "_materials": [
       {
         "__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3"
@@ -3077,9 +3075,7 @@
     "_headAniInfo": null,
     "_playTimes": 0,
     "_isAniComplete": true,
-    "_N$skeletonData": {
-      "__uuid__": "8f090d5d-cfa1-40d6-bcce-014cc1aa881e"
-    },
+    "_N$skeletonData": null,
     "_N$_defaultCacheMode": 0,
     "_N$debugSlots": false,
     "_N$debugBones": false,
@@ -3787,13 +3783,13 @@
         "__id__": 105
       },
       {
-        "__id__": 110
+        "__id__": 109
       }
     ],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 133
+      "__id__": 132
     },
     "_opacity": 255,
     "_color": {
@@ -3854,20 +3850,17 @@
     "_components": [
       {
         "__id__": 106
-      },
-      {
-        "__id__": 107
       }
     ],
     "_prefab": {
-      "__id__": 109
+      "__id__": 108
     },
     "_opacity": 0,
     "_color": {
       "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_contentSize": {
@@ -3910,38 +3903,6 @@
     "_id": ""
   },
   {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 105
-    },
-    "_enabled": true,
-    "_materials": [
-      {
-        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
-      }
-    ],
-    "_srcBlendFactor": 770,
-    "_dstBlendFactor": 771,
-    "_spriteFrame": {
-      "__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91"
-    },
-    "_type": 0,
-    "_sizeMode": 0,
-    "_fillType": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_atlas": null,
-    "_id": ""
-  },
-  {
     "__type__": "cdc50kCRVVBa5gcp4XXxVO+",
     "_name": "",
     "_objFlags": 0,
@@ -3955,7 +3916,7 @@
     "transition_type": 0,
     "onComplete": [
       {
-        "__id__": 108
+        "__id__": 107
       }
     ],
     "_id": ""
@@ -3990,25 +3951,25 @@
     },
     "_children": [
       {
-        "__id__": 111
+        "__id__": 110
       },
       {
-        "__id__": 115
+        "__id__": 114
       },
       {
-        "__id__": 119
+        "__id__": 118
       },
       {
-        "__id__": 125
+        "__id__": 124
       },
       {
-        "__id__": 129
+        "__id__": 128
       }
     ],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 132
+      "__id__": 131
     },
     "_opacity": 255,
     "_color": {
@@ -4062,20 +4023,20 @@
     "_name": "bg_prize2",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 110
+      "__id__": 109
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 112
+        "__id__": 111
       },
       {
-        "__id__": 113
+        "__id__": 112
       }
     ],
     "_prefab": {
-      "__id__": 114
+      "__id__": 113
     },
     "_opacity": 255,
     "_color": {
@@ -4129,7 +4090,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 111
+      "__id__": 110
     },
     "_enabled": true,
     "_materials": [
@@ -4161,7 +4122,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 111
+      "__id__": 110
     },
     "_enabled": true,
     "_id": ""
@@ -4182,20 +4143,20 @@
     "_name": "get_window_light",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 110
+      "__id__": 109
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 116
+        "__id__": 115
       },
       {
-        "__id__": 117
+        "__id__": 116
       }
     ],
     "_prefab": {
-      "__id__": 118
+      "__id__": 117
     },
     "_opacity": 255,
     "_color": {
@@ -4249,7 +4210,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 115
+      "__id__": 114
     },
     "_enabled": true,
     "_materials": [
@@ -4281,7 +4242,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 115
+      "__id__": 114
     },
     "_enabled": true,
     "_defaultClip": {
@@ -4311,21 +4272,21 @@
     "_name": "bg_prize",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 110
+      "__id__": 109
     },
     "_children": [
       {
-        "__id__": 120
+        "__id__": 119
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 123
+        "__id__": 122
       }
     ],
     "_prefab": {
-      "__id__": 124
+      "__id__": 123
     },
     "_opacity": 255,
     "_color": {
@@ -4379,17 +4340,17 @@
     "_name": "图标",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 119
+      "__id__": 118
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 121
+        "__id__": 120
       }
     ],
     "_prefab": {
-      "__id__": 122
+      "__id__": 121
     },
     "_opacity": 255,
     "_color": {
@@ -4443,7 +4404,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 120
+      "__id__": 119
     },
     "_enabled": true,
     "_materials": [
@@ -4486,7 +4447,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 119
+      "__id__": 118
     },
     "_enabled": true,
     "_materials": [
@@ -4529,20 +4490,20 @@
     "_name": "获得数量",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 110
+      "__id__": 109
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 126
+        "__id__": 125
       },
       {
-        "__id__": 127
+        "__id__": 126
       }
     ],
     "_prefab": {
-      "__id__": 128
+      "__id__": 127
     },
     "_opacity": 255,
     "_color": {
@@ -4596,7 +4557,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 125
+      "__id__": 124
     },
     "_enabled": true,
     "_materials": [
@@ -4629,7 +4590,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 125
+      "__id__": 124
     },
     "_enabled": true,
     "_color": {
@@ -4658,17 +4619,17 @@
     "_name": "关闭文本",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 110
+      "__id__": 109
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 130
+        "__id__": 129
       }
     ],
     "_prefab": {
-      "__id__": 131
+      "__id__": 130
     },
     "_opacity": 255,
     "_color": {
@@ -4722,7 +4683,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 129
+      "__id__": 128
     },
     "_enabled": true,
     "_materials": [
@@ -4792,25 +4753,25 @@
     },
     "_children": [
       {
-        "__id__": 135
+        "__id__": 134
       },
       {
-        "__id__": 138
+        "__id__": 137
       },
       {
-        "__id__": 141
+        "__id__": 140
       },
       {
-        "__id__": 144
+        "__id__": 143
       },
       {
-        "__id__": 147
+        "__id__": 146
       }
     ],
     "_active": false,
     "_components": [],
     "_prefab": {
-      "__id__": 150
+      "__id__": 149
     },
     "_opacity": 255,
     "_color": {
@@ -4864,17 +4825,17 @@
     "_name": "星星",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 134
+      "__id__": 133
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 136
+        "__id__": 135
       }
     ],
     "_prefab": {
-      "__id__": 137
+      "__id__": 136
     },
     "_opacity": 255,
     "_color": {
@@ -4928,7 +4889,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 135
+      "__id__": 134
     },
     "_enabled": true,
     "_materials": [
@@ -4971,17 +4932,17 @@
     "_name": "星星",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 134
+      "__id__": 133
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 139
+        "__id__": 138
       }
     ],
     "_prefab": {
-      "__id__": 140
+      "__id__": 139
     },
     "_opacity": 255,
     "_color": {
@@ -5035,7 +4996,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 138
+      "__id__": 137
     },
     "_enabled": true,
     "_materials": [
@@ -5078,17 +5039,17 @@
     "_name": "星星",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 134
+      "__id__": 133
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 142
+        "__id__": 141
       }
     ],
     "_prefab": {
-      "__id__": 143
+      "__id__": 142
     },
     "_opacity": 255,
     "_color": {
@@ -5142,7 +5103,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 141
+      "__id__": 140
     },
     "_enabled": true,
     "_materials": [
@@ -5185,17 +5146,17 @@
     "_name": "星星",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 134
+      "__id__": 133
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 145
+        "__id__": 144
       }
     ],
     "_prefab": {
-      "__id__": 146
+      "__id__": 145
     },
     "_opacity": 255,
     "_color": {
@@ -5249,7 +5210,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 144
+      "__id__": 143
     },
     "_enabled": true,
     "_materials": [
@@ -5292,17 +5253,17 @@
     "_name": "星星",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 134
+      "__id__": 133
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 148
+        "__id__": 147
       }
     ],
     "_prefab": {
-      "__id__": 149
+      "__id__": 148
     },
     "_opacity": 255,
     "_color": {
@@ -5356,7 +5317,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 147
+      "__id__": 146
     },
     "_enabled": true,
     "_materials": [
@@ -5416,11 +5377,11 @@
     "_active": false,
     "_components": [
       {
-        "__id__": 152
+        "__id__": 151
       }
     ],
     "_prefab": {
-      "__id__": 153
+      "__id__": 152
     },
     "_opacity": 255,
     "_color": {
@@ -5474,7 +5435,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 151
+      "__id__": 150
     },
     "_enabled": true,
     "_materials": [
@@ -5634,10 +5595,10 @@
       "__id__": 104
     },
     "lbl_reward_num": {
-      "__id__": 126
+      "__id__": 125
     },
     "node_hb": {
-      "__id__": 120
+      "__id__": 119
     },
     "_id": ""
   },
@@ -5673,8 +5634,11 @@
       "__id__": 2
     },
     "open_effect": 1,
+    "isOpenCloseEffect": true,
     "close_effect": 1,
     "close_toPoint": "",
+    "close_uibg": false,
+    "isDelayOneFrame": false,
     "_id": ""
   },
   {

assets/resources/module/speedUpUI/speedUp.prefab

@@ -24,20 +24,20 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 89
+        "__id__": 92
       },
       {
-        "__id__": 90
+        "__id__": 93
       },
       {
-        "__id__": 91
+        "__id__": 94
       },
       {
-        "__id__": 92
+        "__id__": 95
       }
     ],
     "_prefab": {
-      "__id__": 93
+      "__id__": 96
     },
     "_opacity": 255,
     "_color": {
@@ -101,7 +101,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 88
+      "__id__": 91
     },
     "_opacity": 255,
     "_color": {
@@ -180,20 +180,20 @@
         "__id__": 33
       },
       {
-        "__id__": 67
+        "__id__": 70
       },
       {
-        "__id__": 70
+        "__id__": 73
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 86
+        "__id__": 89
       }
     ],
     "_prefab": {
-      "__id__": 87
+      "__id__": 90
     },
     "_opacity": 255,
     "_color": {
@@ -1279,7 +1279,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 66
+      "__id__": 69
     },
     "_opacity": 255,
     "_color": {
@@ -1343,23 +1343,20 @@
         "__id__": 38
       },
       {
-        "__id__": 42
-      },
-      {
-        "__id__": 45
+        "__id__": 48
       },
       {
-        "__id__": 55
+        "__id__": 58
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 64
+        "__id__": 67
       }
     ],
     "_prefab": {
-      "__id__": 65
+      "__id__": 68
     },
     "_opacity": 255,
     "_color": {
@@ -1517,23 +1514,94 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "提现金额",
+    "_name": "New Node",
     "_objFlags": 0,
     "_parent": {
       "__id__": 34
     },
+    "_children": [
+      {
+        "__id__": 39
+      },
+      {
+        "__id__": 43
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 46
+      }
+    ],
+    "_prefab": {
+      "__id__": 47
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 200,
+      "height": 50
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -20.239,
+        23.524,
+        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__": 38
+    },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 39
+        "__id__": 40
       },
       {
-        "__id__": 40
+        "__id__": 41
       }
     ],
     "_prefab": {
-      "__id__": 41
+      "__id__": 42
     },
     "_opacity": 255,
     "_color": {
@@ -1545,7 +1613,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 75.7,
+      "width": 50.68,
       "height": 54.4
     },
     "_anchorPoint": {
@@ -1557,8 +1625,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -92.075,
-        21.989,
+        -74.66,
+        -1.535,
         0,
         0,
         0,
@@ -1587,7 +1655,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 38
+      "__id__": 39
     },
     "_enabled": true,
     "_materials": [
@@ -1597,8 +1665,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "0.5元",
-    "_N$string": "0.5元",
+    "_string": "1元",
+    "_N$string": "1元",
     "_fontSize": 30,
     "_lineHeight": 40,
     "_enableWrapText": true,
@@ -1620,7 +1688,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 38
+      "__id__": 39
     },
     "_enabled": true,
     "_color": {
@@ -1641,7 +1709,7 @@
     "asset": {
       "__uuid__": "c24623b9-b557-420c-bf8c-8927ea736fa1"
     },
-    "fileId": "77irIQaJtOoLxI/pBGZROX",
+    "fileId": "373Qgy1lRGIaTgpZYOIFwb",
     "sync": false
   },
   {
@@ -1649,17 +1717,17 @@
     "_name": "提现进度",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 34
+      "__id__": 38
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 43
+        "__id__": 44
       }
     ],
     "_prefab": {
-      "__id__": 44
+      "__id__": 45
     },
     "_opacity": 255,
     "_color": {
@@ -1683,8 +1751,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        13.743,
-        19.239,
+        10.680000000000007,
+        -4.285,
         0,
         0,
         0,
@@ -1713,7 +1781,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 42
+      "__id__": 43
     },
     "_enabled": true,
     "_materials": [
@@ -1749,7 +1817,50 @@
     "asset": {
       "__uuid__": "c24623b9-b557-420c-bf8c-8927ea736fa1"
     },
-    "fileId": "99gkDmktNGDq8y1IdqEDvG",
+    "fileId": "8e44Dx0FRG7JjrdPMa1Xx8",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Layout",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 38
+    },
+    "_enabled": true,
+    "_layoutSize": {
+      "__type__": "cc.Size",
+      "width": 200,
+      "height": 50
+    },
+    "_resize": 0,
+    "_N$layoutType": 1,
+    "_N$cellSize": {
+      "__type__": "cc.Size",
+      "width": 40,
+      "height": 40
+    },
+    "_N$startAxis": 0,
+    "_N$paddingLeft": 0,
+    "_N$paddingRight": 0,
+    "_N$paddingTop": 0,
+    "_N$paddingBottom": 0,
+    "_N$spacingX": 8,
+    "_N$spacingY": 0,
+    "_N$verticalDirection": 1,
+    "_N$horizontalDirection": 0,
+    "_N$affectedByScale": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "c24623b9-b557-420c-bf8c-8927ea736fa1"
+    },
+    "fileId": "29snbHY9BOjKM1FcpEFLKR",
     "sync": false
   },
   {
@@ -1761,20 +1872,20 @@
     },
     "_children": [
       {
-        "__id__": 46
+        "__id__": 49
       },
       {
-        "__id__": 49
+        "__id__": 52
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 53
+        "__id__": 56
       }
     ],
     "_prefab": {
-      "__id__": 54
+      "__id__": 57
     },
     "_opacity": 255,
     "_color": {
@@ -1828,17 +1939,17 @@
     "_name": "进度条",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 45
+      "__id__": 48
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 47
+        "__id__": 50
       }
     ],
     "_prefab": {
-      "__id__": 48
+      "__id__": 51
     },
     "_opacity": 255,
     "_color": {
@@ -1892,7 +2003,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 46
+      "__id__": 49
     },
     "_enabled": true,
     "_materials": [
@@ -1935,20 +2046,20 @@
     "_name": "进度",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 45
+      "__id__": 48
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 50
+        "__id__": 53
       },
       {
-        "__id__": 51
+        "__id__": 54
       }
     ],
     "_prefab": {
-      "__id__": 52
+      "__id__": 55
     },
     "_opacity": 255,
     "_color": {
@@ -2002,7 +2113,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 49
+      "__id__": 52
     },
     "_enabled": true,
     "_materials": [
@@ -2035,7 +2146,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 49
+      "__id__": 52
     },
     "_enabled": true,
     "_color": {
@@ -2064,7 +2175,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 45
+      "__id__": 48
     },
     "_enabled": true,
     "_materials": [
@@ -2111,23 +2222,23 @@
     },
     "_children": [
       {
-        "__id__": 56
+        "__id__": 59
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 60
+        "__id__": 63
       },
       {
-        "__id__": 61
+        "__id__": 64
       },
       {
-        "__id__": 62
+        "__id__": 65
       }
     ],
     "_prefab": {
-      "__id__": 63
+      "__id__": 66
     },
     "_opacity": 255,
     "_color": {
@@ -2181,20 +2292,20 @@
     "_name": "描述",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 55
+      "__id__": 58
     },
     "_children": [],
     "_active": false,
     "_components": [
       {
-        "__id__": 57
+        "__id__": 60
       },
       {
-        "__id__": 58
+        "__id__": 61
       }
     ],
     "_prefab": {
-      "__id__": 59
+      "__id__": 62
     },
     "_opacity": 255,
     "_color": {
@@ -2248,7 +2359,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 56
+      "__id__": 59
     },
     "_enabled": true,
     "_materials": [
@@ -2281,7 +2392,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 56
+      "__id__": 59
     },
     "_enabled": true,
     "_color": {
@@ -2310,7 +2421,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 55
+      "__id__": 58
     },
     "_enabled": true,
     "_materials": [
@@ -2342,7 +2453,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 55
+      "__id__": 58
     },
     "_enabled": true,
     "_defaultClip": {
@@ -2361,7 +2472,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 55
+      "__id__": 58
     },
     "_enabled": true,
     "panel_name": "module/newCashUI/walletCashOut",
@@ -2447,11 +2558,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 68
+        "__id__": 71
       }
     ],
     "_prefab": {
-      "__id__": 69
+      "__id__": 72
     },
     "_opacity": 255,
     "_color": {
@@ -2505,7 +2616,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 67
+      "__id__": 70
     },
     "_enabled": true,
     "_materials": [
@@ -2553,26 +2664,26 @@
     },
     "_children": [
       {
-        "__id__": 71
+        "__id__": 74
       },
       {
-        "__id__": 74
+        "__id__": 77
       },
       {
-        "__id__": 78
+        "__id__": 81
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 82
+        "__id__": 85
       },
       {
-        "__id__": 83
+        "__id__": 86
       }
     ],
     "_prefab": {
-      "__id__": 85
+      "__id__": 88
     },
     "_opacity": 255,
     "_color": {
@@ -2626,17 +2737,17 @@
     "_name": "video_icon",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 70
+      "__id__": 73
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 72
+        "__id__": 75
       }
     ],
     "_prefab": {
-      "__id__": 73
+      "__id__": 76
     },
     "_opacity": 255,
     "_color": {
@@ -2690,7 +2801,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 71
+      "__id__": 74
     },
     "_enabled": true,
     "_materials": [
@@ -2733,20 +2844,20 @@
     "_name": "add_window_btn_byte_0",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 70
+      "__id__": 73
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 75
+        "__id__": 78
       },
       {
-        "__id__": 76
+        "__id__": 79
       }
     ],
     "_prefab": {
-      "__id__": 77
+      "__id__": 80
     },
     "_opacity": 255,
     "_color": {
@@ -2800,7 +2911,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 74
+      "__id__": 77
     },
     "_enabled": true,
     "_materials": [
@@ -2810,8 +2921,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "立即拓建",
-    "_N$string": "立即拓建",
+    "_string": "立即加速",
+    "_N$string": "立即加速",
     "_fontSize": 36,
     "_lineHeight": 40,
     "_enableWrapText": true,
@@ -2833,7 +2944,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 74
+      "__id__": 77
     },
     "_enabled": true,
     "_color": {
@@ -2862,20 +2973,20 @@
     "_name": "hb",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 70
+      "__id__": 73
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 79
+        "__id__": 82
       },
       {
-        "__id__": 80
+        "__id__": 83
       }
     ],
     "_prefab": {
-      "__id__": 81
+      "__id__": 84
     },
     "_opacity": 255,
     "_color": {
@@ -2929,7 +3040,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 78
+      "__id__": 81
     },
     "_enabled": true,
     "_materials": [
@@ -2961,7 +3072,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 78
+      "__id__": 81
     },
     "_enabled": true,
     "_defaultClip": {
@@ -2991,7 +3102,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 70
+      "__id__": 73
     },
     "_enabled": true,
     "_materials": [
@@ -3023,7 +3134,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 70
+      "__id__": 73
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -3032,7 +3143,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 84
+        "__id__": 87
       }
     ],
     "_N$interactable": true,
@@ -3238,16 +3349,16 @@
     },
     "_enabled": true,
     "lbl_reward_value": {
-      "__id__": 39
+      "__id__": 40
     },
     "spr_cash_out": {
-      "__id__": 47
+      "__id__": 50
     },
     "lbl_progress": {
-      "__id__": 50
+      "__id__": 53
     },
     "node_cash": {
-      "__id__": 61
+      "__id__": 64
     },
     "lbl_remainTimes": null,
     "_id": ""

assets/script/before/main/TouchHelper.ts

@@ -55,10 +55,10 @@ export class TouchHelper extends cc.Component {
     }
     private onTouchMove(e: cc.Event.EventTouch) {
         if (e.getTouches().length > 1) { this.isMoved = true; return }
-        //this.isMoved = cc.Vec2.distance(e.getStartLocation(), e.getLocation()) > 20;
-        let touchPoint = e.getLocation();
-        let localPoint = this.node.convertToNodeSpaceAR(touchPoint);
-        this.isMoved = cc.Intersection.pointInPolygon(localPoint, this.points);//!this.pointInPoly(localPoint, this.points);
+        this.isMoved = cc.Vec2.distance(e.getStartLocation(), e.getLocation()) > 20;
+        //let touchPoint = e.getLocation();
+        //let localPoint = this.node.convertToNodeSpaceAR(touchPoint);
+        //this.isMoved = !cc.Intersection.pointInPolygon(localPoint, this.points);//!this.pointInPoly(localPoint, this.points);
         
 
         if(this.isScaleAct && this.isMoved)

assets/script/game/data/GData.ts

@@ -32,6 +32,7 @@ import HarvestData from "../../before/view/data/HarvestData";
 import ADClearSickData from "../../before/view/data/ADClearSickData";
 import PastureSystem from "../../before/main/PastureSystem";
 import FactorySystem from "../../before/main/FactorySystem";
+import { FarmMapData } from "./module/FarmMapData";
 
 /**
  * 数据集合全局类
@@ -88,6 +89,7 @@ class GData {
     public adClearSickData: ADClearSickData;
     public pastureSystem: PastureSystem;
     public factorySystem: FactorySystem;
+    public farmMapData: FarmMapData;
 
     public moduleData: Map<number, Data>;
 
@@ -128,6 +130,7 @@ class GData {
         this.factorySystem = new FactorySystem();
 
         this.farmSystem = new FarmSystem();
+        this.farmMapData = new FarmMapData();
 
         this.moduleData = new Map<number, Data>();
         this.moduleData.set(Fun.moreGame, this.moreGame);

assets/script/game/data/GameData.ts

@@ -143,7 +143,7 @@ export class GameData {
         this.gameData.initPiggyBank(res_data.piggyBank);
         this.gameData.piggyBankCashTimes = res_data.piggyBankCashTimes;
         this.gameData.redMoney = res_data.redMoney == null ? 0 : res_data.redMoney;
-        this.gameData.signInDay = 8;//res_data.signInDay;
+        this.gameData.signInDay = res_data.signInDay;
         this.gameData.totalPiggyBankCashTimes = res_data.totalPiggyBankCashTimes;
         this.gameData.turntableTimes = res_data.turntableTimes;
         this.gameData.userTuCaoInfo = res_data.userTuCaoInfo;
@@ -220,6 +220,7 @@ export class GameData {
         this.setFactoryDataMapByServer();
         this.initSetMaxProduct();
         this.initLeftTimes();
+        this.initFarmMapGetRewardData();
     }
 
     private initLeftTimes() {
@@ -238,6 +239,78 @@ export class GameData {
         this.ProductionRecovery = 1;
     }
 
+    //图鉴领取数据
+    private _farmMapRewardData = [];
+
+    public getFarmMapRewardState(index)
+    {
+        
+        if(index.i < this._farmMapRewardData.length)
+        {
+            if(index.j < this._farmMapRewardData[index.i].length)
+            {
+                return this._farmMapRewardData[index.i][index.j];
+            }
+        }
+        return 1;
+    }
+
+    public setFarmMapRewardState(index, state)
+    {
+        if(index.i < this._farmMapRewardData.length)
+        {
+            if(index.j < this._farmMapRewardData[index.i].length)
+            {
+                this._farmMapRewardData[index.i][index.j] = state;
+                this.setProp(GameProp.farmMapGetRewardData, this._farmMapRewardData);
+            }
+        }
+    }
+    
+    private initFarmMapGetRewardData()
+    {
+        this._farmMapRewardData = this.getProp(GameProp.farmMapGetRewardData);
+        if(!this._farmMapRewardData)
+        {
+            this._farmMapRewardData = [];
+        }
+        let needSync = false;
+        let index = 0;
+        this._productTypeMap.forEach((value, key)=>{
+
+            if(this._farmMapRewardData.length <= index)
+            {
+                let len = value.length;
+                let arr = [];
+                for(let i = 0; i != len; ++i)
+                {
+                    arr.push(0);
+                }
+                this._farmMapRewardData.push(arr);
+                needSync = true;
+                console.log("-----add 数组数据")
+            }else
+            {
+                let data = this._farmMapRewardData[index];
+                let len = value.length;
+                for(let i = 0; i != len; ++i)
+                {
+                    if(i >= data.length)
+                    {
+                        data.push(0);
+                        needSync = true;
+                        console.log("-----add 单个数据")
+                    }
+                }
+            }       
+            ++index;
+        });
+        if(needSync)
+        {
+            this.setProp(GameProp.farmMapGetRewardData, this._farmMapRewardData);
+        }
+    }
+
     /**
      * 第二天需要重置的数据
      */
@@ -802,6 +875,10 @@ export enum GameProp {
     /** 剩余可种植次数 */
     leftTimes = 16,
 
+    /**
+     图鉴领取数据*/
+     farmMapGetRewardData = 17,
+
 
 
     /** ------------------ 转盘数据 ------------------------------ */

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

@@ -3,11 +3,24 @@
  */
 
 import { Data } from "../../../mk/data/Data";
+import { ProductType } from "../GameData";
+
 
 export class FarmMapData extends Data{
 
+    public chooseType: ProductType = ProductType.nzw;
+    public maxUnluckValue: any;
+
+    public isStateChange:boolean = false;
+
     init()
     {
         
     }
+
+    setChooseType(t: ProductType)
+    {
+        this.chooseType = t;
+        this.maxUnluckValue = gData.gameData.getMaxProduct(t);
+    }
 }

assets/script/game/game/Farmer.ts

@@ -23,7 +23,7 @@ export class Farmer extends cc.Component {
 
         this.clips = this.animation.getClips();
 
-        this.refreshTime = 2.5;
+        this.refreshTime = 10;
         this.redMoneyNum = 3;
     }
     update(dt) {
@@ -46,7 +46,7 @@ return;
         {
             this.refreshTime -= dt;
         }else{
-            this.refreshTime = 2.5;
+            this.refreshTime = 10;
             mk.fly.PlayCoinAnim(1, 3, this.fly_node, '', null,2);
         }
     }

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

@@ -130,7 +130,8 @@ export default class BlessingBag extends cc.Component {
                 break;            
             }
         }
-        if(isAllComplete || data.leftVideoTimes <= 0)
+        //if(isAllComplete || data.leftVideoTimes <= 0)
+        if(isAllComplete)
         {
             this.video_btn.interactable = false;
             let cmp = this.video_btn.getComponent(SetGray);
@@ -248,7 +249,7 @@ export default class BlessingBag extends cc.Component {
             //免费加进度
             gData.blessingBag.addProgress();
         } else {
-            if (gData.blessingBag.videoRbData.leftVideoTimes > 0) {
+            //if (gData.blessingBag.videoRbData.leftVideoTimes > 0) {
                 mk.ad.videoAdType = VideoAdType.Fudai;
                 mk.ad.watchAd((success: boolean) => {
                     mk.console.log("watchAD:" + success);
@@ -257,9 +258,9 @@ export default class BlessingBag extends cc.Component {
                         //gData.adData.watchVideo(AdFun.bigCash)
                     }
                 });
-            } else {             
-                mk.tip.pop('今日观看次数已用完');
-            }
+            //} else {             
+                //mk.tip.pop('今日观看次数已用完');
+            //}
         }
         mk.audio.playEffect('button');
 

assets/script/game/module/farmMap/FarmItem.ts

@@ -1,3 +1,4 @@
+import { ProductType } from "../../data/GameData";
 
 const { ccclass, property } = cc._decorator;
 @ccclass
@@ -24,21 +25,151 @@ export default class FarmItem extends cc.Component{
     @property({displayName: '红点', type: cc.Node})
     private node_redPoint: cc.Node = null;
 
+    private data = null;
 
     public setItemData(data)
     {
-        //this.InitUI(data);
+        this.InitUI(data);
     }
 
     private async InitUI(data)
     {
+        this.data = data;
+        let plantPath = '';
+        let namePath = '';
+        if (gData.farmMapData.chooseType == ProductType.nzw) {
+            plantPath = 'game/coregame/texture/plant_icons/plantIcon_';
+            namePath = 'game/coregame/texture/plant_icons/nameIcon/plant_name_';        
+        }
+        else {
+            plantPath = 'game/coregame/texture/factory_icons/factory_';
+            namePath = 'game/coregame/texture/factory_icons/factoryNams/factory_name_icon_';
+        }
+    
+        let max = gData.farmMapData.maxUnluckValue;     
+        if(data.picture <= max)
+        {
+            this.sp_icon.spriteFrame = await mk.loader.load(plantPath + data.picture, cc.SpriteFrame);
+            this.lbl_nameDes.node.active = true;
+            this.lbl_nameDes.string = `Lv.${data.name} ${data.time}秒成熟`;
+            this.lbl_des.string = `最高收获${data.MenuredBagCoin}红包币`;
+            
+            let state = gData.gameData.getFarmMapRewardState(this.getIndex());
+            if(state == 1)
+            {
+                this.node_getBtn.active =true;
+                this.node_ungetBtn.active = false;
+                this.node_unluckBtn.active = false;
+                this.node_redPoint.active = false;
+            }else{
+                this.node_getBtn.active =false;
+                this.node_ungetBtn.active = true;
+                this.node_unluckBtn.active = false;
+                this.node_redPoint.active = true;
+            }
+
+        }else if(data.picture -1 == max)
+        {
+            this.sp_icon.spriteFrame = await mk.loader.load('module/farmMap/texture/gift', cc.SpriteFrame);
+            let times = gData.gameData.getProductMakeTimesById(data.picture - 1);
+            let plantName = gData.gameData.getProductMap(data.picture - 1).name;
+            let des = this.getDesByType();
+            this.lbl_des.string = `${des}${this.data.value}次${plantName}后解锁(${times}/${data.value})`;;
+
+            this.node_getBtn.active =false;
+            this.node_ungetBtn.active = false;
+            this.node_unluckBtn.active = true;
+            this.lbl_nameDes.node.active = false;
+            this.node_redPoint.active = false;
+        }else
+        {
+            this.sp_icon.spriteFrame = await mk.loader.load('module/farmMap/texture/gift', cc.SpriteFrame);
+            this.lbl_des.string = "神秘物种，等待发现";
+            this.node_getBtn.active =false;
+            this.node_ungetBtn.active = false;
+            this.node_unluckBtn.active = true;
+            this.lbl_nameDes.node.active = false;
+            this.node_redPoint.active = false;
+        }
+        
+    }
 
-        this.sp_icon.spriteFrame = await mk.loader.load('module/turnable/texture/hb' + 1, cc.SpriteFrame);
+    getIndex()
+    {
+        let index: any = {};
+        index.i = 0;
+        index.j = 0;
+        switch(this.data.tab)
+        {
+            case '农作物':
+                index.i = 0;
+                index.j = this.data.picture - 10001;
+                break;
+            case '动物':
+                index.i = 1;
+                index.j = this.data.picture - 20001;
+                break;
+            case '爆米花厂':
+                index.i = 2;
+                index.j = this.data.picture - 20004;
+                break;
+            case '糕点铺':
+                index.i = 3;
+                index.j = this.data.picture - 20013;
+                break;
+            case '制糖厂':
+                index.i = 4;
+                index.j = this.data.picture - 20010;
+                break;
+            case '炼乳厂':
+                index.i = 5;
+                index.j = this.data.picture - 20007;
+                break;
+            case '功夫面馆':
+                index.i = 6;
+                index.j = this.data.picture - 20025;
+                break;
+            case '快餐店':
+                index.i = 7;
+                index.j = this.data.picture - 20019;
+                break;
+        }
+
+        return index;
+    }
+
+    getDesByType() {
+        let des = ''
+        switch (this.data.tab) {
+            case '农作物':
+                des = '种植';
+                break;
+            case '动物':
+                des = '养殖';
+                break;
+            case '爆米花厂':
+            case '糕点铺':
+            case '制糖厂':
+            case '炼乳厂':
+            case '功夫面馆':
+            case '快餐店':
+                des = '制作';
+                break;
+        }
+
+        return des;
     }
 
     private clickUnGetRewardBtn(){
         mk.audio.playEffect("button");
 
+
+        gData.farmMapData.isStateChange = true;
+        this.node_getBtn.active =true;
+        this.node_ungetBtn.active = false;
+        this.node_unluckBtn.active = false;
+        this.node_redPoint.active = false;
+        gData.gameData.setFarmMapRewardState(this.getIndex(), 1);
     }
 
     private clickUnluckBtn(){

assets/script/game/module/farmMap/FarmMap.ts

@@ -1,4 +1,5 @@
 import TableView from "../../component/TableView";
+import { ProductType } from "../../data/GameData";
 import ItemName from "./ItemName";
 
 const { ccclass, property } = cc._decorator;
@@ -23,22 +24,116 @@ export default class FarmMap extends cc.Component{
 
     start(){
 
-        let list_data = [{}, {}, {}, {}, {}, {}, {}];
+        gData.farmMapData.setChooseType(ProductType.nzw);
+
+        let list_data = gData.gameData.getProductArrByType(ProductType.nzw);
+        //let list_data = [{}, {}, {}, {}, {}, {}];
         this.scroll_view.node.emit('srollview-init', list_data)
 
-        cc.tween(this.node).delay(0.2).call(()=>{
+        cc.tween(this.node).delay(0.1).call(()=>{
+            this.scroll_view.vertical = false;
+        }).delay(0.1).call(()=>{
             let allItem = this.tableview.getFrontPositionItemByCount(5);
             
             for(let i = 0; i != allItem.length; ++i)
             {
                 allItem[i].active = true;
-                allItem[i].setPosition(allItem[i].position.x + 600, allItem[i].position.y);
-                cc.tween(allItem[i]).delay(i*0.1 + 0.2).by(0.3, {x: -600}, cc.easeSineOut()).start();
+                allItem[i].x = 600;
+                cc.tween(allItem[i]).delay(i*0.1 + 0.2).to(0.3, {x: 0}, cc.easeSineOut()).start();
             }
+        }).delay(1).call(()=>{
+            this.scroll_view.vertical = true;
         }).start();
         
         //this.itemName[1].toggle.interactable = false;
+        this.refreshBtnState();
+    }
 
+
+    private refreshBtnState()
+    {
+        let index= 0;
+        for(let key in ProductType)
+        {
+            let max = gData.gameData.getMaxProduct(ProductType[key]);
+            if(max)
+            {
+                this.itemName[index].toggle.interactable = true;
+                let list_data = gData.gameData.getProductArrByType(ProductType[key]);
+                let isShowRed = false;
+                for(let i = 0; i != list_data.length; ++i)
+                {
+                    if(list_data[i].picture <= max)
+                    {
+                        let state = gData.gameData.getFarmMapRewardState(this.getIndex(list_data[i]));
+                        if(state == 0)
+                        {                         
+                            isShowRed = true;
+                            break;
+                        }
+                    }
+                }
+                this.itemName[index].setShowUIState(false, isShowRed);
+
+            }else{
+                this.itemName[index].toggle.interactable = false;    
+                this.itemName[index].setShowUIState(true, false);       
+            }
+            ++index;
+        }
+    }
+
+    update(dt)
+    {
+        if(gData.farmMapData.isStateChange)
+        {
+            this.refreshBtnState();
+            gData.farmMapData.isStateChange = false;
+        }
+    }
+
+    getIndex(data)
+    {
+        let index:any = {};
+        index.i = 0;
+        index.j = 0;
+        switch(data.tab)
+        {
+            case '农作物':
+                index.i = 0;
+                index.j = data.picture - 10001;
+                break;
+            case '动物':
+                index.i = 1;
+                index.j = data.picture - 20001;
+                break;
+            case '爆米花厂':
+                index.i = 2;
+                index.j = data.picture - 20004;
+                break;
+            case '糕点铺':
+                index.i = 3;
+                index.j = data.picture - 20013;
+                break;
+            case '制糖厂':
+                index.i = 4;
+                index.j = data.picture - 20010;
+                break;
+            case '炼乳厂':
+                index.i = 5;
+                index.j = data.picture - 20007;
+                break;
+            case '功夫面馆':
+                index.i = 6;
+                index.j = data.picture - 20025;
+                break;
+            case '快餐店':
+                index.i = 7;
+                index.j = data.picture - 20019;
+                break;
+        }
+
+        return index;
     }
 
 
@@ -50,34 +145,48 @@ export default class FarmMap extends cc.Component{
             return;
 
         this.curChooseId = id;
+        let list_data:any;
         switch(id)
         {
             case 1:
-                let list_data = [{}, {}, {}, {}, {}, {}];
-                this.scroll_view.node.emit('srollview-init', list_data)
+                gData.farmMapData.setChooseType(ProductType.nzw);
+                list_data = gData.gameData.getProductArrByType(ProductType.nzw);            
                 break;
             case 2:
-                list_data = [{}, {}, {}, {}, {}, {}, {}, {}];
-                this.scroll_view.node.emit('srollview-init', list_data)
+                gData.farmMapData.setChooseType(ProductType.dw);
+                list_data = gData.gameData.getProductArrByType(ProductType.dw);           
                 break;
             case 3:
-                list_data = [{}, {}, {}, {}, {}, {}, {}, {}, {}];
-                this.scroll_view.node.emit('srollview-init', list_data)
+                gData.farmMapData.setChooseType(ProductType.bmhc);
+                list_data = gData.gameData.getProductArrByType(ProductType.bmhc);           
                 break;
             case 4:
+                gData.farmMapData.setChooseType(ProductType.gdp);
+                list_data = gData.gameData.getProductArrByType(ProductType.gdp);
+                
                 break;
             case 5:
+                gData.farmMapData.setChooseType(ProductType.ztc);              
+                list_data = gData.gameData.getProductArrByType(ProductType.ztc);
                 break;
             case 6:
+                gData.farmMapData.setChooseType(ProductType.lrc);                    
+                list_data = gData.gameData.getProductArrByType(ProductType.lrc);
                 break;
             case 7:
+                gData.farmMapData.setChooseType(ProductType.gfmg);                
+                list_data = gData.gameData.getProductArrByType(ProductType.gfmg);
                 break;
             case 8:
+                gData.farmMapData.setChooseType(ProductType.kcd);   
+                list_data = gData.gameData.getProductArrByType(ProductType.kcd);
                 break;
             default:
                 break;
 
         }
+
+        this.scroll_view.node.emit('srollview-init', list_data)
     }
 
     private clickCloseBtn(){

assets/script/game/module/farmMap/ItemName.ts

@@ -9,8 +9,8 @@ export default class ItemName extends cc.Component{
     @property({displayName: '名字', type: cc.Label})
     public lbl_name: cc.Label = null;
 
-    @property({displayName: '是否解锁标识', type: cc.Sprite})
-    public sp_luck: cc.Sprite = null;
+    @property({displayName: '是否解锁标识', type: cc.Node})
+    public sp_luck: cc.Node = null;
 
     @property({displayName: '红点', type: cc.Node})
     public node_redPoint: cc.Node = null;
@@ -24,4 +24,10 @@ export default class ItemName extends cc.Component{
     {
 
     }
+
+    setShowUIState(luck: boolean, showRedPoint: boolean)
+    {
+        this.sp_luck.active = luck;
+        this.node_redPoint.active = showRedPoint;
+    }
 }

assets/script/game/module/newOpenRedBag/NewOpenRedBag.ts

@@ -10,6 +10,15 @@ export default class NewOpenRedBag extends cc.Component{
     @property({displayName: '数字组', type: cc.Label})
     private lbl_value: cc.Label[] = [];
 
+    @property(cc.Label)
+    private lbl_reward_value: cc.Label = null;
+    @property(cc.Sprite)
+    private spr_cash_out:  cc.Sprite = null;
+    @property(cc.Label)
+    private lbl_progress: cc.Label = null;
+    @property(cc.Animation)
+    private node_cash: cc.Animation = null;
+
     start(){
         this.showChangePart();
 
@@ -23,6 +32,26 @@ export default class NewOpenRedBag extends cc.Component{
         }
     }
 
+    /**
+     * 底部提现相关样式
+     */
+     private initCashOutStyle(redMoney: number = 0) {
+        const cash_bar = gData.redBagCash.cash_bar;
+        let cash_data = gData.redBagCash.getItemDataByIndex(cash_bar);
+        if (!cash_data) return;
+        const newRedMoney = redMoney > cash_data.type_value ? cash_data.type_value : redMoney;
+        this.lbl_reward_value.string = cash_data.money / 100 + '元';
+        this.lbl_progress.string = newRedMoney + '/' + cash_data.type_value;
+        const fillRange = newRedMoney / cash_data.type_value >= 1 ? 1 : newRedMoney / cash_data.type_value;
+        // this.spr_cash_out.fillRange = fillRange;
+        cc.tween(this.spr_cash_out).to(fillRange, { fillRange: fillRange }).start();
+        if (redMoney >= cash_data.type_value) {
+            this.node_cash.play();
+        } else {
+            this.node_cash.stop();
+        }
+    }
+
     private showWatchAdReward()
     {
         if(gData.reward.adData)
@@ -56,7 +85,7 @@ export default class NewOpenRedBag extends cc.Component{
 
     private clickOpenBtn(){
         mk.audio.playEffect("button");
-
+        mk.ui.closePanel(this.name);
         mk.ad.videoAdType = VideoAdType.StartQiPaoRedBag;
         mk.ad.watchAd((success: boolean) => {
             mk.console.log("watchAD:" + success);

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

@@ -49,7 +49,7 @@ export default class Sign extends cc.Component {
         this.tableview.contentMoveByIndex(index, 0.01);    
         cc.tween(this.node).delay(0.1).call(()=>{
             this.scroll_view.vertical = false;
-        }).delay(0.1).call(()=>{
+        }).call(()=>{
             let allItem = this.tableview.getItemByIndexAndCount(index, 3);
             allItem && allItem.sort((a, b)=>{
 
@@ -61,7 +61,7 @@ export default class Sign extends cc.Component {
                 allItem[i].active = true;
                 let posY = allItem[i].position.y
                 allItem[i].y = posY - 600;
-                cc.tween(allItem[i]).delay(i*0.1).to(0.3, {y: posY}).start();
+                cc.tween(allItem[i]).delay(i*0.1).to(0.3, {y: posY}, cc.easeSineOut()).start();
             }
             console.log("---");
         }).delay(0.7).call(()=>{

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

@@ -85,7 +85,7 @@ export default class Turnable extends cc.Component {
     }
 
     private async play(type) {
-        this.audioId = await mk.audio.playEffect("turnableplay", true);
+        //this.audioId = await mk.audio.playEffect("turnableplay", true);
         this.btn_close.getComponent(BtnClosePanel).block_click = true;
         //停止转动动作
         if(this.act_rotate)
@@ -127,7 +127,7 @@ export default class Turnable extends cc.Component {
     private async playOver() {
         mk.audio.stopEffect(this.audioId);
         this.btn_close.getComponent(BtnClosePanel).block_click = false;
-        mk.audio.playEffect("turnplateDrawEnd");
+        //mk.audio.playEffect("turnplateDrawEnd");
         this.updateLeftTimes();
         this.node_point.runAction(cc.blink(0.7, 3));
         await mk.time.WaitForSeconds(0.7);