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

assets/resources/game/prefab/game.prefab

@@ -4538,7 +4538,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 370.8,
+      "width": 400,
       "height": 103.2
     },
     "_anchorPoint": {
@@ -4747,7 +4747,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -44.799,
+        -46.799,
         24.599,
         0,
         0,
@@ -4899,7 +4899,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "7c3McgHWdGTZdMaoagyLlo",
+    "fileId": "3edOH3a+FHcr+7wuVRbmoL",
     "sync": false
   },
   {
@@ -4980,7 +4980,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -43.324,
+        -45.324,
         -18.599,
         0,
         0,
@@ -5111,7 +5111,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "fcyngFNe1F5rVKPV0atWVz",
+    "fileId": "5fZfahilRBnqo+c2OinR7K",
     "sync": false
   },
   {
@@ -5220,7 +5220,7 @@
     "asset": {
       "__uuid__": "b4dea4a9-29c8-46bc-a50d-5754afa7a2bd"
     },
-    "fileId": "18A7qN1HVKH5c5qvPb3QOm",
+    "fileId": "a55yWEU3tJG405w3gcMIJ7",
     "sync": false
   },
   {
@@ -5297,7 +5297,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        136.764,
+        145.764,
         0,
         0,
         0,

assets/resources/module/sign/sign.prefab

@@ -1968,7 +1968,7 @@
       "r": 0,
       "g": 0,
       "b": 0,
-      "a": 230
+      "a": 180
     },
     "design_block_node": {
       "__id__": 4

assets/resources/module/speedUpUI/completeImmediately.prefab

@@ -215,8 +215,8 @@
         0,
         0,
         1,
-        1,
-        1,
+        1.2,
+        1.2,
         1
       ]
     },
@@ -1815,8 +1815,11 @@
       "__id__": 2
     },
     "open_effect": 1,
+    "isOpenCloseEffect": true,
     "close_effect": 1,
     "close_toPoint": "",
+    "close_uibg": false,
+    "isDelayOneFrame": false,
     "_id": ""
   },
   {
@@ -1828,6 +1831,7 @@
     },
     "_enabled": true,
     "sp_icon": null,
+    "lbl_name": null,
     "_id": ""
   },
   {

assets/resources/module/speedUpUI/productReward.prefab

@@ -13,7 +13,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "productReward",
+    "_name": "completeImmediately",
     "_objFlags": 0,
     "_parent": null,
     "_children": [
@@ -215,8 +215,8 @@
         0,
         0,
         1,
-        1,
-        1,
+        1.2,
+        1.2,
         1
       ]
     },
@@ -758,7 +758,7 @@
         1,
         1,
         1,
-        0
+        1
       ]
     },
     "_eulerAngles": {
@@ -1168,8 +1168,8 @@
     ],
     "_N$interactable": true,
     "_N$enableAutoGrayEffect": false,
-    "_N$transition": 3,
-    "transition": 3,
+    "_N$transition": 0,
+    "transition": 0,
     "_N$normalColor": {
       "__type__": "cc.Color",
       "r": 255,
@@ -1698,9 +1698,7 @@
       "__id__": 1
     },
     "_enabled": true,
-    "lbl_times": {
-      "__id__": 34
-    },
+    "lbl_times": null,
     "_id": ""
   },
   {

assets/resources/module/speedUpUI/productReward2.prefab

@@ -24,20 +24,20 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 65
+        "__id__": 74
       },
       {
-        "__id__": 66
+        "__id__": 75
       },
       {
-        "__id__": 67
+        "__id__": 76
       },
       {
-        "__id__": 68
+        "__id__": 77
       }
     ],
     "_prefab": {
-      "__id__": 69
+      "__id__": 78
     },
     "_opacity": 255,
     "_color": {
@@ -101,7 +101,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 64
+      "__id__": 73
     },
     "_opacity": 255,
     "_color": {
@@ -174,20 +174,23 @@
         "__id__": 33
       },
       {
-        "__id__": 36
+        "__id__": 42
       },
       {
-        "__id__": 39
+        "__id__": 45
+      },
+      {
+        "__id__": 48
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 62
+        "__id__": 71
       }
     ],
     "_prefab": {
-      "__id__": 63
+      "__id__": 72
     },
     "_opacity": 255,
     "_color": {
@@ -218,8 +221,8 @@
         0,
         0,
         1,
-        1,
-        1,
+        1.2,
+        1.2,
         1
       ]
     },
