界面优化

assets/resources/animation/Main.meta

@@ -1,12 +0,0 @@
-{
-  "ver": "1.1.2",
-  "uuid": "64032a87-13a2-414a-a91f-a4bed7cc56a9",
-  "isBundle": false,
-  "bundleName": "",
-  "priority": 1,
-  "compressionType": {},
-  "optimizeHotUpdate": {},
-  "inlineSpriteFrames": {},
-  "isRemoteBundle": {},
-  "subMetas": {}
-}

assets/resources/animation/bubbleAni.anim

@@ -0,0 +1,105 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "bubbleAni",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 35.083333333333336,
+  "sample": 12,
+  "speed": 1,
+  "wrapMode": 2,
+  "curveData": {
+    "props": {
+      "position": [
+        {
+          "frame": 0,
+          "value": [
+            799.616,
+            169.709,
+            0
+          ]
+        },
+        {
+          "frame": 2.5833333333333335,
+          "value": [
+            470.312,
+            200.957,
+            0
+          ]
+        },
+        {
+          "frame": 5,
+          "value": [
+            222.733,
+            234.609,
+            0
+          ]
+        },
+        {
+          "frame": 7.5,
+          "value": [
+            -70.516,
+            287.49,
+            0
+          ]
+        },
+        {
+          "frame": 10,
+          "value": [
+            -308.48,
+            352.389,
+            0
+          ]
+        },
+        {
+          "frame": 12.583333333333334,
+          "value": [
+            -39.268,
+            462.958,
+            0
+          ]
+        },
+        {
+          "frame": 15,
+          "value": [
+            160.238,
+            573.527,
+            0
+          ]
+        },
+        {
+          "frame": 17.5,
+          "value": [
+            369.358,
+            698.518,
+            0
+          ]
+        },
+        {
+          "frame": 20,
+          "value": [
+            580.882,
+            785.051,
+            0
+          ]
+        },
+        {
+          "frame": 22.5,
+          "value": [
+            782.791,
+            823.51,
+            0
+          ]
+        },
+        {
+          "frame": 35.083333333333336,
+          "value": [
+            782.791,
+            823.51,
+            0
+          ]
+        }
+      ]
+    }
+  },
+  "events": []
+}

assets/resources/animation/bubbleAni.anim.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "2.1.0",
+  "uuid": "694be332-0f99-413a-9807-7bc7445d01ea",
+  "subMetas": {}
+}

assets/resources/game/coregame/texture/animations/dog/dogMove.anim

@@ -3,7 +3,7 @@
   "_name": "dogMove",
   "_objFlags": 0,
   "_native": "",
-  "_duration": 31,
+  "_duration": 30.2,
   "sample": 5,
   "speed": 1,
   "wrapMode": 1,
@@ -253,37 +253,30 @@
           "value": 255
         },
         {
-          "frame": 29,
+          "frame": 28,
           "value": 255
         },
         {
-          "frame": 31,
+          "frame": 30.2,
           "value": 0
         }
-      ],
-      "scaleX": [
-        {
-          "frame": 0,
-          "value": 1
-        },
-        {
-          "frame": 8.8,
-          "value": 1
-        },
-        {
-          "frame": 9,
-          "value": -1
-        },
-        {
-          "frame": 19.8,
-          "value": -1
-        },
-        {
-          "frame": 20,
-          "value": 1
-        }
       ]
     }
   },
-  "events": []
+  "events": [
+    {
+      "frame": 9,
+      "func": "changeDogAni",
+      "params": [
+        0
+      ]
+    },
+    {
+      "frame": 20,
+      "func": "changeDogAni",
+      "params": [
+        1
+      ]
+    }
+  ]
 }

assets/resources/game/coregame/texture/animations/idleAni.anim

@@ -0,0 +1,79 @@
+{
+  "__type__": "cc.AnimationClip",
+  "_name": "idleAni",
+  "_objFlags": 0,
+  "_native": "",
+  "_duration": 1.5,
+  "sample": 40,
+  "speed": 1,
+  "wrapMode": 2,
+  "curveData": {
+    "props": {
+      "position": [
+        {
+          "frame": 0,
+          "value": [
+            0,
+            0,
+            0
+          ]
+        },
+        {
+          "frame": 1,
+          "value": [
+            9.959,
+            65.674,
+            0
+          ]
+        },
+        {
+          "frame": 1.5,
+          "value": [
+            23.239,
+            99.74,
+            0
+          ]
+        }
+      ],
+      "scale": [
+        {
+          "frame": 0,
+          "value": {
+            "__type__": "cc.Vec2",
+            "x": 0,
+            "y": 0
+          }
+        },
+        {
+          "frame": 0.75,
+          "value": {
+            "__type__": "cc.Vec2",
+            "x": 0.4,
+            "y": 0.4
+          }
+        }
+      ],
+      "angle": [
+        {
+          "frame": 0,
+          "value": 0
+        },
+        {
+          "frame": 1.5,
+          "value": -50
+        }
+      ],
+      "opacity": [
+        {
+          "frame": 1.25,
+          "value": 255
+        },
+        {
+          "frame": 1.5,
+          "value": 0
+        }
+      ]
+    }
+  },
+  "events": []
+}

assets/resources/game/coregame/texture/animations/idleAni.anim.meta

@@ -0,0 +1,5 @@
+{
+  "ver": "2.1.0",
+  "uuid": "826bbb51-7f99-41de-bee6-ee93f22b9c3b",
+  "subMetas": {}
+}

assets/resources/game/coregame/texture/farm/product.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "375d9eeb-bfea-46a7-b705-9c049b4c9c20",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 57,
+  "height": 31,
+  "platformSettings": {},
+  "subMetas": {
+    "product": {
+      "ver": "1.0.4",
+      "uuid": "f215fb07-184b-4334-a464-06ab8d3aacfa",
+      "rawTextureUuid": "375d9eeb-bfea-46a7-b705-9c049b4c9c20",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0.5,
+      "trimX": 1,
+      "trimY": 0,
+      "width": 55,
+      "height": 30,
+      "rawWidth": 57,
+      "rawHeight": 31,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/game/coregame/texture/farm/title.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "9cf2a775-8404-4a71-973a-2c0da4cce19d",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 651,
+  "height": 54,
+  "platformSettings": {},
+  "subMetas": {
+    "title": {
+      "ver": "1.0.4",
+      "uuid": "e9d6fa3f-d70b-44f9-8a1b-329c4f7ecce7",
+      "rawTextureUuid": "9cf2a775-8404-4a71-973a-2c0da4cce19d",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 651,
+      "height": 54,
+      "rawWidth": 651,
+      "rawHeight": 54,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/game/coregame/texture/main/main/addSpeed.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "a07ea12c-1078-421d-9e9b-1c40e390b8b1",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 100,
+  "height": 130,
+  "platformSettings": {},
+  "subMetas": {
+    "addSpeed": {
+      "ver": "1.0.4",
+      "uuid": "dc41e45f-cf12-4fb5-b4b6-95a640b7ed1e",
+      "rawTextureUuid": "a07ea12c-1078-421d-9e9b-1c40e390b8b1",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 100,
+      "height": 130,
+      "rawWidth": 100,
+      "rawHeight": 130,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/game/coregame/texture/main/main/idle.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "a8500fbc-b3a9-4987-87b8-fe23b11c2878",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 82,
+  "height": 73,
+  "platformSettings": {},
+  "subMetas": {
+    "idle": {
+      "ver": "1.0.4",
+      "uuid": "a4c1e481-48f9-4e4c-812f-10c012958625",
+      "rawTextureUuid": "a8500fbc-b3a9-4987-87b8-fe23b11c2878",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 82,
+      "height": 73,
+      "rawWidth": 82,
+      "rawHeight": 73,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/game/coregame/texture/main/main/taikBg.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "760c37de-a674-4355-8ff5-03443b5b43fe",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 129,
+  "height": 52,
+  "platformSettings": {},
+  "subMetas": {
+    "taikBg": {
+      "ver": "1.0.4",
+      "uuid": "79e7ee57-5dab-4650-8639-543bdd2f6637",
+      "rawTextureUuid": "760c37de-a674-4355-8ff5-03443b5b43fe",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 129,
+      "height": 52,
+      "rawWidth": 129,
+      "rawHeight": 52,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/game/prefab/ProductShow.prefab

@@ -28,10 +28,13 @@
     "_components": [
       {
         "__id__": 9
+      },
+      {
+        "__id__": 10
       }
     ],
     "_prefab": {
-      "__id__": 10
+      "__id__": 11
     },
     "_opacity": 255,
     "_color": {
@@ -328,6 +331,23 @@
     "_id": ""
   },
   {
+    "__type__": "bdb4cbzMa9EJ4AUwcV17EQN",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "moveOffset": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 6,
+      "z": 0
+    },
+    "duration": 1,
+    "_id": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1

assets/resources/game/prefab/uiItem/PlantItem.prefab

@@ -21,20 +21,20 @@
         "__id__": 2
       },
       {
-        "__id__": 54
+        "__id__": 57
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 64
+        "__id__": 70
       },
       {
-        "__id__": 65
+        "__id__": 71
       }
     ],
     "_prefab": {
-      "__id__": 66
+      "__id__": 72
     },
     "_opacity": 255,
     "_color": {
@@ -113,11 +113,11 @@
     "_active": false,
     "_components": [
       {
-        "__id__": 52
+        "__id__": 55
       }
     ],
     "_prefab": {
-      "__id__": 53
+      "__id__": 56
     },
     "_opacity": 255,
     "_color": {
@@ -1688,19 +1688,22 @@
     "_children": [
       {
         "__id__": 45
+      },
+      {
+        "__id__": 48
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 48
+        "__id__": 51
       },
       {
-        "__id__": 49
+        "__id__": 52
       }
     ],
     "_prefab": {
-      "__id__": 51
+      "__id__": 54
     },
     "_opacity": 255,
     "_color": {
@@ -1857,6 +1860,109 @@
     "sync": false
   },
   {
+    "__type__": "cc.Node",
+    "_name": "制作",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 44
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 49
+      }
+    ],
+    "_prefab": {
+      "__id__": 50
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 55,
+      "height": 30
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 48
+    },
+    "_enabled": true,
+    "_materials": [],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "f215fb07-184b-4334-a464-06ab8d3aacfa"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "ca279bfd-c7e6-46f5-9731-0a636e046674"
+    },
+    "fileId": "b30N/B2YJP+JGbCQ11rvuE",
+    "sync": false
+  },
+  {
     "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
@@ -1902,7 +2008,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 50
+        "__id__": 53
       }
     ],
     "_N$interactable": true,
@@ -2033,20 +2139,20 @@
     },
     "_children": [
       {
-        "__id__": 55
+        "__id__": 58
       },
       {
-        "__id__": 58
+        "__id__": 61
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 62
+        "__id__": 68
       }
     ],
     "_prefab": {
-      "__id__": 63
+      "__id__": 69
     },
     "_opacity": 255,
     "_color": {
@@ -2059,7 +2165,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 180,
-      "height": 131.8
+      "height": 156.8
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2100,17 +2206,17 @@
     "_name": "lock",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 54
+      "__id__": 57
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 56
+        "__id__": 59
       }
     ],
     "_prefab": {
-      "__id__": 57
+      "__id__": 60
     },
     "_opacity": 255,
     "_color": {
@@ -2135,7 +2241,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        35.900000000000006,
+        48.400000000000006,
         0,
         0,
         0,
@@ -2164,7 +2270,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 55
+      "__id__": 58
     },
     "_enabled": true,
     "_materials": [
@@ -2207,20 +2313,24 @@
     "_name": "解锁条件文本",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 54
+      "__id__": 57
     },
-    "_children": [],
+    "_children": [
+      {
+        "__id__": 62
+      }
+    ],
     "_active": true,
     "_components": [
       {
-        "__id__": 59
+        "__id__": 65
       },
       {
-        "__id__": 60
+        "__id__": 66
       }
     ],
     "_prefab": {
-      "__id__": 61
+      "__id__": 67
     },
     "_opacity": 255,
     "_color": {
@@ -2245,7 +2355,71 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -29.999999999999993,
+        -42.49999999999999,
+        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__": 61
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 63
+      }
+    ],
+    "_prefab": {
+      "__id__": 64
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 98,
+      "g": 61,
+      "b": 17,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 33.36,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        44.122,
         0,
         0,
         0,
@@ -2274,7 +2448,51 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 58
+      "__id__": 62
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "0/3",
+    "_N$string": "0/3",
+    "_fontSize": 24,
+    "_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.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "ca279bfd-c7e6-46f5-9731-0a636e046674"
+    },
+    "fileId": "40hRvSUotOhaBC7PlNEHzM",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 61
     },
     "_enabled": true,
     "_materials": [
@@ -2307,7 +2525,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 58
+      "__id__": 61
     },
     "_enabled": true,
     "_color": {
@@ -2336,13 +2554,13 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 54
+      "__id__": 57
     },
     "_enabled": true,
     "_layoutSize": {
       "__type__": "cc.Size",
       "width": 180,
-      "height": 131.8
+      "height": 156.8
     },
     "_resize": 1,
     "_N$layoutType": 2,
@@ -2357,7 +2575,7 @@
     "_N$paddingTop": 0,
     "_N$paddingBottom": 0,
     "_N$spacingX": 0,
-    "_N$spacingY": 0,
+    "_N$spacingY": 25,
     "_N$verticalDirection": 1,
     "_N$horizontalDirection": 0,
     "_N$affectedByScale": false,
@@ -2418,7 +2636,7 @@
       "__id__": 2
     },
     "lockNode": {
-      "__id__": 54
+      "__id__": 57
     },
     "plantIcon": {
       "__id__": 4
@@ -2433,7 +2651,16 @@
       "__id__": 23
     },
     "labUnlock": {
-      "__id__": 59
+      "__id__": 65
+    },
+    "lbl_progress": {
+      "__id__": 63
+    },
+    "node_plant": {
+      "__id__": 45
+    },
+    "node_product": {
+      "__id__": 48
     },
     "_id": ""
   },

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

