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

# Conflicts:
#	assets/script/game/game/Game.ts

assets/resources/animation/Main.meta

@@ -1,12 +0,0 @@
-{
-  "ver": "1.1.2",
-  "uuid": "f7bacbfe-36b6-4d58-a67c-2bd784f014d1",
-  "isBundle": false,
-  "bundleName": "",
-  "priority": 1,
-  "compressionType": {},
-  "optimizeHotUpdate": {},
-  "inlineSpriteFrames": {},
-  "isRemoteBundle": {},
-  "subMetas": {}
-}

assets/resources/game/prefab/uiPanel/ADClearSickPanel.prefab

@@ -1017,9 +1017,9 @@
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 253,
-      "g": 255,
-      "b": 229,
+      "r": 255,
+      "g": 251,
+      "b": 237,
       "a": 255
     },
     "_contentSize": {
@@ -1081,11 +1081,13 @@
     "_fontSize": 36,
     "_lineHeight": 40,
     "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
+    "_N$file": {
+      "__uuid__": "b47819b5-a9ec-4916-8909-db422f79bbb7"
+    },
+    "_isSystemFontUsed": false,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 1,
+    "_styleFlags": 0,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 0,
     "_N$verticalAlign": 0,
@@ -1104,9 +1106,9 @@
     "_enabled": true,
     "_color": {
       "__type__": "cc.Color",
-      "r": 182,
-      "g": 100,
-      "b": 19,
+      "r": 178,
+      "g": 77,
+      "b": 18,
       "a": 255
     },
     "_width": 3,

assets/resources/game/prefab/uiPanel/ADUnlockPanel.prefab

@@ -1017,9 +1017,9 @@
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 253,
-      "g": 255,
-      "b": 229,
+      "r": 255,
+      "g": 251,
+      "b": 237,
       "a": 255
     },
     "_contentSize": {
@@ -1081,8 +1081,10 @@
     "_fontSize": 36,
     "_lineHeight": 40,
     "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
+    "_N$file": {
+      "__uuid__": "b47819b5-a9ec-4916-8909-db422f79bbb7"
+    },
+    "_isSystemFontUsed": false,
     "_spacingX": 0,
     "_batchAsBitmap": false,
     "_styleFlags": 1,
@@ -1104,9 +1106,9 @@
     "_enabled": true,
     "_color": {
       "__type__": "cc.Color",
-      "r": 182,
-      "g": 100,
-      "b": 19,
+      "r": 178,
+      "g": 77,
+      "b": 18,
       "a": 255
     },
     "_width": 3,

assets/resources/game/prefab/uiPanel/HarvestPanel.prefab

@@ -24,17 +24,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 65
+        "__id__": 73
       },
       {
-        "__id__": 67
+        "__id__": 75
       },
       {
-        "__id__": 68
+        "__id__": 76
       }
     ],
     "_prefab": {
-      "__id__": 69
+      "__id__": 77
     },
     "_opacity": 255,
     "_color": {
@@ -98,7 +98,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 64
+      "__id__": 72
     },
     "_opacity": 255,
     "_color": {
@@ -165,11 +165,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 62
+        "__id__": 70
       }
     ],
     "_prefab": {
-      "__id__": 63
+      "__id__": 71
     },
     "_opacity": 255,
     "_color": {
@@ -437,7 +437,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 61
+      "__id__": 69
     },
     "_opacity": 255,
     "_color": {
@@ -1059,17 +1059,17 @@
         "__id__": 27
       },
       {
-        "__id__": 42
+        "__id__": 46
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 59
+        "__id__": 67
       }
     ],
     "_prefab": {
-      "__id__": 60
+      "__id__": 68
     },
     "_opacity": 255,
     "_color": {
@@ -1130,17 +1130,17 @@
         "__id__": 28
       },
       {
-        "__id__": 36
+        "__id__": 40
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 39
+        "__id__": 43
       }
     ],
     "_prefab": {
-      "__id__": 41
+      "__id__": 45
     },
     "_opacity": 255,
     "_color": {
@@ -1199,19 +1199,22 @@
     "_children": [
       {
         "__id__": 29
+      },
+      {
+        "__id__": 32
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 32
+        "__id__": 36
       },
       {
-        "__id__": 33
+        "__id__": 37
       }
     ],
     "_prefab": {
-      "__id__": 35
+      "__id__": 39
     },
     "_opacity": 255,
     "_color": {
@@ -1268,7 +1271,7 @@
       "__id__": 28
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 30
@@ -1368,6 +1371,137 @@
     "sync": false
   },
   {
+    "__type__": "cc.Node",
+    "_name": "New Label",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 28
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 33
+      },
+      {
+        "__id__": 34
+      }
+    ],
+    "_prefab": {
+      "__id__": 35
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 251,
+      "b": 237,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 118,
+      "height": 56.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        3,
+        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__": 32
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "普通领取",
+    "_N$string": "普通领取",
+    "_fontSize": 28,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": {
+      "__uuid__": "b47819b5-a9ec-4916-8909-db422f79bbb7"
+    },
+    "_isSystemFontUsed": false,
+    "_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.LabelOutline",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 32
+    },
+    "_enabled": true,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 87,
+      "g": 144,
+      "b": 23,
+      "a": 255
+    },
+    "_width": 3,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "04dd6ff2-c365-488b-9c49-8994289ce473"
+    },
+    "fileId": "a5F7Bw0nZBwJ5YZNDyuukR",
+    "sync": false
+  },
+  {
     "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
@@ -1413,7 +1547,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 34
+        "__id__": 38
       }
     ],
     "_N$interactable": true,
@@ -1503,11 +1637,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 37
+        "__id__": 41
       }
     ],
     "_prefab": {
-      "__id__": 38
+      "__id__": 42
     },
     "_opacity": 255,
     "_color": {
@@ -1561,7 +1695,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 36
+      "__id__": 40
     },
     "_enabled": true,
     "_materials": [
@@ -1613,7 +1747,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 40
+        "__id__": 44
       }
     ],
     "_N$interactable": true,
@@ -1701,23 +1835,23 @@
     },
     "_children": [
       {
-        "__id__": 43
+        "__id__": 47
       },
       {
-        "__id__": 52
+        "__id__": 60
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 55
+        "__id__": 63
       },
       {
-        "__id__": 57
+        "__id__": 65
       }
     ],
     "_prefab": {
-      "__id__": 58
+      "__id__": 66
     },
     "_opacity": 255,
     "_color": {
@@ -1771,24 +1905,27 @@
     "_name": "noraml_btn",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 42
+      "__id__": 46
     },
     "_children": [
       {
-        "__id__": 44
+        "__id__": 48
       },
       {
-        "__id__": 47
+        "__id__": 51
+      },
+      {
+        "__id__": 55
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 50
+        "__id__": 58
       }
     ],
     "_prefab": {
-      "__id__": 51
+      "__id__": 59
     },
     "_opacity": 255,
     "_color": {
@@ -1842,17 +1979,17 @@
     "_name": "hav_btn_byte_0",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 43
+      "__id__": 47
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
-        "__id__": 45
+        "__id__": 49
       }
     ],
     "_prefab": {
-      "__id__": 46
+      "__id__": 50
     },
     "_opacity": 255,
     "_color": {
@@ -1906,7 +2043,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 44
+      "__id__": 48
     },
     "_enabled": true,
     "_materials": [
@@ -1946,20 +2083,151 @@
   },
   {
     "__type__": "cc.Node",
+    "_name": "New Label",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 47
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 52
+      },
+      {
+        "__id__": 53
+      }
+    ],
+    "_prefab": {
+      "__id__": 54
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 251,
+      "b": 237,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 118,
+      "height": 56.4
+    },
+    "_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.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 51
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "超级加倍",
+    "_N$string": "超级加倍",
+    "_fontSize": 28,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": {
+      "__uuid__": "b47819b5-a9ec-4916-8909-db422f79bbb7"
+    },
+    "_isSystemFontUsed": false,
+    "_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.LabelOutline",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 51
+    },
+    "_enabled": true,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 178,
+      "g": 77,
+      "b": 18,
+      "a": 255
+    },
+    "_width": 3,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "04dd6ff2-c365-488b-9c49-8994289ce473"
+    },
+    "fileId": "8bZxjA9hZAQ45xUijpWtQx",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
     "_name": "video_icon",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 43
+      "__id__": 47
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 48
+        "__id__": 56
       }
     ],
     "_prefab": {
-      "__id__": 49
+      "__id__": 57
     },
     "_opacity": 255,
     "_color": {
@@ -2013,7 +2281,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 47
+      "__id__": 55
     },
     "_enabled": true,
     "_materials": [
@@ -2056,7 +2324,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 43
+      "__id__": 47
     },
     "_enabled": true,
     "_materials": [
@@ -2099,17 +2367,17 @@
     "_name": "hav_btn_byte_2",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 42
+      "__id__": 46
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 53
+        "__id__": 61
       }
     ],
     "_prefab": {
-      "__id__": 54
+      "__id__": 62
     },
     "_opacity": 255,
     "_color": {
@@ -2163,7 +2431,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 52
+      "__id__": 60
     },
     "_enabled": true,
     "_materials": [
@@ -2206,7 +2474,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 42
+      "__id__": 46
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -2215,7 +2483,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 56
+        "__id__": 64
       }
     ],
     "_N$interactable": true,
