1.添加灾难状态

assets/Prefabs/UI/lease/DisaterPanel.prefab

@@ -0,0 +1,1557 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "",
+    "_objFlags": 0,
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "asyncLoadAssets": false,
+    "readonly": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "DisaterPanel",
+    "_objFlags": 0,
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      },
+      {
+        "__id__": 6
+      },
+      {
+        "__id__": 9
+      },
+      {
+        "__id__": 40
+      }
+    ],
+    "_active": true,
+    "_level": 1,
+    "_components": [
+      {
+        "__id__": 43
+      }
+    ],
+    "_prefab": {
+      "__id__": 44
+    },
+    "_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
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_scale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Mask",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_level": 2,
+    "_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
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_scale": {
+      "__type__": "cc.Vec3",
+      "x": 1.331,
+      "y": 1.331,
+      "z": 1.331
+    },
+    "_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__": "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__": "92647753-9d01-4118-af2c-e89a66fc4a91"
+    },
+    "fileId": "c6D93LE15K5LWW6oSaWH6O",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "box-red",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_level": 2,
+    "_components": [
+      {
+        "__id__": 7
+      }
+    ],
+    "_prefab": {
+      "__id__": 8
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 610,
+      "height": 2666
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": -348.915,
+      "y": 0,
+      "z": 0
+    },
+    "_scale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 6
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "aa7a7de1-881f-4b3d-bfc6-d55ba07a4db3"
+    },
+    "_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__": "92647753-9d01-4118-af2c-e89a66fc4a91"
+    },
+    "fileId": "33NmUWqA5Hurx3H7aZZY53",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "BG",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [
+      {
+        "__id__": 10
+      },
+      {
+        "__id__": 13
+      },
+      {
+        "__id__": 16
+      },
+      {
+        "__id__": 22
+      },
+      {
+        "__id__": 25
+      },
+      {
+        "__id__": 28
+      }
+    ],
+    "_active": true,
+    "_level": 6,
+    "_components": [],
+    "_prefab": {
+      "__id__": 39
+    },
+    "_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
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_scale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "DiamondExchangeBg1",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 9
+    },
+    "_children": [],
+    "_active": true,
+    "_level": 7,
+    "_components": [
+      {
+        "__id__": 11
+      }
+    ],
+    "_prefab": {
+      "__id__": 12
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 675,
+      "height": 492
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_scale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 10
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "2063e561-a0c7-4106-8df3-01df7554777e"
+    },
+    "_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__": "92647753-9d01-4118-af2c-e89a66fc4a91"
+    },
+    "fileId": "79egJQtM5OnojCvw2lysTS",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "DiamondExchangeBg2",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 9
+    },
+    "_children": [],
+    "_active": true,
+    "_level": 7,
+    "_components": [
+      {
+        "__id__": 14
+      }
+    ],
+    "_prefab": {
+      "__id__": 15
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 558,
+      "height": 339
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 40.582,
+      "z": 0
+    },
+    "_scale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 13
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "ac6bed28-f031-46a9-a3a2-5b7b7a6f922c"
+    },
+    "_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__": "92647753-9d01-4118-af2c-e89a66fc4a91"
+    },
+    "fileId": "dfGhUJ2bBPHbW1rNL1fYmX",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "listTitle",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 9
+    },
+    "_children": [
+      {
+        "__id__": 17
+      }
+    ],
+    "_active": true,
+    "_level": 7,
+    "_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": 376,
+      "height": 126
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": 4.04,
+      "y": 223.569,
+      "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": "text_title",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 16
+    },
+    "_children": [],
+    "_active": true,
+    "_level": 8,
+    "_components": [
+      {
+        "__id__": 18
+      }
+    ],
+    "_prefab": {
+      "__id__": 19
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 216,
+      "height": 63
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 5.387,
+      "z": 0
+    },
+    "_scale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 17
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "20a6c06c-838a-4348-ba61-521c267caf97"
+    },
+    "_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__": "92647753-9d01-4118-af2c-e89a66fc4a91"
+    },
+    "fileId": "71nRPLkvpN1bkfp1+Huga/",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 16
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "7b8aa6f7-e7bb-4978-ba2e-51959101b4c3"
+    },
+    "_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__": "92647753-9d01-4118-af2c-e89a66fc4a91"
+    },
+    "fileId": "1fPu+m8opJ/o6FVW2fbuj1",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "disater_natural",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 9
+    },
+    "_children": [],
+    "_active": true,
+    "_level": 7,
+    "_components": [
+      {
+        "__id__": 23
+      }
+    ],
+    "_prefab": {
+      "__id__": 24
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 857,
+      "height": 669
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": 4.04,
+      "y": 65.993,
+      "z": 0
+    },
+    "_scale": {
+      "__type__": "cc.Vec3",
+      "x": 0.3,
+      "y": 0.3,
+      "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__": 22
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "cb28a53b-e30b-4c95-a44c-5053c68910a9"
+    },
+    "_type": 1,
+    "_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__": "92647753-9d01-4118-af2c-e89a66fc4a91"
+    },
+    "fileId": "47J/PCuThGIY7pkLYHEkWC",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "disater_tip",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 9
+    },
+    "_children": [],
+    "_active": true,
+    "_level": 7,
+    "_components": [
+      {
+        "__id__": 26
+      }
+    ],
+    "_prefab": {
+      "__id__": 27
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 140,
+      "g": 70,
+      "b": 28,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 315.05,
+      "height": 44.1
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": -53.872,
+      "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__": 25
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_useOriginalSize": false,
+    "_string": "遭遇暴风，减产50%",
+    "_N$string": "遭遇暴风，减产50%",
+    "_fontSize": 35,
+    "_lineHeight": 35,
+    "_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__": "92647753-9d01-4118-af2c-e89a66fc4a91"
+    },
+    "fileId": "3d9wkBPP5HZJxJHgaz8SDZ",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "button",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 9
+    },
+    "_children": [
+      {
+        "__id__": 29
+      }
+    ],
+    "_active": true,
+    "_level": 7,
+    "_components": [
+      {
+        "__id__": 36
+      }
+    ],
+    "_prefab": {
+      "__id__": 38
+    },
+    "_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
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": -124.699,
+      "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": "Background",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 28
+    },
+    "_children": [
+      {
+        "__id__": 30
+      }
+    ],
+    "_active": true,
+    "_level": 2,
+    "_components": [
+      {
+        "__id__": 33
+      },
+      {
+        "__id__": 34
+      }
+    ],
+    "_prefab": {
+      "__id__": 35
+    },
+    "_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
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_scale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "Label",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 29
+    },
+    "_children": [],
+    "_active": true,
+    "_level": 3,
+    "_components": [
+      {
+        "__id__": 31
+      }
+    ],
+    "_prefab": {
+      "__id__": 32
+    },
+    "_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
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_scale": {
+      "__type__": "cc.Vec3",
+      "x": 1,
+      "y": 1,
+      "z": 1
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 30
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_useOriginalSize": false,
+    "_string": "",
+    "_N$string": "",
+    "_fontSize": 20,
+    "_lineHeight": 40,
+    "_enableWrapText": false,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_N$horizontalAlign": 1,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 1,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "92647753-9d01-4118-af2c-e89a66fc4a91"
+    },
+    "fileId": "96KhHZI4NLpJfQLOHj8sP3",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 29
+    },
+    "_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__": 29
+    },
+    "_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__": "92647753-9d01-4118-af2c-e89a66fc4a91"
+    },
+    "fileId": "3fxBlbX8FCs54i81TBqZ3s",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Button",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 28
+    },
+    "_enabled": true,
+    "duration": 0.1,
+    "zoomScale": 0.8,
+    "clickEvents": [
+      {
+        "__id__": 37
+      }
+    ],
+    "_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__": 29
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.ClickEvent",
+    "target": {
+      "__id__": 1
+    },
+    "component": "",
+    "_componentId": "2d0deIkpIxGZJgDGYejqY0s",
+    "handler": "onClose",
+    "customEventData": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "92647753-9d01-4118-af2c-e89a66fc4a91"
+    },
+    "fileId": "38MmBi4r1KU6t98X0FIwu4",
+    "sync": false
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "92647753-9d01-4118-af2c-e89a66fc4a91"
+    },
+    "fileId": "451Y0R4WRMjqIHF30FJOis",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "box-red",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_level": 2,
+    "_components": [
+      {
+        "__id__": 41
+      }
+    ],
+    "_prefab": {
+      "__id__": 42
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 610,
+      "height": 2666
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": 348.915,
+      "y": 0,
+      "z": 0
+    },
+    "_scale": {
+      "__type__": "cc.Vec3",
+      "x": -1,
+      "y": 1,
+      "z": 1
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 40
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "aa7a7de1-881f-4b3d-bfc6-d55ba07a4db3"
+    },
+    "_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__": "92647753-9d01-4118-af2c-e89a66fc4a91"
+    },
+    "fileId": "e5gHoFx7VL2rLABYbQIrRZ",
+    "sync": false
+  },
+  {
+    "__type__": "2d0deIkpIxGZJgDGYejqY0s",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "beastTitle": {
+      "__uuid__": "deb510a6-1504-4f0e-a02a-27c30737c1e1"
+    },
+    "beastIcon": {
+      "__uuid__": "a308318c-dc43-4fa5-b635-e4a4c4432b5e"
+    },
+    "beastTip": "野兽侵袭，产量减少50%",
+    "currentTitle": {
+      "__id__": 18
+    },
+    "currentIcon": {
+      "__id__": 23
+    },
+    "currentTip": {
+      "__id__": 26
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "92647753-9d01-4118-af2c-e89a66fc4a91"
+    },
+    "fileId": "85g0D4PO5BHrW+IrTKqTtn",
+    "sync": false
+  }
+]

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