@@ -24,20 +24,20 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 34
+        "__id__": 38
       },
       {
-        "__id__": 35
+        "__id__": 39
       },
       {
-        "__id__": 37
+        "__id__": 41
       },
       {
-        "__id__": 38
+        "__id__": 42
       }
     ],
     "_prefab": {
-      "__id__": 39
+      "__id__": 43
     },
     "_opacity": 255,
     "_color": {
@@ -113,11 +113,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 32
+        "__id__": 36
       }
     ],
     "_prefab": {
-      "__id__": 33
+      "__id__": 37
     },
     "_opacity": 255,
     "_color": {
@@ -759,19 +759,22 @@
       },
       {
         "__id__": 24
+      },
+      {
+        "__id__": 28
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 28
+        "__id__": 32
       },
       {
-        "__id__": 29
+        "__id__": 33
       }
     ],
     "_prefab": {
-      "__id__": 31
+      "__id__": 35
     },
     "_opacity": 255,
     "_color": {
@@ -1057,6 +1060,135 @@
     "sync": false
   },
   {
+    "__type__": "cc.Node",
+    "_name": "hb",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 20
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 29
+      },
+      {
+        "__id__": 30
+      }
+    ],
+    "_prefab": {
+      "__id__": 31
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 47,
+      "height": 51
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        124.89699999999999,
+        35.591,
+        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.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 28
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "d5e97c66-9823-45e8-a28f-98221c51338a"
+    },
+    "_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.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 28
+    },
+    "_enabled": true,
+    "_defaultClip": {
+      "__uuid__": "d51cece8-b476-4297-9b9e-2e09bdd99a18"
+    },
+    "_clips": [
+      {
+        "__uuid__": "d51cece8-b476-4297-9b9e-2e09bdd99a18"
+      }
+    ],
+    "playOnLoad": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "f5c0b09e-7ed9-41a5-aa98-47b18e3423f9"
+    },
+    "fileId": "0d4Ru/IDdFpqCHph1qAPkT",
+    "sync": false
+  },
+  {
     "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
@@ -1102,7 +1234,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 30
+        "__id__": 34
       }
     ],
     "_N$interactable": true,
@@ -1270,7 +1402,7 @@
     "bClickClose": true,
     "onComplete": [
       {
-        "__id__": 36
+        "__id__": 40
       }
     ],
     "_id": ""

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

@@ -24,20 +24,20 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 34
+        "__id__": 38
       },
       {
-        "__id__": 35
+        "__id__": 39
       },
       {
-        "__id__": 37
+        "__id__": 41
       },
       {
-        "__id__": 38
+        "__id__": 42
       }
     ],
     "_prefab": {
-      "__id__": 39
+      "__id__": 43
     },
     "_opacity": 255,
     "_color": {
@@ -113,11 +113,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 32
+        "__id__": 36
       }
     ],
     "_prefab": {
-      "__id__": 33
+      "__id__": 37
     },
     "_opacity": 255,
     "_color": {
@@ -759,19 +759,22 @@
       },
       {
         "__id__": 24
+      },
+      {
+        "__id__": 28
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 28
+        "__id__": 32
       },
       {
-        "__id__": 29
+        "__id__": 33
       }
     ],
     "_prefab": {
-      "__id__": 31
+      "__id__": 35
     },
     "_opacity": 255,
     "_color": {
@@ -1057,6 +1060,135 @@
     "sync": false
   },
   {
+    "__type__": "cc.Node",
+    "_name": "hb",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 20
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 29
+      },
+      {
+        "__id__": 30
+      }
+    ],
+    "_prefab": {
+      "__id__": 31
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 47,
+      "height": 51
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        124.89699999999999,
+        35.591,
+        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.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 28
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "d5e97c66-9823-45e8-a28f-98221c51338a"
+    },
+    "_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.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 28
+    },
+    "_enabled": true,
+    "_defaultClip": {
+      "__uuid__": "d51cece8-b476-4297-9b9e-2e09bdd99a18"
+    },
+    "_clips": [
+      {
+        "__uuid__": "d51cece8-b476-4297-9b9e-2e09bdd99a18"
+      }
+    ],
+    "playOnLoad": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "b909c955-7722-48c8-abeb-eb1ddf0190f1"
+    },
+    "fileId": "5bB8XJtJ1FMK7CN68dQbv2",
+    "sync": false
+  },
+  {
     "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
@@ -1102,7 +1234,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 30
+        "__id__": 34
       }
     ],
     "_N$interactable": true,
@@ -1270,7 +1402,7 @@
     "bClickClose": true,
     "onComplete": [
       {
-        "__id__": 36
+        "__id__": 40
       }
     ],
     "_id": ""

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

@@ -642,8 +642,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 44,
-      "height": 48
+      "width": 47,
+      "height": 51
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -695,7 +695,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "ccf6ba12-cd01-45df-bdda-453cccb2aa25@6c48a"
+      "__uuid__": "d5e97c66-9823-45e8-a28f-98221c51338a"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -2292,11 +2292,11 @@
     },
     "_enabled": true,
     "_defaultClip": {
-      "__uuid__": "ebfa09f7-ef7d-4aeb-b477-87eb94357dd8"
+      "__uuid__": "d51cece8-b476-4297-9b9e-2e09bdd99a18"
     },
     "_clips": [
       {
-        "__uuid__": "ebfa09f7-ef7d-4aeb-b477-87eb94357dd8"
+        "__uuid__": "d51cece8-b476-4297-9b9e-2e09bdd99a18"
       }
     ],
     "playOnLoad": true,

assets/resources/game/prefab/uiPanel/PlantPanel.prefab

@@ -24,6 +24,9 @@
     "_active": true,
     "_components": [
       {
+        "__id__": 21
+      },
+      {
         "__id__": 22
       },
       {
@@ -31,13 +34,10 @@
       },
       {
         "__id__": 24
-      },
-      {
-        "__id__": 25
       }
     ],
     "_prefab": {
-      "__id__": 26
+      "__id__": 25
     },
     "_opacity": 255,
     "_color": {
@@ -101,20 +101,20 @@
         "__id__": 6
       },
       {
-        "__id__": 10
+        "__id__": 9
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 19
+        "__id__": 18
       },
       {
-        "__id__": 20
+        "__id__": 19
       }
     ],
     "_prefab": {
-      "__id__": 21
+      "__id__": 20
     },
     "_opacity": 255,
     "_color": {
@@ -272,7 +272,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "New Label",
+    "_name": "New Sprite",
     "_objFlags": 0,
     "_parent": {
       "__id__": 2
@@ -282,26 +282,23 @@
     "_components": [
       {
         "__id__": 7
-      },
-      {
-        "__id__": 8
       }
     ],
     "_prefab": {
-      "__id__": 9
+      "__id__": 8
     },
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 250,
+      "r": 255,
       "g": 255,
-      "b": 173,
+      "b": 255,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 570,
-      "height": 60.4
+      "width": 651,
+      "height": 54
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -313,7 +310,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        7,
+        0,
         0,
         0,
         0,
@@ -338,7 +335,7 @@
     "_id": ""
   },
   {
-    "__type__": "cc.Label",
+    "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
     "node": {
@@ -352,40 +349,21 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "收获即可得红包，真提现无套路",
-    "_N$string": "收获即可得红包，真提现无套路",
-    "_fontSize": 40,
-    "_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__": 6
+    "_spriteFrame": {
+      "__uuid__": "e9d6fa3f-d70b-44f9-8a1b-329c4f7ecce7"
     },
-    "_enabled": true,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 104,
-      "g": 49,
-      "b": 11,
-      "a": 255
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
     },
-    "_width": 5,
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
     "_id": ""
   },
   {
@@ -396,7 +374,7 @@
     "asset": {
       "__uuid__": "6c4cddd9-4029-4d7b-b09d-8cae76051b8c"
     },
-    "fileId": "52QjhYWnJJ+J3piecWE9s0",
+    "fileId": "aa4xvysZdLeaBIFDCZ23g5",
     "sync": false
   },
   {
@@ -408,20 +386,20 @@
     },
     "_children": [
       {
-        "__id__": 11
+        "__id__": 10
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 16
+        "__id__": 15
       },
       {
-        "__id__": 17
+        "__id__": 16
       }
     ],
     "_prefab": {
-      "__id__": 18
+      "__id__": 17
     },
     "_opacity": 255,
     "_color": {
@@ -475,21 +453,21 @@
     "_name": "view",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 10
+      "__id__": 9
     },
     "_children": [
       {
-        "__id__": 12
+        "__id__": 11
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 14
+        "__id__": 13
       }
     ],
     "_prefab": {
-      "__id__": 15
+      "__id__": 14
     },
     "_opacity": 255,
     "_color": {
@@ -543,13 +521,13 @@
     "_name": "content",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 11
+      "__id__": 10
     },
     "_children": [],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 13
+      "__id__": 12
     },
     "_opacity": 255,
     "_color": {
@@ -614,7 +592,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 11
+      "__id__": 10
     },
     "_enabled": true,
     "_materials": [
@@ -645,7 +623,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 10
+      "__id__": 9
     },
     "_enabled": true,
     "horizontal": true,
