1

assets/resources/module/blessingBag/blessingBag.prefab

@@ -977,7 +977,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 651,
-      "height": 1020
+      "height": 1050
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -989,7 +989,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        323.049,
+        296.049,
         0,
         0,
         0,
@@ -1063,7 +1063,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        402.018,
+        411.018,
         0,
         0,
         0,
@@ -1214,7 +1214,7 @@
     "asset": {
       "__uuid__": "94760687-648e-4d1f-ac2f-169b0dc625d9"
     },
-    "fileId": "d6yKMxe2pPkr0jsHyUL7+L",
+    "fileId": "a6vmI9IdVNxZuqC7wgBews",
     "sync": false
   },
   {
@@ -1344,7 +1344,7 @@
     "asset": {
       "__uuid__": "94760687-648e-4d1f-ac2f-169b0dc625d9"
     },
-    "fileId": "7a7gOCz5JBHaxCPWNz2Hkr",
+    "fileId": "7br1NasRhPtrJ2ABXFbezI",
     "sync": false
   },
   {
@@ -1474,7 +1474,7 @@
     "asset": {
       "__uuid__": "94760687-648e-4d1f-ac2f-169b0dc625d9"
     },
-    "fileId": "00vOMEx4tKzpfduyrZFIrw",
+    "fileId": "38hfutRkJMf7rc40SJyt6j",
     "sync": false
   },
   {
@@ -1635,7 +1635,7 @@
       "__uuid__": "7b17b419-9c62-47a5-a9a2-cec821bec1b4"
     },
     "_type": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillType": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
@@ -6445,7 +6445,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 650,
-      "height": 730
+      "height": 760
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -6457,7 +6457,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        586.48,
+        549.48,
         0,
         0,
         0,
@@ -6505,7 +6505,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 650,
-      "height": 730
+      "height": 760
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -8267,7 +8267,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -5,
+        -35,
         0,
         0,
         0,
@@ -8794,7 +8794,7 @@
     "position": {
       "__type__": "cc.Vec2",
       "x": 0,
-      "y": -605
+      "y": -600.2
     },
     "angle": 0,
     "scale": 1,
@@ -8817,7 +8817,7 @@
     "position": {
       "__type__": "cc.Vec2",
       "x": 0,
-      "y": -5
+      "y": -35
     },
     "angle": 0,
     "scale": 1,

assets/resources/module/blessingBag/blessingBagItem.prefab

@@ -71,7 +71,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 651,
-      "height": 135
+      "height": 145
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -146,15 +146,15 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -225,
-        -56.462999999999994,
+        -244,
+        -64.463,
         0,
         0,
         0,
         0,
         1,
-        1,
-        1,
+        1.1,
+        1.1,
         1
       ]
     },
@@ -253,15 +253,15 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -225,
-        -56.563,
+        -244,
+        -64.563,
         0,
         0,
         0,
         0,
         1,
-        1,
-        1,
+        1.2,
+        1.2,
         1
       ]
     },
@@ -363,15 +363,15 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -225,
-        -96.244,
+        -244,
+        -104.244,
         0,
         0,
         0,
         0,
         1,
-        1,
-        1,
+        1.2,
+        1.2,
         1
       ]
     },
@@ -496,15 +496,15 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -17.766,
-        -44.669,
+        -28.766,
+        -37.669,
         0,
         0,
         0,
         0,
         1,
-        1,
-        1,
+        1.2,
+        1.2,
         1
       ]
     },
@@ -627,7 +627,7 @@
     "asset": {
       "__uuid__": "3c12cc7b-777b-45f9-8bf1-8a285075e6f7"
     },
-    "fileId": "10H14rfpdPab1yimUbKfrF",
+    "fileId": "854NOdq/5CObiAo/DZ8AnT",
     "sync": false
   },
   {
@@ -736,7 +736,7 @@
     "asset": {
       "__uuid__": "3c12cc7b-777b-45f9-8bf1-8a285075e6f7"
     },
-    "fileId": "9dsqDd3X9KT4nJBGy18u2w",
+    "fileId": "9cdTo3ZcZM/I9zL2e8tHU1",
     "sync": false
   },
   {
@@ -814,15 +814,15 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -16.318,
-        -79.245,
+        -27.318,
+        -87.245,
         0,
         0,
         0,
         0,
         1,
         1,
-        1,
+        1.3,
         1
       ]
     },
@@ -1019,7 +1019,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 2,
+      "width": 67.06,
       "height": 37.28
     },
     "_anchorPoint": {
@@ -1031,8 +1031,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -20.498,
-        -78.108,
+        -18.498,
+        -87.108,
         0,
         0,
         0,
@@ -1071,8 +1071,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "",
-    "_N$string": "",
+    "_string": "10.10",
+    "_N$string": "10.10",
     "_fontSize": 26,
     "_lineHeight": 28,
     "_enableWrapText": true,
@@ -1164,15 +1164,15 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        223,
+        218,
         -66,
         0,
         0,
         0,
         0,
         1,
-        1,
-        1,
+        1.2,
+        1.2,
         1
       ]
     },
@@ -1489,15 +1489,15 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        223,
+        218,
         -66,
         0,
         0,
         0,
         0,
         1,
-        1,
-        1,
+        1.2,
+        1.2,
         1
       ]
     },
@@ -1816,15 +1816,15 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        223,
+        218,
         -66,
         0,
         0,
         0,
         0,
         1,
-        1,
-        1,
+        1.2,
+        1.2,
         1
       ]
     },
