Merge branch 'TheHolyFarmer' of http://81.70.224.233:10080/yichael/FragrantTown into TheHolyFarmer

assets/Prefabs/NBuildings/Labour/Labour_205_Holy_Farmland.prefab

@@ -294,7 +294,7 @@
         "__id__": 14
       }
     ],
-    "_active": true,
+    "_active": false,
     "_level": 2,
     "_components": [],
     "_prefab": {
@@ -916,13 +916,13 @@
     "_position": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 0,
+      "y": -61.66,
       "z": 0
     },
     "_scale": {
       "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
+      "x": 0.8,
+      "y": 0.8,
       "z": 1
     },
     "_eulerAngles": {
@@ -2542,8 +2542,8 @@
     },
     "_scale": {
       "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
+      "x": 0.8,
+      "y": 0.8,
       "z": 1
     },
     "_eulerAngles": {

assets/Prefabs/NDressUp/Dress_503_WhiteWoodRailingX.prefab

@@ -296,9 +296,9 @@
     },
     "_scale": {
       "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
-      "z": 1
+      "x": 0.896,
+      "y": 0.896,
+      "z": 0.896
     },
     "_eulerAngles": {
       "__type__": "cc.Vec3",
@@ -494,7 +494,7 @@
     "id": 503,
     "occupyArea": {
       "__type__": "cc.Vec2",
-      "x": 2,
+      "x": 1,
       "y": 1
     },
     "startTilePos": {

assets/Prefabs/NDressUp/Dress_505_MainDoor01.prefab

@@ -0,0 +1,859 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "",
+    "_objFlags": 0,
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "asyncLoadAssets": false,
+    "readonly": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Dress_505_MainDoor01",
+    "_objFlags": 0,
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      },
+      {
+        "__id__": 5
+      },
+      {
+        "__id__": 8
+      },
+      {
+        "__id__": 11
+      },
+      {
+        "__id__": 14
+      },
+      {
+        "__id__": 16
+      },
+      {
+        "__id__": 19
+      }
+    ],
+    "_active": true,
+    "_level": 1,
+    "_components": [
+      {
+        "__id__": 22
+      }
+    ],
+    "_prefab": {
+      "__id__": 24
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 171,
+      "height": 150
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.51,
+      "y": 0.03
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": -553,
+      "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.Node",
+    "_name": "Tip",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_level": 2,
+    "_components": [
+      {
+        "__id__": 3
+      }
+    ],
+    "_prefab": {
+      "__id__": 4
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 165,
+      "height": 96
+    },
+    "_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.15,
+      "y": 1.15,
+      "z": 1.15
+    },
+    "_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__": 2
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "41b72dc7-bfdc-4365-92b1-31d1d986f1ce"
+    },
+    "_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__": "20440cb6-eb9e-4fcf-9378-4a8279259d9d"
+    },
+    "fileId": "366lZg7tdMYregovKqC+D2",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Tip copy",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": false,
+    "_level": 2,
+    "_components": [
+      {
+        "__id__": 6
+      }
+    ],
+    "_prefab": {
+      "__id__": 7
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 165,
+      "height": 96
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": -95.12,
+      "y": 53.984,
+      "z": 0
+    },
+    "_scale": {
+      "__type__": "cc.Vec3",
+      "x": 1.15,
+      "y": 1.15,
+      "z": 1.15
+    },
+    "_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__": 5
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "41b72dc7-bfdc-4365-92b1-31d1d986f1ce"
+    },
+    "_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__": "20440cb6-eb9e-4fcf-9378-4a8279259d9d"
+    },
+    "fileId": "7338YtnohN4qhzcmSM8UBC",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Tip copy",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": false,
+    "_level": 2,
+    "_components": [
+      {
+        "__id__": 9
+      }
+    ],
+    "_prefab": {
+      "__id__": 10
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 165,
+      "height": 96
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": -189.62,
+      "y": 109.634,
+      "z": 0
+    },
+    "_scale": {
+      "__type__": "cc.Vec3",
+      "x": 1.15,
+      "y": 1.15,
+      "z": 1.15
+    },
+    "_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__": "41b72dc7-bfdc-4365-92b1-31d1d986f1ce"
+    },
+    "_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__": "20440cb6-eb9e-4fcf-9378-4a8279259d9d"
+    },
+    "fileId": "9atMjCashCc5W6rMu8+fCH",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Tip copy",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": false,
+    "_level": 2,
+    "_components": [
+      {
+        "__id__": 12
+      }
+    ],
+    "_prefab": {
+      "__id__": 13
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 165,
+      "height": 96
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": -283.07,
+      "y": 165.284,
+      "z": 0
+    },
+    "_scale": {
+      "__type__": "cc.Vec3",
+      "x": 1.15,
+      "y": 1.15,
+      "z": 1.15
+    },
+    "_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__": 11
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "41b72dc7-bfdc-4365-92b1-31d1d986f1ce"
+    },
+    "_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__": "20440cb6-eb9e-4fcf-9378-4a8279259d9d"
+    },
+    "fileId": "71Uu+T0upNLLslX1osXXzm",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Draw",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_level": 4,
+    "_components": [],
+    "_prefab": {
+      "__id__": 15
+    },
+    "_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,
+      "y": 0
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": 0.1,
+      "y": 48,
+      "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.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "20440cb6-eb9e-4fcf-9378-4a8279259d9d"
+    },
+    "fileId": "df7wFcxZhAkowinIVh+mHd",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "main_door_01",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_level": 2,
+    "_components": [
+      {
+        "__id__": 17
+      }
+    ],
+    "_prefab": {
+      "__id__": 18
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 187,
+      "height": 231
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": -136.058,
+      "y": 206.305,
+      "z": 0
+    },
+    "_scale": {
+      "__type__": "cc.Vec3",
+      "x": -2,
+      "y": 2,
+      "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__": 16
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "176fc165-d3fb-402d-8cb4-e675b7b1b0bb"
+    },
+    "_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__": "20440cb6-eb9e-4fcf-9378-4a8279259d9d"
+    },
+    "fileId": "9ectJipKlFlL39u8p+BH9d",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Title",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_level": 4,
+    "_components": [
+      {
+        "__id__": 20
+      }
+    ],
+    "_prefab": {
+      "__id__": 21
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 97.87,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": -36,
+      "y": 425.7,
+      "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.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 19
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_useOriginalSize": false,
+    "_string": "Label",
+    "_N$string": "Label",
+    "_fontSize": 40,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_N$horizontalAlign": 1,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "20440cb6-eb9e-4fcf-9378-4a8279259d9d"
+    },
+    "fileId": "efmV/EkbJMkLxXXnDtjGM2",
+    "sync": false
+  },
+  {
+    "__type__": "665c9OT2R1OgqpO6W6onlaQ",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "title": {
+      "__id__": 20
+    },
+    "buildInfo": {
+      "__id__": 23
+    },
+    "buildZone": {
+      "__id__": 14
+    },
+    "_canBuild": false,
+    "InitPosFromStore": false,
+    "InitPos": true,
+    "InitStartPos": {
+      "__type__": "cc.Vec2",
+      "x": 12,
+      "y": 31
+    },
+    "InitBuildingInfo": false,
+    "ShowTip": null,
+    "ShowTipString": "",
+    "InitWorkBuildingInfo": false,
+    "InitWorkBuildingIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "BuildInfo",
+    "buildType": 8,
+    "id": 505,
+    "occupyArea": {
+      "__type__": "cc.Vec2",
+      "x": 4,
+      "y": 1
+    },
+    "startTilePos": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "isItActive": false,
+    "isItOccupied": false,
+    "occupantPlayerInfo": null,
+    "isThereAnItem": false,
+    "isItSaleable": false,
+    "isItStopOperation": false,
+    "buildingName": "花圃",
+    "BuildingPrefabName": "Dress_505_FlowerBed",
+    "EnglishName": "Dress_505_FlowerBed",
+    "BuildingSynopsis": "装饰品",
+    "BuildingSprite": null,
+    "RunningCost": 0,
+    "consumeStrength": 0,
+    "totalConsumption": 0,
+    "totalInventory": 0,
+    "goodsArray": [],
+    "_goods": null,
+    "_inventory": 0,
+    "_targetBuildingsInfo": null,
+    "_gotoPosistion": [],
+    "specialSetValue": 10,
+    "consumeStrengthAddValue": 0,
+    "goodsPriceAddValue": 0,
+    "AssetValue": 0
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "20440cb6-eb9e-4fcf-9378-4a8279259d9d"
+    },
+    "fileId": "35TtlrzOtJWJ2C2F+sJ2Ej",
+    "sync": false
+  }
+]

