1

assets/resources/game/prefab/game.prefab

@@ -27,14 +27,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 306
+        "__id__": 311
       },
       {
-        "__id__": 308
+        "__id__": 313
       }
     ],
     "_prefab": {
-      "__id__": 309
+      "__id__": 314
     },
     "_opacity": 255,
     "_color": {
@@ -4484,7 +4484,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "fbi/dftNpKcYDC4uc/7wvy",
+    "fileId": "7cASg8xkxIvZb8GfiVRn+P",
     "sync": false
   },
   {
@@ -4696,7 +4696,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "e06oDK90hM6qVZYhbgui9Q",
+    "fileId": "4fsOgMoiZHG5Sjw4qUgoau",
     "sync": false
   },
   {
@@ -4805,7 +4805,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "c5R4dgD/hOMqwprmmhzJGT",
+    "fileId": "91rBECbwVF5LKgOWasQuAG",
     "sync": false
   },
   {
@@ -5935,6 +5935,7 @@
       "__id__": 2
     },
     "_enabled": true,
+    "isFitSpecialNode": false,
     "_id": ""
   },
   {
@@ -5969,11 +5970,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 304
+        "__id__": 309
       }
     ],
     "_prefab": {
-      "__id__": 305
+      "__id__": 310
     },
     "_opacity": 255,
     "_color": {
@@ -7930,20 +7931,20 @@
         "__id__": 251
       },
       {
-        "__id__": 292
+        "__id__": 297
       },
       {
-        "__id__": 296
+        "__id__": 301
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 302
+        "__id__": 307
       }
     ],
     "_prefab": {
-      "__id__": 303
+      "__id__": 308
     },
     "_opacity": 255,
     "_color": {
@@ -8345,22 +8346,25 @@
       },
       {
         "__id__": 272
+      },
+      {
+        "__id__": 287
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 287
+        "__id__": 292
       },
       {
-        "__id__": 288
+        "__id__": 293
       },
       {
-        "__id__": 290
+        "__id__": 295
       }
     ],
     "_prefab": {
-      "__id__": 291
+      "__id__": 296
     },
     "_opacity": 255,
     "_color": {
@@ -9639,6 +9643,157 @@
     "sync": false
   },
   {
+    "__type__": "cc.Node",
+    "_name": "增加效果文本",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 251
+    },
+    "_children": [],
+    "_active": false,
+    "_components": [
+      {
+        "__id__": 288
+      },
+      {
+        "__id__": 289
+      },
+      {
+        "__id__": 290
+      }
+    ],
+    "_prefab": {
+      "__id__": 291
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 49.61,
+      "height": 67
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        62,
+        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__": 287
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "+1",
+    "_N$string": "+1",
+    "_fontSize": 40,
+    "_lineHeight": 50,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 1,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 1,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.LabelOutline",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 287
+    },
+    "_enabled": true,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 139,
+      "g": 69,
+      "b": 19,
+      "a": 255
+    },
+    "_width": 2,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 287
+    },
+    "_enabled": true,
+    "_defaultClip": {
+      "__uuid__": "7ed7c68f-a943-47b4-83fe-aa7df7e01c96"
+    },
+    "_clips": [
+      {
+        "__uuid__": "7ed7c68f-a943-47b4-83fe-aa7df7e01c96"
+      }
+    ],
+    "playOnLoad": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
+    },
+    "fileId": "26/uS6ZXJDIboD45DDq0fe",
+    "sync": false
+  },
+  {
     "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
@@ -9684,7 +9839,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 289
+        "__id__": 294
       }
     ],
     "_N$interactable": true,
@@ -9793,14 +9948,14 @@
     "_active": false,
     "_components": [
       {
-        "__id__": 293
+        "__id__": 298
       },
       {
-        "__id__": 294
+        "__id__": 299
       }
     ],
     "_prefab": {
-      "__id__": 295
+      "__id__": 300
     },
     "_opacity": 255,
     "_color": {
@@ -9854,7 +10009,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 292
+      "__id__": 297
     },
     "_enabled": true,
     "_materials": [
@@ -9886,7 +10041,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 292
+      "__id__": 297
     },
     "_enabled": false,
     "panel_name": "module/farmMap/farmMap",
