浏览代码

1.修复收取,租赁导致覆盖种植等bug
2.优化游戏

slambb 3 年之前
父节点
当前提交
99b80367a6
共有 100 个文件被更改,包括 4144 次插入3072 次删除
  1. 二进制
      assets/DragonBone/Playground/Wheel_tex.png
  2. 二进制
      assets/DragonBone/Tourist/tourist_tex.png
  3. 二进制
      assets/DragonBone/Worker/worker_tex.png
  4. 二进制
      assets/DragonBone/yanwu/yanwu_tex.png
  5. 0 498
      assets/Map/MapDivide.tmx
  6. 0 5
      assets/Map/MapDivide.tmx.meta
  7. 0 157
      assets/Map/MapDivide_02.tmx
  8. 0 5
      assets/Map/MapDivide_02.tmx.meta
  9. 0 208
      assets/Map/MyCity.tmx
  10. 0 5
      assets/Map/MyCity.tmx.meta
  11. 0 248
      assets/Map/MyCity_02.tmx
  12. 0 5
      assets/Map/MyCity_02.tmx.meta
  13. 0 250
      assets/Map/MyCity_03.tmx
  14. 0 5
      assets/Map/MyCity_03.tmx.meta
  15. 0 259
      assets/Map/MyCity_06.tmx
  16. 0 5
      assets/Map/MyCity_06.tmx.meta
  17. 二进制
      assets/Map/Player/Player1/AllGuy_tex.png
  18. 二进制
      assets/Map/Player/Player2/AllGuy_tex.png
  19. 二进制
      assets/Map/Player/Player3/OtherGuy_tex.png
  20. 二进制
      assets/Map/Player/Player4/OtherGuy_tex.png
  21. 二进制
      assets/Map/Player/Player4/WorkGuy_tex.png
  22. 二进制
      assets/Map/Player/Player5/WorkGuy_tex.png
  23. 871 168
      assets/Prefabs/UI/lease/GrantPanel.prefab
  24. 521 71
      assets/Prefabs/UI/lease/LandInfo.prefab
  25. 258 132
      assets/Prefabs/UI/lease/LeaseInfo.prefab
  26. 540 69
      assets/Prefabs/UI/lease/PlantInfo.prefab
  27. 3 3
      assets/Prefabs/UI/lease/SalePanel.prefab
  28. 300 114
      assets/Prefabs/UI/seed/HolyFarmlandFruit.prefab
  29. 366 147
      assets/Prefabs/UI/seed/HolyFarmlandSeed.prefab
  30. 163 92
      assets/Prefabs/UI/seed/HolyFarmlandSeedStore.prefab
  31. 3 1
      assets/Scene/Login.fire
  32. 295 133
      assets/Scene/MyCityScene - 004.fire
  33. 9 3
      assets/Script/Lease/LandInfo.js
  34. 55 18
      assets/Script/Lease/LeaseGrantInfo.js
  35. 32 9
      assets/Script/Lease/LeaseInfo.js
  36. 26 20
      assets/Script/Lease/PlantInfo.js
  37. 72 23
      assets/Script/Login/Login.js
  38. 4 4
      assets/Script/Network/dapp.js
  39. 105 31
      assets/Script/Network/netUtils.ts
  40. 14 13
      assets/Script/UI/BuildingView.js
  41. 31 13
      assets/Script/UI/Content_Button.js
  42. 1 70
      assets/Script/UI/ManageBuildings.js
  43. 1 1
      assets/Script/UI/ManageSeedNode.js
  44. 59 16
      assets/Script/UI/StoreView.js
  45. 39 3
      assets/Script/Unit/date.js
  46. 303 79
      assets/Script/build/LeaseFarmlandInfo.js
  47. 7 3
      assets/Script/public/GameData.js
  48. 1 3
      assets/Script/public/ManageTask.js
  49. 29 4
      assets/Script/public/ManageUI.js
  50. 二进制
      assets/Sound/Sound_BuildingAddition.mp3
  51. 二进制
      assets/Sound/Sound_FinishBuilding.mp3
  52. 二进制
      assets/Sound/Sound_GetCoins.mp3
  53. 二进制
      assets/Sound/Sound_PeopleLevelUp.mp3
  54. 二进制
      assets/Sound/Sound_PressBtn.mp3
  55. 二进制
      assets/Sound/Sound_Recruit.mp3
  56. 二进制
      assets/Texture/Labour_01_0.png
  57. 4 4
      assets/Texture/Labour_01_0.png.meta
  58. 二进制
      assets/Texture/Labour_01_00.png
  59. 4 4
      assets/Texture/Labour_01_00.png.meta
  60. 二进制
      assets/Texture/Labour_01_01.png
  61. 4 4
      assets/Texture/Labour_01_01.png.meta
  62. 二进制
      assets/Texture/Labour_01_02.png
  63. 4 4
      assets/Texture/Labour_01_02.png.meta
  64. 二进制
      assets/Texture/Labour_01_1.png
  65. 4 4
      assets/Texture/Labour_01_1.png.meta
  66. 二进制
      assets/Texture/Labour_01_2.png
  67. 4 4
      assets/Texture/Labour_01_2.png.meta
  68. 二进制
      assets/Texture/Labour_01_3.png
  69. 二进制
      assets/Texture/Labour_03_0.png
  70. 二进制
      assets/Texture/Labour_03_1.png
  71. 二进制
      assets/Texture/Labour_03_2.png
  72. 二进制
      assets/Texture/Labour_03_3.png
  73. 二进制
      assets/Texture/Labour_03_4.png
  74. 二进制
      assets/Texture/Labour_03_5.png
  75. 二进制
      assets/Texture/Labour_03_6.png
  76. 二进制
      assets/Texture/Labour_04_0.png
  77. 二进制
      assets/Texture/Labour_04_1.png
  78. 二进制
      assets/Texture/Labour_04_2.png
  79. 2 2
      assets/Texture/Labour_04_2.png.meta
  80. 二进制
      assets/Texture/Labour_04_3.png
  81. 2 2
      assets/Texture/Labour_04_3.png.meta
  82. 二进制
      assets/UI/NPublic/seedNum.png
  83. 8 8
      assets/UI/NPublic/seedNum.png.meta
  84. 二进制
      assets/res/resUI/BG_DownLeft.jpg
  85. 二进制
      assets/res/resUI/BG_DownRight.jpg
  86. 二进制
      assets/res/resUI/BG_UpLeft.jpg
  87. 二进制
      assets/res/resUI/BG_UpRight.jpg
  88. 二进制
      assets/resources/Luckdraw/Wheel_03.png
  89. 二进制
      assets/resources/Luckdraw/Wheel_05.png
  90. 0 7
      assets/resources/NewTeaching_Road.meta
  91. 二进制
      assets/resources/NewTeaching_Road/1.jpg
  92. 二进制
      assets/resources/NewTeaching_Road/10.jpg
  93. 0 34
      assets/resources/NewTeaching_Road/10.jpg.meta
  94. 二进制
      assets/resources/NewTeaching_Road/3.jpg
  95. 0 34
      assets/resources/NewTeaching_Road/3.jpg.meta
  96. 二进制
      assets/resources/NewTeaching_Road/4.jpg
  97. 0 34
      assets/resources/NewTeaching_Road/4.jpg.meta
  98. 二进制
      assets/resources/NewTeaching_Road/5.jpg
  99. 0 34
      assets/resources/NewTeaching_Road/5.jpg.meta
  100. 二进制
      assets/resources/NewTeaching_Road/6.jpg

二进制
assets/DragonBone/Playground/Wheel_tex.png


二进制
assets/DragonBone/Tourist/tourist_tex.png


二进制
assets/DragonBone/Worker/worker_tex.png


二进制
assets/DragonBone/yanwu/yanwu_tex.png


+ 0 - 498
assets/Map/MapDivide.tmx

@@ -1,498 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.2" tiledversion="1.2.1" orientation="isometric" renderorder="right-down" width="50" height="50" tilewidth="165" tileheight="96" infinite="0" nextlayerid="10" nextobjectid="1">
- <tileset firstgid="1" name="Terrain_02_8" tilewidth="168" tileheight="99" tilecount="1" columns="1">
-  <image source="Terrain_02_8.png" width="168" height="99"/>
- </tileset>
- <tileset firstgid="2" name="Terrain_01_0" tilewidth="168" tileheight="99" tilecount="1" columns="1">
-  <image source="Terrain_01_0.png" width="168" height="99"/>
- </tileset>
- <tileset firstgid="3" name="Terrain_02_9" tilewidth="167" tileheight="99" tilecount="1" columns="1">
-  <image source="Terrain_02_9.png" width="168" height="99"/>
- </tileset>
- <layer id="2" name="Grass" width="50" height="50" visible="0">
-  <data encoding="csv">
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
-2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
-</data>
- </layer>
- <layer id="1" name="NotOpenedMap0_0" width="50" height="50">
-  <data encoding="csv">
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-</data>
- </layer>
- <layer id="3" name="NotOpenedMap0_1" width="50" height="50">
-  <data encoding="csv">
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-</data>
- </layer>
- <layer id="4" name="NotOpenedMap1_0" width="50" height="50">
-  <data encoding="csv">
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-</data>
- </layer>
- <layer id="7" name="NotOpenedMap1_1" width="50" height="50">
-  <data encoding="csv">
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-</data>
- </layer>
- <layer id="5" name="NotOpenedMap2_0" width="50" height="50">
-  <data encoding="csv">
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-</data>
- </layer>
- <layer id="8" name="NotOpenedMap2_1" width="50" height="50">
-  <data encoding="csv">
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-</data>
- </layer>
- <layer id="6" name="NotOpenedMap3_0" width="50" height="50">
-  <data encoding="csv">
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-</data>
- </layer>
- <layer id="9" name="NotOpenedMap3_1" width="50" height="50">
-  <data encoding="csv">
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,3,3,3,3,3,3,3,3,3,3,3,3,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-</data>
- </layer>
-</map>

+ 0 - 5
assets/Map/MapDivide.tmx.meta

@@ -1,5 +0,0 @@
-{
-  "ver": "2.0.1",
-  "uuid": "1474b162-88dc-47fd-a653-f46ca01f6609",
-  "subMetas": {}
-}

+ 0 - 157
assets/Map/MapDivide_02.tmx

@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.2" tiledversion="1.2.1" orientation="isometric" renderorder="right-down" width="32" height="32" tilewidth="165" tileheight="96" infinite="0" nextlayerid="87" nextobjectid="75">
- <tileset firstgid="1" name="Terrain_01_0" tilewidth="168" tileheight="99" tilecount="1" columns="1">
-  <image source="Terrain_01_0.png" width="168" height="99"/>
- </tileset>
- <tileset firstgid="2" name="Terrain_02_0" tilewidth="165" tileheight="96" tilecount="1" columns="1">
-  <image source="Terrain_02_0.png" width="168" height="99"/>
- </tileset>
- <tileset firstgid="3" name="Terrain_02_0" tilewidth="168" tileheight="99" tilecount="1" columns="1">
-  <image source="Terrain_02_0.png" width="168" height="99"/>
- </tileset>
- <tileset firstgid="4" name="Terrain_02_1" tilewidth="168" tileheight="99" tilecount="1" columns="1">
-  <image source="../Texture/Terrain_02_1.png" width="168" height="99"/>
- </tileset>
- <tileset firstgid="5" name="Terrain_09_0" tilewidth="333" tileheight="247" tilecount="1" columns="1">
-  <image source="../Texture/Terrain_09_0.png" width="333" height="247"/>
- </tileset>
- <tileset firstgid="6" name="Terrain_02_8" tilewidth="168" tileheight="99" tilecount="1" columns="1">
-  <image source="Terrain_02_8.png" width="168" height="99"/>
- </tileset>
- <tileset firstgid="7" name="Terrain_02_9" tilewidth="167" tileheight="99" tilecount="1" columns="1">
-  <image source="Terrain_02_9.png" width="168" height="99"/>
- </tileset>
- <tileset firstgid="8" name="Special_07_0" tilewidth="63" tileheight="164" tilecount="1" columns="1">
-  <image source="../Texture/Special_07_0.png" width="63" height="164"/>
- </tileset>
- <tileset firstgid="9" name="Terrain_09_2" tilewidth="75" tileheight="100" tilecount="1" columns="1">
-  <image source="../Texture/Terrain_09_2.png" width="75" height="100"/>
- </tileset>
- <tileset firstgid="10" name="Terrain_09_1" tilewidth="75" tileheight="100" tilecount="1" columns="1">
-  <image source="../Texture/Terrain_09_1.png" width="75" height="100"/>
- </tileset>
- <tileset firstgid="11" name="MaskBlue" tilewidth="168" tileheight="99" tilecount="1" columns="1">
-  <image source="Terrain_02_8.png" width="168" height="99"/>
- </tileset>
- <tileset firstgid="12" name="MaskBlack" tilewidth="168" tileheight="99" tilecount="1" columns="1">
-  <image source="Terrain_02_9.png" width="168" height="99"/>
- </tileset>
- <layer id="44" name="walkable" width="32" height="32" visible="0">
-  <properties>
-   <property name="cc_vertexz" type="int" value="-1000"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztwwEJAAAMBKH7/qXXYyi4aqqqqurrBxngBAE=
-  </data>
- </layer>
- <layer id="45" name="InitPoint" width="32" height="32" visible="0">
-  <data encoding="base64" compression="zlib">
-   eJztw7EJAAAIA7CC///s0NULJIEkAAAAP8wRqAU+aAAQ
-  </data>
- </layer>
- <layer id="49" name="Road" width="32" height="32" visible="0">
-  <data encoding="base64" compression="zlib">
-   eJztzbEJAAAIBLEH99/Zxhm0MAdXJ9mv5qv4fD6fz+fz+Xw+n8//5jfnywDB
-  </data>
- </layer>
- <layer id="50" name="BusinessRoad" width="32" height="32" visible="0">
-  <data encoding="base64" compression="zlib">
-   eJzt1MEJAAAIw0Af7j+zH2ewQnLgAIFilaRLvUdF75eUQ/8/9H5l0fdH79cfA2nvADE=
-  </data>
- </layer>
- <layer id="51" name="Railing" width="32" height="32" visible="0">
-  <data encoding="base64" compression="zlib">
-   eJzt0DERAAAIw8Cu+DfMjAE6JDHwd0nss9FH+/Ta//X19bk+vfZ/fbZPr/2f7tttASOqAL4=
-  </data>
- </layer>
- <layer id="52" name="Railing1" width="32" height="32" visible="0">
-  <data encoding="base64" compression="zlib">
-   eJzt1sEJADAIA0Df7j9wX46gRbyDjJCQCEoOBNirs/+2A/jF/4G79P+eB8cpA98=
-  </data>
- </layer>
- <layer id="53" name="Railing2" width="32" height="32" visible="0">
-  <data encoding="base64" compression="zlib">
-   eJzt0MkNACAIAEG+9t+wsQMVjxhnC2CACLXKA37vjjO38Pn89XNP+pn9+Hw+/1Yj/o4/8Pl8/VYF1KcCmw==
-  </data>
- </layer>
- <layer id="55" name="NotOpenedMap0_Blue" width="32" height="32">
-  <data encoding="base64" compression="zlib">
-   eJztzaENAAAMw7Dy/f/vPujogC0FJwEAgG6O/P39/flvAaR1Axk=
-  </data>
- </layer>
- <layer id="63" name="NotOpenedMap0_Black" width="32" height="32">
-  <data encoding="base64" compression="zlib">
-   eJztzTENAAAMw7ACGH+8Y9C9O2wpdxIAAOjmyN/f35//FrH0A2E=
-  </data>
- </layer>
- <layer id="56" name="NotOpenedMap1_Blue" width="32" height="32">
-  <data encoding="base64" compression="zlib">
-   eJztzbENAAAIw7Du/P8vN3RE2FLmJAAAfDRF/v7+/ty3ndQEQg==
-  </data>
- </layer>
- <layer id="64" name="NotOpenedMap1_Black" width="32" height="32">
-  <data encoding="base64" compression="zlib">
-   eJztzTENAAAMw7ACGH+8w9Bzmi3lTgIAwEdT5O/v7899Cx8eBKU=
-  </data>
- </layer>
- <layer id="57" name="NotOpenedMap2_Blue" width="32" height="32">
-  <data encoding="base64" compression="zlib">
-   eJztzbEJAAAMw7Ds/f/fvhDo0EUCz04A+DRF/v7+/gBwtVOrA3w=
-  </data>
- </layer>
- <layer id="65" name="NotOpenedMap2_Black" width="32" height="32">
-  <data encoding="base64" compression="zlib">
-   eJztzTENAAAMw7ACGH+8o1Bpxx5byp0EgE9T5O/v7w8AVwv8sQPN
-  </data>
- </layer>
- <layer id="58" name="NotOpenedMap3_Blue" width="32" height="32">
-  <data encoding="base64" compression="zlib">
-   eJztzbEJAAAMw7Ds/f/fkg+6FiTw7ISaQ/7+/v4AAPDVAv4MA3w=
-  </data>
- </layer>
- <layer id="66" name="NotOpenedMap3_Black" width="32" height="32">
-  <data encoding="base64" compression="zlib">
-   eJztzbEJAAAMw7Ac0P/vLfmga0ECz06oOeTv7+8PAABfLRO/A80=
-  </data>
- </layer>
- <layer id="59" name="NotOpenedMap4_Blue" width="32" height="32">
-  <data encoding="base64" compression="zlib">
-   eJztzbENAAAIw7Du/P8vL3QF2VLmJLSmzN/f/98fAACuW8l0A3E=
-  </data>
- </layer>
- <layer id="67" name="NotOpenedMap4_Black" width="32" height="32">
-  <data encoding="base64" compression="zlib">
-   eJztzTENAAAMw7ACGH+8o9B3ky3lTkJryvz9/f/9AQDgugXaUAPB
-  </data>
- </layer>
- <layer id="60" name="NotOpenedMap5_Blue" width="32" height="32">
-  <data encoding="base64" compression="zlib">
-   eJztzbEJAAAIBLHv3X9fR7CxEEng6kvYVkP+/v5//wAAcFUDdI0CwQ==
-  </data>
- </layer>
- <layer id="68" name="NotOpenedMap5_Black" width="32" height="32">
-  <data encoding="base64" compression="zlib">
-   eJztzbEJAAAIBLEfwP3ndQQbC5EErr6EbTXk7+//9w8AAFc1rDoDAQ==
-  </data>
- </layer>
- <layer id="61" name="NotOpenedMap6_Blue" width="32" height="32">
-  <data encoding="base64" compression="zlib">
-   eJztzbEJAAAIBLHv3X9fVxCslASuvgSArRrm7+/v/+0PwB0NFzQETQ==
-  </data>
- </layer>
- <layer id="69" name="NotOpenedMap6_Black" width="32" height="32">
-  <data encoding="base64" compression="zlib">
-   eJztzbEJAAAIBLEfwP3ndQXBSkng6ksA2Kph/v7+/t/+ANzRXakEsQ==
-  </data>
- </layer>
- <layer id="62" name="NotOpenedMap7_Blue" width="32" height="32">
-  <data encoding="base64" compression="zlib">
-   eJztzbENAAAMwjD2/v9vT2BHtpQ5CQDNlfz9/f1X/wDseF5TA3E=
-  </data>
- </layer>
- <layer id="70" name="NotOpenedMap7_Black" width="32" height="32">
-  <data encoding="base64" compression="zlib">
-   eJztzTENAAAMw7ACGH+8g9C/sqXcSQBoruTv7++/+gdgxwMIYAPB
-  </data>
- </layer>
-</map>

+ 0 - 5
assets/Map/MapDivide_02.tmx.meta

@@ -1,5 +0,0 @@
-{
-  "ver": "2.0.1",
-  "uuid": "41b03e64-3b6f-49db-9d30-3b864c93d94d",
-  "subMetas": {}
-}

+ 0 - 208
assets/Map/MyCity.tmx