@@ -657,10 +635,10 @@
     "scrollEvents": [],
     "cancelInnerEvents": false,
     "_N$content": {
-      "__id__": 12
+      "__id__": 11
     },
     "content": {
-      "__id__": 12
+      "__id__": 11
     },
     "_N$horizontalScrollBar": null,
     "_N$verticalScrollBar": null,
@@ -671,7 +649,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 10
+      "__id__": 9
     },
     "_enabled": true,
     "pre_item": [
@@ -688,6 +666,8 @@
     "limitLength": 0,
     "direction": 2,
     "isHideAllChild": false,
+    "limitDataLen": 3,
+    "addOffset": 20,
     "_id": ""
   },
   {
@@ -848,7 +828,7 @@
     },
     "_enabled": true,
     "tableView": {
-      "__id__": 17
+      "__id__": 16
     },
     "_id": ""
   },

assets/resources/game/texture/public/hb.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "dd541a8c-5a0b-4338-91bd-e403a106f7c5",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 47,
+  "height": 51,
+  "platformSettings": {},
+  "subMetas": {
+    "hb": {
+      "ver": "1.0.4",
+      "uuid": "d5e97c66-9823-45e8-a28f-98221c51338a",
+      "rawTextureUuid": "dd541a8c-5a0b-4338-91bd-e403a106f7c5",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 47,
+      "height": 51,
+      "rawWidth": 47,
+      "rawHeight": 51,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/module/farmMap/farmMap.prefab

@@ -132,8 +132,8 @@
         0,
         0,
         1,
-        1.1,
-        1.1,
+        1.2,
+        1.2,
         1
       ]
     },
@@ -680,7 +680,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 460,
-      "height": 60
+      "height": 85
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -691,7 +691,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -4.745,
+        1.255,
         290.032,
         0,
         0,
@@ -754,7 +754,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 460,
-      "height": 60
+      "height": 85
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -817,8 +817,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 1050,
-      "height": 60
+      "width": 1080,
+      "height": 85
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -829,7 +829,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        322.419,
+        324.419,
         0,
         0,
         0,
@@ -910,7 +910,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 1050,
-      "height": 61
+      "height": 80
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -1008,8 +1008,8 @@
         0,
         0,
         1,
-        1,
-        1,
+        1.1,
+        1.1,
         0
       ]
     },
@@ -1274,7 +1274,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 85,
+      "width": 91,
       "height": 50
     },
     "_anchorPoint": {
@@ -1350,13 +1350,13 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -32.5,
-        0,
-        0,
+        48.093,
+        22.477,
         0,
         0,
         0,
-        1,
+        -0.17364817766693033,
+        0.984807753012208,
         1,
         1,
         1
@@ -1366,7 +1366,7 @@
       "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
-      "z": 0
+      "z": -20
     },
     "_skewX": 0,
     "_skewY": 0,
@@ -1445,7 +1445,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 60,
+      "width": 66,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -1457,8 +1457,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -17.5,
-        0,
+        -33.5,
+        1,
         0,
         0,
         0,
@@ -1499,7 +1499,7 @@
     "_dstBlendFactor": 771,
     "_string": "农作物",
     "_N$string": "农作物",
-    "_fontSize": 20,
+    "_fontSize": 22,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": null,
@@ -1533,10 +1533,10 @@
     "node": {
       "__id__": 30
     },
-    "_enabled": true,
+    "_enabled": false,
     "_layoutSize": {
       "__type__": "cc.Size",
-      "width": 85,
+      "width": 91,
       "height": 50
     },
     "_resize": 1,
@@ -1854,15 +1854,15 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -336,
+        -331,
         3,
         0,
         0,
         0,
         0,
         1,
-        1,
-        1,
+        1.1,
+        1.1,
         0
       ]
     },
@@ -2127,7 +2127,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 65,
+      "width": 69,
       "height": 50
     },
     "_anchorPoint": {
@@ -2203,13 +2203,13 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -22.5,
-        0,
+        48.093,
+        22.477,
         0,
         0,
         0,
-        0,
-        1,
+        -0.17364817766693033,
+        0.984807753012208,
         1,
         1,
         1
@@ -2219,7 +2219,7 @@
       "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
-      "z": 0
+      "z": -20
     },
     "_skewX": 0,
     "_skewY": 0,
@@ -2298,7 +2298,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 40,
+      "width": 44,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -2310,8 +2310,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -7.5,
-        0,
+        -20.5,
+        1,
         0,
         0,
         0,
@@ -2352,7 +2352,7 @@
     "_dstBlendFactor": 771,
     "_string": "动物",
     "_N$string": "动物",
-    "_fontSize": 20,
+    "_fontSize": 22,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": null,
@@ -2386,10 +2386,10 @@
     "node": {
       "__id__": 53
     },
-    "_enabled": true,
+    "_enabled": false,
     "_layoutSize": {
       "__type__": "cc.Size",
-      "width": 65,
+      "width": 69,
       "height": 50
     },
     "_resize": 1,
@@ -2707,15 +2707,15 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -205,
+        -195,
         3,
         0,
         0,
         0,
         0,
         1,
-        1,
-        1,
+        1.1,
+        1.1,
         0
       ]
     },
@@ -2980,7 +2980,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 105,
+      "width": 113,
       "height": 50
     },
     "_anchorPoint": {
@@ -3056,13 +3056,13 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -42.5,
+        48.093,
+        22.477,
         0,
         0,
         0,
-        0,
-        0,
-        1,
+        -0.17364817766693033,
+        0.984807753012208,
         1,
         1,
         1
@@ -3072,7 +3072,7 @@
       "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
-      "z": 0
+      "z": -20
     },
     "_skewX": 0,
     "_skewY": 0,
@@ -3151,7 +3151,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 80,
+      "width": 88,
       "height": 50.4
     },
     "_anchorPoint": {
@@ -3163,7 +3163,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -27.5,
+        -41.5,
         0,
         0,
         0,
@@ -3205,7 +3205,7 @@
     "_dstBlendFactor": 771,
     "_string": "爆米花厂",
     "_N$string": "爆米花厂",
-    "_fontSize": 20,
+    "_fontSize": 22,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": null,
@@ -3239,10 +3239,10 @@
     "node": {
       "__id__": 76
     },
-    "_enabled": true,
+    "_enabled": false,
     "_layoutSize": {
       "__type__": "cc.Size",
-      "width": 105,
+      "width": 113,
       "height": 50
     },
     "_resize": 1,
@@ -3560,15 +3560,15 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -74,
+        -59,
         3,
         0,
         0,
         0,
         0,
         1,
-        1,
-        1,
+        1.1,
+        1.1,
         0
       ]
     },
@@ -3845,7 +3845,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
+        1,
         0,
         0,
         0,
@@ -3909,13 +3909,13 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -32.5,
-        0,
+        48.093,
+        22.477,
         0,
         0,
         0,
-        0,
-        1,
+        -0.17364817766693033,
+        0.984807753012208,
         1,
         1,
         1
@@ -3925,7 +3925,7 @@
       "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
-      "z": 0
+      "z": -20
     },
     "_skewX": 0,
     "_skewY": 0,
@@ -4016,8 +4016,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -17.5,
-        0,
+        -33.5,
+        1,
         0,
         0,
         0,
@@ -4092,7 +4092,7 @@
     "node": {
       "__id__": 99
     },
-    "_enabled": true,
+    "_enabled": false,
     "_layoutSize": {
       "__type__": "cc.Size",
       "width": 85,
@@ -4413,15 +4413,15 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        57,
+        77,
         3,
         0,
         0,
         0,
         0,
         1,
-        1,
-        1,
+        1.1,
+        1.1,
         0
       ]
     },
@@ -4762,13 +4762,13 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -32.5,
+        48.093,
+        22.477,
         0,
         0,
         0,
-        0,
-        0,
-        1,
+        -0.17364817766693033,
+        0.984807753012208,
         1,
         1,
         1
@@ -4778,7 +4778,7 @@
       "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
-      "z": 0
+      "z": -20
     },
     "_skewX": 0,
     "_skewY": 0,
@@ -4869,8 +4869,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -17.5,
-        0,
+        -31.5,
+        1,
         0,
         0,
         0,
@@ -4945,7 +4945,7 @@
     "node": {
       "__id__": 122
     },
-    "_enabled": true,
+    "_enabled": false,
     "_layoutSize": {
       "__type__": "cc.Size",
       "width": 85,
@@ -5266,15 +5266,15 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        188,
+        213,
         3,
         0,
         0,
         0,
         0,
         1,
-        1,
-        1,
+        1.1,
+        1.1,
         0
       ]
     },
@@ -5615,13 +5615,13 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -32.5,
-        0,
+        48.093,
+        22.477,
         0,
         0,
         0,
-        0,
-        1,
+        -0.17364817766693033,
+        0.984807753012208,
         1,
         1,
         1
@@ -5631,7 +5631,7 @@
       "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
-      "z": 0
+      "z": -20
     },
     "_skewX": 0,
     "_skewY": 0,
@@ -5722,8 +5722,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -17.5,
-        0,
+        -31.5,
+        1,
         0,
         0,
         0,
@@ -5798,7 +5798,7 @@
     "node": {
       "__id__": 145
     },
-    "_enabled": true,
+    "_enabled": false,
     "_layoutSize": {
       "__type__": "cc.Size",
       "width": 85,
@@ -6119,15 +6119,15 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        319,
+        349,
         3,
         0,
         0,
         0,
         0,
         1,
-        1,
-        1,
+        1.1,
+        1.1,
         0
       ]
     },
@@ -6468,13 +6468,13 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -42.5,
+        48.093,
+        22.477,
         0,
         0,
         0,
-        0,
-        0,
-        1,
+        -0.17364817766693033,
+        0.984807753012208,
         1,
         1,
         1
@@ -6484,7 +6484,7 @@
       "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
-      "z": 0
+      "z": -20
     },
     "_skewX": 0,
     "_skewY": 0,
@@ -6575,8 +6575,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -27.5,
-        0,
+        -39.5,
+        1,
         0,
         0,
         0,
@@ -6651,7 +6651,7 @@
     "node": {
       "__id__": 168
     },
-    "_enabled": true,
+    "_enabled": false,
     "_layoutSize": {
       "__type__": "cc.Size",
       "width": 105,
@@ -6972,15 +6972,15 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        450,
+        485,
         3,
         0,
         0,
         0,
         0,
         1,
-        1,
-        1,
+        1.1,
+        1.1,
         0
       ]
     },
@@ -7321,13 +7321,13 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -32.5,
-        0,
+        48.093,
+        22.477,
         0,
         0,
         0,
-        0,
-        1,
+        -0.17364817766693033,
+        0.984807753012208,
         1,
         1,
         1
@@ -7337,7 +7337,7 @@
       "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
-      "z": 0
+      "z": -20
     },
     "_skewX": 0,
     "_skewY": 0,
@@ -7428,8 +7428,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -17.5,
-        0,
+        -30.5,
+        1,
         0,
         0,
         0,
@@ -7504,7 +7504,7 @@
     "node": {
       "__id__": 191
     },
