1.跑通版

assets/Prefabs/NBuildings/Labour/Labour_205_Holy_Farmland.prefab

@@ -1623,8 +1623,8 @@
     ],
     "_N$interactable": true,
     "_N$enableAutoGrayEffect": false,
-    "_N$transition": 2,
-    "transition": 2,
+    "_N$transition": 3,
+    "transition": 3,
     "_N$normalColor": {
       "__type__": "cc.Color",
       "r": 230,

assets/Prefabs/UI/seed/HolyFarmlandSeedStore.prefab

@@ -40,14 +40,14 @@
         "__id__": 29
       },
       {
-        "__id__": 31
+        "__id__": 30
       },
       {
-        "__id__": 33
+        "__id__": 32
       }
     ],
     "_prefab": {
-      "__id__": 34
+      "__id__": 33
     },
     "_opacity": 255,
     "_color": {
@@ -1050,11 +1050,7 @@
     "_enabled": true,
     "duration": 0.1,
     "zoomScale": 1.2,
-    "clickEvents": [
-      {
-        "__id__": 30
-      }
-    ],
+    "clickEvents": [],
     "_N$interactable": true,
     "_N$enableAutoGrayEffect": false,
     "_N$transition": 3,
@@ -1124,16 +1120,6 @@
     },
     "_id": ""
   },
-  {
-    "__type__": "cc.ClickEvent",
-    "target": {
-      "__id__": 1
-    },
-    "component": "",
-    "_componentId": "ba198n/JUtJXqII6aiwPODz",
-    "handler": "onPressed",
-    "customEventData": ""
-  },
   {
     "__type__": "ba198n/JUtJXqII6aiwPODz",
     "_name": "",
@@ -1160,7 +1146,7 @@
     },
     "clickEvents": [
       {
-        "__id__": 32
+        "__id__": 31
       }
     ],
     "_id": ""

assets/Scene/MyCityScene - 004.fire.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.2.1",
-  "uuid": "fa358137-208a-4b0f-94eb-b73bfaf5c3d0",
+  "uuid": "591a1367-313f-4af1-9802-88a6dd1f5ef0",
   "asyncLoadAssets": false,
   "autoReleaseAssets": false,
   "subMetas": {}

assets/Script/Lease/LeaseGrantInfo.js

@@ -69,9 +69,9 @@ cc.Class({
         //todo 判断一下amount
         console.log(this.inputInviteValue);
         if (this.inputInviteValue.length < 20) {
-            gameToast.getInstance().show(cc.find('Canvas/UICamera'), "输入地址", 2, () => {
+            GlobalD.GameData.showToast(cc.find('Canvas/UICamera'), "输入地址", 2, () => {
                 console.log("finish toast!");
-            }, this);
+            });
             return;
         }
 
@@ -85,13 +85,13 @@ cc.Class({
                 NumLabel.string = 0;
                 this.saleAmount.string = 0;
 
-                gameToast.getInstance().show(cc.find('Canvas/UICamera'), value.msg, 2, () => {
+                GlobalD.GameData.showToast(cc.find('Canvas/UICamera'), value.msg, 2, () => {
                     console.log("finish toast!");
-                }, this);
+                });
             } else {
-                gameToast.getInstance().show(cc.find('Canvas/UICamera'), value.msg, 2, () => {
+                GlobalD.GameData.showToast(cc.find('Canvas/UICamera'), value.msg, 2, () => {
                     console.log("finish toast!");
-                }, this);
+                });
             }
         });
     }

assets/Script/Lease/LeaseInfo.js

@@ -67,8 +67,8 @@ cc.Class({
             default: null,
             type: cc.Node,
             serializable: true,
-            visible:false,
-            toolTip:"操作的土地对象,初始化时候传入"
+            visible: false,
+            toolTip: "操作的土地对象,初始化时候传入"
         }
     },
 