@@ -2135,7 +2135,7 @@
       "ctor": "Float64Array",
       "array": [
         16,
-        -133.813,
+        -143.813,
         0,
         0,
         0,

assets/resources/module/blessingBag/texture/bg.png.meta

@@ -26,8 +26,8 @@
       "height": 1020,
       "rawWidth": 651,
       "rawHeight": 1020,
-      "borderTop": 0,
-      "borderBottom": 0,
+      "borderTop": 354,
+      "borderBottom": 382,
       "borderLeft": 0,
       "borderRight": 0,
       "subMetas": {}

assets/resources/module/farmMap/farmItem.prefab

@@ -19,29 +19,94 @@
     "_children": [
       {
         "__id__": 2
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 55
+      }
+    ],
+    "_prefab": {
+      "__id__": 56
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 469,
+      "height": 99
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 1
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1.02,
+        1.02,
+        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": "New Node",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [
+      {
+        "__id__": 3
       },
       {
-        "__id__": 8
+        "__id__": 9
       },
       {
-        "__id__": 20
+        "__id__": 21
       },
       {
-        "__id__": 32
+        "__id__": 33
       },
       {
-        "__id__": 41
+        "__id__": 42
       },
       {
-        "__id__": 49
+        "__id__": 50
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 52
-      },
-      {
         "__id__": 53
       }
     ],
@@ -70,7 +135,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
+        -3,
         0,
         0,
         0,
@@ -100,21 +165,21 @@
     "_name": "iconBg",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 1
+      "__id__": 2
     },
     "_children": [
       {
-        "__id__": 3
+        "__id__": 4
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 6
+        "__id__": 7
       }
     ],
     "_prefab": {
-      "__id__": 7
+      "__id__": 8
     },
     "_opacity": 255,
     "_color": {
@@ -168,17 +233,17 @@
     "_name": "icon",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 2
+      "__id__": 3
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 4
+        "__id__": 5
       }
     ],
     "_prefab": {
-      "__id__": 5
+      "__id__": 6
     },
     "_opacity": 255,
     "_color": {
@@ -202,7 +267,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
+        2.842170943040401e-14,
         4,
         0,
         0,
@@ -211,7 +276,7 @@
         1,
         0.3,
         0.3,
-        1
+        0.3
       ]
     },
     "_eulerAngles": {
@@ -232,7 +297,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 3
+      "__id__": 4
     },
     "_enabled": true,
     "_materials": [
@@ -267,7 +332,7 @@
     "asset": {
       "__uuid__": "c92ee1bb-0e83-4868-97e3-d71b8b58fae0"
     },
-    "fileId": "75Q1PEbqJCKIDo9gZtoq89",
+    "fileId": "6fMrGYI/pN+LoONqP2saqY",
     "sync": false
   },
   {
@@ -275,7 +340,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 2
+      "__id__": 3
     },
     "_enabled": true,
     "_materials": [
@@ -310,7 +375,7 @@
     "asset": {
       "__uuid__": "c92ee1bb-0e83-4868-97e3-d71b8b58fae0"
     },
-    "fileId": "91HSdSyulDlJnijnKmRKv/",
+    "fileId": "1dL0jCyF9OrK5pPptAsyeM",
     "sync": false
   },
   {
@@ -318,27 +383,27 @@
     "_name": "New Node",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 1
+      "__id__": 2
     },
     "_children": [
       {
-        "__id__": 9
+        "__id__": 10
       },
       {
-        "__id__": 12
+        "__id__": 13
       },
       {
-        "__id__": 15
+        "__id__": 16
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 18
+        "__id__": 19
       }
     ],
     "_prefab": {
-      "__id__": 19
+      "__id__": 20
     },
     "_opacity": 255,
     "_color": {
@@ -392,17 +457,17 @@
     "_name": "title",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 8
+      "__id__": 9
     },
     "_children": [],
     "_active": false,
     "_components": [
       {
-        "__id__": 10
+        "__id__": 11
       }
     ],
     "_prefab": {
-      "__id__": 11
+      "__id__": 12
     },
     "_opacity": 255,
     "_color": {
@@ -426,7 +491,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
+        2.842170943040401e-14,
         16.6,
         0,
         0,
@@ -456,7 +521,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 9
+      "__id__": 10
     },
     "_enabled": true,
     "_materials": [
@@ -492,7 +557,7 @@
     "asset": {
       "__uuid__": "c92ee1bb-0e83-4868-97e3-d71b8b58fae0"
     },
-    "fileId": "bd+gnMaAlPdowQHGl8DD7k",
+    "fileId": "cai9UTg/lJtaTYEuU9WAzo",
     "sync": false
   },
   {
@@ -500,17 +565,17 @@
     "_name": "描述",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 8
+      "__id__": 9
     },
     "_children": [],
     "_active": false,
     "_components": [
       {
-        "__id__": 13
+        "__id__": 14
       }
     ],
     "_prefab": {
-      "__id__": 14
+      "__id__": 15
     },
     "_opacity": 255,
     "_color": {
@@ -534,8 +599,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        -17.86,
+        2.842170943040401e-14,
+        -17.859999999999978,
         0,
         0,
         0,
@@ -564,7 +629,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 12
+      "__id__": 13
     },
     "_enabled": true,
     "_materials": [
@@ -600,7 +665,7 @@
     "asset": {
       "__uuid__": "c92ee1bb-0e83-4868-97e3-d71b8b58fae0"
     },
-    "fileId": "a4vAAY2IxPw4voEzenRlOH",
+    "fileId": "5e5+QqJJxLmpIWxdyjKex/",
     "sync": false
   },
   {
@@ -608,17 +673,17 @@
     "_name": "组合描述",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 8
+      "__id__": 9
     },
     "_children": [],
     "_active": false,
     "_components": [
       {
-        "__id__": 16
+        "__id__": 17
       }
     ],
     "_prefab": {
-      "__id__": 17
+      "__id__": 18
     },
     "_opacity": 255,
     "_color": {
@@ -642,7 +707,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
+        2.842170943040401e-14,
         0.14000000000000057,
         0,
         0,
@@ -672,7 +737,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 15
+      "__id__": 16
     },
     "_enabled": true,
     "_materials": [
@@ -708,7 +773,7 @@
     "asset": {
       "__uuid__": "c92ee1bb-0e83-4868-97e3-d71b8b58fae0"
     },
-    "fileId": "8cL7vfuKNLOocKfLhtFSm1",
+    "fileId": "5eVOCsJe1KV53bhwOvNWKe",
     "sync": false
   },
   {
@@ -716,7 +781,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 8
+      "__id__": 9
     },
     "_enabled": false,
     "_layoutSize": {
@@ -751,7 +816,7 @@
     "asset": {
       "__uuid__": "c92ee1bb-0e83-4868-97e3-d71b8b58fae0"
     },
-    "fileId": "16FnbvSa9C9IrdJsaL7ekb",
+    "fileId": "7eyL9O3AhHc4/vW7gzUbkY",
     "sync": false
   },
   {
@@ -759,27 +824,27 @@
     "_name": "领奖按钮",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 1
+      "__id__": 2
     },
     "_children": [
       {
-        "__id__": 21
+        "__id__": 22
       },
       {
-        "__id__": 25
+        "__id__": 26
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 28
+        "__id__": 29
       },
       {
-        "__id__": 29
+        "__id__": 30
       }
     ],
     "_prefab": {
-      "__id__": 31
+      "__id__": 32
     },
     "_opacity": 255,
     "_color": {
@@ -833,20 +898,20 @@
     "_name": "文字",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 20
+      "__id__": 21
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 22
+        "__id__": 23
       },
       {
-        "__id__": 23
+        "__id__": 24
       }
     ],
     "_prefab": {
-      "__id__": 24
+      "__id__": 25
     },
     "_opacity": 255,
     "_color": {
@@ -900,7 +965,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 21
+      "__id__": 22
     },
     "_enabled": true,
     "_materials": [
@@ -935,7 +1000,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 21
+      "__id__": 22
     },
     "_enabled": true,
     "_color": {
@@ -956,7 +1021,7 @@
     "asset": {
       "__uuid__": "c92ee1bb-0e83-4868-97e3-d71b8b58fae0"
     },
-    "fileId": "3dgyiebtBILKQ8+jiHFWSy",
+    "fileId": "68Br1Xmv5BdZP6ThynY5tC",
     "sync": false
   },
   {
@@ -964,17 +1029,17 @@
     "_name": "video",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 20
+      "__id__": 21
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 26
+        "__id__": 27
       }
     ],
     "_prefab": {
-      "__id__": 27
+      "__id__": 28
     },
     "_opacity": 255,
     "_color": {
@@ -999,7 +1064,7 @@
       "ctor": "Float64Array",
       "array": [
         -49,
-        3,
+        3.000000000000007,
         0,
         0,
         0,
@@ -1028,7 +1093,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 25
+      "__id__": 26
     },
     "_enabled": true,
     "_materials": [
@@ -1063,7 +1128,7 @@
     "asset": {
       "__uuid__": "c92ee1bb-0e83-4868-97e3-d71b8b58fae0"
     },
-    "fileId": "55uzESckxEuJZselqMb47H",
+    "fileId": "1cNJ72JWlKBpJ9pPR2AnAq",
     "sync": false
   },
   {
@@ -1071,7 +1136,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 20
+      "__id__": 21
     },
     "_enabled": true,
     "_materials": [
@@ -1103,7 +1168,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 20
+      "__id__": 21
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -1112,7 +1177,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 30
+        "__id__": 31
       }
     ],
     "_N$interactable": true,
