添加修改资源

assets/Prefabs/NBuildings/Labour/Labour_205_Holy_Farmland.prefab

@@ -37,26 +37,29 @@
       },
       {
         "__id__": 81
+      },
+      {
+        "__id__": 95
       }
     ],
     "_active": true,
     "_level": 1,
     "_components": [
       {
-        "__id__": 95
+        "__id__": 102
       },
       {
-        "__id__": 99
+        "__id__": 106
       },
       {
-        "__id__": 100
+        "__id__": 107
       },
       {
-        "__id__": 101
+        "__id__": 108
       }
     ],
     "_prefab": {
-      "__id__": 102
+      "__id__": 109
     },
     "_opacity": 255,
     "_color": {
@@ -2165,17 +2168,17 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 219,
-      "height": 30
+      "width": 100,
+      "height": 25
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
-      "x": 0.5,
+      "x": 0,
       "y": 0.5
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": 0.877,
+      "x": -59.117,
       "y": 0,
       "z": 0
     },
@@ -2225,8 +2228,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 160.20000000000002,
-      "height": 20
+      "width": 95,
+      "height": 18
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2235,7 +2238,7 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": -90.354,
+      "x": 0,
       "y": 0,
       "z": 0
     },
@@ -2338,15 +2341,15 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": -101.793,
+      "x": -5.537,
       "y": 0,
       "z": 0
     },
     "_scale": {
       "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
+      "x": 0.773,
+      "y": 0.773,
+      "z": 0.773
     },
     "_eulerAngles": {
       "__type__": "cc.Vec3",
@@ -2512,8 +2515,8 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 20.169,
+      "x": 48.321,
+      "y": 23.253,
       "z": 0
     },
     "_scale": {
@@ -2562,8 +2565,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 74.02,
-      "height": 22.68
+      "width": 61,
+      "height": 18.9
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2610,8 +2613,8 @@
     "_useOriginalSize": false,
     "_string": "3天5小时",
     "_N$string": "3天5小时",
-    "_fontSize": 18,
-    "_lineHeight": 18,
+    "_fontSize": 15,
+    "_lineHeight": 15,
     "_enableWrapText": true,
     "_N$file": null,
     "_isSystemFontUsed": true,
@@ -2737,8 +2740,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 100,
-      "height": 100
+      "width": 120,
+      "height": 30
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2747,15 +2750,15 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": -6.152,
+      "x": -16.663,
       "y": -0.836,
       "z": 0
     },
     "_scale": {
       "__type__": "cc.Vec3",
-      "x": 2.305,
-      "y": 0.385,
-      "z": 1.989
+      "x": 1,
+      "y": 1,
+      "z": 1
     },
     "_eulerAngles": {
       "__type__": "cc.Vec3",
@@ -2938,15 +2941,15 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": -74.514,
+      "x": -71.157,
       "y": 3.508,
       "z": 0
     },
     "_scale": {
       "__type__": "cc.Vec3",
-      "x": 0.414,
-      "y": 0.459,
-      "z": 0.428
+      "x": 0.434,
+      "y": 0.519,
+      "z": 0.484
     },
     "_eulerAngles": {
       "__type__": "cc.Vec3",
@@ -3146,7 +3149,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "2f158680-cc6a-451b-8ffa-3a50b5e8c91a"
+      "__uuid__": "0bfaa849-91a3-4dbb-9ba8-c107a26ccf64"
     },
     "_type": 1,
     "_sizeMode": 0,
@@ -3342,6 +3345,207 @@
     "fileId": "34QyzTN5RBnZgp/F6lVs1t",
     "sync": false
   },