@@ -1,208 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.2" tiledversion="1.2.1" orientation="isometric" renderorder="right-down" width="50" height="50" tilewidth="165" tileheight="96" infinite="0" nextlayerid="42" nextobjectid="63">
- <tileset firstgid="1" name="Terrain_01_0" tilewidth="168" tileheight="99" tilecount="1" columns="1">
-  <image source="Terrain_01_0.png" width="168" height="99"/>
- </tileset>
- <tileset firstgid="2" name="Terrain_02_0" tilewidth="165" tileheight="96" tilecount="1" columns="1">
-  <image source="Terrain_02_0.png" width="168" height="99"/>
- </tileset>
- <tileset firstgid="3" name="Terrain_02_0" tilewidth="168" tileheight="99" tilecount="1" columns="1">
-  <image source="Terrain_02_0.png" width="168" height="99"/>
- </tileset>
- <tileset firstgid="4" name="Terrain_02_1" tilewidth="168" tileheight="99" tilecount="1" columns="1">
-  <image source="../Texture/Terrain_02_1.png" width="168" height="99"/>
- </tileset>
- <tileset firstgid="5" name="Terrain_09_0" tilewidth="333" tileheight="247" tilecount="1" columns="1">
-  <image source="../Texture/Terrain_09_0.png" width="333" height="247"/>
- </tileset>
- <tileset firstgid="6" name="Terrain_02_8" tilewidth="168" tileheight="99" tilecount="1" columns="1">
-  <image source="Terrain_02_8.png" width="168" height="99"/>
- </tileset>
- <tileset firstgid="7" name="Terrain_02_9" tilewidth="167" tileheight="99" tilecount="1" columns="1">
-  <image source="Terrain_02_9.png" width="168" height="99"/>
- </tileset>
- <tileset firstgid="8" name="Special_07_0" tilewidth="63" tileheight="164" tilecount="1" columns="1">
-  <image source="../Texture/Special_07_0.png" width="63" height="164"/>
- </tileset>
- <layer id="19" name="walkable" width="50" height="50">
-  <properties>
-   <property name="cc_vertexz" type="int" value="-1000"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztwwEJAAAMBKH7/qWXY6DgqqmqqqqqqqqqqurzBwHpCcU=
-  </data>
- </layer>
- <layer id="39" name="InitPoint" width="50" height="50">
-  <data encoding="base64" compression="zlib">
-   eJztw7EJAAAIA7CC///sB10EpwSSAAAAAAAAAAD8mBIArhasnAAW
-  </data>
- </layer>
- <layer id="41" name="OldPoint" width="50" height="50" visible="0">
-  <data encoding="base64" compression="zlib">
-   eJzt1sEJACEMBVHB/nu2AxF+AmOYgb2KjyCbtfJ2wRmEdLDSwUoHKx2sdLCa5Eg+SslddNSnQ0dHOnR0pKPOke4U6W7hPOrTMctB2fedh46OJjlI77Wrn+56SwcrHax0sNLB+n86D1Y6WOlgpeO9A4KhAZw=
-  </data>
- </layer>
- <layer id="24" name="Highway" width="50" height="50">
-  <properties>
-   <property name="cc_vertexz" type="int" value="-1000"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20ON6AAAAAAAAAAAADg3wAnEAAB
-  </data>
- </layer>
- <layer id="27" name="BuildsHighway" width="50" height="50">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20ON6AAAAAAAAAAAADg3wAnEAAB
-  </data>
- </layer>
- <layer id="29" name="Road" width="50" height="50">
-  <data encoding="base64" compression="zlib">
-   eJztz7EJADAMwLBA//+5S4ee4IAEPsAze53Xdj5afLT4aPHR4qPFR4uPFh8tPlp8tPho8dHio8VHi48WHy0+Wny0+Gjx0eKjxUeLjxYfLf/HBaJCAS0=
-  </data>
- </layer>
- <layer id="30" name="BusinessRoad" width="50" height="50">
-  <data encoding="base64" compression="zlib">
-   eJzt1rENAEAIAzGK339mCn4EJFLYUia4JlUAADDeHxn0AADY5V9l0QMAYJd/lUUPgDsNYh0AMQ==
-  </data>
- </layer>
- <layer id="31" name="Railing" width="50" height="50">
-  <data encoding="base64" compression="zlib">
-   eJzt1bEJADAMA7As/f/lzh2yZKkJ0gUGY1wFbHN+B+ChD+jZBwAT/iOLPqBnHwBM+I8s+oCefQAw4T+ybO3jAh50ADg=
-  </data>
- </layer>
- <layer id="37" name="Trees" width="50" height="50" visible="0">
-  <data encoding="base64" compression="zlib">
-   eJzt1jEOQBEUBVGl/a9Yo5EoFIQ75iTqb+R7UYoS1b7SUTpeRjlfSkcSyv2kdEjiuT2fdn2f0vEjz00nUP4rSockJaK87ygdkkaUe/16x+oMpXRIku6izOvUjsQ9z1A6SBq7uAEx
-  </data>
- </layer>
- <objectgroup id="40" name="Barrier">
-  <object id="37" name="TreeBarrier" x="3754.39" y="3560.62" width="172.442" height="170.891">
-   <properties>
-    <property name="areaX" type="int" value="2"/>
-    <property name="areaY" type="int" value="2"/>
-    <property name="startTiledX" type="int" value="39"/>
-    <property name="startTiledY" type="int" value="37"/>
-   </properties>
-  </object>
-  <object id="46" name="TreeBarrier" x="4038.88" y="780.118" width="172.824" height="165.842">
-   <properties>
-    <property name="areaX" type="int" value="2"/>
-    <property name="areaY" type="int" value="2"/>
-    <property name="startTiledX" type="int" value="42"/>
-    <property name="startTiledY" type="int" value="8"/>
-   </properties>
-  </object>
-  <object id="47" name="TreeBarrier" x="3659.3" y="1455.37" width="172.824" height="165.842">
-   <properties>
-    <property name="areaX" type="int" value="2"/>
-    <property name="areaY" type="int" value="2"/>
-    <property name="startTiledX" type="int" value="38"/>
-    <property name="startTiledY" type="int" value="15"/>
-   </properties>
-  </object>
-  <object id="48" name="TreeBarrier" x="1933.05" y="1548.28" width="172.824" height="165.842">
-   <properties>
-    <property name="areaX" type="int" value="2"/>
-    <property name="areaY" type="int" value="2"/>
-    <property name="startTiledX" type="int" value="20"/>
-    <property name="startTiledY" type="int" value="16"/>
-   </properties>
-  </object>
-  <object id="49" name="TreeBarrier" x="971.624" y="299.043" width="172.824" height="165.842">
-   <properties>
-    <property name="areaX" type="int" value="2"/>
-    <property name="areaY" type="int" value="2"/>
-    <property name="startTiledX" type="int" value="10"/>
-    <property name="startTiledY" type="int" value="3"/>
-   </properties>
-  </object>
-  <object id="50" name="TreeBarrier" x="201.333" y="2889.33" width="172.824" height="165.842">
-   <properties>
-    <property name="areaX" type="int" value="2"/>
-    <property name="areaY" type="int" value="2"/>
-    <property name="startTiledX" type="int" value="2"/>
-    <property name="startTiledY" type="int" value="30"/>
-   </properties>
-  </object>
-  <object id="51" name="TreeBarrier" x="304.124" y="4428.97" width="172.824" height="165.842">
-   <properties>
-    <property name="areaX" type="int" value="2"/>
-    <property name="areaY" type="int" value="2"/>
-    <property name="startTiledX" type="int" value="3"/>
-    <property name="startTiledY" type="int" value="46"/>
-   </properties>
-  </object>
-  <object id="52" name="TreeBarrierLong" x="4430.23" y="4152.52" width="64.1331" height="621.766">
-   <properties>
-    <property name="areaX" type="int" value="1"/>
-    <property name="areaY" type="int" value="7"/>
-    <property name="startTiledX" type="int" value="46"/>
-    <property name="startTiledY" type="int" value="43"/>
-   </properties>
-  </object>
-  <object id="53" name="TreeBarrierLong" x="4426.81" y="2802.84" width="64.3513" height="996.679">
-   <properties>
-    <property name="areaX" type="int" value="1"/>
-    <property name="areaY" type="int" value="11"/>
-    <property name="startTiledX" type="int" value="46"/>
-    <property name="startTiledY" type="int" value="29"/>
-   </properties>
-  </object>
-  <object id="54" name="TreeBarrierLong" x="4426.48" y="1455.01" width="64.3513" height="996.679">
-   <properties>
-    <property name="areaX" type="int" value="1"/>
-    <property name="areaY" type="int" value="11"/>
-    <property name="startTiledX" type="int" value="46"/>
-    <property name="startTiledY" type="int" value="15"/>
-   </properties>
-  </object>
-  <object id="55" name="TreeBarrierLong" x="4430.78" y="113.37" width="64.3513" height="996.679">
-   <properties>
-    <property name="areaX" type="int" value="1"/>
-    <property name="areaY" type="int" value="11"/>
-    <property name="startTiledX" type="int" value="46"/>
-    <property name="startTiledY" type="int" value="1"/>
-   </properties>
-  </object>
-  <object id="58" name="TreeBarrier" x="4722.84" y="4516.49" width="53.4329" height="170.891">
-   <properties>
-    <property name="areaX" type="int" value="1"/>
-    <property name="areaY" type="int" value="2"/>
-    <property name="startTiledX" type="int" value="49"/>
-    <property name="startTiledY" type="int" value="47"/>
-   </properties>
-  </object>
-  <object id="59" name="TreeBarrier" x="4725.51" y="3299.09" width="53.4329" height="294.727">
-   <properties>
-    <property name="areaX" type="int" value="1"/>
-    <property name="areaY" type="int" value="3"/>
-    <property name="startTiledX" type="int" value="49"/>
-    <property name="startTiledY" type="int" value="34"/>
-   </properties>
-  </object>
-  <object id="60" name="TreeBarrier" x="4723.42" y="2022.65" width="53.4329" height="173.975">
-   <properties>
-    <property name="areaX" type="int" value="1"/>
-    <property name="areaY" type="int" value="2"/>
-    <property name="startTiledX" type="int" value="49"/>
-    <property name="startTiledY" type="int" value="21"/>
-   </properties>
-  </object>
-  <object id="61" name="TreeBarrier" x="4726.18" y="1745.64" width="53.4329" height="49.7811">
-   <properties>
-    <property name="areaX" type="int" value="1"/>
-    <property name="areaY" type="int" value="1"/>
-    <property name="startTiledX" type="int" value="49"/>
-    <property name="startTiledY" type="int" value="18"/>
-   </properties>
-  </object>
-  <object id="62" name="TreeBarrier" x="4732.97" y="496.722" width="53.4329" height="141.817">
-   <properties>
-    <property name="areaX" type="int" value="1"/>
-    <property name="areaY" type="int" value="2"/>
-    <property name="startTiledX" type="int" value="49"/>
-    <property name="startTiledY" type="int" value="5"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>

+ 0 - 5
assets/Map/MyCity.tmx.meta

@@ -1,5 +0,0 @@
-{
-  "ver": "2.0.1",
-  "uuid": "f3bc9e93-2fa0-4fdf-b425-5dcb5f19ce6a",
-  "subMetas": {}
-}

+ 0 - 248
assets/Map/MyCity_02.tmx

@@ -1,248 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.2" tiledversion="1.2.1" orientation="isometric" renderorder="right-down" width="32" height="32" tilewidth="165" tileheight="96" infinite="0" nextlayerid="55" nextobjectid="75">
- <tileset firstgid="1" name="Terrain_01_0" tilewidth="168" tileheight="99" tilecount="1" columns="1">
-  <image source="Terrain_01_0.png" width="168" height="99"/>
- </tileset>
- <tileset firstgid="2" name="Terrain_02_0" tilewidth="165" tileheight="96" tilecount="1" columns="1">
-  <image source="Terrain_02_0.png" width="168" height="99"/>
- </tileset>
- <tileset firstgid="3" name="Terrain_02_0" tilewidth="168" tileheight="99" tilecount="1" columns="1">
-  <image source="Terrain_02_0.png" width="168" height="99"/>
- </tileset>
- <tileset firstgid="4" name="Terrain_02_1" tilewidth="168" tileheight="99" tilecount="1" columns="1">
-  <image source="../Texture/Terrain_02_1.png" width="168" height="99"/>
- </tileset>
- <tileset firstgid="5" name="Terrain_09_0" tilewidth="333" tileheight="247" tilecount="1" columns="1">
-  <image source="../Texture/Terrain_09_0.png" width="333" height="247"/>
- </tileset>
- <tileset firstgid="6" name="Terrain_02_8" tilewidth="168" tileheight="99" tilecount="1" columns="1">
-  <image source="Terrain_02_8.png" width="168" height="99"/>
- </tileset>
- <tileset firstgid="7" name="Terrain_02_9" tilewidth="167" tileheight="99" tilecount="1" columns="1">
-  <image source="Terrain_02_9.png" width="168" height="99"/>
- </tileset>
- <tileset firstgid="8" name="Special_07_0" tilewidth="63" tileheight="164" tilecount="1" columns="1">
-  <image source="../Texture/Special_07_0.png" width="63" height="164"/>
- </tileset>
- <tileset firstgid="9" name="Terrain_09_2" tilewidth="75" tileheight="100" tilecount="1" columns="1">
-  <image source="../Texture/Terrain_09_2.png" width="75" height="100"/>
- </tileset>
- <tileset firstgid="10" name="Terrain_09_1" tilewidth="75" tileheight="100" tilecount="1" columns="1">
-  <image source="../Texture/Terrain_09_1.png" width="75" height="100"/>
- </tileset>
- <layer id="44" name="walkable" width="32" height="32">
-  <properties>
-   <property name="cc_vertexz" type="int" value="-1000"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztwwEJAAAMBKH7/qXXYyi4aqqqqurrBxngBAE=
-  </data>
- </layer>
- <layer id="45" name="InitPoint" width="32" height="32">
-  <data encoding="base64" compression="zlib">
-   eJztw7EJAAAIA7CC///s0NULJIEkAAAAP8wRqAU+aAAQ
-  </data>
- </layer>
- <layer id="46" name="OldPoint" width="32" height="32" visible="0">
-  <data encoding="base64" compression="zlib">
-   eJzt1FEGADAMBNGQ+985RwhrWZEZ+tm8lmqVVov7XOHj4//21eXyk+H75iTf0Xa2ZPj4+Dd9x791+f74+Ph7A7naAMo=
-  </data>
- </layer>
- <layer id="47" name="Highway" width="32" height="32">
-  <properties>
-   <property name="cc_vertexz" type="int" value="-1000"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAADwbhAAAAE=
-  </data>
- </layer>
- <layer id="48" name="BuildsHighway" width="32" height="32">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAADwbhAAAAE=
-  </data>
- </layer>
- <layer id="49" name="Road" width="32" height="32">
-  <data encoding="base64" compression="zlib">
-   eJztzbEJAAAIBLEH99/Zxhm0MAdXJ9mv5qv4fD6fz+fz+Xw+n8//5jfnywDB
-  </data>
- </layer>
- <layer id="50" name="BusinessRoad" width="32" height="32">
-  <data encoding="base64" compression="zlib">
-   eJzt1MEJAAAIw0Af7j+zH2ewQnLgAIFilaRLvUdF75eUQ/8/9H5l0fdH79cfA2nvADE=
-  </data>
- </layer>
- <layer id="51" name="Railing" width="32" height="32">
-  <data encoding="base64" compression="zlib">
-   eJzt0DERAAAIw8Cu+DfMjAE6JDHwd0nss9FH+/Ta//X19bk+vfZ/fbZPr/2f7tttASOqAL4=
-  </data>
- </layer>
- <layer id="52" name="Railing1" width="32" height="32">
-  <data encoding="base64" compression="zlib">
-   eJzt1sEJADAIA0Df7j9wX46gRbyDjJCQCEoOBNirs/+2A/jF/4G79P+eB8cpA98=
-  </data>
- </layer>
- <layer id="53" name="Railing2" width="32" height="32">
-  <data encoding="base64" compression="zlib">
-   eJzt0MkNACAIAEG+9t+wsQMVjxhnC2CACLXKA37vjjO38Pn89XNP+pn9+Hw+/1Yj/o4/8Pl8/VYF1KcCmw==
-  </data>
- </layer>
- <layer id="54" name="Trees" width="32" height="32">
-  <data encoding="base64" compression="zlib">
-   eJzt1bERADAIAzFK9p84K6TJmQvSAHxnqkjp5X0Adnr1f/ry9q99gOnS+5fuT3AAjj4AWQ==
-  </data>
- </layer>
- <objectgroup id="40" name="Barrier">
-  <object id="37" name="TreeBarrier" x="2028.54" y="1739.56" width="172.442" height="170.891">
-   <properties>
-    <property name="areaX" type="int" value="2"/>
-    <property name="areaY" type="int" value="2"/>
-    <property name="startTiledX" type="int" value="21"/>
-    <property name="startTiledY" type="int" value="28"/>
-   </properties>
-  </object>
-  <object id="52" name="TreeBarrierLong" x="2702.23" y="2532.67" width="64.1331" height="313.612">
-   <properties>
-    <property name="areaX" type="int" value="1"/>
-    <property name="areaY" type="int" value="4"/>
-    <property name="startTiledX" type="int" value="28"/>
-    <property name="startTiledY" type="int" value="26"/>
-   </properties>
-  </object>
-  <object id="53" name="TreeBarrierLong" x="2698.81" y="805.474" width="64.3513" height="875.908">
-   <properties>
-    <property name="areaX" type="int" value="1"/>
-    <property name="areaY" type="int" value="10"/>
-    <property name="startTiledX" type="int" value="28"/>
-    <property name="startTiledY" type="int" value="8"/>
-   </properties>
-  </object>
-  <object id="54" name="TreeBarrierLong" x="2698.48" y="220.447" width="64.3513" height="400.102">
-   <properties>
-    <property name="areaX" type="int" value="1"/>
-    <property name="areaY" type="int" value="5"/>
-    <property name="startTiledX" type="int" value="28"/>
-    <property name="startTiledY" type="int" value="2"/>
-   </properties>
-  </object>
-  <object id="58" name="TreeBarrier" x="2994.84" y="2788.49" width="53.4329" height="170.891">
-   <properties>
-    <property name="areaX" type="int" value="1"/>
-    <property name="areaY" type="int" value="2"/>
-    <property name="startTiledX" type="int" value="31"/>
-    <property name="startTiledY" type="int" value="30"/>
-   </properties>
-  </object>
-  <object id="59" name="TreeBarrier" x="2997.51" y="1628.34" width="53.4329" height="237.482">
-   <properties>
-    <property name="areaX" type="int" value="1"/>
-    <property name="areaY" type="int" value="3"/>
-    <property name="startTiledX" type="int" value="31"/>
-    <property name="startTiledY" type="int" value="17"/>
-   </properties>
-  </object>
-  <object id="60" name="TreeBarrier" x="2995.42" y="294.65" width="53.4329" height="173.975">
-   <properties>
-    <property name="areaX" type="int" value="1"/>
-    <property name="areaY" type="int" value="2"/>
-    <property name="startTiledX" type="int" value="31"/>
-    <property name="startTiledY" type="int" value="3"/>
-   </properties>
-  </object>
-  <object id="63" name="TreeBarrierLong" x="2705.16" y="1857.16" width="64.3513" height="486.762">
-   <properties>
-    <property name="areaX" type="int" value="1"/>
-    <property name="areaY" type="int" value="6"/>
-    <property name="startTiledX" type="int" value="28"/>
-    <property name="startTiledY" type="int" value="19"/>
-   </properties>
-  </object>
-  <object id="64" name="TreeBarrierLong" x="17.2786" y="18.8726" width="245.729" height="3031.45">
-   <properties>
-    <property name="areaX" type="int" value="3"/>
-    <property name="areaY" type="int" value="28"/>
-    <property name="startTiledX" type="int" value="0"/>
-    <property name="startTiledY" type="int" value="0"/>
-   </properties>
-  </object>
-  <object id="65" name="TreeBarrierLong" x="1059.1" y="292.892" width="64.3513" height="1661.04">
-   <properties>
-    <property name="areaX" type="int" value="1"/>
-    <property name="areaY" type="int" value="18"/>
-    <property name="startTiledX" type="int" value="11"/>
-    <property name="startTiledY" type="int" value="3"/>
-   </properties>
-  </object>
-  <object id="66" name="TreeBarrierLong" x="1260.92" y="2047.02" width="64.3513" height="621.728">
-   <properties>
-    <property name="areaX" type="int" value="1"/>
-    <property name="areaY" type="int" value="7"/>
-    <property name="startTiledX" type="int" value="13"/>
-    <property name="startTiledY" type="int" value="21"/>
-   </properties>
-  </object>
-  <object id="67" name="TreeBarrierLong" x="2024.72" y="2052.45" width="64.3513" height="624.8">
-   <properties>
-    <property name="areaX" type="int" value="1"/>
-    <property name="areaY" type="int" value="7"/>
-    <property name="startTiledX" type="int" value="21"/>
-    <property name="startTiledY" type="int" value="21"/>
-   </properties>
-  </object>
-  <object id="68" name="TreeBarrierLong" x="1831.55" y="1082.75" width="64.3513" height="814.362">
-   <properties>
-    <property name="areaX" type="int" value="1"/>
-    <property name="areaY" type="int" value="9"/>
-    <property name="startTiledX" type="int" value="19"/>
-    <property name="startTiledY" type="int" value="11"/>
-   </properties>
-  </object>
-  <object id="69" name="TreeBarrierLong" x="2023.73" y="320.108" width="64.3513" height="612.198">
-   <properties>
-    <property name="areaX" type="int" value="1"/>
-    <property name="areaY" type="int" value="7"/>
-    <property name="startTiledX" type="int" value="21"/>
-    <property name="startTiledY" type="int" value="3"/>
-   </properties>
-  </object>
-  <object id="70" name="TreeBarrierLong" x="303.147" y="28.232" width="2350.15" height="244.893">
-   <properties>
-    <property name="areaX" type="int" value="25"/>
-    <property name="areaY" type="int" value="3"/>
-    <property name="startTiledX" type="int" value="3"/>
-    <property name="startTiledY" type="int" value="0"/>
-   </properties>
-  </object>
-  <object id="71" name="TreeBarrierLong" x="298.738" y="2715.99" width="2372.84" height="343.341">
-   <properties>
-    <property name="areaX" type="int" value="25"/>
-    <property name="areaY" type="int" value="4"/>
-    <property name="startTiledX" type="int" value="3"/>
-    <property name="startTiledY" type="int" value="28"/>
-   </properties>
-  </object>
-  <object id="72" name="TreeBarrierLong" x="312.266" y="1965.07" width="2366.64" height="32.9517">
-   <properties>
-    <property name="areaX" type="int" value="25"/>
-    <property name="areaY" type="int" value="1"/>
-    <property name="startTiledX" type="int" value="3"/>
-    <property name="startTiledY" type="int" value="20"/>
-   </properties>
-  </object>
-  <object id="73" name="TreeBarrierLong" x="1168.78" y="991.005" width="1506.97" height="43.4001">
-   <properties>
-    <property name="areaX" type="int" value="16"/>
-    <property name="areaY" type="int" value="1"/>
-    <property name="startTiledX" type="int" value="12"/>
-    <property name="startTiledY" type="int" value="10"/>
-   </properties>
-  </object>
-  <object id="74" name="TreeBarrierLong" x="297.991" y="1093.62" width="748.811" height="44.5307">
-   <properties>
-    <property name="areaX" type="int" value="8"/>
-    <property name="areaY" type="int" value="1"/>
-    <property name="startTiledX" type="int" value="3"/>
-    <property name="startTiledY" type="int" value="11"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>

+ 0 - 5
assets/Map/MyCity_02.tmx.meta

@@ -1,5 +0,0 @@
-{
-  "ver": "2.0.1",
-  "uuid": "81da0087-6eed-4ccb-aad1-1fe549a8ee76",
-  "subMetas": {}
-}

+ 0 - 250
assets/Map/MyCity_03.tmx