@@ -1168,7 +1233,7 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 20
+      "__id__": 21
     },
     "_id": ""
   },
@@ -1190,7 +1255,7 @@
     "asset": {
       "__uuid__": "c92ee1bb-0e83-4868-97e3-d71b8b58fae0"
     },
-    "fileId": "5aEPDQoA5DM4TYpeKtsZTk",
+    "fileId": "bdMd3wVpxISZQI9hqk31zH",
     "sync": false
   },
   {
@@ -1198,24 +1263,24 @@
     "_name": "已领奖按钮",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 1
+      "__id__": 2
     },
     "_children": [
       {
-        "__id__": 33
+        "__id__": 34
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 37
+        "__id__": 38
       },
       {
-        "__id__": 38
+        "__id__": 39
       }
     ],
     "_prefab": {
-      "__id__": 40
+      "__id__": 41
     },
     "_opacity": 255,
     "_color": {
@@ -1269,20 +1334,20 @@
     "_name": "文字",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 32
+      "__id__": 33
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 34
+        "__id__": 35
       },
       {
-        "__id__": 35
+        "__id__": 36
       }
     ],
     "_prefab": {
-      "__id__": 36
+      "__id__": 37
     },
     "_opacity": 255,
     "_color": {
@@ -1307,7 +1372,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        3,
+        3.000000000000007,
         0,
         0,
         0,
@@ -1336,7 +1401,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 33
+      "__id__": 34
     },
     "_enabled": true,
     "_materials": [
@@ -1369,7 +1434,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 33
+      "__id__": 34
     },
     "_enabled": true,
     "_color": {
@@ -1390,7 +1455,7 @@
     "asset": {
       "__uuid__": "c92ee1bb-0e83-4868-97e3-d71b8b58fae0"
     },
-    "fileId": "77/brO7UxCKLH5NwjQRdSZ",
+    "fileId": "249OIe9lJPwbnzPyBqDbht",
     "sync": false
   },
   {
@@ -1398,7 +1463,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 32
+      "__id__": 33
     },
     "_enabled": true,
     "_materials": [
@@ -1430,7 +1495,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 32
+      "__id__": 33
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -1439,7 +1504,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 39
+        "__id__": 40
       }
     ],
     "_N$interactable": true,
@@ -1495,7 +1560,7 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 32
+      "__id__": 33
     },
     "_id": ""
   },
@@ -1517,7 +1582,7 @@
     "asset": {
       "__uuid__": "c92ee1bb-0e83-4868-97e3-d71b8b58fae0"
     },
-    "fileId": "fdEVdSU5tAibDljdfgyvXL",
+    "fileId": "6dsZnuKqNKKp/F1RM+TvBu",
     "sync": false
   },
   {
@@ -1525,24 +1590,24 @@
     "_name": "未解锁",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 1
+      "__id__": 2
     },
     "_children": [
       {
-        "__id__": 42
+        "__id__": 43
       }
     ],
     "_active": false,
     "_components": [
       {
-        "__id__": 45
+        "__id__": 46
       },
       {
-        "__id__": 46
+        "__id__": 47
       }
     ],
     "_prefab": {
-      "__id__": 48
+      "__id__": 49
     },
     "_opacity": 255,
     "_color": {
@@ -1596,17 +1661,17 @@
     "_name": "锁",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 41
+      "__id__": 42
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 43
+        "__id__": 44
       }
     ],
     "_prefab": {
-      "__id__": 44
+      "__id__": 45
     },
     "_opacity": 255,
     "_color": {
@@ -1631,7 +1696,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        3,
+        3.000000000000007,
         0,
         0,
         0,
@@ -1660,7 +1725,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 42
+      "__id__": 43
     },
     "_enabled": true,
     "_materials": [
@@ -1695,7 +1760,7 @@
     "asset": {
       "__uuid__": "c92ee1bb-0e83-4868-97e3-d71b8b58fae0"
     },
-    "fileId": "69TckwR0dBa6jQ8r5aIbF5",
+    "fileId": "6aHqLRQmhAuZTd9c5/Ns98",
     "sync": false
   },
   {
@@ -1703,7 +1768,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 41
+      "__id__": 42
     },
     "_enabled": true,
     "_materials": [
@@ -1735,7 +1800,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 41
+      "__id__": 42
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -1744,7 +1809,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 47
+        "__id__": 48
       }
     ],
     "_N$interactable": true,