@@ -2288,7 +2556,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 42
+      "__id__": 46
     },
     "_enabled": true,
     "_defaultClip": {
@@ -2442,7 +2710,7 @@
     "bClickClose": true,
     "onComplete": [
       {
-        "__id__": 66
+        "__id__": 74
       }
     ],
     "_id": ""

assets/resources/module/blessingBag/blessingBag.prefab

@@ -1228,7 +1228,7 @@
     "asset": {
       "__uuid__": "94760687-648e-4d1f-ac2f-169b0dc625d9"
     },
-    "fileId": "60kqw4+hBBJa6KywtvrR3V",
+    "fileId": "48HjrawgRDq6QW1T26T3Hx",
     "sync": false
   },
   {
@@ -1358,7 +1358,7 @@
     "asset": {
       "__uuid__": "94760687-648e-4d1f-ac2f-169b0dc625d9"
     },
-    "fileId": "6fcDB3XSRLX4fPTYLZfQR+",
+    "fileId": "1cgLwXtvVKt7Md1dffZSqW",
     "sync": false
   },
   {
@@ -1488,7 +1488,7 @@
     "asset": {
       "__uuid__": "94760687-648e-4d1f-ac2f-169b0dc625d9"
     },
-    "fileId": "c5+XJ6XiNB3KjTu6mwny+A",
+    "fileId": "99q+UV1NtAs7nZ+2s037VF",
     "sync": false
   },
   {
@@ -8506,15 +8506,15 @@
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 253,
-      "g": 252,
-      "b": 245,
+      "r": 255,
+      "g": 251,
+      "b": 237,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 184,
-      "height": 54.4
+      "width": 186,
+      "height": 56.4
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -8570,11 +8570,13 @@
     "_fontSize": 30,
     "_lineHeight": 40,
     "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
+    "_N$file": {
+      "__uuid__": "b47819b5-a9ec-4916-8909-db422f79bbb7"
+    },
+    "_isSystemFontUsed": false,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 1,
+    "_styleFlags": 0,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
@@ -8593,12 +8595,12 @@
     "_enabled": true,
     "_color": {
       "__type__": "cc.Color",
-      "r": 146,
-      "g": 66,
-      "b": 19,
+      "r": 178,
+      "g": 77,
+      "b": 18,
       "a": 255
     },
-    "_width": 2,
+    "_width": 3,
     "_id": ""
   },
   {

assets/resources/module/blessingBag/blessingBagItem.prefab

@@ -627,7 +627,7 @@
     "asset": {
       "__uuid__": "3c12cc7b-777b-45f9-8bf1-8a285075e6f7"
     },
-    "fileId": "18wEM6K2NHgJ6NLgc9yQtM",
+    "fileId": "10H14rfpdPab1yimUbKfrF",
     "sync": false
   },
   {
@@ -736,7 +736,7 @@
     "asset": {
       "__uuid__": "3c12cc7b-777b-45f9-8bf1-8a285075e6f7"
     },
-    "fileId": "b2Nb300MhOKY9DkSN6yqX6",
+    "fileId": "9dsqDd3X9KT4nJBGy18u2w",
     "sync": false
   },
   {
@@ -1538,13 +1538,13 @@
     "_color": {
       "__type__": "cc.Color",
       "r": 255,
-      "g": 255,
-      "b": 255,
+      "g": 251,
+      "b": 237,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 72.33,
+      "width": 71.94,
       "height": 41.8
     },
     "_anchorPoint": {
@@ -1601,8 +1601,10 @@
     "_fontSize": 30,
     "_lineHeight": 30,
     "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
+    "_N$file": {
+      "__uuid__": "b47819b5-a9ec-4916-8909-db422f79bbb7"
+    },
+    "_isSystemFontUsed": false,
     "_spacingX": 0,
     "_batchAsBitmap": false,
     "_styleFlags": 0,
@@ -1624,9 +1626,9 @@
     "_enabled": true,
     "_color": {
       "__type__": "cc.Color",
-      "r": 183,
-      "g": 78,
-      "b": 0,
+      "r": 178,
+      "g": 77,
+      "b": 18,
       "a": 255
     },
     "_width": 2,

assets/resources/module/farmMap/farmItem.prefab

@@ -741,13 +741,13 @@
     "_color": {
       "__type__": "cc.Color",
       "r": 255,
-      "g": 255,
-      "b": 255,
+      "g": 251,
+      "b": 237,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 54.11,
+      "width": 53.82,
       "height": 54.4
     },
     "_anchorPoint": {
@@ -804,8 +804,10 @@
     "_fontSize": 22,
     "_lineHeight": 40,
     "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
+    "_N$file": {
+      "__uuid__": "b47819b5-a9ec-4916-8909-db422f79bbb7"
+    },
+    "_isSystemFontUsed": false,
     "_spacingX": 0,
     "_batchAsBitmap": false,
     "_styleFlags": 0,
@@ -827,9 +829,9 @@
     "_enabled": true,
     "_color": {
       "__type__": "cc.Color",
-      "r": 183,
-      "g": 78,
-      "b": 0,
+      "r": 178,
+      "g": 77,
+      "b": 18,
       "a": 255
     },
     "_width": 2,

assets/resources/module/farmMap/farmMap.prefab

@@ -1502,8 +1502,10 @@
     "_fontSize": 22,
     "_lineHeight": 40,
     "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
+    "_N$file": {
+      "__uuid__": "b47819b5-a9ec-4916-8909-db422f79bbb7"
+    },
+    "_isSystemFontUsed": false,
     "_spacingX": 0,
     "_batchAsBitmap": false,
     "_styleFlags": 0,
@@ -2355,8 +2357,10 @@
     "_fontSize": 22,
     "_lineHeight": 40,
     "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
+    "_N$file": {
+      "__uuid__": "b47819b5-a9ec-4916-8909-db422f79bbb7"
+    },
+    "_isSystemFontUsed": false,
     "_spacingX": 0,
     "_batchAsBitmap": false,
     "_styleFlags": 0,
@@ -3208,8 +3212,10 @@
     "_fontSize": 22,
     "_lineHeight": 40,
     "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
+    "_N$file": {
+      "__uuid__": "b47819b5-a9ec-4916-8909-db422f79bbb7"
+    },
+    "_isSystemFontUsed": false,
     "_spacingX": 0,
     "_batchAsBitmap": false,
     "_styleFlags": 0,
@@ -4061,8 +4067,10 @@
     "_fontSize": 20,
     "_lineHeight": 40,
     "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
+    "_N$file": {
+      "__uuid__": "b47819b5-a9ec-4916-8909-db422f79bbb7"
+    },
+    "_isSystemFontUsed": false,
     "_spacingX": 0,
     "_batchAsBitmap": false,
     "_styleFlags": 0,
@@ -4914,8 +4922,10 @@
     "_fontSize": 20,
     "_lineHeight": 40,
     "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
+    "_N$file": {
+      "__uuid__": "b47819b5-a9ec-4916-8909-db422f79bbb7"
+    },
+    "_isSystemFontUsed": false,
     "_spacingX": 0,
     "_batchAsBitmap": false,
     "_styleFlags": 0,
@@ -5767,8 +5777,10 @@
     "_fontSize": 20,
     "_lineHeight": 40,
     "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
+    "_N$file": {
+      "__uuid__": "b47819b5-a9ec-4916-8909-db422f79bbb7"
+    },
+    "_isSystemFontUsed": false,
     "_spacingX": 0,
     "_batchAsBitmap": false,
     "_styleFlags": 0,
@@ -6620,8 +6632,10 @@
     "_fontSize": 20,
     "_lineHeight": 40,
     "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
+    "_N$file": {
+      "__uuid__": "b47819b5-a9ec-4916-8909-db422f79bbb7"
+    },
+    "_isSystemFontUsed": false,
     "_spacingX": 0,
     "_batchAsBitmap": false,
     "_styleFlags": 0,
@@ -7473,8 +7487,10 @@
     "_fontSize": 20,
     "_lineHeight": 40,
     "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
+    "_N$file": {
+      "__uuid__": "b47819b5-a9ec-4916-8909-db422f79bbb7"
+    },
+    "_isSystemFontUsed": false,
     "_spacingX": 0,
     "_batchAsBitmap": false,
     "_styleFlags": 0,

assets/resources/module/gradeReward/gradeReward.prefab

@@ -623,14 +623,14 @@
     "_color": {
       "__type__": "cc.Color",
       "r": 255,
-      "g": 255,
-      "b": 255,
+      "g": 251,
+      "b": 237,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 76,
-      "height": 54.4
+      "width": 78,
+      "height": 56.4
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -686,8 +686,10 @@
     "_fontSize": 24,
     "_lineHeight": 40,
     "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
+    "_N$file": {
+      "__uuid__": "b47819b5-a9ec-4916-8909-db422f79bbb7"
+    },
+    "_isSystemFontUsed": false,
     "_spacingX": 0,
     "_batchAsBitmap": false,
     "_styleFlags": 0,
@@ -709,12 +711,12 @@
     "_enabled": true,
     "_color": {
       "__type__": "cc.Color",
-      "r": 147,
-      "g": 83,
-      "b": 56,
+      "r": 178,
+      "g": 77,
+      "b": 18,
       "a": 255
     },
-    "_width": 2,
+    "_width": 3,
     "_id": ""
   },
   {

assets/resources/module/gradeReward/gradeRewardItem.prefab

@@ -755,13 +755,13 @@
     "_color": {
       "__type__": "cc.Color",
       "r": 255,
-      "g": 255,
-      "b": 255,
+      "g": 251,
+      "b": 237,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 67.78,
+      "width": 67.41,
       "height": 54.4
     },
     "_anchorPoint": {
@@ -818,8 +818,10 @@
     "_fontSize": 28,
     "_lineHeight": 40,
     "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
+    "_N$file": {
+      "__uuid__": "b47819b5-a9ec-4916-8909-db422f79bbb7"
+    },
+    "_isSystemFontUsed": false,
     "_spacingX": 0,
     "_batchAsBitmap": false,
     "_styleFlags": 0,
@@ -841,9 +843,9 @@
     "_enabled": true,
     "_color": {
       "__type__": "cc.Color",
-      "r": 183,
-      "g": 78,
-      "b": 0,
+      "r": 178,
+      "g": 77,
+      "b": 18,
       "a": 255
     },
     "_width": 2,
@@ -1088,7 +1090,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 94,
+      "width": 82,
       "height": 54.4
     },
     "_anchorPoint": {
@@ -1145,8 +1147,10 @@
     "_fontSize": 26,
     "_lineHeight": 40,
     "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
+    "_N$file": {
+      "__uuid__": "b47819b5-a9ec-4916-8909-db422f79bbb7"
+    },
+    "_isSystemFontUsed": false,
     "_spacingX": 0,
     "_batchAsBitmap": false,
     "_styleFlags": 0,
@@ -1415,7 +1419,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 94,
+      "width": 82,
       "height": 54.4
     },
     "_anchorPoint": {
@@ -1472,8 +1476,10 @@
     "_fontSize": 26,
     "_lineHeight": 40,
     "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
+    "_N$file": {
+      "__uuid__": "b47819b5-a9ec-4916-8909-db422f79bbb7"
+    },
+    "_isSystemFontUsed": false,
     "_spacingX": 0,
     "_batchAsBitmap": false,
     "_styleFlags": 0,

assets/resources/module/inviteFriends/inviteRule.prefab

@@ -2398,15 +2398,15 @@
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 253,
-      "g": 252,
-      "b": 245,
+      "r": 255,
+      "g": 251,
+      "b": 237,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 95.11,
-      "height": 54.4
+      "width": 96.59,
+      "height": 56.4
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2462,8 +2462,10 @@
     "_fontSize": 40,
     "_lineHeight": 40,
     "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
+    "_N$file": {
+      "__uuid__": "b47819b5-a9ec-4916-8909-db422f79bbb7"
+    },
+    "_isSystemFontUsed": false,
     "_spacingX": 0,
     "_batchAsBitmap": false,
     "_styleFlags": 1,
@@ -2485,12 +2487,12 @@
     "_enabled": true,
     "_color": {
       "__type__": "cc.Color",
-      "r": 146,
-      "g": 66,
-      "b": 19,
+      "r": 178,
+      "g": 77,
+      "b": 18,
       "a": 255
     },
-    "_width": 2,
+    "_width": 3,
     "_id": ""
   },
   {
@@ -2675,8 +2677,11 @@
       "__id__": 2
     },
     "open_effect": 1,
+    "isOpenCloseEffect": true,
     "close_effect": 1,
     "close_toPoint": "",
+    "close_uibg": false,
+    "isDelayOneFrame": false,
     "_id": ""
   },
   {

assets/resources/module/newCashUI/walletCashOut.prefab

@@ -1127,7 +1127,7 @@
     "asset": {
       "__uuid__": "e3718e3b-b05d-4d23-9195-924548d5c740"
     },
-    "fileId": "57eRgVAtlLpa1rFIHLkeXe",
+    "fileId": "ff+uQfRotKsqcWbkaRaqiF",
     "sync": false
   },
   {
@@ -1336,7 +1336,7 @@
     "asset": {
       "__uuid__": "e3718e3b-b05d-4d23-9195-924548d5c740"
     },
-    "fileId": "cbdOL7iRdOapNG7lYMfyVV",
+    "fileId": "23UydlKZpAzpK5mgPa7SQz",
     "sync": false
   },
   {
@@ -2177,13 +2177,13 @@
     "_color": {
       "__type__": "cc.Color",
       "r": 255,
-      "g": 255,
-      "b": 255,
+      "g": 251,
+      "b": 237,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 126.7,
+      "width": 122.48,
       "height": 54.4
     },
     "_anchorPoint": {
@@ -2240,8 +2240,10 @@
     "_fontSize": 24,
     "_lineHeight": 40,
     "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
+    "_N$file": {
+      "__uuid__": "b47819b5-a9ec-4916-8909-db422f79bbb7"
+    },
+    "_isSystemFontUsed": false,
     "_spacingX": 0,
     "_batchAsBitmap": false,
     "_styleFlags": 0,
@@ -2513,8 +2515,8 @@
     "_color": {
       "__type__": "cc.Color",
       "r": 255,
-      "g": 255,
-      "b": 255,
+      "g": 251,
+      "b": 237,
       "a": 255
     },
     "_contentSize": {
@@ -2576,8 +2578,10 @@
     "_fontSize": 24,
     "_lineHeight": 40,
     "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
+    "_N$file": {
+      "__uuid__": "b47819b5-a9ec-4916-8909-db422f79bbb7"
+    },
+    "_isSystemFontUsed": false,
     "_spacingX": 0,
     "_batchAsBitmap": false,
     "_styleFlags": 0,
@@ -2599,9 +2603,9 @@
     "_enabled": true,
     "_color": {
       "__type__": "cc.Color",
-      "r": 183,
-      "g": 78,
-      "b": 0,
+      "r": 178,
+      "g": 77,
+      "b": 18,
       "a": 255
     },
     "_width": 2,
@@ -9511,8 +9515,8 @@
     "_color": {
       "__type__": "cc.Color",
       "r": 255,
-      "g": 255,
-      "b": 255,
+      "g": 251,
+      "b": 237,
       "a": 255
     },
     "_contentSize": {
@@ -9748,8 +9752,10 @@
     "_fontSize": 24,
     "_lineHeight": 40,
     "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
+    "_N$file": {
+      "__uuid__": "b47819b5-a9ec-4916-8909-db422f79bbb7"
+    },
+    "_isSystemFontUsed": false,
     "_spacingX": 0,
     "_batchAsBitmap": false,
     "_styleFlags": 0,
@@ -9771,9 +9777,9 @@
     "_enabled": true,
     "_color": {
       "__type__": "cc.Color",
-      "r": 183,
-      "g": 78,
-      "b": 0,
+      "r": 178,
+      "g": 77,
+      "b": 18,
       "a": 255
     },
     "_width": 2,
@@ -10200,8 +10206,8 @@
     "_color": {
       "__type__": "cc.Color",
       "r": 255,
-      "g": 255,
-      "b": 255,
+      "g": 251,
+      "b": 237,
       "a": 255
     },
     "_contentSize": {
@@ -10273,7 +10279,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 101.67,
+      "width": 101.12,
       "height": 61.44
     },
     "_anchorPoint": {
@@ -10330,11 +10336,13 @@
     "_fontSize": 42,
     "_lineHeight": 44,
     "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
+    "_N$file": {
+      "__uuid__": "b47819b5-a9ec-4916-8909-db422f79bbb7"
+    },
+    "_isSystemFontUsed": false,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 1,
+    "_styleFlags": 0,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
@@ -10353,9 +10361,9 @@
     "_enabled": true,
     "_color": {
       "__type__": "cc.Color",
-      "r": 146,
-      "g": 66,
-      "b": 19,
+      "r": 178,
+      "g": 77,
+      "b": 18,
       "a": 255
     },
     "_width": 3,

assets/resources/module/newNotice/lineUpUI.prefab

@@ -24,20 +24,20 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 28
+        "__id__": 30
       },
       {
-        "__id__": 29
+        "__id__": 31
       },
       {
-        "__id__": 30
+        "__id__": 32
       },
       {
-        "__id__": 31
+        "__id__": 33
       }
     ],
     "_prefab": {
-      "__id__": 32
+      "__id__": 34
     },
     "_opacity": 255,
     "_color": {
@@ -101,7 +101,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 27
+      "__id__": 29
     },
     "_opacity": 255,
     "_color": {
@@ -174,11 +174,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 25
+        "__id__": 27
       }
     ],
     "_prefab": {
-      "__id__": 26
+      "__id__": 28
     },
     "_opacity": 255,
     "_color": {
@@ -591,20 +591,20 @@
         "__id__": 16
       },
       {
-        "__id__": 19
+        "__id__": 20
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 22
+        "__id__": 23
       },
       {
-        "__id__": 23
+        "__id__": 24
       }
     ],
     "_prefab": {
-      "__id__": 24
+      "__id__": 26
     },
     "_opacity": 255,
     "_color": {
@@ -665,23 +665,26 @@
     "_components": [
       {
         "__id__": 17
+      },
+      {
+        "__id__": 18
       }
     ],
     "_prefab": {
-      "__id__": 18
+      "__id__": 19
     },
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 118,
-      "g": 70,
-      "b": 70,
+      "r": 255,
+      "g": 251,
+      "b": 237,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 200,
-      "height": 63
+      "width": 206,
+      "height": 69
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -737,8 +740,10 @@
     "_fontSize": 50,
     "_lineHeight": 50,
     "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
+    "_N$file": {
+      "__uuid__": "b47819b5-a9ec-4916-8909-db422f79bbb7"
+    },
+    "_isSystemFontUsed": false,
     "_spacingX": 0,
     "_batchAsBitmap": false,
     "_styleFlags": 0,
@@ -751,6 +756,24 @@
     "_id": ""
   },
   {
+    "__type__": "cc.LabelOutline",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 16
+    },
+    "_enabled": true,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 178,
+      "g": 77,
+      "b": 18,
+      "a": 255
+    },
+    "_width": 3,
+    "_id": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -772,11 +795,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 20
+        "__id__": 21
       }
     ],
     "_prefab": {
-      "__id__": 21
+      "__id__": 22
     },
     "_opacity": 255,
     "_color": {
@@ -830,7 +853,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 19
+      "__id__": 20
     },
     "_enabled": true,
     "_materials": [
@@ -912,7 +935,11 @@
     "_grayMaterial": null,
     "duration": 0.1,
     "zoomScale": 1.2,
-    "clickEvents": [],
+    "clickEvents": [
+      {
+        "__id__": 25
+      }
+    ],
     "_N$interactable": true,
     "_N$enableAutoGrayEffect": false,
     "_N$transition": 0,
@@ -971,6 +998,16 @@
     "_id": ""
   },
   {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "1c78dTYnjVE95q2lNCW1t1a",
+    "handler": "clickVideoBtn",
+    "customEventData": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1

assets/resources/module/newNotice/newNotice.prefab

@@ -2061,14 +2061,14 @@
     "_color": {
       "__type__": "cc.Color",
       "r": 255,
-      "g": 255,
-      "b": 255,
+      "g": 251,
+      "b": 237,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 95.11,
-      "height": 54.4
+      "width": 96.59,
+      "height": 56.4
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2124,11 +2124,13 @@
     "_fontSize": 40,
     "_lineHeight": 40,
     "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
+    "_N$file": {
+      "__uuid__": "b47819b5-a9ec-4916-8909-db422f79bbb7"
+    },
+    "_isSystemFontUsed": false,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 1,
+    "_styleFlags": 0,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
@@ -2147,12 +2149,12 @@
     "_enabled": true,
     "_color": {
       "__type__": "cc.Color",
-      "r": 146,
-      "g": 66,
-      "b": 19,
+      "r": 178,
+      "g": 77,
+      "b": 18,
       "a": 255
     },
-    "_width": 2,
+    "_width": 3,
     "_id": ""
   },
   {

assets/resources/module/sign/sign.prefab

@@ -1303,14 +1303,14 @@
     "_color": {
       "__type__": "cc.Color",
       "r": 255,
-      "g": 255,
-      "b": 255,
+      "g": 251,
+      "b": 237,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 84,
-      "height": 54.4
+      "width": 86,
+      "height": 56.4
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1367,7 +1367,7 @@
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": {
-      "__uuid__": "0bc2f1e8-1dd4-45ba-8f7e-36c47dde4152"
+      "__uuid__": "b47819b5-a9ec-4916-8909-db422f79bbb7"
     },
     "_isSystemFontUsed": false,
     "_spacingX": 0,
@@ -1391,12 +1391,12 @@
     "_enabled": true,
     "_color": {
       "__type__": "cc.Color",
-      "r": 146,
-      "g": 66,
-      "b": 19,
+      "r": 178,
+      "g": 77,
+      "b": 18,
       "a": 255
     },
-    "_width": 2,
+    "_width": 3,
     "_id": ""
   },
   {

assets/resources/module/speedUpUI/completeImmediately.prefab

@@ -905,14 +905,14 @@
     "_color": {
       "__type__": "cc.Color",
       "r": 255,
-      "g": 255,
-      "b": 255,
+      "g": 251,
+      "b": 237,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 154.8,
-      "height": 54.4
+      "width": 156.8,
+      "height": 56.4
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -968,8 +968,10 @@
     "_fontSize": 37.7,
     "_lineHeight": 40,
     "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
+    "_N$file": {
+      "__uuid__": "b47819b5-a9ec-4916-8909-db422f79bbb7"
+    },
+    "_isSystemFontUsed": false,
     "_spacingX": 0,
     "_batchAsBitmap": false,
     "_styleFlags": 0,
@@ -991,12 +993,12 @@
     "_enabled": true,
     "_color": {
       "__type__": "cc.Color",
-      "r": 146,
-      "g": 66,
-      "b": 19,
+      "r": 178,
+      "g": 77,
+      "b": 18,
       "a": 255
     },
-    "_width": 2,
+    "_width": 3,
     "_id": ""
   },
   {

assets/resources/module/speedUpUI/productReward2.prefab

@@ -24,20 +24,20 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 74
+        "__id__": 77
       },
       {
-        "__id__": 75
+        "__id__": 78
       },
       {
-        "__id__": 76
+        "__id__": 79
       },
       {
-        "__id__": 77
+        "__id__": 80
       }
     ],
     "_prefab": {
-      "__id__": 78
+      "__id__": 81
     },
     "_opacity": 255,
     "_color": {
@@ -101,7 +101,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 73
+      "__id__": 76
     },
     "_opacity": 255,
     "_color": {
@@ -171,26 +171,26 @@
         "__id__": 18
       },
       {
-        "__id__": 33
-      },
-      {
-        "__id__": 42
+        "__id__": 36
       },
       {
         "__id__": 45
       },
       {
         "__id__": 48
+      },
+      {
+        "__id__": 51
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 71
+        "__id__": 74
       }
     ],
     "_prefab": {
-      "__id__": 72
+      "__id__": 75
     },
     "_opacity": 255,
     "_color": {
@@ -705,7 +705,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "视频按钮",
+    "_name": "New Node",
     "_objFlags": 0,
     "_parent": {
       "__id__": 3
@@ -713,25 +713,93 @@
     "_children": [
       {
         "__id__": 19
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 34
+      }
+    ],
+    "_prefab": {
+      "__id__": 35
+    },
+    "_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": "视频按钮",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 18
+    },
+    "_children": [
+      {
+        "__id__": 20
       },
       {
-        "__id__": 22
+        "__id__": 23
       },
       {
-        "__id__": 26
+        "__id__": 27
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 29
+        "__id__": 30
       },
       {
-        "__id__": 30
+        "__id__": 31
       }
     ],
     "_prefab": {
-      "__id__": 32
+      "__id__": 33
     },
     "_opacity": 255,
     "_color": {
@@ -764,7 +832,7 @@
         1,
         1.2,
         1.2,
-        1
+        1.2
       ]
     },
     "_eulerAngles": {
@@ -785,17 +853,17 @@
     "_name": "video",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 18
+      "__id__": 19
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 20
+        "__id__": 21
       }
     ],
     "_prefab": {
-      "__id__": 21
+      "__id__": 22
     },
     "_opacity": 255,
     "_color": {
@@ -849,7 +917,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 19
+      "__id__": 20
     },
     "_enabled": true,
     "_materials": [
@@ -884,7 +952,7 @@
     "asset": {
       "__uuid__": "e315a4ee-0591-45b7-aac6-949ee3845f4d"
     },
-    "fileId": "83Ltg+xZtBs6DTb7gnsEf7",
+    "fileId": "3743FJLqNMRIYsqTPDJoCi",
     "sync": false
   },
   {
@@ -892,20 +960,20 @@
     "_name": "描述",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 18
+      "__id__": 19
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 23
+        "__id__": 24
       },
       {
-        "__id__": 24
+        "__id__": 25
       }
     ],
     "_prefab": {
-      "__id__": 25
+      "__id__": 26
     },
     "_opacity": 255,
     "_color": {
@@ -917,8 +985,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 124,
-      "height": 54.4
+      "width": 118,
+      "height": 56.4
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -959,7 +1027,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 22
+      "__id__": 23
     },
     "_enabled": true,
     "_materials": [
@@ -971,7 +1039,7 @@
     "_dstBlendFactor": 771,
     "_string": "领取红包",
     "_N$string": "领取红包",
-    "_fontSize": 30,
+    "_fontSize": 28,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": {
@@ -994,7 +1062,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 22
+      "__id__": 23
     },
     "_enabled": true,
     "_color": {
@@ -1004,7 +1072,7 @@
       "b": 18,
       "a": 255
     },