+  {
+    "__type__": "cc.Node",
+    "_name": "harvest",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [
+      {
+        "__id__": 96
+      }
+    ],
+    "_active": false,
+    "_level": 2,
+    "_components": [
+      {
+        "__id__": 99
+      },
+      {
+        "__id__": 100
+      }
+    ],
+    "_prefab": {
+      "__id__": 101
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 100,
+      "height": 100
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": 7.17,
+      "y": 62.377,
+      "z": 0
+    },
+    "_scale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "harvest",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 95
+    },
+    "_children": [],
+    "_active": true,
+    "_level": 3,
+    "_components": [
+      {
+        "__id__": 97
+      }
+    ],
+    "_prefab": {
+      "__id__": 98
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 52,
+      "height": 79
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_scale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 96
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "a429132a-73bd-4b1e-9eed-0e9004be21b9"
+    },
+    "_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__": "4456b7c3-3442-48da-aad3-369482e0172a"
+    },
+    "fileId": "90944O2kBJJJNED1/rFt+7",
+    "sync": false
+  },
+  {
+    "__type__": "8e86bCCFq1H259acLru40nd",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 95
+    },
+    "_enabled": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.BlockInputEvents",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 95
+    },
+    "_enabled": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "4456b7c3-3442-48da-aad3-369482e0172a"
+    },
+    "fileId": "10eYfTgmlDrYHFLQ0B235Y",
+    "sync": false
+  },
   {
     "__type__": "665c9OT2R1OgqpO6W6onlaQ",
     "_name": "",
@@ -3354,7 +3558,7 @@
       "__id__": 8
     },
     "buildInfo": {
-      "__id__": 96
+      "__id__": 103
     },
     "buildZone": {
       "__id__": 2
@@ -3407,7 +3611,7 @@
     "totalInventory": 10,
     "goodsArray": [
       {
-        "__id__": 97
+        "__id__": 104
       }
     ],
     "_goods": null,
@@ -3427,7 +3631,7 @@
     "goodsPrice": 20,
     "goodsSalesRate": 50,
     "goodsMaterial": {
-      "__id__": 98
+      "__id__": 105
     }
   },
   {
@@ -3464,10 +3668,13 @@
     "_enabled": true,
     "stateArray": [
       {
-        "__uuid__": "0bf10f81-00d4-4c35-8f25-0c04cc7bbcd8"
+        "__uuid__": "19f8dc86-b387-45de-9faf-289bed54b139"
+      },
+      {
+        "__uuid__": "01eacfc1-b5b7-46dc-877a-bdc9339dd683"
       },
       {
-        "__uuid__": "67dece92-f574-4b4e-88f9-f5e73f064f1c"
+        "__uuid__": "087c03fb-5148-401b-82cb-0cbbd8f0e575"
       }
     ],
     "workArray": [
@@ -3510,8 +3717,14 @@
     "leaseDate": {
       "__id__": 46
     },
-    "sliderProgressNode": {
-      "__id__": 14
+    "midSliderNode": {
+      "__id__": 58
+    },
+    "midDate": {
+      "__id__": 70
+    },
+    "midSliderProgressNode": {
+      "__id__": 59
     },
     "notLeased": {
       "__id__": 81
@@ -3524,12 +3737,16 @@
     "landInfoPrefabs": {
       "__uuid__": "8b7c02b7-8c93-4f18-8a21-8ea7d64b433a"
     },
+    "plantInfo": null,
     "showPlantInfo": {
       "__id__": 76
     },
     "plantInfoPrefabs": {
       "__uuid__": "ff60e2cb-959f-4250-93e7-95c5223b0176"
     },
+    "harvestNode": {
+      "__id__": 95
+    },
     "_id": ""
   },
   {

assets/Prefabs/UI/DragonFarmlandSeedNode.prefab

@@ -27,21 +27,24 @@
         "__id__": 8
       },
       {
-        "__id__": 14
+        "__id__": 11
       },
       {
-        "__id__": 22
+        "__id__": 17
+      },
+      {
+        "__id__": 25
       }
     ],
     "_active": true,
     "_level": 1,
     "_components": [
       {
-        "__id__": 30
+        "__id__": 33
       }
     ],
     "_prefab": {
-      "__id__": 31
+      "__id__": 34
     },
     "_opacity": 255,
     "_color": {
@@ -63,7 +66,7 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": 24,
+      "x": 0,
       "y": -1801,
       "z": 0
     },
@@ -192,7 +195,7 @@
       "__id__": 1
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_level": 5,
     "_components": [
       {
@@ -295,6 +298,109 @@
     "fileId": "36AjrkikNBg4VQ+31mgwM0",
     "sync": false
   },
+  {
+    "__type__": "cc.Node",
+    "_name": "SeedSprite",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_level": 2,
+    "_components": [
+      {
+        "__id__": 9
+      }
+    ],
+    "_prefab": {
+      "__id__": 10
+    },
+    "_opacity": 155,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 274,
+      "height": 245
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": -11,
+      "y": 57,
+      "z": 0
+    },
+    "_scale": {
+      "__type__": "cc.Vec3",
+      "x": 0.5,
+      "y": 0.5,
+      "z": 1
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 8
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "a153f47d-708e-42c1-84f3-f5557feab7f0"
+    },
+    "_type": 2,
+    "_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__": "dfff901a-dac2-48df-a77d-261318f9c441"
+    },
+    "fileId": "bc3VNqOVdIqr+dP+RkCIhl",
+    "sync": false
+  },
   {
     "__type__": "cc.Node",
     "_name": "commonTip_down_Bg",
@@ -304,18 +410,18 @@
     },
     "_children": [
       {
-        "__id__": 9
+        "__id__": 12
       }
     ],
     "_active": true,
     "_level": 5,
     "_components": [
       {
-        "__id__": 12
+        "__id__": 15
       }
     ],
     "_prefab": {
-      "__id__": 13
+      "__id__": 16
     },
     "_opacity": 255,
     "_color": {
@@ -364,18 +470,18 @@
     "_name": "Tip",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 8
+      "__id__": 11
     },
     "_children": [],
     "_active": true,
     "_level": 6,
     "_components": [
       {
-        "__id__": 10
+        "__id__": 13
       }
     ],
     "_prefab": {
-      "__id__": 11
+      "__id__": 14
     },
     "_opacity": 255,
     "_color": {
@@ -424,7 +530,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 9
+      "__id__": 12
     },
     "_enabled": true,
     "_materials": [
@@ -465,7 +571,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 8
+      "__id__": 11
     },
     "_enabled": true,
     "_materials": [
@@ -512,21 +618,21 @@
     },
     "_children": [
       {
-        "__id__": 15
+        "__id__": 18
       }
     ],
     "_active": true,
     "_level": 4,
     "_components": [
       {
-        "__id__": 18
+        "__id__": 21
       },
       {
-        "__id__": 19
+        "__id__": 22
       }
     ],
     "_prefab": {
-      "__id__": 21
+      "__id__": 24
     },
     "_opacity": 255,
     "_color": {
@@ -575,18 +681,18 @@
     "_name": "Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 14
+      "__id__": 17
     },
     "_children": [],
     "_active": false,
     "_level": 0,
     "_components": [
       {
-        "__id__": 16
+        "__id__": 19
       }
     ],
     "_prefab": {
-      "__id__": 17
+      "__id__": 20
     },
     "_opacity": 255,
     "_color": {
@@ -635,7 +741,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 15
+      "__id__": 18
     },
     "_enabled": true,
     "_materials": [],
@@ -672,7 +778,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 14
+      "__id__": 17
     },
     "_enabled": true,
     "_materials": [
@@ -704,14 +810,14 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 14
+      "__id__": 17
     },
     "_enabled": true,
     "duration": 0.1,
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 20
+        "__id__": 23
       }
     ],
     "_N$interactable": true,