assets/Prefabs/NDressUp/Dress_505_MainDoor01.prefab.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "1.2.1",
+  "uuid": "20440cb6-eb9e-4fcf-9378-4a8279259d9d",
+  "optimizationPolicy": "AUTO",
+  "asyncLoadAssets": false,
+  "readonly": false,
+  "subMetas": {}
+}

assets/Scene/MyCityScene - 004.fire

@@ -135410,6 +135410,9 @@
       },
       {
         "__uuid__": "78c249f6-2ac6-4959-a3b0-4e0eaf9820b8"
+      },
+      {
+        "__uuid__": "20440cb6-eb9e-4fcf-9378-4a8279259d9d"
       }
     ],
     "_id": "74KdLGIIRPWK7A6h7BZEga"

assets/Script/Lease/LeaseInfo.js

@@ -246,10 +246,10 @@ cc.Class({
     },
 
     onClose() {
-        if (this.AutoGetLandData) {
-            this.unschedule(this.AutoGetLandData);
-            this.AutoGetLandData = null;
-        }
+        // if (this.AutoGetLandData) {
+        //     this.unschedule(this.AutoGetLandData);
+        //     this.AutoGetLandData = null;
+        // }
         this.node.destroy();
     },
     onDestroy() {

assets/Script/UI/ManageBuildings.js

@@ -373,12 +373,13 @@ cc.Class({
         this.spawnConfigLand();
 
         /**
+         * todo 之类初始化场景障碍物操作，如果不需要直接注释即可。
          * 村长和镇长
          * 初始化障碍物场景，装饰
          */
-        if(0 != GlobalD.Dapp.UserInfo.agent_level){
-            this.spawnDressUp();
-        }
+        // if(0 != GlobalD.Dapp.UserInfo.agent_level){
+        //     this.spawnDressUp();
+        // }
 
         //先初始化网络数据
         this.SpawnHouse();
@@ -542,7 +543,11 @@ cc.Class({
 
     },
 
-    //初始化障碍物
+   
+    /**
+     * 初始化障碍物
+     * 生成的预制信息，需要在 DressUpArray 添加对应的预制件，才可以添加
+     */
     spawnDressUp() {
         //村长和镇长的区别，樱花树区别
     
@@ -554,6 +559,11 @@ cc.Class({
                 spawnName: "Dress_502_ChrisTree",
                 startPos: cc.v2(14, 20)
             },
+            //拱门
+            {
+                spawnName: "Dress_505_MainDoor01",
+                startPos: cc.v2(18, 17)
+            },
             {
                 spawnName: "Dress_503_RailingGrassX",
                 startPos: cc.v2(9, 20)
@@ -614,77 +624,77 @@ cc.Class({
 
         ];
         //左边小麦区域
-        for (let x = 0; x < 3; x++) {
-            for (let y = 0; y < 2; y++) {
-                _temp.push({
-                    spawnName: "Dress_502_Rice",
-                    startPos: cc.v2(4 - x * 2, 30 - y * 2)
-                })
-            }
-        }
+        // for (let x = 0; x < 3; x++) {
+        //     for (let y = 0; y < 2; y++) {
+        //         _temp.push({
+        //             spawnName: "Dress_502_Rice",
+        //             startPos: cc.v2(4 - x * 2, 30 - y * 2)
+        //         })
+        //     }
+        // }
 
 
         //1倍土地部分木质花圃
-        for (let x = 0; x < 6; x++) {
-            for (let y = 0; y < 3; y++) {
-                _temp.push({
-                    spawnName: "Dress_503_WhiteWoodRailingX",
-                    startPos: cc.v2(18 + x, 14 - y * 3)
-                })
-            }
-        }
+        // for (let x = 0; x < 6; x++) {
+        //     for (let y = 0; y < 3; y++) {
+        //         _temp.push({
+        //             spawnName: "Dress_503_WhiteWoodRailingX",
+        //             startPos: cc.v2(18 + x, 14 - y * 3)
+        //         })
+        //     }
+        // }
         //生成一个未盛开的樱花围绕，间隔1个空格 ---start  ，镇长换成盛开的樱花
-        for (let x = 0; x < 3; x++) {
-            _temp.push({
-                spawnName: _cherryTree,
-                startPos: cc.v2(18 + x * 2, 17)
-            })
-            _temp.push({
-                spawnName: _cherryTree,
-                startPos: cc.v2(18 + x * 2, 5)
-            })
-        }
-        for (let y = 0; y < 7; y++) {
-            _temp.push({
-                spawnName: _cherryTree,
-                startPos: cc.v2(24, 17 - y * 2)
-            })
-
-        }
+        // for (let x = 0; x < 3; x++) {
+        //     _temp.push({
+        //         spawnName: _cherryTree,
+        //         startPos: cc.v2(18 + x * 2, 17)
+        //     })
+        //     _temp.push({
+        //         spawnName: _cherryTree,
+        //         startPos: cc.v2(18 + x * 2, 5)
+        //     })
+        // }
+        // for (let y = 0; y < 7; y++) {
+        //     _temp.push({
+        //         spawnName: _cherryTree,
+        //         startPos: cc.v2(24, 17 - y * 2)
+        //     })
+
+        // }
         //多倍区域
-        for (let x = 0; x < 3; x++) {
-            _temp.push({
-                spawnName: _cherryTree,
-                startPos: cc.v2(15 - x * 2, 14)
-            })
-            _temp.push({
-                spawnName: _cherryTree,
-                startPos: cc.v2(15 - x * 2, 2)
-            })
-        }
+        // for (let x = 0; x < 3; x++) {
+        //     _temp.push({
+        //         spawnName: _cherryTree,
+        //         startPos: cc.v2(15 - x * 2, 14)
+        //     })
+        //     _temp.push({
+        //         spawnName: _cherryTree,
+        //         startPos: cc.v2(15 - x * 2, 2)
+        //     })
+        // }
        
         //生成一个未盛开的樱花围绕，间隔1个空格 --- end
        
 
         //多倍土地部分木质花圃
-        for (let x = 0; x < 3; x++) {
-            for (let y = 0; y < 3; y++) {
-                _temp.push({
-                    spawnName: "Dress_503_RailingGrassX",
-                    startPos: cc.v2(15 - x * 2, 11 - y * 3)
-                })
-            }
-        }
+        // for (let x = 0; x < 3; x++) {
+        //     for (let y = 0; y < 3; y++) {
+        //         _temp.push({
+        //             spawnName: "Dress_503_RailingGrassX",
+        //             startPos: cc.v2(15 - x * 2, 11 - y * 3)
+        //         })
+        //     }
+        // }
 
         //生成番茄区域
-        for (let x = 0; x < 3; x++) {
-            for (let y = 0; y < 2; y++) {
-                _temp.push({
-                    spawnName: "Dress_502_Tomato",
-                    startPos: cc.v2(26 + x * 2, 30 - y * 2)
-                })
-            }
-        }
+        // for (let x = 0; x < 3; x++) {
+        //     for (let y = 0; y < 2; y++) {
+        //         _temp.push({
+        //             spawnName: "Dress_502_Tomato",
+        //             startPos: cc.v2(26 + x * 2, 30 - y * 2)
+        //         })
+        //     }
+        // }
         
 
         //----中上别墅区域--start
@@ -745,7 +755,7 @@ cc.Class({
         }
 
         //樱花路
-        for (let x = 0; x < 6; x++) {
+        for (let x = 0; x < 5; x++) {
             _temp.push({
                 spawnName: _cherryTree,
                 startPos: cc.v2(10 - x * 2, 17)

assets/UI/NScene/DressUp/main_door_01.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "8888e0b4-fb49-4dc3-8470-2c8ac0e46f24",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "main_door_01": {
+      "ver": "1.0.4",
+      "uuid": "176fc165-d3fb-402d-8cb4-e675b7b1b0bb",
+      "rawTextureUuid": "8888e0b4-fb49-4dc3-8470-2c8ac0e46f24",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0.5,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 187,
+      "height": 231,
+      "rawWidth": 187,
+      "rawHeight": 232,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

doc/dapp-host.js

@@ -1,11 +1,11 @@
  //window.dappHost 全局的域名前缀，本地就直接用本地ip加端口，需要本地运行服务器文件
  //window.dappWss 此处连接websocket，目前可以不用配置
  //window.isTestNet 运行DApp时候，dapp-plugin.min 初始化的环境，true就是测试网，false就是正式网络
- window.dappHost = "http://192.168.0.109:26001";
- window.dappWss = "ws://192.168.0.109:26001/api_dapp/game_websocket/play_back/";
+ //window.dappHost = "http://192.168.0.109:26001";
+ //window.dappWss = "ws://192.168.0.109:26001/api_dapp/game_websocket/play_back/";
  window.isTestNet = true;
- //window.dappHost = "https://www.yuyekeji.cn";
- //window.dappWss = "wss://www.yuyekeji.cn/api_dapp/game_websocket/play_back/";
+ window.dappHost = "https://www.9527fun.cn";
+ window.dappWss = "wss://www.9527fun.cn/api_dapp/game_websocket/play_back/";
  
  /**这里就是线上服务器配置，走线上流程时候，这里开发注释*/
  //window.dappHost = "https://cnt.landownership.live";