-    "_width": 2,
+    "_width": 3,
     "_id": ""
   },
   {
@@ -1015,7 +1083,7 @@
     "asset": {
       "__uuid__": "e315a4ee-0591-45b7-aac6-949ee3845f4d"
     },
-    "fileId": "e9dGE7pNFAkYMbe9dlMs9G",
+    "fileId": "06nasHlTRNtKkDBZC4qUce",
     "sync": false
   },
   {
@@ -1023,17 +1091,17 @@
     "_name": "hb",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 18
+      "__id__": 19
     },
     "_children": [],
     "_active": false,
     "_components": [
       {
-        "__id__": 27
+        "__id__": 28
       }
     ],
     "_prefab": {
-      "__id__": 28
+      "__id__": 29
     },
     "_opacity": 255,
     "_color": {
@@ -1087,7 +1155,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 26
+      "__id__": 27
     },
     "_enabled": true,
     "_materials": [
@@ -1122,7 +1190,7 @@
     "asset": {
       "__uuid__": "e315a4ee-0591-45b7-aac6-949ee3845f4d"
     },
-    "fileId": "4ev5f9BF5FS7or7PkqNtMw",
+    "fileId": "a65ugVUqlC65rvn5kCalzS",
     "sync": false
   },
   {
@@ -1130,7 +1198,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 18
+      "__id__": 19
     },
     "_enabled": true,
     "_materials": [
@@ -1162,7 +1230,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 18
+      "__id__": 19
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -1171,7 +1239,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 31
+        "__id__": 32
       }
     ],
     "_N$interactable": true,