-    "_enabled": true,
+    "_enabled": false,
     "_layoutSize": {
       "__type__": "cc.Size",
       "width": 85,
@@ -7793,7 +7793,7 @@
     "_layoutSize": {
       "__type__": "cc.Size",
       "width": 1050,
-      "height": 61
+      "height": 80
     },
     "_resize": 0,
     "_N$layoutType": 1,
@@ -7807,7 +7807,7 @@
     "_N$paddingRight": 0,
     "_N$paddingTop": 0,
     "_N$paddingBottom": 0,
-    "_N$spacingX": 15,
+    "_N$spacingX": 20,
     "_N$spacingY": 0,
     "_N$verticalDirection": 1,
     "_N$horizontalDirection": 0,

assets/resources/module/gradeReward/gradeReward.prefab

@@ -629,7 +629,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 64,
+      "width": 76,
       "height": 54.4
     },
     "_anchorPoint": {
@@ -683,7 +683,7 @@
     "_dstBlendFactor": 771,
     "_string": "加经验",
     "_N$string": "加经验",
-    "_fontSize": 20,
+    "_fontSize": 24,
     "_lineHeight": 40,
     "_enableWrapText": true,
     "_N$file": null,
@@ -767,7 +767,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -33.047,
+        -40.047,
         4,
         0,
         0,
@@ -1043,7 +1043,7 @@
       "ctor": "Float64Array",
       "array": [
         -226.897,
-        -56.039,
+        -51.039,
         0,
         0,
         0,

assets/resources/module/gradeReward/gradeRewardItem.prefab

@@ -135,7 +135,7 @@
       "ctor": "Float64Array",
       "array": [
         -96.113,
-        26.113,
+        23.113,
         0,
         0,
         0,
@@ -249,7 +249,7 @@
       "ctor": "Float64Array",
       "array": [
         -97.679,
-        -18,
+        -21,
         0,
         0,
         0,

assets/resources/module/newCashUI/texture/line.png.meta

@@ -0,0 +1,36 @@
+{
+  "ver": "2.3.5",
+  "uuid": "280ac922-a2ce-4092-a4e4-4f724c1b5686",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 2,
+  "height": 60,
+  "platformSettings": {},
+  "subMetas": {
+    "line": {
+      "ver": "1.0.4",
+      "uuid": "e3183a07-a62b-4bf5-a4d2-bf2fde2ffd8c",
+      "rawTextureUuid": "280ac922-a2ce-4092-a4e4-4f724c1b5686",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 2,
+      "height": 60,
+      "rawWidth": 2,
+      "rawHeight": 60,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/module/newCashUI/walletCashOut.prefab

@@ -1059,7 +1059,7 @@
     "asset": {
       "__uuid__": "e3718e3b-b05d-4d23-9195-924548d5c740"
     },
-    "fileId": "a7oDkjsyhNCo0TJucti6wu",
+    "fileId": "ad/mnZoAhE5KX/Ge2BOpFx",
     "sync": false
   },
   {
@@ -1268,7 +1268,7 @@
     "asset": {
       "__uuid__": "e3718e3b-b05d-4d23-9195-924548d5c740"
     },
-    "fileId": "84lJcyq09ECZfU7TCC9ppk",
+    "fileId": "a1gmyojahCHZ2qfOygZtZw",
     "sync": false
   },
   {
@@ -2899,15 +2899,15 @@
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 147,
-      "g": 83,
-      "b": 56,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 21,
-      "height": 50.4
+      "width": 2,
+      "height": 19
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2919,7 +2919,7 @@
       "ctor": "Float64Array",
       "array": [
         -111.62,
-        2,
+        -0.3639999999999999,
         0,
         0,
         0,
@@ -2944,7 +2944,7 @@
     "_id": ""
   },
   {
-    "__type__": "cc.Label",
+    "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
     "node": {
@@ -2958,22 +2958,21 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "丨",
-    "_N$string": "丨",
-    "_fontSize": 21,
-    "_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,
+    "_spriteFrame": {
+      "__uuid__": "e3183a07-a62b-4bf5-a4d2-bf2fde2ffd8c"
+    },
+    "_type": 0,
+    "_sizeMode": 0,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
     "_id": ""
   },
   {
@@ -3007,15 +3006,15 @@
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 147,
-      "g": 83,
-      "b": 56,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 21,
-      "height": 50.4
+      "width": 2,
+      "height": 19
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -3027,7 +3026,7 @@
       "ctor": "Float64Array",
       "array": [
         -55.183,
-        2,
+        -0.364,
         0,
         0,
         0,
@@ -3052,7 +3051,7 @@
     "_id": ""
   },
   {
-    "__type__": "cc.Label",
+    "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
     "node": {
@@ -3066,22 +3065,21 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "丨",
-    "_N$string": "丨",
-    "_fontSize": 21,
-    "_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,
+    "_spriteFrame": {
+      "__uuid__": "e3183a07-a62b-4bf5-a4d2-bf2fde2ffd8c"
+    },
+    "_type": 0,
+    "_sizeMode": 0,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
     "_id": ""
   },
   {
@@ -3115,15 +3113,15 @@
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 147,
-      "g": 83,
-      "b": 56,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 21,
-      "height": 50.4
+      "width": 2,
+      "height": 19
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -3135,7 +3133,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        2,
+        -0.364,
         0,
         0,
         0,
@@ -3160,7 +3158,7 @@
     "_id": ""
   },
   {
-    "__type__": "cc.Label",
+    "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
     "node": {
@@ -3174,22 +3172,21 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "丨",
-    "_N$string": "丨",
-    "_fontSize": 21,
-    "_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,
+    "_spriteFrame": {
+      "__uuid__": "e3183a07-a62b-4bf5-a4d2-bf2fde2ffd8c"
+    },
+    "_type": 0,
+    "_sizeMode": 0,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
     "_id": ""
   },
   {
@@ -3223,15 +3220,15 @@
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 147,
-      "g": 83,
-      "b": 56,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 21,
-      "height": 50.4
+      "width": 2,
+      "height": 19
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -3243,7 +3240,7 @@
       "ctor": "Float64Array",
       "array": [
         52.675,
-        2,
+        -0.364,
         0,
         0,
         0,
@@ -3268,7 +3265,7 @@
     "_id": ""
   },
   {
-    "__type__": "cc.Label",
+    "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
     "node": {
@@ -3282,22 +3279,21 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "丨",
-    "_N$string": "丨",
-    "_fontSize": 21,
-    "_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,
+    "_spriteFrame": {
+      "__uuid__": "e3183a07-a62b-4bf5-a4d2-bf2fde2ffd8c"
+    },
+    "_type": 0,
+    "_sizeMode": 0,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
     "_id": ""
   },
   {
@@ -3331,15 +3327,15 @@
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 147,
-      "g": 83,
-      "b": 56,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 6.22,
-      "height": 50.4
+      "width": 2,
+      "height": 19
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -3351,7 +3347,7 @@
       "ctor": "Float64Array",
       "array": [
         107.604,
-        2,
+        -0.364,
         0,
         0,
         0,
@@ -3376,7 +3372,7 @@
     "_id": ""
   },
   {
-    "__type__": "cc.Label",
+    "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
     "node": {
@@ -3390,22 +3386,21 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "l",
-    "_N$string": "l",
-    "_fontSize": 28,
-    "_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,
+    "_spriteFrame": {
+      "__uuid__": "e3183a07-a62b-4bf5-a4d2-bf2fde2ffd8c"
+    },
+    "_type": 0,
+    "_sizeMode": 0,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
     "_id": ""
   },
   {

assets/resources/module/newNotice/texture/bg4.png.meta

@@ -26,8 +26,8 @@
       "height": 380,
       "rawWidth": 640,
       "rawHeight": 380,
-      "borderTop": 0,
-      "borderBottom": 136,
+      "borderTop": 303,
+      "borderBottom": 36,
       "borderLeft": 0,
       "borderRight": 0,
       "subMetas": {}

assets/resources/module/redBagTask/redBagTask.prefab

@@ -1563,7 +1563,7 @@
     "node": {
       "__id__": 22
     },
-    "_enabled": true,
+    "_enabled": false,
     "_layoutSize": {
       "__type__": "cc.Size",
       "width": 200,
@@ -2814,7 +2814,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 379.63,
+      "width": 384.1,
       "height": 63
     },
     "_anchorPoint": {
@@ -2890,7 +2890,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -189.815,
+        -192.05,
         -31.5,
         0,
         0,
@@ -2931,8 +2931,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "种植",
-    "_N$string": "种植",
+    "_string": "完成",
+    "_N$string": "完成",
     "_fontSize": 26,
     "_lineHeight": 50,
     "_enableWrapText": true,
@@ -2957,7 +2957,7 @@
     "asset": {
       "__uuid__": "82a16e23-7ade-43a5-af4f-5504bb39b61f"
     },
-    "fileId": "83i+qi46FGvJRSIBi0MZBX",
+    "fileId": "93DCx8lh5Ou7pVAJufocm1",
     "sync": false
   },
   {
@@ -2987,7 +2987,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 44.49,
+      "width": 48.96,
       "height": 63
     },
     "_anchorPoint": {
@@ -2999,7 +2999,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -137.815,
+        -140.05,
         -31.5,
         0,
         0,
@@ -3040,8 +3040,8 @@
     ],
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
-    "_string": "10",
-    "_N$string": "10",
+    "_string": "{0}",
+    "_N$string": "{0}",
     "_fontSize": 40,
     "_lineHeight": 50,
     "_enableWrapText": true,
@@ -3066,7 +3066,7 @@
     "asset": {
       "__uuid__": "82a16e23-7ade-43a5-af4f-5504bb39b61f"
     },
-    "fileId": "43ibtFFr1NM6PkrJtJ31dv",
+    "fileId": "d8IP9/lcBEbZfWW5u14KQ0",
     "sync": false
   },
   {
@@ -3108,7 +3108,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -93.32499999999999,
+        -91.09,
         -31.5,
         0,
         0,
@@ -3175,7 +3175,7 @@
     "asset": {
       "__uuid__": "82a16e23-7ade-43a5-af4f-5504bb39b61f"
     },
-    "fileId": "2dYr3fIhBFcJFcP5wih4kS",
+    "fileId": "86I0jR1eNOep/zjvt4jPts",
     "sync": false
   },
   {
@@ -3217,7 +3217,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        114.67500000000001,
+        116.91000000000003,
         -31.5,
         0,
         0,
@@ -3284,7 +3284,7 @@
     "asset": {
       "__uuid__": "82a16e23-7ade-43a5-af4f-5504bb39b61f"
     },
-    "fileId": "0bwnEmSolKPojzvB+negBd",
+    "fileId": "1cmsf/v/JKJY1usDfSWiXE",
     "sync": false
   },
   {
@@ -3297,7 +3297,7 @@
     "_enabled": true,
     "_fontFamily": "Arial",
     "_isSystemFontUsed": true,
-    "_N$string": "<color=#FFF7D4>种植</c><size=40><color=#FFDA31>10</c></size><color=#FFF7D4>次玉米，领取红包</color><color=#8AFFFE> (1/10)</c>",
+    "_N$string": "<color=#FFF7D4>完成</c><size=40><color=#FFDA31>{0}</c></size><color=#FFF7D4>次玉米，领取红包</color><color=#8AFFFE> (1/10)</c>",
     "_N$horizontalAlign": 0,
     "_N$fontSize": 26,
     "_N$font": null,
@@ -3356,7 +3356,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 325,
+      "width": 400,
       "height": 33
     },
     "_anchorPoint": {
@@ -3368,7 +3368,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        -53.182,
+        0,
         0,
         0,
         0,
@@ -3420,7 +3420,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 325,
+      "width": 400,
       "height": 33
     },
     "_anchorPoint": {
@@ -3476,7 +3476,7 @@
       "__uuid__": "6389923b-e670-4ac5-9284-42466a20c57b"
     },
     "_type": 3,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillType": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
@@ -3539,7 +3539,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        41.597,
+        0,
         0,
         0,
         0,
@@ -3623,7 +3623,7 @@
         "__id__": 104
       }
     ],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 107
@@ -3999,7 +3999,7 @@
       "__uuid__": "b58186aa-fe69-4dad-b263-cc6c32574961"
     },
     "_type": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillType": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",

assets/resources/module/setting/setting.prefab

@@ -2641,73 +2641,18 @@
     "_id": ""
   },
   {
-    "__type__": "cc.Button",
+    "__type__": "b8d2cnq+GZLFK30xbLDqr/m",
     "_name": "",
     "_objFlags": 0,
     "node": {
       "__id__": 71
     },
     "_enabled": true,
-    "_normalMaterial": null,
-    "_grayMaterial": null,
-    "duration": 0.1,
-    "zoomScale": 1.2,
-    "clickEvents": [],
-    "_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__": 71
-    },
+    "panel_name": "module/newCashUI/walletCashOut",
+    "bool_Auth": false,
+    "open_type": 0,
+    "transition_type": 0,
+    "onComplete": [],
     "_id": ""
   },
   {

assets/resources/module/speedUpUI/speedUp.prefab

@@ -24,20 +24,20 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 67
+        "__id__": 74
       },
       {
-        "__id__": 68
+        "__id__": 75
       },
       {
-        "__id__": 69
+        "__id__": 76
       },
       {
-        "__id__": 70
+        "__id__": 77
       }
     ],
     "_prefab": {
-      "__id__": 71
+      "__id__": 78
     },
     "_opacity": 255,
     "_color": {
@@ -101,7 +101,7 @@
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 66
+      "__id__": 73
     },
     "_opacity": 255,
     "_color": {
@@ -174,17 +174,23 @@
         "__id__": 18
       },
       {
-        "__id__": 29
+        "__id__": 21
+      },
+      {
+        "__id__": 33
+      },
+      {
+        "__id__": 68
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 64
+        "__id__": 71
       }
     ],
     "_prefab": {
-      "__id__": 65
+      "__id__": 72
     },
     "_opacity": 255,
     "_color": {
@@ -197,7 +203,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 640,
-      "height": 380
+      "height": 460
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -241,7 +247,7 @@
       "__id__": 3
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_components": [
       {
         "__id__": 5
@@ -275,8 +281,8 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        0,
-        146.634,
+        121.155,
+        177.689,
         0,
         0,
         0,
@@ -405,7 +411,7 @@
       "ctor": "Float64Array",
       "array": [
         314.005,
-        164.408,
+        200.408,
         0,
         0,
         0,
@@ -527,7 +533,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        61.014,
+        30.01400000000001,
         0,
         0,
         0,
@@ -635,7 +641,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -0.445,
+        -31.445,
         0,
         0,
         0,
@@ -705,6 +711,113 @@
   },
   {
     "__type__": "cc.Node",
+    "_name": "New Sprite",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 3
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 19
+      }
+    ],
+    "_prefab": {
+      "__id__": 20
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 100,
+      "height": 130
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        143.049,
+        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.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 18
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "dc41e45f-cf12-4fb5-b4b6-95a640b7ed1e"
+    },
+    "_type": 0,
+    "_sizeMode": 1,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "c24623b9-b557-420c-bf8c-8927ea736fa1"
+    },
+    "fileId": "57qlOBvDRHAoYSKRLI0+tw",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
     "_name": "按钮",
     "_objFlags": 0,
     "_parent": {
@@ -712,23 +825,26 @@
     },
     "_children": [
       {
-        "__id__": 19
+        "__id__": 22
       },
       {
-        "__id__": 23
+        "__id__": 26
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 26
+        "__id__": 29
       },
       {
-        "__id__": 27
+        "__id__": 30
+      },
+      {
+        "__id__": 31
       }
     ],
     "_prefab": {
-      "__id__": 28
+      "__id__": 32
     },
     "_opacity": 255,
     "_color": {
@@ -753,14 +869,14 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        -135.421,
+        -150.421,
         0,
         0,
         0,
         0,
         1,
-        1,
-        1,
+        1.2,
+        1.2,
         1
       ]
     },
@@ -782,20 +898,20 @@
     "_name": "New Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 18
+      "__id__": 21
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 20
+        "__id__": 23
       },
       {
-        "__id__": 21
+        "__id__": 24
       }
     ],
     "_prefab": {
-      "__id__": 22
+      "__id__": 25
     },
     "_opacity": 255,
     "_color": {
@@ -849,7 +965,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 19
+      "__id__": 22
     },
     "_enabled": true,
     "_materials": [
@@ -882,7 +998,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 19
+      "__id__": 22
     },
     "_enabled": true,
     "_color": {
@@ -911,17 +1027,17 @@
     "_name": "New Sprite",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 18
+      "__id__": 21
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 24
+        "__id__": 27
       }
     ],
     "_prefab": {
-      "__id__": 25
+      "__id__": 28
     },
     "_opacity": 255,
     "_color": {
@@ -975,7 +1091,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 23
+      "__id__": 26
     },
     "_enabled": true,
     "_materials": [
@@ -1018,7 +1134,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 18
+      "__id__": 21
     },
     "_enabled": true,
     "_materials": [
@@ -1050,7 +1166,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 18
+      "__id__": 21
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -1111,11 +1227,30 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 18
+      "__id__": 21
     },
     "_id": ""
   },
   {
+    "__type__": "cc.Animation",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 21
+    },
+    "_enabled": true,
+    "_defaultClip": {
+      "__uuid__": "d51cece8-b476-4297-9b9e-2e09bdd99a18"
+    },
+    "_clips": [
+      {
+        "__uuid__": "d51cece8-b476-4297-9b9e-2e09bdd99a18"
+      }
+    ],
+    "playOnLoad": true,
+    "_id": ""
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "root": {
       "__id__": 1
@@ -1135,13 +1270,13 @@
     },
     "_children": [
       {
-        "__id__": 30
+        "__id__": 34
       }
     ],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 63
+      "__id__": 67
     },
     "_opacity": 255,
     "_color": {
@@ -1195,33 +1330,33 @@
     "_name": "背景",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 29
+      "__id__": 33
     },
     "_children": [
       {
-        "__id__": 31
+        "__id__": 35
       },
       {
-        "__id__": 34
+        "__id__": 38
       },
       {
-        "__id__": 38
+        "__id__": 42
       },
       {
-        "__id__": 41
+        "__id__": 45
       },
       {
-        "__id__": 51
+        "__id__": 55
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 61
+        "__id__": 65
       }
     ],
     "_prefab": {
-      "__id__": 62
+      "__id__": 66
     },
     "_opacity": 255,
     "_color": {
@@ -1275,17 +1410,17 @@
     "_name": "图标",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 30
+      "__id__": 34
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 32
+        "__id__": 36
       }
     ],
     "_prefab": {
-      "__id__": 33
+      "__id__": 37
     },
     "_opacity": 255,
     "_color": {
@@ -1339,7 +1474,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 31
+      "__id__": 35
     },
     "_enabled": true,
     "_materials": [
@@ -1382,20 +1517,20 @@
     "_name": "提现金额",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 30
+      "__id__": 34
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 35
+        "__id__": 39
       },
       {
-        "__id__": 36
+        "__id__": 40
       }
     ],
     "_prefab": {
-      "__id__": 37
+      "__id__": 41
     },
     "_opacity": 255,
     "_color": {
@@ -1449,7 +1584,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 34
+      "__id__": 38
     },
     "_enabled": true,
     "_materials": [
@@ -1482,7 +1617,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 34
+      "__id__": 38
     },
     "_enabled": true,
     "_color": {
@@ -1511,17 +1646,17 @@
     "_name": "提现进度",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 30
+      "__id__": 34
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 39
+        "__id__": 43
       }
     ],
     "_prefab": {
-      "__id__": 40
+      "__id__": 44
     },
     "_opacity": 255,
     "_color": {
@@ -1575,7 +1710,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 38
+      "__id__": 42
     },
     "_enabled": true,
     "_materials": [
@@ -1619,24 +1754,24 @@
     "_name": "进度条背景",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 30
+      "__id__": 34
     },
     "_children": [
       {
-        "__id__": 42
+        "__id__": 46
       },
       {
-        "__id__": 45
+        "__id__": 49
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 49
+        "__id__": 53
       }
     ],
     "_prefab": {
-      "__id__": 50
+      "__id__": 54
     },
     "_opacity": 255,
     "_color": {
@@ -1690,17 +1825,17 @@
     "_name": "进度条",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 41
+      "__id__": 45
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 43
+        "__id__": 47
       }
     ],
     "_prefab": {
-      "__id__": 44
+      "__id__": 48
     },
     "_opacity": 255,
     "_color": {
@@ -1754,7 +1889,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 42
+      "__id__": 46
     },
     "_enabled": true,
     "_materials": [
@@ -1797,20 +1932,20 @@
     "_name": "进度",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 41
+      "__id__": 45
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 46
+        "__id__": 50
       },
       {
-        "__id__": 47
+        "__id__": 51
       }
     ],
     "_prefab": {
-      "__id__": 48
+      "__id__": 52
     },
     "_opacity": 255,
     "_color": {
@@ -1864,7 +1999,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 45
+      "__id__": 49
     },
     "_enabled": true,
     "_materials": [
@@ -1897,7 +2032,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 45
+      "__id__": 49
     },
     "_enabled": true,
     "_color": {
@@ -1926,7 +2061,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 41
+      "__id__": 45
     },
     "_enabled": true,
     "_materials": [
@@ -1969,27 +2104,27 @@
     "_name": "提现按钮",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 30
+      "__id__": 34
     },
     "_children": [
       {
-        "__id__": 52
+        "__id__": 56
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 56
+        "__id__": 60
       },
       {
-        "__id__": 57
+        "__id__": 61
       },
       {
-        "__id__": 58
+        "__id__": 62
       }
     ],
     "_prefab": {
-      "__id__": 60
+      "__id__": 64
     },
     "_opacity": 255,
     "_color": {
@@ -2043,20 +2178,20 @@
     "_name": "描述",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 51
+      "__id__": 55
     },
     "_children": [],
     "_active": false,
     "_components": [
       {
-        "__id__": 53
+        "__id__": 57
       },
       {
-        "__id__": 54
+        "__id__": 58
       }
     ],
     "_prefab": {
-      "__id__": 55
+      "__id__": 59
     },
     "_opacity": 255,
     "_color": {
@@ -2110,7 +2245,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 52
+      "__id__": 56
     },
     "_enabled": true,
     "_materials": [
@@ -2143,7 +2278,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 52
+      "__id__": 56
     },
     "_enabled": true,
     "_color": {
@@ -2172,7 +2307,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 51
+      "__id__": 55
     },
     "_enabled": true,
     "_materials": [
@@ -2204,7 +2339,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 51
+      "__id__": 55
     },
     "_enabled": true,
     "_defaultClip": {
@@ -2223,7 +2358,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 51
+      "__id__": 55
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -2232,7 +2367,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 59
+        "__id__": 63
       }
     ],
     "_N$interactable": true,
