slambb 3 жил өмнө
parent
commit
b36f44578b
100 өөрчлөгдсөн 1561 нэмэгдсэн , 501 устгасан
  1. 326 116
      assets/Prefabs/NBuildings/Labour/Labour_205_Holy_Farmland.prefab
  2. 1 1
      assets/Prefabs/UI/seed/HolyFarmlandFruit.prefab
  3. 226 176
      assets/Scene/MyCityScene - 004.fire
  4. 4 0
      assets/Script/Network/dapp.js
  5. 35 14
      assets/Script/UI/BuildingView.js
  6. 23 15
      assets/Script/UI/StoreView.js
  7. 104 0
      assets/Script/adpp/DynamicLoadingBg.js
  8. 9 0
      assets/Script/adpp/DynamicLoadingBg.js.meta
  9. 16 0
      assets/Script/adpp/ManageDapp.js
  10. 42 5
      assets/Script/build/LeaseFarmlandInfo.js
  11. 7 5
      assets/Script/build/WorkingBuilding.js
  12. BIN
      assets/Texture/Labour_205_Black.png
  13. 34 0
      assets/Texture/Labour_205_Black.png.meta
  14. BIN
      assets/Texture/Labour_205_Gold.png
  15. 34 0
      assets/Texture/Labour_205_Gold.png.meta
  16. BIN
      assets/Texture/Labour_205_Normal.png
  17. 34 0
      assets/Texture/Labour_205_Normal.png.meta
  18. BIN
      assets/Texture/Labour_205_light.png
  19. 34 0
      assets/Texture/Labour_205_light.png.meta
  20. BIN
      assets/Texture/Labour_Holy_growing.png
  21. 7 7
      assets/Texture/Labour_Holy_growing.png.meta
  22. BIN
      assets/Texture/Labour_Holy_planting.png
  23. 7 7
      assets/Texture/Labour_Holy_planting.png.meta
  24. BIN
      assets/UI/DApp/avatar/farmer.png
  25. 3 3
      assets/UI/DApp/avatar/farmer.png.meta
  26. BIN
      assets/UI/DApp/avatar/mayor.png
  27. BIN
      assets/UI/DApp/avatar/village.png
  28. BIN
      assets/UI/NScene/Fruits/BroccoliSeed.png
  29. 8 8
      assets/UI/NScene/Fruits/BroccoliSeed.png.meta
  30. BIN
      assets/UI/NScene/Fruits/CabbageSeed.png
  31. 8 8
      assets/UI/NScene/Fruits/CabbageSeed.png.meta
  32. BIN
      assets/UI/NScene/Fruits/CarrotSeed.png
  33. 8 8
      assets/UI/NScene/Fruits/CarrotSeed.png.meta
  34. BIN
      assets/UI/NScene/Fruits/EggplantSeed.png
  35. 8 8
      assets/UI/NScene/Fruits/EggplantSeed.png.meta
  36. BIN
      assets/UI/NScene/Fruits/LentilSeed.png
  37. 8 8
      assets/UI/NScene/Fruits/LentilSeed.png.meta
  38. BIN
      assets/UI/NScene/Fruits/PepperSeed.png
  39. 8 8
      assets/UI/NScene/Fruits/PepperSeed.png.meta
  40. BIN
      assets/UI/NScene/Fruits/PotatoSeed.png
  41. 8 8
      assets/UI/NScene/Fruits/PotatoSeed.png.meta
  42. BIN
      assets/UI/NScene/Fruits/SquashSeed.png
  43. 8 8
      assets/UI/NScene/Fruits/SquashSeed.png.meta
  44. BIN
      assets/UI/NScene/Fruits/TomatoSeed.png
  45. 8 8
      assets/UI/NScene/Fruits/TomatoSeed.png.meta
  46. BIN
      assets/UI/NScene/Seeds/Broccoli.png
  47. 8 8
      assets/UI/NScene/Seeds/Broccoli.png.meta
  48. BIN
      assets/UI/NScene/Seeds/Cabbage.png
  49. 8 8
      assets/UI/NScene/Seeds/Cabbage.png.meta
  50. BIN
      assets/UI/NScene/Seeds/Carrot.png
  51. 8 8
      assets/UI/NScene/Seeds/Carrot.png.meta
  52. BIN
      assets/UI/NScene/Seeds/Eggplant.png
  53. 8 8
      assets/UI/NScene/Seeds/Eggplant.png.meta
  54. BIN
      assets/UI/NScene/Seeds/Lentil.png
  55. 8 8
      assets/UI/NScene/Seeds/Lentil.png.meta
  56. BIN
      assets/UI/NScene/Seeds/Pepper.png
  57. 8 8
      assets/UI/NScene/Seeds/Pepper.png.meta
  58. BIN
      assets/UI/NScene/Seeds/Potato.png
  59. 8 8
      assets/UI/NScene/Seeds/Potato.png.meta
  60. BIN
      assets/UI/NScene/Seeds/Squash.png
  61. 8 8
      assets/UI/NScene/Seeds/Squash.png.meta
  62. BIN
      assets/UI/NScene/Seeds/Tomato.png
  63. 8 8
      assets/UI/NScene/Seeds/Tomato.png.meta
  64. 7 0
      assets/UI/NScene/StoreIcon.meta
  65. BIN
      assets/UI/NScene/StoreIcon/BroccoliIcon.png
  66. 34 0
      assets/UI/NScene/StoreIcon/BroccoliIcon.png.meta
  67. BIN
      assets/UI/NScene/StoreIcon/CabbageIcon.png
  68. 34 0
      assets/UI/NScene/StoreIcon/CabbageIcon.png.meta
  69. BIN
      assets/UI/NScene/StoreIcon/CarrotIcon.png
  70. 34 0
      assets/UI/NScene/StoreIcon/CarrotIcon.png.meta
  71. BIN
      assets/UI/NScene/StoreIcon/EggplantIcon.png
  72. 34 0
      assets/UI/NScene/StoreIcon/EggplantIcon.png.meta
  73. BIN
      assets/UI/NScene/StoreIcon/LentilIcon.png
  74. 34 0
      assets/UI/NScene/StoreIcon/LentilIcon.png.meta
  75. BIN
      assets/UI/NScene/StoreIcon/PepperIcon.png
  76. 34 0
      assets/UI/NScene/StoreIcon/PepperIcon.png.meta
  77. BIN
      assets/UI/NScene/StoreIcon/PotatoIcon.png
  78. 34 0
      assets/UI/NScene/StoreIcon/PotatoIcon.png.meta
  79. BIN
      assets/UI/NScene/StoreIcon/SquashIcon.png
  80. 34 0
      assets/UI/NScene/StoreIcon/SquashIcon.png.meta
  81. BIN
      assets/UI/NScene/StoreIcon/TomatoIcon.png
  82. 34 0
      assets/UI/NScene/StoreIcon/TomatoIcon.png.meta
  83. BIN
      assets/res/resUI/BG_DownLeft.png
  84. BIN
      assets/res/resUI/BG_DownRight.png
  85. BIN
      assets/res/resUI/BG_UpLeft.png
  86. BIN
      assets/res/resUI/BG_UpRight.png
  87. 7 0
      assets/res/resUI/farmer.meta
  88. BIN
      assets/res/resUI/farmer/farmer_DownLeft.jpg
  89. 34 0
      assets/res/resUI/farmer/farmer_DownLeft.jpg.meta
  90. BIN
      assets/res/resUI/farmer/farmer_DownRight.jpg
  91. 34 0
      assets/res/resUI/farmer/farmer_DownRight.jpg.meta
  92. BIN
      assets/res/resUI/farmer/farmer_UpLeft.jpg
  93. 4 4
      assets/res/resUI/farmer/farmer_UpLeft.jpg.meta
  94. BIN
      assets/res/resUI/farmer/farmer_UpRight.jpg
  95. 4 4
      assets/res/resUI/farmer/farmer_UpRight.jpg.meta
  96. 7 0
      assets/res/resUI/mayor.meta
  97. BIN
      assets/res/resUI/mayor/mayor_DownLeft.jpg
  98. 34 0
      assets/res/resUI/mayor/mayor_DownLeft.jpg.meta
  99. BIN
      assets/res/resUI/mayor/mayor_DownRight.jpg
  100. 34 0
      assets/res/resUI/mayor/mayor_DownRight.jpg.meta

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 326 - 116
assets/Prefabs/NBuildings/Labour/Labour_205_Holy_Farmland.prefab