@@ -1227,7 +1295,7 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 18
+      "__id__": 19
     },
     "_id": ""
   },
@@ -1237,7 +1305,7 @@
       "__id__": 1
     },
     "component": "",
-    "_componentId": "55189x5p0tEzImKka7Ch6fC",
+    "_componentId": "e63d7pMKM1CTrdeSMc1OrBc",
     "handler": "clickVideoBtn",
     "customEventData": ""
   },
@@ -1249,7 +1317,40 @@
     "asset": {
       "__uuid__": "e315a4ee-0591-45b7-aac6-949ee3845f4d"
     },
-    "fileId": "20Zd0OmJdOr6j7xc7drr3q",
+    "fileId": "cavMWA9rZJrI+uOX1gmOHX",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 18
+    },
+    "_enabled": true,
+    "_defaultClip": {
+      "__uuid__": "1c7cfdae-7b6c-46a5-9085-2fa8aa684ac7"
+    },
+    "_clips": [
+      {
+        "__uuid__": "d51cece8-b476-4297-9b9e-2e09bdd99a18"
+      },
+      {
+        "__uuid__": "1c7cfdae-7b6c-46a5-9085-2fa8aa684ac7"
+      }
+    ],
+    "playOnLoad": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "e315a4ee-0591-45b7-aac6-949ee3845f4d"
+    },
+    "fileId": "83uUwSExlN3rzP1Dfws3O6",
     "sync": false
   },
   {
@@ -1261,20 +1362,20 @@
     },
     "_children": [
       {
-        "__id__": 34
+        "__id__": 37
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 38
+        "__id__": 41
       },
       {
-        "__id__": 39
+        "__id__": 42
       }
     ],
     "_prefab": {
-      "__id__": 41
+      "__id__": 44
     },
     "_opacity": 255,
     "_color": {
@@ -1328,20 +1429,20 @@
     "_name": "描述",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 33
+      "__id__": 36
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 35
+        "__id__": 38
       },
       {
-        "__id__": 36
+        "__id__": 39
       }
     ],
     "_prefab": {
-      "__id__": 37
+      "__id__": 40
     },
     "_opacity": 255,
     "_color": {
@@ -1353,8 +1454,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 124,
-      "height": 54.4
+      "width": 118,
+      "height": 56.4
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1395,7 +1496,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 34
+      "__id__": 37
     },
     "_enabled": true,
     "_materials": [
@@ -1407,7 +1508,7 @@
     "_dstBlendFactor": 771,
     "_string": "退出游戏",
     "_N$string": "退出游戏",
-    "_fontSize": 30,
+    "_fontSize": 28,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": {
@@ -1430,7 +1531,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 34
+      "__id__": 37
     },
     "_enabled": true,
     "_color": {
@@ -1440,7 +1541,7 @@
       "b": 23,
       "a": 255
     },
-    "_width": 2,
+    "_width": 3,
     "_id": ""
   },
   {
@@ -1459,7 +1560,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 33
+      "__id__": 36
     },
     "_enabled": true,
     "_materials": [
@@ -1491,7 +1592,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 33
+      "__id__": 36
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -1500,7 +1601,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 40
+        "__id__": 43
       }
     ],
     "_N$interactable": true,
@@ -1556,16 +1657,18 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 33
+      "__id__": 36
     },
     "_id": ""
   },
   {
     "__type__": "cc.ClickEvent",
-    "target": null,
+    "target": {
+      "__id__": 1
+    },
     "component": "",
-    "_componentId": "",
-    "handler": "",
+    "_componentId": "e63d7pMKM1CTrdeSMc1OrBc",
+    "handler": "clickExitBtn",
     "customEventData": ""
   },
   {
@@ -1590,11 +1693,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 43
+        "__id__": 46
       }
     ],
     "_prefab": {
-      "__id__": 44
+      "__id__": 47
     },
     "_opacity": 255,
     "_color": {
@@ -1648,7 +1751,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 42
+      "__id__": 45
     },
     "_enabled": true,
     "_materials": [
@@ -1698,11 +1801,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 46
+        "__id__": 49
       }
     ],
     "_prefab": {
-      "__id__": 47
+      "__id__": 50
     },
     "_opacity": 255,
     "_color": {
@@ -1756,7 +1859,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 45
+      "__id__": 48
     },
     "_enabled": true,
     "_materials": [
@@ -1804,29 +1907,29 @@
     },
     "_children": [
       {
-        "__id__": 49
+        "__id__": 52
       },
       {
-        "__id__": 53
+        "__id__": 56
       },
       {
-        "__id__": 57
+        "__id__": 60
       },
       {
-        "__id__": 61
+        "__id__": 64
       },
       {
-        "__id__": 65
+        "__id__": 68
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 69
+        "__id__": 72
       }
     ],
     "_prefab": {
-      "__id__": 70
+      "__id__": 73
     },
     "_opacity": 255,
     "_color": {
@@ -1850,7 +1953,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -37.787,
+        -18,
         53.29900000000001,
         0,
         0,
@@ -1880,20 +1983,20 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 48
+      "__id__": 51
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 50
+        "__id__": 53
       },
       {
-        "__id__": 51
+        "__id__": 54
       }
     ],
     "_prefab": {
-      "__id__": 52
+      "__id__": 55
     },
     "_opacity": 255,
     "_color": {
@@ -1947,7 +2050,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 49
+      "__id__": 52
     },
     "_enabled": true,
     "_materials": [
@@ -1980,7 +2083,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 49
+      "__id__": 52
     },
     "_enabled": false,
     "_color": {
@@ -2009,20 +2112,20 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 48
+      "__id__": 51
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 54
+        "__id__": 57
       },
       {
-        "__id__": 55
+        "__id__": 58
       }
     ],
     "_prefab": {
-      "__id__": 56
+      "__id__": 59
     },
     "_opacity": 255,
     "_color": {
@@ -2034,7 +2137,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 61.18,
+      "width": 55.62,
       "height": 151.2
     },
     "_anchorPoint": {
@@ -2046,7 +2149,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -11.630000000000003,
+        -17.19,
         0,
         0,
         0,
@@ -2076,7 +2179,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 53
+      "__id__": 56
     },
     "_enabled": true,
     "_materials": [
@@ -2088,14 +2191,14 @@
     "_dstBlendFactor": 771,
     "_string": "8",
     "_N$string": "8",
-    "_fontSize": 110,
+    "_fontSize": 100,
     "_lineHeight": 120,
     "_enableWrapText": true,
     "_N$file": null,
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 1,
+    "_styleFlags": 0,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
@@ -2109,7 +2212,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 53
+      "__id__": 56
     },
     "_enabled": false,
     "_color": {
@@ -2138,20 +2241,20 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 48
+      "__id__": 51
     },
     "_children": [],
     "_active": false,
     "_components": [
       {
-        "__id__": 58
+        "__id__": 61
       },
       {
-        "__id__": 59
+        "__id__": 62
       }
     ],
     "_prefab": {
-      "__id__": 60
+      "__id__": 63
     },
     "_opacity": 255,
     "_color": {
@@ -2205,7 +2308,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 57
+      "__id__": 60
     },
     "_enabled": true,
     "_materials": [
@@ -2238,7 +2341,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 57
+      "__id__": 60
     },
     "_enabled": false,
     "_color": {
@@ -2267,20 +2370,20 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 48
+      "__id__": 51
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 62
+        "__id__": 65
       },
       {
-        "__id__": 63
+        "__id__": 66
       }
     ],
     "_prefab": {
-      "__id__": 64
+      "__id__": 67
     },
     "_opacity": 255,
     "_color": {
@@ -2292,7 +2395,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 61.18,
+      "width": 55.62,
       "height": 151.2
     },
     "_anchorPoint": {
@@ -2304,7 +2407,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        60.10999999999999,
+        43.42999999999999,
         0,
         0,
         0,
@@ -2334,7 +2437,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 61
+      "__id__": 64
     },
     "_enabled": true,
     "_materials": [
@@ -2346,14 +2449,14 @@
     "_dstBlendFactor": 771,
     "_string": "8",
     "_N$string": "8",
-    "_fontSize": 110,
+    "_fontSize": 100,
     "_lineHeight": 120,
     "_enableWrapText": true,
     "_N$file": null,
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 1,
+    "_styleFlags": 0,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
@@ -2367,7 +2470,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 61
+      "__id__": 64
     },
     "_enabled": false,
     "_color": {
@@ -2396,20 +2499,20 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 48
+      "__id__": 51
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 66
+        "__id__": 69
       },
       {
-        "__id__": 67
+        "__id__": 70
       }
     ],
     "_prefab": {
-      "__id__": 68
+      "__id__": 71
     },
     "_opacity": 255,
     "_color": {
@@ -2421,7 +2524,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 61.18,
+      "width": 55.62,
       "height": 151.2
     },
     "_anchorPoint": {
@@ -2433,7 +2536,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        131.85,
+        104.05,
         0,
         0,
         0,
@@ -2463,7 +2566,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 65
+      "__id__": 68
     },
     "_enabled": true,
     "_materials": [
@@ -2475,14 +2578,14 @@
     "_dstBlendFactor": 771,
     "_string": "8",
     "_N$string": "8",
-    "_fontSize": 110,
+    "_fontSize": 100,
     "_lineHeight": 120,
     "_enableWrapText": true,
     "_N$file": null,
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 1,
+    "_styleFlags": 0,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
@@ -2496,7 +2599,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 65
+      "__id__": 68
     },
     "_enabled": false,
     "_color": {
@@ -2525,7 +2628,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 48
+      "__id__": 51
     },
     "_enabled": false,
     "_layoutSize": {
@@ -2693,13 +2796,13 @@
     "_enabled": true,
     "lbl_value": [
       {
-        "__id__": 54
+        "__id__": 57
       },
       {
-        "__id__": 62
+        "__id__": 65
       },
       {
-        "__id__": 66
+        "__id__": 69
       }
     ],
     "_id": ""

assets/resources/module/speedUpUI/speedUp.prefab

@@ -224,8 +224,8 @@
         0,
         0,
         1,
-        1.2,
-        1.2,
+        1.1,
+        1.1,
         1
       ]
     },