@@ -2288,7 +2423,7 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 51
+      "__id__": 55
     },
     "_id": ""
   },
@@ -2316,7 +2451,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 30
+      "__id__": 34
     },
     "_enabled": true,
     "_materials": [
@@ -2366,6 +2501,114 @@
     "sync": false
   },
   {
+    "__type__": "cc.Node",
+    "_name": "New Label",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 3
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 69
+      }
+    ],
+    "_prefab": {
+      "__id__": 70
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 193,
+      "g": 105,
+      "b": 51,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 162.25,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -202,
+        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__": 68
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "今日剩余次数：20",
+    "_N$string": "今日剩余次数：20",
+    "_fontSize": 20,
+    "_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.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "c24623b9-b557-420c-bf8c-8927ea736fa1"
+    },
+    "fileId": "94RdYwOudE0bmH1T5DrhJt",
+    "sync": false
+  },
+  {
     "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
@@ -2384,7 +2627,7 @@
       "__uuid__": "583e8dba-cff4-4047-b497-9a963c4f8f8c"
     },
     "_type": 0,
-    "_sizeMode": 1,
+    "_sizeMode": 0,
     "_fillType": 0,
     "_fillCenter": {
       "__type__": "cc.Vec2",
@@ -2494,17 +2737,18 @@
     },
     "_enabled": true,
     "lbl_reward_value": {
-      "__id__": 35
+      "__id__": 39
     },
     "spr_cash_out": {
-      "__id__": 43
+      "__id__": 47
     },
     "lbl_progress": {
-      "__id__": 46
+      "__id__": 50
     },
     "node_cash": {
-      "__id__": 57
+      "__id__": 61
     },