@@ -1,250 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.2" tiledversion="1.2.1" orientation="isometric" renderorder="right-down" width="32" height="32" tilewidth="165" tileheight="96" infinite="0" nextlayerid="59" nextobjectid="95">
- <tileset firstgid="1" name="Terrain_01_0" tilewidth="168" tileheight="99" tilecount="1" columns="1">
-  <image source="Terrain_01_0.png" width="168" height="99"/>
- </tileset>
- <tileset firstgid="2" name="Terrain_02_0" tilewidth="165" tileheight="96" tilecount="1" columns="1">
-  <image source="Terrain_02_0.png" width="168" height="99"/>
- </tileset>
- <tileset firstgid="3" name="Terrain_02_0" tilewidth="168" tileheight="99" tilecount="1" columns="1">
-  <image source="Terrain_02_0.png" width="168" height="99"/>
- </tileset>
- <tileset firstgid="4" name="Terrain_02_1" tilewidth="168" tileheight="99" tilecount="1" columns="1">
-  <image source="../Texture/Terrain_02_1.png" width="168" height="99"/>
- </tileset>
- <tileset firstgid="5" name="Terrain_09_0" tilewidth="333" tileheight="247" tilecount="1" columns="1">
-  <image source="../Texture/Terrain_09_0.png" width="333" height="247"/>
- </tileset>
- <tileset firstgid="6" name="Terrain_02_8" tilewidth="168" tileheight="99" tilecount="1" columns="1">
-  <image source="Terrain_02_8.png" width="168" height="99"/>
- </tileset>
- <tileset firstgid="7" name="Terrain_02_9" tilewidth="167" tileheight="99" tilecount="1" columns="1">
-  <image source="Terrain_02_9.png" width="168" height="99"/>
- </tileset>
- <tileset firstgid="8" name="Special_07_0" tilewidth="63" tileheight="164" tilecount="1" columns="1">
-  <image source="../Texture/Special_07_0.png" width="63" height="164"/>
- </tileset>
- <tileset firstgid="9" name="Terrain_09_2" tilewidth="75" tileheight="100" tilecount="1" columns="1">
-  <image source="../Texture/Terrain_09_2.png" width="75" height="100"/>
- </tileset>
- <tileset firstgid="10" name="Terrain_09_1" tilewidth="75" tileheight="100" tilecount="1" columns="1">
-  <image source="../Texture/Terrain_09_1.png" width="75" height="100"/>
- </tileset>
- <layer id="44" name="walkable" width="32" height="32">
-  <properties>
-   <property name="cc_vertexz" type="int" value="-1000"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztwwEJAAAMBKH7/qXXYyi4aqqqqurrBxngBAE=
-  </data>
- </layer>
- <layer id="45" name="InitPoint" width="32" height="32">
-  <data encoding="base64" compression="zlib">
-   eJztw7EJAAAIA7CC///s0NULJIEkAAAAP8wRqAU+aAAQ
-  </data>
- </layer>
- <layer id="46" name="OldPoint" width="32" height="32" visible="0">
-  <data encoding="base64" compression="zlib">
-   eJzt1FEGADAMBNGQ+985RwhrWZEZ+tm8lmqVVov7XOHj4//21eXyk+H75iTf0Xa2ZPj4+Dd9x791+f74+Ph7A7naAMo=
-  </data>
- </layer>
- <layer id="47" name="Highway" width="32" height="32">
-  <properties>
-   <property name="cc_vertexz" type="int" value="-1000"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAADwbhAAAAE=
-  </data>
- </layer>
- <layer id="48" name="BuildsHighway" width="32" height="32">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAADwbhAAAAE=
-  </data>
- </layer>
- <layer id="49" name="Road" width="32" height="32">
-  <data encoding="base64" compression="zlib">
-   eJztzbEJAAAIBLEH99/Zxhm0MAdXJ9mv5qv4fD6fz+fz+Xw+n8//5jfnywDB
-  </data>
- </layer>
- <layer id="50" name="BusinessRoad" width="32" height="32">
-  <data encoding="base64" compression="zlib">
-   eJzt1MEJAAAIw0Af7j+zH2ewQnLgAIFilaRLvUdF75eUQ/8/9H5l0fdH79cfA2nvADE=
-  </data>
- </layer>
- <layer id="51" name="Railing" width="32" height="32">
-  <data encoding="base64" compression="zlib">
-   eJzt0DERAAAIw8Cu+DfMjAE6JDHwd0nss9FH+/Ta//X19bk+vfZ/fbZPr/2f7tttASOqAL4=
-  </data>
- </layer>
- <layer id="52" name="RailingX" width="32" height="32">
-  <data encoding="base64" compression="zlib">
-   eJzt1sEJADAIA0Df7j9wX46gRbyDjJCQCEoOBNirs/+2A/jF/4G79P+eB8cpA98=
-  </data>
- </layer>
- <layer id="53" name="RailingY" width="32" height="32">
-  <data encoding="base64" compression="zlib">
-   eJzt0MkNACAIAEG+9t+wsQMVjxhnC2CACLXKA37vjjO38Pn89XNP+pn9+Hw+/1Yj/o4/8Pl8/VYF1KcCmw==
-  </data>
- </layer>
- <layer id="54" name="Trees" width="32" height="32">
-  <data encoding="base64" compression="zlib">
-   eJzt1bERADAIAzFK9p84K6TJmQvSAHxnqkjp5X0Adnr1f/ry9q99gOnS+5fuT3AAjj4AWQ==
-  </data>
- </layer>
- <objectgroup id="40" name="Barrier">
-  <object id="37" name="TreeBarrier" x="2028.54" y="1739.56" width="172.442" height="170.891">
-   <properties>
-    <property name="areaX" type="int" value="2"/>
-    <property name="areaY" type="int" value="2"/>
-    <property name="startTiledX" type="int" value="21"/>
-    <property name="startTiledY" type="int" value="18"/>
-   </properties>
-  </object>
-  <object id="58" name="TreeBarrier" x="2994.84" y="2788.49" width="53.4329" height="170.891">
-   <properties>
-    <property name="areaX" type="int" value="1"/>
-    <property name="areaY" type="int" value="2"/>
-    <property name="startTiledX" type="int" value="31"/>
-    <property name="startTiledY" type="int" value="29"/>
-   </properties>
-  </object>
-  <object id="59" name="TreeBarrier" x="2997.51" y="1628.34" width="53.4329" height="237.482">
-   <properties>
-    <property name="areaX" type="int" value="1"/>
-    <property name="areaY" type="int" value="3"/>
-    <property name="startTiledX" type="int" value="31"/>
-    <property name="startTiledY" type="int" value="17"/>
-   </properties>
-  </object>
-  <object id="52" name="RailingBarrierLong" x="2702.23" y="2532.67" width="64.1331" height="525.648">
-   <properties>
-    <property name="areaX" type="int" value="1"/>
-    <property name="areaY" type="int" value="6"/>
-    <property name="startTiledX" type="int" value="28"/>
-    <property name="startTiledY" type="int" value="26"/>
-   </properties>
-  </object>
-  <object id="53" name="RailingBarrierLong" x="2698.81" y="805.474" width="64.3513" height="875.908">
-   <properties>
-    <property name="areaX" type="int" value="1"/>
-    <property name="areaY" type="int" value="10"/>
-    <property name="startTiledX" type="int" value="28"/>
-    <property name="startTiledY" type="int" value="8"/>
-   </properties>
-  </object>
-  <object id="54" name="RailingBarrierLong" x="2698.48" y="37.1743" width="64.3513" height="583.375">
-   <properties>
-    <property name="areaX" type="int" value="1"/>
-    <property name="areaY" type="int" value="7"/>
-    <property name="startTiledX" type="int" value="28"/>
-    <property name="startTiledY" type="int" value="0"/>
-   </properties>
-  </object>
-  <object id="60" name="TreeBarrier" x="2995.42" y="294.65" width="53.4329" height="173.975">
-   <properties>
-    <property name="areaX" type="int" value="1"/>
-    <property name="areaY" type="int" value="2"/>
-    <property name="startTiledX" type="int" value="31"/>
-    <property name="startTiledY" type="int" value="3"/>
-   </properties>
-  </object>
-  <object id="63" name="TreeBarrierLong" x="2705.16" y="1857.16" width="64.3513" height="486.762">
-   <properties>
-    <property name="areaX" type="int" value="1"/>
-    <property name="areaY" type="int" value="6"/>
-    <property name="startTiledX" type="int" value="28"/>
-    <property name="startTiledY" type="int" value="19"/>
-   </properties>
-  </object>
-  <object id="64" name="TreeBarrierLong" x="17.2786" y="18.8726" width="141.984" height="3031.45">
-   <properties>
-    <property name="areaX" type="int" value="2"/>
-    <property name="areaY" type="int" value="28"/>
-    <property name="startTiledX" type="int" value="0"/>
-    <property name="startTiledY" type="int" value="0"/>
-   </properties>
-  </object>
-  <object id="70" name="TreeBarrierLong" x="213.438" y="28.232" width="2439.86" height="119.693">
-   <properties>
-    <property name="areaX" type="int" value="26"/>
-    <property name="areaY" type="int" value="2"/>
-    <property name="startTiledX" type="int" value="2"/>
-    <property name="startTiledY" type="int" value="0"/>
-   </properties>
-  </object>
-  <object id="71" name="TreeBarrierLong" x="219.502" y="2824.5" width="2452.08" height="234.832">
-   <properties>
-    <property name="areaX" type="int" value="26"/>
-    <property name="areaY" type="int" value="3"/>
-    <property name="startTiledX" type="int" value="2"/>
-    <property name="startTiledY" type="int" value="29"/>
-   </properties>
-  </object>
- </objectgroup>
- <objectgroup id="56" name="Region">
-  <object id="76" name="Region0" x="1369.16" y="2044.34" width="725.424" height="596.6">
-   <properties>
-    <property name="areaX" type="int" value="8"/>
-    <property name="areaY" type="int" value="7"/>
-    <property name="startTiledX" type="int" value="14"/>
-    <property name="startTiledY" type="int" value="21"/>
-   </properties>
-  </object>
-  <object id="77" name="Region1" x="331.997" y="2041.83" width="990.914" height="607.4">
-   <properties>
-    <property name="areaX" type="int" value="8"/>
-    <property name="areaY" type="int" value="7"/>
-    <property name="startTiledX" type="int" value="10"/>
-    <property name="startTiledY" type="int" value="21"/>
-   </properties>
-  </object>
-  <object id="78" name="Region2" x="313.416" y="1187.17" width="712.878" height="760.564">
-   <properties>
-    <property name="areaX" type="int" value="8"/>
-    <property name="areaY" type="int" value="9"/>
-    <property name="startTiledX" type="int" value="3"/>
-    <property name="startTiledY" type="int" value="12"/>
-   </properties>
-  </object>
-  <object id="79" name="Region3" x="307.125" y="332.154" width="712.878" height="760.564">
-   <properties>
-    <property name="areaX" type="int" value="8"/>
-    <property name="areaY" type="int" value="9"/>
-    <property name="startTiledX" type="int" value="3"/>
-    <property name="startTiledY" type="int" value="3"/>
-   </properties>
-  </object>
-  <object id="81" name="Region4" x="1103.36" y="338.882" width="879.387" height="582.782">
-   <properties>
-    <property name="areaX" type="int" value="10"/>
-    <property name="areaY" type="int" value="7"/>
-    <property name="startTiledX" type="int" value="11"/>
-    <property name="startTiledY" type="int" value="3"/>
-   </properties>
-  </object>
-  <object id="82" name="Region5" x="2049.91" y="344.191" width="578.188" height="579.291">
-   <properties>
-    <property name="areaX" type="int" value="7"/>
-    <property name="areaY" type="int" value="7"/>
-    <property name="startTiledX" type="int" value="21"/>
-    <property name="startTiledY" type="int" value="3"/>
-   </properties>
-  </object>
-  <object id="83" name="Region6" x="1957.22" y="1013.5" width="688.078" height="944.673">
-   <properties>
-    <property name="areaX" type="int" value="8"/>
-    <property name="areaY" type="int" value="11"/>
-    <property name="startTiledX" type="int" value="20"/>
-    <property name="startTiledY" type="int" value="10"/>
-   </properties>
-  </object>
-  <object id="80" name="Region7" x="1106.51" y="1003.9" width="778.66" height="943.182">
-   <properties>
-    <property name="areaX" type="int" value="9"/>
-    <property name="areaY" type="int" value="11"/>
-    <property name="startTiledX" type="int" value="11"/>
-    <property name="startTiledY" type="int" value="10"/>
-   </properties>
-  </object>
- </objectgroup>
-</map>

+ 0 - 5
assets/Map/MyCity_03.tmx.meta

@@ -1,5 +0,0 @@
-{
-  "ver": "2.0.1",
-  "uuid": "04a5717b-f404-4cfb-9e48-3ee573d2df17",
-  "subMetas": {}
-}

+ 0 - 259
assets/Map/MyCity_06.tmx

@@ -1,259 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.2" tiledversion="1.2.1" orientation="isometric" renderorder="right-down" width="32" height="32" tilewidth="165" tileheight="96" infinite="0" nextlayerid="62" nextobjectid="132">
- <tileset firstgid="1" name="Terrain_01_0" tilewidth="168" tileheight="99" tilecount="1" columns="1">
-  <image source="Terrain_01_0.png" width="168" height="99"/>
- </tileset>
- <tileset firstgid="2" name="Terrain_02_0" tilewidth="165" tileheight="96" tilecount="1" columns="1">
-  <image source="Terrain_02_0.png" width="168" height="99"/>
- </tileset>
- <tileset firstgid="3" name="Terrain_02_0" tilewidth="168" tileheight="99" tilecount="1" columns="1">
-  <image source="Terrain_02_0.png" width="168" height="99"/>
- </tileset>
- <tileset firstgid="4" name="Terrain_02_1" tilewidth="168" tileheight="99" tilecount="0" columns="0">
-  <image source="../Texture/Terrain_02_1.png" width="167" height="99"/>
- </tileset>
- <tileset firstgid="4" name="Terrain_09_0" tilewidth="333" tileheight="247" tilecount="1" columns="1">
-  <image source="../Texture/Terrain_09_0.png" width="333" height="247"/>
- </tileset>
- <tileset firstgid="5" name="Terrain_02_8" tilewidth="168" tileheight="99" tilecount="1" columns="1">
-  <image source="Terrain_02_8.png" width="168" height="99"/>
- </tileset>
- <tileset firstgid="6" name="Terrain_02_9" tilewidth="167" tileheight="99" tilecount="1" columns="1">
-  <image source="Terrain_02_9.png" width="168" height="99"/>
- </tileset>
- <tileset firstgid="7" name="Special_07_0" tilewidth="63" tileheight="164" tilecount="1" columns="1">
-  <image source="../Texture/Special_07_0.png" width="63" height="164"/>
- </tileset>
- <tileset firstgid="8" name="Terrain_09_2" tilewidth="75" tileheight="100" tilecount="1" columns="1">
-  <image source="../Texture/Terrain_09_2.png" width="75" height="100"/>
- </tileset>
- <tileset firstgid="9" name="Terrain_09_1" tilewidth="75" tileheight="100" tilecount="1" columns="1">
-  <image source="../Texture/Terrain_09_1.png" width="75" height="100"/>
- </tileset>
- <tileset firstgid="10" name="Terrain_02_3" tilewidth="166" tileheight="99" tilecount="2" columns="2">
-  <image source="../Texture/Terrain_02_3.png" width="332" height="99"/>
- </tileset>
- <tileset firstgid="12" name="Terrain_09_3" tilewidth="167" tileheight="127" tilecount="2" columns="2">
-  <image source="../Texture/Terrain_09_3.png" width="334" height="127"/>
- </tileset>
- <tileset firstgid="14" name="Terrain_07_1" tilewidth="166" tileheight="99" tilecount="2" columns="2">
-  <image source="../Texture/Terrain_07_1.png" width="332" height="99"/>
-  <tile id="0">
-   <properties>
-    <property name="moveX" type="int" value="1"/>
-   </properties>
-  </tile>
-  <tile id="1">
-   <properties>
-    <property name="moveY" type="int" value="2"/>
-   </properties>
-  </tile>
- </tileset>
- <layer id="44" name="walkable" width="32" height="32" visible="0">
-  <properties>
-   <property name="cc_vertexz" type="int" value="-1000"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztwwEJAAAMBKH7/qXXYyi4aqqqqurrBxngBAE=
-  </data>
- </layer>
- <layer id="45" name="InitPoint" width="32" height="32">
-  <data encoding="base64" compression="zlib">
-   eJztl8EOwCAIQzlrMv7/b3ceIdCwzplIEy5M81bFDUVau+hKYgBjsnGRlPgMzTV/Lz5SX0iw/KvJv/G6mu+tyQj4k8xHcsic3fjVWqvwpzz35Wv/njeV3Ks3D1mn7P1W+/dyf9SfmjiBb/eZzcq+f55/Nj9S9P9Dzxj7/FX9rOg/ms/lo71Vdg+o9v+t83QDD34OUg==
-  </data>
- </layer>
- <layer id="59" name="InsideRoad" width="32" height="32" visible="0">
-  <data encoding="base64" compression="zlib">
-   eJzt1LEJACAMRcEP7r+zI6gkFso9sFK8VEn0SqP5HZ/PP/M7TuX/1Xw34/P5//pd+62yw3bnrNzz+XwpmX9vASc=
-  </data>
- </layer>
- <layer id="46" name="OldPoint" width="32" height="32" visible="0">
-  <data encoding="base64" compression="zlib">
-   eJzt1FEGADAMBNGQ+985RwhrWZEZ+tm8lmqVVov7XOHj4//21eXyk+H75iTf0Xa2ZPj4+Dd9x791+f74+Ph7A7naAMo=
-  </data>
- </layer>
- <layer id="47" name="Highway" width="32" height="32">
-  <properties>
-   <property name="cc_vertexz" type="int" value="-1000"/>
-  </properties>
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAADwbhAAAAE=
-  </data>
- </layer>
- <layer id="48" name="BuildsHighway" width="32" height="32">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAADwbhAAAAE=
-  </data>
- </layer>
- <layer id="49" name="Road" width="32" height="32">
-  <data encoding="base64" compression="zlib">
-   eJztzbEJAAAIBLEH99/Zxhm0MAdXJ9mv5qv4fD6fz+fz+Xw+n8//5jfnywDB
-  </data>
- </layer>
- <layer id="50" name="BusinessRoad" width="32" height="32" visible="0">
-  <data encoding="base64" compression="zlib">
-   eJzt08EJAEAIBDH/9t+vn4MrIhOwgGFxJkkc+06l9ycy/f/1fp2+v96f7wBDVQCF
-  </data>
- </layer>
- <layer id="51" name="Railing" width="32" height="32">
-  <data encoding="base64" compression="zlib">
-   eJztzwENAAAIwzAM4N8uLjgJnYFmVdqs+Xz+Wz9d+p/P5//106X/+Xy+rjRM5gFG
-  </data>
- </layer>
- <layer id="52" name="RailingX" width="32" height="32">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAADwbhAAAAE=
-  </data>
- </layer>
- <layer id="53" name="RailingY" width="32" height="32">
-  <data encoding="base64" compression="zlib">
-   eJztwQENAAAAwqD3T20PBxQAAADwbhAAAAE=
-  </data>
- </layer>
- <layer id="54" name="Trees" width="32" height="32">
-  <data encoding="base64" compression="zlib">
-   eJzt1TERAAAMArFu9e+4MugdiYHfYIaULe8D0Cn9P+19gJT0/qX7Hxx80wAy
-  </data>
- </layer>
- <objectgroup id="40" name="Barrier" visible="0">
-  <object id="58" name="TreeBarrier" x="2994.84" y="2788.49" width="53.4329" height="170.891">
-   <properties>
-    <property name="areaX" type="int" value="1"/>
-    <property name="areaY" type="int" value="2"/>
-    <property name="startTiledX" type="int" value="31"/>
-    <property name="startTiledY" type="int" value="29"/>
-   </properties>
-  </object>
-  <object id="59" name="TreeBarrier" x="2997.51" y="1628.34" width="53.4329" height="237.482">
-   <properties>
-    <property name="areaX" type="int" value="1"/>
-    <property name="areaY" type="int" value="3"/>
-    <property name="startTiledX" type="int" value="31"/>
-    <property name="startTiledY" type="int" value="17"/>
-   </properties>
-  </object>
-  <object id="53" name="RailingBarrierLong" x="2698.81" y="1080.57" width="64.3513" height="773.318">
-   <properties>
-    <property name="areaX" type="int" value="1"/>
-    <property name="areaY" type="int" value="9"/>
-    <property name="startTiledX" type="int" value="28"/>
-    <property name="startTiledY" type="int" value="11"/>
-   </properties>
-  </object>
-  <object id="54" name="RailingBarrierLong" x="2698.48" y="37.1743" width="64.3513" height="874.119">
-   <properties>
-    <property name="areaX" type="int" value="1"/>
-    <property name="areaY" type="int" value="10"/>
-    <property name="startTiledX" type="int" value="28"/>
-    <property name="startTiledY" type="int" value="0"/>
-   </properties>
-  </object>
-  <object id="60" name="TreeBarrier" x="2995.42" y="294.65" width="53.4329" height="173.975">
-   <properties>
-    <property name="areaX" type="int" value="1"/>
-    <property name="areaY" type="int" value="2"/>
-    <property name="startTiledX" type="int" value="31"/>
-    <property name="startTiledY" type="int" value="3"/>
-   </properties>
-  </object>
-  <object id="63" name="TreeBarrierLong" x="2705.16" y="2043.28" width="64.3513" height="815.099">
-   <properties>
-    <property name="areaX" type="int" value="1"/>
-    <property name="areaY" type="int" value="9"/>
-    <property name="startTiledX" type="int" value="28"/>
-    <property name="startTiledY" type="int" value="21"/>
-   </properties>
-  </object>
-  <object id="64" name="TreeBarrierLong" x="17.2786" y="18.8726" width="141.984" height="3031.45">
-   <properties>
-    <property name="areaX" type="int" value="2"/>
-    <property name="areaY" type="int" value="28"/>
-    <property name="startTiledX" type="int" value="0"/>
-    <property name="startTiledY" type="int" value="0"/>
-   </properties>
-  </object>
-  <object id="70" name="TreeBarrierLong" x="213.438" y="28.232" width="2439.86" height="119.693">
-   <properties>
-    <property name="areaX" type="int" value="26"/>
-    <property name="areaY" type="int" value="2"/>
-    <property name="startTiledX" type="int" value="2"/>
-    <property name="startTiledY" type="int" value="0"/>
-   </properties>
-  </object>
-  <object id="71" name="TreeBarrierLong" x="219.502" y="2824.5" width="2452.08" height="234.832">
-   <properties>
-    <property name="areaX" type="int" value="26"/>
-    <property name="areaY" type="int" value="3"/>
-    <property name="startTiledX" type="int" value="2"/>
-    <property name="startTiledY" type="int" value="29"/>
-   </properties>
-  </object>
- </objectgroup>
- <objectgroup id="56" name="Region" visible="0">
-  <object id="76" name="Region0" x="1369.16" y="2044.34" width="725.424" height="596.6">
-   <properties>
-    <property name="areaX" type="int" value="8"/>
-    <property name="areaY" type="int" value="7"/>
-    <property name="startTiledX" type="int" value="14"/>
-    <property name="startTiledY" type="int" value="21"/>
-   </properties>
-  </object>
-  <object id="77" name="Region1" x="331.997" y="2041.83" width="990.914" height="607.4">
-   <properties>
-    <property name="areaX" type="int" value="8"/>
-    <property name="areaY" type="int" value="7"/>
-    <property name="startTiledX" type="int" value="10"/>
-    <property name="startTiledY" type="int" value="21"/>
-   </properties>
-  </object>
-  <object id="78" name="Region2" x="313.416" y="1187.17" width="712.878" height="760.564">
-   <properties>
-    <property name="areaX" type="int" value="8"/>
-    <property name="areaY" type="int" value="9"/>
-    <property name="startTiledX" type="int" value="3"/>
-    <property name="startTiledY" type="int" value="12"/>
-   </properties>
-  </object>
-  <object id="79" name="Region3" x="307.125" y="332.154" width="712.878" height="760.564">
-   <properties>
-    <property name="areaX" type="int" value="8"/>
-    <property name="areaY" type="int" value="9"/>
-    <property name="startTiledX" type="int" value="3"/>
-    <property name="startTiledY" type="int" value="3"/>
-   </properties>
-  </object>
-  <object id="81" name="Region4" x="1103.36" y="338.882" width="879.387" height="582.782">
-   <properties>
-    <property name="areaX" type="int" value="10"/>
-    <property name="areaY" type="int" value="7"/>
-    <property name="startTiledX" type="int" value="11"/>
-    <property name="startTiledY" type="int" value="3"/>
-   </properties>
-  </object>
-  <object id="82" name="Region5" x="2049.91" y="344.191" width="578.188" height="579.291">
-   <properties>
-    <property name="areaX" type="int" value="7"/>
-    <property name="areaY" type="int" value="7"/>
-    <property name="startTiledX" type="int" value="21"/>
-    <property name="startTiledY" type="int" value="3"/>
-   </properties>
-  </object>
-  <object id="83" name="Region6" x="1956.01" y="1051.08" width="688.078" height="944.673">
-   <properties>
-    <property name="areaX" type="int" value="8"/>
-    <property name="areaY" type="int" value="11"/>
-    <property name="startTiledX" type="int" value="20"/>
-    <property name="startTiledY" type="int" value="10"/>
-   </properties>
-  </object>
-  <object id="80" name="Region7" x="1106.51" y="1003.9" width="778.66" height="943.182">
-   <properties>
-    <property name="areaX" type="int" value="9"/>
-    <property name="areaY" type="int" value="11"/>
-    <property name="startTiledX" type="int" value="11"/>
-    <property name="startTiledY" type="int" value="10"/>
-   </properties>
-  </object>
- </objectgroup>
- <objectgroup id="61" name="Highway" visible="0"/>
-</map>

+ 0 - 5
assets/Map/MyCity_06.tmx.meta

@@ -1,5 +0,0 @@
-{
-  "ver": "2.0.1",
-  "uuid": "0ba35888-7ebc-4dc6-b91a-7a079968e726",
-  "subMetas": {}
-}

二进制
assets/Map/Player/Player1/AllGuy_tex.png


二进制
assets/Map/Player/Player2/AllGuy_tex.png


二进制
assets/Map/Player/Player3/OtherGuy_tex.png