@@ -1800,7 +1865,7 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 41
+      "__id__": 42
     },
     "_id": ""
   },
@@ -1822,7 +1887,7 @@
     "asset": {
       "__uuid__": "c92ee1bb-0e83-4868-97e3-d71b8b58fae0"
     },
-    "fileId": "2avk/02WxKt6LxLD6Ho+Mb",
+    "fileId": "a9e1xKdrJE4pBvLwyxF/v/",
     "sync": false
   },
   {
@@ -1830,17 +1895,17 @@
     "_name": "redPoint",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 1
+      "__id__": 2
     },
     "_children": [],
     "_active": false,
     "_components": [
       {
-        "__id__": 50
+        "__id__": 51
       }
     ],
     "_prefab": {
-      "__id__": 51
+      "__id__": 52
     },
     "_opacity": 255,
     "_color": {
@@ -1894,7 +1959,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 49
+      "__id__": 50
     },
     "_enabled": true,
     "_materials": [
@@ -1929,7 +1994,7 @@
     "asset": {
       "__uuid__": "c92ee1bb-0e83-4868-97e3-d71b8b58fae0"
     },
-    "fileId": "046vpufYhOzbAxq6ftrrDd",
+    "fileId": "01lmS7YtVBdo1b+3zGBrt2",
     "sync": false
   },
   {
@@ -1937,7 +2002,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 1
+      "__id__": 2
     },
     "_enabled": true,
     "_materials": [
@@ -1965,6 +2030,17 @@
     "_id": ""
   },
   {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "c92ee1bb-0e83-4868-97e3-d71b8b58fae0"
+    },
+    "fileId": "5c6xskYjRL2aE9t87EtWjm",
+    "sync": false
+  },
+  {
     "__type__": "9b578CB5kBCtpyvrx1EoT+t",
     "_name": "",
     "_objFlags": 0,
@@ -1973,28 +2049,28 @@
     },
     "_enabled": true,
     "sp_icon": {
-      "__id__": 4
+      "__id__": 5
     },
     "lbl_nameDes": {
-      "__id__": 10
+      "__id__": 11
     },
     "lbl_des": {
-      "__id__": 13
+      "__id__": 14
     },
     "lbl_groupDes": {
-      "__id__": 16
+      "__id__": 17
     },
     "node_ungetBtn": {
-      "__id__": 20
+      "__id__": 21
     },
     "node_getBtn": {
-      "__id__": 32
+      "__id__": 33
     },
     "node_unluckBtn": {
-      "__id__": 41
+      "__id__": 42
     },
     "node_redPoint": {
-      "__id__": 49
+      "__id__": 50
     },
     "_id": ""
   },

assets/resources/module/farmMap/farmMap.prefab

@@ -24,6 +24,9 @@
     "_active": true,
     "_components": [
       {
+        "__id__": 234
+      },
+      {
         "__id__": 235
       },
       {
@@ -31,13 +34,10 @@
       },
       {
         "__id__": 237
-      },
-      {
-        "__id__": 238
       }
     ],
     "_prefab": {
-      "__id__": 239
+      "__id__": 238
     },
     "_opacity": 255,
     "_color": {
@@ -101,7 +101,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 234
+      "__id__": 233
     },
     "_opacity": 255,
     "_color": {
@@ -132,8 +132,8 @@
         0,
         0,
         1,
-        1.2,
-        1.2,
+        1.25,
+        1.35,
         1
       ]
     },
@@ -177,11 +177,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 232
+        "__id__": 231
       }
     ],
     "_prefab": {
-      "__id__": 233
+      "__id__": 232
     },
     "_opacity": 255,
     "_color": {
@@ -275,7 +275,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        268.057,
+        254.05700000000002,
         426.37,
         0,
         0,
@@ -381,7 +381,7 @@
     "__type__": "PropsData",
     "position": {
       "__type__": "cc.Vec2",
-      "x": 268.057,
+      "x": 254.05700000000002,
       "y": 426.37
     },
     "angle": 0,
@@ -404,7 +404,7 @@
     "__type__": "PropsData",
     "position": {
       "__type__": "cc.Vec2",
-      "x": 268.057,
+      "x": 254.05700000000002,
       "y": 426.37
     },
     "angle": 0,
@@ -679,7 +679,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 460,
+      "width": 470,
       "height": 85
     },
     "_anchorPoint": {
@@ -691,8 +691,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        1.255,
-        290.032,
+        0,
+        305.032,
         0,
         0,
         0,
@@ -753,7 +753,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 460,
+      "width": 470,
       "height": 85
     },
     "_anchorPoint": {
@@ -829,7 +829,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        369.419,
+        354.419,
         0,
         0,
         0,
@@ -8032,13 +8032,10 @@
       },
       {
         "__id__": 226
-      },
-      {
-        "__id__": 230
       }
     ],
     "_prefab": {
-      "__id__": 231
+      "__id__": 230
     },
     "_opacity": 255,
     "_color": {
@@ -8051,7 +8048,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 500,
-      "height": 540
+      "height": 560
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -8111,7 +8108,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 500,
-      "height": 540
+      "height": 560
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -8123,7 +8120,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        270,
+        278,
         0,
         0,
         0,
@@ -8220,7 +8217,7 @@
     "scr_item": [
       "FarmItem"
     ],
-    "itemInterval": 10,
+    "itemInterval": 15,
     "node_xiabiao": {
       "__id__": 227
     },
@@ -8340,24 +8337,6 @@
     "sync": false
   },
   {
-    "__type__": "f6f53cvJdVFOrnXVyTfFb5T",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 221
-    },
-    "_enabled": true,
-    "toggle": null,
-    "lbl_name": {
-      "__id__": 35
-    },
-    "sp_luck": {
-      "__id__": 32
-    },
-    "node_redPoint": null,
-    "_id": ""
-  },
-  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1