@@ -9918,17 +10073,17 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 297
+        "__id__": 302
       },
       {
-        "__id__": 298
+        "__id__": 303
       },
       {
-        "__id__": 299
+        "__id__": 304
       }
     ],
     "_prefab": {
-      "__id__": 301
+      "__id__": 306
     },
     "_opacity": 255,
     "_color": {
@@ -9982,7 +10137,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 296
+      "__id__": 301
     },
     "_enabled": true,
     "_materials": [
@@ -10014,7 +10169,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 296
+      "__id__": 301
     },
     "_enabled": true,
     "_defaultClip": {
@@ -10033,7 +10188,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 296
+      "__id__": 301
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -10042,7 +10197,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 300
+        "__id__": 305
       }
     ],
     "_N$interactable": true,
@@ -10191,7 +10346,7 @@
       "__id__": 246
     },
     "btn8": {
-      "__id__": 296
+      "__id__": 301
     },
     "_id": ""
   },
@@ -10236,7 +10391,7 @@
       "__id__": 3
     },
     "nodeRedPoint": {
-      "__id__": 307
+      "__id__": 312
     },
     "icon_plant": {
       "__id__": 253
@@ -10271,6 +10426,9 @@
     "sp_gradeName": {
       "__id__": 77
     },
+    "ani_add2": {
+      "__id__": 290
+    },
     "_id": ""
   },
   {

assets/resources/module/blessingBag/blessingBagItem.prefab

@@ -46,19 +46,22 @@
       },
       {
         "__id__": 58
+      },
+      {
+        "__id__": 61
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 61
+        "__id__": 66
       },
       {
-        "__id__": 62
+        "__id__": 67
       }
     ],
     "_prefab": {
-      "__id__": 63
+      "__id__": 68
     },
     "_opacity": 255,
     "_color": {
@@ -627,7 +630,7 @@
     "asset": {
       "__uuid__": "3c12cc7b-777b-45f9-8bf1-8a285075e6f7"
     },
-    "fileId": "854NOdq/5CObiAo/DZ8AnT",
+    "fileId": "70Q87myRtPEJZcfeQv5yrH",
     "sync": false
   },
   {
@@ -736,7 +739,7 @@
     "asset": {
       "__uuid__": "3c12cc7b-777b-45f9-8bf1-8a285075e6f7"
     },
-    "fileId": "9cdTo3ZcZM/I9zL2e8tHU1",
+    "fileId": "7bcKZ0oQdCYLMeSgtF8psp",
     "sync": false
   },
   {
@@ -2203,6 +2206,157 @@
     "sync": false
   },
   {
+    "__type__": "cc.Node",
+    "_name": "增加效果文本",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 62
+      },
+      {
+        "__id__": 63
+      },
+      {
+        "__id__": 64
+      }
+    ],
+    "_prefab": {
+      "__id__": 65
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 237,
+      "g": 13,
+      "b": 63,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 36.2,
+      "height": 39.8
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        74.494,
+        -86.471,
+        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__": 61
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "+1",
+    "_N$string": "+1",
+    "_fontSize": 30,
+    "_lineHeight": 30,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 1,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 1,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.LabelOutline",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 61
+    },
+    "_enabled": true,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_width": 1,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 61
+    },
+    "_enabled": false,
+    "_defaultClip": {
+      "__uuid__": "7ed7c68f-a943-47b4-83fe-aa7df7e01c96"
+    },
+    "_clips": [
+      {
+        "__uuid__": "7ed7c68f-a943-47b4-83fe-aa7df7e01c96"
+      }
+    ],
+    "playOnLoad": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "3c12cc7b-777b-45f9-8bf1-8a285075e6f7"
+    },
+    "fileId": "c1ukup7/1GuoPHSC2sP1mu",
+    "sync": false
+  },
+  {
     "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
@@ -2263,6 +2417,9 @@
     "btnNoFinish": {
       "__id__": 31
     },
+    "ani_fadeUp": {
+      "__id__": 61
+    },
     "_id": ""
   },
   {

assets/resources/module/gradeReward/gradeReward.prefab

@@ -370,7 +370,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 336,
+      "width": 420,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -422,8 +422,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "看视频将获得大量等级经验",
-    "_N$string": "看视频将获得大量等级经验",
+    "_string": "生产和看视频将获得大量等级经验",
+    "_N$string": "生产和看视频将获得大量等级经验",
     "_fontSize": 28,
     "_lineHeight": 40,
     "_enableWrapText": true,

assets/resources/module/newCashUI/walletCashOut.prefab

@@ -185,7 +185,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 717,
-      "height": 1195
+      "height": 1295
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -465,7 +465,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 630,
-      "height": 1100
+      "height": 1250
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -548,7 +548,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        505.529,
+        550.529,
         0,
         0,
         0,
@@ -841,14 +841,14 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        406.574,
+        433.574,
         0,
         0,
         0,
         0,
         1,
-        1,
-        1,
+        1.4,
+        1.4,
         1
       ]
     },
@@ -1113,7 +1113,7 @@
     "asset": {
       "__uuid__": "e3718e3b-b05d-4d23-9195-924548d5c740"
     },
-    "fileId": "0duKxZQqlCIrsEa1aVr7e5",
+    "fileId": "b3yD46tSNFRI9RlbihXPmu",
     "sync": false
   },
   {
@@ -1322,7 +1322,7 @@
     "asset": {
       "__uuid__": "e3718e3b-b05d-4d23-9195-924548d5c740"
     },
-    "fileId": "38syhgcCJDAKW97A+48lcl",
+    "fileId": "755NqsgJhNNaTQwLbc2pyz",
     "sync": false
   },
   {
@@ -1543,9 +1543,6 @@
       },
       {
         "__id__": 86
-      },
-      {
-        "__id__": 107
       }
     ],
     "_active": true,
@@ -1570,8 +1567,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 581,
-      "height": 179
+      "width": 610,
+      "height": 200
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1582,8 +1579,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        269.491,
+        -4,
+        289.491,
         0,
         0,
         0,
@@ -1644,7 +1641,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 330.08000000000004,
+      "width": 345.75,
       "height": 50
     },
     "_anchorPoint": {
@@ -1656,7 +1653,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -93.5,
+        -105.5,
         36.75,
         0,
         0,
@@ -1708,7 +1705,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 129.99,
+      "width": 138.66,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -1720,7 +1717,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -100.04500000000002,
+        -103.545,
         1,
         0,
         0,
@@ -1762,7 +1759,7 @@
     "_dstBlendFactor": 771,
     "_string": "福利现金:",
     "_N$string": "福利现金:",
-    "_fontSize": 30,
+    "_fontSize": 32,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": null,
@@ -1828,15 +1825,15 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -0.05000000000001137,
+        0.7849999999999966,
         0,
         0,
         0,
         0,
         0,
         1,
-        1,
-        1,
+        1.1,
+        1.1,
         1
       ]
     },
@@ -1926,7 +1923,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 130.09,
+      "width": 137.09,
       "height": 54.4
     },
     "_anchorPoint": {
@@ -1938,7 +1935,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        99.99499999999999,
+        104.33,
         1,
         0,
         0,
@@ -1980,7 +1977,7 @@
     "_dstBlendFactor": 771,
     "_string": "5.000元",
     "_N$string": "5.000元",
-    "_fontSize": 36,
+    "_fontSize": 38,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": null,
@@ -2035,7 +2032,7 @@
     "_enabled": true,
     "_layoutSize": {
       "__type__": "cc.Size",
-      "width": 330.08000000000004,
+      "width": 345.75,
       "height": 50
     },
     "_resize": 1,
@@ -2114,15 +2111,15 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        183.664,
-        35.18,
+        188.664,
+        37.18,
         0,
         0,
         0,
         0,
         1,
-        1,
-        1,
+        1.2,
+        1.2,
         1
       ]
     },
@@ -2452,15 +2449,15 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        183.664,
-        -41.472,
+        188.664,
+        -48.472,
         0,
         0,
         0,
         0,
         1,
-        1.2,
-        1.2,
+        1.4,
+        1.4,
         1
       ]
     },
@@ -2903,16 +2900,19 @@
       },
       {
         "__id__": 102
+      },
+      {
+        "__id__": 105
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 105
+        "__id__": 108
       }
     ],
     "_prefab": {
-      "__id__": 106
+      "__id__": 109
     },
     "_opacity": 255,
     "_color": {
@@ -2924,7 +2924,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 332,
+      "width": 345,
       "height": 41
     },
     "_anchorPoint": {
@@ -2936,8 +2936,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -94.063,
-        -16.304,
+        -108.063,
+        -29.304,
         0,
         0,
         0,
@@ -2988,7 +2988,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 328,
+      "width": 342,
       "height": 37
     },
     "_anchorPoint": {
@@ -3044,7 +3044,7 @@
       "__uuid__": "8d0db762-e91a-45be-9b65-9ed2009991bd"
     },
     "_type": 3,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillType": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
@@ -3052,7 +3052,7 @@
       "y": 0
     },
     "_fillStart": 0,
-    "_fillRange": 0.83,
+    "_fillRange": 0.5,
     "_isTrimmedMode": true,
     "_atlas": null,
     "_id": ""