二进制
assets/Map/Player/Player4/OtherGuy_tex.png


二进制
assets/Map/Player/Player4/WorkGuy_tex.png


二进制
assets/Map/Player/Player5/WorkGuy_tex.png


文件差异内容过多而无法显示
+ 871 - 168
assets/Prefabs/UI/lease/GrantPanel.prefab


文件差异内容过多而无法显示
+ 521 - 71
assets/Prefabs/UI/lease/LandInfo.prefab


文件差异内容过多而无法显示
+ 258 - 132
assets/Prefabs/UI/lease/LeaseInfo.prefab


文件差异内容过多而无法显示
+ 540 - 69
assets/Prefabs/UI/lease/PlantInfo.prefab


+ 3 - 3
assets/Prefabs/UI/lease/SalePanel.prefab

@@ -2057,7 +2057,7 @@
     "_position": {
       "__type__": "cc.Vec3",
       "x": -82.447,
-      "y": -30,
+      "y": -48.123,
       "z": 0
     },
     "_scale": {
@@ -2120,7 +2120,7 @@
     "_position": {
       "__type__": "cc.Vec3",
       "x": 159.528,
-      "y": 1.14,
+      "y": 0,
       "z": 0
     },
     "_scale": {
@@ -2660,7 +2660,7 @@
     "_position": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -175.198,
+      "y": -161.908,
       "z": 0
     },
     "_scale": {

+ 300 - 114
assets/Prefabs/UI/seed/HolyFarmlandFruit.prefab

@@ -27,27 +27,30 @@
         "__id__": 8
       },
       {
-        "__id__": 14
+        "__id__": 12
       },
       {
-        "__id__": 20
+        "__id__": 19
+      },
+      {
+        "__id__": 25
       }
     ],
     "_active": true,
     "_level": 1,
     "_components": [
       {
-        "__id__": 38
+        "__id__": 44
       },
       {
-        "__id__": 40
+        "__id__": 46
       },
       {
-        "__id__": 42
+        "__id__": 48
       }
     ],
     "_prefab": {
-      "__id__": 43
+      "__id__": 49
     },
     "_opacity": 255,
     "_color": {
@@ -60,7 +63,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 173,
-      "height": 270
+      "height": 310
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -130,7 +133,7 @@
     "_position": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 21,
+      "y": 44.019,
       "z": 0
     },
     "_scale": {
@@ -233,7 +236,7 @@
     "_position": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 41,
+      "y": 64.019,
       "z": 0
     },
     "_scale": {
@@ -304,20 +307,19 @@
     "_parent": {
       "__id__": 1
     },
-    "_children": [
-      {
-        "__id__": 9
-      }
-    ],
+    "_children": [],
     "_active": true,
     "_level": 3,
     "_components": [
       {
-        "__id__": 12
+        "__id__": 9
+      },
+      {
+        "__id__": 10
       }
     ],
     "_prefab": {
-      "__id__": 13
+      "__id__": 11
     },
     "_opacity": 255,
     "_color": {
@@ -329,8 +331,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 44,
-      "height": 27.72
+      "width": 45.4,
+      "height": 29.119999999999997
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -339,8 +341,131 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": -13,
-      "y": -61,
+      "x": -2.962,
+      "y": -34.396,
+      "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__": 8
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_useOriginalSize": false,
+    "_string": "种子",
+    "_N$string": "种子",
+    "_fontSize": 22,
+    "_lineHeight": 22,
+    "_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.LabelOutline",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 8
+    },
+    "_enabled": true,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_width": 0.7,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "b056e9fe-07e9-4094-ba81-0b13bafda1aa"
+    },
+    "fileId": "909EqhOPJPo5PQuNC0hGuC",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "seedNum",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [
+      {
+        "__id__": 13
+      }
+    ],
+    "_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": 168,
+      "height": 45
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": -85.32,
       "z": 0
     },
     "_scale": {
@@ -366,31 +491,34 @@
     "_name": "Num",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 8
+      "__id__": 12
     },
     "_children": [],
     "_active": true,
-    "_level": 4,
+    "_level": 3,
     "_components": [
       {
-        "__id__": 10
+        "__id__": 14
+      },
+      {
+        "__id__": 15
       }
     ],
     "_prefab": {
-      "__id__": 11
+      "__id__": 16
     },
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
+      "r": 237,
+      "g": 106,
+      "b": 144,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 26.4,
-      "height": 31.5
+      "width": 15.5,
+      "height": 33.1
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -399,8 +527,8 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": 68.162,
-      "y": 0,
+      "x": -1.479,
+      "y": 2.886,
       "z": 0
     },
     "_scale": {
@@ -426,7 +554,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 9
+      "__id__": 13
     },
     "_enabled": true,
     "_materials": [
@@ -435,8 +563,8 @@
       }
     ],
     "_useOriginalSize": false,
-    "_string": "x1",
-    "_N$string": "x1",
+    "_string": "1",
+    "_N$string": "1",
     "_fontSize": 25,
     "_lineHeight": 25,
     "_enableWrapText": true,
@@ -451,6 +579,24 @@
     "_N$cacheMode": 0,
     "_id": ""
   },
+  {
+    "__type__": "cc.LabelOutline",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 13
+    },
+    "_enabled": true,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 237,
+      "g": 106,
+      "b": 144,
+      "a": 255
+    },
+    "_width": 0.8,
+    "_id": ""
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -459,15 +605,15 @@
     "asset": {
       "__uuid__": "b056e9fe-07e9-4094-ba81-0b13bafda1aa"
     },
-    "fileId": "e3rr13PDNGVb9kPwsbpqwD",
+    "fileId": "0etLMXSBhKpJNc/xbpretJ",
     "sync": false
   },
   {
-    "__type__": "cc.Label",
+    "__type__": "cc.Sprite",
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 8
+      "__id__": 12
     },
     "_enabled": true,
     "_materials": [
@@ -475,21 +621,23 @@
         "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
       }
     ],
-    "_useOriginalSize": false,
-    "_string": "种子",
-    "_N$string": "种子",
-    "_fontSize": 22,
-    "_lineHeight": 22,
-    "_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,
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "f38f8a90-bff0-45e6-a971-020cd7357e7f"
+    },
+    "_type": 0,
+    "_sizeMode": 0,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": true,
+    "_atlas": null,
     "_id": ""
   },
   {
@@ -500,7 +648,7 @@
     "asset": {
       "__uuid__": "b056e9fe-07e9-4094-ba81-0b13bafda1aa"
     },
-    "fileId": "909EqhOPJPo5PQuNC0hGuC",
+    "fileId": "dcvP+R+zVPBa2LyuohpPLz",
     "sync": false
   },
   {
@@ -515,17 +663,17 @@
     "_level": 3,
     "_components": [
       {
-        "__id__": 15
+        "__id__": 20
       },
       {
-        "__id__": 17
+        "__id__": 22
       },
       {
-        "__id__": 18
+        "__id__": 23
       }
     ],
     "_prefab": {
-      "__id__": 19
+      "__id__": 24
     },
     "_opacity": 255,
     "_color": {
@@ -548,7 +696,7 @@
     "_position": {
       "__type__": "cc.Vec3",
       "x": 75,
-      "y": 121,
+      "y": 144.019,
       "z": 0
     },
     "_scale": {
@@ -574,14 +722,14 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 14
+      "__id__": 19
     },
     "_enabled": true,
     "duration": 0.1,
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 16
+        "__id__": 21
       }
     ],
     "_N$interactable": true,
@@ -637,7 +785,7 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 14
+      "__id__": 19
     },
     "_id": ""
   },
@@ -656,7 +804,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 14
+      "__id__": 19
     },
     "_enabled": true,
     "_materials": [
@@ -688,7 +836,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 14
+      "__id__": 19
     },
     "_enabled": true,
     "_id": ""
@@ -713,17 +861,21 @@
     },
     "_children": [
       {
-        "__id__": 21
+        "__id__": 26
       },
       {
-        "__id__": 29
+        "__id__": 34
       }
     ],
     "_active": true,
     "_level": 2,
-    "_components": [],
+    "_components": [
+      {
+        "__id__": 42
+      }
+    ],
     "_prefab": {
-      "__id__": 37
+      "__id__": 43
     },
     "_opacity": 255,
     "_color": {
@@ -735,7 +887,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 173,
+      "width": 170,
       "height": 40
     },
     "_anchorPoint": {
@@ -746,7 +898,7 @@
     "_position": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -111,
+      "y": -131.717,
       "z": 0
     },
     "_scale": {
@@ -769,25 +921,25 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "grant",
+    "_name": "sale",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 20
+      "__id__": 25
     },
     "_children": [
       {
-        "__id__": 22
+        "__id__": 27
       }
     ],
     "_active": true,
     "_level": 3,
     "_components": [
       {
-        "__id__": 26
+        "__id__": 31
       }
     ],
     "_prefab": {
-      "__id__": 28
+      "__id__": 33
     },
     "_opacity": 255,
     "_color": {
@@ -809,7 +961,7 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": 46,
+      "x": -40,
       "y": 0,
       "z": 0
     },
@@ -836,21 +988,21 @@
     "_name": "Background",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 21
+      "__id__": 26
     },
     "_children": [],
     "_active": true,
     "_level": 2,
     "_components": [
       {
-        "__id__": 23
+        "__id__": 28
       },
       {
-        "__id__": 24
+        "__id__": 29
       }
     ],
     "_prefab": {
-      "__id__": 25
+      "__id__": 30
     },
     "_opacity": 255,
     "_color": {
@@ -899,7 +1051,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 22
+      "__id__": 27
     },
     "_enabled": true,
     "_materials": [
@@ -910,7 +1062,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "259987bb-0a59-45ea-93e5-e426be699d29"
+      "__uuid__": "30b277f2-db20-4081-9ad1-f2e6be16bf10"
     },
     "_type": 1,
     "_sizeMode": 0,
@@ -931,7 +1083,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 22
+      "__id__": 27
     },
     "_enabled": true,
     "alignMode": 0,
@@ -961,7 +1113,7 @@
     "asset": {
       "__uuid__": "b056e9fe-07e9-4094-ba81-0b13bafda1aa"
     },
-    "fileId": "c9GvvcShxOXbzDzIjJt8KY",
+    "fileId": "d9EwvdV6lPEZfmB8lrM3OR",
     "sync": false
   },
   {
@@ -969,14 +1121,14 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 21
+      "__id__": 26
     },
     "_enabled": true,
     "duration": 0.1,
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 27
+        "__id__": 32
       }
     ],
     "_N$interactable": true,
@@ -1026,7 +1178,7 @@
       "a": 200
     },
     "_N$normalSprite": {
-      "__uuid__": "259987bb-0a59-45ea-93e5-e426be699d29"
+      "__uuid__": "30b277f2-db20-4081-9ad1-f2e6be16bf10"
     },
     "_N$pressedSprite": {
       "__uuid__": "e9ec654c-97a2-4787-9325-e6a10375219a"
@@ -1044,7 +1196,7 @@
       "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
     },
     "_N$target": {
-      "__id__": 22
+      "__id__": 27
     },
     "_id": ""
   },
@@ -1055,7 +1207,7 @@
     },
     "component": "",
     "_componentId": "985b6AjuYtNapwlu4dBpFa6",
-    "handler": "onGrantInfo",
+    "handler": "onSaleInfo",
     "customEventData": ""
   },
   {
@@ -1066,30 +1218,30 @@
     "asset": {
       "__uuid__": "b056e9fe-07e9-4094-ba81-0b13bafda1aa"
     },
-    "fileId": "e4G2uLIrhF2b4EI0AAZsVq",
+    "fileId": "5a6IE0buFNpqxorXGCGeoP",
     "sync": false
   },
   {
     "__type__": "cc.Node",
-    "_name": "sale",
+    "_name": "grant",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 20
+      "__id__": 25
     },
     "_children": [
       {
-        "__id__": 30
+        "__id__": 35
       }
     ],
     "_active": true,
     "_level": 3,
     "_components": [
       {
-        "__id__": 34
+        "__id__": 39
       }
     ],
     "_prefab": {
-      "__id__": 36
+      "__id__": 41
     },
     "_opacity": 255,
     "_color": {
@@ -1111,7 +1263,7 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": -46,
+      "x": 40,
       "y": 0,
       "z": 0
     },
@@ -1138,21 +1290,21 @@
     "_name": "Background",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 29
+      "__id__": 34
     },
     "_children": [],
     "_active": true,
     "_level": 2,
     "_components": [
       {
-        "__id__": 31
+        "__id__": 36
       },
       {
-        "__id__": 32
+        "__id__": 37
       }
     ],
     "_prefab": {
-      "__id__": 33
+      "__id__": 38
     },
     "_opacity": 255,
     "_color": {
@@ -1201,7 +1353,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 30
+      "__id__": 35
     },
     "_enabled": true,
     "_materials": [
@@ -1212,7 +1364,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "30b277f2-db20-4081-9ad1-f2e6be16bf10"
+      "__uuid__": "259987bb-0a59-45ea-93e5-e426be699d29"
     },
     "_type": 1,
     "_sizeMode": 0,
@@ -1233,7 +1385,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 30
+      "__id__": 35
     },
     "_enabled": true,
     "alignMode": 0,
@@ -1263,7 +1415,7 @@
     "asset": {
       "__uuid__": "b056e9fe-07e9-4094-ba81-0b13bafda1aa"
     },
-    "fileId": "d9EwvdV6lPEZfmB8lrM3OR",
+    "fileId": "c9GvvcShxOXbzDzIjJt8KY",
     "sync": false
   },
   {
@@ -1271,14 +1423,14 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 29
+      "__id__": 34
     },
     "_enabled": true,
     "duration": 0.1,
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 35
+        "__id__": 40
       }
     ],
     "_N$interactable": true,
@@ -1328,7 +1480,7 @@
       "a": 200
     },
     "_N$normalSprite": {
-      "__uuid__": "30b277f2-db20-4081-9ad1-f2e6be16bf10"
+      "__uuid__": "259987bb-0a59-45ea-93e5-e426be699d29"
     },
     "_N$pressedSprite": {
       "__uuid__": "e9ec654c-97a2-4787-9325-e6a10375219a"
@@ -1346,7 +1498,7 @@
       "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
     },
     "_N$target": {
-      "__id__": 30
+      "__id__": 35
     },
     "_id": ""
   },
@@ -1357,7 +1509,7 @@
     },
     "component": "",
     "_componentId": "985b6AjuYtNapwlu4dBpFa6",
-    "handler": "onSaleInfo",
+    "handler": "onGrantInfo",
     "customEventData": ""
   },
   {
@@ -1368,9 +1520,42 @@
     "asset": {
       "__uuid__": "b056e9fe-07e9-4094-ba81-0b13bafda1aa"
     },
-    "fileId": "5a6IE0buFNpqxorXGCGeoP",
+    "fileId": "e4G2uLIrhF2b4EI0AAZsVq",
     "sync": false
   },
+  {
+    "__type__": "cc.Layout",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 25
+    },
+    "_enabled": true,
+    "_layoutSize": {
+      "__type__": "cc.Size",
+      "width": 170,
+      "height": 40
+    },
+    "_resize": 1,
+    "_N$layoutType": 1,
+    "_N$padding": 0,
+    "_N$cellSize": {
+      "__type__": "cc.Size",
+      "width": 40,
+      "height": 40
+    },
+    "_N$startAxis": 0,
+    "_N$paddingLeft": 10,
+    "_N$paddingRight": 10,
+    "_N$paddingTop": 0,
+    "_N$paddingBottom": 0,
+    "_N$spacingX": 10,
+    "_N$spacingY": 0,
+    "_N$verticalDirection": 1,
+    "_N$horizontalDirection": 0,
+    "_N$affectedByScale": false,
+    "_id": ""
+  },
   {
     "__type__": "cc.PrefabInfo",
     "root": {
@@ -1394,7 +1579,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 39
+        "__id__": 45
       }
     ],
     "_N$interactable": true,
@@ -1489,20 +1674,21 @@
     "DiamondPrice": 1,
     "CNT": "",
     "SNB": "",
+    "Mature": "",
     "Synopsis": "可在神农农田播种",
-    "consumeType": 2,
+    "consumeType": 3,
     "bgSprite": {
       "__id__": 6
     },
     "NumLabel": {
-      "__id__": 10
+      "__id__": 14
     },
     "NameLabel": {
-      "__id__": 12
+      "__id__": 9
     },
     "clickEvents": [
       {
-        "__id__": 41
+        "__id__": 47
       }
     ],
     "_id": ""

+ 366 - 147
assets/Prefabs/UI/seed/HolyFarmlandSeed.prefab

@@ -24,30 +24,33 @@
         "__id__": 5
       },
       {
-        "__id__": 11
+        "__id__": 8
       },
       {
-        "__id__": 17
+        "__id__": 12
+      },
+      {
+        "__id__": 18
+      },
+      {
+        "__id__": 25
       }
     ],
     "_active": true,
     "_level": 1,
     "_components": [
       {
-        "__id__": 28
-      },
-      {
-        "__id__": 29
+        "__id__": 36
       },
       {
-        "__id__": 31
+        "__id__": 38
       },
       {
-        "__id__": 33
+        "__id__": 40
       }
     ],
     "_prefab": {
-      "__id__": 34
+      "__id__": 41
     },
     "_opacity": 255,
     "_color": {
@@ -60,7 +63,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 173,
-      "height": 215
+      "height": 265
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -93,7 +96,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "picture",
+    "_name": "currency_bg_2",
     "_objFlags": 0,
     "_parent": {
       "__id__": 1
@@ -119,8 +122,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 108,
-      "height": 135
+      "width": 173,
+      "height": 215
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -130,13 +133,13 @@
     "_position": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 22,
+      "y": 19,
       "z": 0
     },
     "_scale": {
       "__type__": "cc.Vec3",
-      "x": 0.7,
-      "y": 0.7,
+      "x": 1,
+      "y": 1,
       "z": 1
     },
     "_eulerAngles": {
@@ -167,7 +170,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "301b3d49-5ffd-4773-87b9-3a0c6cc064d3"
+      "__uuid__": "98c8ea12-e46b-44a1-ba81-d0b5028081e6"
     },
     "_type": 0,
     "_sizeMode": 1,
@@ -191,43 +194,39 @@
     "asset": {
       "__uuid__": "bb950ba5-2167-4f1e-b274-07765f8ddbc3"
     },
-    "fileId": "65KxOLcr5MuIonNQNpmieg",
+    "fileId": "9bBkl/GGFFO5r70ThOO6wK",
     "sync": false
   },
   {
     "__type__": "cc.Node",
-    "_name": "Name",
+    "_name": "picture",
     "_objFlags": 0,
     "_parent": {
       "__id__": 1
     },
-    "_children": [
-      {
-        "__id__": 6
-      }
-    ],
+    "_children": [],
     "_active": true,
-    "_level": 3,
+    "_level": 2,
     "_components": [
       {
-        "__id__": 9
+        "__id__": 6
       }
     ],
     "_prefab": {
-      "__id__": 10
+      "__id__": 7
     },
     "_opacity": 255,
     "_color": {
       "__type__": "cc.Color",
-      "r": 0,
-      "g": 0,
-      "b": 0,
+      "r": 255,
+      "g": 255,
+      "b": 255,
       "a": 255
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 44,
-      "height": 27.72
+      "width": 108,
+      "height": 135
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -236,14 +235,14 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": -13,
-      "y": -80,
+      "x": 0,
+      "y": 41,
       "z": 0
     },
     "_scale": {
       "__type__": "cc.Vec3",
-      "x": 1,
-      "y": 1,
+      "x": 0.7,
+      "y": 0.7,
       "z": 1
     },
     "_eulerAngles": {
@@ -258,23 +257,69 @@
     "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__": "301b3d49-5ffd-4773-87b9-3a0c6cc064d3"
+    },
+    "_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__": "bb950ba5-2167-4f1e-b274-07765f8ddbc3"
+    },
+    "fileId": "65KxOLcr5MuIonNQNpmieg",
+    "sync": false
+  },
   {
     "__type__": "cc.Node",
-    "_name": "Num",
+    "_name": "Name",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 5
+      "__id__": 1
     },
     "_children": [],
     "_active": true,
-    "_level": 4,
+    "_level": 3,
     "_components": [
       {
-        "__id__": 7
+        "__id__": 9
+      },
+      {
+        "__id__": 10
       }
     ],
     "_prefab": {
-      "__id__": 8
+      "__id__": 11
     },
     "_opacity": 255,
     "_color": {
@@ -286,8 +331,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 26.4,
-      "height": 31.5
+      "width": 45.2,
+      "height": 28.919999999999998
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -296,8 +341,8 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": 68.162,
-      "y": 0,
+      "x": 0.106,
+      "y": -57.314,
       "z": 0
     },
     "_scale": {
@@ -323,7 +368,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 6
+      "__id__": 8
     },
     "_enabled": true,
     "_materials": [
@@ -332,10 +377,10 @@
       }
     ],
     "_useOriginalSize": false,
-    "_string": "x1",
-    "_N$string": "x1",
-    "_fontSize": 25,
-    "_lineHeight": 25,
+    "_string": "种子",
+    "_N$string": "种子",
+    "_fontSize": 22,
+    "_lineHeight": 22,
     "_enableWrapText": true,
     "_N$file": null,
     "_isSystemFontUsed": true,
@@ -349,44 +394,21 @@
     "_id": ""
   },
   {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__uuid__": "bb950ba5-2167-4f1e-b274-07765f8ddbc3"
-    },
-    "fileId": "e3rr13PDNGVb9kPwsbpqwD",
-    "sync": false
-  },
-  {
-    "__type__": "cc.Label",
+    "__type__": "cc.LabelOutline",
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 5
+      "__id__": 8
     },
     "_enabled": true,
-    "_materials": [
-      {
-        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
-      }
-    ],
-    "_useOriginalSize": false,
-    "_string": "种子",
-    "_N$string": "种子",
-    "_fontSize": 22,
-    "_lineHeight": 22,
-    "_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,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_width": 0.6,
     "_id": ""
   },
   {
@@ -412,17 +434,17 @@
     "_level": 3,
     "_components": [
       {
-        "__id__": 12
+        "__id__": 13
       },
       {
-        "__id__": 14
+        "__id__": 15
       },
       {
-        "__id__": 15
+        "__id__": 16
       }
     ],
     "_prefab": {
-      "__id__": 16
+      "__id__": 17
     },
     "_opacity": 255,
     "_color": {
@@ -445,7 +467,7 @@
     "_position": {
       "__type__": "cc.Vec3",
       "x": 75,
-      "y": 102,
+      "y": 121,
       "z": 0
     },
     "_scale": {
@@ -471,14 +493,14 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 11
+      "__id__": 12
     },
     "_enabled": true,
     "duration": 0.1,
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 13
+        "__id__": 14
       }
     ],
     "_N$interactable": true,
@@ -534,7 +556,7 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 11
+      "__id__": 12
     },
     "_id": ""
   },
@@ -553,7 +575,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 11
+      "__id__": 12
     },
     "_enabled": true,
     "_materials": [
@@ -585,7 +607,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 11
+      "__id__": 12
     },
     "_enabled": true,
     "_id": ""
@@ -601,6 +623,235 @@
     "fileId": "b35wX+cyxNAIMdi4MRfJMA",
     "sync": false
   },