assets/resources/module/newOpenRedBag/newOpenRedBag.prefab

@@ -637,7 +637,7 @@
     "_dstBlendFactor": 771,
     "_spriteFrame": null,
     "_type": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillType": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
@@ -2491,7 +2491,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -475.313,
+        -505.313,
         0,
         0,
         0,
@@ -2574,8 +2574,8 @@
         0,
         0,
         1,
-        1,
-        1,
+        1.08,
+        1.08,
         1
       ]
     },
@@ -2638,8 +2638,8 @@
         0,
         0,
         1,
-        1,
-        1,
+        1.1,
+        1.1,
         1
       ]
     },
@@ -2733,7 +2733,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 234,
+      "width": 200,
       "height": 30
     },
     "_anchorPoint": {
@@ -2797,7 +2797,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 230,
+      "width": 197,
       "height": 26
     },
     "_anchorPoint": {
@@ -2853,7 +2853,7 @@
       "__uuid__": "9ae7b17e-12eb-4496-9746-ee4ab69b7680"
     },
     "_type": 3,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillType": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
@@ -3025,7 +3025,7 @@
       "__uuid__": "518d1473-cc4c-429f-b845-19acb33fa54f"
     },
     "_type": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillType": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
@@ -3101,8 +3101,8 @@
         0,
         0,
         1,
-        1,
-        1,
+        1.1,
+        1.1,
         0
       ]
     },

assets/resources/module/reward/reward.prefab

@@ -24,20 +24,20 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 84
+        "__id__": 91
       },
       {
-        "__id__": 85
+        "__id__": 92
       },
       {
-        "__id__": 86
+        "__id__": 93
       },
       {
-        "__id__": 87
+        "__id__": 94
       }
     ],
     "_prefab": {
-      "__id__": 88
+      "__id__": 95
     },
     "_opacity": 255,
     "_color": {
@@ -101,17 +101,17 @@
         "__id__": 36
       },
       {
-        "__id__": 65
+        "__id__": 72
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 82
+        "__id__": 89
       }
     ],
     "_prefab": {
-      "__id__": 83
+      "__id__": 90
     },
     "_opacity": 255,
     "_color": {
@@ -1351,7 +1351,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 64
+      "__id__": 71
     },
     "_opacity": 255,
     "_color": {
@@ -1382,8 +1382,8 @@
         0,
         0,
         1,
-        1.2,
-        1.2,
+        1.3,
+        1.3,
         1
       ]
     },
@@ -1525,13 +1525,13 @@
         "__id__": 56
       },
       {
-        "__id__": 60
+        "__id__": 67
       }
     ],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 63
+      "__id__": 70
     },
     "_opacity": 255,
     "_color": {
@@ -2049,23 +2049,94 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "获得数量",
+    "_name": "New Node",
     "_objFlags": 0,
     "_parent": {
       "__id__": 41
     },
+    "_children": [
+      {
+        "__id__": 57
+      },
+      {
+        "__id__": 61
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 65
+      }
+    ],
+    "_prefab": {
+      "__id__": 66
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 162.45999999999998,
+      "height": 100
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -96,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "描述",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 56
+    },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 57
+        "__id__": 58
       },
       {
-        "__id__": 58
+        "__id__": 59
       }
     ],
     "_prefab": {
-      "__id__": 59
+      "__id__": 60
     },
     "_opacity": 255,
     "_color": {
@@ -2077,7 +2148,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 65.4,
+      "width": 92,
       "height": 52.4
     },
     "_anchorPoint": {
@@ -2089,8 +2160,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
+        -35.22999999999999,
         0,
-        -96.517,
         0,
         0,
         0,
@@ -2119,8 +2190,137 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
+      "__id__": 57
+    },
+    "_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": 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__": 57
+    },
+    "_enabled": true,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 203,
+      "g": 23,
+      "b": 0,
+      "a": 255
+    },
+    "_width": 1,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "14193c60-068a-42b4-92cf-a6cb623fe40f"
+    },
+    "fileId": "9a+HPcAexPMIS3QAAbpkRw",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "获得数量",
+    "_objFlags": 0,
+    "_parent": {
       "__id__": 56
     },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 62
+      },
+      {
+        "__id__": 63
+      }
+    ],
+    "_prefab": {
+      "__id__": 64
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 247,
+      "b": 112,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 66.46,
+      "height": 52.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        14.77000000000001,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 61
+    },
     "_enabled": true,
     "_materials": [
       {
@@ -2129,8 +2329,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "x14",
-    "_N$string": "x14",
+    "_string": "+14",
+    "_N$string": "+14",
     "_fontSize": 38,
     "_lineHeight": 40,
     "_enableWrapText": true,
@@ -2152,7 +2352,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 56
+      "__id__": 61
     },
     "_enabled": true,
     "_color": {
@@ -2173,7 +2373,50 @@
     "asset": {
       "__uuid__": "14193c60-068a-42b4-92cf-a6cb623fe40f"
     },
-    "fileId": "89+FEpT+ZORZ5wAELykZYz",
+    "fileId": "82M6qjwtFJNIkRZJatYVsJ",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Layout",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 56
+    },
+    "_enabled": true,
+    "_layoutSize": {
+      "__type__": "cc.Size",
+      "width": 162.45999999999998,
+      "height": 100
+    },
+    "_resize": 1,
+    "_N$layoutType": 1,
+    "_N$cellSize": {
+      "__type__": "cc.Size",
+      "width": 40,
+      "height": 40
+    },
+    "_N$startAxis": 0,
+    "_N$paddingLeft": 0,
+    "_N$paddingRight": 0,
+    "_N$paddingTop": 0,
+    "_N$paddingBottom": 0,
+    "_N$spacingX": 4,
+    "_N$spacingY": 0,
+    "_N$verticalDirection": 1,
+    "_N$horizontalDirection": 0,
+    "_N$affectedByScale": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "14193c60-068a-42b4-92cf-a6cb623fe40f"
+    },
+    "fileId": "19CttPGLVL8bX8TJN2FVmR",
     "sync": false
   },
   {
@@ -2187,11 +2430,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 61
+        "__id__": 68
       }
     ],
     "_prefab": {
-      "__id__": 62
+      "__id__": 69
     },
     "_opacity": 255,
     "_color": {
@@ -2245,7 +2488,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 60
+      "__id__": 67
     },
     "_enabled": true,
     "_materials": [
@@ -2315,25 +2558,25 @@
     },
     "_children": [
       {
-        "__id__": 66
+        "__id__": 73
       },
       {
-        "__id__": 69
+        "__id__": 76
       },
       {
-        "__id__": 72
+        "__id__": 79
       },
       {
-        "__id__": 75
+        "__id__": 82
       },
       {
-        "__id__": 78
+        "__id__": 85
       }
     ],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 81
