1.添加了修改喂养功能

2.修复gameToastbug

assets/Prefabs/NBuildings/Labour/Labour_206_Holy_Animal.prefab

@@ -4891,6 +4891,9 @@
     },
     "envBgSpriteFrameList": [],
     "currentAnimalType": 0,
+    "buyAnimalFoodPrefab": {
+      "__uuid__": "1c234e01-985b-486c-b319-3d58fb453969"
+    },
     "_id": ""
   },
   {

assets/Prefabs/UI/lease/BuyAnimalFood.prefab

@@ -0,0 +1,2296 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "",
+    "_objFlags": 0,
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "asyncLoadAssets": false,
+    "readonly": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "BuyAnimalFood",
+    "_objFlags": 0,
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      },
+      {
+        "__id__": 6
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 63
+      }
+    ],
+    "_prefab": {
+      "__id__": 64
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 0,
+      "height": 0
+    },
+    "_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.Node",
+    "_name": "Mask",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 4
+      }
+    ],
+    "_prefab": {
+      "__id__": 5
+    },
+    "_opacity": 62,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 68,
+      "g": 66,
+      "b": 66,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 1000,
+      "height": 2000
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1.331,
+        1.331,
+        1.331
+      ]
+    },
+    "_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__": 2
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91"
+    },
+    "_type": 0,
+    "_sizeMode": 0,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.BlockInputEvents",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "1c234e01-985b-486c-b319-3d58fb453969"
+    },
+    "fileId": "c6D93LE15K5LWW6oSaWH6O",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "BG",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [
+      {
+        "__id__": 7
+      },
+      {
+        "__id__": 10
+      },
+      {
+        "__id__": 19
+      },
+      {
+        "__id__": 50
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 61
+      }
+    ],
+    "_prefab": {
+      "__id__": 62
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 567,
+      "height": 404
+    },
+    "_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.Node",
+    "_name": "ListNail",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 6
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 8
+      }
+    ],
+    "_prefab": {
+      "__id__": 9
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 71,
+      "height": 80
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -258.709,
+        171.943,
+        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__": 7
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "3bf38d21-90b8-46ae-a029-3bfc92fb3534"
+    },
+    "_type": 0,
+    "_sizeMode": 0,
+    "_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__": "1c234e01-985b-486c-b319-3d58fb453969"
+    },
+    "fileId": "5fYuXR5khOXJ+6pPHON+aG",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "CloseButton",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 6
+    },
+    "_children": [
+      {
+        "__id__": 11
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 15
+      },
+      {
+        "__id__": 17
+      }
+    ],
+    "_prefab": {
+      "__id__": 18
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 47,
+      "height": 44
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        240.174,
+        156.511,
+        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": "Background",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 10
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 12
+      },
+      {
+        "__id__": 13
+      }
+    ],
+    "_prefab": {
+      "__id__": 14
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 47,
+      "height": 44
+    },
+    "_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,
+        0
+      ]
+    },
+    "_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__": 11
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "bfd7980a-4103-4052-bea2-17a80cc7d683"
+    },
+    "_type": 1,
+    "_sizeMode": 0,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 11
+    },
+    "_enabled": true,
+    "alignMode": 0,
+    "_target": null,
+    "_alignFlags": 45,
+    "_left": -4.440892098500626e-16,
+    "_right": 4.440892098500626e-16,
+    "_top": 0,
+    "_bottom": 0,
+    "_verticalCenter": 0,
+    "_horizontalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 100,
+    "_originalHeight": 40,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "1c234e01-985b-486c-b319-3d58fb453969"
+    },
+    "fileId": "6etJj1Ws5M06fzu/4U0oNe",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 10
+    },
+    "_enabled": true,
+    "_normalMaterial": null,
+    "_grayMaterial": null,
+    "duration": 0.1,
+    "zoomScale": 0.8,
+    "clickEvents": [
+      {
+        "__id__": 16
+      }
+    ],
+    "_N$interactable": true,
+    "_N$enableAutoGrayEffect": false,
+    "_N$transition": 3,
+    "transition": 3,
+    "_N$normalColor": {
+      "__type__": "cc.Color",
+      "r": 230,
+      "g": 230,
+      "b": 230,
+      "a": 255
+    },
+    "_N$pressedColor": {
+      "__type__": "cc.Color",
+      "r": 200,
+      "g": 200,
+      "b": 200,
+      "a": 255
+    },
+    "pressedColor": {
+      "__type__": "cc.Color",
+      "r": 200,
+      "g": 200,
+      "b": 200,
+      "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": 120,
+      "g": 120,
+      "b": 120,
+      "a": 200
+    },
+    "_N$normalSprite": {
+      "__uuid__": "bfd7980a-4103-4052-bea2-17a80cc7d683"
+    },
+    "_N$pressedSprite": {
+      "__uuid__": "bfd7980a-4103-4052-bea2-17a80cc7d683"
+    },
+    "pressedSprite": {
+      "__uuid__": "bfd7980a-4103-4052-bea2-17a80cc7d683"
+    },
+    "_N$hoverSprite": {
+      "__uuid__": "bfd7980a-4103-4052-bea2-17a80cc7d683"
+    },
+    "hoverSprite": {
+      "__uuid__": "bfd7980a-4103-4052-bea2-17a80cc7d683"
+    },
+    "_N$disabledSprite": {
+      "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
+    },
+    "_N$target": {
+      "__id__": 11
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 10
+    },
+    "component": "",
+    "_componentId": "0ecf9R8aodBXYuantqy5mWQ",
+    "handler": "Close",
+    "customEventData": ""
+  },
+  {
+    "__type__": "0ecf9R8aodBXYuantqy5mWQ",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 10
+    },
+    "_enabled": true,
+    "targetNode": {
+      "__id__": 1
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "1c234e01-985b-486c-b319-3d58fb453969"
+    },
+    "fileId": "abJxjYde1BOpPVlSMQkyxW",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "BG1_sprite_splash",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 6
+    },
+    "_children": [
+      {
+        "__id__": 20
+      },
+      {
+        "__id__": 24
+      },
+      {
+        "__id__": 31
+      },
+      {
+        "__id__": 41
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 48
+      }
+    ],
+    "_prefab": {
+      "__id__": 49
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 391,
+      "height": 223
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        47.966,
+        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": "NameLabel",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 19
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 21
+      },
+      {
+        "__id__": 22
+      }
+    ],
+    "_prefab": {
+      "__id__": 23
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 80,
+      "height": 52.62
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 1,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -14.794,
+        65.96,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 20
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "小狗",
+    "_N$string": "小狗",
+    "_fontSize": 37,
+    "_lineHeight": 37,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 0,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 0,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.LabelOutline",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 20
+    },
+    "_enabled": true,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 160,
+      "g": 87,
+      "b": 45,
+      "a": 255
+    },
+    "_width": 3,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "1c234e01-985b-486c-b319-3d58fb453969"
+    },
+    "fileId": "7eemhb+SZCTpNslXa/B+Ox",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "BuyNumLabel",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 19
+    },
+    "_children": [
+      {
+        "__id__": 25
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 29
+      }
+    ],
+    "_prefab": {
+      "__id__": 30
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 171,
+      "g": 97,
+      "b": 52,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 140,
+      "height": 35.28
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -106.733,
+        -44.253,
+        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": "NumLabel",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 24
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 26
+      },
+      {
+        "__id__": 27
+      }
+    ],
+    "_prefab": {
+      "__id__": 28
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 92.41,
+      "height": 52.62
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        79.384,
+        -2.909,
+        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__": 25
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "X100",
+    "_N$string": "X100",
+    "_fontSize": 37,
+    "_lineHeight": 37,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 0,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 0,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.LabelOutline",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 25
+    },
+    "_enabled": true,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 160,
+      "g": 87,
+      "b": 45,
+      "a": 255
+    },
+    "_width": 3,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "1c234e01-985b-486c-b319-3d58fb453969"
+    },
+    "fileId": "9ccYd9I6lDUoGN93fDURXu",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 24
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "购买数量：",
+    "_N$string": "购买数量：",
+    "_fontSize": 28,
+    "_lineHeight": 28,
+    "_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__": "1c234e01-985b-486c-b319-3d58fb453969"
+    },
+    "fileId": "57LXnLHmpGubVfXfAa4op+",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Estimate",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 19
+    },
+    "_children": [
+      {
+        "__id__": 32
+      },
+      {
+        "__id__": 35
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 39
+      }
+    ],
+    "_prefab": {
+      "__id__": 40
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 171,
+      "g": 97,
+      "b": 52,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 140,
+      "height": 35.28
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 1
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -106.733,
+        -74.906,
+        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": "SNBIcon",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 31
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 33
+      }
+    ],
+    "_prefab": {
+      "__id__": 34
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 44,
+      "height": 42
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        94.393,
+        -21.305,
+        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__": 32
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "d5039c08-db94-4b5f-9e8c-ecd1f614f817"
+    },
+    "_type": 0,
+    "_sizeMode": 0,
+    "_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__": "1c234e01-985b-486c-b319-3d58fb453969"
+    },
+    "fileId": "4ezKrI2bZPVJVOqsvihQrG",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "label",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 31
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 36
+      },
+      {
+        "__id__": 37
+      }
+    ],
+    "_prefab": {
+      "__id__": 38
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 239,
+      "b": 0,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 26.58,
+      "height": 52.62
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 1
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        120.999,
+        7.242,
+        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__": 35
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "0",
+    "_N$string": "0",
+    "_fontSize": 37,
+    "_lineHeight": 37,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 0,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 0,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.LabelOutline",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 35
+    },
+    "_enabled": true,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 160,
+      "g": 87,
+      "b": 45,
+      "a": 255
+    },
+    "_width": 3,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "1c234e01-985b-486c-b319-3d58fb453969"
+    },
+    "fileId": "f35JNWyjBHxYfe2KvUiN2C",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 31
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "预计消耗：",
+    "_N$string": "预计消耗：",
+    "_fontSize": 28,
+    "_lineHeight": 28,
+    "_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__": "1c234e01-985b-486c-b319-3d58fb453969"
+    },
+    "fileId": "aeW+BsqIFNl5WwKl3iYDIy",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "BuyUnitLabel",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 19
+    },
+    "_children": [
+      {
+        "__id__": 42
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 46
+      }
+    ],
+    "_prefab": {
+      "__id__": 47
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 171,
+      "g": 97,
+      "b": 52,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 140,
+      "height": 35.28
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        -106.733,
+        -0.96,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "UnitNumLabel",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 41
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 43
+      },
+      {
+        "__id__": 44
+      }
+    ],
+    "_prefab": {
+      "__id__": 45
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 92.41,
+      "height": 52.62
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        79.384,
+        -2.909,
+        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__": 42
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "X100",
+    "_N$string": "X100",
+    "_fontSize": 37,
+    "_lineHeight": 37,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 0,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 0,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.LabelOutline",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 42
+    },
+    "_enabled": true,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 160,
+      "g": 87,
+      "b": 45,
+      "a": 255
+    },
+    "_width": 3,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "1c234e01-985b-486c-b319-3d58fb453969"
+    },
+    "fileId": "adtZZgt4xOVZkx5jqFmUSQ",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 41
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "购买单价：",
+    "_N$string": "购买单价：",
+    "_fontSize": 28,
+    "_lineHeight": 28,
+    "_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__": "1c234e01-985b-486c-b319-3d58fb453969"
+    },
+    "fileId": "eeSEgB3oJKKa7qya+XENA5",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 19
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": null,
+    "_type": 1,
+    "_sizeMode": 0,
+    "_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__": "1c234e01-985b-486c-b319-3d58fb453969"
+    },
+    "fileId": "fboEEKqlFOIKbnUC9X3ZdA",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "button",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 6
+    },
+    "_children": [
+      {
+        "__id__": 51
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 58
+      }
+    ],
+    "_prefab": {
+      "__id__": 60
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 234,
+      "height": 94
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -124.699,
+        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": "Background",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 50
+    },
+    "_children": [
+      {
+        "__id__": 52
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 55
+      },
+      {
+        "__id__": 56
+      }
+    ],
+    "_prefab": {
+      "__id__": 57
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 234,
+      "height": 94
+    },
+    "_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,
+        0
+      ]
+    },
+    "_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": "Label",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 51
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 53
+      }
+    ],
+    "_prefab": {
+      "__id__": 54
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 100,
+      "height": 40
+    },
+    "_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.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 52
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "",
+    "_N$string": "",
+    "_fontSize": 20,
+    "_lineHeight": 40,
+    "_enableWrapText": false,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 0,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 1,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 1,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "1c234e01-985b-486c-b319-3d58fb453969"
+    },
+    "fileId": "96KhHZI4NLpJfQLOHj8sP3",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 51
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "057894bc-b3cf-4a27-993a-097ccbe08c60"
+    },
+    "_type": 1,
+    "_sizeMode": 0,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 51
+    },
+    "_enabled": true,
+    "alignMode": 0,
+    "_target": null,
+    "_alignFlags": 45,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_verticalCenter": 0,
+    "_horizontalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 100,
+    "_originalHeight": 40,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "1c234e01-985b-486c-b319-3d58fb453969"
+    },
+    "fileId": "3fxBlbX8FCs54i81TBqZ3s",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 50
+    },
+    "_enabled": true,
+    "_normalMaterial": null,
+    "_grayMaterial": null,
+    "duration": 0.1,
+    "zoomScale": 0.8,
+    "clickEvents": [
+      {
+        "__id__": 59
+      }
+    ],
+    "_N$interactable": true,
+    "_N$enableAutoGrayEffect": false,
+    "_N$transition": 3,
+    "transition": 3,
+    "_N$normalColor": {
+      "__type__": "cc.Color",
+      "r": 230,
+      "g": 230,
+      "b": 230,
+      "a": 255
+    },
+    "_N$pressedColor": {
+      "__type__": "cc.Color",
+      "r": 200,
+      "g": 200,
+      "b": 200,
+      "a": 255
+    },
+    "pressedColor": {
+      "__type__": "cc.Color",
+      "r": 200,
+      "g": 200,
+      "b": 200,
+      "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": 120,
+      "g": 120,
+      "b": 120,
+      "a": 200
+    },
+    "_N$normalSprite": {
+      "__uuid__": "30b277f2-db20-4081-9ad1-f2e6be16bf10"
+    },
+    "_N$pressedSprite": {
+      "__uuid__": "30b277f2-db20-4081-9ad1-f2e6be16bf10"
+    },
+    "pressedSprite": {
+      "__uuid__": "30b277f2-db20-4081-9ad1-f2e6be16bf10"
+    },
+    "_N$hoverSprite": {
+      "__uuid__": "30b277f2-db20-4081-9ad1-f2e6be16bf10"
+    },
+    "hoverSprite": {
+      "__uuid__": "30b277f2-db20-4081-9ad1-f2e6be16bf10"
+    },
+    "_N$disabledSprite": {
+      "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
+    },
+    "_N$target": {
+      "__id__": 51
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "5b7e9dLHeZFk7AFbYUPOJlZ",
+    "handler": "onBuyAnimalFood",
+    "customEventData": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "1c234e01-985b-486c-b319-3d58fb453969"
+    },
+    "fileId": "38MmBi4r1KU6t98X0FIwu4",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 6
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "ac6bed28-f031-46a9-a3a2-5b7b7a6f922c"
+    },
+    "_type": 1,
+    "_sizeMode": 0,
+    "_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__": "1c234e01-985b-486c-b319-3d58fb453969"
+    },
+    "fileId": "451Y0R4WRMjqIHF30FJOis",
+    "sync": false
+  },
+  {
+    "__type__": "5b7e9dLHeZFk7AFbYUPOJlZ",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "animalName": {
+      "__id__": 21
+    },
+    "animalAmount": {
+      "__id__": 26
+    },
+    "animalUnit": {
+      "__id__": 43
+    },
+    "estimateAmount": {
+      "__id__": 36
+    },
+    "_leaseLandScript": null,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "1c234e01-985b-486c-b319-3d58fb453969"
+    },
+    "fileId": "",
+    "sync": false
+  }
+]