@@ -779,7 +885,7 @@
       "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
     },
     "_N$target": {
-      "__id__": 14
+      "__id__": 17
     },
     "_id": ""
   },
@@ -813,21 +919,21 @@
     },
     "_children": [
       {
-        "__id__": 23
+        "__id__": 26
       }
     ],
     "_active": true,
     "_level": 4,
     "_components": [
       {
-        "__id__": 26
+        "__id__": 29
       },
       {
-        "__id__": 27
+        "__id__": 30
       }
     ],
     "_prefab": {
-      "__id__": 29
+      "__id__": 32
     },
     "_opacity": 255,
     "_color": {
@@ -876,18 +982,18 @@
     "_name": "Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 22
+      "__id__": 25
     },
     "_children": [],
     "_active": false,
     "_level": 0,
     "_components": [
       {
-        "__id__": 24
+        "__id__": 27
       }
     ],
     "_prefab": {
-      "__id__": 25
+      "__id__": 28
     },
     "_opacity": 255,
     "_color": {
@@ -936,7 +1042,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 23
+      "__id__": 26
     },
     "_enabled": true,
     "_materials": [],
@@ -973,7 +1079,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 22
+      "__id__": 25
     },
     "_enabled": true,
     "_materials": [
@@ -1005,14 +1111,14 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 22
+      "__id__": 25
     },
     "_enabled": true,
     "duration": 0.1,
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 28
+        "__id__": 31
       }
     ],
     "_N$interactable": true,
@@ -1080,7 +1186,7 @@
       "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
     },
     "_N$target": {
-      "__id__": 22
+      "__id__": 25
     },
     "_id": ""
   },
@@ -1114,8 +1220,9 @@
     },
     "_enabled": true,
     "seedType": 0,
+    "seedName": "",
     "labelTip": {
-      "__id__": 10
+      "__id__": 13
     },
     "labelTipString": "移动到对应的田地播种",
     "targetBuildingsInfo": null,
@@ -1125,6 +1232,10 @@
     "isMoveState": true,
     "MoveStartNode": null,
     "MoveEndNode": null,
+    "goodsSeedInfo": null,
+    "seedSprite": {
+      "__id__": 9
+    },
     "_id": ""
   },
   {

assets/Prefabs/UI/lease/LandInfo.prefab

@@ -585,7 +585,7 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": -69.286,
+      "x": -70,
       "y": 0,
       "z": 0
     },
@@ -861,7 +861,7 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": -43.95,
+      "x": -70,
       "y": 0,
       "z": 0
     },
@@ -1414,7 +1414,7 @@
     "_position": {
       "__type__": "cc.Vec3",
       "x": -27.762,
-      "y": 0,
+      "y": -1.729,
       "z": 0
     },
     "_scale": {
@@ -1689,7 +1689,7 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": -19.881,
+      "x": -70,
       "y": 0,
       "z": 0
     },
@@ -2031,18 +2031,18 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 312,
-      "height": 102.24
+      "width": 364,
+      "height": 119.28
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "x": 0,
-      "y": 0.5
+      "y": 1
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": -135.553,
-      "y": -29.957,
+      "x": -146.711,
+      "y": 7.236,
       "z": 0
     },
     "_scale": {
@@ -2079,17 +2079,17 @@
     "_useOriginalSize": false,
     "_string": "可用与种植农作用，购买种子\n播种到土地，等农作物成熟后\n收获到仓库，售卖之后可获得\n农贝。",
     "_N$string": "可用与种植农作用，购买种子\n播种到土地，等农作物成熟后\n收获到仓库，售卖之后可获得\n农贝。",
-    "_fontSize": 24,
-    "_lineHeight": 24,
+    "_fontSize": 28,
+    "_lineHeight": 28,
     "_enableWrapText": true,
     "_N$file": null,
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_N$horizontalAlign": 1,
-    "_N$verticalAlign": 1,
+    "_N$horizontalAlign": 0,
+    "_N$verticalAlign": 0,
     "_N$fontFamily": "Arial",
-    "_N$overflow": 0,
+    "_N$overflow": 1,
     "_N$cacheMode": 0,
     "_id": ""
   },

assets/Prefabs/UI/lease/LeaseInfo.prefab

@@ -3234,7 +3234,7 @@
     "_N$horizontalAlign": 1,
     "_N$verticalAlign": 1,
     "_N$fontFamily": "Arial",
-    "_N$overflow": 0,
+    "_N$overflow": 1,
     "_N$cacheMode": 0,
     "_id": ""
   },

assets/Prefabs/UI/lease/PlantInfo.prefab

@@ -348,7 +348,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 300,
+      "width": 330,
       "height": 150
     },
     "_anchorPoint": {
@@ -421,8 +421,8 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": 0,
-      "y": -25,
+      "x": -10.642,
+      "y": -23,
       "z": 0
     },
     "_scale": {
@@ -582,7 +582,7 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": -69.286,
+      "x": -40,
       "y": 0,
       "z": 0
     },
@@ -697,8 +697,8 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": 0,
-      "y": -60,
+      "x": -10.642,
+      "y": -58,
       "z": 0
     },
     "_scale": {
@@ -858,7 +858,7 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": -43.95,
+      "x": -40,
       "y": 0,
       "z": 0
     },