+    "lbl_remainTimes": null,
     "_id": ""
   },
   {

assets/resources/module/turnable/turnable.prefab

@@ -446,7 +446,9 @@
       "__id__": 14
     },
     "playOnLoad": true,
+    "actType": 0,
     "isSetSuitStartPos": false,
+    "isDelaySetOrigin": null,
     "_id": ""
   },
   {
@@ -2283,7 +2285,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "f5JBWWRChCq7DfRx3E2OGP",
+    "fileId": "73Tc2CqXxL2oWSPWQqbm2j",
     "sync": false
   },
   {
@@ -2415,7 +2417,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "2dJ85zoHVM06Bje5Jd+V4j",
+    "fileId": "15kkRKus1EU4KjmRQ/5xZl",
     "sync": false
   },
   {
@@ -2547,7 +2549,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "64mSbHjjZCs45VeHJOrCKN",
+    "fileId": "51/Il9MLJJkpoB0hJgeH+w",
     "sync": false
   },
   {
@@ -2763,7 +2765,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "f267hKiUxIkb364yKgiU83",
+    "fileId": "6eSASSOsJKmqJr9m1Xu8Kq",
     "sync": false
   },
   {
@@ -2874,7 +2876,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "76lrIuVAdPrINpEf7rZK1N",
+    "fileId": "c2b/bdSk1CqqVShnb0dk6o",
     "sync": false
   },
   {
@@ -4740,7 +4742,7 @@
     "asset": {
       "__uuid__": "18e0b7f8-059f-4a52-9e57-690fe778a31a"
     },
-    "fileId": "a5N4+XChBEu6jedllaMPkW",
+    "fileId": "4437Cdd3RJEYeHpOeuEi7p",
     "sync": false
   },
   {

assets/resources/module/turnable/turnableitem.prefab

@@ -60,8 +60,8 @@
         0,
         0,
         0,
-        0.49999999999999994,
-        -0.8660254037844387,
+        0,
+        1,
         1,
         1,
         1
@@ -71,7 +71,7 @@
       "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
-      "z": 300
+      "z": 0
     },
     "_skewX": 0,
     "_skewY": 0,
@@ -213,8 +213,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 106,
-      "height": 34.76
+      "width": 108,
+      "height": 36.76
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -293,12 +293,12 @@
     "_enabled": true,
     "_color": {
       "__type__": "cc.Color",
-      "r": 217,
-      "g": 88,
-      "b": 9,
+      "r": 98,
+      "g": 61,
+      "b": 17,
       "a": 255
     },
