修改租赁信息设置

assets/Scene/MyCityScene - 004.fire

@@ -1984,7 +1984,7 @@
     "_skewY": 0,
     "_is3DNode": false,
     "groupIndex": 0,
-    "_id": "33Lis1LLpJy7Uz1VHIW/lN"
+    "_id": "e3PfGvlSZBP4e5xoiusLmz"
   },
   {
     "__type__": "cc.TiledLayer",
@@ -1995,7 +1995,7 @@
     },
     "_enabled": true,
     "_materials": [],
-    "_id": "08La8dphZEF5LjVnKcC1y6"
+    "_id": "50W+TRL4ZGOZA+R67o/MP2"
   },
   {
     "__type__": "cc.Node",
@@ -2056,7 +2056,7 @@
     "_skewY": 0,
     "_is3DNode": false,
     "groupIndex": 0,
-    "_id": "42qeOvC0dCi5Smw94JzPyD"
+    "_id": "c4OEQmojhFZ78R+izBDrHI"
   },
   {
     "__type__": "cc.TiledLayer",
@@ -2067,7 +2067,7 @@
     },
     "_enabled": true,
     "_materials": [],
-    "_id": "1eqXQPbf1BAqOUTacAHI0G"
+    "_id": "bdTNGSCFFLgpXHyrY+ydTD"
   },
   {
     "__type__": "cc.TiledObjectGroup",
@@ -2077,7 +2077,7 @@
       "__id__": 32
     },
     "_enabled": true,
-    "_id": "003Je9RJhKfI51RgByoWgs"
+    "_id": "1avuyYEF5FxYSxBngfqENy"
   },
   {
     "__type__": "cc.Node",
@@ -2135,7 +2135,7 @@
     "_skewY": 0,
     "_is3DNode": false,
     "groupIndex": 0,
-    "_id": "39vO69+7FMqKozxKjq24dF"
+    "_id": "2eTPM8ripP5IiGrupbxFWU"
   },
   {
     "__type__": "cc.TiledLayer",
@@ -2146,7 +2146,7 @@
     },
     "_enabled": true,
     "_materials": [],
-    "_id": "47oGQby3FC/aGHgU6K5bmz"
+    "_id": "b760WIYEZHKaee23hlNUbo"
   },
   {
     "__type__": "cc.Node",
@@ -2204,7 +2204,7 @@
     "_skewY": 0,
     "_is3DNode": false,
     "groupIndex": 0,
-    "_id": "36pQRIYQpIRakzmD9ffowd"
+    "_id": "5ayHNHIlZOPq0fWKLourAK"
   },
   {
     "__type__": "cc.TiledLayer",
@@ -2219,7 +2219,7 @@
         "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
       }
     ],
-    "_id": "11aMfP1xJP2IfO+YvEG6Q6"
+    "_id": "46+8ms9RNF646Udb2zMwA+"
   },
   {
     "__type__": "cc.Node",
@@ -2277,7 +2277,7 @@
     "_skewY": 0,
     "_is3DNode": false,
     "groupIndex": 0,
-    "_id": "b8j8LLJL9KGITN6TZnaYYq"
+    "_id": "dauRWpJ5RKHrsEqH4tflvi"
   },
   {
     "__type__": "cc.TiledObjectGroup",
@@ -2287,7 +2287,7 @@
       "__id__": 39
     },
     "_enabled": true,
-    "_id": "9c/QHPi5ZBnacflF2M7wK/"
+    "_id": "c0uoJcmr5KsJ+8W3p3D8GK"
   },
   {
     "__type__": "cc.Node",
@@ -2345,7 +2345,7 @@
     "_skewY": 0,
     "_is3DNode": false,
     "groupIndex": 0,
-    "_id": "86hmL40fxNiIAZX33H3Mj3"
+    "_id": "08/CSBBbFL8qFGy8rxVE/g"
   },
   {
     "__type__": "cc.TiledObjectGroup",
@@ -2355,7 +2355,7 @@
       "__id__": 41
     },
     "_enabled": true,