@@ -2862,9 +2862,9 @@
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 253,
-      "g": 255,
-      "b": 229,
+      "r": 255,
+      "g": 251,
+      "b": 237,
       "a": 255
     },
     "_contentSize": {
@@ -2926,11 +2926,13 @@
     "_fontSize": 36,
     "_lineHeight": 40,
     "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
+    "_N$file": {
+      "__uuid__": "b47819b5-a9ec-4916-8909-db422f79bbb7"
+    },
+    "_isSystemFontUsed": false,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 1,
+    "_styleFlags": 0,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 0,
     "_N$verticalAlign": 0,
@@ -2949,9 +2951,9 @@
     "_enabled": true,
     "_color": {
       "__type__": "cc.Color",
-      "r": 182,
-      "g": 100,
-      "b": 19,
+      "r": 178,
+      "g": 77,
+      "b": 18,
       "a": 255
     },
     "_width": 3,

assets/resources/module/speedUpUI/texture/hb.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "c175430c-1494-4415-af5e-49df823d319d",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 64,
+  "height": 71,
+  "platformSettings": {},
+  "subMetas": {
+    "hb": {
+      "ver": "1.0.4",
+      "uuid": "696eb068-a451-4795-838b-909e805f8956",
+      "rawTextureUuid": "c175430c-1494-4415-af5e-49df823d319d",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 64,
+      "height": 71,
+      "rawWidth": 64,
+      "rawHeight": 71,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/module/speedUpUI/texture/hbBg.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "15f959e3-976b-41f3-b0bb-f4d45a52a58f",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 101,
+  "height": 86,
+  "platformSettings": {},
+  "subMetas": {
+    "hbBg": {
+      "ver": "1.0.4",
+      "uuid": "66861599-21bd-40ca-aa38-9379445f5f5b",
+      "rawTextureUuid": "15f959e3-976b-41f3-b0bb-f4d45a52a58f",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 101,
+      "height": 86,
+      "rawWidth": 101,
+      "rawHeight": 86,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/module/turnable/turnable.prefab

@@ -24,17 +24,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 112
+        "__id__": 117
       },
       {
-        "__id__": 113
+        "__id__": 118
       },
       {
-        "__id__": 114
+        "__id__": 119
       }
     ],
     "_prefab": {
-      "__id__": 115
+      "__id__": 120
     },
     "_opacity": 255,
     "_color": {
@@ -134,7 +134,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 111
+      "__id__": 116
     },
     "_opacity": 255,
     "_color": {
@@ -2285,7 +2285,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "0arvX2BpNL3pskr0RAkxVB",
+    "fileId": "15SHYrmMREgKwlHoFf/Ivn",
     "sync": false
   },
   {
@@ -2417,7 +2417,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "79uijYQT1HyomKrggGFScw",
+    "fileId": "47fao6Xk9HHqxEH8VH3oRd",
     "sync": false
   },
   {
@@ -2549,7 +2549,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "cf+t7dVZFE7oNH4k3+IyDF",
+    "fileId": "a6LSL0xA9NEIKB0GSeZMDM",
     "sync": false
   },
   {
@@ -2765,7 +2765,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "67yeajyz5AA5DPYNJgIGpx",
+    "fileId": "27V7fkOcpBm7ngwh/FkhnW",
     "sync": false
   },
   {
@@ -2876,7 +2876,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "3cl2kLmJNEm7k1JgiV6EKr",
+    "fileId": "81AklLFb5InJQdJg9ftwma",
     "sync": false
   },
   {
@@ -3374,7 +3374,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "ea0U2TeDtPxIjCjDF4eVbu",
+    "fileId": "28Ls7C9HxCLKkJPSWhDQ5n",
     "sync": false
   },
   {
@@ -3424,22 +3424,28 @@
       },
       {
         "__id__": 103
+      },
+      {
+        "__id__": 106
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 106
+        "__id__": 110
       },
       {
-        "__id__": 107
+        "__id__": 111
       },
       {
-        "__id__": 109
+        "__id__": 113
+      },
+      {
+        "__id__": 114
       }
     ],
     "_prefab": {
-      "__id__": 110
+      "__id__": 115
     },
     "_opacity": 255,
     "_color": {
@@ -3603,7 +3609,7 @@
       "__id__": 99
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 104
@@ -3703,6 +3709,137 @@
     "sync": false
   },
   {
+    "__type__": "cc.Node",
+    "_name": "描述",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 99
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 107
+      },
+      {
+        "__id__": 108
+      }
+    ],
+    "_prefab": {
+      "__id__": 109
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 251,
+      "b": 237,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 198,
+      "height": 69
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        4,
+        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__": 106
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "免费抽奖",
+    "_N$string": "免费抽奖",
+    "_fontSize": 48,
+    "_lineHeight": 50,
+    "_enableWrapText": true,
+    "_N$file": {
+      "__uuid__": "b47819b5-a9ec-4916-8909-db422f79bbb7"
+    },
+    "_isSystemFontUsed": false,
+    "_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.LabelOutline",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 106
+    },
+    "_enabled": true,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 178,
+      "g": 77,
+      "b": 18,
+      "a": 255
+    },
+    "_width": 3,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
+    },
+    "fileId": "efkhUN5blJXKdLHdzbzxGc",
+    "sync": false
+  },
+  {
     "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
@@ -3748,7 +3885,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 108
+        "__id__": 112
       }
     ],
     "_N$interactable": true,