@@ -0,0 +1,8 @@
+{
+  "ver": "1.2.1",
+  "uuid": "92647753-9d01-4118-af2c-e89a66fc4a91",
+  "optimizationPolicy": "AUTO",
+  "asyncLoadAssets": false,
+  "readonly": false,
+  "subMetas": {}
+}

assets/Prefabs/UI/listInfo/applyListInfoItem.prefab

@@ -24,18 +24,18 @@
         "__id__": 5
       },
       {
-        "__id__": 14
+        "__id__": 15
       }
     ],
     "_active": true,
     "_level": 1,
     "_components": [
       {
-        "__id__": 25
+        "__id__": 23
       }
     ],
     "_prefab": {
-      "__id__": 26
+      "__id__": 24
     },
     "_opacity": 255,
     "_color": {
@@ -48,7 +48,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 511,
-      "height": 143
+      "height": 100
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -108,7 +108,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 511,
-      "height": 143
+      "height": 100
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -194,14 +194,14 @@
         "__id__": 6
       },
       {
-        "__id__": 9
+        "__id__": 10
       }
     ],
     "_active": true,
     "_level": 1,
     "_components": [],
     "_prefab": {
-      "__id__": 13
+      "__id__": 14
     },
     "_opacity": 255,
     "_color": {
@@ -224,7 +224,7 @@
     "_position": {
       "__type__": "cc.Vec3",
       "x": 49,
-      "y": -40.995,
+      "y": -26.995,
       "z": 0
     },
     "_scale": {
@@ -258,10 +258,13 @@
     "_components": [
       {
         "__id__": 7
+      },
+      {
+        "__id__": 8
       }
     ],
     "_prefab": {
-      "__id__": 8
+      "__id__": 9
     },
     "_opacity": 255,
     "_color": {
@@ -273,8 +276,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 122.25,
-      "height": 50.4
+      "width": 93.68,
+      "height": 39.8
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -321,8 +324,8 @@
     "_useOriginalSize": false,
     "_string": "SNB：",
     "_N$string": "SNB：",
-    "_fontSize": 40,
-    "_lineHeight": 40,
+    "_fontSize": 30,
+    "_lineHeight": 30,
     "_enableWrapText": true,
     "_N$file": null,
     "_isSystemFontUsed": true,
@@ -335,6 +338,24 @@
     "_N$cacheMode": 0,
     "_id": ""
   },
+  {
+    "__type__": "cc.LabelOutline",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 6
+    },
+    "_enabled": true,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 140,
+      "g": 90,
+      "b": 28,
+      "a": 255
+    },
+    "_width": 1,
+    "_id": ""
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -358,14 +379,14 @@
     "_level": 2,
     "_components": [
       {
-        "__id__": 10
+        "__id__": 11
       },
       {
-        "__id__": 11
+        "__id__": 12
       }
     ],
     "_prefab": {
-      "__id__": 12
+      "__id__": 13
     },
     "_opacity": 255,
     "_color": {
@@ -378,7 +399,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 200,
-      "height": 31.240000000000002
+      "height": 38.8
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -387,8 +408,8 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": 88.965,
-      "y": -13.663,
+      "x": 71.965,
+      "y": 0,
       "z": 0
     },
     "_scale": {
@@ -414,7 +435,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 9
+      "__id__": 10
     },
     "_enabled": true,
     "_materials": [
@@ -425,8 +446,8 @@
     "_useOriginalSize": false,
     "_string": "1",
     "_N$string": "1",
-    "_fontSize": 24,
-    "_lineHeight": 24,
+    "_fontSize": 30,
+    "_lineHeight": 30,
     "_enableWrapText": true,
     "_N$file": null,
     "_isSystemFontUsed": true,
@@ -444,7 +465,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 9
+      "__id__": 10
     },
     "_enabled": true,
     "_color": {
@@ -488,18 +509,18 @@
     },
     "_children": [
       {
-        "__id__": 15
+        "__id__": 16
       }
     ],
     "_active": false,
     "_level": 2,
     "_components": [
       {
-        "__id__": 22
+        "__id__": 20
       }
     ],
     "_prefab": {
-      "__id__": 24
+      "__id__": 22
     },
     "_opacity": 255,
     "_color": {
@@ -521,8 +542,8 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": 415.944,
-      "y": -70,
+      "x": 410.944,
+      "y": -54,
       "z": 0
     },
     "_scale": {
@@ -548,25 +569,21 @@
     "_name": "Background",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 14
+      "__id__": 15
     },
-    "_children": [
-      {
-        "__id__": 16
-      }
-    ],
+    "_children": [],
     "_active": true,
     "_level": 2,
     "_components": [
       {
-        "__id__": 19
+        "__id__": 17
       },
       {
-        "__id__": 20
+        "__id__": 18
       }
     ],
     "_prefab": {
-      "__id__": 21
+      "__id__": 19
     },
     "_opacity": 255,
     "_color": {
@@ -610,113 +627,12 @@
     "groupIndex": 0,
     "_id": ""
   },
-  {
-    "__type__": "cc.Node",
-    "_name": "New Label",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 15
-    },
-    "_children": [],
-    "_active": true,
-    "_level": 3,
-    "_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": 100.02,
-      "height": 37.8
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_position": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 3.999,
-      "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__": 16
-    },
-    "_enabled": true,
-    "_materials": [
-      {
-        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
-      }
-    ],
-    "_useOriginalSize": false,
-    "_string": "兑换cnt",
-    "_N$string": "兑换cnt",
-    "_fontSize": 30,
-    "_lineHeight": 30,
-    "_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__": "3bc6c259-3596-4ea0-8d0f-c488cf8759e0"
-    },
-    "fileId": "68HhOEA2tH55QdnB2+SyOL",
-    "sync": false
-  },
   {
     "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 15
+      "__id__": 16
     },
     "_enabled": true,
     "_materials": [
@@ -727,7 +643,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "71646e31-40ce-4f00-ba88-8e6e636b3017"
+      "__uuid__": "bf583da9-976a-4a96-ab50-5dd2b17b2baf"
     },
     "_type": 1,
     "_sizeMode": 0,