+      "__id__": 88
     },
     "_opacity": 255,
     "_color": {
@@ -2387,17 +2630,17 @@
     "_name": "星星",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 65
+      "__id__": 72
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 67
+        "__id__": 74
       }
     ],
     "_prefab": {
-      "__id__": 68
+      "__id__": 75
     },
     "_opacity": 255,
     "_color": {
@@ -2451,7 +2694,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 66
+      "__id__": 73
     },
     "_enabled": true,
     "_materials": [
@@ -2494,17 +2737,17 @@
     "_name": "星星",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 65
+      "__id__": 72
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 70
+        "__id__": 77
       }
     ],
     "_prefab": {
-      "__id__": 71
+      "__id__": 78
     },
     "_opacity": 255,
     "_color": {
@@ -2558,7 +2801,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 69
+      "__id__": 76
     },
     "_enabled": true,
     "_materials": [
@@ -2601,17 +2844,17 @@
     "_name": "星星",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 65
+      "__id__": 72
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 73
+        "__id__": 80
       }
     ],
     "_prefab": {
-      "__id__": 74
+      "__id__": 81
     },
     "_opacity": 255,
     "_color": {
@@ -2665,7 +2908,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 72
+      "__id__": 79
     },
     "_enabled": true,
     "_materials": [
@@ -2708,17 +2951,17 @@
     "_name": "星星",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 65
+      "__id__": 72
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 76
+        "__id__": 83
       }
     ],
     "_prefab": {
-      "__id__": 77
+      "__id__": 84
     },
     "_opacity": 255,
     "_color": {
@@ -2772,7 +3015,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 75
+      "__id__": 82
     },
     "_enabled": true,
     "_materials": [
@@ -2815,17 +3058,17 @@
     "_name": "星星",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 65
+      "__id__": 72
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 79
+        "__id__": 86
       }
     ],
     "_prefab": {
-      "__id__": 80
+      "__id__": 87
     },
     "_opacity": 255,
     "_color": {
@@ -2879,7 +3122,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 78
+      "__id__": 85
     },
     "_enabled": true,
     "_materials": [
@@ -3017,11 +3260,14 @@
       "__id__": 36
     },
     "lbl_reward_num": {
-      "__id__": 57
+      "__id__": 62
     },
     "node_hb": {
       "__id__": 52
     },
+    "lbl_des": {
+      "__id__": 58
+    },
     "_id": ""
   },
   {

assets/resources/module/speedUpUI/productReward.prefab

@@ -1307,7 +1307,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 194.27,
+      "width": 195.33,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -1359,8 +1359,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "生产次数x5",
-    "_N$string": "生产次数x5",
+    "_string": "生产次数+5",
+    "_N$string": "生产次数+5",
     "_fontSize": 38,
     "_lineHeight": 40,
     "_enableWrapText": true,

assets/resources/module/speedUpUI/speedUp.prefab

@@ -1387,8 +1387,8 @@
         0,
         0,
         1,
-        1,
-        1,
+        1.08,
+        1.08,
         1
       ]
     },
@@ -1451,8 +1451,8 @@
         0,
         0,
         1,
-        1,
-        1,
+        1.1,
+        1.1,
         1
       ]
     },
@@ -1897,7 +1897,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 234,
+      "width": 200,
       "height": 30
     },
     "_anchorPoint": {
@@ -1961,7 +1961,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 230,
+      "width": 197,
       "height": 26
     },
     "_anchorPoint": {
@@ -2017,7 +2017,7 @@
       "__uuid__": "9ae7b17e-12eb-4496-9746-ee4ab69b7680"
     },
     "_type": 3,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillType": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
@@ -2189,7 +2189,7 @@
       "__uuid__": "518d1473-cc4c-429f-b845-19acb33fa54f"
     },
     "_type": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillType": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
@@ -2269,8 +2269,8 @@
         0,
         0,
         1,
-        1,
-        1,
+        1.1,
+        1.1,
         1
       ]
     },

assets/resources/module/turnable/turnablerule.prefab

@@ -1158,8 +1158,8 @@
         0,
         0,
         1,
-        1,
-        1,
+        1.08,
+        1.08,
         1
       ]
     },
@@ -1222,8 +1222,8 @@
         0,
         0,
         1,
-        1,
-        1,
+        1.1,
+        1.1,
         1
       ]
     },
@@ -1317,7 +1317,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 234,
+      "width": 200,
       "height": 30
     },
     "_anchorPoint": {
@@ -1381,7 +1381,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 230,
+      "width": 197,
       "height": 26
     },
     "_anchorPoint": {
@@ -1437,7 +1437,7 @@
       "__uuid__": "9ae7b17e-12eb-4496-9746-ee4ab69b7680"
     },
     "_type": 3,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillType": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
@@ -1609,7 +1609,7 @@
       "__uuid__": "518d1473-cc4c-429f-b845-19acb33fa54f"
     },
     "_type": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillType": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
@@ -1689,8 +1689,8 @@
         0,
         0,
         1,
-        1,
-        1,
+        1.1,
+        1.1,
         1
       ]
     },

assets/script/game/component/BangsFit.ts

@@ -2,6 +2,8 @@
 const {ccclass, property} = cc._decorator;
 const LeftPadding = 65;
 const RightPadding = 65;