@@ -3836,6 +3973,28 @@
     "_id": ""
   },
   {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 99
+    },
+    "_enabled": true,
+    "_defaultClip": {
+      "__uuid__": "1c7cfdae-7b6c-46a5-9085-2fa8aa684ac7"
+    },
+    "_clips": [
+      {
+        "__uuid__": "d51cece8-b476-4297-9b9e-2e09bdd99a18"
+      },
+      {
+        "__uuid__": "1c7cfdae-7b6c-46a5-9085-2fa8aa684ac7"
+      }
+    ],
+    "playOnLoad": true,
+    "_id": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -3889,7 +4048,7 @@
       }
     ],
     "btn_draw": {
-      "__id__": 109
+      "__id__": 113
     },
     "btn_close": {
       "__id__": 7

assets/resources/module/turnable/turnablerule.prefab

@@ -673,15 +673,15 @@
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 253,
-      "g": 252,
-      "b": 245,
+      "r": 255,
+      "g": 251,
+      "b": 237,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 81.45,
-      "height": 54.4
+      "width": 83,
+      "height": 56.4
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -737,11 +737,13 @@
     "_fontSize": 34,
     "_lineHeight": 40,
     "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
+    "_N$file": {
+      "__uuid__": "b47819b5-a9ec-4916-8909-db422f79bbb7"
+    },
+    "_isSystemFontUsed": false,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 1,
+    "_styleFlags": 0,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
@@ -760,12 +762,12 @@
     "_enabled": true,
     "_color": {
       "__type__": "cc.Color",
-      "r": 146,
-      "g": 66,
-      "b": 19,
+      "r": 178,
+      "g": 77,
+      "b": 18,
       "a": 255
     },
-    "_width": 2,
+    "_width": 3,
     "_id": ""
   },
   {

assets/script/game/data/GameData.ts

@@ -81,7 +81,10 @@ export class GameData {
     public init_expLevel = false;
 
     //标志位任务跟新
-    public init_redBagTask = true;
+    public init_redBagTask = false;
+
+    //标志位 生产奖励的任务ui刷新
+    public init_productTask = false;
     /**
      * 初始化游戏数据：网络配置信息，用户信息
      * @returns 
@@ -266,10 +269,10 @@ export class GameData {
         this.initLeftTimes();
         this.initFarmMapGetRewardData();
 
-        let isNewTask = this.getProp(GameProp.redBagTaskRefresh);
-        if (isNewTask != undefined) {
-            this.init_redBagTask = isNewTask;
-        }
+        // let isNewTask = this.getProp(GameProp.redBagTaskRefresh);
+        // if (isNewTask != undefined) {
+        //     this.init_redBagTask = isNewTask;
+        // }
     }
 
     private initLeftTimes() {
@@ -492,9 +495,9 @@ export class GameData {
 
     private async updateNewTaskProgress() {
 
-        if (gData.gameData.init_redBagTask) {
-            return;
-        }
+        // if (gData.gameData.init_redBagTask) {
+        //     return;
+        // }
         if (gData.gameData.gameData.userFarmTaskInfo) {
             let com = gData.gameData.gameData.userFarmTaskInfo.completeCount;
             let count = gData.gameData.gameData.userFarmTaskInfo.taskCount;
@@ -511,7 +514,7 @@ export class GameData {
         }
 
         gData.gameData.gameData.userFarmTaskInfo = response.data.userFarmTaskInfo;
-        gData.gameData.init_task = true;
+        //gData.gameData.init_task = true;
     }
 
     public setFarmDataMap(id, data, sendToServer = true) {

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

@@ -4,4 +4,6 @@ import { Data } from "../../../mk/data/Data";
 export class LineUpUIData extends Data {
 
     public personCount = 0;
+    public cashId = 0;
+    public refresh = false;
 }

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

@@ -49,7 +49,9 @@
             if(response.data.count > 0)
             {
                 gData.lineUpUIData.personCount = response.data.count;
-                mk.ui.openPanel("module/newNotice/LineUpUI");
+                gData.lineUpUIData.cashId = id;
+                gData.lineUpUIData.refresh = true;
+                mk.ui.openPanel("module/newNotice/lineUpUI");
             }
             return;
         }  

assets/script/game/game/Game.ts

@@ -214,14 +214,17 @@ export default class Game extends cc.Component {
         if (gData.gameData.gameData.userFarmTaskInfo) {
             let com = gData.gameData.gameData.userFarmTaskInfo.completeCount;
             let count = gData.gameData.gameData.userFarmTaskInfo.taskCount;
-            if (gData.gameData.init_redBagTask) {
-                this.lbl_task.string = `<b><color=#8D4D32>点击领取任务!</c></b>`
-                this.node_hand.active = true;
-            } else {
+            //if(gData.gameData.init_redBagTask)
+            // {
+            //     this.lbl_task.string = `<b><color=#8D4D32>点击领取任务!</c></b>`
+            //     this.node_hand.active = true;
+            // }else
+            {
                 this.lbl_task.string = `<b><color=#8D4D32>进行${count}次生产</c><color=#7EB80E>(${com}/${count})</color></b>`
-                if (com >= count) {
+                if(com >= count)
+                {
                     this.node_hand.active = true;
-                } else {
+                }else{
                     this.node_hand.active = false;
                 }
             }

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

@@ -53,6 +53,9 @@ export default class NewCashUI extends cc.Component {
     private clickCloseBtn(){
         mk.audio.playEffect('closeButton');
         mk.audio.setResumeMusic();
+
+        // gData.gameData.init_redBagTask = true;
+        // gData.gameData.init_productTask = true;
     }
 
     onDestroy(){

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

@@ -9,13 +9,32 @@ export default class LineUpUI extends cc.Component {
 
 
     start(){
-        this.lbl_tip.string = gData.lineUpUIData.personCount.toString();
+        gData.lineUpUIData.refresh = false;
+        this.lbl_tip.string = `提现排队中，你前面还有${gData.lineUpUIData.personCount}人`;
+    }
+
+    update(dt)
+    {
+        if(gData.lineUpUIData.refresh)
+        {
+            gData.lineUpUIData.refresh = false;
+            this.lbl_tip.string = `提现排队中，你前面还有${gData.lineUpUIData.personCount}人`;
+        }
     }
 
     private clickVideoBtn()
     {
         mk.audio.playEffect("button");
-        mk.tip.pop('插队成功');
+
+        // 看广告
+        mk.ad.watchAd((success: boolean) => {
+            mk.console.log("watchAD:" + success);
+            if (success) {
+                mk.tip.pop('插队成功');
+                gData.walletCashOutData.HttpCashOut2(gData.lineUpUIData.cashId);
+            }
+        });
+        
 
     }
     private clickCloseBtn(){

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

@@ -30,5 +30,7 @@ export default class NewNotice extends cc.Component {
     }
 
     private clickCloseBtn() {
+        mk.audio.playEffect("closeButton");
+        gData.gameData.init_redBagTask = true;
     }
 }

assets/script/game/module/redBagTask/RedBagTask.ts

@@ -35,12 +35,10 @@ export default class RedBagTask extends cc.Component {
     private lbl_Ani: cc.Label = null;
     @property({ type: cc.Label, displayName: '任务数量' })
     private lbl_taskNum: cc.Label = null;
-    @property({ type: cc.Label, displayName: '任务描述' })
-    private lbl_taskDes: cc.Label = null;
     @property(cc.Node)
     private node_videoIcon: cc.Node = null;
 
-    private isShowNewTask = true;
+    private isShowNewTask = false;
     private num = 0;
     private delayTime = 0;
     private times = 0;
@@ -48,15 +46,17 @@ export default class RedBagTask extends cc.Component {
 
     private isCanCash = false;
 
+    private isRefreshTask = false;
+
 
     start() {
         mk.console.logSingle('redBagTask=>', gData.gameData.gameData.userFarmTaskInfo);
-        if(!gData.gameData.gameData.userFarmTaskInfo)
-        {
+        if (!gData.gameData.gameData.userFarmTaskInfo) {
             return;
         }
+        gData.gameData.init_redBagTask = false;
         this.maxNum = gData.gameData.gameData.userFarmTaskInfo.taskCount;
-        this.isShowNewTask = gData.gameData.init_redBagTask;
+        //this.isShowNewTask = gData.gameData.init_redBagTask;
         if (this.isShowNewTask) {
             this.showNewTaskUI();
         } else {
@@ -78,9 +78,9 @@ export default class RedBagTask extends cc.Component {
         this.node_task.active = false;
         this.openBtn_ani.node.active = false;
         this.lbl_Ani.node.active = true;
-        gData.gameData.init_redBagTask = false;
+        //gData.gameData.init_redBagTask = false;
         gData.gameData.init_task = true;
-        gData.gameData.setProp(GameProp.redBagTaskRefresh, gData.gameData.init_redBagTask)
+        //gData.gameData.setProp(GameProp.redBagTaskRefresh, gData.gameData.init_redBagTask)
     }
 
     onEnable() {
@@ -141,6 +141,14 @@ export default class RedBagTask extends cc.Component {
             }
 
         }
+
+        if (gData.gameData.init_redBagTask) {
+            gData.gameData.init_redBagTask = false;
+            gData.gameData.init_productTask = true;
+            this.isRefreshTask = true;
+            this.showNewTaskUI();
+            this.isShowNewTask = true;
+        }
     }
 
     private initTaskProgressUI() {
@@ -148,16 +156,23 @@ export default class RedBagTask extends cc.Component {
             let com = gData.gameData.gameData.userFarmTaskInfo.completeCount;
             let count = gData.gameData.gameData.userFarmTaskInfo.taskCount;
             let per = com / count;
-            cc.tween(this.sp_taskProgress).delay(0.2).to(0.2, { fillRange: per }, {
-                onUpdate: () => {
-                    let str = this.sp_taskProgress.fillRange * 100;
-                    this.lbl_taskProgress.string = str.toFixed(0) + "%";
-                }
-            }).start();
-            cc.tween(this)
-
+            if(!this.isRefreshTask)
+            {
+                cc.tween(this.sp_taskProgress).delay(0.2).to(0.2, { fillRange: per }, {
+                    onUpdate: () => {
+                        let num = Math.round(this.sp_taskProgress.fillRange * count);
+                        this.lbl_taskProgress.string = `${num}/${count}`;
+                    }
+                }).call(()=>{
+                    this.lbl_taskProgress.string = `${com}/${count}`;
+                }).start();
+    
+            }else{
+                this.sp_taskProgress.fillRange = per;
+                this.lbl_taskProgress.string = `${com}/${count}`;
+            }
+            
             this.lbl_taskNum.string = count.toString();
-            this.lbl_taskDes.string = `(${com}/${count})`;
 
             let gray = this.openBtn_ani.getComponent(SetGray);
             if (gray && com < count) {
@@ -166,10 +181,9 @@ export default class RedBagTask extends cc.Component {
             }
 
             this.isCanCash = com >= count;
-            if(this.isCanCash &&  gData.adData.checkShowVideoIcon())
-            {
+            if (this.isCanCash && gData.adData.checkShowVideoIcon()) {
                 this.node_videoIcon.active = true;
-            }else{
+            } else {
                 this.node_videoIcon.active = false;
             }
         }
@@ -227,15 +241,15 @@ export default class RedBagTask extends cc.Component {
             return null;
         }
         gData.gameData.gameData.userFarmTaskInfo = response.data.userFarmTaskInfo;
-        gData.gameData.init_redBagTask = true;
-        //gData.gameData.init_task = true;
-       
+        //gData.gameData.init_redBagTask = true;
+        gData.gameData.init_task = true;
+
         this.maxNum = gData.gameData.gameData.userFarmTaskInfo.taskCount;
         this.num = 0;
-        this.delayTime= 0;
+        this.delayTime = 0;
         this.times = 0;
-        this.showNewTaskUI();
-        this.isShowNewTask = true;
+        //this.showNewTaskUI();
+        //this.isShowNewTask = true;
 
         gData.receiptNotice.receip_rmb = response.data.cashMoney;
         mk.ui.openPanel('module/newNotice/newNotice');

assets/script/game/module/speedUpUI/ProductReward.ts

@@ -8,12 +8,60 @@ export default class ProductReward extends cc.Component {
     @property({ type: cc.Label, displayName: "文本" })
     lbl_times: cc.Label = null;
 
+    @property({ type: cc.Label, displayName: '任务次数' })
+    lbl_taskTimes: cc.Label = null;
+    @property({ type: cc.Label, displayName: '进度文本' })
+    lbl_progress: cc.Label = null;
+    @property({ type: cc.Sprite, displayName: '进度条' })
+    sp_taskProgress: cc.Sprite = null;
+    @property({ type: cc.Node, displayName: '完成节点' })
+    node_complete: cc.Node = null;
+    @property({ type: cc.Node, displayName: '未完成节点' })
+    node_Uncomplete: cc.Node = null;
+
     onEnable() {
         this.scheduleOnce(() => {
             mk.guide.open(4);
         }, 0.5)
 
         this.lbl_times.string = `生产次数x${gData.gameData.configs.ServerConfig.ProductionAd}`;
+
+        gData.gameData.init_productTask = false;
+        if (gData.gameData.gameData.userFarmTaskInfo) {
+            let com = gData.gameData.gameData.userFarmTaskInfo.completeCount;
+            let count = gData.gameData.gameData.userFarmTaskInfo.taskCount;
+            if (count > com) {
+                this.lbl_taskTimes.string = (count - com).toString();
+                this.node_Uncomplete.active = true;
+                this.node_complete.active = false;
+            } else {
+                this.node_Uncomplete.active = false;
+                this.node_complete.active = true;
+            }
+            this.lbl_progress.string = `${com}/${count}`;
+            this.sp_taskProgress.fillRange = com / count;
+        }
+    }
+
+    update(dt) {
+        if (gData.gameData.init_productTask) {
+            if (gData.gameData.gameData.userFarmTaskInfo) {
+                let com = gData.gameData.gameData.userFarmTaskInfo.completeCount;
+                let count = gData.gameData.gameData.userFarmTaskInfo.taskCount;
+                if (count > com) {
+                    this.lbl_taskTimes.string = (count - com).toString();
+                    this.node_Uncomplete.active = true;
+                    this.node_complete.active = false;
+                } else {
+                    this.node_Uncomplete.active = false;
+                    this.node_complete.active = true;
+                }
+                this.lbl_progress.string = (com / count).toString();
+                this.sp_taskProgress.fillRange = com / count;
+            }
+
+            gData.gameData.init_productTask = false;
+        }
     }
 
     private clickVideoBtn() {

build/jsb-link/assets/resources/import/15/15f959e3-976b-41f3-b0bb-f4d45a52a58f.json

@@ -0,0 +1 @@
+[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/assets/resources/import/66/66861599-21bd-40ca-aa38-9379445f5f5b.json

@@ -0,0 +1 @@
+[1,["15+Vnjl2tB87C79NRaUqWP"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"hbBg","rect":[0,0,101,86],"offset":[0,0],"originalSize":[101,86],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/69/696eb068-a451-4795-838b-909e805f8956.json

@@ -0,0 +1 @@
+[1,["c1dUMMFJREFa9eSd+CPTGd"],["_textureSetter"],["cc.SpriteFrame"],0,[{"name":"hb","rect":[0,0,64,71],"offset":[0,0],"originalSize":[64,71],"capInsets":[0,0,0,0]}],[0],0,[0],[0],[0]]

build/jsb-link/assets/resources/import/6b/6b16bf98-3349-42bd-9631-d63e9225c348.json

@@ -1 +0,0 @@
-[1,0,0,[["cc.TTFFont",["_name","_native"],1]],[[0,0,1,3]],[[0,"Adorable","Adorable.ttf"],-1],0,0,[],[],[]]

build/jsb-link/assets/resources/import/c1/c175430c-1494-4415-af5e-49df823d319d.json

@@ -0,0 +1 @@
+[1,0,0,["cc.Texture2D"],0,["0,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

build/jsb-link/js backups (useful for debugging)/main.index.js

@@ -2490,12 +2490,16 @@ this.adMap.set(i.turntable, gData.turnable);
 this.adMap.set(i.sign, gData.sign);
 this.adMap.set(i.bigCash, gData.blessingBag);
 this.adMap.set(i.cashOutAddCash, gData.walletCashOutData);
+this.adMap.set(i.harvest, gData.harvestData);
+this.adMap.set(i.farmMap, gData.farmMapData);
 };
 t.prototype.checkAdMax = function() {
 this.watchNumToday++;
 var t = parseInt(gData.gameData.configs.ServerConfig.VideoTimesMax);
+mk.console.logSingle("checkAdMax  watchNumToday ", this.watchNumToday);
+mk.console.logSingle("checkAdMax  max ", t);
 if (this.watchNumToday > t) {
-mk.tip.pop("今日看广告获得奖励的次数已用完", 1);
+mk.tip.pop("今日看广告获得奖励的次数已用完");
 mk.ui.closeAllUI();
 return !0;
 }
@@ -2621,8 +2625,11 @@ this.ABCInsertAdArr = gData.gameData.configs.ServerConfig.ABInsertAd.split(",");
 this.FullCsahAdArr = gData.gameData.configs.ServerConfig.FullCsahAd.split(",");
 };
 t.prototype.setEcpmLevel = function() {
-this.ecpmLevel = 1;
-this.AutoRedMoneyMap.set(1, 20);
+for (var t = gData.gameData.configs.ForceAd, e = t.length, o = -1, n = 0; n < e; n++) if (gData.gameData.adShowConfig.average_ecpm <= parseInt(t[n].ecpmMax)) {
+-1 == o && (o = parseInt(t[n].value));
+this.AutoRedMoneyMap.set(parseInt(t[n].value), parseInt(t[n].AutoRedMoney));
+}
+this.ecpmLevel = o;
 };
 t.prototype.checkShowFullInter = function(t, e) {
 void 0 === e && (e = null);
@@ -2701,7 +2708,11 @@ mk.ui.openPanel("module/newOpenRedBag/newOpenRedBag");
 }
 };
 t.prototype.getPerByEcpm = function() {
-return .26;
+for (var t = gData.gameData.configs.ForceAd, e = t.length, o = 0, n = 0; n < e; n++) if (gData.gameData.adShowConfig.average_ecpm <= parseInt(t[n].ecpmMax)) {
+o = parseFloat(t[n].percent);
+break;
+}
+return o;
 };
 return t;
 }();
@@ -2713,7 +2724,6 @@ t[t.settlement = 3] = "settlement";
 t[t.turntable = 4] = "turntable";
 t[t.sign = 5] = "sign";
 t[t.bigCash = 6] = "bigCash";
-t[t.cashOutNoviceWelfare = 7] = "cashOutNoviceWelfare";
 t[t.cashOutAddCash = 8] = "cashOutAddCash";
 t[t.harvest = 9] = "harvest";
 t[t.farmMap = 10] = "farmMap";
@@ -6753,7 +6763,6 @@ t++;
 return [ 3, 1 ];
 
 case 5:
-gData.gameData.setProductMapFromJson();
 return [ 2 ];
 }
 });
@@ -8823,6 +8832,7 @@ this.countDown.node.active = !0;
 this.process.node.active = !0;
 this.countDown.setState(1);
 this.process.setData(this.data);
+this.plantID = this.data.productID;
 return [ 4, mk.loader.load("game/prefab/ProductShow1", cc.Prefab) ];
 
 case 6:
@@ -11501,7 +11511,8 @@ this.init_makeInfo = !1;
 this.isProducting = !1;
 this.init_task = !1;
 this.init_expLevel = !1;
-this.init_redBagTask = !0;
+this.init_redBagTask = !1;
+this.init_productTask = !1;
 this._farmMapRewardData = [];
 this._farmData = [];
 this._farmDataMap = new Map();
@@ -11566,6 +11577,7 @@ return [ 2 ];
 t.prototype.initConfigs = function(t) {
 this.configs = t;
 this.funOpenData = this.configs.ServerConfig.Functionswitch.split(",");
+this.setProductMapFromJson();
 };
 t.prototype.initPlayerProp = function(t) {
 this.gameData = new d();
@@ -11676,8 +11688,6 @@ this.initSetMaxProduct();
 this.initProductTimes();
 this.initLeftTimes();
 this.initFarmMapGetRewardData();
-var o = this.getProp(i.redBagTaskRefresh);
-null != o && (this.init_redBagTask = o);
 }
 };
 t.prototype.initLeftTimes = function() {
@@ -11814,7 +11824,6 @@ var t, e, o, n;
 return a(this, function(a) {
 switch (a.label) {
 case 0:
-if (gData.gameData.init_redBagTask) return [ 2 ];
 if (gData.gameData.gameData.userFarmTaskInfo) {
 t = gData.gameData.gameData.userFarmTaskInfo.completeCount;
 e = gData.gameData.gameData.userFarmTaskInfo.taskCount;
@@ -11828,7 +11837,6 @@ n = a.sent();
 mk.console.logSingle("refrehTask=>", n);
 if (0 != n.errcode) return [ 2, null ];
 gData.gameData.gameData.userFarmTaskInfo = n.data.userFarmTaskInfo;
-gData.gameData.init_task = !0;
 return [ 2 ];
 }
 });
@@ -11880,7 +11888,7 @@ this.setProp(i.farmData, this._farmData);
 } else for (n = 0; n < t; n++) this._farmDataMap.set(this._farmData[n].id, this._farmData[n]);
 };
 t.prototype.setProductMapFromJson = function() {
-for (var t = gData.configData.configMap.get("product"), e = t.length, o = null, n = "", a = [], i = 0; i < e; i++) {
+for (var t = this.configs.Product, e = t.length, o = null, n = "", a = [], i = 0; i < e; i++) {
 o = t[i];
 this._productMap.set(o.picture, o);
 if (n != o.tab) {
@@ -12843,14 +12851,9 @@ scale: 1
 }).start();
 if (gData.gameData.gameData.userFarmTaskInfo) {
 var t = gData.gameData.gameData.userFarmTaskInfo.completeCount, e = gData.gameData.gameData.userFarmTaskInfo.taskCount;
-if (gData.gameData.init_redBagTask) {
-this.lbl_task.string = "<b><color=#8D4D32>点击领取任务!</c></b>";
-this.node_hand.active = !0;
-} else {
 this.lbl_task.string = "<b><color=#8D4D32>进行" + e + "次生产</c><color=#7EB80E>(" + t + "/" + e + ")</color></b>";
 this.node_hand.active = t >= e;
 }
-}
 gData.gameData.init_task = !1;
 };
 e.prototype.initFarmExpUI = function() {
@@ -14685,6 +14688,7 @@ this.config = gData.gameData.getProductMap(this.plantID);
 mk.ui.openPanel("game/prefab/uiPanel/HarvestPanel");
 };
 e.prototype.setAdData = function(e) {
+mk.console.logSingle("HarvestData  addata ", this.adData);
 t.prototype.setAdData.call(this, e);
 this.init_reward = !0;
 };
@@ -14840,18 +14844,30 @@ return null !== t && t.apply(this, arguments) || this;
 }
 e.prototype.clickNormalBtn = function() {
 return r(this, void 0, void 0, function() {
-var t;
-return c(this, function() {
+var t, e, o;
+return c(this, function(n) {
+switch (n.label) {
+case 0:
 mk.ui.closePanel("HarvestPanel");
 gData.adData.checkShowFullInter(1, l.InterFullAdType.interstitial2_init_2);
-t = [ {
+t = {
+id: gData.harvestData.config.id
+};
+return [ 4, mk.http.sendData("redMoney/addRedMoneyByFarm", t) ];
+
+case 1:
+if ((e = n.sent()) && 0 != e.errcode) return [ 2 ];
+if (e.data.redMoneyAddition <= 0) console.log("返回奖励为0"); else {
+o = [ {
 rewardType: 1,
-rewardNum: 20
+rewardNum: e.data.redMoneyAddition
 } ];
-gData.reward.data = t;
+gData.reward.data = o;
 gData.reward.callback = gData.harvestData.call;
 mk.ui.openPanel("module/reward/reward");
+}
 return [ 2 ];
+}
 });
 });
 };
@@ -16059,6 +16075,8 @@ a(e, t);
 function e() {
 var e = null !== t && t.apply(this, arguments) || this;
 e.personCount = 0;
+e.cashId = 0;
+e.refresh = !1;
 return e;
 }
 return e;
@@ -16101,11 +16119,24 @@ e.lbl_tip = null;
 return e;
 }
 e.prototype.start = function() {
-this.lbl_tip.string = gData.lineUpUIData.personCount.toString();
+gData.lineUpUIData.refresh = !1;
+this.lbl_tip.string = "提现排队中，你前面还有" + gData.lineUpUIData.personCount + "人";
+};
+e.prototype.update = function() {
+if (gData.lineUpUIData.refresh) {
+gData.lineUpUIData.refresh = !1;
+this.lbl_tip.string = "提现排队中，你前面还有" + gData.lineUpUIData.personCount + "人";
+}
 };
 e.prototype.clickVideoBtn = function() {
 mk.audio.playEffect("button");
+mk.ad.watchAd(function(t) {
+mk.console.log("watchAD:" + t);
+if (t) {
 mk.tip.pop("插队成功");
+gData.walletCashOutData.HttpCashOut2(gData.lineUpUIData.cashId);
+}
+});
 };
 e.prototype.clickCloseBtn = function() {
 mk.audio.playEffect("closeButton");
@@ -16877,6 +16908,7 @@ this.setProgress(0);
 e.prototype.start = function() {
 if (1 != mk.storage.getStorage("alifengkong")) {
 mk.aliRiskManager.init();
+mk.loader.preload("game/coregame/coregame", cc.Prefab);
 this.init();
 }
 };
@@ -17055,7 +17087,6 @@ return [ 4, gData.configData.loadConfig() ];
 
 case 1:
 t.sent();
-mk.loader.preload("game/coregame/coregame", cc.Prefab);
 gData.adData.init();
 mk.console.log("[FC] gData.appData.appId", gData.appData.appId);
 gData.loginData.login();
@@ -19130,7 +19161,10 @@ console.log("newNotices=>" + gData.receiptNotice.receip_rmb);
 this.lbl_reward_value.string = (gData.receiptNotice.receip_rmb / 100).toFixed(2);
 this.lbl_time.string = mk.time.getNowDayStringExtend();
 };
-e.prototype.clickCloseBtn = function() {};
+e.prototype.clickCloseBtn = function() {
+mk.audio.playEffect("closeButton");
+gData.gameData.init_redBagTask = !0;
+};
 i([ s({
 displayName: "提现金额",
 type: cc.Label
@@ -20707,7 +20741,7 @@ return [ 4, mk.loader.load(o + t.picture, cc.SpriteFrame) ];
 
 case 2:
 a.spriteFrame = c.sent();
-this.awardLabel.string = t.MenuredBagCoin;
+this.awardLabel.string = t.menuRedBagCoin.toString();
 this.timeLabel.string = t.time;
 i = !1;
 r = 0;
@@ -20729,7 +20763,7 @@ return [ 2 ];
 });
 };
 e.prototype.clickMake = function() {
-if (gData.gameData.leftTimes <= 0) mk.ui.openPanel("module/speedUpUI/productReward"); else if (this.data.tab == l.ProductType.nzw) {
+if (gData.gameData.leftTimes <= 0) mk.ui.openPanel("module/speedUpUI/productReward"); else if (gData.gameData.isProducting) mk.tip.pop("点击太快了"); else if (this.data.tab == l.ProductType.nzw) {
 gData.farmSystem.plant(this.data.picture);
 gData.gameData.nextMake = null;
 gData.farmSystem.selectNextFarm(!1);
@@ -21293,6 +21327,11 @@ a(e, t);
 function e() {
 var e = null !== t && t.apply(this, arguments) || this;
 e.lbl_times = null;
+e.lbl_taskTimes = null;
+e.lbl_progress = null;
+e.sp_taskProgress = null;
+e.node_complete = null;
+e.node_Uncomplete = null;
 return e;
 }
 e.prototype.onEnable = function() {
@@ -21300,6 +21339,38 @@ this.scheduleOnce(function() {
 mk.guide.open(4);
 }, .5);
 this.lbl_times.string = "生产次数x" + gData.gameData.configs.ServerConfig.ProductionAd;
+gData.gameData.init_productTask = !1;
+if (gData.gameData.gameData.userFarmTaskInfo) {
+var t = gData.gameData.gameData.userFarmTaskInfo.completeCount, e = gData.gameData.gameData.userFarmTaskInfo.taskCount;
+if (e > t) {
+this.lbl_taskTimes.string = (e - t).toString();
+this.node_Uncomplete.active = !0;
+this.node_complete.active = !1;
+} else {
+this.node_Uncomplete.active = !1;
+this.node_complete.active = !0;
+}
+this.lbl_progress.string = t + "/" + e;
+this.sp_taskProgress.fillRange = t / e;
+}
+};
+e.prototype.update = function() {
+if (gData.gameData.init_productTask) {
+if (gData.gameData.gameData.userFarmTaskInfo) {
+var t = gData.gameData.gameData.userFarmTaskInfo.completeCount, e = gData.gameData.gameData.userFarmTaskInfo.taskCount;
+if (e > t) {
+this.lbl_taskTimes.string = (e - t).toString();
+this.node_Uncomplete.active = !0;
+this.node_complete.active = !1;
+} else {
+this.node_Uncomplete.active = !1;
+this.node_complete.active = !0;
+}
+this.lbl_progress.string = (t / e).toString();
+this.sp_taskProgress.fillRange = t / e;
+}
+gData.gameData.init_productTask = !1;
+}
 };
 e.prototype.clickVideoBtn = function() {
 var t = this;
@@ -21330,6 +21401,26 @@ i([ l({
 type: cc.Label,
 displayName: "文本"
 }) ], e.prototype, "lbl_times", void 0);
+i([ l({
+type: cc.Label,
+displayName: "任务次数"
+}) ], e.prototype, "lbl_taskTimes", void 0);
+i([ l({
+type: cc.Label,
+displayName: "进度文本"
+}) ], e.prototype, "lbl_progress", void 0);
+i([ l({
+type: cc.Sprite,
+displayName: "进度条"
+}) ], e.prototype, "sp_taskProgress", void 0);
+i([ l({
+type: cc.Node,
+displayName: "完成节点"
+}) ], e.prototype, "node_complete", void 0);
+i([ l({
+type: cc.Node,
+displayName: "未完成节点"
+}) ], e.prototype, "node_Uncomplete", void 0);
 return i([ s ], e);
 }(cc.Component);
 o.default = p;
@@ -22741,21 +22832,21 @@ e.node_value = null;
 e.node_task = null;
 e.lbl_Ani = null;
 e.lbl_taskNum = null;
-e.lbl_taskDes = null;
 e.node_videoIcon = null;
-e.isShowNewTask = !0;
+e.isShowNewTask = !1;
 e.num = 0;
 e.delayTime = 0;
 e.times = 0;
 e.maxNum = 14;
 e.isCanCash = !1;
+e.isRefreshTask = !1;
 return e;
 }
 e.prototype.start = function() {
 mk.console.logSingle("redBagTask=>", gData.gameData.gameData.userFarmTaskInfo);
 if (gData.gameData.gameData.userFarmTaskInfo) {
+gData.gameData.init_redBagTask = !1;
 this.maxNum = gData.gameData.gameData.userFarmTaskInfo.taskCount;
-this.isShowNewTask = gData.gameData.init_redBagTask;
 if (this.isShowNewTask) this.showNewTaskUI(); else {
 this.initTaskProgressUI();
 this.showChangePart();
@@ -22768,9 +22859,7 @@ this.node_value.active = !1;
 this.node_task.active = !1;
 this.openBtn_ani.node.active = !1;
 this.lbl_Ani.node.active = !0;
-gData.gameData.init_redBagTask = !1;
 gData.gameData.init_task = !0;
-gData.gameData.setProp(p.GameProp.redBagTaskRefresh, gData.gameData.init_redBagTask);
 };
 e.prototype.onEnable = function() {
 mk.ad.showBanner(p.BannerAdType.banner_click_2);
@@ -22831,22 +22920,32 @@ e.showChangePart();
 }
 }
 }
+if (gData.gameData.init_redBagTask) {
+gData.gameData.init_redBagTask = !1;
+gData.gameData.init_productTask = !0;
+this.isRefreshTask = !0;
+this.showNewTaskUI();
+this.isShowNewTask = !0;
+}
 };
 e.prototype.initTaskProgressUI = function() {
 var t = this;
 if (gData.gameData.gameData.userFarmTaskInfo) {
 var e = gData.gameData.gameData.userFarmTaskInfo.completeCount, o = gData.gameData.gameData.userFarmTaskInfo.taskCount, n = e / o;
-cc.tween(this.sp_taskProgress).delay(.2).to(.2, {
+if (this.isRefreshTask) {
+this.sp_taskProgress.fillRange = n;
+this.lbl_taskProgress.string = e + "/" + o;
+} else cc.tween(this.sp_taskProgress).delay(.2).to(.2, {
 fillRange: n
 }, {
 onUpdate: function() {
-var e = 100 * t.sp_taskProgress.fillRange;
-t.lbl_taskProgress.string = e.toFixed(0) + "%";
+var e = Math.round(t.sp_taskProgress.fillRange * o);
+t.lbl_taskProgress.string = e + "/" + o;
 }
+}).call(function() {
+t.lbl_taskProgress.string = e + "/" + o;
 }).start();
-cc.tween(this);
 this.lbl_taskNum.string = o.toString();
-this.lbl_taskDes.string = "(" + e + "/" + o + ")";
 var a = this.openBtn_ani.getComponent(l.default);
 if (a && e < o) {
 a.setGray(!0);
@@ -22897,13 +22996,11 @@ e = o.sent();
 mk.console.logSingle("redBagTask=>", e);
 if (0 != e.errcode) return [ 2, null ];
 gData.gameData.gameData.userFarmTaskInfo = e.data.userFarmTaskInfo;
-gData.gameData.init_redBagTask = !0;
+gData.gameData.init_task = !0;
 this.maxNum = gData.gameData.gameData.userFarmTaskInfo.taskCount;
 this.num = 0;
 this.delayTime = 0;
 this.times = 0;
-this.showNewTaskUI();
-this.isShowNewTask = !0;
 gData.receiptNotice.receip_rmb = e.data.cashMoney;
 mk.ui.openPanel("module/newNotice/newNotice");
 mk.data.sendDataEvent(p.DataEventId.Sundry, "任务红包提现成功");
@@ -22957,10 +23054,6 @@ i([ h({
 type: cc.Label,
 displayName: "任务数量"
 }) ], e.prototype, "lbl_taskNum", void 0);
-i([ h({
-type: cc.Label,
-displayName: "任务描述"
-}) ], e.prototype, "lbl_taskDes", void 0);
 i([ h(cc.Node) ], e.prototype, "node_videoIcon", void 0);
 return i([ d ], e);
 }(cc.Component);
@@ -29290,7 +29383,9 @@ mk.console.logSingle("wallet2=>", o);
 if (0 != o.errcode) {
 if (o.data.count > 0) {
 gData.lineUpUIData.personCount = o.data.count;
-mk.ui.openPanel("module/newNotice/LineUpUI");
+gData.lineUpUIData.cashId = t;
+gData.lineUpUIData.refresh = !0;
+mk.ui.openPanel("module/newNotice/lineUpUI");
 }
 return [ 2 ];
 }

packages-hot-update/cfg.json

@@ -9,7 +9,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/kxnlyTest/baseRemote/"
     ],
-    "buildTime": 1631252624818,
-    "genTime": 1631252624818,
+    "buildTime": 1631266832945,
+    "genTime": 1631266832945,
     "genVersion": null
 }