assets/Prefabs/UI/lease/BuyAnimalFood.prefab.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "1.2.9",
+  "uuid": "1c234e01-985b-486c-b319-3d58fb453969",
+  "optimizationPolicy": "AUTO",
+  "asyncLoadAssets": false,
+  "readonly": false,
+  "subMetas": {}
+}

assets/Prefabs/UI/lease/LandAnimalInfo.prefab

@@ -1300,14 +1300,14 @@
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
-      "x": 0,
+      "x": 1,
       "y": 0.5
     },
     "_trs": {
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        27.654,
+        80.224,
         0,
         0,
         0,
@@ -1433,7 +1433,7 @@
       "__type__": "TypedArray",
       "ctor": "Float64Array",
       "array": [
-        140.388,
+        96.182,
         0,
         0,
         0,

assets/Scene/Login.fire

@@ -183,7 +183,7 @@
       "array": [
         0,
         0,
-        470.4108976548273,
+        470.2517942549502,
         0,
         0,
         0,

assets/Script/Lease/BuyAnimalFood.js

@@ -0,0 +1,60 @@
+
+cc.Class({
+    extends: cc.Component,
+
+    properties: {
+        animalName: {
+            default: null,
+            type: cc.Label,
+            serializable: true,
+        },
+        animalAmount: {
+            default: null,
+            type: cc.Label,
+            serializable: true,
+        },
+        animalUnit: {
+            default: null,
+            type: cc.Label,
+            serializable: true,
+        },
+        /**
+         * 预计
+         */
+        estimateAmount: {
+            default: null,
+            type: cc.Label,
+            serializable: true,
+        },
+
+        _leaseLandScript: null,
+    },
+    //foodName, foodPrice,foodAmount, leaseLandScript
+    setInfo(foodName, foodPrice, foodAmount, leaseLandScript) {
+        this.animalName.string = foodName;
+        this.animalUnit.string = foodPrice + ' SNB';
+        this.animalAmount.string = "x" + foodAmount;
+        this._leaseLandScript = leaseLandScript;
+        //计算一个预计消耗值
+        this.estimateAmount.string = (foodPrice * foodAmount).toFixed(3) + " SNB";
+    },
+    onclose() {
+        this.node.destroy();
+    },
+
+    //确定销售果实
+    onBuyAnimalFood() {
+        let data = { configLandId: this._leaseLandScript.leaseLandInfo.configLandId }
+        GlobalD.GameData.onBuyAnimalFood(data, (value) => {
+            if (0 === value.code && value.flag) {
+                this._leaseLandScript.setLeaseLandInfo(value.data, true);
+                //更新日志数据
+                cc.find("GameNode/ManageDapp").getComponent("ManageDapp").onUpdateSnbList();
+                
+                GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), value.msg, 2);
+            } else {
+                GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), value.msg, 2);
+            }
+        });
+    }
+});