+const topOffset = 80;
+
 /**
  * 刘海屏适配
  * @author 薛鸿潇
@@ -9,9 +11,16 @@ const RightPadding = 65;
 @ccclass
 export default class BangsFit extends cc.Component {
 
+    @property({displayName: '是否适配特殊节点'})
+    private isFitSpecialNode = false;
+
     onLoad() {
         this._AdaptLeftAndRight();
     }
+    start()
+    {
+
+    }
 
     /*============================================================================================================*/
     /**
@@ -23,7 +32,23 @@ export default class BangsFit extends cc.Component {
 
         let is_big = this.IsBigScreenRatio();
         if (is_big) {
-            widget.top = LeftPadding;
+            if(this.isFitSpecialNode)
+            {
+                if(widget.isAlignTop)
+                {
+                    let add = Math.round((this.GetWinHeightWidthRatio() * topOffset)/1.86);
+                    widget.top = widget.top + add;
+                }
+                if(widget.isAlignBottom)
+                {
+                    let add = Math.round((this.GetWinHeightWidthRatio() * topOffset)/1.86);
+                    widget.bottom = widget.bottom + add;
+                }
+                
+            }else{
+                widget.top = LeftPadding;
+            }
+           
             // widget.bottom = RightPadding;
         }
     }

assets/script/game/component/tween/EffectOpenAndClose.ts

@@ -73,6 +73,11 @@ export default class EffectOpenAndClose extends cc.Component {
     start() {
         if (CC_EDITOR) return;
         if (this.isDelayOneFrame) {
+            if(EffectType.scale)
+            {
+                this.effect_par.opacity = 0;
+            }
+            
             cc.tween(this.effect_par).delay(0.16).call(() => {
                 this.showEffect();
             }).start();
@@ -94,6 +99,7 @@ export default class EffectOpenAndClose extends cc.Component {
                     break;
                 case EffectType.scale:
                     let scale = this.effect_par.scale;
+                    this.effect_par.opacity = 255;
                     mk.tween.scale(this.effect_par, 0.3, undefined, scale, undefined, 'backOut');
                     break;
                 case EffectType.centerUnfolding:

assets/script/game/data/AdData.ts

@@ -137,6 +137,10 @@ export class AdData {
             return;
         }
         let times = gData.gameData.getProp(GameProp.videoTimes);
+        if(!times)
+        {
+            times = 0;
+        }
         gData.gameData.setProp(GameProp.videoTimes, ++times);
         if (times < 5) {
             mk.data.sendXYEvent("video_end_" + times, "第" + times + "次看视频");

assets/script/game/data/GameData.ts

@@ -465,7 +465,7 @@ export class GameData {
         }
     }
 
-    makeProduct() {
+    async makeProduct() {
         let flyRed = true;
         switch (this.nextType) {
             case 0:
@@ -478,7 +478,7 @@ export class GameData {
                 this.setNextProduct(false);
                 gData.adData.checkPopRed();
 
-                this.updateNewTaskProgress();
+                await this.updateNewTaskProgress();
                 break;
             case 2:
                 gData.pastureSystem.btnMake();
@@ -486,7 +486,7 @@ export class GameData {
                 this.setNextProduct(false);
                 gData.adData.checkPopRed();
 
-                this.updateNewTaskProgress();
+                await this.updateNewTaskProgress();
                 break;
             case 3:
                 gData.factorySystem.btnMake();
@@ -494,7 +494,7 @@ export class GameData {
                 this.setNextProduct(false);
                 gData.adData.checkPopRed();
 
-                this.updateNewTaskProgress();
+                await this.updateNewTaskProgress();
                 break;
         }
         return flyRed;

assets/script/game/game/Game.ts

@@ -409,7 +409,7 @@ export default class Game extends cc.Component {
     }
 
     /** 点击种植 */
-    public onClickPlant() {
+    public async onClickPlant() {
         mk.audio.playEffect("button");
         if (gData.gameData.leftTimes <= 0) {
             // mk.tip.pop('生产次数不足');
@@ -422,7 +422,7 @@ export default class Game extends cc.Component {
             return;
         }
 
-        let flyRed = gData.gameData.makeProduct();
+        let flyRed = await gData.gameData.makeProduct();
 
         if (flyRed) {
             //mk.audio.playEffect('redmoney');

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

@@ -125,6 +125,7 @@ export default class BlessingBag extends cc.Component {
         }
 
         let isAllComplete = true;
+
         for (let i = 0; i != data.welFareTaskList.length; ++i) {
             if (data.welFareTaskList[i].progressRate < 1) {
                 isAllComplete = false;
@@ -133,14 +134,14 @@ export default class BlessingBag extends cc.Component {
         }
         //if(isAllComplete || data.leftVideoTimes <= 0)
         if (isAllComplete) {
-            this.video_btn.interactable = false;
+            this.video_btn.interactable = false; 
             let cmp = this.video_btn.getComponent(SetGray);
             if (cmp) {
                 cmp.setGray(true);
             }
         }
         {
-            if (!this.video_btn.interactable) {
+            if (!isAllComplete && !this.video_btn.interactable) {
                 this.video_btn.interactable = true;
                 let cmp = this.video_btn.getComponent(SetGray);
                 if (cmp) {

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

@@ -1,4 +1,5 @@
 import Util from "../../../before/util/Util";
+import JsbSystem from "../../../mk/system/JsbSystem";
 import SetGray from "../../component/SetGray";
 import { BannerAdType, DataEventId, GameProp } from "../../data/GameData";
 
@@ -37,6 +38,8 @@ export default class RedBagTask extends cc.Component {
     private lbl_taskNum: cc.Label = null;
     @property(cc.Node)
     private node_videoIcon: cc.Node = null;
+    @property(cc.Node)
+    private node_hand: cc.Node = null;
 
     private isShowNewTask = false;
     private num = 0;
@@ -176,11 +179,13 @@ export default class RedBagTask extends cc.Component {
 
             let gray = this.openBtn_ani.getComponent(SetGray);
             if (gray && com < count) {
+                
                 gray.setGray(true);
                 this.openBtn_ani.getComponent(cc.Button).interactable = false;
             }
 
             this.isCanCash = com >= count;
+            this.node_hand.active = this.isCanCash;
             if (this.isCanCash && gData.adData.checkShowVideoIcon()) {
                 this.node_videoIcon.active = true;
             } else {
@@ -233,7 +238,17 @@ export default class RedBagTask extends cc.Component {
         //mk.ui.openPanel('module/newNotice/newNotice');
         mk.audio.playEffect("button");
         if (this.isCanCash) {
+            if (cc.sys.isNative) {
+                if (!gData.loginData.isAuth) {
+                    JsbSystem.WxAuth();
+                    return;
+                }
+            }
+
             this.httpCashOut();
+        }else
+        {
+            mk.tip.pop('完成任务即可提现');
         }
 
     }

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

@@ -38,6 +38,9 @@ export default class Reward extends cc.Component {
     @property({ displayName: '红包节点', type: cc.Sprite })
     private node_hb: cc.Sprite = null;
 
+    @property({ displayName: '描述', type: cc.Label })
+    private lbl_des: cc.Label = null;
+
     /** 当前阶段 */
     private cur_stage: number = LidType.none;
 
@@ -142,9 +145,12 @@ export default class Reward extends cc.Component {
         } else {
             if(gData.reward.data[0].rewardType != RewardType.productTimes)
             {
-                rewardNum = rewardNum/100;
-            }   
-            this.lbl_reward_num.string = `x${rewardNum}`;
+                rewardNum = Math.round(rewardNum/100);
+                this.lbl_des.string = '红包币'
+            }else{
+                this.lbl_des.string = '生产次数'
+            }  
+            this.lbl_reward_num.string = `+${rewardNum}`;
         }
 
         // 底部进度动画
@@ -165,9 +171,7 @@ export default class Reward extends cc.Component {
             gData.reward.callback = null;
         }
         this.onClickClose();
-        if (gData.gameData.getProp(GameProp.videoTimes) == 0) {
-            mk.data.sendXYEvent("guide_receive", "新手引导领取2500红包币");
-        }
+        
     }
 
     /**

build/jsb-link/assets/resources/import/23/2301f946-ef9d-4d93-b296-1f8ff5b307d3.json

@@ -1 +1 @@
-[1,0,0,[["cc.JsonAsset",["_name","json"],1]],[[0,0,1,3]],[[0,"guide_data",[{"id":"1_1","trigger":"1","trNum":"0","trForm":"2","dialogPos":":0::::","dialogPos1":"","dialogAlignment":"0","dialog":"<color=8A4312>欢迎来到《开心农乐园》\n让我带你了解农场的玩法吧~</color>","displayRect":"","clickRect":"all","finger":"","lagNext":"0"},{"id":"3_1","trigger":"1","trNum":"0","trForm":"1","dialogPos":":200::::","dialogPos1":"","dialogAlignment":"0","dialog":"<color=8A4312>点击生产，即可种植农\n作物，获得红包币哦</color>","displayRect":"","clickRect":"主界面层/game/功能按钮/底部按钮/中间按钮","finger":"100:20","lagNext":"1"},{"id":"4_1","trigger":"1","trNum":"0","trForm":"3","dialogPos":"::::-600:","dialogPos1":"","dialogAlignment":"0","dialog":"<color=8A4312>再生产1次，即可获得任\n务红包，快领取次数吧！</color>","displayRect":"","clickRect":"all","finger":"100:-280","lagNext":"1"},{"id":"5_1","trigger":"1","trNum":"0","trForm":"1","dialogPos":"300:::::","dialogPos1":"","dialogAlignment":"0","dialog":"<color=8A4312>太棒啦！你完成了任务！\n快点击提现吧~</color>","displayRect":"","clickRect":"主界面层/game/node_ui/顶部个人信息/任务","finger":"100:20","lagNext":"1"}]]],0,0,[],[],[]]
+[1,0,0,[["cc.JsonAsset",["_name","json"],1]],[[0,0,1,3]],[[0,"guide_data",[{"id":"1_1","trigger":"1","trNum":"0","trForm":"2","dialogPos":":0::::","dialogPos1":"","dialogAlignment":"0","dialog":"<color=8A4312>欢迎来到《开心农乐园》\n让我带你了解农场的玩法吧~</color>","displayRect":"","clickRect":"all","finger":"","lagNext":"0"},{"id":"1_2","trigger":"1","trNum":"0","trForm":"1","dialogPos":":200::::","dialogPos1":"","dialogAlignment":"0","dialog":"<color=8A4312>点击生产，即可种植农\n作物，获得红包币哦</color>","displayRect":"","clickRect":"主界面层/game/功能按钮/底部按钮/中间按钮","finger":"100:20","lagNext":"1"},{"id":"4_1","trigger":"1","trNum":"0","trForm":"3","dialogPos":"::::-600:","dialogPos1":"","dialogAlignment":"0","dialog":"<color=8A4312>再生产1次，即可获得任\n务红包，快领取次数吧！</color>","displayRect":"","clickRect":"all","finger":"100:-280","lagNext":"1"},{"id":"5_1","trigger":"1","trNum":"0","trForm":"1","dialogPos":"300:::::","dialogPos1":"","dialogAlignment":"0","dialog":"<color=8A4312>太棒啦！你完成了任务！\n快点击提现吧~</color>","displayRect":"","clickRect":"主界面层/game/node_ui/顶部个人信息/任务","finger":"100:20","lagNext":"1"}]]],0,0,[],[],[]]

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

@@ -23444,6 +23444,7 @@ e.node_task = null;
 e.lbl_Ani = null;
 e.lbl_taskNum = null;
 e.node_videoIcon = null;
+e.node_hand = null;
 e.isShowNewTask = !1;
 e.num = 0;
 e.delayTime = 0;
@@ -23479,7 +23480,6 @@ mk.ad.showBanner(p.BannerAdType.banner_click_2);
 e.prototype.onDisable = function() {
 mk.ui.removeRefreshEvent(this);
 mk.ad.destoryBanner();
-mk.guide.open(3);
 };
 e.prototype.update = function(t) {
 var e = this;
@@ -23564,6 +23564,7 @@ a.setGray(!0);
 this.openBtn_ani.getComponent(cc.Button).interactable = !1;
 }
 this.isCanCash = e >= o;
+this.node_hand.active = this.isCanCash;
 this.isCanCash && gData.adData.checkShowVideoIcon() ? this.node_videoIcon.active = !0 : this.node_videoIcon.active = !1;
 }
 };
@@ -23670,6 +23671,7 @@ type: cc.Label,
 displayName: "任务数量"
 }) ], e.prototype, "lbl_taskNum", void 0);
 i([ h(cc.Node) ], e.prototype, "node_videoIcon", void 0);
+i([ h(cc.Node) ], e.prototype, "node_hand", void 0);
 return i([ d ], e);
 }(cc.Component);
 o.default = f;

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