+ 1 - 1
assets/Prefabs/UI/seed/HolyFarmlandFruit.prefab

@@ -288,7 +288,7 @@
     },
     "_fillStart": 0,
     "_fillRange": 0,
-    "_isTrimmedMode": true,
+    "_isTrimmedMode": false,
     "_atlas": null,
     "_id": ""
   },

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 226 - 176
assets/Scene/MyCityScene - 004.fire


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

@@ -52,6 +52,10 @@ cc.Class({
                     // 返回成功,见下面消息体
                     // console.log(res)
                     GlobalD.Dapp.UserInfo = res;
+
+                    //测试
+                    // GlobalD.Dapp.UserInfo.agent_level = 0;
+
                     // GameNet.getInstance().init(res.id, (data) => {
                     //     console.log('GameNet:' + data);
                     // }, _self);

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

@@ -95,6 +95,10 @@ cc.Class({
             default: [],
             type: [cc.SpriteFrame]
         },
+        seedIconSpriteFrame: {
+            default: [],
+            type: [cc.SpriteFrame]
+        },
         fruitSpriteFrame: {
             default: [],
             type: [cc.SpriteFrame]
@@ -148,10 +152,10 @@ cc.Class({
             for (let i = 0; i < this.mySeedList.length; i++) {
                 //没有种子数量不显示 todo 看看后续需不需要处理删除
                 if (this.mySeedList[i].amount < 1) continue;
-                
+
                 let _seed = cc.instantiate(this.seedPrefab);
                 _seed.parent = this.Seed;
-               
+
                 //if (this.mySeedList[i].amount == 0)
                 //{
                 //    _seed.getChildByName("SellOut").active = 0;
@@ -172,46 +176,63 @@ cc.Class({
                 _seedScript.NameLabel.string = this.mySeedList[i].name;
                 switch (this.mySeedList[i].picture) {
                     case "Cabbage":
-                        _seedScript.bgSprite.spriteFrame = this.seedSpriteFrame[0];
+                        _seedScript.bgSprite.spriteFrame = this.seedIconSpriteFrame[0];
                         _spawnScript.fruitSpriteFrame = this.fruitSpriteFrame[0];
+                        
+                        _spawnScript.seedSpriteFrame = this.seedSpriteFrame[0];
                         break;
                     case "Potato":
-                        _seedScript.bgSprite.spriteFrame = this.seedSpriteFrame[1];
+                        _seedScript.bgSprite.spriteFrame = this.seedIconSpriteFrame[1];
                         _spawnScript.fruitSpriteFrame = this.fruitSpriteFrame[1];
+
+                        _spawnScript.seedSpriteFrame = this.seedSpriteFrame[1];
                         break;
                     case "Carrot":
-                        _seedScript.bgSprite.spriteFrame = this.seedSpriteFrame[2];
+                        _seedScript.bgSprite.spriteFrame = this.seedIconSpriteFrame[2];
                         _spawnScript.fruitSpriteFrame = this.fruitSpriteFrame[2];
+
+                        _spawnScript.seedSpriteFrame = this.seedSpriteFrame[2];
                         break;
                     case "Broccoli":
-                        _seedScript.bgSprite.spriteFrame = this.seedSpriteFrame[3];
+                        _seedScript.bgSprite.spriteFrame = this.seedIconSpriteFrame[3];
                         _spawnScript.fruitSpriteFrame = this.fruitSpriteFrame[3];
+
+                        _spawnScript.seedSpriteFrame = this.seedSpriteFrame[3];
                         break;
                     case "Tomato":
-                        _seedScript.bgSprite.spriteFrame = this.seedSpriteFrame[4];
+                        _seedScript.bgSprite.spriteFrame = this.seedIconSpriteFrame[4];
                         _spawnScript.fruitSpriteFrame = this.fruitSpriteFrame[4];
+
+                        _spawnScript.seedSpriteFrame = this.seedSpriteFrame[4];
                         break;
                     case "Squash":
-                        _seedScript.bgSprite.spriteFrame = this.seedSpriteFrame[5];
+                        _seedScript.bgSprite.spriteFrame = this.seedIconSpriteFrame[5];
                         _spawnScript.fruitSpriteFrame = this.fruitSpriteFrame[5];
+
+                        _spawnScript.seedSpriteFrame = this.seedSpriteFrame[5];
                         break;
                     case "Eggplant":
-                        _seedScript.bgSprite.spriteFrame = this.seedSpriteFrame[6];
+                        _seedScript.bgSprite.spriteFrame = this.seedIconSpriteFrame[6];
                         _spawnScript.fruitSpriteFrame = this.fruitSpriteFrame[6];
+
+                        _spawnScript.seedSpriteFrame = this.seedSpriteFrame[6];
                         break;
                     case "Pepper":
-                        _seedScript.bgSprite.spriteFrame = this.seedSpriteFrame[7];
+                        _seedScript.bgSprite.spriteFrame = this.seedIconSpriteFrame[7];
                         _spawnScript.fruitSpriteFrame = this.fruitSpriteFrame[7];
+
+                        _spawnScript.seedSpriteFrame = this.seedSpriteFrame[7];
                         break;
                     case "Lentil":
-                        _seedScript.bgSprite.spriteFrame = this.seedSpriteFrame[8];
+                        _seedScript.bgSprite.spriteFrame = this.seedIconSpriteFrame[8];
                         _spawnScript.fruitSpriteFrame = this.fruitSpriteFrame[8];
+
+                        _spawnScript.seedSpriteFrame = this.seedSpriteFrame[8];
                         break;
                     default:
                         break;
                 }
-                //获取一下种子图片
-                _spawnScript.seedSpriteFrame = _seedScript.bgSprite.spriteFrame;
+
 
 
 
@@ -221,7 +242,7 @@ cc.Class({
                 _fruit.parent = this.Fruit;
                 _fruit.zIndex = 999;
                 let _fruitScript = _fruit.getComponent("Content_Button");
-                _fruitScript.NumLabel.string =  Number(this.myFruitList[i].amount + this.myFruitList[i].amountPart).toFixed(3);
+                _fruitScript.NumLabel.string = Number(this.myFruitList[i].amount + this.myFruitList[i].amountPart).toFixed(3);
                 _fruitScript.NameLabel.string = this.myFruitList[i].name;
                 _fruitScript.Name = this.myFruitList[i].name;
                 _fruitScript.SNB = this.myFruitList[i].priceSnb;

+ 23 - 15
assets/Script/UI/StoreView.js

@@ -37,6 +37,7 @@ cc.Class({
         //商城的列表
         mySeedList: [],
 
+
         seedPrefab: cc.Prefab,
 
         seedSpriteFrame: {
@@ -44,9 +45,17 @@ cc.Class({
             type: [cc.SpriteFrame]
         },
 
+        //商城的图标列表
+        mySeedIconList:{
+            default: [],
+            type: [cc.SpriteFrame]
+        },
+
         seedNodeArry: {
             default: [],
-            type: [cc.Node]
+            type: [cc.Node],
+            serializable: false,
+            visible:false
         },
         snbAmount: 0,
         cntAmount: 0,
@@ -137,11 +146,10 @@ cc.Class({
                 //if (this.mySeedList[i].amount < 1) continue;
                 let _seed = cc.instantiate(this.seedPrefab);
                 //if (this.mySeedList[i].amount < 1)
-                if (this.mySeedList[i].amount < 1)
-                {
+                if (this.mySeedList[i].amount < 1) {
                     //_seed.getChildByName("SellOut").active = true;
                 }
-                else{
+                else {
                     _seed.getChildByName("SellOut").active = false;
                 }
                 // _seed.getChildByName("buy_button").active = true;
@@ -166,31 +174,31 @@ cc.Class({
                 _seedScript.NameLabel.string = this.mySeedList[i].name;
                 switch (this.mySeedList[i].picture) {
                     case "Cabbage":
-                        _seedScript.bgSprite.spriteFrame = this.seedSpriteFrame[0];
+                        _seedScript.bgSprite.spriteFrame =  this.mySeedIconList[0];//this.seedSpriteFrame[0];
                         break;
                     case "Potato":
-                        _seedScript.bgSprite.spriteFrame = this.seedSpriteFrame[1];
+                        _seedScript.bgSprite.spriteFrame = this.mySeedIconList[1];//this.seedSpriteFrame[1];
                         break;
                     case "Carrot":
-                        _seedScript.bgSprite.spriteFrame = this.seedSpriteFrame[2];
+                        _seedScript.bgSprite.spriteFrame = this.mySeedIconList[2];//this.seedSpriteFrame[2];
                         break;
                     case "Broccoli":
-                        _seedScript.bgSprite.spriteFrame = this.seedSpriteFrame[3];
+                        _seedScript.bgSprite.spriteFrame = this.mySeedIconList[3];//this.seedSpriteFrame[3];
                         break;
                     case "Tomato":
-                        _seedScript.bgSprite.spriteFrame = this.seedSpriteFrame[4];
+                        _seedScript.bgSprite.spriteFrame = this.mySeedIconList[4];//this.seedSpriteFrame[4];
                         break;
                     case "Squash":
-                        _seedScript.bgSprite.spriteFrame = this.seedSpriteFrame[5];
+                        _seedScript.bgSprite.spriteFrame = this.mySeedIconList[5];//this.seedSpriteFrame[5];
                         break;
                     case "Eggplant":
-                        _seedScript.bgSprite.spriteFrame = this.seedSpriteFrame[6];
+                        _seedScript.bgSprite.spriteFrame = this.mySeedIconList[6];//this.seedSpriteFrame[6];
                         break;
                     case "Pepper":
-                        _seedScript.bgSprite.spriteFrame = this.seedSpriteFrame[7];
+                        _seedScript.bgSprite.spriteFrame = this.mySeedIconList[7];//this.seedSpriteFrame[7];
                         break;
                     case "Lentil":
-                        _seedScript.bgSprite.spriteFrame = this.seedSpriteFrame[8];
+                        _seedScript.bgSprite.spriteFrame = this.mySeedIconList[8];//this.seedSpriteFrame[8];
                         break;
                     default:
                         break;
@@ -278,7 +286,7 @@ cc.Class({
             GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "请输入5的倍数兑换!", 1);
             return;
         }
-        console.log("发起兑换:"+Number(this.snbAmount));
+        console.log("发起兑换:" + Number(this.snbAmount));
         GlobalD.GameData.onSnbToCnt(Number(this.snbAmount), (data) => {
             //更新数据
             this.snbAmountLabel.string = GlobalD.GameData.SNB;
@@ -487,7 +495,7 @@ cc.Class({
         }
     },
 
-    onDestory(){
+    onDestory() {
         if (this.AutoGetSeedsData) {
             this.unschedule(this.AutoGetSeedsData);
             this.AutoGetSeedsData = null;

+ 104 - 0
assets/Script/adpp/DynamicLoadingBg.js

@@ -0,0 +1,104 @@
+// Learn cc.Class:
+//  - [Chinese] https://docs.cocos.com/creator/manual/zh/scripting/class.html
+//  - [English] http://docs.cocos2d-x.org/creator/manual/en/scripting/class.html
+// Learn Attribute:
+//  - [Chinese] https://docs.cocos.com/creator/manual/zh/scripting/reference/attributes.html
+//  - [English] http://docs.cocos2d-x.org/creator/manual/en/scripting/reference/attributes.html
+// Learn life-cycle callbacks:
+//  - [Chinese] https://docs.cocos.com/creator/manual/zh/scripting/life-cycle-callbacks.html
+//  - [English] https://www.cocos2d-x.org/docs/creator/manual/en/scripting/life-cycle-callbacks.html
+
+cc.Class({
+    extends: cc.Component,
+
+    properties: {
+        upLeft: {
+            default: null,
+            type: cc.Node,
+            serializable: true,
+        },
+        upRight: {
+            default: null,
+            type: cc.Node,
+            serializable: true,
+        },
+        downLeft: {
+            default: null,
+            type: cc.Node,
+            serializable: true,
+        },
+        downRight: {
+            default: null,
+            type: cc.Node,
+            serializable: true,
+        },
+
+        villageUpLeft: {
+            default: null,
+            tip: "村长图片",
+            type: cc.SpriteFrame,
+            serializable: true,
+        },
+        villageUpRight: {
+            default: null,
+            tip: "村长图片",
+            type: cc.SpriteFrame,
+            serializable: true,
+        },
+        villageDownLeft: {
+            default: null,
+            tip: "村长图片",
+            type: cc.SpriteFrame,
+            serializable: true,
+        },
+        villageDownRight: {
+            default: null,
+            tip: "村长图片",
+            type: cc.SpriteFrame,
+            serializable: true,
+        },
+
+        mayorUpLeft: {
+            default: null,
+            tip: "镇长图片",
+            type: cc.SpriteFrame,
+            serializable: true,
+        },
+        mayorUpRight: {
+            default: null,
+            tip: "镇长图片",
+            type: cc.SpriteFrame,
+            serializable: true,
+        },
+        mayorDownLeft: {
+            default: null,
+            tip: "镇长图片",
+            type: cc.SpriteFrame,
+            serializable: true,
+        },
+        mayorDownRight: {
+            default: null,
+            tip: "镇长图片",
+            type: cc.SpriteFrame,
+            serializable: true,
+        },
+    },
+
+    /**
+     * 设置面板信息
+     */
+    setInfo(context) {
+        let { type } = context;
+        if (type == "village") {
+            this.upLeft.getComponent(cc.Sprite).spriteFrame = this.villageUpLeft;
+            this.upRight.getComponent(cc.Sprite).spriteFrame = this.villageUpRight;
+            this.downLeft.getComponent(cc.Sprite).spriteFrame = this.villageDownLeft;
+            this.downRight.getComponent(cc.Sprite).spriteFrame = this.villageDownRight;
+        }else  if(type == "mayor"){
+            this.upLeft.getComponent(cc.Sprite).spriteFrame = this.mayorUpLeft;
+            this.upRight.getComponent(cc.Sprite).spriteFrame = this.mayorUpRight;
+            this.downLeft.getComponent(cc.Sprite).spriteFrame = this.mayorDownLeft;
+            this.downRight.getComponent(cc.Sprite).spriteFrame = this.mayorDownRight;
+        }
+    },
+});

+ 9 - 0
assets/Script/adpp/DynamicLoadingBg.js.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.5",
+  "uuid": "e5ff45e1-922a-4350-ae15-ae6b7e8f02bc",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

+ 16 - 0
assets/Script/adpp/ManageDapp.js

@@ -138,6 +138,14 @@ cc.Class({
             default: null,
             visible: false
         },
+        /**
+         * 动态修改背景
+         */
+        dynamicLoadingBg: {
+            default: null,
+            type: cc.Node,
+            serializable: true
+        }
     },
 
     // LIFE-CYCLE CALLBACKS:
@@ -224,6 +232,10 @@ cc.Class({
                 // this.avatarTipLabel.string = '村长';
                 this.avatarButtonBG.spriteFrame = this.mayorButton;
                 this.avatarTipBG.spriteFrame = this.villageText;
+
+                this.dynamicLoadingBg.getComponent("DynamicLoadingBg").setInfo({
+                    type: "village"
+                });
                 break;
             case 2:
                 this.avatarNode.getComponent(cc.Sprite).spriteFrame = this.avatarMayorSprite;
@@ -231,6 +243,10 @@ cc.Class({
                 this.avatarButtonBG.node.parent.active = false;
                 // this.avatarTipLabel.string = '镇长';
                 this.avatarTipBG.spriteFrame = this.mayorText;
+
+                this.dynamicLoadingBg.getComponent("DynamicLoadingBg").setInfo({
+                    type: "mayor"
+                });
                 break;
 
         }

+ 42 - 5
assets/Script/build/LeaseFarmlandInfo.js

@@ -184,6 +184,22 @@ cc.Class({
 
         //是否是自己的土地,记录一下
         bSelfLand: true,
+
+        //
+        giveOutLightNode: {
+            default: null,
+            type: cc.Node,
+            serializable: true,
+        },
+        envBg: {
+            default: null,
+            type: cc.Node,
+            serializable: true,
+        },
+        envBgSpriteFrameList: {
+            default: [],
+            type: cc.SpriteFrame,
+        },
     },
 
     // LIFE-CYCLE CALLBACKS:
@@ -211,13 +227,13 @@ cc.Class({
                     //更新仓库列表
                     this._buildingView.onUpdateList();
                     // "收获成功!"
-                    if(value.data.lossAmount>0){
-                        console.log("loss amount:"+value.data.lossAmount);
-                        GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "收获成功!损失了"+ value.data.lossAmount+"个果实", 2);
-                    }else{
+                    if (value.data.lossAmount > 0) {
+                        console.log("loss amount:" + value.data.lossAmount);
+                        GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "收获成功!损失了" + value.data.lossAmount + "个果实", 2);
+                    } else {
                         GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "收获成功!", 2);
                     }
-                   
+
 
                     this.isShowHarvest = false;
                     this.isShowIndex = 0;
@@ -240,6 +256,24 @@ cc.Class({
         this.stealHarvestNode.on(cc.Node.EventType.TOUCH_START, () => {
             GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "请点击偷菜按钮收取!", 1);
         })
+
+        //如果是村长或者镇长,换地皮
+
+
+
+        if (GlobalD.Dapp) {
+            switch (GlobalD.Dapp.UserInfo.agent_level) {
+                case 0:
+                    this.envBg.getComponent(cc.Sprite).spriteFrame = this.envBgSpriteFrameList[0];
+                    break;
+                case 1:
+                    this.envBg.getComponent(cc.Sprite).spriteFrame = this.envBgSpriteFrameList[1];
+                    break;
+                case 2:
+                    this.envBg.getComponent(cc.Sprite).spriteFrame = this.envBgSpriteFrameList[2];
+                    break;
+            }
+        }
     },
 
     onSpawnLeasePanel() {
@@ -624,6 +658,9 @@ cc.Class({
      * @param {boolean} bActive 
      */
     onSetInfoBoxActive(bActive) {
+
+        this.giveOutLightNode.active = bActive;
+
         if (!this.bSelfLand) {
             // console.log("其他用户的不用显示面板");
             return;

+ 7 - 5
assets/Script/build/WorkingBuilding.js

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

BIN
assets/Texture/Labour_205_Black.png


+ 34 - 0
assets/Texture/Labour_205_Black.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "50d30291-6656-4611-89ef-9f3dfc5491ad",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "Labour_205_Black": {
+      "ver": "1.0.4",
+      "uuid": "61d576e5-e89f-4e22-8e95-4eda156768de",
+      "rawTextureUuid": "50d30291-6656-4611-89ef-9f3dfc5491ad",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": -26.5,
+      "trimX": 23,
+      "trimY": 74,
+      "width": 286,
+      "height": 173,
+      "rawWidth": 332,
+      "rawHeight": 268,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/Texture/Labour_205_Gold.png


+ 34 - 0
assets/Texture/Labour_205_Gold.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "6fb68d6e-5bdb-4216-9ce9-586cc7d181e9",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "Labour_205_Gold": {
+      "ver": "1.0.4",
+      "uuid": "f14efb24-cb6c-4d87-9ab3-0586a735cbc5",
+      "rawTextureUuid": "6fb68d6e-5bdb-4216-9ce9-586cc7d181e9",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": -27.5,
+      "trimX": 23,
+      "trimY": 75,
+      "width": 286,
+      "height": 173,
+      "rawWidth": 332,
+      "rawHeight": 268,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/Texture/Labour_205_Normal.png


+ 34 - 0
assets/Texture/Labour_205_Normal.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "c6037b21-52fd-4788-8d86-2bca3e635d72",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "Labour_205_Normal": {
+      "ver": "1.0.4",
+      "uuid": "24ac7bab-b638-434c-a6a1-c35d04d7ebc7",
+      "rawTextureUuid": "c6037b21-52fd-4788-8d86-2bca3e635d72",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": -26.5,
+      "trimX": 23,
+      "trimY": 75,
+      "width": 286,
+      "height": 171,
+      "rawWidth": 332,
+      "rawHeight": 268,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/Texture/Labour_205_light.png


+ 34 - 0
assets/Texture/Labour_205_light.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "667b9156-32db-4f35-9098-f1ec8cca7c36",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "Labour_205_light": {
+      "ver": "1.0.4",
+      "uuid": "60d0a3f2-fc8b-4a58-aa96-ec79b5aaca3d",
+      "rawTextureUuid": "667b9156-32db-4f35-9098-f1ec8cca7c36",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0.5,
+      "offsetY": -27,
+      "trimX": 4,
+      "trimY": 55,
+      "width": 325,
+      "height": 212,
+      "rawWidth": 332,
+      "rawHeight": 268,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/Texture/Labour_Holy_growing.png


+ 7 - 7
assets/Texture/Labour_Holy_growing.png.meta

@@ -16,13 +16,13 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
-      "offsetY": -38,
-      "trimX": 1,
-      "trimY": 76,
-      "width": 274,
-      "height": 171,
-      "rawWidth": 276,
+      "offsetX": 3.5,
+      "offsetY": -9,
+      "trimX": 54,
+      "trimY": 51,
+      "width": 231,
+      "height": 163,
+      "rawWidth": 332,
       "rawHeight": 247,
       "borderTop": 0,
       "borderBottom": 0,

BIN
assets/Texture/Labour_Holy_planting.png


+ 7 - 7
assets/Texture/Labour_Holy_planting.png.meta

@@ -16,13 +16,13 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": -0.5,
-      "offsetY": -39,
-      "trimX": 1,
-      "trimY": 78,
-      "width": 273,
-      "height": 169,
-      "rawWidth": 276,
+      "offsetX": 3.5,
+      "offsetY": -31,
+      "trimX": 57,
+      "trimY": 89,
+      "width": 225,
+      "height": 131,
+      "rawWidth": 332,
       "rawHeight": 247,
       "borderTop": 0,
       "borderBottom": 0,

BIN
assets/UI/DApp/avatar/farmer.png


+ 3 - 3
assets/UI/DApp/avatar/farmer.png.meta

@@ -16,11 +16,11 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
+      "offsetX": 1.5,
       "offsetY": 0,
-      "trimX": 0,
+      "trimX": 3,
       "trimY": 0,
-      "width": 81,
+      "width": 78,
       "height": 81,
       "rawWidth": 81,
       "rawHeight": 81,

BIN
assets/UI/DApp/avatar/mayor.png


BIN
assets/UI/DApp/avatar/village.png


BIN
assets/UI/NScene/Fruits/BroccoliSeed.png


+ 8 - 8
assets/UI/NScene/Fruits/BroccoliSeed.png.meta

@@ -16,14 +16,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
-      "offsetY": -7,
-      "trimX": 1,
-      "trimY": 14,
-      "width": 274,
-      "height": 233,
-      "rawWidth": 276,
-      "rawHeight": 247,
+      "offsetX": -6,
+      "offsetY": -12.5,
+      "trimX": 32,
+      "trimY": 51,
+      "width": 256,
+      "height": 191,
+      "rawWidth": 332,
+      "rawHeight": 268,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/UI/NScene/Fruits/CabbageSeed.png


+ 8 - 8
assets/UI/NScene/Fruits/CabbageSeed.png.meta

@@ -16,14 +16,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
-      "offsetY": -1,
-      "trimX": 1,
-      "trimY": 2,
-      "width": 274,
-      "height": 245,
-      "rawWidth": 276,
-      "rawHeight": 247,
+      "offsetX": 2,
+      "offsetY": -10.5,
+      "trimX": 37,
+      "trimY": 49,
+      "width": 262,
+      "height": 191,
+      "rawWidth": 332,
+      "rawHeight": 268,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/UI/NScene/Fruits/CarrotSeed.png


+ 8 - 8
assets/UI/NScene/Fruits/CarrotSeed.png.meta

@@ -16,14 +16,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
-      "offsetY": -1,
-      "trimX": 1,
-      "trimY": 2,
-      "width": 274,
-      "height": 245,
-      "rawWidth": 276,
-      "rawHeight": 247,
+      "offsetX": -11.5,
+      "offsetY": -3.5,
+      "trimX": 20,
+      "trimY": 41,
+      "width": 269,
+      "height": 193,
+      "rawWidth": 332,
+      "rawHeight": 268,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/UI/NScene/Fruits/EggplantSeed.png


+ 8 - 8
assets/UI/NScene/Fruits/EggplantSeed.png.meta

@@ -16,14 +16,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": -0.5,
-      "offsetY": -0.5,
-      "trimX": 0,
-      "trimY": 1,
-      "width": 275,
-      "height": 246,
-      "rawWidth": 276,
-      "rawHeight": 247,
+      "offsetX": 10.5,
+      "offsetY": 12.5,
+      "trimX": 31,
+      "trimY": 0,
+      "width": 291,
+      "height": 243,
+      "rawWidth": 332,
+      "rawHeight": 268,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/UI/NScene/Fruits/LentilSeed.png


+ 8 - 8
assets/UI/NScene/Fruits/LentilSeed.png.meta

@@ -16,14 +16,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 1,
-      "trimY": 0,
-      "width": 274,
-      "height": 247,
-      "rawWidth": 276,
-      "rawHeight": 247,
+      "offsetX": 3.5,
+      "offsetY": -1,
+      "trimX": 25,
+      "trimY": 25,
+      "width": 289,
+      "height": 220,
+      "rawWidth": 332,
+      "rawHeight": 268,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/UI/NScene/Fruits/PepperSeed.png


+ 8 - 8
assets/UI/NScene/Fruits/PepperSeed.png.meta

@@ -16,14 +16,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
-      "offsetY": -1,
-      "trimX": 1,
-      "trimY": 2,
-      "width": 274,
-      "height": 245,
-      "rawWidth": 276,
-      "rawHeight": 247,
+      "offsetX": 1,
+      "offsetY": 3.5,
+      "trimX": 24,
+      "trimY": 16,
+      "width": 286,
+      "height": 229,
+      "rawWidth": 332,
+      "rawHeight": 268,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/UI/NScene/Fruits/PotatoSeed.png


+ 8 - 8
assets/UI/NScene/Fruits/PotatoSeed.png.meta

@@ -16,14 +16,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
-      "offsetY": -0.5,
-      "trimX": 1,
-      "trimY": 1,
-      "width": 274,
-      "height": 246,
-      "rawWidth": 276,
-      "rawHeight": 247,
+      "offsetX": -3.5,
+      "offsetY": 15,
+      "trimX": 30,
+      "trimY": 14,
+      "width": 265,
+      "height": 210,
+      "rawWidth": 332,
+      "rawHeight": 268,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/UI/NScene/Fruits/SquashSeed.png


+ 8 - 8
assets/UI/NScene/Fruits/SquashSeed.png.meta

@@ -16,14 +16,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 1,
-      "trimY": 0,
-      "width": 274,
-      "height": 247,
-      "rawWidth": 276,
-      "rawHeight": 247,
+      "offsetX": -3,
+      "offsetY": 6,
+      "trimX": 29,
+      "trimY": 21,
+      "width": 268,
+      "height": 214,
+      "rawWidth": 332,
+      "rawHeight": 268,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/UI/NScene/Fruits/TomatoSeed.png


+ 8 - 8
assets/UI/NScene/Fruits/TomatoSeed.png.meta

@@ -16,14 +16,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
-      "offsetY": -1,
-      "trimX": 1,
-      "trimY": 2,
-      "width": 274,
-      "height": 245,
-      "rawWidth": 276,
-      "rawHeight": 247,
+      "offsetX": 1,
+      "offsetY": 4,
+      "trimX": 26,
+      "trimY": 15,
+      "width": 282,
+      "height": 230,
+      "rawWidth": 332,
+      "rawHeight": 268,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/UI/NScene/Seeds/Broccoli.png


+ 8 - 8
assets/UI/NScene/Seeds/Broccoli.png.meta

@@ -16,14 +16,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
-      "offsetY": -7,
-      "trimX": 1,
-      "trimY": 14,
-      "width": 274,
-      "height": 233,
-      "rawWidth": 276,
-      "rawHeight": 247,
+      "offsetX": -6,
+      "offsetY": -12.5,
+      "trimX": 32,
+      "trimY": 51,
+      "width": 256,
+      "height": 191,
+      "rawWidth": 332,
+      "rawHeight": 268,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/UI/NScene/Seeds/Cabbage.png


+ 8 - 8
assets/UI/NScene/Seeds/Cabbage.png.meta

@@ -16,14 +16,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
-      "offsetY": -1,
-      "trimX": 1,
-      "trimY": 2,
-      "width": 274,
-      "height": 245,
-      "rawWidth": 276,
-      "rawHeight": 247,
+      "offsetX": 2,
+      "offsetY": -10.5,
+      "trimX": 37,
+      "trimY": 49,
+      "width": 262,
+      "height": 191,
+      "rawWidth": 332,
+      "rawHeight": 268,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/UI/NScene/Seeds/Carrot.png


+ 8 - 8
assets/UI/NScene/Seeds/Carrot.png.meta

@@ -16,14 +16,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
-      "offsetY": -1,
-      "trimX": 1,
-      "trimY": 2,
-      "width": 274,
-      "height": 245,
-      "rawWidth": 276,
-      "rawHeight": 247,
+      "offsetX": -11.5,
+      "offsetY": -3.5,
+      "trimX": 20,
+      "trimY": 41,
+      "width": 269,
+      "height": 193,
+      "rawWidth": 332,
+      "rawHeight": 268,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/UI/NScene/Seeds/Eggplant.png


+ 8 - 8
assets/UI/NScene/Seeds/Eggplant.png.meta

@@ -16,14 +16,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": -0.5,
-      "offsetY": -0.5,
-      "trimX": 0,
-      "trimY": 1,
-      "width": 275,
-      "height": 246,
-      "rawWidth": 276,
-      "rawHeight": 247,
+      "offsetX": 10.5,
+      "offsetY": 12.5,
+      "trimX": 31,
+      "trimY": 0,
+      "width": 291,
+      "height": 243,
+      "rawWidth": 332,
+      "rawHeight": 268,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/UI/NScene/Seeds/Lentil.png


+ 8 - 8
assets/UI/NScene/Seeds/Lentil.png.meta

@@ -16,14 +16,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 1,
-      "trimY": 0,
-      "width": 274,
-      "height": 247,
-      "rawWidth": 276,
-      "rawHeight": 247,
+      "offsetX": 3.5,
+      "offsetY": -1,
+      "trimX": 25,
+      "trimY": 25,
+      "width": 289,
+      "height": 220,
+      "rawWidth": 332,
+      "rawHeight": 268,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/UI/NScene/Seeds/Pepper.png


+ 8 - 8
assets/UI/NScene/Seeds/Pepper.png.meta

@@ -16,14 +16,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
-      "offsetY": -1,
-      "trimX": 1,
-      "trimY": 2,
-      "width": 274,
-      "height": 245,
-      "rawWidth": 276,
-      "rawHeight": 247,
+      "offsetX": 1,
+      "offsetY": 3.5,
+      "trimX": 24,
+      "trimY": 16,
+      "width": 286,
+      "height": 229,
+      "rawWidth": 332,
+      "rawHeight": 268,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/UI/NScene/Seeds/Potato.png


+ 8 - 8
assets/UI/NScene/Seeds/Potato.png.meta

@@ -16,14 +16,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
-      "offsetY": -0.5,
-      "trimX": 1,
-      "trimY": 1,
-      "width": 274,
-      "height": 246,
-      "rawWidth": 276,
-      "rawHeight": 247,
+      "offsetX": -3.5,
+      "offsetY": 15,
+      "trimX": 30,
+      "trimY": 14,
+      "width": 265,
+      "height": 210,
+      "rawWidth": 332,
+      "rawHeight": 268,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/UI/NScene/Seeds/Squash.png


+ 8 - 8
assets/UI/NScene/Seeds/Squash.png.meta

@@ -16,14 +16,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
-      "offsetY": 0,
-      "trimX": 1,
-      "trimY": 0,
-      "width": 274,
-      "height": 247,
-      "rawWidth": 276,
-      "rawHeight": 247,
+      "offsetX": -3,
+      "offsetY": 6,
+      "trimX": 29,
+      "trimY": 21,
+      "width": 268,
+      "height": 214,
+      "rawWidth": 332,
+      "rawHeight": 268,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

BIN
assets/UI/NScene/Seeds/Tomato.png


+ 8 - 8
assets/UI/NScene/Seeds/Tomato.png.meta

@@ -16,14 +16,14 @@
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
-      "offsetX": 0,
-      "offsetY": -1,
-      "trimX": 1,
-      "trimY": 2,
-      "width": 274,
-      "height": 245,
-      "rawWidth": 276,
-      "rawHeight": 247,
+      "offsetX": 1,
+      "offsetY": 4,
+      "trimX": 26,
+      "trimY": 15,
+      "width": 282,
+      "height": 230,
+      "rawWidth": 332,
+      "rawHeight": 268,
       "borderTop": 0,
       "borderBottom": 0,
       "borderLeft": 0,

+ 7 - 0
assets/UI/NScene/StoreIcon.meta

@@ -0,0 +1,7 @@
+{
+  "ver": "1.0.1",
+  "uuid": "4cec6f15-685f-41e1-99d8-dc1f3daf3bf5",
+  "isSubpackage": false,
+  "subpackageName": "",
+  "subMetas": {}
+}

BIN
assets/UI/NScene/StoreIcon/BroccoliIcon.png


+ 34 - 0
assets/UI/NScene/StoreIcon/BroccoliIcon.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "b82e04e9-0882-462a-9f84-4ccf469cd7a0",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "BroccoliIcon": {
+      "ver": "1.0.4",
+      "uuid": "5c0e187e-bcc9-415a-af80-a0e42073b57d",
+      "rawTextureUuid": "b82e04e9-0882-462a-9f84-4ccf469cd7a0",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 2,
+      "offsetY": 23,
+      "trimX": 77,
+      "trimY": 87,
+      "width": 200,
+      "height": 185,
+      "rawWidth": 350,
+      "rawHeight": 405,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/UI/NScene/StoreIcon/CabbageIcon.png


+ 34 - 0
assets/UI/NScene/StoreIcon/CabbageIcon.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "c26b2635-ec96-46cb-a343-e42f8e7a51fd",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "CabbageIcon": {
+      "ver": "1.0.4",
+      "uuid": "a5f15978-675b-45ef-bf77-5b165370652c",
+      "rawTextureUuid": "c26b2635-ec96-46cb-a343-e42f8e7a51fd",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0.5,
+      "offsetY": 22,
+      "trimX": 77,
+      "trimY": 94,
+      "width": 197,
+      "height": 173,
+      "rawWidth": 350,
+      "rawHeight": 405,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/UI/NScene/StoreIcon/CarrotIcon.png


+ 34 - 0
assets/UI/NScene/StoreIcon/CarrotIcon.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "1c82ba10-e6cd-405d-8d6a-033e36d10047",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "CarrotIcon": {
+      "ver": "1.0.4",
+      "uuid": "3022deb6-6222-4f14-bb91-47a46b7413fb",
+      "rawTextureUuid": "1c82ba10-e6cd-405d-8d6a-033e36d10047",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -7,
+      "offsetY": 27,
+      "trimX": 80,
+      "trimY": 78,
+      "width": 176,
+      "height": 195,
+      "rawWidth": 350,
+      "rawHeight": 405,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/UI/NScene/StoreIcon/EggplantIcon.png


+ 34 - 0
assets/UI/NScene/StoreIcon/EggplantIcon.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "7cf07f78-6445-4f96-9158-7a0ce940144b",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "EggplantIcon": {
+      "ver": "1.0.4",
+      "uuid": "52d077a4-c84a-4d26-a5cc-ab83fe2dc829",
+      "rawTextureUuid": "7cf07f78-6445-4f96-9158-7a0ce940144b",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -2.5,
+      "offsetY": 29.5,
+      "trimX": 88,
+      "trimY": 80,
+      "width": 169,
+      "height": 186,
+      "rawWidth": 350,
+      "rawHeight": 405,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/UI/NScene/StoreIcon/LentilIcon.png


+ 34 - 0
assets/UI/NScene/StoreIcon/LentilIcon.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "e9decb48-7f17-4ab5-bf66-fda509f0f200",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "LentilIcon": {
+      "ver": "1.0.4",
+      "uuid": "d6d3e680-0f32-4f22-98b7-ad22b0d0de3c",
+      "rawTextureUuid": "e9decb48-7f17-4ab5-bf66-fda509f0f200",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -10.5,
+      "offsetY": 27.5,
+      "trimX": 78,
+      "trimY": 95,
+      "width": 173,
+      "height": 160,
+      "rawWidth": 350,
+      "rawHeight": 405,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/UI/NScene/StoreIcon/PepperIcon.png


+ 34 - 0
assets/UI/NScene/StoreIcon/PepperIcon.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "abaea5f6-1f2b-482b-b462-d10c7f60ae8e",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "PepperIcon": {
+      "ver": "1.0.4",
+      "uuid": "f881b960-b140-4b7e-967e-365ef05a5257",
+      "rawTextureUuid": "abaea5f6-1f2b-482b-b462-d10c7f60ae8e",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 34.5,
+      "trimX": 78,
+      "trimY": 75,
+      "width": 194,
+      "height": 186,
+      "rawWidth": 350,
+      "rawHeight": 405,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/UI/NScene/StoreIcon/PotatoIcon.png


+ 34 - 0
assets/UI/NScene/StoreIcon/PotatoIcon.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "d48bffd4-9cd4-4b38-9c4d-f97e78b70836",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "PotatoIcon": {
+      "ver": "1.0.4",
+      "uuid": "de82120a-cf59-434a-ac67-747da3e23674",
+      "rawTextureUuid": "d48bffd4-9cd4-4b38-9c4d-f97e78b70836",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0.5,
+      "offsetY": 19.5,
+      "trimX": 82,
+      "trimY": 115,
+      "width": 187,
+      "height": 136,
+      "rawWidth": 350,
+      "rawHeight": 405,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/UI/NScene/StoreIcon/SquashIcon.png


+ 34 - 0
assets/UI/NScene/StoreIcon/SquashIcon.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "7edd7b3b-1142-443a-a9af-e796abb291ef",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "SquashIcon": {
+      "ver": "1.0.4",
+      "uuid": "8f3e036d-9523-4b96-82df-0c85640e861e",
+      "rawTextureUuid": "7edd7b3b-1142-443a-a9af-e796abb291ef",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -4,
+      "offsetY": 32,
+      "trimX": 90,
+      "trimY": 70,
+      "width": 162,
+      "height": 201,
+      "rawWidth": 350,
+      "rawHeight": 405,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/UI/NScene/StoreIcon/TomatoIcon.png


+ 34 - 0
assets/UI/NScene/StoreIcon/TomatoIcon.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "de74d89c-6673-45ac-82a3-ed74e13d43b3",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "TomatoIcon": {
+      "ver": "1.0.4",
+      "uuid": "6429068a-95f6-453c-859b-50a9cf82975a",
+      "rawTextureUuid": "de74d89c-6673-45ac-82a3-ed74e13d43b3",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 30,
+      "trimX": 89,
+      "trimY": 89,
+      "width": 172,
+      "height": 167,
+      "rawWidth": 350,
+      "rawHeight": 405,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/res/resUI/BG_DownLeft.png


BIN
assets/res/resUI/BG_DownRight.png


BIN
assets/res/resUI/BG_UpLeft.png


BIN
assets/res/resUI/BG_UpRight.png


+ 7 - 0
assets/res/resUI/farmer.meta

@@ -0,0 +1,7 @@
+{
+  "ver": "1.0.1",
+  "uuid": "63e64f7f-5d3a-48d0-bb40-586996767603",
+  "isSubpackage": false,
+  "subpackageName": "",
+  "subMetas": {}
+}

BIN
assets/res/resUI/farmer/farmer_DownLeft.jpg


+ 34 - 0
assets/res/resUI/farmer/farmer_DownLeft.jpg.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "6b1454aa-06c6-4f8f-be18-825c52811b2a",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "farmer_DownLeft": {
+      "ver": "1.0.4",
+      "uuid": "35f7788a-5526-45fd-b81d-377b32d8b835",
+      "rawTextureUuid": "6b1454aa-06c6-4f8f-be18-825c52811b2a",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 3349,
+      "height": 2513,
+      "rawWidth": 3349,
+      "rawHeight": 2513,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/res/resUI/farmer/farmer_DownRight.jpg


+ 34 - 0
assets/res/resUI/farmer/farmer_DownRight.jpg.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "5e8defe5-5b8e-416b-91be-713e3587bbff",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "farmer_DownRight": {
+      "ver": "1.0.4",
+      "uuid": "9dc49b6b-0436-4b9b-a2d9-989f0f2983e5",
+      "rawTextureUuid": "5e8defe5-5b8e-416b-91be-713e3587bbff",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 3349,
+      "height": 2513,
+      "rawWidth": 3349,
+      "rawHeight": 2513,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/res/resUI/farmer/farmer_UpLeft.jpg


+ 4 - 4
assets/res/resUI/BG_DownLeft.png.meta → assets/res/resUI/farmer/farmer_UpLeft.jpg.meta

@@ -1,6 +1,6 @@
 {
   "ver": "2.3.3",
-  "uuid": "766925ac-7430-4b97-9780-56ac12a56644",
+  "uuid": "62968418-8e0a-4b2a-841f-ed7b35629416",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
@@ -9,10 +9,10 @@
   "packable": true,
   "platformSettings": {},
   "subMetas": {
-    "BG_DownLeft": {
+    "farmer_UpLeft": {
       "ver": "1.0.4",
-      "uuid": "1b91bf03-2db9-47ac-a01c-8f48aa428e92",
-      "rawTextureUuid": "766925ac-7430-4b97-9780-56ac12a56644",
+      "uuid": "ff3f5f62-9520-4ed8-be6c-a5277c217b8c",
+      "rawTextureUuid": "62968418-8e0a-4b2a-841f-ed7b35629416",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,

BIN
assets/res/resUI/farmer/farmer_UpRight.jpg


+ 4 - 4
assets/res/resUI/BG_DownRight.png.meta → assets/res/resUI/farmer/farmer_UpRight.jpg.meta

@@ -1,6 +1,6 @@
 {
   "ver": "2.3.3",
-  "uuid": "3d5d9199-40fb-4f4f-aba9-6511ff72cd2b",
+  "uuid": "295abdfe-7b96-4803-a6ce-f52ec5328f7d",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
@@ -9,10 +9,10 @@
   "packable": true,
   "platformSettings": {},
   "subMetas": {
-    "BG_DownRight": {
+    "farmer_UpRight": {
       "ver": "1.0.4",
-      "uuid": "0417b856-742a-47e7-aca9-895877968d6d",
-      "rawTextureUuid": "3d5d9199-40fb-4f4f-aba9-6511ff72cd2b",
+      "uuid": "170515f4-2d8f-49a9-a9d4-8f323edffc44",
+      "rawTextureUuid": "295abdfe-7b96-4803-a6ce-f52ec5328f7d",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,

+ 7 - 0
assets/res/resUI/mayor.meta

@@ -0,0 +1,7 @@
+{
+  "ver": "1.0.1",
+  "uuid": "4e660671-fc30-4d6d-946f-b43f02defc9b",
+  "isSubpackage": false,
+  "subpackageName": "",
+  "subMetas": {}
+}

BIN
assets/res/resUI/mayor/mayor_DownLeft.jpg


+ 34 - 0
assets/res/resUI/mayor/mayor_DownLeft.jpg.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "1b14fb04-1328-46cb-958d-f04faa4566d8",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "mayor_DownLeft": {
+      "ver": "1.0.4",
+      "uuid": "33527716-4018-4153-a156-fdec36a619d5",
+      "rawTextureUuid": "1b14fb04-1328-46cb-958d-f04faa4566d8",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 3349,
+      "height": 2513,
+      "rawWidth": 3349,
+      "rawHeight": 2513,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/res/resUI/mayor/mayor_DownRight.jpg


+ 34 - 0
assets/res/resUI/mayor/mayor_DownRight.jpg.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "abbbb7d1-5675-43e7-9017-247db221b899",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "mayor_DownRight": {
+      "ver": "1.0.4",
+      "uuid": "0b54e1a2-c7a2-4f73-82c7-1a4812e6dd9e",
+      "rawTextureUuid": "abbbb7d1-5675-43e7-9017-247db221b899",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 3349,
+      "height": 2513,
+      "rawWidth": 3349,
+      "rawHeight": 2513,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно