修改字体

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/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,9 +24,6 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 28
-      },
-      {
         "__id__": 29
       },
       {
@@ -34,10 +31,13 @@
       },
       {
         "__id__": 31
+      },
+      {
+        "__id__": 32
       }
     ],
     "_prefab": {
-      "__id__": 32
+      "__id__": 33
     },
     "_opacity": 255,
     "_color": {
@@ -101,7 +101,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 27
+      "__id__": 28
     },
     "_opacity": 255,
     "_color": {
@@ -174,11 +174,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 25
+        "__id__": 26
       }
     ],
     "_prefab": {
-      "__id__": 26
+      "__id__": 27
     },
     "_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__": 25
     },
     "_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": [

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

@@ -917,8 +917,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 124,
-      "height": 54.4
+      "width": 126,
+      "height": 56.4
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1004,7 +1004,7 @@
       "b": 18,
       "a": 255
     },
-    "_width": 2,
+    "_width": 3,
     "_id": ""
   },
   {
@@ -1237,7 +1237,7 @@
       "__id__": 1
     },
     "component": "",
-    "_componentId": "55189x5p0tEzImKka7Ch6fC",
+    "_componentId": "e63d7pMKM1CTrdeSMc1OrBc",
     "handler": "clickVideoBtn",
     "customEventData": ""
   },
@@ -1353,8 +1353,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 124,
-      "height": 54.4
+      "width": 126,
+      "height": 56.4
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1440,7 +1440,7 @@
       "b": 23,
       "a": 255
     },
-    "_width": 2,
+    "_width": 3,
     "_id": ""
   },
   {
@@ -1562,10 +1562,12 @@
   },
   {
     "__type__": "cc.ClickEvent",
-    "target": null,
+    "target": {
+      "__id__": 1
+    },
     "component": "",
-    "_componentId": "",
-    "handler": "",
+    "_componentId": "e63d7pMKM1CTrdeSMc1OrBc",
+    "handler": "clickExitBtn",
     "customEventData": ""
   },
   {

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__": 116
       },
       {
-        "__id__": 113
+        "__id__": 117
       },
       {
-        "__id__": 114
+        "__id__": 118
       }
     ],
     "_prefab": {
-      "__id__": 115
+      "__id__": 119
     },
     "_opacity": 255,
     "_color": {
@@ -134,7 +134,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 111
+      "__id__": 115
     },
     "_opacity": 255,
     "_color": {
@@ -2285,7 +2285,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "0arvX2BpNL3pskr0RAkxVB",
+    "fileId": "023gDjWE5CwYs70dZkaI4s",
     "sync": false
   },
   {
@@ -2417,7 +2417,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "79uijYQT1HyomKrggGFScw",
+    "fileId": "5fY4/YQ3pL86WZfaK+mfRl",
     "sync": false
   },
   {
@@ -2549,7 +2549,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "cf+t7dVZFE7oNH4k3+IyDF",
+    "fileId": "52XSzFA41Ir6SVXqiyEoe5",
     "sync": false
   },
   {
@@ -2765,7 +2765,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "67yeajyz5AA5DPYNJgIGpx",
+    "fileId": "3anizeioRJ6p6gvL75d3Qh",
     "sync": false
   },
   {
@@ -2876,7 +2876,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "3cl2kLmJNEm7k1JgiV6EKr",
+    "fileId": "acZoVQnGpEQ4B6SZf1EFvw",
     "sync": false
   },
   {
@@ -3374,7 +3374,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "ea0U2TeDtPxIjCjDF4eVbu",
+    "fileId": "7fQO8T+5dOwqzSvPVOmBeY",
     "sync": false
   },
   {
@@ -3424,22 +3424,25 @@
       },
       {
         "__id__": 103
+      },
+      {
+        "__id__": 106
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 106
+        "__id__": 110
       },
       {
-        "__id__": 107
+        "__id__": 111
       },
       {
-        "__id__": 109
+        "__id__": 113
       }
     ],
     "_prefab": {
-      "__id__": 110
+      "__id__": 114
     },
     "_opacity": 255,
     "_color": {
@@ -3603,7 +3606,7 @@
       "__id__": 99
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 104
@@ -3703,6 +3706,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 +3882,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 108
+        "__id__": 112
       }
     ],
     "_N$interactable": true,
@@ -3889,7 +4023,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 

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

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

assets/script/game/game/Game.ts

@@ -216,11 +216,12 @@ 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)
+            //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>点击领取任务!</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)
                 {

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,7 +9,7 @@ export default class LineUpUI extends cc.Component {
 
 
     start(){
-        this.lbl_tip.string = gData.lineUpUIData.personCount.toString();
+        this.lbl_tip.string = `提现排队中，你前面还有${gData.lineUpUIData.personCount}人`;
     }
 
     private clickVideoBtn()

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

@@ -40,7 +40,7 @@ export default class RedBagTask extends cc.Component {
     @property(cc.Node)
     private node_videoIcon: cc.Node = null;
 
-    private isShowNewTask = true;
+    private isShowNewTask = false;
     private num = 0;
     private delayTime = 0;
     private times = 0;
@@ -51,12 +51,12 @@ export default class RedBagTask extends cc.Component {
 
     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,12 @@ export default class RedBagTask extends cc.Component {
             }
 
         }
+
+        if (gData.gameData.init_redBagTask) {
+            gData.gameData.init_redBagTask = false;
+            this.showNewTaskUI();
+            this.isShowNewTask = true;
+        }
     }
 
     private initTaskProgressUI() {
@@ -166,10 +172,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 +232,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).toString();
+            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() {