-    "_width": 1,
+    "_width": 2,
     "_id": ""
   },
   {

assets/script/before/main/FactoryIcon.ts

@@ -10,6 +10,8 @@ export class FactoryIcon extends cc.Component {
     @property({ type: FarmCountDown, tooltip: "倒计时组件" }) countDown: FarmCountDown = null;
     @property({ type: cc.Node, tooltip: "完成品展示节点" }) showGroup: cc.Node = null;
 
+    @property({type: cc.Node, tooltip: '闲置动画'}) idleAni: cc.Node = null;
+
     public configID: number = 0;
     public sortID: number = 0;
     private tab: ProductType = ProductType.bmhc;
@@ -72,11 +74,18 @@ export class FactoryIcon extends cc.Component {
 
                     break;
                 case FactroyState.Empty:
-
+                    if(this.idleAni && this.idleAni.active == false)
+                    {
+                        this.idleAni.active = true;
+                    }
                     break;
                 case FactroyState.Producting:
                     this.countDown.node.active = true;
                     this.countDown.setData(this.data);
+                    if(this.idleAni && this.idleAni.active == true)
+                    {
+                        this.idleAni.active = false;
+                    }
                     break;
                 case FactroyState.Ripe:
                     this.countDown.node.active = true;

assets/script/before/main/FarmIcon.ts

@@ -15,6 +15,8 @@ export class FarmIcon extends cc.Component {
     @property({ type: FarmCountDown, tooltip: "倒计时组件" }) countDown: FarmCountDown = null;
     @property({ type: FarmGrowProcess, tooltip: "成长控制组件" }) process: FarmGrowProcess = null;
 
+    @property({type: cc.Node, tooltip: '闲置动画'}) idleAni: cc.Node = null;
+
     public configID: number = 0;
     public sortID: number = 0;
 
@@ -64,12 +66,20 @@ export class FarmIcon extends cc.Component {
                     this.canUnlockNode.active = true;
                     break;
                 case FarmState.Empty:
+                    if(this.idleAni && this.idleAni.active == false)
+                    {
+                        this.idleAni.active = true;
+                    }
                     break;
                 case FarmState.Growing:
                     this.countDown.node.active = true;
                     this.process.node.active = true;
                     this.countDown.setData(this.data);
                     this.process.setData(this.data);
+                    if(this.idleAni && this.idleAni.active == true)
+                    {
+                        this.idleAni.active = false;
+                    }
                     break;
                 case FarmState.Ripe:
                     this.plantIcon.node.active = true;

assets/script/before/main/PastureIcon.ts

@@ -16,6 +16,8 @@ export default class PastureIcon extends cc.Component {
     @property({ type: FarmCountDown, tooltip: "倒计时组件" }) countDown: FarmCountDown = null;
     @property({ type: cc.Node, tooltip: "完成品展示节点" }) showGroup: cc.Node = null;
 
+    @property({type: cc.Node, tooltip: '闲置动画'}) idleAni: cc.Node = null;
+
     private animalsArr: Array<Animals> = new Array<Animals>();
 
     public configID: number = 0;
@@ -86,6 +88,10 @@ export default class PastureIcon extends cc.Component {
                     for (var i = 0; i < this.animalsArr.length; i++) {
                         this.animalsArr[i].setState(AnimalState.Hanger, this.configID);
                     }
+                    if(this.idleAni && this.idleAni.active == false)
+                    {
+                        this.idleAni.active = true;
+                    }
                     break;
                 case PastureState.Growing:
                     this.points.parent.active = true;
@@ -95,6 +101,10 @@ export default class PastureIcon extends cc.Component {
                     for (var i = 0; i < this.animalsArr.length; i++) {
                         this.animalsArr[i].setState(AnimalState.Eat, this.configID);
                     }
+                    if(this.idleAni && this.idleAni.active == true)
+                    {
+                        this.idleAni.active = false;
+                    }
                     break;
                 case PastureState.Ripe:
                     this.countDown.node.active = true;
@@ -106,6 +116,7 @@ export default class PastureIcon extends cc.Component {
                     this.onProductComplete();
                     break;
                 case PastureState.Sick:
+                    this.points.parent.active = true;
                     this.countDown.node.active = true;
                     this.countDown.setState(0);
                     for (var i = 0; i < this.animalsArr.length; i++) {

assets/script/before/main/TouchHelper.ts

@@ -10,47 +10,84 @@ export class TouchHelper extends cc.Component {
     @property({ tooltip: "在多边形范围内产生点击", type: cc.Component.EventHandler }) onInPolygon: cc.Component.EventHandler = null;
     @property({ tooltip: "在多边形范围外产生点击", type: cc.Component.EventHandler }) onOutPolygon: cc.Component.EventHandler = null;
     @property({ tooltip: "在节点范围内产生点击", type: cc.Component.EventHandler }) onTouchTap: cc.Component.EventHandler = null;
-    @property({ tooltip: "是否与需要多边形检查" }) needPolygon: boolean = false;
+    @property({ tooltip: "是否与需要多边形检查" }) needPolygon: boolean = true;
     @property({ type: [cc.Vec2], tooltip: "多边形定点位置信息（局部坐标，至少3个点）" }) points: Array<cc.Vec2> = [];
     @property({ tooltip: "点击在多边形区域内时是否阻止事件冒泡" }) stopPropagation = false;
 
+    @property({tooltip: '是否点击有缩放效果'})
+    private isScaleAct: boolean = true;
+
     private isMoved = false;
+    private isStart = false;
     start() {
         this.node.on(cc.Node.EventType.TOUCH_END, this.onTouchEnd, this);
         this.node.on(cc.Node.EventType.TOUCH_CANCEL, this.onTouchCancel, this);
         this.node.on(cc.Node.EventType.TOUCH_MOVE, this.onTouchMove, this);
+        this.node.on(cc.Node.EventType.TOUCH_START, this.onTouchStart, this);
+        this.node['_touchListener'].swallowTouches  = false;
     }
 
     private onTouchEnd(e): void {
-        if (this.canTouch && this.needPolygon && this.points.length >= 3) {
-            let touchPoint = e.touch._point;
-            let localPoint = this.node.convertToNodeSpaceAR(touchPoint);
-            let result = this.pointInPoly(localPoint, this.points);
-            if (!this.isMoved) {
-                if (result) {
-                    if (this.stopPropagation) {
-                        e.propagationStopped = true;
-                    }
-                    this.canTouch && this.onInPolygon && this.onInPolygon.emit([]);
-
-                    if (this.canTouch) {
-                        if (!this.isMoved) {
-                            this.canTouch && this.onTouchTap && this.onTouchTap.emit([]);
-                        }
-                    }
-                    this.isMoved = false;
-                } else {
-                    this.canTouch && this.onOutPolygon && this.onOutPolygon.emit([]);
+        if (!this.isMoved) {
+            if (this.isStart) {
+                if (this.stopPropagation) {
+                    e.propagationStopped = true;
+                }
+                if(this.canTouch)
+                {
+                    this.onInPolygon && this.onInPolygon.emit([]);
+                    this.onTouchTap && this.onTouchTap.emit([]);
                 }
+                         
+                if(this.isScaleAct)
+                {
+                    cc.tween(this.node).to(0.1, {scale: 1}).start();
+                    console.log(`------end${this.name}`);
+                }
+                
+            } else {
+                this.canTouch && this.onOutPolygon && this.onOutPolygon.emit([]);
             }
         }
+
+        this.isStart = false;
+        this.isMoved = false;
     }
     private onTouchMove(e: cc.Event.EventTouch) {
         if (e.getTouches().length > 1) { this.isMoved = true; return }
-        this.isMoved = cc.Vec2.distance(e.getStartLocation(), e.getLocation()) > 20;
+        //this.isMoved = cc.Vec2.distance(e.getStartLocation(), e.getLocation()) > 20;
+        let touchPoint = e.getLocation();
+        let localPoint = this.node.convertToNodeSpaceAR(touchPoint);
+        this.isMoved = cc.Intersection.pointInPolygon(localPoint, this.points);//!this.pointInPoly(localPoint, this.points);
+        
+
+        if(this.isScaleAct && this.isMoved)
+        {
+            console.log(`------move${this.name}`);
+            cc.tween(this.node).to(0.1, {scale: 1}).start();
+        }
     }
     private onTouchCancel(e: cc.Event.EventTouch) {
         this.isMoved = false;
+
+        if(this.isScaleAct)
+        {
+            this.node.setScale(1);
+        }
+        
+    }
+
+    private onTouchStart(e: cc.Event.EventTouch){
+        if (this.canTouch && this.needPolygon && this.points.length >= 3) {
+            let touchPoint = e.getLocation();
+            let localPoint = this.node.convertToNodeSpaceAR(touchPoint);
+            this.isStart = cc.Intersection.pointInPolygon(localPoint, this.points)//this.pointInPoly(localPoint, this.points);
+        }
+        if(this.isScaleAct && this.isStart)
+        {
+            cc.tween(this.node).to(0.1, {scale: 1.1}).start();
+            console.log(`------start${this.name}`);
+        }
     }
 
     private pointInPoly(point: cc.Vec2 | cc.Vec3, polyPoints: cc.Vec2[]) {

assets/script/before/view/uiItem/PlantItem.ts

@@ -14,6 +14,11 @@ export default class PlantItem extends cc.Component {
     @property({ type: BitmapFontC, tooltip: "获得数量文本" }) awardLabel: BitmapFontC = null;
     @property({ type: BitmapFontC, tooltip: "成熟时间文本" }) timeLabel: BitmapFontC = null;
     @property({ type: cc.Label, tooltip: "未开条件" }) labUnlock: cc.Label = null;
+    @property({ type: cc.Label, tooltip: '进度文本'}) lbl_progress: cc.Label = null;
+
+    @property({type: cc.Node}) node_plant: cc.Node =null;
+    @property({type: cc.Node}) node_product: cc.Node =null;
+
 
     private data = null;
     /**
@@ -35,10 +40,14 @@ export default class PlantItem extends cc.Component {
         if (this.data.tab == ProductType.nzw) {
             plantPath = 'game/coregame/texture/plant_icons/plantIcon_';
             namePath = 'game/coregame/texture/plant_icons/nameIcon/plant_name_';
+            this.node_plant.active = true;
+            this.node_product.active = false;
         }
         else {
             plantPath = 'game/coregame/texture/factory_icons/factory_';
             namePath = 'game/coregame/texture/factory_icons/factoryNams/factory_name_icon_';
+            this.node_plant.active = false;
+            this.node_product.active = true;
         }
         this.plantIcon.spriteFrame = await mk.loader.load(plantPath + list_data.picture, cc.SpriteFrame);
         this.nameIcon.spriteFrame = await mk.loader.load(namePath + list_data.picture, cc.SpriteFrame);
@@ -66,7 +75,8 @@ export default class PlantItem extends cc.Component {
             let des = this.getDesByType();
             let plantName = gData.gameData.getProductMap(this.data.picture - 1).name;
             if (list_data.picture - 1 == gData.gameData.getMaxProduct(this.data.tab)) {
-                this.labUnlock.string = `${times}/${this.data.value}\n${des}${this.data.value}次\n${plantName}`;
+                this.labUnlock.string = `${des}${this.data.value}次\n${plantName}`;
+                this.lbl_progress.string = `${times}/${this.data.value}`;
                 this.labUnlock.node.active = true;
             }
             else {

assets/script/game/component/TableView.ts

@@ -42,6 +42,11 @@ export default class TableView extends cc.Component {
     @property({ displayName: "初始化时所有子节点隐藏" })
     private isHideAllChild: boolean = false;
 
+    @property({displayName: '数据长度限制', tooltip: '总数据小于限制长度调大间距'})
+    private limitDataLen: number = -1;
+    @property({displayName: '间距增加数值', visible(){return this.limitDataLen != -1}})
+    private addOffset: number = 10;
+
     /** 数据 */
     private itemData: any = null;
     /** 滚动列表组件 */
@@ -80,6 +85,8 @@ export default class TableView extends cc.Component {
 
         if (this.node_xiabiao)
             this.node_xiabiao.active = false;
+
+
         // 测试
         // let itemData = [];
         // for (let i = 0; i < 20; i++) {
@@ -125,6 +132,13 @@ export default class TableView extends cc.Component {
         this.initItemData = true;
         this.count = 0;
         if (isSkipInit) return;
+        if(this.limitDataLen != -1)
+        {
+            if(this.itemData.length <= this.limitDataLen)
+            {
+                this.itemInterval += this.addOffset;
+            }
+        }
         // this.itemNode = [];
         // for (let i = 0; i < this.item.length; i++) {
         //     this.itemNode[i] = cc.instantiate(this.item[i]);
@@ -139,7 +153,7 @@ export default class TableView extends cc.Component {
         //水平居中
         if (this.direction == Direction.horizontal) {
             if (this.content.width < this.layerWith) {
-                this.node.x = (this.layerWith - this.content.width) * 0.5;
+                this.node.x = (this.layerWith - this.content.width) * 0.5 + this.itemInterval/2;
             }
         }
     }

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

@@ -93,7 +93,8 @@ export default class EffectOpenAndClose extends cc.Component {
                 case EffectType.none:
                     break;
                 case EffectType.scale:
-                    mk.tween.scale(this.effect_par, 0.3, undefined, undefined, undefined, 'backOut');
+                    let scale = this.effect_par.scale;
+                    mk.tween.scale(this.effect_par, 0.3, undefined, scale, undefined, 'backOut');
                     break;
                 case EffectType.centerUnfolding:
                     mk.tween.scaleX(this.effect_par, 0.3, undefined, undefined, undefined, 'backOut');

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

@@ -18,11 +18,12 @@ export default class MoveUpAndDown extends cc.Component {
         // let pos = cc.Vec3.ZERO;
         // this.startPos.add(this.moveOffset, pos);
     
-        let move1= cc.moveBy(this.duration, cc.v2(this.moveOffset.x, this.moveOffset.y));
-        let move2 = cc.moveBy(this.duration, cc.v2(this.moveOffset.x, -this.moveOffset.y));
-        let seq= cc.sequence([move1, move2]);
-        this.node.runAction(cc.repeatForever(seq));
-        //cc.tween(this.node).by(this.duration, { y: this.moveOffset.y }).by(this.duration, { y: -this.moveOffset.y }, cc.easeSineOut()).union().repeatForever().start();
+        // let move1= cc.moveBy(this.duration, cc.v2(this.moveOffset.x, this.moveOffset.y));
+        // let move2 = cc.moveBy(this.duration, cc.v2(-this.moveOffset.x, -this.moveOffset.y));
+        // let seq= cc.sequence([move1, move2]);
+        // this.node.runAction(cc.repeatForever(seq));
+        
+        cc.tween(this.node).by(this.duration, { y: this.moveOffset.y }).by(this.duration, { y: -this.moveOffset.y }).union().repeatForever().start();
 
     }
 }

assets/script/game/data/GameData.ts

@@ -333,10 +333,10 @@ export class GameData {
             let id = 31000;
             let data = null;
             for (var i = 0; i < 18; i++) {
-                if (i < 6) {
+                if (i < 9) {
                     data = { id: id, state: FarmState.Empty, productID: 0, growSpan: 0 };
                 }
-                else if (i == 6) {
+                else if (i == 9) {
                     data = { id: id, state: FarmState.CanUnlock, productID: 0, growSpan: 0 };
                 }
                 else {

assets/script/game/game/AniControl.ts

@@ -112,6 +112,7 @@ export default class AniControl extends cc.Component {
     {
         let time = mk.math.random(5, 8);
         this.dogMove.node.active = false;
+        this.dogMove.node.scaleX = 1;
         cc.Tween.stopAllByTarget(this.dogMove.node);
         cc.tween(this.dogMove.node).delay(time).call(()=>{
             this.dogMove.node.active = true;

assets/script/game/game/ChangeAni.ts

@@ -28,4 +28,9 @@ export default class ChangeAni extends cc.Component {
             //this.hb_node.setPosition(this.node.position.add(cc.v3(0, 82, 0)));
         }
     }
+
+    private changeDogAni(num: number)
+    {
+        this.node.scaleX = - this.node.scaleX;
+    }
 }

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

@@ -13,6 +13,8 @@ export default class SpeedUpUI extends cc.Component {
     private lbl_progress: cc.Label = null;
     @property(cc.Animation)
     private node_cash: cc.Animation = null;
+    @property(cc.Label)
+    private lbl_remainTimes: cc.Label = null;
 
 
     start(){

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

@@ -2650,6 +2650,7 @@ this.dogMove.on("finished", this.moveDogFinished, this);
 e.prototype.moveDogFinished = function() {
 var t = this, e = mk.math.random(5, 8);
 this.dogMove.node.active = !1;
+this.dogMove.node.scaleX = 1;
 cc.Tween.stopAllByTarget(this.dogMove.node);
 cc.tween(this.dogMove.node).delay(e).call(function() {
 t.dogMove.node.active = !0;
@@ -6059,6 +6060,9 @@ this.sheepAni.play("sheepStand");
 this.hb_node.active = !0;
 }
 };
+e.prototype.changeDogAni = function() {
+this.node.scaleX = -this.node.scaleX;
+};
 i([ s({
 displayName: "sheepAni",
 type: cc.Animation
@@ -6657,7 +6661,8 @@ case r.none:
 break;
 
 case r.scale:
-mk.tween.scale(this.effect_par, .3, void 0, void 0, void 0, "backOut");
+var t = this.effect_par.scale;
+mk.tween.scale(this.effect_par, .3, void 0, t, void 0, "backOut");
 break;
 
 case r.centerUnfolding:
@@ -7477,6 +7482,7 @@ function e() {
 var e = null !== t && t.apply(this, arguments) || this;
 e.countDown = null;
 e.showGroup = null;
+e.idleAni = null;
 e.configID = 0;
 e.sortID = 0;
 e.tab = s.ProductType.bmhc;
@@ -7539,12 +7545,16 @@ this._state = t;
 this.countDown.node.active = !1;
 switch (this.state) {
 case s.FactroyState.Lock:
+break;
+
 case s.FactroyState.Empty:
+this.idleAni && 0 == this.idleAni.active && (this.idleAni.active = !0);
 break;
 
 case s.FactroyState.Producting:
 this.countDown.node.active = !0;
 this.countDown.setData(this.data);
+this.idleAni && 1 == this.idleAni.active && (this.idleAni.active = !1);
 break;
 
 case s.FactroyState.Ripe:
@@ -7649,6 +7659,10 @@ i([ f({
 type: cc.Node,
 tooltip: "完成品展示节点"
 }) ], e.prototype, "showGroup", void 0);
+i([ f({
+type: cc.Node,
+tooltip: "闲置动画"
+}) ], e.prototype, "idleAni", void 0);
 return i([ h ], e);
 }(cc.Component);
 o.FactoryIcon = y;
@@ -8372,6 +8386,7 @@ e.selectNode = null;
 e.plantIcon = null;
 e.countDown = null;
 e.process = null;
+e.idleAni = null;
 e.configID = 0;
 e.sortID = 0;
 e.plantID = 0;
@@ -8425,6 +8440,7 @@ this.canUnlockNode.active = !0;
 break;
 
 case s.FarmState.Empty:
+this.idleAni && 0 == this.idleAni.active && (this.idleAni.active = !0);
 break;
 
 case s.FarmState.Growing:
@@ -8432,6 +8448,7 @@ this.countDown.node.active = !0;
 this.process.node.active = !0;
 this.countDown.setData(this.data);
 this.process.setData(this.data);
+this.idleAni && 1 == this.idleAni.active && (this.idleAni.active = !1);
 break;
 
 case s.FarmState.Ripe:
@@ -8584,6 +8601,10 @@ i([ y({
 type: u.FarmGrowProcess,
 tooltip: "成长控制组件"
 }) ], e.prototype, "process", void 0);
+i([ y({
+type: cc.Node,
+tooltip: "闲置动画"
+}) ], e.prototype, "idleAni", void 0);
 return i([ f ], e);
 }(cc.Component);
 o.FarmIcon = g;
@@ -10704,12 +10725,12 @@ this._farmData || (this._farmData = []);
 var t = this._farmData.length;
 if (t < 18) {
 for (var e = 31e3, o = null, n = 0; n < 18; n++) {
-o = n < 6 ? {
+o = n < 9 ? {
 id: e,
 state: s.Empty,
 productID: 0,
 growSpan: 0
-} : 6 == n ? {
+} : 9 == n ? {
 id: e,
 state: s.CanUnlock,
 productID: 0,
@@ -15760,6 +15781,9 @@ position: this.confirmPosition(e)
 easing: "sineOut"
 }).start();
 };
+e.prototype.clickMapBookBtn = function() {
+mk.ui.openPanel("module/farmMap/farmMap");
+};
 i([ l({
 type: cc.Node,
 tooltip: "地图容器"
@@ -17120,8 +17144,11 @@ return e;
 }
 e.prototype.start = function() {
 this.node.getPosition(this.startPos);
-var t = cc.moveBy(this.duration, cc.v2(this.moveOffset.x, this.moveOffset.y)), e = cc.moveBy(this.duration, cc.v2(this.moveOffset.x, -this.moveOffset.y)), o = cc.sequence([ t, e ]);
-this.node.runAction(cc.repeatForever(o));
+cc.tween(this.node).by(this.duration, {
+y: this.moveOffset.y
+}).by(this.duration, {
+y: -this.moveOffset.y
+}).union().repeatForever().start();
 };
 i([ s({
 displayName: "移动的相对距离"
@@ -17760,6 +17787,7 @@ e.points = null;
 e.eatNode = null;
 e.countDown = null;
 e.showGroup = null;
+e.idleAni = null;
 e.animalsArr = new Array();
 e.configID = 0;
 e.sortID = 0;
@@ -17845,6 +17873,7 @@ break;
 
 case s.PastureState.Empty:
 for (e = 0; e < this.animalsArr.length; e++) this.animalsArr[e].setState(s.AnimalState.Hanger, this.configID);
+this.idleAni && 0 == this.idleAni.active && (this.idleAni.active = !0);
 break;
 
 case s.PastureState.Growing:
@@ -17853,6 +17882,7 @@ this.eatNode.active = !1;
 this.countDown.node.active = !0;
 this.countDown.setData(this.data);
 for (e = 0; e < this.animalsArr.length; e++) this.animalsArr[e].setState(s.AnimalState.Eat, this.configID);
+this.idleAni && 1 == this.idleAni.active && (this.idleAni.active = !1);
 break;
 
 case s.PastureState.Ripe:
@@ -17863,6 +17893,7 @@ this.onProductComplete();
 break;
 
 case s.PastureState.Sick:
+this.points.parent.active = !0;
 this.countDown.node.active = !0;
 this.countDown.setState(0);
 for (e = 0; e < this.animalsArr.length; e++) this.animalsArr[e].setState(s.AnimalState.Wait, this.configID);
@@ -17969,6 +18000,10 @@ i([ y({
 type: cc.Node,
 tooltip: "完成品展示节点"
 }) ], e.prototype, "showGroup", void 0);
+i([ y({
+type: cc.Node,
+tooltip: "闲置动画"
+}) ], e.prototype, "idleAni", void 0);
 return i([ f ], e);
 }(cc.Component);
 o.default = g;
@@ -18595,6 +18630,7 @@ e.nameIcon = null;
 e.awardLabel = null;
 e.timeLabel = null;
 e.labUnlock = null;
+e.lbl_progress = null;
 e.data = null;
 return e;
 }
@@ -18649,7 +18685,8 @@ if (!i) {
 s = this.getDesByType();
 p = gData.gameData.getProductMap(this.data.picture - 1).name;
 if (t.picture - 1 == gData.gameData.getMaxProduct(this.data.tab)) {
-this.labUnlock.string = r + "/" + this.data.value + "\n" + s + this.data.value + "次\n" + p;
+this.labUnlock.string = "" + s + this.data.value + "次\n" + p;
+this.lbl_progress.string = r + "/" + this.data.value;
 this.labUnlock.node.active = !0;
 } else this.labUnlock.node.active = !1;
 }
@@ -18713,6 +18750,10 @@ i([ d({
 type: cc.Label,
 tooltip: "未开条件"
 }) ], e.prototype, "labUnlock", void 0);
+i([ d({
+type: cc.Label,
+tooltip: "进度文本"
+}) ], e.prototype, "lbl_progress", void 0);
 return i([ u ], e);
 }(cc.Component);
 o.default = h;
@@ -23190,6 +23231,7 @@ e.lbl_reward_value = null;
 e.spr_cash_out = null;
 e.lbl_progress = null;
 e.node_cash = null;
+e.lbl_remainTimes = null;
 return e;
 }
 e.prototype.start = function() {
@@ -23227,6 +23269,7 @@ i([ s(cc.Label) ], e.prototype, "lbl_reward_value", void 0);
 i([ s(cc.Sprite) ], e.prototype, "spr_cash_out", void 0);
 i([ s(cc.Label) ], e.prototype, "lbl_progress", void 0);
 i([ s(cc.Animation) ], e.prototype, "node_cash", void 0);
+i([ s(cc.Label) ], e.prototype, "lbl_remainTimes", void 0);
 return i([ c ], e);
 }(cc.Component);
 o.default = l;
@@ -23617,6 +23660,8 @@ e.isShowByLimitLength = !1;
 e.limitLength = 0;
 e.direction = r.vertical;
 e.isHideAllChild = !1;
+e.limitDataLen = -1;
+e.addOffset = 10;
 e.itemData = null;
 e.scrollView = null;
 e.item = null;
@@ -23673,10 +23718,12 @@ this.itemPosMap = new Map();
 this.initItemData = !0;
 this.count = 0;
 if (!e) {
+-1 != this.limitDataLen && this.itemData.length <= this.limitDataLen && (this.itemInterval += this.addOffset);
 this.initItem();
 this.initItemPos(0);
 this.isHideAllChild && (this.isHideAllChild = !1);
 this.scrollView.node.on("scrolling", this.callback, this);
+this.direction == r.horizontal && this.content.width < this.layerWith && (this.node.x = .5 * (this.layerWith - this.content.width) + this.itemInterval / 2);
 }
 };
 e.prototype.updateList = function(t) {
@@ -23754,10 +23801,12 @@ this.itemArr.push(n);
 return n;
 };
 e.prototype.updateContentHeigh = function(t) {
-this.content.height = t > this.layerHeight ? t : this.layerHeight;
+this.content.height = t;
+this.content.height <= this.layerHeight ? this.scrollView.vertical = !1 : this.scrollView.vertical = !0;
 };
 e.prototype.updateContentWidth = function(t) {
-this.content.width = t > this.layerWith ? t : this.layerWith;
+this.content.width = t;
+this.content.width <= this.layerWith ? this.scrollView.horizontal = !1 : this.scrollView.horizontal = !0;
 };
 e.prototype.callback = function() {
 if (this.direction == r.vertical) {
@@ -24051,6 +24100,16 @@ type: cc.Enum(r)
 i([ l({
 displayName: "初始化时所有子节点隐藏"
 }) ], e.prototype, "isHideAllChild", void 0);
+i([ l({
+displayName: "数据长度限制",
+tooltip: "总数据小于限制长度调大间距"
+}) ], e.prototype, "limitDataLen", void 0);
+i([ l({
+displayName: "间距增加数值",
+visible: function() {
+return -1 != this.limitDataLen;
+}
+}) ], e.prototype, "addOffset", void 0);
 return i([ s ], e);
 }(cc.Component);
 o.default = p;
@@ -24829,33 +24888,55 @@ e.canTouch = !0;
 e.onInPolygon = null;
 e.onOutPolygon = null;
 e.onTouchTap = null;
-e.needPolygon = !1;
+e.needPolygon = !0;
 e.points = [];
 e.stopPropagation = !1;
+e.isScaleAct = !0;
 e.isMoved = !1;
+e.isStart = !1;
 return e;
 }
 e.prototype.start = function() {
 this.node.on(cc.Node.EventType.TOUCH_END, this.onTouchEnd, this);
 this.node.on(cc.Node.EventType.TOUCH_CANCEL, this.onTouchCancel, this);
 this.node.on(cc.Node.EventType.TOUCH_MOVE, this.onTouchMove, this);
+this.node.on(cc.Node.EventType.TOUCH_START, this.onTouchStart, this);
+this.node._touchListener.swallowTouches = !1;
 };
 e.prototype.onTouchEnd = function(t) {
-if (this.canTouch && this.needPolygon && this.points.length >= 3) {
-var e = t.touch._point, o = this.node.convertToNodeSpaceAR(e), n = this.pointInPoly(o, this.points);
-if (!this.isMoved) if (n) {
+if (!this.isMoved) if (this.isStart) {
 this.stopPropagation && (t.propagationStopped = !0);
 this.canTouch && this.onInPolygon && this.onInPolygon.emit([]);
 this.canTouch && (this.isMoved || this.canTouch && this.onTouchTap && this.onTouchTap.emit([]));
-this.isMoved = !1;
+this.isScaleAct && cc.tween(this.node).to(.1, {
+scale: 1
+}).start();
 } else this.canTouch && this.onOutPolygon && this.onOutPolygon.emit([]);
-}
+this.isStart = !1;
+this.isMoved = !1;
 };
 e.prototype.onTouchMove = function(t) {
-t.getTouches().length > 1 ? this.isMoved = !0 : this.isMoved = cc.Vec2.distance(t.getStartLocation(), t.getLocation()) > 20;
+if (t.getTouches().length > 1) this.isMoved = !0; else {
+var e = t.getLocation(), o = this.node.convertToNodeSpaceAR(e);
+this.isMoved = cc.Intersection.pointInPolygon(o, this.points);
+this.isScaleAct && this.isMoved && cc.tween(this.node).to(.1, {
+scale: 1
+}).start();
+}
 };
 e.prototype.onTouchCancel = function() {
 this.isMoved = !1;
+this.isScaleAct && this.node.setScale(1);
+};
+e.prototype.onTouchStart = function(t) {
+console.log("------" + this.name);
+if (this.canTouch && this.needPolygon && this.points.length >= 3) {
+var e = t.getLocation(), o = this.node.convertToNodeSpaceAR(e);
+this.isStart = cc.Intersection.pointInPolygon(o, this.points);
+}
+this.isScaleAct && this.isStart && cc.tween(this.node).to(.1, {
+scale: 1.1
+}).start();
 };
 e.prototype.pointInPoly = function(t, e) {
 for (var o = !1, n = -1, a = e.length, i = a - 1; ++n < a; i = n) (e[n].y <= t.y && t.y < e[i].y || e[i].y <= t.y && t.y < e[n].y) && t.x < (e[i].x - e[n].x) * (t.y - e[n].y) / (e[i].y - e[n].y) + e[n].x && (o = !o);
@@ -24886,6 +24967,9 @@ tooltip: "多边形定点位置信息（局部坐标，至少3个点）"
 i([ s({
 tooltip: "点击在多边形区域内时是否阻止事件冒泡"
 }) ], e.prototype, "stopPropagation", void 0);
+i([ s({
+tooltip: "是否点击有缩放效果"
+}) ], e.prototype, "isScaleAct", void 0);
 return i([ c ], e);
 }(cc.Component);
 o.TouchHelper = l;

packages-hot-update/cfg.json

@@ -8,7 +8,7 @@
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminateTest/baseRemote/",
         "https://xcx-box.oss-cn-hangzhou.aliyuncs.com/hotgame/EasyEliminate/baseRemote/"
     ],
-    "buildTime": 1630057560705,
-    "genTime": 1630057560705,
+    "buildTime": 1630394316726,
+    "genTime": 1630394316726,
     "genVersion": null
 }