@@ -3604,64 +3604,21 @@
     "sync": false
   },
   {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 86
-    },
-    "_enabled": true,
-    "_materials": [
-      {
-        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
-      }
-    ],
-    "_srcBlendFactor": 770,
-    "_dstBlendFactor": 771,
-    "_spriteFrame": {
-      "__uuid__": "d799ebe5-6f84-43b4-b23d-0ffa66b6230a"
-    },
-    "_type": 0,
-    "_sizeMode": 1,
-    "_fillType": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_atlas": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__uuid__": "e3718e3b-b05d-4d23-9195-924548d5c740"
-    },
-    "fileId": "12nZvOCIhIFKn/c/2b5z+c",
-    "sync": false
-  },
-  {
     "__type__": "cc.Node",
     "_name": "tip",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 49
+      "__id__": 86
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 108
+        "__id__": 106
       }
     ],
     "_prefab": {
-      "__id__": 109
+      "__id__": 107
     },
     "_opacity": 255,
     "_color": {
@@ -3673,7 +3630,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 211.12,
+      "width": 274.46,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -3685,8 +3642,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -94.063,
-        -57.675,
+        0,
+        -41.371,
         0,
         0,
         0,
@@ -3715,7 +3672,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 107
+      "__id__": 105
     },
     "_enabled": true,
     "_materials": [
@@ -3727,7 +3684,7 @@
     "_dstBlendFactor": 771,
     "_string": "进度加满后必得5元现金",
     "_N$string": "进度加满后必得5元现金",
-    "_fontSize": 20,
+    "_fontSize": 26,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": null,
@@ -3751,7 +3708,50 @@
     "asset": {
       "__uuid__": "e3718e3b-b05d-4d23-9195-924548d5c740"
     },
-    "fileId": "90RMQJ3INHu7SegtU3EtHX",
+    "fileId": "3cUAB875tKIoyVlKHnoGf0",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 86
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "d799ebe5-6f84-43b4-b23d-0ffa66b6230a"
+    },
+    "_type": 0,
+    "_sizeMode": 0,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "e3718e3b-b05d-4d23-9195-924548d5c740"
+    },
+    "fileId": "12nZvOCIhIFKn/c/2b5z+c",
     "sync": false
   },
   {
@@ -3773,7 +3773,7 @@
       "__uuid__": "60d4cb48-7dd2-46b9-9044-d00060ac3baf"
     },
     "_type": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillType": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
@@ -3909,8 +3909,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 581,
-      "height": 498
+      "width": 610,
+      "height": 550
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -3922,7 +3922,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -95.149,
+        -114.149,
         0,
         0,
         0,
@@ -3980,8 +3980,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 540,
-      "height": 118
+      "width": 570,
+      "height": 148
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -3993,7 +3993,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        161.682,
+        179.682,
         0,
         0,
         0,
@@ -4057,14 +4057,14 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        33,
+        44,
         0,
         0,
         0,
         0,
         1,
-        1,
-        1,
+        1.2,
+        1.2,
         1
       ]
     },
@@ -4177,14 +4177,14 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -14,
+        -20,
         0,
         0,
         0,
         0,
         1,
-        1,
-        1,
+        1.4,
+        1.4,
         1
       ]
     },
@@ -4880,7 +4880,7 @@
       "__uuid__": "c086456f-8287-4613-a6ad-6c4187ecc195"
     },
     "_type": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillType": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
@@ -5024,7 +5024,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -6.5,
+        -21.5,
         95.044,
         0,
         0,
@@ -5390,7 +5390,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 40.9,
+      "width": 46.01,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -5444,7 +5444,7 @@
     "_dstBlendFactor": 771,
     "_string": "剩3次",
     "_N$string": "剩3次",
-    "_fontSize": 16,
+    "_fontSize": 18,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": null,
@@ -5751,7 +5751,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        9.5,
+        24.5,
         0,
         0,
         0,
@@ -6037,7 +6037,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 40.9,
+      "width": 46.01,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -6091,7 +6091,7 @@
     "_dstBlendFactor": 771,
     "_string": "剩3次",
     "_N$string": "剩3次",
-    "_fontSize": 16,
+    "_fontSize": 18,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": null,
@@ -6398,7 +6398,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        192.5,
+        222.5,
         0,
         0,
         0,
@@ -6684,7 +6684,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 40.9,
+      "width": 46.01,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -6738,7 +6738,7 @@
     "_dstBlendFactor": 771,
     "_string": "剩3次",
     "_N$string": "剩3次",