@@ -973,8 +973,8 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": 0,
-      "y": -95,
+      "x": -10.642,
+      "y": -93,
       "z": 0
     },
     "_scale": {
@@ -1134,7 +1134,7 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": -19.881,
+      "x": -20,
       "y": 0,
       "z": 0
     },
@@ -1249,8 +1249,8 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": 0,
-      "y": -130,
+      "x": -10.642,
+      "y": -128,
       "z": 0
     },
     "_scale": {
@@ -1410,7 +1410,7 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": -19.881,
+      "x": -20,
       "y": 0,
       "z": 0
     },
@@ -1526,7 +1526,7 @@
     "_enabled": true,
     "_layoutSize": {
       "__type__": "cc.Size",
-      "width": 300,
+      "width": 330,
       "height": 150
     },
     "_resize": 0,
@@ -1540,7 +1540,7 @@
     "_N$startAxis": 0,
     "_N$paddingLeft": 0,
     "_N$paddingRight": 0,
-    "_N$paddingTop": 25,
+    "_N$paddingTop": 23,
     "_N$paddingBottom": 0,
     "_N$spacingX": 0,
     "_N$spacingY": 35,
@@ -1661,7 +1661,7 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": -181.828,
+      "x": -186.334,
       "y": 23.614,
       "z": 0
     },
@@ -1752,18 +1752,18 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 312,
-      "height": 102.24
+      "width": 364,
+      "height": 119.28
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
       "x": 0,
-      "y": 0.5
+      "y": 1
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": -135.553,
-      "y": -29.957,
+      "x": -151.322,
+      "y": 6.087,
       "z": 0
     },
     "_scale": {
@@ -1798,19 +1798,19 @@
       }
     ],
     "_useOriginalSize": false,
-    "_string": "可用与种植农作用，购买种子\n播种到土地，等农作物成熟后\n收获到仓库，售卖之后可获得\n农贝。",
-    "_N$string": "可用与种植农作用，购买种子\n播种到土地，等农作物成熟后\n收获到仓库，售卖之后可获得\n农贝。",
-    "_fontSize": 24,
-    "_lineHeight": 24,
+    "_string": "可用与种植农作用，购买种子\n播种到土地，等农作物成熟后\n收获到仓库，售卖之后可获得\n神农贝。",
+    "_N$string": "可用与种植农作用，购买种子\n播种到土地，等农作物成熟后\n收获到仓库，售卖之后可获得\n神农贝。",
+    "_fontSize": 28,
+    "_lineHeight": 28,
     "_enableWrapText": true,
     "_N$file": null,
     "_isSystemFontUsed": true,
     "_spacingX": 0,
     "_batchAsBitmap": false,
-    "_N$horizontalAlign": 1,
-    "_N$verticalAlign": 1,
+    "_N$horizontalAlign": 0,
+    "_N$verticalAlign": 0,
     "_N$fontFamily": "Arial",
-    "_N$overflow": 0,
+    "_N$overflow": 1,
     "_N$cacheMode": 0,
     "_id": ""
   },

assets/Script/Network/dapp.js