@@ -96,9 +96,9 @@ cc.Class({
 
         var numberTemp = new RegExp("^[A-Za-z0-9]+$");
         if (numberTemp.test(value)) {
-            if(Number(value)>=1){
+            if (Number(value) >= 1) {
                 this.inputInviteValue = Number(value);
-            }else{
+            } else {
                 this.inputInviteValue = 1;
                 this.inputContainer.getComponent(cc.EditBox).string = this.inputInviteValue;
             }
@@ -106,9 +106,6 @@ cc.Class({
             this.inputInviteValue = 1;
             this.inputContainer.getComponent(cc.EditBox).string = this.inputInviteValue;
             console.log("请输入整数的倍数", this.inputInviteValue);
-            // gameToast.getInstance().show(this.ToastParent, "请输入整数的倍数", 2, () => {
-            //     console.log("finish toast!");
-            // }, this);
         }
         this._updatePrice();
     },
@@ -139,13 +136,13 @@ cc.Class({
     /**
      * 显示面板时候，设置一下初始化数据
      */
-    onInitLeaseInfo(multiple){
+    onInitLeaseInfo(multiple) {
         //这里处理倍数
         this.inputInviteValue = multiple;
         this.inputContainer.getComponent(cc.EditBox).string = this.inputInviteValue;
         this._updatePrice();
     },
-  
+
     //租赁支付
     onLeaseInfo() {
         console.log('支付总额：' + this.totalPriceValue);
@@ -155,25 +152,39 @@ cc.Class({
         }
         let _self = this;
         //cntAmount,payType,itemType,callback
-        GlobalD.GameData.payCNT(this.totalPriceValue, 1, this.toggleInputValue, (data) => {
-            console.log("土地支付", this.totalPriceValue, "==", 1, "==", this.toggleInputValue);
+        let _configLandInfo = this.leaseFarmlandInfoNode.getComponent("LeaseFarmlandInfo").configLandInfo
+        let payType = 0;
+        switch (this.toggleInputValue) {
+            case "1":
+                payType = 1;
+                break;
+            case "2":
+                payType = 5;
+                break;
+            case "3":
+                payType = 6;
+                break;
+            default:
+                console.error("this.toggleInputValue 不是1 2 3！", this.toggleInputValue);
+                break;
+        }
+        if(0 === payType){
+            console.log('选择租赁日错误：' + this.totalPriceValue + " == " + payType);
+        }
+
+        GlobalD.GameData.payCNT(this.totalPriceValue, payType, _configLandInfo.id, (data) => {
+            console.log("土地支付:", this.totalPriceValue, "== playType=", 1, ",item_type==", _configLandInfo.id);
             console.log("支付data:", data);
             const [err, tx] = data;
-       
+
             if (err === null) {
                 // TODO 成功, 支付为链上操作，需要提供回调接口给这边服务端确认交易成功后修改购买订单结果
                 console.log(tx) // 交易hash，唯一标识符
-                gameToast.getInstance().show(this.ToastParent, "支付成功！", 3, () => {
-                    console.log("finish toast!");
-                }, this);
                 //解锁土地操作
                 this.leaseFarmlandInfoNode.getComponent("LeaseFarmlandInfo").onUnlockLand();
-
+                this.onClose();
             } else {
                 console.log(err)
-                gameToast.getInstance().show(this.ToastParent, err, 3, () => {
-                    console.log("finish toast!");
-                }, this);
             }
         });
         // GlobalD.dapp.bindParent(_self.inputInviteValue).then((data) => {
@@ -190,9 +201,6 @@ cc.Class({
         //     } else {
         //         //TODO 服务错误
         //         console.log(data.err)
-        //         gameToast.getInstance().show(_self.ToastParent, "绑定失败！", 3, () => {
-        //             console.log("finish toast!");
-        //         }, _self);
         //     }
         // })
     },
@@ -200,6 +208,6 @@ cc.Class({
     onClose() {
         this.node.destroy();
     },
-    
+
 
 });

assets/Script/Lease/LeaseSaleInfo.js

@@ -44,9 +44,6 @@ cc.Class({
             this.inputInviteValue = 1;
             this.inputContainer.getComponent(cc.EditBox).string = this.inputInviteValue;
             console.log("请输入整数的倍数", this.inputInviteValue);
-            // gameToast.getInstance().show(this.ToastParent, "请输入整数的倍数", 2, () => {
-            //     console.log("finish toast!");
-            // }, this);
         }
     },
     setInfo(saleName, amount) {
@@ -62,9 +59,9 @@ cc.Class({
         //todo 判断一下amount
         console.log(this.inputInviteValue, Number(this.saleAmount.string));
         if (this.inputInviteValue > Number(this.saleAmount.string)) {
-            gameToast.getInstance().show(cc.find('Canvas/UICamera'), "销售的果实数量过多！", 2, () => {
+            GlobalD.GameData.showToast(cc.find('Canvas/UICamera'), "销售的果实数量过多！", 2, () => {
                 console.log("finish toast!");
-            }, this);
+            });
             return;
         }
 
@@ -80,13 +77,13 @@ cc.Class({
                     NumLabel.string = parseInt(NumLabel.string) - this.inputInviteValue;
                     this.saleAmount.string = parseInt(this.saleAmount.string) - this.inputInviteValue;
                 }
-                gameToast.getInstance().show(cc.find('Canvas/UICamera'), "成功售卖了！", 2, () => {
+                GlobalD.GameData.showToast(cc.find('Canvas/UICamera'), "成功售卖了！", 2, () => {
                     console.log("finish toast!");
-                }, this);
+                });
             } else {
-                gameToast.getInstance().show(cc.find('Canvas/UICamera'), value.msg, 2, () => {
+                GlobalD.GameData.showToast(cc.find('Canvas/UICamera'), value.msg, 2, () => {
                     console.log("finish toast!");
-                }, this);
+                });
             }
         });
     }

assets/Script/Network/dapp.js

@@ -16,9 +16,6 @@ cc.Class({
         async function dappInit() {
             console.log("初始化 dappInit");
             let dapp = GlobalD.dapp = new Dapp()
-            // gameToast.getInstance().show("loding...",5,()=>{
-            //     console.log("finish toast!");
-            // },_self);
             try {
                 const isTestNet = window['isTestNet'];
                 console.log('-----------开始初始化dapp!-----------');

assets/Script/Network/netUtils.ts

@@ -47,7 +47,9 @@ var utils = {
         //出售果实
         saleFruit:'comPlayerGoods/saleFruit',
         //赠送果实
-        grantFruit:'comPlayerGoods/grantFruit'
+        grantFruit:'comPlayerGoods/grantFruit',
+        //神农呗购买种子
+        snbBuySeeds:'comMallSeed/snbBuySeeds'
 
     },
     /** 登录获取的token */

assets/Script/UI/ManageBuildings.js

@@ -371,21 +371,23 @@ cc.Class({
         let BuildingStateArray = GlobalD.GameData.GetBuildingStateArray();
         for (let i = 0; i < BuildingStateArray.length; i++) {
             if (BuildingStateArray[i] == 0) {
-                this.BuildingArray[i].active = false;
+                if (this.BuildingArray[i])
+                    this.BuildingArray[i].active = false;
             }
             else {
-                this.BuildingArray[i].active = true;
+                if (this.BuildingArray[i])
+                    this.BuildingArray[i].active = true;
             }
         }
         let BuildingNumArray = GlobalD.GameData.GetBuildingNumArray();
         // cc.log('BuildingNumArray',BuildingNumArray)
         for (let i = 3; i < this.BuildingArray.length; i++) {
-            // cc.log('this.BuildingArray['+i+']='+this.BuildingArray[i].getChildByName('Name').getComponent(cc.Label).string);
-            this.BuildingArray[i].getChildByName('Name').getChildByName('Num').getComponent(cc.Label).string = BuildingNumArray[i];
+            // cc.log('this.BuildingArray[' + i + ']=' + this.BuildingArray[i].getChildByName('Name').getComponent(cc.Label).string);
+            if (this.BuildingArray[i])
+                this.BuildingArray[i].getChildByName('Name').getChildByName('Num').getComponent(cc.Label).string = BuildingNumArray[i];
         }
 
-        //初始化两个默认的建筑
-        //
+
     },
     //生成房子的默认值
     SpawnBuildingDefaultValue(buildingsInfo) {
@@ -499,7 +501,7 @@ 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];

assets/Script/UI/ManageClearNode.js

@@ -1,3 +1,4 @@
+var reGameStates = require('GameStates');
 
 var ClearType = cc.Enum({
     Hammer: -1,
@@ -153,7 +154,13 @@ cc.Class({
             // cc.log(buildIndex, _targetBuildingsInfo);
 
             if (_targetBuildingsInfo) {
-                self.labelTip.string = '是否移除' + _targetBuildingsInfo.buildInfo.buildingName;
+                if(_targetBuildingsInfo.buildInfo.buildType == reGameStates.BuildType.HolyFarmland){
+                    self.labelTip.string = '神农农田不可移除！';
+                 
+                }else{
+                    self.labelTip.string = '是否移除' + _targetBuildingsInfo.buildInfo.buildingName;
+                }
+            
                 self.targetBuildingsInfo = _targetBuildingsInfo;
             }
             else {
@@ -174,7 +181,14 @@ cc.Class({
     //拆除建筑时候调用
     onRemoveThisItem() {
         if (!this.targetBuildingsInfo) return;
-        // cc.log('this.targetBuildingsInfo', this.targetBuildingsInfo)
+      
+        //todo 如果是农田，不可移除
+        if(this.targetBuildingsInfo.buildInfo.buildType == reGameStates.BuildType.HolyFarmland){
+            this.labelTip.string = '神农农田不可移除！';
+            console.log("神农农田不可移除！");
+            return;
+        }
+
         this.targetBuildingsInfo.onClearSelfResetFromType();
         //清除时候，消除建筑物的影响力
         GlobalD.game.onClearBuildingsEffect(this.targetBuildingsInfo);

assets/Script/UI/ManageSeedNode.js

@@ -167,9 +167,9 @@ cc.Class({
         let leaseLandInfo = _leaseFarmlandInfo.leaseLandInfo;
 
         if (leaseLandInfo == null) {
-            gameToast.getInstance().show(cc.find("Canvas/UICamera"), "请先租赁土地！", 2, () => {
+            GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "请先租赁土地！", 2, () => {
                 console.log("finish toast!");
-            }, this);
+            });
             //隐藏种子和显示UI
             this.node.active = false;
             GlobalD.game._ManageUIScript.onBottomMenuView(true);
@@ -199,14 +199,14 @@ cc.Class({
                 //开始种植，给一个初始的状态
                 this.targetBuildingsInfo.onInitHolyFarmlandSeedFromGrow(1, this.fruitSpriteFrame);
 
-                gameToast.getInstance().show(cc.find("Canvas/UICamera"), "已成功种植！", 2, () => {
+                GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "已成功种植！", 2, () => {
                     console.log("finish toast!");
-                }, this);
+                });
             } else if (value.code == 704) {
                 //土地已经种植了
-                gameToast.getInstance().show(cc.find("Canvas/UICamera"), value.msg, 2, () => {
+                GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), value.msg, 2, () => {
                     console.log("finish toast!");
-                }, this);
+                });
             }
 
         });

assets/Script/adpp/ManageDapp.js

@@ -209,14 +209,14 @@ cc.Class({
                 //成功设置村长状态，并且更新
                 GlobalD.Dapp.UserInfo.agent_level = 1;
                 this.InitAvatarInfo();
-                gameToast.getInstance().show(this.ToastParent, "申请成功！", 3, () => {
+                GlobalD.GameData.showToast(this.ToastParent, "申请成功！", 3, () => {
                     console.log("finish toast!");
-                }, this);
+                });
             } else {
                 console.log(err) // 申请失败
-                gameToast.getInstance().show(this.ToastParent, err, 3, () => {
+                GlobalD.GameData.showToast(this.ToastParent, err, 3, () => {
                     console.log("finish toast!");
-                }, this);
+                });
             } 
         })
 
@@ -250,14 +250,14 @@ cc.Class({
             console.log("任职镇长:", JSON.stringify(data));
             if (data.err === null) {
                 console.log(data.res) // 申请提交成功，等待审核
-                gameToast.getInstance().show(_self.ToastParent, data.res, 3, () => {
+                GlobalD.GameData.showToast(_self.ToastParent, data.res, 3, () => {
                     console.log("finish toast!");
-                }, _self);
+                });
             } else {
                 console.log(data.err) // 申请失败
-                gameToast.getInstance().show(_self.ToastParent, data.err, 3, () => {
+                GlobalD.GameData.showToast(_self.ToastParent, data.err, 3, () => {
                     console.log("finish toast!");
-                }, _self);
+                });
             }
         })
 

assets/Script/adpp/dapp-plugin.min.js.meta

@@ -1,9 +0,0 @@
-{
-  "ver": "1.0.5",
-  "uuid": "0b4ce681-b122-4879-8a2f-9acaaade534d",
-  "isPlugin": false,
-  "loadPluginInWeb": true,
-  "loadPluginInNative": true,
-  "loadPluginInEditor": false,
-  "subMetas": {}
-}

assets/Script/adpp/inviteInfo.js

@@ -99,9 +99,9 @@ cc.Class({
             } else {
                 //TODO 服务错误
                 console.log(data.err)
-                gameToast.getInstance().show(this.ToastParent, data.err, 3, () => {
+                GlobalD.GameData.showToast(this.ToastParent, data.err, 3, () => {
                     console.log("finish toast!");
-                }, this);
+                });
             }
         })
     },
@@ -128,15 +128,15 @@ cc.Class({
                 //如果存在父节点，隐藏输入框
                 _self.inputContainer.active = false;
 
-                gameToast.getInstance().show(_self.ToastParent, "绑定成功！", 3, () => {
+                GlobalD.GameData.showToast(_self.ToastParent, "绑定成功！", 3, () => {
                     console.log("finish toast!");
-                }, _self);
+                });
             } else {
                 //TODO 服务错误
                 console.log(data.err)
-                gameToast.getInstance().show(_self.ToastParent, "绑定失败！", 3, () => {
+                GlobalD.GameData.showToast(_self.ToastParent, "绑定失败！", 3, () => {
                     console.log("finish toast!");
-                }, _self);
+                });
             }
         })
     },

assets/Script/build/LeaseFarmlandInfo.js

@@ -305,13 +305,13 @@ cc.Class({
                     let _workingBuilding = this.node.getComponent("WorkingBuilding");
                     _workingBuilding.onSetGrow(0, null);
                     // "收获成功！"
-                    gameToast.getInstance().show(cc.find("Canvas/UICamera"), "收获成功！", 2, () => {
+                    GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "收获成功！", 2, () => {
                         console.log("finish toast!");
-                    }, this);
+                    });
                 } else {
-                    gameToast.getInstance().show(cc.find("Canvas/UICamera"), value.msg, 2, () => {
+                    GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), value.msg, 2, () => {
                         console.log("finish toast!");
-                    }, this);
+                    });
                 }
             });
         })
@@ -320,6 +320,6 @@ cc.Class({
     },
 
     onPayCnt() {
-        Global.game.payCNT();
+
     }
 });

assets/Script/public/GameData.js

@@ -63,7 +63,10 @@ cc.Class({
         ConfigLand: {
             default: null,
             visible: false
-        }
+        },
+
+
+        toast: null,
 
     },
     onLoad() {
@@ -1098,11 +1101,18 @@ cc.Class({
         })
     },
 
+    //神农呗购买种子
+    onBuySeedsWithSNB(snbAmount,seedId,callback){
+        utils.post(utils.api.snbBuySeeds, {payAmount:snbAmount,seedId:seedId}, (res, vaule) => {
+            callback(res, vaule);
+        })
+    },
+
     //用cnt购买种子，种子的payType类型是 4
-    onBuySeedsWithCNT(cntAmount,seedId,callback){
+    onBuySeedsWithCNT(cntAmount, seedId, callback) {
         this.payCNT(cntAmount, 4, seedId, callback);
     },
-    
+
 
     /**
      * 支付cnt操作
@@ -1111,21 +1121,22 @@ cc.Class({
      * @param {*} itemType 操作物品的id
      */
     payCNT(cntAmount, payType, itemType, callback) {
+        console.log("购买金额："+cntAmount+"购买类型PlayType："+payType+"购买物品的id:"+itemType);
         if (!GlobalD.dapp) {
             console.warn("GlobalD.dapp未初始化，不能payCNT!");
             return;
         }
         //
         if (GlobalD.GameData.GetCNT() < cntAmount) {
-            console.log("cnt 不足，GetCNT：", GlobalD.GameData.GetCNT(), "消费的cntAmount", cntAmount);
-            gameToast.getInstance().show(cc.find("Canvas/UICamera"), "CNT不足！", 2, () => {
+            console.log("cnt 不足，GetCNT："+ GlobalD.GameData.GetCNT()+"消费的cntAmount"+cntAmount);
+            GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "CNT不足！", 2, () => {
                 console.log("finish toast!");
-            }, this);
+            });
             return;
         }
-        gameToast.getInstance().show(cc.find("Canvas/UICamera"), "支付处理中...", 10, () => {
+        GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "支付处理中...", 10, () => {
             console.log("finish toast!");
-        }, this);
+        });
 
         GlobalD.dapp.payCnt(cntAmount, payType, itemType).then((data) => {
             const [err, tx] = data;
@@ -1133,12 +1144,20 @@ cc.Class({
                 // TODO 成功, 支付为链上操作，需要提供回调接口给这边服务端确认交易成功后修改购买订单结果
                 console.log(tx) // 交易hash，唯一标识符
 
-                gameToast.getInstance().hide(this);
-                gameToast.getInstance().show(cc.find("Canvas/UICamera"), "支付成功!", 10, () => {
+                GlobalD.dapp.cntBalance().then((cntBalance) => {
+                    //会延迟返回
+                    console.log("更新cnt:" + cntBalance) // string, 精度18，需要自行处理省略几位小数
+                    GlobalD.GameData.SetCNT(cntBalance);
+                });
+
+                GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "支付成功!", 2, () => {
                     console.log("finish toast!");
-                }, this);
+                });
             } else {
                 console.log(err)
+                GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), err, 2, () => {
+                    console.log("finish toast!");
+                });
             }
 
             if (callback) {
@@ -1160,9 +1179,9 @@ cc.Class({
         }
         if (GlobalD.GameData.GetSNB() <= 0) {
             console.log("神农呗数量GetSNB:", GlobalD.GameData.GetSNB(), "替换snbAmount:", snbAmount);
-            gameToast.getInstance().show(cc.find("Canvas/UICamera"), "神农呗数量不足！", 2, () => {
+            GlobalD.GameData.showToast(cc.find("Canvas/UICamera"), "神农呗数量不足！", 2, () => {
                 console.log("finish toast!");
-            }, this);
+            });
             return;
         }
 
@@ -1174,6 +1193,12 @@ cc.Class({
                 //扣除对应的神农呗，本地修改显示
                 GlobalD.GameData.SetSNB(GlobalD.GameData.GetSNB() - snbAmount);
 
+                GlobalD.dapp.cntBalance().then((cntBalance) => {
+                    //会延迟返回
+                    console.log("更新cnt:" + cntBalance) // string, 精度18，需要自行处理省略几位小数
+                    GlobalD.GameData.SetCNT(cntBalance);
+                });
+
             } else {
                 console.log(err)
             }
@@ -1184,20 +1209,52 @@ cc.Class({
         });
     },
     //获取 神农呗转 CNT 日志
-    onGetSnbToCntInfo(page,limit,callback) {
+    onGetSnbToCntInfo(page, limit, callback) {
         if (!GlobalD.dapp) {
             console.warn("GlobalD.dapp未初始化，不能onGetSnbToCntInfo!");
             return;
         }
         GlobalD.dapp.swapLog(page, limit).then((data) => {
             const { err, res } = data;
-            if (err ===null) {
+            if (err === null) {
                 console.log(res) //
             }
             if (callback) {
                 callback(data);
             }
         });
+    },
+
+
+    showToast(parent, content, time, callback) {
+        if (this.toast) {
+            this.toast.active = true;
+            let DetailLabel = this.toast.getChildByName('DetailLabel');
+            DetailLabel.getComponent(cc.Label).string = content;
+            this.unschedule(this.scheduleObj);
+            this.scheduleObj = null;
+
+            this.scheduleObj = this.scheduleOnce(() => {
+                if (callback) {
+                    callback();
+                }
+                this.toast.active = false;
+            }, time);
+        } else {
+            cc.loader.loadRes("prefab/gameToast", function (err, texture) {
+                this.toast = cc.instantiate(texture);
+                this.toast.parent = parent;
+                let DetailLabel = this.toast.getChildByName('DetailLabel');
+                DetailLabel.getComponent(cc.Label).string = content;
+
+                this.scheduleObj = this.scheduleOnce(() => {
+                    if (callback) {
+                        callback();
+                    }
+                    this.toast.active = false;
+                }, time);
+            }.bind(this));
+        }
     }
 
 

assets/Script/public/ManageUI.js

@@ -165,9 +165,11 @@ cc.Class({
         let BuildingStateArray = GlobalD.GameData.GetBuildingLockStateArray();
         for (let i = 0; i < BuildingStateArray.length; i++) {
             if (BuildingStateArray[i] == 1) {
-                this.OpenBuildingUILock(i, false);
+                if (this.BuildingFrameArray[i])
+                    this.OpenBuildingUILock(i, false);
             }
-            let Price = this.BuildingFrameArray[i].getChildByName('Lock').getChildByName('PriceBG').getChildByName('label').getComponent(cc.Label).string = this.FormatMoney(AConfig.BuildingUnlockMoneyArray[i]);
+            if (this.BuildingFrameArray[i])
+                this.BuildingFrameArray[i].getChildByName('Lock').getChildByName('PriceBG').getChildByName('label').getComponent(cc.Label).string = this.FormatMoney(AConfig.BuildingUnlockMoneyArray[i]);
         }
 
         // *********** todo *************
@@ -175,18 +177,21 @@ cc.Class({
         //运营费用数组
         let _runningCostArray = AConfig.RunningCostArray;
         for (let i = 0; i < _runningCostArray.length; i++) {
-            let _contentButton = this.BuildingFrameArray[i].getComponent('Content_Button');
-            _contentButton.Price = AConfig.RunningCostArray[i];    //运营费用
-            //设置新的钻石价格
-            let _DiamondNumArray = GlobalD.GameData.GetDiamondNumArray();
-            _contentButton.DiamondPrice = _DiamondNumArray[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 (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;
@@ -196,6 +201,7 @@ cc.Class({
 
     },
     OpenBuildingUILock(Index, BLock) {
+
         let Lock = this.BuildingFrameArray[Index].getChildByName('Lock').active = BLock;
 
         let BuildingStateArray = GlobalD.GameData.GetBuildingLockStateArray();
@@ -320,7 +326,7 @@ cc.Class({
     OnShowRewardsViewClose(event, CustomEventData) {
         this.ShowRewardsView.destroy();
     },
-  
+
     //弹出购买提示
     onPurchaseTips(_contentButton) {
 
@@ -441,7 +447,7 @@ cc.Class({
         //转盘界面
         if (this.LuckView.active)
             this.onSetTouchStatus(this.LuckView, false);
-         //商城界面
+        //商城界面
         if (this.StoreView.active)
             this.onSetTouchStatus(this.StoreView, false);
     },
@@ -482,7 +488,7 @@ cc.Class({
     /**
      * 绑定邀请
      */
-    onInvite_Open(){
+    onInvite_Open() {
         this.inviteNode.getComponent("inviteInfo").onOpenInviteInfo();
     },