-    "_fontSize": 16,
+    "_fontSize": 18,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": null,
@@ -7015,7 +7015,7 @@
     "_N$paddingRight": 0,
     "_N$paddingTop": 0,
     "_N$paddingBottom": 0,
-    "_N$spacingX": 30,
+    "_N$spacingX": 45,
     "_N$spacingY": 0,
     "_N$verticalDirection": 1,
     "_N$horizontalDirection": 0,
@@ -7082,8 +7082,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -6.5,
-        0,
+        -21.5,
+        -11,
         0,
         0,
         0,
@@ -7448,7 +7448,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 40.9,
+      "width": 46.01,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -7500,9 +7500,9 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "剩3次",
-    "_N$string": "剩3次",
-    "_fontSize": 16,
+    "_string": "剩9次",
+    "_N$string": "剩9次",
+    "_fontSize": 18,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": null,
@@ -7809,7 +7809,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        9.5,
+        24.5,
         0,
         0,
         0,
@@ -8095,7 +8095,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 40.9,
+      "width": 46.01,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -8149,7 +8149,7 @@
     "_dstBlendFactor": 771,
     "_string": "剩3次",
     "_N$string": "剩3次",
-    "_fontSize": 16,
+    "_fontSize": 18,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": null,
@@ -8456,7 +8456,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        192.5,
+        222.5,
         0,
         0,
         0,
@@ -8742,7 +8742,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 40.9,
+      "width": 46.01,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -8796,7 +8796,7 @@
     "_dstBlendFactor": 771,
     "_string": "剩3次",
     "_N$string": "剩3次",
-    "_fontSize": 16,
+    "_fontSize": 18,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": null,
@@ -9073,7 +9073,7 @@
     "_N$paddingRight": 0,
     "_N$paddingTop": 0,
     "_N$paddingBottom": 0,
-    "_N$spacingX": 30,
+    "_N$spacingX": 45,
     "_N$spacingY": 0,
     "_N$verticalDirection": 1,
     "_N$horizontalDirection": 0,
@@ -9214,8 +9214,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 540,
-      "height": 118
+      "width": 570,
+      "height": 148
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -9227,7 +9227,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -169,
+        -191,
         0,
         0,
         0,
@@ -9278,7 +9278,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 140,
+      "width": 160,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -9290,8 +9290,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -176.386,
-        20.067,
+        -183.386,
+        27.067,
         0,
         0,
         0,
@@ -9332,7 +9332,7 @@
     "_dstBlendFactor": 771,
     "_string": "提现条件：",
     "_N$string": "提现条件：",
-    "_fontSize": 28,
+    "_fontSize": 32,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": null,
@@ -9386,7 +9386,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 320.75,
+      "width": 345.42,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -9398,7 +9398,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -246.945,
+        -262.945,
         -22.575,
         0,
         0,
@@ -9440,7 +9440,7 @@
     "_dstBlendFactor": 771,
     "_string": "需要0.3元，当前只有0.20元",
     "_N$string": "需要0.3元，当前只有0.20元",
-    "_fontSize": 26,
+    "_fontSize": 28,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": null,
@@ -9519,15 +9519,15 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        183.664,
-        -5.942,
+        191.808,
+        0,
         0,
         0,
         0,
         0,
         1,
-        1.2,
-        1.2,
+        1.4,
+        1.4,
         1
       ]
     },
@@ -9947,7 +9947,7 @@
       "__uuid__": "26d28042-1a94-4a0f-9134-f7c6466471da"
     },
     "_type": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillType": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
@@ -10062,7 +10062,7 @@
       "__uuid__": "63d59e19-3f67-4596-b047-3fac3030e536"
     },
     "_type": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillType": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
@@ -10211,7 +10211,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -440.807,
+        -480.807,
         0,
         0,
         0,
@@ -10632,7 +10632,7 @@
       "__uuid__": "82a89c61-984a-4b1c-bf54-6c43322b014e"
     },
     "_type": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillType": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