@@ -740,8 +743,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 283,
-      "height": 112
+      "width": 170,
+      "height": 60
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -752,15 +755,15 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        -397.676,
+        160,
+        -403,
         0,
         0,
         0,
         0,
         1,
-        1,
-        1,
+        1.2,
+        1.2,
         1
       ]
     },
@@ -816,15 +819,15 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -93.024,
-        7.429,
+        -82.593,
+        5,
         0,
         0,
         0,
-        -0.05799963026006231,
-        0.9983166045347017,
-        1,
-        1,
+        0.2552010731127484,
+        0.9668880040015502,
+        0.7,
+        0.7,
         1
       ]
     },
@@ -832,7 +835,7 @@
       "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
-      "z": -6.65
+      "z": 29.570999999999998
     },
     "_skewX": 0,
     "_skewY": 0,
@@ -914,7 +917,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 154.8,
+      "width": 124,
       "height": 54.4
     },
     "_anchorPoint": {
@@ -926,8 +929,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        16.304,
-        5,
+        6.3039999999999985,
+        3,
         0,
         0,
         0,
@@ -966,9 +969,9 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "领取次数",
-    "_N$string": "领取次数",
-    "_fontSize": 37.7,
+    "_string": "领取红包",
+    "_N$string": "领取红包",
+    "_fontSize": 30,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": null,
@@ -1021,7 +1024,7 @@
       "__id__": 18
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 27
@@ -1052,7 +1055,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        121.654,
+        329.661,
         40.133,
         0,
         0,
@@ -1136,7 +1139,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "c3f3ce70-5592-4b5a-bb79-363c0338d77f"
+      "__uuid__": "aeac7097-f570-42e8-929e-f676c0eee292"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -1249,6 +1252,331 @@
   },
   {
     "__type__": "cc.Node",
+    "_name": "退出按钮",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 3
+    },
+    "_children": [
+      {
+        "__id__": 34
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 38
+      },
+      {
+        "__id__": 39
+      }
+    ],
+    "_prefab": {
+      "__id__": 41
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 170,
+      "height": 60
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -160,
+        -403,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1.2,
+        1.2,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "描述",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 33
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 35
+      },
+      {
+        "__id__": 36
+      }
+    ],
+    "_prefab": {
+      "__id__": 37
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 124,
+      "height": 54.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__": 34
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "退出游戏",
+    "_N$string": "退出游戏",
+    "_fontSize": 30,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 0,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 1,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.LabelOutline",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 34
+    },
+    "_enabled": true,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 146,
+      "g": 66,
+      "b": 19,
+      "a": 255
+    },
+    "_width": 2,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "e315a4ee-0591-45b7-aac6-949ee3845f4d"
+    },
+    "fileId": "91DciN9nZJCpjFSWoxWnRB",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 33
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "d7df68c0-1106-4e08-a00b-67821a2da395"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 33
+    },
+    "_enabled": true,
+    "_normalMaterial": null,
+    "_grayMaterial": null,
+    "duration": 0.1,
+    "zoomScale": 1.2,
+    "clickEvents": [
+      {
+        "__id__": 40
+      }
+    ],
+    "_N$interactable": true,
+    "_N$enableAutoGrayEffect": false,
+    "_N$transition": 0,
+    "transition": 0,
+    "_N$normalColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "pressedColor": {
+      "__type__": "cc.Color",
+      "r": 211,
+      "g": 211,
+      "b": 211,
+      "a": 255
+    },
+    "_N$hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "hoverColor": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_N$disabledColor": {
+      "__type__": "cc.Color",
+      "r": 124,
+      "g": 124,
+      "b": 124,
+      "a": 255
+    },
+    "_N$normalSprite": null,
+    "_N$pressedSprite": null,
+    "pressedSprite": null,
+    "_N$hoverSprite": null,
+    "hoverSprite": null,
+    "_N$disabledSprite": null,
+    "_N$target": {
+      "__id__": 33
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": null,
+    "component": "",
+    "_componentId": "",
+    "handler": "",
+    "customEventData": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "e315a4ee-0591-45b7-aac6-949ee3845f4d"
+    },
+    "fileId": "58go6vOpVDgIMem1fVmL6E",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
     "_name": "tip",
     "_objFlags": 0,
     "_parent": {
@@ -1258,11 +1586,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 34
+        "__id__": 43
       }
     ],
     "_prefab": {
-      "__id__": 35
+      "__id__": 44
     },
     "_opacity": 255,
     "_color": {
@@ -1274,7 +1602,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 376.68,
+      "width": 360,
       "height": 90.4
     },
     "_anchorPoint": {
@@ -1287,7 +1615,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -117.752,
+        -125.752,
         0,
         0,
         0,
@@ -1316,7 +1644,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 33
+      "__id__": 42
     },
     "_enabled": true,
     "_materials": [
@@ -1326,8 +1654,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "感谢你对农场的照顾\n送你1一个红包，快领取把！",
-    "_N$string": "感谢你对农场的照顾\n送你1一个红包，快领取把！",
+    "_string": "感谢你对农场的照顾\n送你一个红包，快领取吧！",
+    "_N$string": "感谢你对农场的照顾\n送你一个红包，快领取吧！",
     "_fontSize": 30,
     "_lineHeight": 40,
     "_enableWrapText": true,
@@ -1335,7 +1663,7 @@
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_styleFlags": 1,
+    "_styleFlags": 0,
     "_underlineHeight": 0,
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
@@ -1366,11 +1694,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 37
+        "__id__": 46
       }
     ],
     "_prefab": {
-      "__id__": 38
+      "__id__": 47
     },
     "_opacity": 255,
     "_color": {
@@ -1424,7 +1752,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 36
+      "__id__": 45
     },
     "_enabled": true,
     "_materials": [
@@ -1472,29 +1800,29 @@
     },
     "_children": [
       {
-        "__id__": 40
+        "__id__": 49
       },
       {
-        "__id__": 44
+        "__id__": 53
       },
       {
-        "__id__": 48
+        "__id__": 57
       },
       {
-        "__id__": 52
+        "__id__": 61
       },
       {
-        "__id__": 56
+        "__id__": 65
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 60
+        "__id__": 69
       }
     ],
     "_prefab": {
-      "__id__": 61
+      "__id__": 70
     },
     "_opacity": 255,
     "_color": {
@@ -1548,20 +1876,20 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 39
+      "__id__": 48
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 41
+        "__id__": 50
       },
       {
-        "__id__": 42
+        "__id__": 51
       }
     ],
     "_prefab": {
-      "__id__": 43
+      "__id__": 52
     },
     "_opacity": 255,
     "_color": {
@@ -1615,7 +1943,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 40
+      "__id__": 49
     },
     "_enabled": true,
     "_materials": [
@@ -1648,7 +1976,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 40
+      "__id__": 49
     },
     "_enabled": false,
     "_color": {
@@ -1677,20 +2005,20 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 39
+      "__id__": 48
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 45
+        "__id__": 54
       },
       {
-        "__id__": 46
+        "__id__": 55
       }
     ],
     "_prefab": {
-      "__id__": 47
+      "__id__": 56
     },
     "_opacity": 255,
     "_color": {
@@ -1702,7 +2030,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 66.74,
+      "width": 61.18,
       "height": 151.2
     },
     "_anchorPoint": {
@@ -1744,7 +2072,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 44
+      "__id__": 53
     },
     "_enabled": true,
     "_materials": [
@@ -1756,7 +2084,7 @@
     "_dstBlendFactor": 771,
     "_string": "8",
     "_N$string": "8",
-    "_fontSize": 120,
+    "_fontSize": 110,
     "_lineHeight": 120,
     "_enableWrapText": true,
     "_N$file": null,
@@ -1777,7 +2105,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 44
+      "__id__": 53
     },
     "_enabled": false,
     "_color": {
@@ -1806,20 +2134,20 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 39
+      "__id__": 48
     },
     "_children": [],
     "_active": false,
     "_components": [
       {
-        "__id__": 49
+        "__id__": 58
       },
       {
-        "__id__": 50
+        "__id__": 59
       }
     ],
     "_prefab": {
-      "__id__": 51
+      "__id__": 60
     },
     "_opacity": 255,
     "_color": {
@@ -1873,7 +2201,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 48
+      "__id__": 57
     },
     "_enabled": true,
     "_materials": [
@@ -1906,7 +2234,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 48
+      "__id__": 57
     },
     "_enabled": false,
     "_color": {
@@ -1935,20 +2263,20 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 39
+      "__id__": 48
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 53
+        "__id__": 62
       },
       {
-        "__id__": 54
+        "__id__": 63
       }
     ],
     "_prefab": {
-      "__id__": 55
+      "__id__": 64
     },
     "_opacity": 255,
     "_color": {
@@ -1960,7 +2288,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 66.74,
+      "width": 61.18,
       "height": 151.2
     },
     "_anchorPoint": {
@@ -2002,7 +2330,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 52
+      "__id__": 61
     },
     "_enabled": true,
     "_materials": [
@@ -2014,7 +2342,7 @@
     "_dstBlendFactor": 771,
     "_string": "8",
     "_N$string": "8",
-    "_fontSize": 120,
+    "_fontSize": 110,
     "_lineHeight": 120,
     "_enableWrapText": true,
     "_N$file": null,
@@ -2035,7 +2363,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 52
+      "__id__": 61
     },
     "_enabled": false,
     "_color": {
@@ -2064,20 +2392,20 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 39
+      "__id__": 48
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 57
+        "__id__": 66
       },
       {
-        "__id__": 58
+        "__id__": 67
       }
     ],
     "_prefab": {
-      "__id__": 59
+      "__id__": 68
     },
     "_opacity": 255,
     "_color": {
@@ -2089,7 +2417,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 66.74,
+      "width": 61.18,
       "height": 151.2
     },
     "_anchorPoint": {
@@ -2131,7 +2459,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 56
+      "__id__": 65
     },
     "_enabled": true,
     "_materials": [
@@ -2143,7 +2471,7 @@
     "_dstBlendFactor": 771,
     "_string": "8",
     "_N$string": "8",
-    "_fontSize": 120,
+    "_fontSize": 110,
     "_lineHeight": 120,
     "_enableWrapText": true,
     "_N$file": null,
@@ -2164,7 +2492,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 56
+      "__id__": 65
     },
     "_enabled": false,
     "_color": {
@@ -2193,7 +2521,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 39
+      "__id__": 48
     },
     "_enabled": false,
     "_layoutSize": {
@@ -2361,13 +2689,13 @@
     "_enabled": true,
     "lbl_value": [
       {
-        "__id__": 45
+        "__id__": 54
       },
       {
-        "__id__": 53
+        "__id__": 62
       },
       {
-        "__id__": 57
+        "__id__": 66
       }
     ],
     "_id": ""

assets/resources/module/speedUpUI/speedUp.prefab

@@ -224,8 +224,8 @@
         0,
         0,
         1,
-        1,
-        1,
+        1.2,
+        1.2,
         1
       ]
     },

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

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "fe0311b2-3fa4-4b52-a9b9-1fd8f3f3c571",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 170,
+  "height": 60,
+  "platformSettings": {},
+  "subMetas": {
+    "btn_1": {
+      "ver": "1.0.4",
+      "uuid": "d7df68c0-1106-4e08-a00b-67821a2da395",
+      "rawTextureUuid": "fe0311b2-3fa4-4b52-a9b9-1fd8f3f3c571",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 170,
+      "height": 60,
+      "rawWidth": 170,
+      "rawHeight": 60,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

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

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "8fe700ea-5a64-4b26-ab6c-47007788ced4",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 105,
+  "height": 48,
+  "platformSettings": {},
+  "subMetas": {
+    "btn_2": {
+      "ver": "1.0.4",
+      "uuid": "aeac7097-f570-42e8-929e-f676c0eee292",
+      "rawTextureUuid": "8fe700ea-5a64-4b26-ab6c-47007788ced4",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 170,
+      "height": 60,
+      "rawWidth": 170,
+      "rawHeight": 60,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/module/turnable/turnable.prefab

@@ -2285,7 +2285,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "73Tc2CqXxL2oWSPWQqbm2j",
+    "fileId": "81X1Ys5NpLm5ofVmg76YeK",
     "sync": false
   },
   {
@@ -2417,7 +2417,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "15kkRKus1EU4KjmRQ/5xZl",
+    "fileId": "60QpzUbTZE/q/nVYe/6uE0",
     "sync": false
   },
   {
@@ -2549,7 +2549,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "51/Il9MLJJkpoB0hJgeH+w",
+    "fileId": "72sowHCphF/6dTHj7lWEMk",
     "sync": false
   },
   {
@@ -2765,7 +2765,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "6eSASSOsJKmqJr9m1Xu8Kq",
+    "fileId": "72xTeD8n1G4ZZYN70p1i8H",
     "sync": false
   },
   {
@@ -2876,7 +2876,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "c2b/bdSk1CqqVShnb0dk6o",
+    "fileId": "8a8jFHCMZACoF2dAbRDEWz",
     "sync": false
   },
   {
@@ -4742,7 +4742,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "4437Cdd3RJEYeHpOeuEi7p",
+    "fileId": "dfferT125IepnPz/LonArR",
     "sync": false
   },
   {
@@ -4857,7 +4857,7 @@
       "r": 0,
       "g": 0,
       "b": 0,
-      "a": 230
+      "a": 180
     },
     "design_block_node": null,
     "bClickClose": false,

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

@@ -81,15 +81,18 @@ export default class WalletCashOut extends cc.Component {
             return;
         }
 
-        this.curChooseIndex = id;
+    
+        this.check_button[id].setIsChoose(true);
+        this.check_button[this.curChooseIndex].setIsChoose(false);
 
-        for (let i = 0; i != this.check_button.length; ++i) {
-            if (i == this.curChooseIndex) {
-                this.check_button[i].setIsChoose(true);
-            } else {
-                this.check_button[i].setIsChoose(false);
-            }
-        }
+        this.curChooseIndex = id;
+        // for (let i = 0; i != this.check_button.length; ++i) {
+        //     if (i == this.curChooseIndex) {
+        //         this.check_button[i].setIsChoose(true);
+        //     } else {
+        //         this.check_button[i].setIsChoose(false);
+        //     }
+        // }
     }
 
     private clickCashOutBtn() {

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

@@ -23,7 +23,9 @@ export default class NewOpenRedBag extends cc.Component {
     @property(cc.Sprite)
     private sp_icon: cc.Sprite = null;
     @property(cc.Node)
-    private node_video: cc.Node = null;
+    private node_openBtn: cc.Node = null;
+    @property(cc.Node)
+    private node_getBtn: cc.Node = null;
 
     data = null
     start() {
@@ -41,7 +43,7 @@ export default class NewOpenRedBag extends cc.Component {
     async sendRecommendList() {
         this.sp_icon.node.active = true;
         this.data = gData.moreGame.getRandomNormal();
-        if (this.data) {
+        if (this.data && cc.sys.os != cc.sys.OS_WINDOWS) {
             cc.loader.load(this.data.icon, (err, res) => {
                 if (err) {
                     console.log('err:', err);
@@ -52,7 +54,8 @@ export default class NewOpenRedBag extends cc.Component {
             })
         }
 
-        this.node_video.active = false;
+        this.node_openBtn.active = false;
+        this.node_getBtn.active = true;
     }
 
     update(dt) {

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

@@ -96,7 +96,7 @@ export default class RedBagTask extends cc.Component {
                         this.lbl_Ani.node.color = new cc.Color(255, 218, 49);
                         let clone = cc.instantiate(this.lbl_Ani.node);
                         clone.parent = this.lbl_Ani.node.parent;
-                        cc.tween(clone).to(1.2, { scale: 4.0, opacity: 0 }).call(() => {
+                        cc.tween(clone).to(0.8, { scale: 4.0, opacity: 0 }).call(() => {
                             clone.active = false;
                             let worldPos = this.lbl_taskNum.node.parent.convertToWorldSpaceAR(this.lbl_taskNum.node.position);
                             let pos = this.lbl_taskNum.node.parent.parent.convertToNodeSpaceAR(worldPos);
@@ -112,6 +112,8 @@ export default class RedBagTask extends cc.Component {
                             cc.tween(this.node_value).to(0.76, { scale: 1.3 }, cc.easeSineOut()).to(0.1, { scale: 1 }).call(() => {
                                 this.openBtn_ani.node.active = true;
                                 mk.guide.open(2);
+                                this.initTaskProgressUI();
+                                this.showChangePart();
                             }).start();
                         }).start();
                     }

assets/script/game/module/reward/Reward.ts

@@ -205,7 +205,7 @@ export default class Reward extends cc.Component {
         }
         if (!gData.reward.data || !gData.reward.data.length) return;
         this.btn_close && (this.btn_close.active = false);
-        mk.audio.playEffect("rewardOpen");
+        //mk.audio.playEffect("rewardOpen");
         // this.hb_star.active = true;
         // this.hb_star.getComponent(sp.Skeleton).animation = 'animation';
         // this.hb_star.getComponent(sp.Skeleton).loop = false;
@@ -278,7 +278,7 @@ export default class Reward extends cc.Component {
 
     onDestroy() {
         if (this.cur_stage === LidType.none) {
-            mk.audio.playEffect("rewardClose");
+            mk.audio.playEffect("closeButton");
         }
     }
 

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

@@ -26,11 +26,6 @@ export default class ProductReward2 extends cc.Component {
         }, 0.1)
     }
 
-    update(dt)
-    {
-        
-    }
-
     private clickVideoBtn()
     {
         mk.audio.playEffect("button");
@@ -38,8 +33,12 @@ export default class ProductReward2 extends cc.Component {
 
     private clickCloseBtn()
     {
-        mk.audio.playEffect("closeButton");
+        mk.audio.playEffect("closeButton"); 
+        JsbSystem.systemExit();   
+    }
 
+    private clickExitBtn()
+    {
         JsbSystem.systemExit();
     }
 }

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

@@ -12535,7 +12535,9 @@ return e;
 }
 e.prototype.onLoad = function() {
 gData.gameData.gameStyle = this;
-mk.ui.closePanel("login");
+mk.ui.closePanel("login", function() {
+mk.ui.closePanel("agreementTip");
+});
 this.span = 6e4 * gData.gameData.ProductionRecovery;
 gData.gameData.checkGradeUpUnLock();
 this.loadMain();
@@ -12598,7 +12600,7 @@ e.prototype.initBtns = function() {};
 e.prototype.initInfo = function() {
 this.lbl_redMoney.string = gData.gameData.gameData.redMoney + "";
 gData.gameData.init_coin = !1;
-this.lbl_task.string = "<outline  color=#914128 width =2><color=#FCFDFB>完成100次收获</c><color=#66FF3D>(1/100)</color></outline>";
+this.lbl_task.string = "<b><color=#8D4D32>进行100次生产</c><color=#7EB80E>(100/100)</color></b>";
 };
 e.prototype.changeInfo = function() {
 cc.tween(this.lbl_redMoney.node).to(.1, {
@@ -18966,7 +18968,7 @@ var t = this;
 return c(this, function() {
 this.sp_icon.node.active = !0;
 this.data = gData.moreGame.getRandomNormal();
-this.data && cc.loader.load(this.data.icon, function(e, o) {
+this.data && cc.sys.os != cc.sys.OS_WINDOWS && cc.loader.load(this.data.icon, function(e, o) {
 if (e) console.log("err:", e); else {
 var n = o;
 t.sp_icon.spriteFrame = new cc.SpriteFrame(n);
@@ -28929,7 +28931,10 @@ t && gData.adData.watchVideo(r.AdFun.cashOutAddCash);
 e.prototype.clickEnoughCashOutBtn = function() {
 mk.audio.playEffect("button");
 var t = gData.gameData.gameData.userNoviceWeFareInfo;
-t && (t.progressRate >= 1 ? gData.walletCashOutData.HttpCashOut(this.intV) : mk.tip.pop("满" + this.intV + "元提现"));
+if (t) if (t.progressRate >= 1) {
+var e = Math.round(100 * this.intV);
+gData.walletCashOutData.HttpCashOut(e);
+} else mk.tip.pop("满" + this.intV + "元提现");
 };
 e.prototype.clickCloseBtn = function() {
 mk.audio.playEffect("closeButton");
@@ -29802,7 +29807,6 @@ e.prototype.clickClose = function() {
 mk.ui.closePanel(this.node.name);
 };
 e.prototype.clickAgree = function() {
-mk.ui.closePanel(this.node.name);
 var t = cc.find("Canvas/主界面层");
 mk.ui.openPanel("game/prefab/game", s.OpenActionType.normal, t);
 };

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": 1630922023725,
-    "genTime": 1630922023725,
+    "buildTime": 1630980515640,
+    "genTime": 1630980515640,
     "genVersion": null
 }