assets/Script/Lease/BuyAnimalFood.js.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "5b7e974b-1de6-4593-b005-6d850f389959",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/Script/Lease/BuyDogInfo.js

@@ -130,7 +130,7 @@ cc.Class({
         } else {
             this.inputInviteValue = 1;
             this.inputContainer.getComponent(cc.EditBox).string = this.inputInviteValue;
-            console.log("请输入整数的倍数", this.inputInviteValue);
+            // console.log("请输入整数的倍数", this.inputInviteValue);
         }
         this._updatePrice();
     },

assets/Script/Lease/CntInfo.js

@@ -33,7 +33,7 @@ cc.Class({
         } else {
             this.inputInviteValue = 0;
             this.inputContainer.getComponent(cc.EditBox).string = this.inputInviteValue;
-            console.log("请输入整数的倍数", this.inputInviteValue);
+            // console.log("请输入整数的倍数", this.inputInviteValue);
             GlobalD.GameData.showToast(cc.find('Canvas/UICamera'), "请输入整数提现！", 1);
         }
     },

assets/Script/Lease/LandAnimalTextInfo.js

@@ -74,7 +74,7 @@ cc.Class({
     setInfo(id, price, date, start, end, multiple, describe,leaseAnimalInfoScript) {
         this.landId.string = id + " 号";
         this._landId = id;
-        this.price.string = price + " CNT";
+        this.price.string = price;
         this.date.string = date;
         this.startTime.string = start;
         this.endTime.string = end;
@@ -86,14 +86,14 @@ cc.Class({
 
     inputEditValue(value, e) {
         var numberTemp = new RegExp("^[A-Za-z0-9]+$");
-        let limitValue = 100;
+        let limitValue = 10000;
         //动态设置一个上限
 
         if (numberTemp.test(value)) {
             if (Number(value) >= 1 && Number(value) <= limitValue) {
                 this.inputValue = Number(value);
             } else if (Number(value) > limitValue) {
-                //限制只能输入100
+                //限制只能输入200
                 this.inputValue = limitValue;
                 this.inputContainer.getComponent(cc.EditBox).string = this.inputValue;
             } else {
@@ -103,7 +103,7 @@ cc.Class({
         } else {
             this.inputValue = 1;
             this.inputContainer.getComponent(cc.EditBox).string = this.inputValue;
-            console.log("请输入整数的倍数", this.inputValue);
+            // console.log("请输入整数的倍数", this.inputValue);
         }
     },
 

assets/Script/Lease/LeaseAnimalPlantInfo.js

@@ -106,7 +106,7 @@ cc.Class({
         } else {
             this.inputValue = 1;
             this.inputContainer.getComponent(cc.EditBox).string = this.inputValue;
-            console.log("请输入整数的倍数", this.inputValue);
+            // console.log("请输入整数的倍数", this.inputValue);
         }
     },
 

assets/Script/Lease/LeaseGrantInfo.js

@@ -86,7 +86,7 @@ cc.Class({
         } else {
             this.inputAmountValue = 0;
             this.inputAmountContainer.getComponent(cc.EditBox).string = this.inputAmountValue;
-            console.log("请输入整数的倍数", this.inputAmountValue);
+            // console.log("请输入整数的倍数", this.inputAmountValue);
         }
     },
 

assets/Script/Lease/LeaseInfo.js

@@ -117,7 +117,7 @@ cc.Class({
         } else {
             this.inputInviteValue = 1;
             this.inputContainer.getComponent(cc.EditBox).string = this.inputInviteValue;
-            console.log("请输入整数的倍数", this.inputInviteValue);
+            // console.log("请输入整数的倍数", this.inputInviteValue);
         }
         this._updatePrice();
     },

assets/Script/Network/dapp.js

@@ -123,7 +123,7 @@ cc.Class({
                                     // console.log("playerPullInfo pass2:" + flag + '-' + value.code + '-' + value.msg);
                                     //记录读取的数据到内存里面
                                     // 正常游戏
-                                    console.log("playerPullInfoTemp:", playerPullInfoTemp);
+                                    // console.log("playerPullInfoTemp:", playerPullInfoTemp);
                                     userData.readData = playerPullInfoTemp.data;
                                     // utils.init(GlobalD.Dapp.UserInfo.id, (data) => {
                                     //     console.log('utils ws:' + data);

assets/Script/Network/gameToast.ts

@@ -20,46 +20,48 @@ export default class gameToast {
      * @param time 清除的时间
      * @param callback 清除时候回调
      */
-    public show(parent:cc.Node, content: string, time: number, callback: Function, target:cc.Component) {
+    public show(parent: cc.Node, content: string, time: number, callback: Function, target: cc.Component) {
 
         this.callback = callback;
-        if(this.showObj){
+        if (this.showObj) {
             this.showObj.parent = parent;
             let DetailLabel = this.showObj.getChildByName('DetailLabel');
             DetailLabel.getComponent(cc.Label).string = content;
             this.scheduleObj = null;
             target.unschedule(this.scheduleObj);
-            this.scheduleObj = target.scheduleOnce(() => {
+            this.scheduleObj = () => {
                 if (callback) {
                     callback();
                     this.callback = null;
                 }
                 this.showObj.destroy();
                 this.showObj = null;
-            }, time);
-        }else{
+            };
+            target.scheduleOnce(this.scheduleObj, time);
+        } else {
             cc.loader.loadRes("prefab/gameToast", function (err, texture) {
                 this.showObj = cc.instantiate(texture);
                 this.showObj.parent = parent;
                 let DetailLabel = this.showObj.getChildByName('DetailLabel');
                 DetailLabel.getComponent(cc.Label).string = content;
-    
-                this.scheduleObj = target.scheduleOnce(() => {
+
+                this.scheduleObj = () => {
                     if (callback) {
                         callback();
                         this.callback = null;
                     }
                     this.showObj.destroy();
                     this.showObj = null;
-                }, time);
+                };
+                target.scheduleOnce(this.scheduleObj, time);
             }.bind(this));
         }
 
     }
 
-    public hide(target:cc.Component) {
+    public hide(target: cc.Component) {
         if (this.showObj) {
-            if(this.callback){
+            if (this.callback) {
                 this.callback();
             }
             this.scheduleObj = null;

assets/Script/UI/ManageSeedNode.js

@@ -82,7 +82,7 @@ cc.Class({
         self.node.setPosition(startEndPos);
         self._EndPosition = startTiledPos;
 
-        if(0 === self.mallType){
+        if (0 === self.mallType) {
             let startIndex = GlobalD.TiledMap.getIndex(startTiledPos);
             let _targetBuildingsInfo = GlobalD.game.onGetBuildingsTiledMapUnitFromIndex(startIndex);
             if (_targetBuildingsInfo) {
@@ -90,10 +90,10 @@ cc.Class({
                 self.targetBuildingsInfo = _targetBuildingsInfo;
             }
             else {
-                self.labelTip.string = "请移动到农田上！";
+                self.labelTip.string = "移动到农田上！";
                 self.targetBuildingsInfo = null;
             }
-        }else{
+        } else {
             let startIndex = GlobalD.TiledMap.getIndex(startTiledPos);
             let _targetBuildingsInfo = GlobalD.game.onGetBuildingsTiledMapUnitFromIndex(startIndex);
             if (_targetBuildingsInfo) {
@@ -101,11 +101,11 @@ cc.Class({
                 self.targetBuildingsInfo = _targetBuildingsInfo;
             }
             else {
-                self.labelTip.string = "请移动到对应的养殖场上！";
+                self.labelTip.string = "移动到对应的养殖场上！";
                 self.targetBuildingsInfo = null;
             }
         }
-        
+
 
         self.node.on(cc.Node.EventType.TOUCH_MOVE, function (event) {
 
@@ -145,30 +145,22 @@ cc.Class({
 
             let buildIndex = GlobalD.TiledMap.getIndex(self._EndPosition);
             let _targetBuildingsInfo = GlobalD.game.onGetBuildingsTiledMapUnitFromIndex(buildIndex);
-            if (_targetBuildingsInfo) {
-                if(0 === self.mallType){
-                    if (_targetBuildingsInfo.buildInfo.buildType == reGameStates.BuildType.HolyFarmland) {
-                        self.labelTip.string = '播种到' + _targetBuildingsInfo.buildInfo.id + "号" + _targetBuildingsInfo.buildInfo.buildingName + '上';
-                        self.targetBuildingsInfo = _targetBuildingsInfo;
-                    } else {
-                        self.labelTip.string = '请移动到农田上！';
-                        self.targetBuildingsInfo = null;
-                    }
-                }else{
-                    if (_targetBuildingsInfo.buildInfo.buildType == reGameStates.BuildType.HolyAnimal) {
-                        self.labelTip.string = "养殖在" + _targetBuildingsInfo.buildInfo.buildingName + '上';
-                        self.targetBuildingsInfo = _targetBuildingsInfo;
-                    } else {
-                        self.labelTip.string = '请移动到对应的养殖场上！';
-                        self.targetBuildingsInfo = null;
-                    }
+            if (0 === self.mallType) {
+                if (_targetBuildingsInfo && _targetBuildingsInfo.buildInfo.buildType == reGameStates.BuildType.HolyFarmland) {
+                    self.labelTip.string = '播种到' + _targetBuildingsInfo.buildInfo.id + "号" + _targetBuildingsInfo.buildInfo.buildingName + '上';
+                    self.targetBuildingsInfo = _targetBuildingsInfo;
+                } else {
+                    self.labelTip.string = '移动到农田上！';
+                    self.targetBuildingsInfo = null;
+                }
+            } else {
+                if (_targetBuildingsInfo && _targetBuildingsInfo.buildInfo.buildType == reGameStates.BuildType.HolyAnimal) {
+                    self.labelTip.string = "养殖在" + _targetBuildingsInfo.buildInfo.buildingName + '上';
+                    self.targetBuildingsInfo = _targetBuildingsInfo;
+                } else {
+                    self.labelTip.string = '移动到对应的养殖场上！';
+                    self.targetBuildingsInfo = null;
                 }
-               
-
-            }
-            else {
-                self.labelTip.string = self.labelTipString;
-                self.targetBuildingsInfo = null;
             }
 
         }, self.node);
@@ -209,7 +201,7 @@ cc.Class({
             _leaselandInfoScript = this.targetBuildingsInfo.getComponent("LeaseAnimalInfo");
         }
         // console.log("_leaselandInfoScript:",_leaselandInfoScript);
-        if(!_leaselandInfoScript){
+        if (!_leaselandInfoScript) {
             GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "种子(幼苗)类型不对！", 2);
             return;
         }
@@ -225,8 +217,8 @@ cc.Class({
         GlobalD.GameData.onPlant(data, (value) => {
             //面板种子消耗减少1  
             if (0 === value.code) {
-                console.log('种子减少的类型名字', this.seedName);
-                console.log(value);
+                // console.log('种子减少的类型名字', this.seedName);
+                // console.log(value);
                 var BuildingView = cc.find("Canvas/UICamera/BuildingContainer/BuildingView").getComponent("BuildingView");
                 BuildingView.onUpdateList();
                 //把种子的信息存储到当前的土地 plantInfo 上;

assets/Script/UI/MyCanvas.js

@@ -12,9 +12,9 @@ cc.Class({
         } else {
             cc.view.setDesignResolutionSize(720, 1280, cc.ResolutionPolicy.FIXED_WIDTH);
             // cc.log('齐刘海手机：');
-            cc.find('Canvas/UICamera/BelowTheMask/TopLabel').getComponent(cc.Widget).top -=100;
-            cc.find('Canvas/UICamera/BelowTheMask/TopButton').getComponent(cc.Widget).top -=100;
-            cc.find('Canvas/UICamera/BelowTheMask/BottomButton').getComponent(cc.Widget).bottom -= 100;
+            // cc.find('Canvas/UICamera/BelowTheMask/TopLabel').getComponent(cc.Widget).top -=100;
+            // cc.find('Canvas/UICamera/BelowTheMask/TopButton').getComponent(cc.Widget).top -=100;
+            // cc.find('Canvas/UICamera/BelowTheMask/BottomButton').getComponent(cc.Widget).bottom -= 100;
         }
 
         cc.log("canvasSize:", canvasSize);

assets/Script/UI/StoreView.js

@@ -484,7 +484,7 @@ cc.Class({
       )
       return
     }
-    console.log('发起兑换：' + Number(this.snbAmount))
+    // console.log('发起兑换：' + Number(this.snbAmount))
     GlobalD.GameData.onSnbToCnt(Number(this.snbAmount), (data) => {
       //更新数据
       this.snbAmountLabel.string = GlobalD.GameData.SNB
@@ -571,7 +571,7 @@ cc.Class({
       )
       return
     }
-    console.log('发起兑换：' + Number(this.luckyAmount))
+    // console.log('发起兑换：' + Number(this.luckyAmount))
     GlobalD.GameData.onPostLuckToSnb({ luckNum: Number(this.luckyAmount) }, (value) => {
       //更新数据
       this.luckyAmountLabel.string = GlobalD.GameData.GetLucky();
@@ -626,11 +626,11 @@ cc.Class({
       this.mySeedList[this.buySeedIndex].maturity
   },
   PayCNT() {
-    console.log('this.playAmount=', this.playAmount)
-    console.log(
-      'this.playAmount price=',
-      this.playAmount * parseInt(this.mySeedList[this.buySeedIndex].priceCnt)
-    )
+    // console.log('this.playAmount=', this.playAmount)
+    // console.log(
+    //   'this.playAmount price=',
+    //   this.playAmount * parseInt(this.mySeedList[this.buySeedIndex].priceCnt)
+    // )
 
     //购买种子也要使用轮询
 
@@ -644,10 +644,10 @@ cc.Class({
       }
     }
     //当前背包的数量
-    console.log('currentAmount:', {
-      seedId: this.mySeedList[this.buySeedIndex].id,
-      currentAmount: currentAmount, //把当前背包的数据传进去
-    })
+    // console.log('currentAmount:', {
+    //   seedId: this.mySeedList[this.buySeedIndex].id,
+    //   currentAmount: currentAmount, //把当前背包的数据传进去
+    // })
     let playAmount =
       this.playAmount * parseInt(this.mySeedList[this.buySeedIndex].priceCnt)
     if (0 === playAmount) {
@@ -658,12 +658,6 @@ cc.Class({
       )
       return
     }
-    // if (this.isPlaying) {
-    //     GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "购买过快！", 1);
-    //     return;
-    // }
-    // this.isPlaying = true;
-    // GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "区块确认中,请耐心等待！", 120);
     GlobalD.GameData.payCNT(
       playAmount,
       4,
@@ -673,7 +667,7 @@ cc.Class({
         // this.isPlaying = false;
         if (err === null) {
           // TODO 成功, 支付为链上操作，需要提供回调接口给这边服务端确认交易成功后修改购买订单结果
-          console.log(tx) // 交易hash，唯一标识符
+          // console.log(tx) // 交易hash，唯一标识符
           //todo 种子
           if (this.AutoGetSeedsData) {
             this.unschedule(this.AutoGetSeedsData)
@@ -690,15 +684,12 @@ cc.Class({
                 console.log('轮询种子:' + JSON.stringify(value))
                 if (0 === value.code) {
                   this.unschedule(this.AutoGetSeedsData)
-                  console.log('轮询种子购买成功')
+                  // console.log('轮询种子购买成功')
                   GlobalD.GameData.showToast(
                     cc.find('Canvas/UICamera'),
                     '种子购买成功！',
                     1
                   )
-
-                  // this.PayCNTPopView.active = false;
-
                   //直接重新初始化一下列表，
                   this.buildingViewScript.onUpdateList()
                 }
@@ -816,6 +807,8 @@ cc.Class({
   _updatePrice() {
 
     this.PayCNTPopViewNameLabel.string = this.mySeedList[this.buySeedIndex].name;
+    //隐藏非植物的cnt购买按钮
+    this.PayCNTPopViewCNTLabel.node.parent.active = 0 === this.mySeedList[this.buySeedIndex].mallType?true:false;
     this.PayCNTPopViewCNTLabel.string = this.mySeedList[this.buySeedIndex].priceCnt;
     this.PayCNTPopViewSNBLabel.string = this.mySeedList[this.buySeedIndex].priceSnb;
     this.PayCNTPopViewMutureDurLabel.string = this.mySeedList[this.buySeedIndex].maturity;

assets/Script/adpp/applyListInfoItem.js

@@ -64,7 +64,7 @@ cc.Class({
             return
         }
         // console.log('发起兑换：' + Number(this.applyItem.snb));
-        console.log('this.applyItem', this.applyItem);
+        // console.log('this.applyItem', this.applyItem);
         //todo 这里先判断一次，对应的snb是否是审查的snb凭证
         if (this.isTrans) return;
         GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "兑换中", 10);
@@ -73,7 +73,7 @@ cc.Class({
 
             this.isTrans = false;
             if (0 === checkRes.code) {
-                console.log('发起兑换：' + Number(this.applyItem.snb),"== checkRes.data.snb：",checkRes.data.snb);
+                // console.log('发起兑换：' + Number(this.applyItem.snb),"== checkRes.data.snb：",checkRes.data.snb);
                 GlobalD.GameData.onSnbToCnt(checkRes.data.snb, (data) => {
                     //更新数据
                     // console.log('res=', data)

assets/Script/adpp/integralInfo.js

@@ -51,7 +51,7 @@ cc.Class({
         this.buildingViewScript = this.buildingView.getComponent('BuildingView');
         //获取一个随机种子
         GlobalD.GameData.onGetPlayerSeeds((value) => {
-            console.log("onGetPlayerSeeds:", value);
+            // console.log("onGetPlayerSeeds:", value);
             if (0 === value.code && value.flag) {
                 this.availableCNT.string = value.data.score.oldTotalCnt + "/" + value.data.score.totalCount;
                 this.seeds = value.data.seeds;
@@ -133,7 +133,7 @@ cc.Class({
         } else {
             this.inputValue = 1;
             this.inputContainer.getComponent(cc.EditBox).string = this.inputValue;
-            console.log("请输入整数的倍数", this.inputValue);
+            // console.log("请输入整数的倍数", this.inputValue);
         }
         this._updatePrice();
     },

assets/Script/adpp/inviteInfo.js

@@ -87,7 +87,7 @@ cc.Class({
         //     return;
         // }
         GlobalD.dapp.teamData().then((data) => {
-            console.log("teamData：" + JSON.stringify(data));
+            // console.log("teamData：" + JSON.stringify(data));
             if (data.err === null) {
                 // 返回成功，见下面消息体
                 this.neighborValue.string = data.res.children_count;

assets/Script/adpp/userListInfo.js

@@ -145,7 +145,7 @@ cc.Class({
         if(this.bUpdateList)return;
         this.bUpdateList = true;
         GlobalD.GameData.onGetCanStealUserList(0, 10, (list) => {
-            console.log("==========", list);
+            // console.log("==========", list);
             this.bUpdateList = false;
             this.onShowUserList(list);
         });

assets/Script/build/LeaseAnimalInfo.js

@@ -222,6 +222,12 @@ cc.Class({
             default: reGameStates.AnimalType.None,
             type: cc.Enum(reGameStates.AnimalType),
             toolTip: '当前的养殖动物类型'
+        },
+
+        buyAnimalFoodPrefab: {
+            default: null,
+            type: cc.Prefab,
+            toolTip: '喂养食物提示面板'
         }
     },
 
@@ -236,7 +242,7 @@ cc.Class({
     start() {
         this.harvestNode.on(cc.Node.EventType.TOUCH_START, () => {
             if (GlobalD.GameData.isOnAddFruit) return;
-            console.log("点击收获");
+            // console.log("点击收获");
             GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "收获中..", 5);
             let data = { landId: this.leaseLandInfo.configLandId };
             //果实收入仓库，重置土地种植信息
@@ -246,7 +252,7 @@ cc.Class({
                     //收成后处理相关状态
                     this.leaseLandInfo.plant = 0;
                     this.leaseLandInfo.seedInfo = null;
-                    this._resetLandInfo();
+                    this._resetPlantInfo();
                     //更新仓库列表
                     this._buildingView.onUpdateList();
                     if (value.data.isWithered) {
@@ -254,10 +260,10 @@ cc.Class({
                     } else {
                         // "收获成功！"
                         if (value.data.lossAmount > 0) {
-                            console.log("loss amount:" + value.data.lossAmount);
-                            GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "收获成功！损失了" + value.data.lossAmount + "个果实", 2);
+                            // console.log("loss amount:" + value.data.lossAmount);
+                            GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "收获成功！损失了" + value.data.lossAmount.toFixed(3) + "个果实", 2);
                         } else {
-                            GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), value.data.msg, 2);
+                            GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), value.data.msg, 1);
                         }
                     }
                 } else if (706 === value.code) {
@@ -307,29 +313,6 @@ cc.Class({
         leasePanelScript.leaseAnimalLandInfoNode = this;
         leasePanelScript.onInitLeaseInfo();
     },
-    onLevelUpLand() {
-        if (this.leaseLandInfo == null) {
-            GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "租赁土地不存在！", 1);
-            return;
-        }
-        let data = {
-            configLandId: this.leaseLandInfo.configLandId
-        }
-        GlobalD.GameData.onPostLandLevelUp(data, (value) => {
-            //设置土地等级
-            if (0 === value.code) {
-                GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), value.msg, 2);
-                if (value.flag) {
-                    console.log(value);
-                    this.levelLabel.string = value.data.name;
-                    this.leaseLandInfo.landLevel = value.data.id;
-                    this.onSwitchEnvBgFromLevel(this.leaseLandInfo.landLevel - 1);
-                }
-            }
-        });
-
-    },
-
     /**
      * 解锁土地操作
      */
@@ -360,10 +343,13 @@ cc.Class({
         }
         //清除当前租赁数据
         this.leaseLandInfo = null;
-        this._resetLandInfo();
-
+        //去除提示框
+        this.upSliderNode.parent.active = false;
+        this.midSliderNode.active = false;
+        this._resetPlantInfo();
+        this.onSetInfoBoxActive(false);
     },
-    _resetLandInfo() {
+    _resetPlantInfo() {
         //隐藏养殖
         this.midAnimal.active = false;
         this._workingBuildingAnimal.onResetAnimal();
@@ -375,17 +361,10 @@ cc.Class({
             this.timeInterval = null;
         }
 
-        //去除提示框
-        this.upSliderNode.parent.active = false;
-        this.midSliderNode.active = false;
         this.harvestNode.active = false;
-
         this.stealHarvestNode.active = false;
-
         //重置养殖场状态
         this._workingBuildingAnimal.onResetAnimal();
-
-        this.onSetInfoBoxActive(false);
     },
     //设置config的土地信息
     setConfigLandInfo(value) {
@@ -630,8 +609,8 @@ cc.Class({
         let leasePanelScript = leasePanel.getComponent("PlantInfo");
         let _harvest = this.leaseLandInfo.seedInfo.harvestQuantity + "x" + this.leaseLandInfo.leaseMultiple + "个";
         //price,maturity,plantStart,harvestQuantity,describe
-        let { name, priceSnb, maturity, seedDescribe } = this.leaseLandInfo.seedInfo;
-        leasePanelScript.setInfo(name, priceSnb, maturity + "天", this.leaseLandInfo.plantStart, _harvest, seedDescribe);
+        let { name, priceSnb, priceCnt, maturity, seedDescribe } = this.leaseLandInfo.seedInfo;
+        leasePanelScript.setInfo(name, priceSnb + ' SNB or ' + priceCnt + ' CNT', maturity + "天", this.leaseLandInfo.plantStart, _harvest, seedDescribe);
     },
 
 
@@ -712,20 +691,19 @@ cc.Class({
             GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "土地未租赁！", 2);
             return;
         }
-        let data = { configLandId: this.leaseLandInfo.configLandId }
-        GlobalD.GameData.onBuyAnimalFood(data, (value) => {
-            if (0 === value.code && value.flag) {
-
-                // this.leaseLandInfo.animalEat = true;
-                // this._workingBuildingAnimal.onSetGrow(this.currentAnimalType, 1, !this.leaseLandInfo.animalEat);
-                this.setLeaseLandInfo(value.data, true);
-
-                GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), value.msg, 2);
-
-            } else {
-                GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), value.msg, 2);
-            }
-        });
+        if (!this.leaseLandInfo.seedInfo) {
+            GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "未养殖动物！", 2);
+            return;
+        }
+        // console.log(this.leaseLandInfo);
+        //生成喂养面板
+        let _TipView = cc.instantiate(this.buyAnimalFoodPrefab)
+        _TipView.parent = GlobalD.game._ManageUIScript.TipView;
+        _TipView.setPosition(cc.v2(0, 0))
+        //foodName, foodPrice,foodAmount, leaseLandScript
+        _TipView
+            .getComponent('BuyAnimalFood')
+            .setInfo(this.leaseLandInfo.cultivateSeedVo.seedName, this.leaseLandInfo.cultivateSeedVo.seedSNB, this.leaseLandInfo.leaseMultiple, this);
     },
 
     //显示光圈提示

assets/Script/build/LeaseFarmlandInfo.js

@@ -221,7 +221,8 @@ cc.Class({
     start() {
         this.harvestNode.on(cc.Node.EventType.TOUCH_START, () => {
             if (GlobalD.GameData.isOnAddFruit) return;
-            console.log("点击收获");
+            //如果打开了，就隐藏ui
+            GlobalD.game._ManageUIScript.onHideSelectLeaseLandInfo();
             GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "收获中..", 5);
             let data = { landId: this.leaseLandInfo.configLandId };
             //果实收入仓库，重置土地种植信息
@@ -231,7 +232,7 @@ cc.Class({
                     //收成后处理相关状态
                     this.leaseLandInfo.plant = 0;
                     this.leaseLandInfo.seedInfo = null;
-                    this._resetLandInfo();
+                    this._resetPlantInfo();
                     //更新仓库列表
                     this._buildingView.onUpdateList();
                     if (value.data.isWithered) {
@@ -239,10 +240,10 @@ cc.Class({
                     } else {
                         // "收获成功！"
                         if (value.data.lossAmount > 0) {
-                            console.log("loss amount:" + value.data.lossAmount);
-                            GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "收获成功！损失了" + value.data.lossAmount + "个果实", 2);
+                            // console.log("loss amount:" + value.data.lossAmount);
+                            GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "收获成功！损失了" + value.data.lossAmount.toFixed(3) + "个果实", 2);
                         } else {
-                            GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), value.data.msg, 2);
+                            GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), value.data.msg, 1);
                         }
                     }
                 } else if (706 === value.code) {
@@ -269,8 +270,9 @@ cc.Class({
                 if (0 === value.code) {
                     //收成后处理相关状态
                     this.onHideStealHarvest();
-                    let _manageUI = cc.find("GameNode/ManageUI");
-                    _manageUI.getComponent("ManageUI").onInitStealViewSuccessPrefab(value.data);
+                    // let _manageUI = cc.find("GameNode/ManageUI");
+                    // _manageUI.getComponent("ManageUI").onInitStealViewSuccessPrefab(value.data);
+                    GlobalD.game._ManageUIScript.onInitStealViewSuccessPrefab(value.data);
                     //更新仓库列表
                     this._buildingView.onUpdateList();
 
@@ -334,15 +336,10 @@ cc.Class({
         }
         GlobalD.GameData.onPostLandLevelUp(data, (value) => {
             //设置土地等级
-            if (0 === value.code) {
-                GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), value.msg, 2);
-                if (value.flag) {
-                    console.log(value);
-                    this.levelLabel.string = value.data.name;
-                    this.leaseLandInfo.landLevel = value.data.id;
-                    this.onSwitchEnvBgFromLevel(this.leaseLandInfo.landLevel - 1);
-                }
-            }
+            let _landLevel = value.data.landLevel;
+            this.levelLabel.string = _landLevel.name;
+            this.leaseLandInfo.landLevel = _landLevel.id;
+            this.onSwitchEnvBgFromLevel(this.leaseLandInfo.landLevel - 1);
         });
 
     },
@@ -370,39 +367,31 @@ cc.Class({
      * 重新锁定
      */
     onLockLand() {
-
         //显示按钮
         if (this.notLeased) {
             this.notLeased.active = true;
         }
-         //清除当前租赁数据
+        //清除当前租赁数据
         this.leaseLandInfo = null;
-        this._resetLandInfo();
-
+        //去除提示框
+        this.upSliderNode.parent.active = false;
+        this._resetPlantInfo();
+        this.onSetInfoBoxActive(false);
     },
-    _resetLandInfo(){
-        
-         this.isShowHarvest = false;
-         this.isShowIndex = 0;
-         if (this.timeInterval) {
-             clearInterval(this.timeInterval);
-             this.timeInterval = null;
-         }
- 
-         //去除提示框
-         this.upSliderNode.parent.active = false;
-         this.midSliderNode.active = false;
-         this.harvestNode.active = false;
- 
-         this.stealHarvestNode.active = false;
- 
-         //重置土地图片
-         this._workingBuilding.onSetGrow(0, null);
- 
-         this.onSetInfoBoxActive(false);
+    _resetPlantInfo() {
+        this.isShowHarvest = false;
+        this.isShowIndex = 0;
+        if (this.timeInterval) {
+            clearInterval(this.timeInterval);
+            this.timeInterval = null;
+        }
+        this.midSliderNode.active = false;
+        this.harvestNode.active = false;
+        this.stealHarvestNode.active = false;
+        //重置土地图片
+        this._workingBuilding.onSetGrow(0, null);
     },
 
-
     //设置config的土地信息
     setConfigLandInfo(value) {
         this.configLandInfo = value;
@@ -616,32 +605,8 @@ cc.Class({
             _harvest = this.leaseLandInfo.seedInfo.harvest3;
         }
         //price,maturity,plantStart,harvestQuantity,describe
-        let { name, priceCnt, maturity, seedDescribe } = this.leaseLandInfo.seedInfo;
-        leasePanelScript.setInfo(name, priceCnt, maturity + "天", this.leaseLandInfo.plantStart, _harvest, seedDescribe);
-    },
-
-    //更新收获的状态
-    updateHarvest() {
-        //todo 后续看看如何刷新，现在走的是开始刷新一次
-        // let _workingBuilding = housingTemp_farmland.getComponent("WorkingBuilding");
-        // //获得服务器种植日期毫秒
-        // let [_day, _hour, _minutes, _seconds] = date.remainFromMillisecond(_leaseLandInfo.plantDaysMill);
-        // let _maturityHour = _leaseLandInfo.seedInfo.maturity * 24
-        // let _ratio = _hour / _maturityHour;
-        // // console.log("生成的：" + _ratio);
-        // if (_ratio > 0.5) {
-        //     _workingBuilding.onSetGrow(1, _spriteFrame);
-        // } else if (_ratio >= 0) {
-        //     _workingBuilding.onSetGrow(2, _spriteFrame);
-        // }else if (_leaseLandInfo.plantDaysMill <= 0) {
-        //     //如果传回的毫秒是小于零，说明成熟了
-        //     //成熟阶段
-        //     _workingBuilding.onSetGrow(3, _spriteFrame);
-        //     //todo，如果时间小的，走收获，收获成果实
-        //     // console.log("土地：", _userLeaseLand[j].configLandId, "已经成熟,可以操作收取果实了！！");
-        //     //todo 土地可收获状态
-        //     leaseFarmlandInfoScript.onShowHarvest();
-        // }
+        let { name, priceSnb, priceCnt, maturity, seedDescribe } = this.leaseLandInfo.seedInfo;
+        leasePanelScript.setInfo(name, priceSnb + ' SNB or ' + priceCnt + ' CNT', maturity + "天", this.leaseLandInfo.plantStart, _harvest, seedDescribe);
     },
 
     //检查土地状态

assets/Script/build/buildingsTouch.js

@@ -89,7 +89,7 @@ cc.Class({
         this.unschedule(this.callback);
     },
     TouchEndFunction() {
-        console.log("buildings touch end!");
+        // console.log("buildings touch end!");
         // if (this.getOnClickTags()) {
         //     return;
         // }
@@ -123,6 +123,9 @@ cc.Class({
                             if (leaseFarmlandInfoScript && 1 === leaseFarmlandInfoScript.leaseLandInfo.isPlant && leaseFarmlandInfoScript.leaseLandInfo.seedInfo) {
                                 //显示工具ui
                                 GlobalD.game._ManageUIScript.onSwitchHideUI();
+                            } else {
+                                //隐藏工具，并设置 currentLeaseLandInfo
+                                GlobalD.game._ManageUIScript.onHideSelectLeaseLandInfo();
                             }
                             leaseFarmlandInfoScript.onSetInfoBoxActive(true);
                             //记录当前选中的buildInfo

assets/Script/public/GameData.js

@@ -472,7 +472,7 @@ cc.Class({
      */
     getPlayerExchangeState(callback) {
         utils.get(utils.api.playerExchangeState, {}, (flag, value) => {
-            console.log("租赁状态：", value);
+            // console.log("租赁状态：", value);
             if (flag)
                 callback(flag, value);
         })
@@ -881,7 +881,7 @@ cc.Class({
         GlobalD.dapp.cntCanWithdrawBalance().then((data) => {
             const { err, res } = data;
             if (err === null) {
-                console.log(res) //Number 返回数字
+                // console.log(res) //Number 返回数字
                 GlobalD.GameData.CNTDrawBalance = res;
             }
             //todo ，记录一个信息
@@ -1049,7 +1049,7 @@ cc.Class({
     //获取工具
     onGetTools(callback) {
         utils.get(utils.api.getTools, {}, (flag, value) => {
-            console.log("工具：", flag, value);
+            // console.log("工具：", flag, value);
             if (flag)
                 callback(value);
         })
@@ -1057,7 +1057,7 @@ cc.Class({
     //使用工具
     onPostToolToLand(data, callback) {
         utils.post(utils.api.postUseLuckyTools, data, (flag, value) => {
-            console.log(data, "=使用工具：", flag, value);
+            // console.log(data, "=使用工具：", flag, value);
             if (flag && 0 === value.code && value.flag) {
                 GlobalD.PlayerAttribute = value.data.playerAttribute;
                 this.SetLucky(GlobalD.PlayerAttribute.lucky);
@@ -1079,9 +1079,14 @@ cc.Class({
     //升级土地
     onPostLandLevelUp(data, callback) {
         utils.post(utils.api.postLandLevelUp, data, (flag, value) => {
-            console.log(data, "=升级土地", flag, value);
-            if (flag) {
+            // console.log(data, "=升级土地", flag, value);
+            if (flag && 0 === value.code && value.flag) {
+                GlobalD.PlayerAttribute = value.data.playerAttribute;
+                this.SetLucky(GlobalD.PlayerAttribute.lucky);
+                this.showToast(cc.find("Canvas/UICamera"), value.msg, 1);
                 callback(value);
+            } else {
+                this.showToast(cc.find("Canvas/UICamera"), value.msg, 1);
             }
         })
     },
@@ -1096,7 +1101,7 @@ cc.Class({
         this.showToast(cc.find("Canvas/UICamera"), "兑换SNB中", 2);
         utils.post(utils.api.luckToSnb, data, (flag, value) => {
             this.isPlayingLucky = false;
-            console.log(data, "=兑换snb", flag, value);
+            // console.log(data, "=兑换snb", flag, value);
             if (flag && 0 === value.code && value.flag) {
                 //如果返回一个体力信息，更新对应的新的用户信息。
                 //更新日志数据
@@ -1121,7 +1126,7 @@ cc.Class({
      */
     onGetAnimalTimes() {
         utils.get(utils.api.getAnimalTimes, {}, (flag, value) => {
-            console.log("getAnimalTimes", flag, value);
+            // console.log("getAnimalTimes", flag, value);
             if (flag && 0 === value.code && value.flag) {
                 this.SetAnimalTimes(value.data);
             }
@@ -1132,7 +1137,7 @@ cc.Class({
 
     onPlayAnimalLand(data, callback) {
         utils.post(utils.api.payAnimalLand, data, (flag, value) => {
-            console.log("payAnimalLand", flag, value);
+            // console.log("payAnimalLand", flag, value);
             if (flag && 0 === value.code && value.flag) {
                 this.SetAnimalTimes(value.data.times);
                 if (callback)
@@ -1145,7 +1150,7 @@ cc.Class({
     onMultipleAnimalLand(data, callback) {
         console.log(data);
         utils.post(utils.api.multipleAnimalLand, data, (flag, value) => {
-            console.log("multipleAnimalLand", flag, value);
+            // console.log("multipleAnimalLand", flag, value);
             if (flag && 0 === value.code && value.flag) {
                 callback(value);
             } else {
@@ -1153,12 +1158,12 @@ cc.Class({
             }
         })
     },
-    
+
 
     //喂养动物
     onBuyAnimalFood(data, callback) {
         utils.post(utils.api.buyAnimalFood, data, (flag, value) => {
-            console.log("buyAnimalFood", flag, value);
+            // console.log("buyAnimalFood", flag, value);
             if (flag)
                 callback(value);
 
@@ -1196,9 +1201,10 @@ cc.Class({
                 this.unschedule(this.scheduleObj);
                 this.scheduleObj = null;
             }
-            this.scheduleObj = this.scheduleOnce(() => {
+            this.scheduleObj = () => {
                 this.toast.active = false
-            }, time);
+            };
+            this.scheduleOnce(this.scheduleObj, time);
             this.toast.active = true;
             this.toast.parent = parent;
             this.toast.zIndex = 999;

assets/Script/public/ManageUI.js

@@ -85,7 +85,7 @@ cc.Class({
 
     listUserInfoNode: cc.Node,
 
-    integralInfo:cc.Node,
+    integralInfo: cc.Node,
 
     //商店面的介绍模板
     mallContent_Name: cc.Label,
@@ -144,7 +144,7 @@ cc.Class({
     isShowTopButton: { default: false, visible: true, serializable: false },
   },
   onLoad() {
-    
+
   },
 
   isGame: function () {
@@ -223,7 +223,7 @@ cc.Class({
     this.onBindTiledMapTouchEnd();
   },
   Init() {
-    
+
     //如果用户未租赁过土地且未用钻石兑换过种子，则显示
     GlobalD.GameData.getPlayerExchangeState((res, value) => {
       //warn 这里需要增加对结果的判断
@@ -327,7 +327,7 @@ cc.Class({
       this.seedBottomSnbNode.active = true;
     }
   },
- 
+
   //收起全部菜单
   onHideMenu() {
     // if (this.BuildView) {
@@ -1168,7 +1168,7 @@ cc.Class({
     GlobalD.GameData.onGetDisasterProtected((value) => {
 
       if (0 === value.code) {
-        console.log("value:", value);
+        // console.log("value:", value);
         this.onRunProtected(value);
       }
 
@@ -1195,7 +1195,7 @@ cc.Class({
     GlobalD.GameData.onGetDisasterHistory((value) => {
       //warn 这里需要增加对结果的判断
       if (0 === value.code) {
-        console.log(value);
+        // console.log(value);
         let list = value.data;
         let showNatural = null, showBeast = null;
         //这里只显示两种类型灾难，不显示数量
@@ -1235,7 +1235,7 @@ cc.Class({
 
   onBindTiledMapTouchEnd() {
     //TiledMap_Touch_End
-    console.log("onBindTiledMapTouchEnd*********");
+    // console.log("onBindTiledMapTouchEnd*********");
     GlobalD.TiledMap.node.on('TiledMap_Touch_End', this.onResetUI, this);
 
   },
@@ -1248,15 +1248,19 @@ cc.Class({
       if (resetLandInfo.name == "Labour_205_Holy_Farmland") {
         let leaseFarmlandInfoScript = resetLandInfo.getComponent("LeaseFarmlandInfo");
         leaseFarmlandInfoScript.onSetInfoBoxActive(false);
-        //记录当前选中的buildInfo
-        GlobalD.game.onSetCurrentSelectLeaseLandInfo(null);
+     
       }
     }
-
+    this.onHideSelectLeaseLandInfo();
+  },
+  onHideSelectLeaseLandInfo() {
+    //记录当前选中的buildInfo
+    GlobalD.game.onSetCurrentSelectLeaseLandInfo(null);
     this.onHideShowToolsAnimation();
     this.onHideTopLabelAnimation();
     this.onHideTopButtonAnimation();
   },
+
   onSwitchHideUI() {
     this.onPlayShowToolsAnimation();
     this.onPlayTopLabelAnimation();

assets/resources.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "647c2ad9-8705-4549-9a7b-200e7bfcf42d",
+  "isBundle": true,
+  "bundleName": "resources",
+  "priority": 8,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

assets/resources/prefab.meta

@@ -0,0 +1,12 @@
+{
+  "ver": "1.1.2",
+  "uuid": "9f513a5d-2503-4238-b5d4-ea2e09ab3a57",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}