@@ -10766,7 +10766,7 @@
       "__id__": 58
     },
     "lbl_tipUp": {
-      "__id__": 108
+      "__id__": 106
     },
     "btn_cashOut": {
       "__id__": 312

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

@@ -54,12 +54,21 @@ export class RewardData extends Data {
         let is_add_money = true;
         const i_count = gData.reward.data.length;
         for (let i = 0; i < i_count; i++) {
-            if (gData.reward.data[i].rewardType === RewardType.rmb || gData.reward.data[i].rewardType === RewardType.productTimes) continue;
+            if (gData.reward.data[i].rewardType === RewardType.rmb) continue;
             if (gData.reward.data[i].rewardNum == 0) continue;
             mk.audio.playEffect('redmoney');
-            mk.fly.PlayCoinAnim(gData.reward.data[i].rewardType, 10, world_Pos, '', () => {
+            let endPos = '';
+            let num = 10;
+            let scale = -1;
+            if( gData.reward.data[i].rewardType === RewardType.productTimes)
+            {
+                endPos = 'Canvas/主界面层/game/功能按钮/底部按钮/中间按钮';
+                num = 5;
+                scale = 0.8;
+            }
+            mk.fly.PlayCoinAnim(gData.reward.data[i].rewardType, num, world_Pos, endPos, () => {
                 is_add_money && this.addReward();
-            })
+            }, scale)
         }
     }
 }

assets/script/game/game/Game.ts