-    "_id": "2eAzGrjulCvoletQzjAhpj"
+    "_id": "e1krX+GdNLs49VoDspFr/W"
   },
   {
     "__type__": "cc.TiledMap",
@@ -3169,6 +3169,8 @@
     "isAutoMove": false,
     "targetNode": null,
     "_OldIndex": 0,
+    "isShowInfo": false,
+    "infoNode": null,
     "_id": "50EmYGvrNLZI4D7Gp2eSL9"
   },
   {
@@ -3669,6 +3671,8 @@
     "isAutoMove": false,
     "targetNode": null,
     "_OldIndex": 0,
+    "isShowInfo": false,
+    "infoNode": null,
     "_id": "46m+HKqENIeqyxoB5z+mRo"
   },
   {

assets/Script/Network/dapp.js

@@ -81,6 +81,8 @@ cc.Class({
                             utils.setToken(value.data.token);
                             /** 登录时候会获取一次游戏端的 userInfo ，后续可以通过userInfo接口获取 */
                             GlobalD.UserInfo = value.data.userInfo;
+                            /** 新增userInto 的 attribute */
+                            GlobalD.playerAttribute = value.data.playerAttribute;
                             /** 推送信息 */
                             utils.get(utils.api.playerPullInfo, {}, (flag, playerPullInfoTemp) => {
                                 if(!flag)return;
@@ -108,6 +110,14 @@ cc.Class({
                                         console.warn("未能读取到config土地？");
                                     }
                                 })
+                                // //获取玩家
+                                // utils.get(utils.api.playerAttribute, {}, (flag, value) => {
+                                //     if (flag && 0 === value.code) {
+                                //         GlobalD.playerAttribute = value.data;
+                                //     } else {
+                                //         console.warn("读取玩家属性错误？");
+                                //     }
+                                // })
                             })
 
                         } else {

assets/Script/Network/netUtils.ts

@@ -30,6 +30,8 @@ var utils = {
         playerInfo: 'comPlayers/getPlayerAndBattleAttribute',
         playerPushInfo: 'comPlayers/playerPushInfo',
         playerPullInfo: 'comPlayers/playerPullInfo',
+        //获取玩家属性
+        playerAttribute: 'comPlayersAttri/getPlayerAttribute',
         /**
          * 获取是否租赁过的状态
          */

assets/Script/UI/component/slider_progress.js

@@ -12,7 +12,7 @@ cc.Class({
     extends: cc.Component,
 
     properties: {
-
+        progressValue: 0
     },
 
     // LIFE-CYCLE CALLBACKS:
@@ -20,6 +20,11 @@ cc.Class({
     onLoad() {
         this.slider = this.getComponent(cc.Slider);
         this.progressbar = this.getComponent(cc.ProgressBar);
+        // console.log("slider");
+        if (this.slider)
+            this.slider.progress =  this.progressValue;
+        if (this.progressbar)
+            this.progressbar.progress =  this.progressValue;
 
         if (this.slider == null || this.progressbar == null) {
             return;
@@ -39,11 +44,15 @@ cc.Class({
     },
 
     onSetProcgress(value) {
+        this.progressValue = value;
+
         if (this.slider)
             this.slider.progress = value;
 
         if (this.progressbar)
             this.progressbar.progress = value;
+
+        // console.log("slider", value);
     }
 
     // update (dt) {},

assets/Script/build/LeaseFarmlandInfo.js

@@ -13,6 +13,12 @@ cc.Class({
             serializable: true,
         },
 
+        //主信息面板
+        infoBox: cc.Node,
+
+        //时间计算对象
+        showTimeOut: null,
+
         /**
          * 显示天数部分
          */
@@ -314,6 +320,7 @@ cc.Class({
      * 重新锁定
      */
     onLockLand() {
+
         //显示按钮
         if (this.notLeased) {
             this.notLeased.active = true;
@@ -336,6 +343,9 @@ cc.Class({
 
         //重置土地图片
         this._workingBuilding.onSetGrow(0, null);
+
+        this.onSetInfoBoxActive(false);
+
     },
     //设置config的土地信息
     setConfigLandInfo(value) {
@@ -352,6 +362,9 @@ cc.Class({
             console.log("已租赁土地状态为空：", value);
             return;
         }
+
+        this.onSetInfoBoxActive(false);
+
         //设置意思显示相关
         this.isShowHarvest = false;
         this.isShowIndex = 0;
@@ -456,13 +469,13 @@ cc.Class({
                 let [_lDay, _lHour, _lMinutes, _lSeconds] = date.remainFromMillisecond(_leaseDaysMill);
                 //todo 处理了 this.leaseLandInfo.leaseDaysRemaining
                 if (0 !== _lDay) {
-                    this.leaseDate.string = "剩余" + _lDay + "天数,共" + this.leaseLandInfo.leaseDays + "天";
+                    this.leaseDate.string = "剩" + _lDay + "天/" + this.leaseLandInfo.leaseDays + "天";
                 } else if (0 !== _lHour) {
-                    this.leaseDate.string = "剩余" + _lHour + "小时,共" + this.leaseLandInfo.leaseDays + "天";
+                    this.leaseDate.string = "剩" + _lHour + "时/" + this.leaseLandInfo.leaseDays + "天";
                 } else if (0 !== _lMinutes) {
-                    this.leaseDate.string = "剩余" + _lMinutes + "分钟,共" + this.leaseLandInfo.leaseDays + "天";
+                    this.leaseDate.string = "剩" + _lMinutes + "分/" + this.leaseLandInfo.leaseDays + "天";
                 } else {
-                    this.leaseDate.string = "剩余" + _lSeconds + "秒,共" + this.leaseLandInfo.leaseDays + "天";
+                    this.leaseDate.string = "剩" + _lSeconds + "秒/" + this.leaseLandInfo.leaseDays + "天";
                 }
                 //todo 如果租赁时间到了，重新锁定
                 //重置锁定状态显示
@@ -480,11 +493,11 @@ cc.Class({
                     //todo 处理了 this.leaseLandInfo.plantDaysRemaining
                     if (0 !== _pDay) {
                         //否则显示天和小时
-                        this.midDate.string = "剩余" + _pDay + "天" + _pHour + "小时";
+                        this.midDate.string = "剩" + _pDay + "天" + _pHour + "时";
                     } else if (0 !== _pHour) {
-                        this.midDate.string = "剩余" + _pHour + "小时" + _pMinutes + "分钟";
+                        this.midDate.string = "剩" + _pHour + "时" + _pMinutes + "分";
                     } else {
-                        this.midDate.string = "剩余" + _pMinutes + "分钟" + _pSeconds + "秒";
+                        this.midDate.string = "剩" + _pMinutes + "分" + _pSeconds + "秒";
                     }
                     if (!this.isShowHarvest) {
                         if (_plantDaysMill <= 0) {
@@ -497,7 +510,7 @@ cc.Class({
                             //如果是自己的，显示收成
                             if (bSelf) {
                                 this.onShowHarvest();
-                            }else{
+                            } else {
                                 this.onShowStealHarvest();
                             }
                         } else {
@@ -613,10 +626,37 @@ cc.Class({
         this.stealHarvestNode.active = true;
     },
 
+    /**
+     * 设置总体信息面板显示
+     * @param {boolean} bActive 
+     */
+    onSetInfoBoxActive(bActive) {
+        if (this.leaseLandInfo){
+            this.infoBox.active = bActive;
+            if(bActive)
+            {
+                if(this.showTimeOut){
+                    clearTimeout(this.showTimeOut);
+                    this.showTimeOut = null;
+                }
+                //自动隐藏面板
+                this.showTimeOut = setTimeout(()=>{
+                    this.infoBox.active = false;
+                },5000)
+            }
+        }
+            
+    },
+
+    
     onDestroy() {
         if (this.timeInterval) {
             clearInterval(this.timeInterval);
             this.timeInterval = null;
         }
+        if(this.showTimeOut){
+            clearTimeout(this.showTimeOut);
+            this.showTimeOut = null;
+        }
     }
 });

assets/Script/build/buildingsTouch.js

@@ -4,11 +4,11 @@ cc.Class({
 
     properties: {
 
-        
-        isHiddenTouch: { 
+
+        isHiddenTouch: {
             default: false,
-            tooltip:"初始化时候是否绑定touch"
-         },
+            tooltip: "初始化时候是否绑定touch"
+        },
 
         //是否显示房屋信息
         isShowBuildingInfo: { default: false },
@@ -44,6 +44,10 @@ cc.Class({
         //编辑时候，记录旧的遮挡位置
         _OldIndex: 0,
 
+        //是否显示节点
+        isShowInfo: { default: false },
+        infoNode: cc.Node,
+
         //如果是在新手引导时候建造的建筑
         //只要拖拽到虚影对应的位置，才能成功建造
     },
@@ -55,7 +59,7 @@ cc.Class({
         this.buildInfo = this._buildingsInfo.buildInfo;
         this.title = this._buildingsInfo.title;
 
-        if(!this.isHiddenTouch){
+        if (!this.isHiddenTouch) {
             this.node.on(cc.Node.EventType.TOUCH_START, this.TouchStartFunction, this);
             this.node.on(cc.Node.EventType.TOUCH_END, this.TouchEndFunction, this);
             this.node.on(cc.Node.EventType.TOUCH_CANCEL, this.TouchCancelFunction, this);
@@ -150,7 +154,27 @@ cc.Class({
 
         this.unschedule(this.callback);
         // cc.warn('touch End！');
-        console.log("this.isShowBuildingInfo:",this.isShowBuildingInfo);
+        if (this.isShowInfo) {
+
+            //关闭其他
+            let _landBuildingsInfo = this.node.parent.children;
+            for (let i = _landBuildingsInfo.length - 1; i >= 0; i--) {
+                let resetLandInfo = _landBuildingsInfo[i];
+                if (resetLandInfo.name == "Labour_205_Holy_Farmland") {
+                    let  _buildInfo = resetLandInfo.getComponent("buildingsInfo").buildInfo;
+                    let leaseFarmlandInfoScript = resetLandInfo.getComponent("LeaseFarmlandInfo");
+                    if (_buildInfo.id == this.buildInfo.id) {
+                        leaseFarmlandInfoScript.onSetInfoBoxActive(true);
+                    } else {
+
+                        leaseFarmlandInfoScript.onSetInfoBoxActive(false);
+                    }
+                }
+
+            }
+
+        }
+        console.log("this.isShowBuildingInfo:", this.isShowBuildingInfo);
         //如果没有移动就判断点击
         if (!this._isMove
             && this.isShowBuildingInfo

assets/Script/public/Globals.js

@@ -31,6 +31,8 @@ window.GlobalD = {
 
     //用户信息
     UserInfo: null,
+    //玩家角色属性后面这个字段处理
+    PlayerAttribute:null,
 
     //新手引导
     ManageTask: null,

assets/UI/NLease/LeseInfoBoxBg.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "d614dbf4-a78c-4a25-8361-a8a05578c31a",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "LeseInfoBoxBg": {
+      "ver": "1.0.4",
+      "uuid": "1f2e5010-a797-4b64-8190-d58183b8c635",
+      "rawTextureUuid": "d614dbf4-a78c-4a25-8361-a8a05578c31a",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -0.5,
+      "offsetY": 1,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 362,
+      "height": 102,
+      "rawWidth": 363,
+      "rawHeight": 104,
+      "borderTop": 17,
+      "borderBottom": 59,
+      "borderLeft": 20,
+      "borderRight": 21,
+      "subMetas": {}
+    }
+  }
+}

assets/UI/NLease/RenewalButtonBg.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "2f65bd34-8a82-4ff5-958d-afc2b9ff690c",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "RenewalButtonBg": {
+      "ver": "1.0.4",
+      "uuid": "71646e31-40ce-4f00-ba88-8e6e636b3017",
+      "rawTextureUuid": "2f65bd34-8a82-4ff5-958d-afc2b9ff690c",
+      "trimType": "custom",
+      "trimThreshold": 0,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 69,
+      "height": 80,
+      "rawWidth": 69,
+      "rawHeight": 80,
+      "borderTop": 15,
+      "borderBottom": 24,
+      "borderLeft": 18,
+      "borderRight": 17,
+      "subMetas": {}
+    }
+  }
+}

assets/UI/NLease/day_bg.png.meta

@@ -1,6 +1,6 @@
 {
   "ver": "2.3.3",
-  "uuid": "fff242a0-d18b-430d-a037-dbc4fc2d859f",
+  "uuid": "bbc06ab9-9486-4459-acc0-097f3077a94d",
   "type": "sprite",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
@@ -11,23 +11,23 @@
   "subMetas": {
     "day_bg": {
       "ver": "1.0.4",
-      "uuid": "60d01cae-62a8-46ab-bd33-2b25392688f6",
-      "rawTextureUuid": "fff242a0-d18b-430d-a037-dbc4fc2d859f",
+      "uuid": "5ac716f5-bf99-4e33-9418-4da240a84ee4",
+      "rawTextureUuid": "bbc06ab9-9486-4459-acc0-097f3077a94d",
       "trimType": "auto",
       "trimThreshold": 1,
       "rotated": false,
       "offsetX": 0,
       "offsetY": 0,
-      "trimX": 3,
-      "trimY": 3,
-      "width": 219,
-      "height": 30,
-      "rawWidth": 225,
-      "rawHeight": 36,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 97,
+      "height": 65,
+      "rawWidth": 97,
+      "rawHeight": 65,
       "borderTop": 0,
       "borderBottom": 0,
-      "borderLeft": 0,
-      "borderRight": 0,
+      "borderLeft": 32,
+      "borderRight": 32,
       "subMetas": {}
     }
   }

assets/UI/NLease/day_slider.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "98d2f7d0-b7ba-455f-aac5-fc0f377d228e",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "day_slider": {
+      "ver": "1.0.4",
+      "uuid": "afe1a055-67cd-4e2e-9c30-f3985080df99",
+      "rawTextureUuid": "98d2f7d0-b7ba-455f-aac5-fc0f377d228e",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0.5,
+      "offsetY": -0.5,
+      "trimX": 6,
+      "trimY": 4,
+      "width": 86,
+      "height": 58,
+      "rawWidth": 97,
+      "rawHeight": 65,
+      "borderTop": 27,
+      "borderBottom": 29,
+      "borderLeft": 24,
+      "borderRight": 23,
+      "subMetas": {}
+    }
+  }
+}

assets/UI/NLease/infoGreyBg.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "b7d4a7d6-7917-4e4e-93e7-4ebe328611bc",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "infoGreyBg": {
+      "ver": "1.0.4",
+      "uuid": "81f386fb-3fd1-43ae-9fda-61c862a3a0a9",
+      "rawTextureUuid": "b7d4a7d6-7917-4e4e-93e7-4ebe328611bc",
+      "trimType": "custom",
+      "trimThreshold": 0,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 49,
+      "height": 51,
+      "rawWidth": 49,
+      "rawHeight": 51,
+      "borderTop": 19,
+      "borderBottom": 21,
+      "borderLeft": 19,
+      "borderRight": 19,
+      "subMetas": {}
+    }
+  }
+}

assets/UI/NLease/land_multiple_bg.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "92348148-96b2-47e2-b5be-0b387a69911d",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "land_multiple_bg": {
+      "ver": "1.0.4",
+      "uuid": "dc274030-5260-4f2f-9670-9cad9ca891bc",
+      "rawTextureUuid": "92348148-96b2-47e2-b5be-0b387a69911d",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 215,
+      "height": 143,
+      "rawWidth": 215,
+      "rawHeight": 143,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/UI/NLease/lock_text.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "1bb046c1-4dd3-4093-a906-ff81e49f5d0a",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "lock_text": {
+      "ver": "1.0.4",
+      "uuid": "d4786e7c-5b8b-4902-843f-e3858184b650",
+      "rawTextureUuid": "1bb046c1-4dd3-4093-a906-ff81e49f5d0a",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 236,
+      "height": 270,
+      "rawWidth": 236,
+      "rawHeight": 270,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

assets/UI/NLease/plant_slider.png.meta

@@ -0,0 +1,34 @@
+{
+  "ver": "2.3.3",
+  "uuid": "ff83c364-b2db-4315-a2d0-5fac7250c930",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "platformSettings": {},
+  "subMetas": {
+    "plant_slider": {
+      "ver": "1.0.4",
+      "uuid": "bab6a325-716f-4c89-a5e0-8683b4e44c39",
+      "rawTextureUuid": "ff83c364-b2db-4315-a2d0-5fac7250c930",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0.5,
+      "offsetY": -0.5,
+      "trimX": 6,
+      "trimY": 4,
+      "width": 86,
+      "height": 58,
+      "rawWidth": 97,
+      "rawHeight": 65,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 23,
+      "borderRight": 23,
+      "subMetas": {}
+    }
+  }
+}