@@ -94,9 +94,9 @@ cc.Class({
                                 //跳转游戏
                                 cc.find("Canvas").getComponent("Login").loginButton();
 
-                                utils.init(GlobalD.Dapp.UserInfo.id, (data) => {
-                                    console.log('utils ws:' + data);
-                                }, _self);
+                                // utils.init(GlobalD.Dapp.UserInfo.id, (data) => {
+                                //     console.log('utils ws:' + data);
+                                // }, _self);
                             })
                             //需要提前拉取一下土地配置，用于初始化地图土地
                             utils.get(utils.api.landConfig, {}, (res, value) => {
@@ -184,9 +184,9 @@ cc.Class({
                     //跳转游戏
                     cc.find("Canvas").getComponent("Login").loginButton();
 
-                    utils.init(4, (data) => {
-                        console.log('utils ws:' + data);
-                    }, _self);
+                    // utils.init(4, (data) => {
+                    //     console.log('utils ws:' + data);
+                    // }, _self);
                 })
                 //需要提前拉取一下土地配置，用于初始化地图土地
                 utils.get(utils.api.landConfig, {}, (res, value) => {

assets/Script/Network/netUtils.ts

@@ -36,10 +36,15 @@ var utils = {
         userLandList: 'comPlayerLand/getList',
         //获取土地信息
         landState: 'comPlayerLand/getState',
+        //种植
+        plant:'comPlayerLand/plant',
         //种子
         mallSeed: 'comMallSeed/getMallSeed',
         //仓库种子和果实
         getSeedAndFruit :'comPlayerGoods/getSeedAndFruit', 
+        //收取果实
+        addFruit:'comPlayerGoods/addFruit'
+
     },
     /** 登录获取的token */
     token: null,

assets/Script/UI/BuildingView.js

@@ -136,36 +136,51 @@ cc.Class({
                 //设置一个生成点
                 let _spawnScript = _seed.getComponent("Content_seed");
                 _spawnScript.SpawnPoint = cc.find("Canvas/SpawnParent/SpawnPoint");
+                _spawnScript.goodsSeedInfo = this.mySeedList[i];//这里传递一个生成的种子信息过去
+               
                 _seedScript.NumLabel.string = this.mySeedList[i].amount;
                 _seedScript.NameLabel.string = this.mySeedList[i].name;
                 switch (this.mySeedList[i].picture) {
                     case "Cabbage":
                         _seedScript.bgSprite.spriteFrame = this.seedSpriteFrame[0];
+                        _spawnScript.fruitSpriteFrame = this.fruitSpriteFrame[0];
                         break;
                     case "Potato":
                         _seedScript.bgSprite.spriteFrame = this.seedSpriteFrame[1];
+                        _spawnScript.fruitSpriteFrame = this.fruitSpriteFrame[1];
                         break;
                     case "Carrot":
                         _seedScript.bgSprite.spriteFrame = this.seedSpriteFrame[2];
+                        _spawnScript.fruitSpriteFrame = this.fruitSpriteFrame[2];
                         break;
                     case "Broccoli":
                         _seedScript.bgSprite.spriteFrame = this.seedSpriteFrame[3];
+                        _spawnScript.fruitSpriteFrame = this.fruitSpriteFrame[3];
                         break;
                     case "Tomato":
                         _seedScript.bgSprite.spriteFrame = this.seedSpriteFrame[4];
+                        _spawnScript.fruitSpriteFrame = this.fruitSpriteFrame[4];
                         break;
                     case "Squash":
                         _seedScript.bgSprite.spriteFrame = this.seedSpriteFrame[5];
+                        _spawnScript.fruitSpriteFrame = this.fruitSpriteFrame[5];
                         break;
                     case "Eggplant":
                         _seedScript.bgSprite.spriteFrame = this.seedSpriteFrame[6];
+                        _spawnScript.fruitSpriteFrame = this.fruitSpriteFrame[6];
                         break;
                     case "Pepper":
                         _seedScript.bgSprite.spriteFrame = this.seedSpriteFrame[7];
+                        _spawnScript.fruitSpriteFrame = this.fruitSpriteFrame[7];
                         break;
                     default:
                         break;
                 }
+                //获取一下种子图片
+                _spawnScript.seedSpriteFrame = _seedScript.bgSprite.spriteFrame;
+                
+           
+
             }
             for (let i = 0; i < this.myFruitList.length; i++) {
                 let _fruit = cc.instantiate(this.fruitPrefab);
@@ -180,32 +195,33 @@ cc.Class({
 
                 switch (this.myFruitList[i].picture) {
                     case "Cabbage":
-                        _fruitScript.bgSprite.spriteFrame = this.seedSpriteFrame[0];
+                        _fruitScript.bgSprite.spriteFrame = this.fruitSpriteFrame[0];
                         break;
                     case "Potato":
-                        _fruitScript.bgSprite.spriteFrame = this.seedSpriteFrame[1];
+                        _fruitScript.bgSprite.spriteFrame = this.fruitSpriteFrame[1];
                         break;
                     case "Carrot":
-                        _fruitScript.bgSprite.spriteFrame = this.seedSpriteFrame[2];
+                        _fruitScript.bgSprite.spriteFrame = this.fruitSpriteFrame[2];
                         break;
                     case "Broccoli":
-                        _fruitScript.bgSprite.spriteFrame = this.seedSpriteFrame[3];
+                        _fruitScript.bgSprite.spriteFrame = this.fruitSpriteFrame[3];
                         break;
                     case "Tomato":
-                        _fruitScript.bgSprite.spriteFrame = this.seedSpriteFrame[4];
+                        _fruitScript.bgSprite.spriteFrame = this.fruitSpriteFrame[4];
                         break;
                     case "Squash":
-                        _fruitScript.bgSprite.spriteFrame = this.seedSpriteFrame[5];
+                        _fruitScript.bgSprite.spriteFrame = this.fruitSpriteFrame[5];
                         break;
                     case "Eggplant":
-                        _fruitScript.bgSprite.spriteFrame = this.seedSpriteFrame[6];
+                        _fruitScript.bgSprite.spriteFrame = this.fruitSpriteFrame[6];
                         break;
                     case "Pepper":
-                        _fruitScript.bgSprite.spriteFrame = this.seedSpriteFrame[7];
+                        _fruitScript.bgSprite.spriteFrame = this.fruitSpriteFrame[7];
                         break;
                     default:
                         break;
                 }
+
             }
         });
     },

assets/Script/UI/CollectHarvest.js

@@ -0,0 +1,42 @@
+
+cc.Class({
+    extends: cc.Component,
+
+    properties: {
+        // foo: {
+        //     // ATTRIBUTES:
+        //     default: null,        // The default value will be used only when the component attaching
+        //                           // to a node for the first time
+        //     type: cc.SpriteFrame, // optional, default is typeof default
+        //     serializable: true,   // optional, default is true
+        // },
+        // bar: {
+        //     get () {
+        //         return this._bar;
+        //     },
+        //     set (value) {
+        //         this._bar = value;
+        //     }
+        // },
+    },
+
+    // LIFE-CYCLE CALLBACKS:
+
+    // onLoad () {},
+
+    start () {
+        this.playScale();
+    },
+
+    playScale(){
+        console.log("play");
+        this.node.stopAllActions();
+        var s = cc.sequence(cc.scaleTo(0.5, 1.5),cc.scaleTo(0.5, 1));
+        var repeat = cc.repeatForever(s);
+        this.node.runAction(repeat);
+        var s1 = cc.sequence(cc.rotateTo(0.1, -5),cc.rotateTo(0.1, 5));
+        var r = cc.repeatForever(s1);
+        this.node.runAction(r);
+
+    }
+});

assets/Script/UI/CollectHarvest.js.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.5",
+  "uuid": "8e86b082-16ad-47db-9f5a-70baeee349dd",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/Script/UI/Content_seed.js

@@ -25,7 +25,21 @@ cc.Class({
             type: cc.Enum(reGameStates.SeedType),
             serializable: true,
         },
-        
+
+        goodsSeedInfo:{
+            default: null,
+            tooltip: '设定一个背包种子信息',
+        },
+        seedSpriteFrame:{
+            default:null,
+            type:cc.SpriteFrame,
+            tooltip:"当前生出工具的提示"
+        },
+        fruitSpriteFrame:{
+            default:null,
+            type:cc.SpriteFrame,
+            tooltip:"当前生出工具的提示"
+        }
     },
 
 
@@ -36,6 +50,11 @@ cc.Class({
         let _ManageSeedNode = seedTemp.getComponent("ManageSeedNode");
         _ManageSeedNode.seedName = this.Name;
         _ManageSeedNode.seedType = this.seedType;
+        _ManageSeedNode.goodsSeedInfo = this.goodsSeedInfo;
+        _ManageSeedNode.seedSprite.spriteFrame = this.seedSpriteFrame;
+        _ManageSeedNode.fruitSpriteFrame = this.fruitSpriteFrame;
+
+        _ManageSeedNode.upTarget = this.node;
 
         let tempPos = this.SpawnPoint.convertToNodeSpace(GlobalD.game.MainCamera.node);
         let CanvasPos = GlobalD.game.Canvas.position;

assets/Script/UI/ManageBuildings.js

@@ -1,4 +1,5 @@
 var reGameStates = require('GameStates');
+import date from "../Unit/date.js"
 
 cc.Class({
     extends: cc.Component,
@@ -484,6 +485,9 @@ cc.Class({
         let _configLand = GlobalD.ConfigLand;
         let _userLeaseLand = GlobalD.UserLeaseLand;
         console.log(_configLand, _userLeaseLand);
+        // console.log(this.node.getComponent("ManageUI"));
+        let _buildingView = this.node.getComponent("ManageUI").BuildView.getComponent('BuildingView');
+
         for (let i = 0; i < _configLand.length; i++) {
             //生成默认土地
             //农田
@@ -496,12 +500,69 @@ cc.Class({
                 let leaseFarmlandInfoScript = housingTemp_farmland.getComponent("LeaseFarmlandInfo");
                 //记录config的土地信息
                 leaseFarmlandInfoScript.setConfigLandInfo(_configLand[i]);
-                //记录已经租赁的信息
-                if(_userLeaseLand[j].configLandId == _configLand[i].id){
-                    leaseFarmlandInfoScript.setLeaseLandInfo(_userLeaseLand[j]);
+                //记录已经租赁的信息(租赁里面包含了seedInfo，如果有种植的话，对应的种植信息会有)
+                if (_userLeaseLand[j].configLandId == _configLand[i].id) {
+                    let _leaseLandInfo = _userLeaseLand[j];
+                    leaseFarmlandInfoScript.setLeaseLandInfo(_leaseLandInfo);
+                    //todo 后续看看如何刷新，现在走的是开始刷新一次
+                    if (_leaseLandInfo.isPlant === 1) {
+
+                        let _workingBuilding = housingTemp_farmland.getComponent("WorkingBuilding");
+                        let _spriteFrame;
+                        switch (_leaseLandInfo.seedInfo.picture) {
+                            case "Cabbage":
+                                _spriteFrame = _buildingView.fruitSpriteFrame[0];
+                                break;
+                            case "Potato":
+                                _spriteFrame = _buildingView.fruitSpriteFrame[1];
+                                break;
+                            case "Carrot":
+                                _spriteFrame = _buildingView.fruitSpriteFrame[2];
+                                break;
+                            case "Broccoli":
+                                _spriteFrame = _buildingView.fruitSpriteFrame[3];
+                                break;
+                            case "Tomato":
+                                _spriteFrame = _buildingView.fruitSpriteFrame[4];
+                                break;
+                            case "Squash":
+                                _spriteFrame = _buildingView.fruitSpriteFrame[5];
+                                break;
+                            case "Eggplant":
+                                _spriteFrame = _buildingView.fruitSpriteFrame[6];
+                                break;
+                            case "Pepper":
+                                _spriteFrame = _buildingView.fruitSpriteFrame[7];
+                                break;
+                            default:
+                                break;
+                        }
+
+                        //拿到土地的成熟期来判断
+                        let _currentDay = date.datedifference(date.formatTime(new Date()), _leaseLandInfo.plantStart);
+                        let _ratio = _currentDay / _leaseLandInfo.seedInfo.maturity;
+                        if (_ratio <= 0.3) {
+                            _workingBuilding.onSetGrow(1, _spriteFrame);
+                            //测试，后面删除
+                            // leaseFarmlandInfoScript.onShowHarvest();
+                        } else if (_ratio <= 0.7) {
+                            _workingBuilding.onSetGrow(2, _spriteFrame);
+                        } else {
+                            //成熟阶段
+                            _workingBuilding.onSetGrow(3, _spriteFrame);
+                            if (_currentDay >= _leaseLandInfo.seedInfo.maturity) {
+                                //todo，如果时间小的，走收获，收获成果实
+                                console.log("土地：", _userLeaseLand[j].configLandId, "已经成熟,可以操作收取果实了！！", _currentDay);
+                                //todo 土地可收获状态
+                                leaseFarmlandInfoScript.onShowHarvest();
+                            }
+                        }
+                    }
+
+
                 }
             }
-          
+
 
             let buildingsInfo_farmland = housingTemp_farmland.getComponent("buildingsInfo");
             //id用时间戳来记录
@@ -819,12 +880,10 @@ cc.Class({
         }
         return buildingName;
     },
-    Grant()
-    {
+    Grant() {
 
     },
-    Sale()
-    {
+    Sale() {
 
     }
 });

assets/Script/UI/ManageSeedNode.js

@@ -1,6 +1,7 @@
 
 var reGameStates = require('GameStates');
-
+import gameToast from "../Network/gameToast";
+// const { values } = require('../Network/runtime');
 cc.Class({
     extends: cc.Component,
 
@@ -9,7 +10,7 @@ cc.Class({
             default: reGameStates.SeedType.Normal,
             type: cc.Enum(reGameStates.SeedType),
         },
-        seedName:{
+        seedName: {
             default: ''
         },
         _EndPosition: {
@@ -39,6 +40,28 @@ cc.Class({
 
         MoveStartNode: cc.Node,
         MoveEndNode: cc.Node,
+
+        //content_seed 传递过来
+        goodsSeedInfo: {
+            default: null,
+            tooltip: '设定一个背包种子信息',
+        },
+        //content_seed 设置
+        seedSprite: {
+            default: null,
+            type: cc.Sprite,
+            tooltip: "当前生出工具的提示"
+        },
+        fruitSpriteFrame: {
+            default: null,
+            type: cc.SpriteFrame,
+            tooltip: "成熟的图片展示"
+        },
+        upTarget: {
+            default: null,
+            type: cc.Node,
+            tooltip: "把当前操作的ui按钮传进来"
+        },
     },
 
     // LIFE-CYCLE CALLBACKS:
@@ -78,7 +101,7 @@ cc.Class({
                 self.labelTip.string = self.labelTipString;
                 self.targetBuildingsInfo = null;
             }
-        } 
+        }
 
 
 
@@ -128,18 +151,65 @@ cc.Class({
 
         GlobalD.game._ManageUIScript.onBottomMenuView(true);
     },
-    //播种
-    onSowOnTheGround(){
+    /**
+     * 
+     * 处理播种逻辑，记录数据库
+     * @returns 
+     */
+    onSowOnTheGround() {
         //调用土地相关
         if (!this.targetBuildingsInfo) return;
         // cc.log('this.targetBuildingsInfo', this.targetBuildingsInfo)
         // this.targetBuildingsInfo.onClearSelfResetFromType();
 
-        //面板种子消耗减少1
-        console.log('种子减少的类型名字',this.seedName);
-        GlobalD.game.MuinusBuilding(this.seedName);
-        this.targetBuildingsInfo.onInitHolyFarmlandSeedFromGrow();
-       
+        // 种植土地的信息
+        let _leaseFarmlandInfo = this.targetBuildingsInfo.getComponent("LeaseFarmlandInfo");
+        let leaseLandInfo = _leaseFarmlandInfo.leaseLandInfo;
+
+        if (leaseLandInfo == null) {
+            gameToast.getInstance().show(cc.find("Canvas/UICamera"), "请先租赁土地！", 2, () => {
+                console.log("finish toast!");
+            }, this);
+            //隐藏种子和显示UI
+            this.node.active = false;
+            GlobalD.game._ManageUIScript.onBottomMenuView(true);
+            return;
+        }
+
+        let data = { landId: leaseLandInfo.id, seedId: this.goodsSeedInfo.id };
+
+        GlobalD.GameData.onPlant(data, (res, value) => {
+            //面板种子消耗减少1  
+            if (value.code == 0) {
+                console.log('种子减少的类型名字', this.seedName);
+                console.log(value);
+                // GlobalD.game.MuinusBuilding(this.seedName);
+                //刷新本地列表对象，数量减去1
+                // console.log(this.upTarget);
+                let NumLabel = this.upTarget.getComponent("Content_Button").NumLabel.getComponent(cc.Label);
+                if (parseInt(NumLabel.string) <= 1) {
+                    //这里只隐藏
+                    this.upTarget.active = false;
+                } else {
+                    NumLabel.string = parseInt(NumLabel.string) - 1;
+                }
+                //把种子的信息存储到当前的土地 plantInfo 上;
+                _leaseFarmlandInfo.plantInfo = value.data.seedInfo;
+                _leaseFarmlandInfo.updateLandState();
+                //开始种植，给一个初始的状态
+                this.targetBuildingsInfo.onInitHolyFarmlandSeedFromGrow(1, this.fruitSpriteFrame);
+
+                gameToast.getInstance().show(cc.find("Canvas/UICamera"), "已成功种植！", 2, () => {
+                    console.log("finish toast!");
+                }, this);
+            } else if (value.code == 704) {
+                //土地已经种植了
+                gameToast.getInstance().show(cc.find("Canvas/UICamera"), value.msg, 2, () => {
+                    console.log("finish toast!");
+                }, this);
+            }
+
+        });
         //隐藏种子和显示UI
         this.node.active = false;
         GlobalD.game._ManageUIScript.onBottomMenuView(true);
@@ -151,6 +221,6 @@ cc.Class({
         this.node.setPosition(endPos);
 
     }
-  
+
 
 });

assets/Script/Unit/date.js

@@ -56,6 +56,7 @@ const dateAddDays=(dateStr,dayCount) => {
     return resultDateStr;
 }
 
+
 /**
  * 根据newDate 来获取加的日期
  */
@@ -78,6 +79,39 @@ const getWeightDate = date => {
 	return timestr 
 }
 
+
+
+
+const dateAddDate=(dateStr,dayCount) => {
+    var tempDate=new Date(dateStr.replace(/-/g,"/"));//把日期字符串转换成日期格式
+    var resultDate=new Date((tempDate/1000+(86400*dayCount))*1000);//增加n天后的日期
+
+	const year = resultDate.getFullYear()
+	const month = resultDate.getMonth()+1
+	const day = resultDate.getDate()
+
+	const hour = resultDate.getHours()
+	const minute = resultDate.getMinutes()
+	const second = resultDate.getSeconds()
+    //将日期转化为字符串格式
+    return [year, month, day].map(formatNumber).join('/')  + ' ' + [hour, minute, second].map(formatNumber).join(':');
+}
+
+const dayAndHour = (sDate1, sDate2) => { //sDate1和sDate2是2006-12-18格式 
+	var dateSpan,
+		tempDate,
+		iDays;
+	sDate1 = Date.parse(sDate1.replace(/-/g, '/'));
+	sDate2 = Date.parse(sDate2.replace(/-/g, '/'));
+	dateSpan = sDate2 - sDate1;
+	dateSpan = Math.abs(dateSpan);
+	iDays = Math.floor(dateSpan / (24 * 3600 * 1000));
+
+	//  计算小时数
+	var hours = Math.floor(dateSpan / (60 * 60 * 1000));
+	return [iDays,hours];
+};
+
 export default {
 	formatTime,
 	formatDate,
@@ -85,5 +119,8 @@ export default {
 	getDays,
 	dateAddDays,
 	addDaysFromNewDate,
-	getWeightDate
+	getWeightDate,
+	
+	dateAddDate,
+	dayAndHour
 }

assets/Script/build/WorkingBuilding.js

@@ -172,6 +172,19 @@ cc.Class({
         this.changeSprite.spriteFrame = this.stateArray[count];
     },
 
+    /**
+     * 神龙田地的直接 生长图片设置
+     */
+    onSetGrow(growStage,harvestSpriteFrame){
+        // console.log(growStage,harvestSpriteFrame);
+        if(growStage === 0 || growStage === 1 || growStage === 2){
+            this.changeSprite.spriteFrame = this.stateArray[growStage];
+        }else{
+            this.changeSprite.spriteFrame = harvestSpriteFrame;
+        }
+   
+    },
+
     onResetSprite(_workPlace) {
         if (_workPlace == reGameStates.BuildType.Farmland) {
             // this.changeSprite.spriteFrame = this.stateArray[0];

assets/Script/build/buildingsInfo.js

@@ -609,7 +609,10 @@ cc.Class({
     /**
      * 植物生长
      */
-    onInitHolyFarmlandSeedFromGrow(){
-        this.node.getComponent('WorkingBuilding').onHolyFarmlandSeedFromGrow();
+    onInitHolyFarmlandSeedFromGrow(growStage,spriteFrame){
+        this.node.getComponent('WorkingBuilding').onSetGrow(growStage,spriteFrame);
+        // this.node.getComponent('WorkingBuilding').onHolyFarmlandSeedFromGrow();
     }
+
+
 });

assets/Script/public/GameData.js

@@ -1068,6 +1068,20 @@ cc.Class({
             callback(res, vaule);
         })
     },
+    //种植种子
+    // data:{landId:1,seedId:1}
+    onPlant(data,callback) {
+        utils.get(utils.api.plant, data, (res, vaule) => {
+            callback(res, vaule);
+        })
+    },
+
+    //收取果实
+    onAddFruit(data,callback) {
+        utils.post(utils.api.addFruit, data, (res, vaule) => {
+            callback(res, vaule);
+        })
+    },
 
 
     /**

assets/UI/NScene/Labour_Holy_Seedling.png.meta → assets/Texture/Labour_Holy_growing.png.meta

@@ -9,7 +9,7 @@
   "packable": true,
   "platformSettings": {},
   "subMetas": {
-    "Labour_Holy_Seedling": {
+    "Labour_Holy_growing": {
       "ver": "1.0.4",
       "uuid": "087c03fb-5148-401b-82cb-0cbbd8f0e575",
       "rawTextureUuid": "0878344e-b5e3-4084-aa71-b52be2a93bd0",

assets/UI/NScene/Labour_Holy_SeedField.png.meta → assets/Texture/Labour_Holy_planting.png.meta

@@ -9,7 +9,7 @@
   "packable": true,
   "platformSettings": {},
   "subMetas": {
-    "Labour_Holy_SeedField": {
+    "Labour_Holy_planting": {
       "ver": "1.0.4",
       "uuid": "01eacfc1-b5b7-46dc-877a-bdc9339dd683",
       "rawTextureUuid": "6c3094e0-e3f4-4a79-82ed-0bfb449a8ce4",

assets/UI/NLease/harvest.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "3c4a03a8-7363-4270-b027-53c10943c234",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "harvest": {
+      "ver": "1.0.4",
+      "uuid": "a429132a-73bd-4b1e-9eed-0e9004be21b9",
+      "rawTextureUuid": "3c4a03a8-7363-4270-b027-53c10943c234",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -0.5,
+      "offsetY": 0.5,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 52,
+      "height": 79,
+      "rawWidth": 53,
+      "rawHeight": 80,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/UI/NLease/withLease.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "8dfcef59-2377-4b3b-bb8a-f27670b0104b",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "withLease": {
+      "ver": "1.0.4",
+      "uuid": "0bfaa849-91a3-4dbb-9ba8-c107a26ccf64",
+      "rawTextureUuid": "8dfcef59-2377-4b3b-bb8a-f27670b0104b",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 92,
+      "height": 41,
+      "rawWidth": 92,
+      "rawHeight": 41,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}