+  {
+    "__type__": "cc.Node",
+    "_name": "seedNum",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [
+      {
+        "__id__": 19
+      }
+    ],
+    "_active": true,
+    "_level": 2,
+    "_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": 168,
+      "height": 45
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": -112.028,
+      "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": "Num",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 18
+    },
+    "_children": [],
+    "_active": true,
+    "_level": 3,
+    "_components": [
+      {
+        "__id__": 20
+      },
+      {
+        "__id__": 21
+      }
+    ],
+    "_prefab": {
+      "__id__": 22
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 237,
+      "g": 106,
+      "b": 144,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 15.1,
+      "height": 32.7
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 3,
+      "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": "1",
+    "_N$string": "1",
+    "_fontSize": 25,
+    "_lineHeight": 25,
+    "_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.LabelOutline",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 19
+    },
+    "_enabled": true,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 237,
+      "g": 106,
+      "b": 144,
+      "a": 255
+    },
+    "_width": 0.6,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "bb950ba5-2167-4f1e-b274-07765f8ddbc3"
+    },
+    "fileId": "62ks7zG1BMvKluWHuHIOVK",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 18
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "f38f8a90-bff0-45e6-a971-020cd7357e7f"
+    },
+    "_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__": "bb950ba5-2167-4f1e-b274-07765f8ddbc3"
+    },
+    "fileId": "72BIoO+adEQJqerQu5nX8T",
+    "sync": false
+  },
   {
     "__type__": "cc.Node",
     "_name": "buy_button",
@@ -610,18 +861,18 @@
     },
     "_children": [
       {
-        "__id__": 18
+        "__id__": 26
       }
     ],
     "_active": false,
     "_level": 2,
     "_components": [
       {
-        "__id__": 25
+        "__id__": 33
       }
     ],
     "_prefab": {
-      "__id__": 27
+      "__id__": 35
     },
     "_opacity": 255,
     "_color": {
@@ -644,7 +895,7 @@
     "_position": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -78,
+      "y": -59,
       "z": 0
     },
     "_scale": {
@@ -670,25 +921,25 @@
     "_name": "Background",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 17
+      "__id__": 25
     },
     "_children": [
       {
-        "__id__": 19
+        "__id__": 27
       }
     ],
     "_active": true,
     "_level": 2,
     "_components": [
       {
-        "__id__": 22
+        "__id__": 30
       },
       {
-        "__id__": 23
+        "__id__": 31
       }
     ],
     "_prefab": {
-      "__id__": 24
+      "__id__": 32
     },
     "_opacity": 255,
     "_color": {
@@ -737,18 +988,18 @@
     "_name": "Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 18
+      "__id__": 26
     },
     "_children": [],
     "_active": true,
     "_level": 3,
     "_components": [
       {
-        "__id__": 20
+        "__id__": 28
       }
     ],
     "_prefab": {
-      "__id__": 21
+      "__id__": 29
     },
     "_opacity": 255,
     "_color": {
@@ -797,7 +1048,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 19
+      "__id__": 27
     },
     "_enabled": true,
     "_materials": [
@@ -838,7 +1089,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 18
+      "__id__": 26
     },
     "_enabled": true,
     "_materials": [
@@ -870,7 +1121,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 18
+      "__id__": 26
     },
     "_enabled": true,
     "alignMode": 0,
@@ -908,14 +1159,14 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 17
+      "__id__": 25
     },
     "_enabled": true,
     "duration": 0.1,
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 26
+        "__id__": 34
       }
     ],
     "_N$interactable": true,
@@ -983,7 +1234,7 @@
       "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
     },
     "_N$target": {
-      "__id__": 18
+      "__id__": 26
     },
     "_id": ""
   },
@@ -1008,38 +1259,6 @@
     "fileId": "ado/ACB6ZEL4Z5uccLcoEb",
     "sync": false
   },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "_materials": [
-      {
-        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
-      }
-    ],
-    "_srcBlendFactor": 770,
-    "_dstBlendFactor": 771,
-    "_spriteFrame": {
-      "__uuid__": "98c8ea12-e46b-44a1-ba81-d0b5028081e6"
-    },
-    "_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.Button",
     "_name": "",
@@ -1052,7 +1271,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 30
+        "__id__": 37
       }
     ],
     "_N$interactable": true,
@@ -1150,17 +1369,17 @@
     "Synopsis": "可在神农农田播种",
     "consumeType": 0,
     "bgSprite": {
-      "__id__": 3
+      "__id__": 6
     },
     "NumLabel": {
-      "__id__": 7
+      "__id__": 20
     },
     "NameLabel": {
       "__id__": 9
     },
     "clickEvents": [
       {
-        "__id__": 32
+        "__id__": 39
       }
     ],
     "_id": ""

+ 163 - 92
assets/Prefabs/UI/seed/HolyFarmlandSeedStore.prefab

@@ -24,30 +24,30 @@
         "__id__": 5
       },
       {
-        "__id__": 11
+        "__id__": 8
       },
       {
-        "__id__": 17
+        "__id__": 14
+      },
+      {
+        "__id__": 20
       }
     ],
     "_active": true,
     "_level": 1,
     "_components": [
       {
-        "__id__": 28
-      },
-      {
-        "__id__": 29
+        "__id__": 31
       },
       {
-        "__id__": 30
+        "__id__": 32
       },
       {
-        "__id__": 32
+        "__id__": 34
       }
     ],
     "_prefab": {
-      "__id__": 33
+      "__id__": 35
     },
     "_opacity": 255,
     "_color": {
@@ -60,7 +60,7 @@
     "_contentSize": {
       "__type__": "cc.Size",
       "width": 173,
-      "height": 215
+      "height": 280
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -93,7 +93,7 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "picture",
+    "_name": "bg",
     "_objFlags": 0,
     "_parent": {
       "__id__": 1
@@ -117,6 +117,109 @@
       "b": 255,
       "a": 255
     },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 173,
+      "height": 215
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_position": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 23.034,
+      "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__": 2
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "98c8ea12-e46b-44a1-ba81-d0b5028081e6"
+    },
+    "_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__": "c508b4fb-2698-49e5-a33b-8ee851a1e2c2"
+    },
+    "fileId": "d94FlMYxNEG6dJrLGik5OD",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "picture",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_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": 108,
@@ -130,7 +233,7 @@
     "_position": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": 22,
+      "y": 45.034,
       "z": 0
     },
     "_scale": {
@@ -156,7 +259,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 2
+      "__id__": 5
     },
     "_enabled": true,
     "_materials": [
@@ -203,18 +306,18 @@
     },
     "_children": [
       {
-        "__id__": 6
+        "__id__": 9
       }
     ],
-    "_active": false,
+    "_active": true,
     "_level": 3,
     "_components": [
       {
-        "__id__": 9
+        "__id__": 12
       }
     ],
     "_prefab": {
-      "__id__": 10
+      "__id__": 13
     },
     "_opacity": 255,
     "_color": {
@@ -236,8 +339,8 @@
     },
     "_position": {
       "__type__": "cc.Vec3",
-      "x": -13,
-      "y": -80,
+      "x": -0.203,
+      "y": -56.113,
       "z": 0
     },
     "_scale": {
@@ -263,18 +366,18 @@
     "_name": "Num",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 5
+      "__id__": 8
     },
     "_children": [],
-    "_active": true,
+    "_active": false,
     "_level": 4,
     "_components": [
       {
-        "__id__": 7
+        "__id__": 10
       }
     ],
     "_prefab": {
-      "__id__": 8
+      "__id__": 11
     },
     "_opacity": 255,
     "_color": {
@@ -323,7 +426,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 6
+      "__id__": 9
     },
     "_enabled": true,
     "_materials": [
@@ -364,7 +467,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 5
+      "__id__": 8
     },
     "_enabled": true,
     "_materials": [
@@ -412,17 +515,17 @@
     "_level": 3,
     "_components": [
       {
-        "__id__": 12
+        "__id__": 15
       },
       {
-        "__id__": 14
+        "__id__": 17
       },
       {
-        "__id__": 15
+        "__id__": 18
       }
     ],
     "_prefab": {
-      "__id__": 16
+      "__id__": 19
     },
     "_opacity": 255,
     "_color": {
@@ -445,7 +548,7 @@
     "_position": {
       "__type__": "cc.Vec3",
       "x": 75,
-      "y": 102,
+      "y": 125.034,
       "z": 0
     },
     "_scale": {
@@ -471,14 +574,14 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 11
+      "__id__": 14
     },
     "_enabled": true,
     "duration": 0.1,
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 13
+        "__id__": 16
       }
     ],
     "_N$interactable": true,
@@ -534,7 +637,7 @@
     "hoverSprite": null,
     "_N$disabledSprite": null,
     "_N$target": {
-      "__id__": 11
+      "__id__": 14
     },
     "_id": ""
   },
@@ -545,7 +648,7 @@
     },
     "component": "",
     "_componentId": "ba198n/JUtJXqII6aiwPODz",
-    "handler": "onPressedInfo",
+    "handler": "onMallPressedInfo",
     "customEventData": "1"
   },
   {
@@ -553,7 +656,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 11
+      "__id__": 14
     },
     "_enabled": true,
     "_materials": [
@@ -585,7 +688,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 11
+      "__id__": 14
     },
     "_enabled": true,
     "_id": ""
@@ -610,18 +713,18 @@
     },
     "_children": [
       {
-        "__id__": 18
+        "__id__": 21
       }
     ],
     "_active": true,
     "_level": 2,
     "_components": [
       {
-        "__id__": 25
+        "__id__": 28
       }
     ],
     "_prefab": {
-      "__id__": 27
+      "__id__": 30
     },
     "_opacity": 255,
     "_color": {
@@ -633,7 +736,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 116,
+      "width": 118,
       "height": 62
     },
     "_anchorPoint": {
@@ -644,7 +747,7 @@
     "_position": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -78,
+      "y": -112.124,
       "z": 0
     },
     "_scale": {
@@ -670,25 +773,25 @@
     "_name": "Background",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 17
+      "__id__": 20
     },
     "_children": [
       {
-        "__id__": 19
+        "__id__": 22
       }
     ],
     "_active": true,
     "_level": 2,
     "_components": [
       {
-        "__id__": 22
+        "__id__": 25
       },
       {
-        "__id__": 23
+        "__id__": 26
       }
     ],
     "_prefab": {
-      "__id__": 24
+      "__id__": 27
     },
     "_opacity": 255,
     "_color": {
@@ -700,7 +803,7 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 116,
+      "width": 118,
       "height": 62
     },
     "_anchorPoint": {
@@ -737,18 +840,18 @@
     "_name": "Label",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 18
+      "__id__": 21
     },
     "_children": [],
     "_active": true,
     "_level": 3,
     "_components": [
       {
-        "__id__": 20
+        "__id__": 23
       }
     ],
     "_prefab": {
-      "__id__": 21
+      "__id__": 24
     },
     "_opacity": 255,
     "_color": {
@@ -797,7 +900,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 19
+      "__id__": 22
     },
     "_enabled": true,
     "_materials": [
@@ -838,7 +941,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 18
+      "__id__": 21
     },
     "_enabled": true,
     "_materials": [
@@ -870,7 +973,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 18
+      "__id__": 21
     },
     "_enabled": true,
     "alignMode": 0,
@@ -908,14 +1011,14 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 17
+      "__id__": 20
     },
     "_enabled": true,
     "duration": 0.1,
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 26
+        "__id__": 29
       }
     ],
     "_N$interactable": true,
@@ -983,7 +1086,7 @@
       "__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
     },
     "_N$target": {
-      "__id__": 18
+      "__id__": 21
     },
     "_id": ""
   },
@@ -1008,38 +1111,6 @@
     "fileId": "ado/ACB6ZEL4Z5uccLcoEb",
     "sync": false
   },
-  {
-    "__type__": "cc.Sprite",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 1
-    },
-    "_enabled": true,
-    "_materials": [
-      {
-        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
-      }
-    ],
-    "_srcBlendFactor": 770,
-    "_dstBlendFactor": 771,
-    "_spriteFrame": {
-      "__uuid__": "98c8ea12-e46b-44a1-ba81-d0b5028081e6"
-    },
-    "_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.Button",
     "_name": "",
@@ -1136,17 +1207,17 @@
     "Synopsis": "可在神农农田播种",
     "consumeType": 0,
     "bgSprite": {
-      "__id__": 3
+      "__id__": 6
     },
     "NumLabel": {
-      "__id__": 7
+      "__id__": 10
     },
     "NameLabel": {
-      "__id__": 9
+      "__id__": 12
     },
     "clickEvents": [
       {
-        "__id__": 31
+        "__id__": 33
       }
     ],
     "_id": ""

+ 3 - 1
assets/Scene/Login.fire

@@ -159,7 +159,7 @@
       "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
-      "z": 523.079343885801
+      "z": 513.5530644441722
     },
     "_scale": {
       "__type__": "cc.Vec3",
@@ -239,6 +239,8 @@
       "__id__": 2
     },
     "_enabled": true,