@@ -748,7 +664,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 15
+      "__id__": 16
     },
     "_enabled": true,
     "alignMode": 0,
@@ -786,14 +702,14 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 14
+      "__id__": 15
     },
     "_enabled": true,
     "duration": 0.1,
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 23
+        "__id__": 21
       }
     ],
     "_N$interactable": true,
@@ -861,7 +777,7 @@
       "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
     },
     "_N$target": {
-      "__id__": 15
+      "__id__": 16
     },
     "_id": ""
   },
@@ -895,11 +811,12 @@
     },
     "_enabled": true,
     "snbAmount": {
-      "__id__": 10
+      "__id__": 11
     },
     "applyButton": {
-      "__id__": 14
+      "__id__": 15
     },
+    "parentScript": null,
     "_id": ""
   },
   {

assets/Script/Lease/disaterPanel.js

@@ -0,0 +1,59 @@
+cc.Class({
+    extends: cc.Component,
+
+    properties: {
+        beastTitle: {
+            default: null,
+            type: cc.SpriteFrame,
+            serializable: true,
+        },
+        beastIcon: {
+            default: null,
+            type: cc.SpriteFrame,
+            serializable: true,
+        },
+        beastTip: {
+            default: '野兽侵袭，产量减少50%',
+            serializable: true,
+        },
+
+
+        currentTitle: {
+            default: null,
+            type: cc.Sprite,
+            serializable: true,
+        },
+        currentIcon: {
+            default: null,
+            type: cc.Sprite,
+            serializable: true,
+        },
+        currentTip: {
+            default: null,
+            type: cc.Label,
+            serializable: true,
+        },
+    },
+
+    // LIFE-CYCLE CALLBACKS:
+
+    // onLoad () {},
+
+    // start () {
+
+    // },
+    onSetDisaterInfo(disaterType,damage){
+
+        if(disaterType == 3){
+            this.currentTitle.spriteFrame = this.beastTitle;
+            this.currentIcon.spriteFrame = this.beastIcon;
+            this.currentTip.string = "野兽侵袭，产量减少" +damage+ "%";
+
+        }else if(disaterType == 2){
+            this.currentTip.string = "遭遇风暴，产量减少" +damage+ "%";
+        }
+    },
+    onClose(){
+        this.node.destroy();
+    }
+});

assets/Script/Lease/disaterPanel.js.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.5",
+  "uuid": "2d0de224-a48c-4664-9803-1987a3a98d2c",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/Script/Network/dapp.js

@@ -1,5 +1,5 @@
 
-import gameToast from "../Network/gameToast"
+// import gameToast from "../Network/gameToast"
 import utils from "../Network/netUtils";
 cc.Class({
     extends: cc.Component,
@@ -77,9 +77,10 @@ cc.Class({
                     //     "signature": "0x09fda37fcad4a9bb7b72f652323881a33847be3a44e4403c7a576b3383df30ec6e5e256f28fbdbac5eb0642f304f331783f36d70b5e6fd576818bc42e14624191c", // 签名文本
                     //     "timestamp": 1641279989 // 签名时间戳，需要在1分钟内完成验签，否则本次签名失效
                     // };
-                    console.log("loginTokenAndVerification========>", new Date());
+                    // console.log("loginTokenAndVerification========>", new Date());
                     utils.post(utils.api.loginTokenAndVerification, dappLoginData, (flag, value) => {
-                        console.log("loginTokenAndVerification========>", value, new Date());
+                        // console.log("loginTokenAndVerification========>", value, new Date());
+                        console.log(value.data.token)
                         if (flag && 0 === value.code) {
                             console.log("login pass1:" + flag + '-' + value.code + '-' + value.msg);
                             /** 登录成功获取token */
@@ -129,6 +130,14 @@ cc.Class({
                                                 });
                                                
                                             } else {
+                                                cc.loader.loadRes("prefab/gameToast", (err, texture) => {
+                                                    let _pause = cc.instantiate(texture);
+                                                    let _uiCamera = cc.find("Canvas/MainCamera");
+                                                    _pause.parent = _uiCamera ? _uiCamera : cc.find("Canvas");
+                                                    _pause.zIndex = 999;
+                                                    let DetailLabel = _pause.getChildByName('DetailLabel');
+                                                    DetailLabel.getComponent(cc.Label).string =  value.msg;
+                                                });
                                                 console.warn("读取到用户的土地错误？");
                                             }
                                         })

assets/Script/Network/netUtils.ts

@@ -39,9 +39,9 @@ var utils = {
         //获取游戏config土地列表
         landConfig: 'configLand/getList',
         //获取用户已经租赁的土地
-        userLandList: 'comPlayerLand/getList',
+        userLandList: 'comPlayerLand/getList', /*** disater  dapp 调用，不用显示ui*/
         //获取用户土地信息和一个租赁状态
-        userLandAndCanStealList: 'comPlayerLand/getCanStealDetailList',
+        userLandAndCanStealList: 'comPlayerLand/getCanStealDetailList', /*** disater 对方玩家，不用显示ui*/
         //获取用户可以偷取的列表信息
         canStealUserList: 'comPlayerLand/getCanStealUserList',
 
@@ -50,12 +50,14 @@ var utils = {
          */
         //灾难接口
         disasterHistory:'comPlayerLand/getDisasterHistory',
+        //获取防护装备
+        getDisasterProtectedMap:'comPlayerLand/getDisasterMap',
 
 
         //获取土地信息
         landState: 'comPlayerLand/getState',
         //种植
-        plant: 'comPlayerLand/plant',
+        plant: 'comPlayerLand/plant', /*** disater 种植完后，直接处理一个初始灾难*/
         //种子
         mallSeed: 'comMallSeed/getMallSeed',
         /**
@@ -111,6 +113,8 @@ var utils = {
         getSnbApplyPage:'comSnbApply/getPage',
         //提交申请
         applySnbToCnt:'comSnbApply/applySnbToCnt',
+        //校验申请
+        checkApplySnbToCnt:'comSnbApply/checkApplySnbToCnt'
         
     },
     /** 登录获取的token */

assets/Script/UI/ManageSeedNode.js

@@ -208,6 +208,9 @@ cc.Class({
                 //把种子的信息存储到当前的土地 plantInfo 上;
                 _leaseFarmlandInfo.setLeaseLandInfo(value.data,true);
 
+                //刷新当前灾难ui
+                GlobalD.game._ManageUIScript.onShowDisater();
+
                 //开始种植，给一个初始的状态
                 // this.targetBuildingsInfo.onInitHolyFarmlandSeedFromGrow(1, this.fruitSpriteFrame);
 

assets/Script/UI/StoreView.js

@@ -1,3 +1,5 @@
+import date from "../Unit/date.js"
+
 cc.Class({
   extends: cc.Component,
 
@@ -125,6 +127,8 @@ cc.Class({
     myWareHouseSeedList: null,
     //轮询种子列表状态
     AutoGetSeedsData: null,
+    //轮询防护包装备等
+    AutoGetEquipsData: null,
 
 
     seedsView: {
@@ -327,6 +331,8 @@ cc.Class({
         this.equipmentList[i].bgSpriteFrame = _equipScript.bgSprite.spriteFrame;
       }
     })
+
+
   },
   //切换建筑的面板
   onSwitchBuildingContent(event, index) {
@@ -458,7 +464,7 @@ cc.Class({
           '已提交申请，详情见申请列表兑换CNT。',
           2
         )
-      }else{
+      } else {
         GlobalD.GameData.showToast(
           cc.find('Canvas/UICamera'),
           value.msg,
@@ -801,85 +807,108 @@ cc.Class({
     console.log(
       '支付价格Cnt：' + this.equipmentList[this.buyEquipIndex].priceCnt + "，购买类型：" + this.equipmentList[this.buyEquipIndex].otherType
     )
-    return;
-    // if (this.isPlaying) {
-    //   GlobalD.GameData.showToast(cc.find('Canvas/UICamera'), '购买过快！', 1)
-    //   return
-    // }
-    // GlobalD.GameData.showToast(cc.find('Canvas/UICamera'), '支付处理中...', 10)
-    // this.isPlaying = true
-
-    // //购买防护包也要使用轮询
-    // let currentAmount = 0;
-
-    // for (let i = 0; i < this.myWareHouseSeedList.length; i++) {
-    //   if (
-    //     this.myWareHouseSeedList[i].id == this.mySeedList[this.buySeedIndex].id
-    //   ) {
-    //     currentAmount = this.myWareHouseSeedList[i].amount
-    //   }
-    // }
-    // //当前背包的数量
-    // console.log('currentAmount:', {
-    //   seedId: this.mySeedList[this.buySeedIndex].id,
-    //   currentAmount: currentAmount, //把当前背包的数据传进去
-    // })
-    // let playAmount =
-    //   this.playAmount * parseInt(this.mySeedList[this.buySeedIndex].priceCnt)
-    // if (0 === playAmount) {
-    //   GlobalD.GameData.showToast(
-    //     cc.find('Canvas/UICamera'),
-    //     '请输入购买数量',
-    //     1
-    //   )
-    //   return
-    // }
-    // GlobalD.GameData.payCNT(
-    //   playAmount,
-    //   4,
-    //   this.mySeedList[this.buySeedIndex].id + '',
-    //   (data) => {
-    //     const [err, tx] = data
-    //     // this.isPlaying = false;
-    //     if (err === null) {
-    //       // TODO 成功, 支付为链上操作，需要提供回调接口给这边服务端确认交易成功后修改购买订单结果
-    //       console.log(tx) // 交易hash，唯一标识符
-    //       //todo 种子
-    //       if (this.AutoGetSeedsData) {
-    //         this.unschedule(this.AutoGetSeedsData)
-    //         this.AutoGetSeedsData = null
-    //       }
-    //       this.AutoGetSeedsData = () => {
-    //         // getSeedCount ++;
-    //         GlobalD.GameData.onGetSeedState(
-    //           {
-    //             seedId: this.mySeedList[this.buySeedIndex].id,
-    //             currentAmount: currentAmount, //把当前背包的数据传进去
-    //           },
-    //           (value) => {
-    //             console.log('轮询种子:' + JSON.stringify(value))
-    //             if (0 === value.code) {
-    //               this.unschedule(this.AutoGetSeedsData)
-    //               console.log('轮询种子购买成功')
-    //               GlobalD.GameData.showToast(
-    //                 cc.find('Canvas/UICamera'),
-    //                 '种子购买成功！',
-    //                 1
-    //               )
-    //               // this.PayCNTPopView.active = false;
-    //               //直接重新初始化一下列表，
-    //               this.buildingViewScript.onUpdateList()
-    //             }
-    //           }
-    //         )
-    //       }
-    //       this.schedule(this.AutoGetSeedsData, 5)
-    //     } else {
-    //       console.log(err)
-    //       GlobalD.GameData.showToast(cc.find('Canvas/UICamera'), err, 2)
-    //     }
-    //   }
-    // )
+    if (!(this.equipmentList[this.buyEquipIndex].otherType == 2 || this.equipmentList[this.buyEquipIndex].otherType == 3)) return;
+
+    if (this.isPlaying) {
+      GlobalD.GameData.showToast(cc.find('Canvas/UICamera'), '购买过快！', 1)
+      return
+    }
+    GlobalD.GameData.showToast(cc.find('Canvas/UICamera'), '支付处理中...', 10)
+    this.isPlaying = true
+
+
+    let playAmount = this.equipmentList[this.buyEquipIndex].priceCnt
+    if (0 === playAmount) {
+      GlobalD.GameData.showToast(
+        cc.find('Canvas/UICamera'),
+        'CNT不能为0！',
+        1
+      )
+      return
+    }
+    GlobalD.GameData.payCNT(
+      playAmount,
+      this.equipmentList[this.buyEquipIndex].otherType,// payType
+      this.equipmentList[this.buyEquipIndex].id + '',
+      (data) => {
+        const [err, tx] = data
+        this.isPlaying = false;
+        if (err === null) {
+          // TODO 成功, 支付为链上操作，需要提供回调接口给这边服务端确认交易成功后修改购买订单结果
+          console.log(tx) // 交易hash，唯一标识符
+
+          //todo 轮询装备
+          if (this.AutoGetEquipsData) {
+            this.unschedule(this.AutoGetEquipsData)
+            this.AutoGetEquipsData = null
+          }
+          this.AutoGetEquipsData = () => {
+
+
+            GlobalD.GameData.onGetDisasterProtected((value) => {
+
+              if (0 === value.code) {
+                // console.log('轮询购买防护包:' + JSON.stringify(value))
+
+                let data = value.data;
+                if (this.equipmentList[this.buyEquipIndex].otherType == 2) {
+                  if (GlobalD.NaturalPack == null) {
+                    if (data.naturalProtected != null) {
+                      this.unschedule(this.AutoGetEquipsData)
+                      GlobalD.GameData.showToast(
+                        cc.find('Canvas/UICamera'),
+                        '购买自然防护包成功！',
+                        1
+                      )
+                      this.ManageUI.getComponent('ManageUI').onRunProtected(value);
+                    }
+                  } else if (!date.datesIsEqual(data.naturalProtected.protectTime, GlobalD.NaturalPack.protectTime)) {
+                    this.unschedule(this.AutoGetEquipsData)
+                    GlobalD.GameData.showToast(
+                      cc.find('Canvas/UICamera'),
+                      '增加自然防护包成功！',
+                      1
+                    )
+                    this.ManageUI.getComponent('ManageUI').onRunProtected(value);
+                  }
+
+                } else if (this.equipmentList[this.buyEquipIndex].otherType == 3) {
+                  if (GlobalD.BeastPack == null) {
+                    if (data.beastProtected != null) {
+                      this.unschedule(this.AutoGetEquipsData)
+                      GlobalD.GameData.showToast(
+                        cc.find('Canvas/UICamera'),
+                        '购买野兽防护包成功！',
+                        1
+                      )
+                      this.ManageUI.getComponent('ManageUI').onRunProtected(value);
+                    }
+                  } else if (!date.datesIsEqual(data.beastProtected.protectTime, GlobalD.BeastPack.protectTime)) {
+                    this.unschedule(this.AutoGetEquipsData)
+                    //如果时间不相等，叠加时间成功
+                    GlobalD.GameData.showToast(
+                      cc.find('Canvas/UICamera'),
+                      '增加野兽防护包成功！',
+                      1
+                    )
+                    this.ManageUI.getComponent('ManageUI').onRunProtected(value);
+                  }
+                } else {
+                  this.unschedule(this.AutoGetEquipsData)
+                }
+
+              }
+
+            })
+          }
+          this.schedule(this.AutoGetEquipsData, 5)
+
+        } else {
+          console.log(err)
+          GlobalD.GameData.showToast(cc.find('Canvas/UICamera'), err, 2)
+        }
+      }
+    )
   },
 
   onDestory() {

assets/Script/adpp/applyListInfo.js

@@ -139,7 +139,7 @@ cc.Class({
     },
     //刷新列表
     onRefreshEvent(e, data) {
-        console.log(e, data);
+        // console.log(e, data);
         this.loadList(data);
     },
     loadList(isState) {
@@ -147,7 +147,7 @@ cc.Class({
         this.bUpdateList = true;
         GlobalD.GameData.onGetSnbApplyPage(isState, 0, 10, (list) => {
             this.bUpdateList = false;
-            console.log(list)
+            // console.log(list)
             this.onShowUserList(list.rows);
         });
     },

assets/Script/adpp/applyListInfoItem.js

@@ -22,18 +22,21 @@ cc.Class({
             type: cc.Node,
             serializable: true,
         },
-        parentScript:{
-            default:null,
-            visible:false
-        }
+        parentScript: {
+            default: null,
+            visible: false
+        },
+        isTrans: false
     },
 
     setInfo(context) {
-        let { item , parentScript} = context;
+        let { item, parentScript } = context;
         this.applyItem = item;
         this.snbAmount.string = item.snb;
-        if(1 === item.isState){
+        if (1 === item.isState) {
             this.applyButton.active = true;
+        }else{
+            this.applyButton.active = false;
         }
         this.parentScript = parentScript;
 
@@ -60,13 +63,31 @@ cc.Class({
             )
             return
         }
-        console.log('发起兑换：' + Number(this.applyItem.snb))
-        GlobalD.GameData.onSnbToCnt(Number(this.applyItem.snb), (data) => {
-            //更新数据
-            // console.log('res=', data)
-            //更新审核列表
-            this.parentScript.onchildrenUpdate();
+        // console.log('发起兑换：' + Number(this.applyItem.snb));
+        console.log('this.applyItem', this.applyItem);
+        //todo 这里先判断一次，对应的snb是否是审查的snb凭证
+        if (this.isTrans) return;
+        GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "兑换中", 10);
+        this.isTrans = true;
+        GlobalD.GameData.onCheckApplySnbToCnt(this.applyItem.id, (checkRes) => {
+
+            this.isTrans = false;
+            if (0 === checkRes.code) {
+                console.log('发起兑换：' + Number(this.applyItem.snb),"== checkRes.data.snb：",checkRes.data.snb);
+                GlobalD.GameData.onSnbToCnt(checkRes.data.snb, (data) => {
+                    //更新数据
+                    // console.log('res=', data)
+                    //更新审核列表
+                    this.parentScript.onchildrenUpdate();
+                })
+            } else {
+                this.parentScript.onchildrenUpdate();
+                GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), checkRes.msg, 3);
+            }
+
         })
+
+
     }
 
 

assets/Script/public/GameData.js

@@ -1362,7 +1362,7 @@ cc.Class({
     /**
      * 支付cnt操作
      * @param {*} amount // 需支付金额
-     * @param {*} payType 支付类型，1购买土地租凭， 2自然灾害防护，3野兽防护
+     * @param {*} payType 支付类型，1购买土地租凭， 2自然灾害防护，3野兽防护, 4种子
      * @param {*} itemType 操作物品的id 字符串
      */
     payCNT(cntAmount, payType, itemType, callback) {
@@ -1378,15 +1378,11 @@ cc.Class({
         }
         if (GlobalD.GameData.GetCNT() < cntAmount) {
             console.log("cnt 不足，GetCNT：" + GlobalD.GameData.GetCNT() + "消费的cntAmount" + cntAmount);
-            GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "CNT不足！", 2, () => {
-                console.log("finish toast! CNT不足！");
-            });
+            this.showToast(cc.find("Canvas/UICamera"), "CNT不足！", 2);
             return;
         }
         this.isPlayingCnt = true;
-        GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "支付处理中...", 5, () => {
-            console.log("finish toast!支付处理中...");
-        });
+        this.showToast(cc.find("Canvas/UICamera"), "支付处理中...", 5);
 
         GlobalD.dapp.payCnt(cntAmount, payType, itemType).then((data) => {
             const [err, tx] = data;
@@ -1400,16 +1396,14 @@ cc.Class({
                     // console.log("更新cnt:" + cntBalance) // string, 精度18，需要自行处理省略几位小数
                     GlobalD.GameData.SetCNT(cntBalance);
                 });
-                GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "支付成功!", 5, () => {
-                    GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "区块确认中，请耐心等待！", 120);
+                this.showToast(cc.find("Canvas/UICamera"), "支付成功!", 5, () => {
+                    this.showToast(cc.find("Canvas/UICamera"), "区块确认中，请耐心等待！", 120);
                 });
 
 
             } else {
                 console.log(err)
-                GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), err, 2, () => {
-                    console.log("finish toast!");
-                });
+                GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), err, 2);
             }
 
             if (callback) {
@@ -1589,10 +1583,10 @@ cc.Class({
             this.showToast(cc.find("Canvas/UICamera"), "正在申请中..", 1);
             return;
         }
-        this.isExchangeSeed = true;
+        this.isApplying = true;
 
         utils.post(utils.api.applySnbToCnt, { applyAmount: applyAmount }, (flag, value) => {
-            this.isExchangeSeed = false;
+            this.isApplying = false;
             if (flag)
                 callback(value);
         })
@@ -1612,6 +1606,14 @@ cc.Class({
                 callback(value);
         })
     },
+    //校验snb凭证
+    onCheckApplySnbToCnt(certificateId,callback) {
+        utils.post(utils.api.checkApplySnbToCnt, {certificateId:certificateId}, (flag, value) => {
+            if (flag)
+                callback(value);
+        })
+    },
+
 
     //切换不同身份的场景，这里处理
     onSwitchAddressBg(_level) {
@@ -1629,6 +1631,25 @@ cc.Class({
 
     },
 
+    /**
+     * 获取灾难
+     */
+    onGetDisasterHistory(callback) {
+        utils.get(utils.api.disasterHistory, {}, (flag, value) => {
+            if (flag)
+                callback(value);
+        })
+    },
+    /**
+     * 获取灾难防护
+     * @param {*} callback 
+     */
+    onGetDisasterProtected(callback) {
+        utils.get(utils.api.getDisasterProtectedMap, {}, (flag, value) => {
+            if (flag)
+                callback(value);
+        })
+    },
 
 
     updateToast() {

assets/Script/public/Globals.js

@@ -44,6 +44,10 @@ window.GlobalD = {
     Dog:null,
     Stick:null,
 
+    //灾害和野兽防护包
+    NaturalPack:null,
+    BeastPack:null,
+
 
     /**
      * DApp 相关信息操作

assets/Script/public/ManageGolden.js

@@ -38,7 +38,7 @@ cc.Class({
   },
 
   formatPrice(price) {
-    return String(price).replace(/\B(?=(\d{3})+(?!\d))/g, ',');
+    return String(price).replace(/\d(?=(?:\d{3})+\b)/g, '$&,');
   },
 
   FormatMoney(s, n) {

assets/Script/public/ManageUI.js

@@ -126,7 +126,13 @@ cc.Class({
 
     //村长领取snb
     VillageReceivesSNBView: cc.Node,
-    VillageReceivesSNBButton: cc.Node
+    VillageReceivesSNBButton: cc.Node,
+
+    //灾害显示
+    disaterShowPrefab: cc.Prefab,
+
+    naturalButtonNode: cc.Node,
+    beastButtonNode: cc.Node,
   },
   onLoad() {
     cc.game.setFrameRate(30)
@@ -279,6 +285,12 @@ cc.Class({
 
     //显示背景
     this.surroundingBlack.active = true;
+
+    //显示灾难
+    this.onShowDisater();
+
+    //获取防护包
+    this.onUpdateProtectedState();
   },
   _setLockBuildingColor() {
     let BuildingStateArray = GlobalD.GameData.GetBuildingLockStateArray()
@@ -1279,7 +1291,7 @@ cc.Class({
     this.SNBlabel.getComponent(cc.Label).string = this.formatPrice(Num);
   },
   formatPrice(price) {
-    return String(price).replace(/\B(?=(\d{3})+(?!\d))/g, ',');
+    return String(price).replace(/\d(?=(?:\d{3})+\b)/g, '$&,');
   },
   FormatMoney(s, n) {
     n = n > 0 && n <= 20 ? n : 2
@@ -1396,5 +1408,88 @@ cc.Class({
     } else {
       GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "尚未购买打狗棒。", 1);
     }
-  }
+  },
+
+  onDetectNaturalPack() {
+    if (GlobalD.NaturalPack) {
+      GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "自然灾害防御时间：" + GlobalD.NaturalPack.protectTime, 2);
+    } else {
+      GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "尚未购买自然防护包。", 1);
+    }
+  },
+  onDetectBeastPack() {
+    if (GlobalD.BeastPack) {
+      GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "野兽灾害防御时间：" + GlobalD.BeastPack.protectTime, 2);
+    } else {
+      GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "尚未购买野兽防护包", 1);
+    }
+  },
+  /**
+   * 刷新购买状态
+   */
+  onUpdateProtectedState() {
+    //获取防护状态
+    GlobalD.GameData.onGetDisasterProtected((value) => {
+
+      if (0 === value.code) {
+        console.log("value:", value);
+        this.onRunProtected(value);
+      }
+
+    })
+  },
+
+  onRunProtected(value) {
+    GlobalD.NaturalPack = value.data.naturalProtected;
+    if (GlobalD.NaturalPack != null) {
+      this.naturalButtonNode.opacity = 255;
+    } else {
+      this.naturalButtonNode.opacity = 125;
+    }
+
+    GlobalD.BeastPack = value.data.beastProtected;
+    if (GlobalD.BeastPack != null) {
+      this.beastButtonNode.opacity = 255;
+    } else {
+      this.beastButtonNode.opacity = 125;
+    }
+  },
+
+  onShowDisater() {
+    GlobalD.GameData.onGetDisasterHistory((value) => {
+      //warn 这里需要增加对结果的判断
+      if (0 === value.code) {
+        console.log(value);
+        let list = value.data;
+        let showNatural = null, showBeast = null;
+        //这里只显示两种类型灾难，不显示数量
+        for (let i = 0; i < list.length; i++) {
+          if (2 === list[i].dsasterType && showNatural == null) {
+            showNatural = list[i];
+            this.onInitDisaterShowPrefabPrefab(showNatural);
+          } else if (3 === list[i].dsasterType && showBeast == null) {
+            showBeast = list[i];
+            this.onInitDisaterShowPrefabPrefab(showBeast);
+          }
+
+        }
+      }
+    })
+  },
+
+  /**
+   * 生成一个灾害提示
+   * @param {显示数据}} tipObj 
+   */
+  onInitDisaterShowPrefabPrefab(tipObj) {
+    // console.log('灾难：', tipObj);
+    if (this.disaterShowPrefab) {
+      let _TipView = cc.instantiate(this.disaterShowPrefab)
+      _TipView.parent = this.TipView
+      _TipView.setPosition(cc.v2(0, 0))
+      _TipView
+        .getComponent('disaterPanel')
+        .onSetDisaterInfo(tipObj.dsasterType,tipObj.damage);
+    }
+  },
 })

assets/UI/NBuilding/box-red.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "8c2f438c-cf65-45a4-bfe5-c2c5bedb8d42",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "box-red": {
+      "ver": "1.0.4",
+      "uuid": "aa7a7de1-881f-4b3d-bfc6-d55ba07a4db3",
+      "rawTextureUuid": "8c2f438c-cf65-45a4-bfe5-c2c5bedb8d42",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 305,
+      "height": 114,
+      "rawWidth": 305,
+      "rawHeight": 114,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/UI/NBuilding/disater_beast.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "ebc668e3-2f77-4c55-8be8-fa35d8f3fa98",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "disater_beast": {
+      "ver": "1.0.4",
+      "uuid": "a308318c-dc43-4fa5-b635-e4a4c4432b5e",
+      "rawTextureUuid": "ebc668e3-2f77-4c55-8be8-fa35d8f3fa98",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -0.5,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 1085,
+      "height": 632,
+      "rawWidth": 1086,
+      "rawHeight": 632,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/UI/NBuilding/disater_natural.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "9b15680a-e827-49e8-916b-2c06ee349e87",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "disater_natural": {
+      "ver": "1.0.4",
+      "uuid": "cb28a53b-e30b-4c95-a44c-5053c68910a9",
+      "rawTextureUuid": "9b15680a-e827-49e8-916b-2c06ee349e87",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 857,
+      "height": 669,
+      "rawWidth": 857,
+      "rawHeight": 669,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/UI/NBuilding/text_beast.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "c6d0d7ee-33d0-471f-8126-4ebc5b40c387",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "text_beast": {
+      "ver": "1.0.4",
+      "uuid": "deb510a6-1504-4f0e-a02a-27c30737c1e1",
+      "rawTextureUuid": "c6d0d7ee-33d0-471f-8126-4ebc5b40c387",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0.5,
+      "trimX": 3,
+      "trimY": 2,
+      "width": 332,
+      "height": 94,
+      "rawWidth": 338,
+      "rawHeight": 99,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/UI/NBuilding/text_natural.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "c8e821f5-a72e-433b-8b00-847008f11487",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "text_natural": {
+      "ver": "1.0.4",
+      "uuid": "20a6c06c-838a-4348-ba61-521c267caf97",
+      "rawTextureUuid": "c8e821f5-a72e-433b-8b00-847008f11487",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -1.5,
+      "offsetY": 2,
+      "trimX": 5,
+      "trimY": 2,
+      "width": 661,
+      "height": 190,
+      "rawWidth": 674,
+      "rawHeight": 198,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/resources/clip.meta

@@ -1,7 +0,0 @@
-{
-  "ver": "1.0.1",
-  "uuid": "08747249-5fa6-47f8-9349-143f8989c1e8",
-  "isSubpackage": false,
-  "subpackageName": "",
-  "subMetas": {}
-}

assets/resources/clip/AnimationClipTask.anim

@@ -1,91 +0,0 @@
-{
-  "__type__": "cc.AnimationClip",
-  "_name": "AnimationClipTask",
-  "_objFlags": 0,
-  "_native": "",
-  "_duration": 1.3875,
-  "sample": 240,
-  "speed": 1,
-  "wrapMode": "2",
-  "curveData": {
-    "comps": {
-      "cc.Sprite": {
-        "spriteFrame": [
-          {
-            "frame": 0,
-            "value": {
-              "__uuid__": "4ce9f7bd-4dc7-4086-b77f-ee694bf555fb"
-            }
-          },
-          {
-            "frame": 0.125,
-            "value": {
-              "__uuid__": "e34d2238-59c8-402f-8cac-857d4dc16c3c"
-            }
-          },
-          {
-            "frame": 0.25,
-            "value": {
-              "__uuid__": "04393d3f-2bb1-467a-ad44-038a7246aca7"
-            }
-          },
-          {
-            "frame": 0.375,
-            "value": {
-              "__uuid__": "9edce5e1-9334-49d4-a989-6f809e445496"
-            }
-          },
-          {
-            "frame": 0.5,
-            "value": {
-              "__uuid__": "4013158b-a42e-478a-92b1-ff03522d8850"
-            }
-          },
-          {
-            "frame": 0.625,
-            "value": {
-              "__uuid__": "7a91290d-ff75-43ef-a8b2-bc3ff873f6c0"
-            }
-          },
-          {
-            "frame": 0.75,
-            "value": {
-              "__uuid__": "8eb8be33-ebc3-4d4b-8913-fe64871c2de1"
-            }
-          },
-          {
-            "frame": 0.875,
-            "value": {
-              "__uuid__": "69195eb2-f0ec-429d-acf2-9c38d3e432af"
-            }
-          },
-          {
-            "frame": 1,
-            "value": {
-              "__uuid__": "f9c1b7d1-5e77-46ae-95dd-5558d549841b"
-            }
-          },
-          {
-            "frame": 1.125,
-            "value": {
-              "__uuid__": "595277b6-08d0-4c9a-8c3e-d35e448299c6"
-            }
-          },
-          {
-            "frame": 1.25,
-            "value": {
-              "__uuid__": "8b0a586c-6fd6-4a9b-aea2-142785bea9b7"
-            }
-          },
-          {
-            "frame": 1.3833333333333333,
-            "value": {
-              "__uuid__": "3671837d-bf26-404d-ae64-630ed0fdd98c"
-            }
-          }
-        ]
-      }
-    }
-  },
-  "events": []
-}

assets/resources/clip/AnimationClipTask.anim.meta

@@ -1,5 +0,0 @@
-{
-  "ver": "2.1.0",
-  "uuid": "fc35e2b1-a979-47c9-bfd5-10826a9d05ae",
-  "subMetas": {}
-}

assets/resources/clip/Course.mp4.meta

@@ -1,5 +0,0 @@
-{
-  "ver": "1.0.1",
-  "uuid": "f023aeea-d7e3-4697-bedd-c17c2d8c4fdb",
-  "subMetas": {}
-}

assets/resources/clip/Twinkle.anim

@@ -1,25 +0,0 @@
-{
-  "__type__": "cc.AnimationClip",
-  "_name": "Twinkle",
-  "_objFlags": 0,
-  "_native": "",
-  "_duration": 1,
-  "sample": 60,
-  "speed": 1,
-  "wrapMode": "22",
-  "curveData": {
-    "props": {
-      "opacity": [
-        {
-          "frame": 0,
-          "value": 50
-        },
-        {
-          "frame": 1,
-          "value": 70
-        }
-      ]
-    }
-  },
-  "events": []
-}

assets/resources/clip/Twinkle.anim.meta

@@ -1,5 +0,0 @@
-{
-  "ver": "2.1.0",
-  "uuid": "72640883-18dc-4679-a75f-12c4c2973633",
-  "subMetas": {}
-}

assets/resources/clip/click.anim

@@ -1,38 +0,0 @@
-{
-  "__type__": "cc.AnimationClip",
-  "_name": "click",
-  "_objFlags": 0,
-  "_native": "",
-  "_duration": 1,
-  "sample": 60,
-  "speed": 1,
-  "wrapMode": "22",
-  "curveData": {
-    "props": {
-      "position": [
-        {
-          "frame": 0,
-          "value": [
-            267,
-            -66
-          ]
-        },
-        {
-          "frame": 0.48333333333333334,
-          "value": [
-            267,
-            -57
-          ]
-        },
-        {
-          "frame": 1,
-          "value": [
-            267,
-            -77
-          ]
-        }
-      ]
-    }
-  },
-  "events": []
-}

assets/resources/clip/click.anim.meta

@@ -1,5 +0,0 @@
-{
-  "ver": "2.1.0",
-  "uuid": "18398459-3381-4990-a49b-8072fa6a8c10",
-  "subMetas": {}
-}

assets/resources/clip/focus.anim

@@ -1,33 +0,0 @@
-{
-  "__type__": "cc.AnimationClip",
-  "_name": "focus",
-  "_objFlags": 0,
-  "_native": "",
-  "_duration": 1,
-  "sample": 60,
-  "speed": 1,
-  "wrapMode": "22",
-  "curveData": {
-    "props": {
-      "scale": [
-        {
-          "frame": 0,
-          "value": {
-            "__type__": "cc.Vec2",
-            "x": 1,
-            "y": 1
-          }
-        },
-        {
-          "frame": 1,
-          "value": {
-            "__type__": "cc.Vec2",
-            "x": 1.1,
-            "y": 1.1
-          }
-        }
-      ]
-    }
-  },
-  "events": []
-}

assets/resources/clip/focus.anim.meta

@@ -1,5 +0,0 @@
-{
-  "ver": "2.1.0",
-  "uuid": "73afb457-2c0f-47ef-8539-c0e0092b9cdc",
-  "subMetas": {}
-}

assets/resources/clip/peristalsis.anim

@@ -1,38 +0,0 @@
-{
-  "__type__": "cc.AnimationClip",
-  "_name": "peristalsis",
-  "_objFlags": 0,
-  "_native": "",
-  "_duration": 1.9833333333333334,
-  "sample": 60,
-  "speed": 1,
-  "wrapMode": "2",
-  "curveData": {
-    "props": {
-      "position": [
-        {
-          "frame": 0,
-          "value": [
-            -53,
-            83
-          ]
-        },
-        {
-          "frame": 1,
-          "value": [
-            -53,
-            40
-          ]
-        },
-        {
-          "frame": 1.9833333333333334,
-          "value": [
-            -53,
-            83
-          ]
-        }
-      ]
-    }
-  },
-  "events": []
-}

assets/resources/clip/peristalsis.anim.meta

@@ -1,5 +0,0 @@
-{
-  "ver": "2.1.0",
-  "uuid": "a2ea79fe-8475-43ad-9680-cb509d47f802",
-  "subMetas": {}
-}