@@ -62,6 +62,9 @@ export default class Game extends cc.Component {
     @property({ type: cc.Sprite, displayName: '等级名字' })
     sp_gradeName: cc.Sprite = null;
 
+    @property({ type: cc.Animation, displayName: '增加效果文本2' })
+    ani_add2: cc.Animation = null;
+
 
     /** 是否开始增加次数倒计时 */
     private lastTimeSpan = 0;
@@ -436,7 +439,7 @@ export default class Game extends cc.Component {
         if (flyRed) {
             //mk.audio.playEffect('redmoney');
             let pos = this.node_taskHb.parent.convertToWorldSpaceAR(this.node_taskHb.getPosition());
-            mk.fly.PlayCoinAnim(1, 3, this.btn_product, pos, () => {
+            mk.fly.PlayCoinAnim(1, 5, this.btn_product, pos, () => {
                 gData.gameData.init_task = true;
             }, 0.8);
         }
@@ -467,10 +470,18 @@ export default class Game extends cc.Component {
         }
     }
 
-    private playAdd(exp) {
-        this.ani_add.node.getComponent(cc.Label).string = `+${exp}`;
-        this.ani_add.node.active = true;
-        this.ani_add.play();
+    public playAdd(exp, type = 1) {
+        if(type == 1)
+        {
+            this.ani_add.node.getComponent(cc.Label).string = `+${exp}`;
+            this.ani_add.node.active = true;
+            this.ani_add.play();
+        }else{
+            this.ani_add2.node.getComponent(cc.Label).string = `+${exp}`;
+            this.ani_add2.node.active = true;
+            this.ani_add2.play();
+        }
+        
         // gData.gameData.init_add = false;
     }
 }

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

@@ -6,7 +6,7 @@
 const { ccclass, property } = cc._decorator;
 
 @ccclass
-export default class BlessingBagItem extends cc.Component{
+export default class BlessingBagItem extends cc.Component {
 
     @property(cc.Label)
     txtNum: cc.Label = null;
@@ -24,6 +24,8 @@ export default class BlessingBagItem extends cc.Component{
     btnCanCash: cc.Node = null;
     @property(cc.Node)
     btnNoFinish: cc.Node = null;
+    @property(cc.Node)
+    ani_fadeUp: cc.Node = null;
 
     data: any = null;
     lastNum: number = 0;
@@ -35,18 +37,21 @@ export default class BlessingBagItem extends cc.Component{
 
     isPlayAni: boolean = false;
 
+    isInit: boolean = true;
+
     /**
      * list_data
      * @param data item数据
      */
     public async setItemData(bData) {
+        this.ani_fadeUp.opacity = 0;
         this.Init(bData.data, bData.isPlayAniUpdate, bData.isPlayInitAni);
     }
 
     Init(data: any, isPlayAni: boolean = false, isPlayInitAni: boolean = false) {
         this.data = data;
-        this.txtNum.string = data.redMoney/100 + "元";
-        this.txtTip.string = "<b><color=#F89800>" + data.redMoney/100 + "元</c><color = #BB6738>提现进度</c></b>";
+        this.txtNum.string = data.redMoney / 100 + "元";
+        this.txtTip.string = "<b><color=#F89800>" + data.redMoney / 100 + "元</c><color = #BB6738>提现进度</c></b>";
         this.btnCashed.active = data.status == 2;
         this.btnCanCash.active = data.status == 1;
         this.btnNoFinish.active = data.status == 0;
@@ -66,9 +71,9 @@ export default class BlessingBagItem extends cc.Component{
                     .start();
             }, 0.3);
         } else {
-            this.txtSlider.string = (data.progressRate*100).toFixed(2) + "%";
+            this.txtSlider.string = (data.progressRate * 100).toFixed(2) + "%";
             this.slider.fillRange = data.progressRate;
-            this.lastNum = data.progressRate *100;
+            this.lastNum = data.progressRate * 100;
         }
     }
 
@@ -78,8 +83,8 @@ export default class BlessingBagItem extends cc.Component{
 
     PlayNumAni(time: number) {
         this.totalTime = time;
-        this.delta = (this.data.progressRate*100 - this.lastNum) / time;
-        this.deltaTime = time / (this.data.progressRate*100 - this.lastNum);
+        this.delta = (this.data.progressRate * 100 - this.lastNum) / time;
+        this.deltaTime = time / (this.data.progressRate * 100 - this.lastNum);
         this.curValue = this.lastNum;
         this.curTime = 0;
         this.isPlayAni = true;
@@ -87,8 +92,8 @@ export default class BlessingBagItem extends cc.Component{
 
     PlayInitNumAni(time: number) {
         this.totalTime = time;
-        this.delta = (this.data.progressRate*100 - 0) / time;
-        this.deltaTime = time / (this.data.progressRate*100 - 0);
+        this.delta = (this.data.progressRate * 100 - 0) / time;
+        this.deltaTime = time / (this.data.progressRate * 100 - 0);
         this.curValue = 0;
         this.curTime = 0;
 
@@ -99,14 +104,14 @@ export default class BlessingBagItem extends cc.Component{
         if (this.curTime < this.totalTime) {
             this.curTime += this.deltaTime;
             this.curValue += this.delta * this.deltaTime;
-            if (this.curValue >= this.data.progressRate*100) {
-                this.curValue = this.data.progressRate*100;
+            if (this.curValue >= this.data.progressRate * 100) {
+                this.curValue = this.data.progressRate * 100;
             }
         } else {
             this.curTime = this.totalTime;
             this.unschedule(this.UpdateAni);
-            this.curValue = this.data.progressRate*100;
-            this.lastNum = this.data.progressRate*100;
+            this.curValue = this.data.progressRate * 100;
+            this.lastNum = this.data.progressRate * 100;
         }
         this.txtSlider.string = this.curValue.toFixed(2) + "%";
         this.slider.fillRange = this.curValue * 0.01;
@@ -117,8 +122,9 @@ export default class BlessingBagItem extends cc.Component{
             if (this.curTime < this.totalTime) {
                 this.curTime += dt;
                 this.curValue += this.delta * dt;
-                if (this.curValue >= this.data.progressRate *100) {
+                if (this.curValue >= this.data.progressRate * 100) {
                     this.isPlayAni = false;
+                    this.doAni();
                     this.curValue = this.data.progressRate * 100;
                     this.lastNum = this.data.progressRate * 100;
                 }
@@ -127,16 +133,34 @@ export default class BlessingBagItem extends cc.Component{
                 //}
             } else {
                 this.isPlayAni = false;
+                this.doAni();
                 this.curTime = this.totalTime;
                 //this.unschedule(this.UpdateAni);
                 this.curValue = this.data.progressRate * 100;
-                this.lastNum = this.data.progressRate * 100;
+                this.lastNum = this.data.progressRate * 100;           
             }
             this.txtSlider.string = this.curValue.toFixed(2) + "%";
             this.slider.fillRange = this.curValue * 0.01;
         }
     }
 
+    doAni() {
+        if(this.isInit)
+        {
+            this.isInit = false;
+            return;
+        }
+        let add = this.data.progressRate*100 - this.lastNum;
+        if(add > 0)
+        {
+            this.ani_fadeUp.scale = 0;
+            this.ani_fadeUp.opacity = 255;
+            cc.tween(this.ani_fadeUp).to(0.2, {scale: 1}).delay(0.6).to(0.2, {opacity: 0}).start();
+            this.ani_fadeUp.getComponent(cc.Label).string = '+' + add.toFixed(1);      
+        }
+        
+    }
+
     OnExit() {
         this.txtSlider.string = "0.00%";
         this.slider.fillRange = 0;
@@ -152,7 +176,7 @@ export default class BlessingBagItem extends cc.Component{
     Click_CanCashBtn() {
         mk.audio.playEffect("button");
         console.log("clicked canCash");
-        gData.blessingBag.OpenTaskRbPanel( this.data.Id, this.data.redMoney);
+        gData.blessingBag.OpenTaskRbPanel(this.data.Id, this.data.redMoney);
     }
 
     Click_NoFinishBtn() {

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

@@ -38,7 +38,7 @@ export default class FarmMap extends cc.Component {
         //let list_data = [{}, {}, {}, {}, {}, {}];
         this.scroll_view.node.emit('srollview-init', list_data)
         this.scroll_view.vertical = false;
-        cc.tween(this.node).delay(0.1).call(() => {
+        cc.tween(this.node).delay(0.06).call(() => {
             let allItem = this.tableview.getFrontPositionItemByCount(5);
 
             for (let i = 0; i != allItem.length; ++i) {

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

@@ -19,6 +19,11 @@ export default class ProductReward extends cc.Component {
     @property({ type: cc.Node, displayName: '未完成节点' })
     node_Uncomplete: cc.Node = null;
 
+    @property({type: cc.Node, displayName: '节点1'})
+    node_1: cc.Node = null;
+    @property({type: cc.Node, displayName: '节点2'})
+    node_2: cc.Node = null;
+
     onEnable() {
         this.scheduleOnce(() => {
             mk.guide.open(4);
@@ -30,29 +35,35 @@ export default class ProductReward extends cc.Component {
         if (gData.gameData.playerProp.userFarmTaskInfo) {
             let com = gData.gameData.playerProp.userFarmTaskInfo.completeCount;
             let count = gData.gameData.playerProp.userFarmTaskInfo.taskCount;
-            if (count > com) {
-                this.lbl_taskTimes.string = (count - com).toString();
-                this.node_Uncomplete.active = true;
-                this.node_complete.active = false;
-                // this.node_Uncomplete.scale = 2;
-                // let posY = this.node_Uncomplete.y;
-                // this.node_Uncomplete.y = posY + 200;
-                // cc.tween(this.node_Uncomplete).delay(0.2).to(0.4, {scale: 1, y: posY}).start();
-            } else {
-                this.node_Uncomplete.active = false;
-                this.node_complete.active = true;
-            }
-            
-            let per = com / count;
-            cc.tween(this.sp_taskProgress).delay(0.2).to(0.3, { fillRange: per }, {
-                onUpdate: () => {
-                    let num = Math.round(this.sp_taskProgress.fillRange * count);
-                    this.lbl_progress.string = `${num}/${count}`;
+            if(count <= 10)
+            {
+                if (count > com) {
+                    this.lbl_taskTimes.string = (count - com).toString();
+                    this.node_Uncomplete.active = true;
+                    this.node_complete.active = false;
+                    // this.node_Uncomplete.scale = 2;
+                    // let posY = this.node_Uncomplete.y;
+                    // this.node_Uncomplete.y = posY + 200;
+                    // cc.tween(this.node_Uncomplete).delay(0.2).to(0.4, {scale: 1, y: posY}).start();
+                } else {
+                    this.node_Uncomplete.active = false;
+                    this.node_complete.active = true;
                 }
-            }).call(()=>{
-                this.lbl_progress.string = `${com}/${count}`;
-            }).start();
-            //this.sp_taskProgress.fillRange = 
+                
+                let per = com / count;
+                cc.tween(this.sp_taskProgress).delay(0.2).to(0.3, { fillRange: per }, {
+                    onUpdate: () => {
+                        let num = Math.round(this.sp_taskProgress.fillRange * count);
+                        this.lbl_progress.string = `${num}/${count}`;
+                    }
+                }).call(()=>{
+                    this.lbl_progress.string = `${com}/${count}`;
+                }).start();
+            }else{
+                this.node_1.active = false;
+                this.node_2.active = false;
+            }
+        
         }
     }
 
@@ -61,16 +72,19 @@ export default class ProductReward extends cc.Component {
             if (gData.gameData.playerProp.userFarmTaskInfo) {
                 let com = gData.gameData.playerProp.userFarmTaskInfo.completeCount;
                 let count = gData.gameData.playerProp.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;
+                if(count <= 10)
+                {
+                    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;
+                }              
             }
 
             gData.gameData.init_productTask = false;
@@ -94,7 +108,9 @@ export default class ProductReward extends cc.Component {
     }
 
     addTimes() {
-        gData.gameData.changeLeftTimes(parseInt(gData.gameData.configs.ServerConfig.ProductionAd));
+        let add = parseInt(gData.gameData.configs.ServerConfig.ProductionAd);
+        gData.gameData.changeLeftTimes(add);
+        gData.gameData.gameStyle.playAdd(add, 2);
     }
 
     private clickCloseBtn() {