+    "addCount": 0,
+    "progressTag": false,
     "_id": "6dodPXyEBMXJOQUSdd+Q0M"
   },
   {

文件差异内容过多而无法显示
+ 295 - 133
assets/Scene/MyCityScene - 004.fire


+ 9 - 3
assets/Script/Lease/LandInfo.js

@@ -3,7 +3,12 @@ cc.Class({
     extends: cc.Component,
 
     properties: {
-
+        //土地id
+        landId:{
+            default: null, 
+            type: cc.Label, 
+            serializable: true,   
+        },
         //单价
         price: {
             default: null, 
@@ -50,8 +55,9 @@ cc.Class({
     // start () {
 
     // },
-    setInfo(price,date,start,end,multiple,describe){
-        this.price.string = price;
+    setInfo(id,price,date,start,end,multiple,describe){
+        this.landId.string = id + " 号";
+        this.price.string = price + " CNT";
         this.date.string = date;
         this.startTime.string = start;
         this.endTime.string = end;

+ 55 - 18
assets/Script/Lease/LeaseGrantInfo.js

@@ -19,9 +19,21 @@ cc.Class({
             type: cc.Label,
             serializable: true,
         },
-        inputInviteValue: {
-            default: 1,
-            visible: false
+        inputAddressValue: {
+            default: "",
+            visible: false,
+            serializable: false
+        },
+
+        inputAmountValue: {
+            default: 0,
+            visible: false,
+            serializable: false
+        },
+        inputAmountContainer: {
+            default: null,
+            type: cc.Node,
+            tooltip: "输入果实数量的节点"
         },
 
         //当前操作的果实信息
@@ -35,31 +47,49 @@ cc.Class({
             type: cc.Node,
             tooltip: "把当前操作的ui按钮传进来"
         },
+       
     },
 
     // LIFE-CYCLE CALLBACKS:
 
     // onLoad () {},
 
-    start() {
+    // start() {
 
-    },
+    // },
 
     /**
      * 赠送
      */
-    onGrant() {
+    // onGrant() {
 
-    },
+    // },
 
     setInfo(grantName, amount) {
         this.grantName.string = grantName;
         this.amount.string = amount;
     },
 
-    inputValue(value, e) {
-        this.inputInviteValue = value;
+    onInputAddressValue(value, e) {
+        this.inputAddressValue = value;
     },
+
+    onInputAmountValue(value, e) {
+        var numberTemp = new RegExp("^[A-Za-z0-9]+$");
+        if (numberTemp.test(value)) {
+            if (Number(value) >= 1) {
+                this.inputAmountValue = Number(value);
+            } else {
+                this.inputAmountValue = 0;
+                this.inputAmountContainer.getComponent(cc.EditBox).string = this.inputAmountValue;
+            }
+        } else {
+            this.inputAmountValue = 0;
+            this.inputAmountContainer.getComponent(cc.EditBox).string = this.inputAmountValue;
+            console.log("请输入整数的倍数", this.inputAmountValue);
+        }
+    },
+
     onclose() {
         this.node.destroy();
     },
@@ -67,17 +97,24 @@ cc.Class({
     //确定增送果实
     onLeaseGrantFruit() {
         //todo 判断一下amount
-        console.log(this.inputInviteValue);
-        if (this.inputInviteValue.length < 20) {
-            GlobalD.GameData.showToast(cc.find('Canvas/UICamera'), "输入地址", 2, () => {
-                console.log("finish toast!");
-            });
+        console.log(this.inputAddressValue);
+        if (this.inputAddressValue.length < 20) {
+            GlobalD.GameData.showToast(cc.find('Canvas/UICamera'), "请输入地址!", 1);
             return;
         }
-        if(GlobalD.GameData.isOnGrantFruit)return;
+        if (Number(this.inputAmountValue) <= 0) {
+            GlobalD.GameData.showToast(cc.find('Canvas/UICamera'), "请输入赠送的果实数量!", 1);
+            return;
+        }
+        if (Number(this.inputAmountValue) > Number(this.amount.string)) {
+            GlobalD.GameData.showToast(cc.find('Canvas/UICamera'), "输入赠送的果实数量过多!", 1);
+            return;
+        }
+
+        if (GlobalD.GameData.isOnGrantFruit) return;
         GlobalD.GameData.showToast(cc.find('Canvas/UICamera'), "赠送果实中...", 5);
-        //默认赠送全部
-        GlobalD.GameData.onGrantFruit({ fruitId: this.fruitInfo.id, amount: Number(this.amount.string), address: this.inputInviteValue }, (res, value) => {
+        //赠送一部分果实
+        GlobalD.GameData.onGrantFruit({ fruitId: this.fruitInfo.id, amount: this.inputAmountValue, address: this.inputAddressValue }, (res, value) => {
             // console.log(value);
             if (value.code === 0) {
                 // let NumLabel = this.upTarget.getComponent("Content_Button").NumLabel.getComponent(cc.Label);
@@ -88,7 +125,7 @@ cc.Class({
                 var BuildingView = cc.find("Canvas/UICamera/BuildingContainer/BuildingView").getComponent("BuildingView");
                 BuildingView.onUpdateList();
 
-                this.amount.string = 0;
+                this.amount.string =  Number(this.amount.string) - this.inputAmountValue;
 
                 GlobalD.GameData.showToast(cc.find('Canvas/UICamera'), value.msg, 1);
             } else {

+ 32 - 9
assets/Script/Lease/LeaseInfo.js

@@ -2,6 +2,7 @@
  * 租赁
  */
 import gameToast from "../Network/gameToast"
+import date from "../Unit/date";
 cc.Class({
     extends: cc.Component,
 
@@ -171,7 +172,7 @@ cc.Class({
             if (err === null) {
                 // TODO 成功, 支付为链上操作,需要提供回调接口给这边服务端确认交易成功后修改购买订单结果
                 console.log(tx) // 交易hash,唯一标识符
-
+                let _leaseFarmlandInfo = this.leaseFarmlandInfoNode.getComponent("LeaseFarmlandInfo");
                 //todo 如果是土地租赁,轮询土地状态 
                 if (this.AutoGetLandData) {
                     this.unschedule(this.AutoGetLandData);
@@ -183,16 +184,38 @@ cc.Class({
                         callback: (res, value) => {
                             console.log("轮询土地数据:" + JSON.stringify(value.msg));
                             if (0 === value.code) {
-                                this.unschedule(this.AutoGetLandData);
-                                console.log("轮询到土地购买成功!");
-                                GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "土地购买成功!", 5);
-                                //解锁土地操作
-                            
                                 let _landData = value.data;
-                                this.leaseFarmlandInfoNode.getComponent("LeaseFarmlandInfo").setLeaseLandInfo(_landData);
-                               
+                                let _leaseLandInfo = _leaseFarmlandInfo.leaseLandInfo
+                                //如果是空的,说明没有创建过土地
+                                if (_leaseLandInfo == null) {
+                                    this.unschedule(this.AutoGetLandData);
+                                    // console.log("轮询到土地购买成功!");
+                                    GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "土地购买成功!", 2);
+                                    //解锁土地操作
+                                    _leaseFarmlandInfo.setLeaseLandInfo(_landData);
+                                    this.onClose();
+                                } else {
+                                    //根据update时间判断
+                                    if (!date.datesIsEqual(_leaseLandInfo.updateTime, _landData.updateTime)) {
+                                        //如果不是空,判断为续租
+                                        GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "续租土地成功!", 2);
+                                        //续租土地时候, 只更新 租赁相关参照
+                                        let _oldLeaseLandInfo = Object.assign({}, _leaseLandInfo, {
+                                            isLease: _landData.isLease,
+                                            isPlant: _landData.isPlant,
+                                            leaseDays: _landData.leaseDays,
+                                            leaseDaysMill: _landData.leaseDaysMill,
+                                            leaseDaysRemaining: _landData.leaseDaysRemaining,
+                                            leaseTime: _landData.leaseTime,
+                                            rentalExpenses: _landData.rentalExpenses,
+                                            updateTime: _landData.updateTime
+                                        });
+                                        // console.log("续租之后的信息:", _landData, _leaseLandInfo, _oldLeaseLandInfo);
+                                        _leaseFarmlandInfo.setLeaseLandInfo(_oldLeaseLandInfo);
+                                        this.onClose();
+                                    }
+                                }
 
-                                this.onClose();
                             }
                         }
                     });

+ 26 - 20
assets/Script/Lease/PlantInfo.js

@@ -3,47 +3,53 @@ cc.Class({
     extends: cc.Component,
 
     properties: {
+        //种子作物的名字
+        plantName: {
+            default: null,
+            type: cc.Label
+        },
         //单价
         price: {
-            default: null, 
-            type: cc.Label, 
-            serializable: true,   
+            default: null,
+            type: cc.Label,
+            serializable: true,
         },
         //成熟期
         maturity: {
-            default: null, 
-            type: cc.Label, 
-            serializable: true,   
+            default: null,
+            type: cc.Label,
+            serializable: true,
         },
         //种植时间
         plantStart: {
-            default: null, 
-            type: cc.Label, 
-            serializable: true,   
+            default: null,
+            type: cc.Label,
+            serializable: true,
         },
         //收获数量
         harvestQuantity: {
-            default: null, 
-            type: cc.Label, 
-            serializable: true,   
+            default: null,
+            type: cc.Label,
+            serializable: true,
         },
         //介绍
         describe: {
-            default: null, 
-            type: cc.Label, 
-            serializable: true,   
+            default: null,
+            type: cc.Label,
+            serializable: true,
         },
-      
+
     },
 
     // LIFE-CYCLE CALLBACKS:
 
     // onLoad () {},
 
-    start () {
+    // start() {
 
-    },
-    setInfo(price,maturity,plantStart,harvestQuantity,describe){
+    // },
+    setInfo(name, price, maturity, plantStart, harvestQuantity, describe) {
+        this.plantName.string = name;
         this.price.string = price;
         this.maturity.string = maturity;
         this.plantStart.string = plantStart;
@@ -51,7 +57,7 @@ cc.Class({
         this.describe.string = describe;
     },
 
-    onclose(){
+    onclose() {
         this.node.destroy();
     }
 });

+ 72 - 23
assets/Script/Login/Login.js

@@ -5,23 +5,24 @@ cc.Class({
     extends: cc.Component,
 
     properties: {
-
+        addCount: 0,
+        progressTag: false
     },
 
     onLoad() {
         cc.audioEngine.stopAll();
-        this.progressTag = false;
-        this.oldprogressTag = -99;
-        cc.loader.onProgress = (completeCount, totalCount) => {
-            if (this.progressTag) {
-                this.progress = (1 * completeCount / totalCount).toFixed(1);
-                // console.log("进度条", this.progress + '%', this.progressNode);
-                if (this.progressNode != null) {
-                    this.progressNode.getComponent(cc.ProgressBar).progress = this.progress;
-                }
-            }
-        };
-       
+        // this.progressTag = false;
+        // this.oldprogressTag = -99;
+        // cc.loader.onProgress = (completeCount, totalCount) => {
+        //     if (this.progressTag) {
+        //         this.progress = (1 * completeCount / totalCount).toFixed(1);
+        //         console.log("进度条", this.progress + '%', this.progressNode);
+        //         if (this.progressNode != null) {
+        //             this.progressNode.getComponent(cc.ProgressBar).progress = this.progress;
+        //         }
+        //     }
+        // };
+
         //如果不是微信环境
         if (typeof wx === 'undefined') {
             // console.log('cc.sys.platform:', cc.sys.platform);
@@ -32,6 +33,24 @@ cc.Class({
         this.wxEnv();
 
     },
+    start() {
+        //预加载
+        cc.director.preloadScene('MyCityScene - 004', (completedCount, totalCount, item) => {
+            // let progress = (completedCount / totalCount).toFixed(1);
+            // console.log("进度条", progress + '%');
+            // if (this.progressNode != null) {
+            //     this.progressNode.getComponent(cc.ProgressBar).progress = progress;
+            // }
+            // if(completedCount / totalCount>0){
+            // }
+        }, () => {
+            //onLoaded
+            cc.log('Next scene preloaded');
+            // cc.director.loadScene('MyCityScene - 004', function () {
+            // this.progressTag = false;
+            // }.bind(this));
+        });
+    },
     /**
      * 获取用户信息
      */
@@ -64,7 +83,7 @@ cc.Class({
     },
 
 
-    loginButton(){
+    loginButton() {
         let self = this;
         UtilsPrefabs.init(self.node).addPrefabs(UtilsPrefabs.getPrefabsPath(UtilsPrefabs.LOGINPREFABSNAME.playButton), null, (node) => {
 
@@ -74,10 +93,12 @@ cc.Class({
 
             node.on(cc.Node.EventType.TOUCH_START, () => {
                 node.destroy();
-                self._showLoading();//显示载入loading
-                //全局函数
-                //获取游戏数据
-                self._gotoScene();//跳转场景
+                //显示载入loading
+                self._showLoading();
+                // () => {
+                //     //获取游戏数据
+                //     self._gotoScene();//跳转场景
+                // }
             })
 
         })
@@ -100,10 +121,6 @@ cc.Class({
             //     })
 
             // })
-
-            // cc.director.preloadScene('MyCityScene - 004', function () {
-            //     cc.log('Next scene preloaded');
-            // });
         })
     },
     wxEnv() {
@@ -207,6 +224,22 @@ cc.Class({
         });
     },
 
+    update(dt) {
+        if (this.progressTag) {
+            this.addCount += dt * Math.random();
+            let progress = (this.addCount / 0.8);
+
+            if (progress >= 1) {
+                //跳转场景
+                this._gotoScene();
+                this.progressTag = false;
+            }
+            if (this.progressNode) {
+                this.progressNode.getComponent(cc.ProgressBar).progress = progress;
+            }
+        }
+    },
+
     _showLoading() {
         console.log('显示载入预制');
         //显示载入预制
@@ -216,14 +249,30 @@ cc.Class({
                 var bgbar = UtilsPrefabs.getNode("bgbar", node);
                 this.progressNode = UtilsPrefabs.getNode("progress", bgbar);
                 this.progressTag = true;
+                this.addCount = 0;
             }.bind(this));
 
 
     },
     _gotoScene() {
         cc.director.loadScene('MyCityScene - 004', function () {
-            this.progressTag = false;
+            // this.progressTag = false;
         }.bind(this));
+        // //预加载
+        // cc.director.preloadScene('MyCityScene - 004', (completedCount, totalCount, item) => {
+
+        //     let progress = (1 * completedCount / totalCount).toFixed(1);
+        //     console.log("进度条", progress + '%');
+        //     if (this.progressNode != null) {
+        //         this.progressNode.getComponent(cc.ProgressBar).progress = progress;
+        //     }
+        // }, () => {
+        //     //onLoaded
+        //     cc.log('Next scene preloaded');
+        //     cc.director.loadScene('MyCityScene - 004', function () {
+        //         // this.progressTag = false;
+        //     }.bind(this));
+        // });
     }
 
 });

+ 4 - 4
assets/Script/Network/dapp.js

@@ -45,7 +45,7 @@ cc.Class({
                         dappInit();
                     }.bind(this));
                 })
-
+            
                 // 获取用户信息 
                 const { err, res } = await dapp.userInfo()
                 if (err === null) {
@@ -76,7 +76,7 @@ cc.Class({
 
                     utils.post(utils.api.loginTokenAndVerification, dappLoginData, (res, value) => {
                         // console.log("loginTokenAndVerification========>", _temp);
-                        console.log(res, value);
+                        // console.log(value);
                         if (value.code == 0) {
                             /** 登录成功获取token */
                             utils.setToken(value.data.token);
@@ -97,9 +97,9 @@ cc.Class({
                                 utils.get(utils.api.landConfig, {}, (res, value) => {
                                     if (0 === value.code) {
                                         GlobalD.ConfigLand = value.data;
-                                        
+
                                         utils.get(utils.api.userLandList, {}, (res, value) => {
-                                            // console.log(value);
+                                            // console.log(value.data);
                                             if (0 === value.code) {
                                                 GlobalD.UserLeaseLand = value.data;
 

+ 105 - 31
assets/Script/Network/netUtils.ts

@@ -12,11 +12,11 @@ var utils = {
     // baseUrl: "https://www.yuyekeji.cn/game/",
     // baseUrl: "http://127.0.0.1:26001/api_dapp/game/",
     // baseUrl: "https://www.yuyekeji.cn/api_dapp/game/",
-    baseUrl: window['dappHost']+'/api_dapp/game/',
-    
+    baseUrl: window['dappHost'] + '/api_dapp/game/',
+
     api: {
         //获取public 和 系统设置
-        publicKeyAndSys :'comUsers/publicKeyAndSys',
+        publicKeyAndSys: 'comUsers/publicKeyAndSys',
 
         /**
          * @deprecated 用loginTokenAndVerification 替代
@@ -28,33 +28,33 @@ var utils = {
         userSnbInfo: 'comUsers/getUserSnb',
         //角色的信息和属性
         playerInfo: 'comPlayers/getPlayerAndBattleAttribute',
-        playerPushInfo:'comPlayers/playerPushInfo',
-        playerPullInfo:'comPlayers/playerPullInfo',
-        
+        playerPushInfo: 'comPlayers/playerPushInfo',
+        playerPullInfo: 'comPlayers/playerPullInfo',
+
         //获取游戏config土地列表
-        landConfig:'configLand/getList',
+        landConfig: 'configLand/getList',
         //获取用户已经租赁的土地
         userLandList: 'comPlayerLand/getList',
         //获取土地信息
         landState: 'comPlayerLand/getState',
         //种植
-        plant:'comPlayerLand/plant',
+        plant: 'comPlayerLand/plant',
         //种子
         mallSeed: 'comMallSeed/getMallSeed',
         //仓库种子和果实
-        getSeedAndFruit :'comPlayerGoods/getSeedAndFruit', 
+        getSeedAndFruit: 'comPlayerGoods/getSeedAndFruit',
         //背包的种子数量
-        getSeedState:'comPlayerGoods/getSeedState',
+        getSeedState: 'comPlayerGoods/getSeedState',
         //收取果实
-        addFruit:'comPlayerGoods/addFruit',
+        addFruit: 'comPlayerGoods/addFruit',
         //出售果实
-        saleFruit:'comPlayerGoods/saleFruit',
+        saleFruit: 'comPlayerGoods/saleFruit',
         //赠送果实
-        grantFruit:'comPlayerGoods/grantFruit',
+        grantFruit: 'comPlayerGoods/grantFruit',
         //神农呗购买种子
-        snbBuySeeds:'comMallSeed/snbBuySeeds',
+        snbBuySeeds: 'comMallSeed/snbBuySeeds',
         //获取操作的snb日志
-        snbList:'comSnbTran/getList'
+        snbList: 'comSnbTran/getList'
 
     },
     /** 登录获取的token */
@@ -65,9 +65,14 @@ var utils = {
     sysApiEncrypt: null,
     /** 设置token格式 */
     setToken(value) {
+        // "eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiIxMDAyIiwiZXhwIjoxNjQyNDUyNjU2LCJpYXQiOjE2NDI0NDU0NTZ9.Wr-u0KIa94_-yJjf28sj2znLmU_NwHpFaAaE_5rQLdUkYQGAHn-kMq2fdQHk_XwMrG71A2vzgz6BCmJtI8cL9Q"
         this.token = "Bearer " + value;
     },
-    setJavaPublicKeyAndSysApiEncrypt(javaPublicKey,sysApiEncrypt){
+    /**设置一个错误token测试 */
+    onTestToken() {
+        this.token = "Bearer " + "eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiIxMDAyIiwiZXhwIjoxNjQyNDUyNjU2LCJpYXQiOjE2NDI0NDU0NTZ9.Wr-u0KIa94_-yJjf28sj2znLmU_NwHpFaAaE_5rQLdUkYQGAHn-kMq2fdQHk_XwMrG71A2vzgz6BCmJtI8cL9Q";
+    },
+    setJavaPublicKeyAndSysApiEncrypt(javaPublicKey, sysApiEncrypt) {
         this.javaPublicKey = javaPublicKey;
         this.sysApiEncrypt = sysApiEncrypt;
     },
@@ -97,10 +102,44 @@ var utils = {
                     // console.log('aesKeyS:',aesKeyS);
                     // console.log('encryptS:',encryptS);
                     // data = aesUtil.decrypt(data.data.data, rsaUtil.decrypt(data.data.aesKey, window.jsPrivateKey));
+                    // todo 处理token过期操作?
+                    // 301,302,303,304
+                    let _response = JSON.parse(response);
+                    if (301 === _response.code || 302 === _response.code || 303 === _response.code || 304 === _response.code) {
+                        console.log("token异常" + _response.msg);
+                        //这里要处理重新登录请求了,让用户刷新浏览器重新登录
+                        cc.loader.loadRes("prefab/gameToast", (err, texture) => {
+                            let _pause = cc.instantiate(texture);
+                            let _uiCamera = cc.find("Canvas/UICamera");
+                            _pause.parent = _uiCamera ? _uiCamera : cc.find("Canvas");
+                            _pause.zIndex = 999;
+                            let DetailLabel = _pause.getChildByName('DetailLabel');
+                            DetailLabel.getComponent(cc.Label).string = "游戏登录失效,请重新刷新页面登录!";
+                            setTimeout(() => {
+                                cc.game.pause();
+                            }, 60)
+                        });
 
-                    let httpStatus = xhr.statusText;
-                    notifyCenter.emit("netSuccess", JSON.parse(response));
-                    callback(true, JSON.parse(response));
+                        return;
+                    }
+                    if (404 === _response.code) {
+                        cc.loader.loadRes("prefab/gameToast", (err, texture) => {
+                            let _pause = cc.instantiate(texture);
+                            let _uiCamera = cc.find("Canvas/UICamera");
+                            _pause.parent = _uiCamera ? _uiCamera : cc.find("Canvas");
+                            _pause.zIndex = 999;
+                            let DetailLabel = _pause.getChildByName('DetailLabel');
+                            DetailLabel.getComponent(cc.Label).string = _response.data.msg;
+                            setTimeout(() => {
+                                cc.game.pause();
+                            }, 60)
+                        });
+
+                        return;
+                    }
+                    // let httpStatus = xhr.statusText;
+                    notifyCenter.emit("netSuccess", _response);
+                    callback(true, _response);
                 } else {
                     callback(false, response);
                     notifyCenter.emit("netError", JSON.parse(response));
@@ -130,9 +169,44 @@ var utils = {
             if (xhr.readyState === 4) {
                 let response = xhr.responseText;
                 if (xhr.status >= 200 && xhr.status < 300) {
-                    let httpStatus = xhr.statusText;
-                    notifyCenter.emit("netSuccess", JSON.parse(response));
-                    callback(true, JSON.parse(response));
+
+                    let _response = JSON.parse(response);
+                    if (301 === _response.code || 302 === _response.code || 303 === _response.code || 304 === _response.code) {
+                        console.log("token异常" + _response.msg);
+                        //这里要处理重新登录请求了,让用户刷新浏览器重新登录
+                        cc.loader.loadRes("prefab/gameToast", (err, texture) => {
+                            let _pause = cc.instantiate(texture);
+                            let _uiCamera = cc.find("Canvas/UICamera");
+                            _pause.parent = _uiCamera ? _uiCamera : cc.find("Canvas");
+                            _pause.zIndex = 999;
+                            let DetailLabel = _pause.getChildByName('DetailLabel');
+                            DetailLabel.getComponent(cc.Label).string = "游戏登录失效,请重新刷新页面登录!";
+                            setTimeout(() => {
+                                cc.game.pause();
+                            }, 60)
+                        });
+
+                        return;
+                    }
+                    if (404 === _response.code) {
+                        cc.loader.loadRes("prefab/gameToast", (err, texture) => {
+                            let _pause = cc.instantiate(texture);
+                            let _uiCamera = cc.find("Canvas/UICamera");
+                            _pause.parent = _uiCamera ? _uiCamera : cc.find("Canvas");
+                            _pause.zIndex = 999;
+                            let DetailLabel = _pause.getChildByName('DetailLabel');
+                            DetailLabel.getComponent(cc.Label).string = _response.data.msg;
+                            setTimeout(() => {
+                                cc.game.pause();
+                            }, 60)
+                        });
+
+                        return;
+                    }
+
+                    // let httpStatus = xhr.statusText;
+                    notifyCenter.emit("netSuccess", _response);
+                    callback(true, _response);
                 } else {
                     callback(false, response);
                     notifyCenter.emit("netError", JSON.parse(response));
@@ -147,17 +221,17 @@ var utils = {
     //     console.log('aesKey:',aesKey);
     // }
 
-    init(id, callback: Function, target: any){
-        if(this.ws != null)return;
+    init(id, callback: Function, target: any) {
+        if (this.ws != null) return;
         // https://www.yuyekeji.cn/api_dapp/index 192.168.0.106:26001 
         // wss://www.yuyekeji.cn/api_dapp/websocket/dappBack/
-        console.log("utils.token:",utils.token);
-        this.ws = new WebSocket(window['dappWss']+id,["11"]);
-        this.ws.onopen = (event: Event)=>{
+        console.log("utils.token:", utils.token);
+        this.ws = new WebSocket(window['dappWss'] + id, ["11"]);
+        this.ws.onopen = (event: Event) => {
             callback.call(target, "登录成功");
         }
- 
-        this.ws.onmessage = (event: MessageEvent)=>{
+
+        this.ws.onmessage = (event: MessageEvent) => {
             callback.call(target, event.data);
         }
 
@@ -165,8 +239,8 @@ var utils = {
             console.error("WebSocket连接发生错误");
         };
     },
-    sendMsg(data: string){
-        if(this.ws != null && this.ws.readyState != WebSocket.OPEN)return;
+    sendMsg(data: string) {
+        if (this.ws != null && this.ws.readyState != WebSocket.OPEN) return;
         this.ws.send(data);
     }
 };

+ 14 - 13
assets/Script/UI/BuildingView.js

@@ -156,9 +156,9 @@ cc.Class({
                 // }
                 let _seedScript = _seed.getComponent("Content_Button");
                 _seedScript.Name = this.mySeedList[i].name;
-                _seedScript.Price = '';
+                _seedScript.Price = 0;
                 _seedScript.SNB = this.mySeedList[i].priceSnb;
-                _seedScript.Synopsis = "成熟期:" + this.mySeedList[i].maturity + "天";
+                _seedScript.Synopsis = "成熟期:" + this.mySeedList[i].maturity + "天," + this.mySeedList[i].seedDescribe;
 
                 //设置一个生成点
                 let _spawnScript = _seed.getComponent("Content_seed");
@@ -307,7 +307,7 @@ cc.Class({
 
             //设置节点顺序
             this.EvnBtn.setSiblingIndex(10);
-            this.EvnBtn.setContentSize(86, 88);
+            this.EvnBtn.setContentSize(110, 100);
         }
         //劳动 
         else if ('1' == index) {
@@ -318,7 +318,8 @@ cc.Class({
             this.ManageUI.getComponent('ManageUI').onSetButtonInfo(this.Building10.getComponent('Content_Button').Name, this.Building10.getComponent('Content_Button').Price, this.Building10.getComponent('Content_Button').Synopsis);
 
             this.LabourBtn.setSiblingIndex(10);
-            this.LabourBtn.setContentSize(86, 88);
+            // this.LabourBtn.setContentSize(86, 88);
+            this.LabourBtn.setContentSize(110, 100);
         }
         //商铺
         else if ('2' == index) {
@@ -329,7 +330,7 @@ cc.Class({
             this.ManageUI.getComponent('ManageUI').onSetButtonInfo(this.Building20.getComponent('Content_Button').Name, this.Building20.getComponent('Content_Button').Price, this.Building20.getComponent('Content_Button').Synopsis);
 
             this.ShopBtn.setSiblingIndex(10);
-            this.ShopBtn.setContentSize(86, 88);
+            this.ShopBtn.setContentSize(110, 100);
 
         }
         //特殊
@@ -341,7 +342,7 @@ cc.Class({
             this.ManageUI.getComponent('ManageUI').onSetButtonInfo(this.Building30.getComponent('Content_Button').Name, this.Building30.getComponent('Content_Button').Price, this.Building30.getComponent('Content_Button').Synopsis);
 
             this.SpeBuildingBtn.setSiblingIndex(10);
-            this.SpeBuildingBtn.setContentSize(86, 88);
+            this.SpeBuildingBtn.setContentSize(110, 100);
         }
         //种子
         else if ('4' == index) {
@@ -351,13 +352,12 @@ cc.Class({
             // this.SelectedFrame.parent = this.Building40;
 
             if (this.mySeedList.length > 0) {
-                let Synopsis = "成熟期:" + this.mySeedList[0].maturity + "天";
-                // this.mySeedList[0].priceSnb
-                this.ManageUI.getComponent('ManageUI').onSetButtonInfo(this.mySeedList[0].name, "", Synopsis);
+                let Synopsis = "成熟期:" + this.mySeedList[0].maturity + "天," + this.mySeedList[0].seedDescribe;
+                this.ManageUI.getComponent('ManageUI').onSetButtonInfo(this.mySeedList[0].name, 0, Synopsis);
             }
 
             this.SeedBtn.setSiblingIndex(10);
-            this.SeedBtn.setContentSize(86, 88);
+            this.SeedBtn.setContentSize(110, 100);
         }
         //果实
         else if ('5' == index) {
@@ -367,12 +367,13 @@ cc.Class({
             // this.SelectedFrame.parent = this.Building50;
 
             if (this.myFruitList.length > 0) {
-                let Synopsis = "这是个" + this.myFruitList[0].name + "果实!";
-                this.ManageUI.getComponent('ManageUI').onSetButtonInfo(this.myFruitList[0].name, this.myFruitList[0].priceSnb, Synopsis);
+                let Synopsis = this.myFruitList[0].fruitDescribe;
+                // "出售价格:" + this.SNB + " SNB";
+                this.ManageUI.getComponent('ManageUI').onSetButtonInfo(this.myFruitList[0].name, "出售价格:" + this.myFruitList[0].priceSnb + " SNB", Synopsis);
             }
 
             this.FruitBtn.setSiblingIndex(10);
-            this.FruitBtn.setContentSize(86, 88);
+            this.FruitBtn.setContentSize(110, 100);
         }
 
 

+ 31 - 13
assets/Script/UI/Content_Button.js

@@ -4,7 +4,8 @@
 var CurrencyType = cc.Enum({
     GAME: 0,
     CNT: 1,
-    SNB: 2
+    SNB: 2,
+    SaleSNB: 3
 });
 
 cc.Class({
@@ -36,6 +37,11 @@ cc.Class({
             tooltip: '需要SNB货币的价格',
         },
 
+        Mature: {
+            default: '',
+            tooltip: '成熟期',
+        },
+
         Synopsis: {
             default: '',
             tooltip: '简介',
@@ -48,18 +54,18 @@ cc.Class({
             tooltip: '需要消耗的货币类型',
         },
 
-        bgSprite:{
-            default:null,
-            type:cc.Sprite,
+        bgSprite: {
+            default: null,
+            type: cc.Sprite,
         },
 
-        NumLabel:{
-            default:null,
-            type:cc.Label,
+        NumLabel: {
+            default: null,
+            type: cc.Label,
         },
-        NameLabel:{
-            default:null,
-            type:cc.Label,
+        NameLabel: {
+            default: null,
+            type: cc.Label,
         },
 
         clickEvents: {
@@ -76,7 +82,7 @@ cc.Class({
             if (Num) {
                 let NumLabel = Num.getComponent(cc.Label);
                 if (parseInt(NumLabel.string) < 1) {
-                
+
                     switch (this.consumeType) {
                         /**
                          * todo 目前只有特殊购买开放购买
@@ -103,11 +109,14 @@ cc.Class({
             case CurrencyType.SNB:
                 item.Price = this.SNB;
                 break;
+            case CurrencyType.SaleSNB:
+                item.Price = "出售价格:" + this.SNB + " SNB";
+                break;
             default:
                 item.Price = this.Price;
                 break;
         }
-        GlobalD.game._ManageUIScript.onSetButtonState({ Target: this },item);
+        GlobalD.game._ManageUIScript.onSetButtonState({ Target: this }, item);
     },
     onPressedInfo(event, customEventData) {
         let item = { Name: this.Name, Price: this.Price, Synopsis: this.Synopsis };
@@ -118,10 +127,19 @@ cc.Class({
             case CurrencyType.SNB:
                 item.Price = this.SNB;
                 break;
+            case CurrencyType.SaleSNB:
+                item.Price = "出售价格:" + this.SNB + " SNB";
+                break;
             default:
                 item.Price = this.Price;
                 break;
         }
-        GlobalD.game._ManageUIScript.onSetButtonInfoState({ Target: this }, item );
+        GlobalD.game._ManageUIScript.onSetButtonInfoState({ Target: this }, item);
+    },
+
+    //商城种子面板信息显示
+    onMallPressedInfo(event, customEventData) {
+        let item = { Name: this.Name, Price: this.CNT + " CNT 或 " + this.SNB + " SNB", Mature: this.Mature, Synopsis: this.Synopsis };
+        GlobalD.game._ManageUIScript.onSetMallInfoState({ Target: this }, item);
     }
 });

+ 1 - 70
assets/Script/UI/ManageBuildings.js

@@ -488,8 +488,7 @@ cc.Class({
         let _userLeaseLand = GlobalD.UserLeaseLand;
         // console.log(_configLand, _userLeaseLand);
         // console.log(this.node.getComponent("ManageUI"));
-        let _buildingView = this.node.getComponent("ManageUI").BuildView.getComponent('BuildingView');
-
+     
         for (let i = 0; i < _configLand.length; i++) {
             //生成默认土地
             //农田
@@ -501,78 +500,10 @@ cc.Class({
             //记录config的土地信息
             leaseFarmlandInfoScript.setConfigLandInfo(_configLand[i]);
             for (let j = 0; j < _userLeaseLand.length; j++) {
-
                 //记录已经租赁的信息(租赁里面包含了seedInfo,如果有种植的话,对应的种植信息会有)
                 if (_userLeaseLand[j].configLandId == _configLand[i].id) {
                     let _leaseLandInfo = _userLeaseLand[j];
                     leaseFarmlandInfoScript.setLeaseLandInfo(_leaseLandInfo);
-                    //todo 后续看看如何刷新,现在走的是开始刷新一次
-                    //如果土地是租赁转态并且同时种植了 ,这里处理土地状态,显示种植信息
-                    if (1 === _leaseLandInfo.isLease && 1 === _leaseLandInfo.isPlant) {
-
-                        let _workingBuilding = housingTemp_farmland.getComponent("WorkingBuilding");
-                        let _spriteFrame;
-                        switch (_leaseLandInfo.seedInfo.picture) {
-                            case "Cabbage":
-                                _spriteFrame = _buildingView.fruitSpriteFrame[0];
-                                break;
-                            case "Potato":
-                                _spriteFrame = _buildingView.fruitSpriteFrame[1];
-                                break;
-                            case "Carrot":
-                                _spriteFrame = _buildingView.fruitSpriteFrame[2];
-                                break;
-                            case "Broccoli":
-                                _spriteFrame = _buildingView.fruitSpriteFrame[3];
-                                break;
-                            case "Tomato":
-                                _spriteFrame = _buildingView.fruitSpriteFrame[4];
-                                break;
-                            case "Squash":
-                                _spriteFrame = _buildingView.fruitSpriteFrame[5];
-                                break;
-                            case "Eggplant":
-                                _spriteFrame = _buildingView.fruitSpriteFrame[6];
-                                break;
-                            case "Pepper":
-                                _spriteFrame = _buildingView.fruitSpriteFrame[7];
-                                break;
-                            case "Lentil":
-                                _spriteFrame = _buildingView.fruitSpriteFrame[8];
-                                break;
-                            default:
-                                break;
-                        }
-                        //拿到土地的成熟期来判断
-                        // let _plantStart = Date.parse(_leaseLandInfo.plantStart.replace(/-/g, '/'))
-                        // let _currentDay = _plantStart.getTime() - new Date().getTime(); //date.datedifference(date.formatTime(new Date()), _leaseLandInfo.plantStart);
-                        //种植日期加成熟期
-                        // let _endMilli = date.addDayTranMillisecond(_leaseLandInfo.plantStart, _leaseLandInfo.seedInfo.maturity);
-                        // let _currentMilli = new Date().getTime();
-                        // console.log("已种植土地状态:",_leaseLandInfo);
-                        let _currentDay = date.dateAddDate(_leaseLandInfo.plantStart, _leaseLandInfo.seedInfo.maturity)
-                        let [_remainingDay, _remainingHour] = date.remainDayAndHour(_currentDay, date.formatTime(new Date()));
-
-                        let _maturityHour = _leaseLandInfo.seedInfo.maturity * 24
-                        let _ratio = _remainingHour / _maturityHour;
-                        // console.log("生成的:" + _ratio);
-                        if (_ratio > 0.6) {
-                            _workingBuilding.onSetGrow(1, _spriteFrame);
-                            //测试,后面删除
-                            // leaseFarmlandInfoScript.onShowHarvest();
-                        } else if (_ratio > 0) {
-                            _workingBuilding.onSetGrow(2, _spriteFrame);
-                        } else {
-                            //成熟阶段
-                            _workingBuilding.onSetGrow(3, _spriteFrame);
-                            //todo,如果时间小的,走收获,收获成果实
-                            // console.log("土地:", _userLeaseLand[j].configLandId, "已经成熟,可以操作收取果实了!!");
-                            //todo 土地可收获状态
-                            leaseFarmlandInfoScript.onShowHarvest();
-                        }
-                    }
-
-
                 }
             }
             let buildingsInfo_farmland = housingTemp_farmland.getComponent("buildingsInfo");

+ 1 - 1
assets/Script/UI/ManageSeedNode.js

@@ -209,7 +209,7 @@ cc.Class({
                 _leaseFarmlandInfo.setLeaseLandInfo(value.data);
 
                 //开始种植,给一个初始的状态
-                this.targetBuildingsInfo.onInitHolyFarmlandSeedFromGrow(1, this.fruitSpriteFrame);
+                // this.targetBuildingsInfo.onInitHolyFarmlandSeedFromGrow(1, this.fruitSpriteFrame);
 
                 GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "已成功种植!", 1);
             } else if (706 === value.code) {

+ 59 - 16
assets/Script/UI/StoreView.js

@@ -81,6 +81,15 @@ cc.Class({
             default: null,
             type: cc.Node,
         },
+        seedBottomLabel: {
+            default: null,
+            type: cc.Node,
+        },
+
+        scrollViewNode: {
+            default: null,
+            type: cc.Node,
+        },
 
         //购买种类数值
         toggleInputValue: {
@@ -113,7 +122,7 @@ cc.Class({
         this.buildingViewScript = this.buildingView.getComponent("BuildingView");
         //默认设置第一个节点为 最上面
         this.SeedBtn.setSiblingIndex(10);
-        console.log('SNB=======', GlobalD.GameData.SNB)
+        // console.log('SNB=======', GlobalD.GameData.SNB)
         this.snbAmountLabel.string = GlobalD.GameData.SNB;
         //这里也初始化获取一个数据
         GlobalD.GameData.getWarehouseSeedAndFruit((res, vaule) => {
@@ -138,6 +147,13 @@ cc.Class({
                 this.seedNodeArry.push(_seed);
                 _seed.parent = this.Seed;
                 let _seedScript = _seed.getComponent("Content_Button");
+                _seedScript.Name = this.mySeedList[i].name;
+                _seedScript.Price = '';
+                _seedScript.CNT = this.mySeedList[i].priceCnt;
+                _seedScript.SNB = this.mySeedList[i].priceSnb;
+                _seedScript.Mature = this.mySeedList[i].maturity + "天";
+                _seedScript.Synopsis = this.mySeedList[i].seedDescribe;
+
                 //设置一个生成点
                 let _spawnScript = _seed.getComponent("Content_seed");
                 _spawnScript.myIndex = i;
@@ -201,19 +217,16 @@ cc.Class({
             this.SeedBtn.y = -20;
             this.SeedBtn.getComponent(cc.Sprite).spriteFrame = this.Selecteded_Seed_Sprite;
             this.Seed.active = true;
-
             if (this.seedNodeArry.length != 0) {
                 this.SelectedFrame.parent = this.seedNodeArry[0];
             }
-
-            //if (this.mySeedList.length > 0) {
-            //    let Synopsis = "成熟期:" + this.mySeedList[0].maturity;
-            //    this.ManageUI.getComponent('ManageUI').onSetButtonInfo(this.mySeedList[0].name, this.mySeedList[0].priceSnb, Synopsis);
-            //}
-
-            this.SeedBtn.setSiblingIndex(10);
-            this.SeedBtn.setContentSize(86, 88);
+            this.SeedBtn.zIndex = 10;
+            this.SeedBtn.setContentSize(110, 100);
+            this.ExchangeBtn.zIndex = 1;
+            // this.ExchangeBtn.setContentSize(86, 88);
             this.bottomLabel.active = false;
+            this.scrollViewNode.active = true;
+            this.seedBottomLabel.active = true;
         }
         //兑换
         else if ('1' == index) {
@@ -221,10 +234,14 @@ cc.Class({
             this.ExchangeBtn.getComponent(cc.Sprite).spriteFrame = this.Selecteded_Exchange_Sprite;
             this.Exchange.active = true;
 
-            this.ExchangeBtn.setSiblingIndex(10);
-            this.ExchangeBtn.setContentSize(86, 88);
+            this.ExchangeBtn.zIndex = 10;
+            this.ExchangeBtn.setContentSize(110, 100);
+            this.SeedBtn.zIndex = 1;
+            // this.SeedBtn.setContentSize(86, 88);
 
             this.bottomLabel.active = true;
+            this.scrollViewNode.active = false;
+            this.seedBottomLabel.active = false;
         }
     },
     switch: function () {
@@ -238,16 +255,29 @@ cc.Class({
         }
     },
     OpentSNBExchangeToCNT() {
+        //限制相关人员交易
+        if (1 === GlobalD.UserInfo.limitTran) {
+            GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "转换CNT通道关闭,请联系相关管理人员!", 1);
+            return;
+        }
         //更新数据
         this.snbAmountLabel.string = GlobalD.GameData.SNB;
         this.ExchangePopView.active = true;
     },
     SNBExchangeToCNT() {
-        GlobalD.GameData.onSnbToCnt(this.snbAmount, (data) => {
-
+        //限制相关人员交易
+        if (1 === GlobalD.UserInfo.limitTran) {
+            GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "转换CNT通道关闭,请联系相关管理人员!", 1);
+            return;
+        }
+        if (0 === Number(this.snbAmount) || 0 != Number(this.snbAmount) % 5) {
+            GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "请输入5的倍数兑换!", 1);
+            return;
+        }
+        console.log("发起兑换:"+Number(this.snbAmount));
+        GlobalD.GameData.onSnbToCnt(Number(this.snbAmount), (data) => {
             //更新数据
             this.snbAmountLabel.string = GlobalD.GameData.SNB;
-
             this.ExchangePopView.active = false;
             console.log('data=', data)
             // console.log('res=', res)
@@ -394,7 +424,20 @@ cc.Class({
         // 这里的 text 表示 修改完后的 EditBox 的文本内容
         // 这里 editbox 是一个 cc.EditBox 对象
         // 这里的 customEventData 参数就等于你之前设置的 "foobar"
-        this.snbAmount = parseInt(text);
+        // this.snbAmount = parseInt(text);
+        var numberTemp = new RegExp("^[A-Za-z0-9]+$");
+        if (numberTemp.test(text)) {
+            if (Number(text) >= 1) {
+                this.snbAmount = Number(text);
+            } else {
+                this.snbAmount = 0;
+                editbox.string = this.snbAmount;
+            }
+        } else {
+            this.snbAmount = 0;
+            editbox.string = this.snbAmount;
+            console.log("请输入5的倍数", this.snbAmount);
+        }
     },
 
     onToggleInput(value, evnentData) {

+ 39 - 3
assets/Script/Unit/date.js

@@ -127,6 +127,42 @@ const remainDayAndHour = (sDate1, currentDate) => { //sDate1和sDate2是2006-12-
 	}
 };
 
+
+//根据毫秒计算剩余时间
+const remainFromMillisecond = (dateMill) => { //
+	if (dateMill > 0) {
+		// 天数
+		let days = Math.floor(dateMill / (24 * 3600 * 1000));
+		//计算出小时数 
+		let leave1 = dateMill % (24 * 3600 * 1000)  //计算天数后剩余的毫秒数 
+		let hours = Math.floor(leave1 / (3600 * 1000))
+		//计算相差分钟数 
+		let leave2 = leave1 % (3600 * 1000)    //计算小时数后剩余的毫秒数 
+		let minutes = Math.floor(leave2 / (60 * 1000))
+		//计算相差秒数 
+		let leave3 = leave2 % (60 * 1000)   //计算分钟数后剩余的毫秒数 
+		let seconds = Math.round(leave3 / 1000)
+
+		return [days, hours, minutes, seconds];
+	} else {
+		return [0, 0, 0, 0];
+	}
+};
+
+//判断两个日期是否相等
+const datesIsEqual = (sDate1, sDate2) => { //sDate1和sDate2是2006-12-18格式 
+	var dateSpan;
+	sDate1 = Date.parse(sDate1.replace(/-/g, '/'));
+	sDate2 = Date.parse(sDate2.replace(/-/g, '/'));
+	dateSpan = sDate2 - sDate1;
+	if (0 === dateSpan) {
+		return true;
+	} else {
+		return false
+	}
+
+};
+
 export default {
 	formatTime,
 	formatDate,
@@ -135,9 +171,9 @@ export default {
 	dateAddDays,
 	addDaysFromNewDate,
 	getWeightDate,
-
 	dateAddDate,
 	remainDayAndHour,
-
-	addDayTranMillisecond
+	addDayTranMillisecond,
+	remainFromMillisecond,
+	datesIsEqual
 }

+ 303 - 79
assets/Script/build/LeaseFarmlandInfo.js

@@ -143,16 +143,41 @@ cc.Class({
             serializable: true,
         },
 
-        isHarvest: false
+        isHarvest: false,
+
+        /**
+         * 成熟时候显示的图片
+         */
+        harvestSprite: {
+            default: null,
+            type: cc.SpriteFrame,
+        },
+        _workingBuilding: null,
+
+        //时间计算对象
+        timeInterval: null,
+
+        //是否显示showHarvest
+        isShowHarvest: false,
+        isShowIndex: 0,
+
+        //检查土地是否到期
+        isCheckLandState: false,
+
+
+        _buildingView: null
     },
 
     // LIFE-CYCLE CALLBACKS:
 
-    // onLoad () {},
+    onLoad() {
+        this._workingBuilding = this.node.getComponent("WorkingBuilding");
+        this._buildingView = cc.find("Canvas/UICamera/BuildingContainer/BuildingView").getComponent("BuildingView");
+    },
 
-    start() {
+    // start() {
 
-    },
+    // },
 
     onSpawnLeasePanel() {
 
@@ -208,14 +233,22 @@ cc.Class({
         if (this.notLeased) {
             this.notLeased.active = true;
         }
+        //清除当前租赁数据
+        this.leaseLandInfo = null;
+        this.isShowHarvest = false;
+        this.isShowIndex = 0;
+        if (this.timeInterval) {
+            clearInterval(this.timeInterval);
+            this.timeInterval = null;
+        }
+
         //去除提示框
         this.upSliderNode.parent.active = false;
         this.midSliderNode.active = false;
         this.harvestNode.active = false;
 
         //重置土地图片
-        let _workingBuilding = this.node.getComponent("WorkingBuilding");
-        _workingBuilding.onSetGrow(0, null);
+        this._workingBuilding.onSetGrow(0, null);
     },
     //设置config的土地信息
     setConfigLandInfo(value) {
@@ -223,86 +256,268 @@ cc.Class({
     },
     //设置已租赁参数
     setLeaseLandInfo(value) {
+        if (!value) {
+            console.log("已租赁土地状态为空:", value);
+            return;
+        }
+        //设置意思显示相关
+        this.isShowHarvest = false;
+        this.isShowIndex = 0;
+        //重新设置租赁检测状态
+        this.isCheckLandState = false;
         this.leaseLandInfo = value;
+
+        //先解绑一下信息
+        this.showLandInfo.off(cc.Node.EventType.TOUCH_START, this._showLandInfo, this);
+        this.showPlantInfo.off(cc.Node.EventType.TOUCH_START, this._showPlantInfo, this);
+        
         //更新一下土地信息
         this.updateLandState();
     },
 
     updateLandState() {
-        if (!this.leaseLandInfo) return;
-        // console.log("this.leaseLandInfo.1", this.leaseLandInfo)
-        if (1 === this.leaseLandInfo.isLease) {
-            // console.log("已租赁土地状态:", this.leaseLandInfo);
-            //已解锁
-            //显示剩余天数
-            this.upSliderNode.parent.active = true;
-            this.multipleLabel.string = this.leaseLandInfo.leaseMultiple;
-            //计算天数
-            // let allDay = date.datedifference(this.leaseLandInfo.createTime, this.leaseLandInfo.leaseTime);
-            //租赁土地的剩余天数
-            // let [_remainingLandDay, _remainingLandHour] = date.remainDayAndHour(this.leaseLandInfo.leaseTime, date.formatTime(new Date()));
-            //todo 处理了
-            this.leaseDate.string = "剩余" + this.leaseLandInfo.leaseDaysRemaining + "天数,共" + this.leaseLandInfo.leaseDays + "天";
-            let sliderProgressScript = this.upSliderNode.getComponent("slider_progress");
-            let _proccess = this.leaseLandInfo.leaseDays === 0 ? 0 : this.leaseLandInfo.leaseDaysRemaining / this.leaseLandInfo.leaseDays;
-            sliderProgressScript.onSetProcgress(_proccess);
-            //删除解锁图标
-            this.onUnlockLand();
+        //已解锁
+        //显示剩余天数
+        this.upSliderNode.parent.active = true;
+        this.multipleLabel.string = this.leaseLandInfo.leaseMultiple;
+        //租赁土地的剩余天数
+        //获得服务器租赁日期毫秒
+        // let [_lDay, _lHour, _lMinutes, _lSeconds] = date.remainFromMillisecond(this.leaseLandInfo.leaseDaysMill);
+        // //todo 处理了 this.leaseLandInfo.leaseDaysRemaining
+        // if (0 !== _lDay) {
+        //     this.leaseDate.string = "剩余" + _lDay + "天数,共" + this.leaseLandInfo.leaseDays + "天";
+        // } else if (0 !== _lHour) {
+        //     this.leaseDate.string = "剩余" + _lHour + "小时,共" + this.leaseLandInfo.leaseDays + "天";
+        // } else if (0 !== _lMinutes) {
+        //     this.leaseDate.string = "剩余" + _lMinutes + "分钟,共" + this.leaseLandInfo.leaseDays + "天";
+        // } else if (0 !== _lSeconds) {
+        //     this.leaseDate.string = "剩余" + _lMinutes + "秒,共" + this.leaseLandInfo.leaseDays + "天";
+        // }
+        //  进去条按天算
+        let sliderProgressScript = this.upSliderNode.getComponent("slider_progress");
+        let _proccess = this.leaseLandInfo.leaseDays === 0 ? 0 : this.leaseLandInfo.leaseDaysRemaining / this.leaseLandInfo.leaseDays;
+        sliderProgressScript.onSetProcgress(_proccess);
+        //删除解锁图标
+        this.onUnlockLand();
+        /**
+         * 绑定生成显示信息面板,现在土地信息
+         */
+        this.showLandInfo.on(cc.Node.EventType.TOUCH_START, this._showLandInfo, this);
+        //如果是种植状态并且有返回种植信息
+        if (1 === this.leaseLandInfo.isPlant && this.leaseLandInfo.seedInfo) {
+            //种植信息
+            //如果土地是租赁转态并且同时种植了 ,这里处理土地状态,显示种植信息
+            let _spriteFrame;
+            switch (this.leaseLandInfo.seedInfo.picture) {
+                case "Cabbage":
+                    _spriteFrame = this._buildingView.fruitSpriteFrame[0];
+                    break;
+                case "Potato":
+                    _spriteFrame = this._buildingView.fruitSpriteFrame[1];
+                    break;
+                case "Carrot":
+                    _spriteFrame = this._buildingView.fruitSpriteFrame[2];
+                    break;
+                case "Broccoli":
+                    _spriteFrame = this._buildingView.fruitSpriteFrame[3];
+                    break;
+                case "Tomato":
+                    _spriteFrame = this._buildingView.fruitSpriteFrame[4];
+                    break;
+                case "Squash":
+                    _spriteFrame = this._buildingView.fruitSpriteFrame[5];
+                    break;
+                case "Eggplant":
+                    _spriteFrame = this._buildingView.fruitSpriteFrame[6];
+                    break;
+                case "Pepper":
+                    _spriteFrame = this._buildingView.fruitSpriteFrame[7];
+                    break;
+                case "Lentil":
+                    _spriteFrame = this._buildingView.fruitSpriteFrame[8];
+                    break;
+                default:
+                    break;
+            }
+            //设置一个收获时候的图片
+            this.harvestSprite = _spriteFrame;
+
+
+            this.midSliderNode.active = true;
+            // //获得服务器种植日期毫秒
+            // let [_pDay, _pHour, _pMinutes, _pSeconds] = date.remainFromMillisecond(this.leaseLandInfo.plantDaysMill);
+            // //todo 处理了 this.leaseLandInfo.plantDaysRemaining
+            // if (0 === _pDay && 0 === _pHour) {
+            //     //如果种植天数和种植小时为0,显示分钟和秒
+            //     this.midDate.string = "剩余" + _pMinutes + "分钟" + _pSeconds + "秒";
+            // } else {
+            //     //否则显示天和小时
+            //     this.midDate.string = "剩余" + _pDay + "天" + _pHour + "小时";
+            // }
+            // 进度条按小时计算
+            let _maturityAllHour = this.leaseLandInfo.seedInfo.maturity * 24
+            let _remainAllHour = this.leaseLandInfo.plantDaysRemaining * 24 + this.leaseLandInfo.plantHoursRemaining;
+            //计算剩余时间显示(进度条)
+            let _midProccess = _maturityAllHour === 0 ? 0 : _remainAllHour / _maturityAllHour;
+            this.midSliderProgressNode.getComponent(cc.ProgressBar).progress = _midProccess;
             /**
-             * 绑定生成显示信息面板,现在土地信息
-             */
-            this.showLandInfo.on(cc.Node.EventType.TOUCH_START, () => {
-                let leasePanel = cc.instantiate(this.landInfoPrefabs);
-                let parent = cc.find('Canvas/UICamera/DAPPContainer');
-                leasePanel.parent = parent;
-                leasePanel.setPosition(0, 0);
-                // leasePanel.zIndex = 999;
-                let leasePanelScript = leasePanel.getComponent("LandInfo");
-                //price,date,start,end,multiple,describe
-                let _date = date.datedifference(this.leaseLandInfo.createTime, this.leaseLandInfo.leaseTime);
-                let { rentalExpenses, createTime, leaseTime, leaseMultiple, landDescribe } = this.leaseLandInfo;
-                leasePanelScript.setInfo(rentalExpenses, _date + "天", createTime, leaseTime, leaseMultiple + "倍", landDescribe);
-            })
-            //如果是种植状态并且有返回种植信息
-            if (1 === this.leaseLandInfo.isPlant && this.leaseLandInfo.seedInfo) {
-                //种植信息
-                this.midSliderNode.active = true;
-                // let _currentDay = date.dateAddDate(this.leaseLandInfo.plantStart, this.leaseLandInfo.seedInfo.maturity)
-                // let [_remainingDay, _remainingHour] = date.remainDayAndHour(_currentDay, date.formatTime(new Date()));
-                // let _hour = _remainingHour - parseInt(_remainingHour / 24) * 24;
-                this.midDate.string = "剩余" + this.leaseLandInfo.plantDaysRemaining + "天" + this.leaseLandInfo.plantHoursRemaining + "小时";
-                let _maturityAllHour = this.leaseLandInfo.seedInfo.maturity * 24
-                let _remainAllHour = this.leaseLandInfo.plantDaysRemaining * 24 + this.leaseLandInfo.plantHoursRemaining;
-                //计算剩余时间显示(进度条)
-                let _midProccess = _maturityAllHour === 0 ? 0 : _remainAllHour / _maturityAllHour;
-                this.midSliderProgressNode.getComponent(cc.ProgressBar).progress = _midProccess;
-                /**
-                  * 绑定生成显示信息面板,种植信息
-                  */
-                this.showPlantInfo.on(cc.Node.EventType.TOUCH_START, () => {
-                    let leasePanel = cc.instantiate(this.plantInfoPrefabs);
-                    let parent = cc.find('Canvas/UICamera/DAPPContainer');
-                    leasePanel.parent = parent;
-                    leasePanel.setPosition(0, 0);
-                    // leasePanel.zIndex = 999;
-                    let leasePanelScript = leasePanel.getComponent("PlantInfo");
-                    let _harvest = 0;
-                    if (this.leaseLandInfo.leaseDate === 1) {
-                        _harvest = this.leaseLandInfo.seedInfo.harvest1;
-                    } else if (this.leaseLandInfo.leaseDate === 2) {
-                        _harvest = this.leaseLandInfo.seedInfo.harvest2;
-                    } else if (this.leaseLandInfo.leaseDate === 3) {
-                        _harvest = this.leaseLandInfo.seedInfo.harvest3;
+              * 绑定生成显示信息面板,种植信息
+              */
+            this.showPlantInfo.on(cc.Node.EventType.TOUCH_START, this._showPlantInfo, this);
+        }
+        //每个作物直接实时计算时间
+        if (this.timeInterval) {
+            clearInterval(this.timeInterval);
+            this.timeInterval = null;
+        }
+        let lastUpdateTime = Date.now();
+        let elapsedTime = 0;
+        let updateFrequency = 1; //ms
+        this.timeInterval = setInterval(() => {
+            let currentTime = Date.now();
+            let deltaTime = currentTime - lastUpdateTime;
+            elapsedTime += deltaTime;
+            if (elapsedTime >= updateFrequency) {
+                elapsedTime -= updateFrequency;
+                let _leaseDaysMill = this.leaseLandInfo.leaseDaysMill - elapsedTime;
+                let _plantDaysMill = this.leaseLandInfo.plantDaysMill - elapsedTime;
+                lastUpdateTime = currentTime;
+                // 更新计时显示
+                let [_lDay, _lHour, _lMinutes, _lSeconds] = date.remainFromMillisecond(_leaseDaysMill);
+                //todo 处理了 this.leaseLandInfo.leaseDaysRemaining
+                if (0 !== _lDay) {
+                    this.leaseDate.string = "剩余" + _lDay + "天数,共" + this.leaseLandInfo.leaseDays + "天";
+                } else if (0 !== _lHour) {
+                    this.leaseDate.string = "剩余" + _lHour + "小时,共" + this.leaseLandInfo.leaseDays + "天";
+                } else if (0 !== _lMinutes) {
+                    this.leaseDate.string = "剩余" + _lMinutes + "分钟,共" + this.leaseLandInfo.leaseDays + "天";
+                } else {
+                    this.leaseDate.string = "剩余" + _lSeconds + "秒,共" + this.leaseLandInfo.leaseDays + "天";
+                }
+                //todo 如果租赁时间到了,重新锁定
+                //重置锁定状态显示
+                if (!this.isCheckLandState) {
+                    if (_leaseDaysMill <= 0) {
+                        this.isCheckLandState = true;
+                        //检查一次土地
+                        this.onCheckLand(this.leaseLandInfo.configLandId);
+                    }
+                }
+
+                if (1 === this.leaseLandInfo.isPlant && this.leaseLandInfo.seedInfo) {
+                    //获得服务器种植日期毫秒
+                    let [_pDay, _pHour, _pMinutes, _pSeconds] = date.remainFromMillisecond(_plantDaysMill);
+                    //todo 处理了 this.leaseLandInfo.plantDaysRemaining
+                    if (0 !== _pDay) {
+                        //否则显示天和小时
+                        this.midDate.string = "剩余" + _pDay + "天" + _pHour + "小时";
+                    } else if (0 !== _pHour) {
+                        this.midDate.string = "剩余" + _pHour + "小时" + _pMinutes + "分钟";
+                    } else {
+                        this.midDate.string = "剩余" + _pMinutes + "分钟" + _pSeconds + "秒";
                     }
-                    //price,maturity,plantStart,harvestQuantity,describe
-                    let { priceCnt, maturity, seedDescribe } = this.leaseLandInfo.seedInfo;
-                    leasePanelScript.setInfo(priceCnt, maturity + "天", this.leaseLandInfo.plantStart, _harvest, seedDescribe);
-                })
+                    if (!this.isShowHarvest) {
+                        if (_plantDaysMill <= 0) {
+                            this.isShowHarvest = true;
+                            this.isShowIndex = 3;
+                            //如果传回的毫秒是小于零,说明成熟了
+                            //成熟阶段
+                            this._workingBuilding.onSetGrow(3, this.harvestSprite);
+                            //todo,如果时间小的,走收获,收获成果实
+                            // console.log("土地:", _userLeaseLand[j].configLandId, "已经成熟,可以操作收取果实了!!");
+                            //todo 土地可收获状态
+                            this.onShowHarvest();
+                        } else {
+                            let _maturityHour = this.leaseLandInfo.seedInfo.maturity * 24
+                            let _ratio = (_pDay * 24 + _pHour) / _maturityHour;
+                            if (_ratio > 0.5 && 1 !== this.isShowIndex) {
+                                this.isShowIndex = 1;
+                                this._workingBuilding.onSetGrow(1, this.harvestSprite);
+                                console.log("_ratio:" + _ratio + "=" + this.leaseLandInfo.configLandId + ",状态:" + this.isShowIndex);
+                            } else if (_ratio <= 0.5 && _ratio >= 0 && 2 !== this.isShowIndex) {
+                                this.isShowIndex = 2;
+                                this._workingBuilding.onSetGrow(2, this.harvestSprite);
+                                console.log("_ratio:" + _ratio + "=" + this.leaseLandInfo.configLandId + ",状态:" + this.isShowIndex);
+                            }
+                        }
+                    }
+
+                }
             }
+        });
+    },
+
+    _showLandInfo() {
+        let leasePanel = cc.instantiate(this.landInfoPrefabs);
+        let parent = cc.find('Canvas/UICamera/DAPPContainer');
+        leasePanel.parent = parent;
+        leasePanel.setPosition(0, 0);
+        let leasePanelScript = leasePanel.getComponent("LandInfo");
+        let _date = date.datedifference(this.leaseLandInfo.createTime, this.leaseLandInfo.leaseTime);
+        let { configLandId, rentalExpenses, createTime, leaseTime, leaseMultiple, landDescribe } = this.leaseLandInfo;
+        leasePanelScript.setInfo(configLandId, rentalExpenses, _date + "天", createTime, leaseTime, leaseMultiple + "倍", landDescribe);
+    },
+
+    _showPlantInfo() {
+        let leasePanel = cc.instantiate(this.plantInfoPrefabs);
+        let parent = cc.find('Canvas/UICamera/DAPPContainer');
+        leasePanel.parent = parent;
+        leasePanel.setPosition(0, 0);
+        // leasePanel.zIndex = 999;
+        let leasePanelScript = leasePanel.getComponent("PlantInfo");
+        let _harvest = 0;
+        if (this.leaseLandInfo.leaseDate === 1) {
+            _harvest = this.leaseLandInfo.seedInfo.harvest1;
+        } else if (this.leaseLandInfo.leaseDate === 2) {
+            _harvest = this.leaseLandInfo.seedInfo.harvest2;
+        } else if (this.leaseLandInfo.leaseDate === 3) {
+            _harvest = this.leaseLandInfo.seedInfo.harvest3;
         }
+        //price,maturity,plantStart,harvestQuantity,describe
+        let { name, priceCnt, maturity, seedDescribe } = this.leaseLandInfo.seedInfo;
+        leasePanelScript.setInfo(name, priceCnt, maturity + "天", this.leaseLandInfo.plantStart, _harvest, seedDescribe);
     },
 
+    //更新收获的状态
+    updateHarvest() {
+        //todo 后续看看如何刷新,现在走的是开始刷新一次
+        // let _workingBuilding = housingTemp_farmland.getComponent("WorkingBuilding");
+        // //获得服务器种植日期毫秒
+        // let [_day, _hour, _minutes, _seconds] = date.remainFromMillisecond(_leaseLandInfo.plantDaysMill);
+        // let _maturityHour = _leaseLandInfo.seedInfo.maturity * 24
+        // let _ratio = _hour / _maturityHour;
+        // // console.log("生成的:" + _ratio);
+        // if (_ratio > 0.5) {
+        //     _workingBuilding.onSetGrow(1, _spriteFrame);
+        // } else if (_ratio >= 0) {
+        //     _workingBuilding.onSetGrow(2, _spriteFrame);
+        // }else if (_leaseLandInfo.plantDaysMill <= 0) {
+        //     //如果传回的毫秒是小于零,说明成熟了
+        //     //成熟阶段
+        //     _workingBuilding.onSetGrow(3, _spriteFrame);
+        //     //todo,如果时间小的,走收获,收获成果实
+        //     // console.log("土地:", _userLeaseLand[j].configLandId, "已经成熟,可以操作收取果实了!!");
+        //     //todo 土地可收获状态
+        //     leaseFarmlandInfoScript.onShowHarvest();
+        // }
+    },
 
+    //检查土地状态
+    onCheckLand(configLandId) {
+        GlobalD.GameData.getLandState({
+            landId: configLandId,
+            callback: (res, value) => {
+                console.log("检查土地数据:" + JSON.stringify(value.msg));
+                //这里只判断土地是否过期
+                if (706 === value.code) {
+                    //土地到期,没有更新刷新的处理刷新
+                    GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), configLandId + "号," + value.msg, 2);
+                    //重置锁定状态显示
+                    this.onLockLand();
+                }
+            }
+        });
+    },
 
 
     /**
@@ -328,18 +543,24 @@ cc.Class({
                     //收成后处理相关状态
                     this.harvestNode.active = false;
                     this.midSliderNode.active = false
-                    let _workingBuilding = this.node.getComponent("WorkingBuilding");
-                    _workingBuilding.onSetGrow(0, null);
+                    this._workingBuilding.onSetGrow(0, null);
                     //更新仓库列表
-                    let BuildingView = cc.find("Canvas/UICamera/BuildingContainer/BuildingView").getComponent("BuildingView");
-                    BuildingView.onUpdateList();
+                    this._buildingView.onUpdateList();
                     // "收获成功!"
                     GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "收获成功!", 1);
+
+                    this.isShowHarvest = false;
+                    this.isShowIndex = 0;
+                    if (this.timeInterval) {
+                        clearInterval(this.timeInterval);
+                        this.timeInterval = null;
+                    }
                 } else if (706 === value.code) {
                     //土地到期,没有更新刷新的处理刷新
                     GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), value.msg, 1);
                     //重置锁定状态显示
                     this.onLockLand();
+
                 } else {
                     GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), value.msg, 1);
                 }
@@ -351,7 +572,10 @@ cc.Class({
 
     },
 
-    onPayCnt() {
-
+    onDestroy() {
+        if (this.timeInterval) {
+            clearInterval(this.timeInterval);
+            this.timeInterval = null;
+        }
     }
 });

+ 7 - 3
assets/Script/public/GameData.js

@@ -1241,9 +1241,9 @@ cc.Class({
         }
         GlobalD.dapp.cntLog(page, limit).then((data) => {
             const { err, res } = data;
-            if (err === null) {
-                console.log(res) //
-            }
+            // if (err === null) {
+            //     console.log(res) //
+            // }
             if (callback) {
                 callback(data);
             }
@@ -1318,6 +1318,10 @@ cc.Class({
             DetailLabel.getComponent(cc.Label).string = content;
             this.toastEndTime = time;
         }
+    },
+
+    onTestToken(){
+        utils.onTestToken();
     }
 
 

+ 1 - 3
assets/Script/public/ManageTask.js

@@ -38,12 +38,10 @@ cc.Class({
 
     onLoad() {
         // 开启碰撞检测系统,未开启时无法检测
-        cc.director.getCollisionManager().enabled = true;
+        // cc.director.getCollisionManager().enabled = true;
         GlobalD.ManageTask = this;
         this._uiCamera = cc.find("Canvas/UICamera");
         this.managerControl = this._uiCamera.getComponent('ManagerControl');
-
-
         //初始化人物对话
         dialogmanager.InitDialgue();
 

+ 29 - 4
assets/Script/public/ManageUI.js

@@ -71,6 +71,13 @@ cc.Class({
         mineContent: cc.Label,
 
         inviteNode: cc.Node,
+
+
+        //商店面的介绍模板
+        mallContent_Name: cc.Label,
+        mallContent_Price: cc.Label,
+        mallContent_Mature: cc.Label,
+        mallContent_Synopsis: cc.Label,
     },
     onLoad() {
         cc.game.setFrameRate(30);
@@ -177,21 +184,21 @@ cc.Class({
         //运营费用数组
         let _runningCostArray = AConfig.RunningCostArray;
         for (let i = 0; i < _runningCostArray.length; i++) {
-            if(this.BuildingFrameArray[i]){
+            if (this.BuildingFrameArray[i]) {
                 let _contentButton = this.BuildingFrameArray[i].getComponent('Content_Button');
                 _contentButton.Price = AConfig.RunningCostArray[i];    //运营费用
                 //设置新的钻石价格
                 let _DiamondNumArray = GlobalD.GameData.GetDiamondNumArray();
                 _contentButton.DiamondPrice = _DiamondNumArray[i];   //钻石费用
             }
-         
+
         }
     },
     _setLockBuildingColor() {
         let BuildingStateArray = GlobalD.GameData.GetBuildingLockStateArray();
 
         for (let index = 0; index < BuildingStateArray.length; index++) {
-            if (this.BuildingFrameArray[index] && BuildingStateArray[index] == 0 ) {
+            if (this.BuildingFrameArray[index] && BuildingStateArray[index] == 0) {
                 this.BuildingFrameArray[index].color = new cc.Color(150, 150, 150, 150);
                 this.BuildingFrameArray[index].getChildByName('New Sprite(Splash)').color = new cc.Color(0, 0, 0, 255);
                 this.BuildingFrameArray[index].getChildByName('Name').active = false;
@@ -354,7 +361,25 @@ cc.Class({
     onSetButtonInfo(_Name, _Price, _Synopsis) {
         this.BuildContent_Name.string = _Name;
         this.BuildContent_Price.string = _Price;
-        this.BuildContent_Synopsis.string = _Synopsis;
+        this.BuildContent_Synopsis.string = _Synopsis.replace(/\n|\r/g,"");
+    },
+
+    /**
+     * 设置商城信息
+     * @param {}} Data 
+     * @param {*} Synopsis 
+     */
+    onSetMallInfoState(Data, Synopsis) {
+        if (Synopsis) {
+            this.onSetMallInfo(Synopsis.Name, Synopsis.Mature, Synopsis.Price, Synopsis.Synopsis)
+        }
+    },
+    //设置介绍信息
+    onSetMallInfo(_Name, _mature, _Price, _Synopsis) {
+        this.mallContent_Name.string = _Name;
+        this.mallContent_Price.string = _Price;
+        this.mallContent_Mature.string = _mature;
+        this.mallContent_Synopsis.string = _Synopsis.replace(/\n|\r/g,"");
     },
     //编辑对应的建筑
     onEditorialBuildings(mUI_buildTarget) {

二进制
assets/Sound/Sound_BuildingAddition.mp3


二进制
assets/Sound/Sound_FinishBuilding.mp3


二进制
assets/Sound/Sound_GetCoins.mp3


二进制
assets/Sound/Sound_PeopleLevelUp.mp3


二进制
assets/Sound/Sound_PressBtn.mp3


二进制
assets/Sound/Sound_Recruit.mp3


二进制
assets/Texture/Labour_01_0.png


+ 4 - 4
assets/Texture/Labour_01_0.png.meta

@@ -17,11 +17,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
+      "offsetY": 0.5,
+      "trimX": 2,
       "trimY": 0,
-      "width": 275,
-      "height": 246,
+      "width": 271,
+      "height": 245,
       "rawWidth": 275,
       "rawHeight": 246,
       "borderTop": 0,

二进制
assets/Texture/Labour_01_00.png


+ 4 - 4
assets/Texture/Labour_01_00.png.meta

@@ -17,11 +17,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
+      "offsetY": 0.5,
+      "trimX": 2,
       "trimY": 0,
-      "width": 275,
-      "height": 246,
+      "width": 271,
+      "height": 245,
       "rawWidth": 275,
       "rawHeight": 246,
       "borderTop": 0,

二进制
assets/Texture/Labour_01_01.png


+ 4 - 4
assets/Texture/Labour_01_01.png.meta

@@ -17,11 +17,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
+      "offsetY": 0.5,
+      "trimX": 2,
       "trimY": 0,
-      "width": 275,
-      "height": 246,
+      "width": 271,
+      "height": 245,
       "rawWidth": 275,
       "rawHeight": 246,
       "borderTop": 0,

二进制
assets/Texture/Labour_01_02.png


+ 4 - 4
assets/Texture/Labour_01_02.png.meta

@@ -17,11 +17,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
+      "offsetY": 0.5,
+      "trimX": 2,
       "trimY": 0,
-      "width": 275,
-      "height": 246,
+      "width": 271,
+      "height": 245,
       "rawWidth": 275,
       "rawHeight": 246,
       "borderTop": 0,

二进制
assets/Texture/Labour_01_1.png


+ 4 - 4
assets/Texture/Labour_01_1.png.meta

@@ -17,11 +17,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
+      "offsetY": 0.5,
+      "trimX": 2,
       "trimY": 0,
-      "width": 275,
-      "height": 246,
+      "width": 271,
+      "height": 245,
       "rawWidth": 275,
       "rawHeight": 246,
       "borderTop": 0,

二进制
assets/Texture/Labour_01_2.png


+ 4 - 4
assets/Texture/Labour_01_2.png.meta

@@ -17,11 +17,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
+      "offsetY": 0.5,
+      "trimX": 2,
       "trimY": 0,
-      "width": 275,
-      "height": 246,
+      "width": 271,
+      "height": 245,
       "rawWidth": 275,
       "rawHeight": 246,
       "borderTop": 0,

二进制
assets/Texture/Labour_01_3.png


二进制
assets/Texture/Labour_03_0.png


二进制
assets/Texture/Labour_03_1.png


二进制
assets/Texture/Labour_03_2.png


二进制
assets/Texture/Labour_03_3.png


二进制
assets/Texture/Labour_03_4.png


二进制
assets/Texture/Labour_03_5.png


二进制
assets/Texture/Labour_03_6.png


二进制
assets/Texture/Labour_04_0.png


二进制
assets/Texture/Labour_04_1.png


二进制
assets/Texture/Labour_04_2.png


+ 2 - 2
assets/Texture/Labour_04_2.png.meta

@@ -17,11 +17,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 5,
-      "offsetY": -5.5,
+      "offsetY": -4.5,
       "trimX": 13,
       "trimY": 26,
       "width": 184,
-      "height": 159,
+      "height": 157,
       "rawWidth": 200,
       "rawHeight": 200,
       "borderTop": 0,

二进制
assets/Texture/Labour_04_3.png


+ 2 - 2
assets/Texture/Labour_04_3.png.meta

@@ -17,11 +17,11 @@
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0.5,
-      "offsetY": -5.5,
+      "offsetY": -4.5,
       "trimX": 4,
       "trimY": 26,
       "width": 193,
-      "height": 159,
+      "height": 157,
       "rawWidth": 200,
       "rawHeight": 200,
       "borderTop": 0,

二进制
assets/UI/NPublic/seedNum.png


+ 8 - 8
assets/resources/NewTeaching_Road/1.jpg.meta → assets/UI/NPublic/seedNum.png.meta

@@ -1,6 +1,6 @@
 {
   "ver": "2.3.3",
-  "uuid": "41028a7f-78e8-43e5-abf8-b5ea9292b1e0",
+  "uuid": "677ae360-b0f7-4de3-bd04-d896f35d0419",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
@@ -9,10 +9,10 @@
   "packable": true,
   "platformSettings": {},
   "subMetas": {
-    "1": {
+    "seedNum": {
       "ver": "1.0.4",
-      "uuid": "9e85c33e-1215-4846-885c-226d72a7c21d",
-      "rawTextureUuid": "41028a7f-78e8-43e5-abf8-b5ea9292b1e0",
+      "uuid": "f38f8a90-bff0-45e6-a971-020cd7357e7f",
+      "rawTextureUuid": "677ae360-b0f7-4de3-bd04-d896f35d0419",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
@@ -20,10 +20,10 @@
       "offsetY": 0,
       "trimX": 0,
       "trimY": 0,
-      "width": 481,
-      "height": 853,
-      "rawWidth": 481,
-      "rawHeight": 853,
+      "width": 162,
+      "height": 45,
+      "rawWidth": 162,
+      "rawHeight": 45,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

二进制
assets/res/resUI/BG_DownLeft.jpg


二进制
assets/res/resUI/BG_DownRight.jpg


二进制
assets/res/resUI/BG_UpLeft.jpg


二进制
assets/res/resUI/BG_UpRight.jpg


二进制
assets/resources/Luckdraw/Wheel_03.png


二进制
assets/resources/Luckdraw/Wheel_05.png


+ 0 - 7
assets/resources/NewTeaching_Road.meta

@@ -1,7 +0,0 @@
-{
-  "ver": "1.0.1",
-  "uuid": "336b0919-4619-4830-8033-3723e5fffc31",
-  "isSubpackage": false,
-  "subpackageName": "",
-  "subMetas": {}
-}

二进制
assets/resources/NewTeaching_Road/1.jpg


二进制
assets/resources/NewTeaching_Road/10.jpg


+ 0 - 34
assets/resources/NewTeaching_Road/10.jpg.meta

@@ -1,34 +0,0 @@
-{
-  "ver": "2.3.3",
-  "uuid": "ff3c5945-be11-4365-b864-94170a05ccc9",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "platformSettings": {},
-  "subMetas": {
-    "10": {
-      "ver": "1.0.4",
-      "uuid": "0bd52f56-1ec8-4577-b606-62723969d4fa",
-      "rawTextureUuid": "ff3c5945-be11-4365-b864-94170a05ccc9",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 480,
-      "height": 850,
-      "rawWidth": 480,
-      "rawHeight": 850,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

二进制
assets/resources/NewTeaching_Road/3.jpg


+ 0 - 34
assets/resources/NewTeaching_Road/3.jpg.meta

@@ -1,34 +0,0 @@
-{
-  "ver": "2.3.3",
-  "uuid": "1ddd7007-f7ca-46fd-b888-e9fd476c1c52",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "platformSettings": {},
-  "subMetas": {
-    "3": {
-      "ver": "1.0.4",
-      "uuid": "cc0c8da7-40bf-4df3-81e7-678221e291cb",
-      "rawTextureUuid": "1ddd7007-f7ca-46fd-b888-e9fd476c1c52",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 479,
-      "height": 853,
-      "rawWidth": 479,
-      "rawHeight": 853,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

二进制
assets/resources/NewTeaching_Road/4.jpg


+ 0 - 34
assets/resources/NewTeaching_Road/4.jpg.meta

@@ -1,34 +0,0 @@
-{
-  "ver": "2.3.3",
-  "uuid": "72ef4b79-887f-4366-a4f0-33732095cae3",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "platformSettings": {},
-  "subMetas": {
-    "4": {
-      "ver": "1.0.4",
-      "uuid": "ed09528b-ce5e-4d43-951c-d48bc9e798d6",
-      "rawTextureUuid": "72ef4b79-887f-4366-a4f0-33732095cae3",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 477,
-      "height": 851,
-      "rawWidth": 477,
-      "rawHeight": 851,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

二进制
assets/resources/NewTeaching_Road/5.jpg


+ 0 - 34
assets/resources/NewTeaching_Road/5.jpg.meta

@@ -1,34 +0,0 @@
-{
-  "ver": "2.3.3",
-  "uuid": "560c5f06-ee36-478a-914a-eb49d79d934d",
-  "type": "sprite",
-  "wrapMode": "clamp",
-  "filterMode": "bilinear",
-  "premultiplyAlpha": false,
-  "genMipmaps": false,
-  "packable": true,
-  "platformSettings": {},
-  "subMetas": {
-    "5": {
-      "ver": "1.0.4",
-      "uuid": "0cf5d0b5-8f48-48db-ab6b-83c194ba9f79",
-      "rawTextureUuid": "560c5f06-ee36-478a-914a-eb49d79d934d",
-      "trimType": "auto",
-      "trimThreshold": 1,
-      "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 0,
-      "trimY": 0,
-      "width": 478,
-      "height": 850,
-      "rawWidth": 478,
-      "rawHeight": 850,
-      "borderTop": 0,
-      "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
-      "subMetas": {}
-    }
-  }
-}

二进制
assets/resources/NewTeaching_Road/6.jpg


部分文件因为文件数量过多而无法显示