Merge remote-tracking branch 'refs/remotes/origin/qx_JoyousManor_czw' into qx_JoyousManor_czw

egret/src/Panels/ShopPanel.ts

@@ -7,6 +7,8 @@ import Tween = egret.Tween;
 import Component = eui.Component;
 import TouchEvent = egret.TouchEvent;
 import {getlogItem} from "../comm/getlogItem";
+import { G_GetHomeDataByKey, HOME } from "../Scenes/Home";
+import { showToast } from "../comm/UtilsConst";
 
 const propData = [
     {
@@ -323,6 +325,16 @@ class ShopItem extends Component {
      */
     private async tapPropBuy() {
         NetManager.ins.clickLog(getlogItem(this.data.bid));
+        let spId = this.data.spId;
+        let spIds = ["sp_prop_1","sp_food_2","sp_food_1"];
+        if(spIds.indexOf(spId)!=-1){
+            let spdata1 = G_GetHomeDataByKey(HOME.PROP);
+            let count = spdata1[spId];
+            if(count>=100){
+                showToast("已达上限");
+                return;
+            }
+        }
 
         topLayerCtrl.instance.show(ModuleTypes.SHOP_BUY_PANEL, {
             ...this.data,

egret/src/Panels/TaskPanel.ts

@@ -121,11 +121,13 @@ class TaskItem extends ItemRenderer {
         this.btn_bg_dis.visible = (this.data.status != 0);
 
         let _f = () => {
-            TopLayerCtrl.instance.show(ModuleTypes.TASK_TOAST, {
-                title: (this.data.id == 1) ? '签到成功' : '分享成功',
-                food: this.data.spFood1RewardNum,
-                water: this.data.spFood2RewardNum,
-            });
+            if(this.data.spFood1RewardNum||this.data.spFood2RewardNum){
+                TopLayerCtrl.instance.show(ModuleTypes.TASK_TOAST, {
+                    title: (this.data.id == 1) ? '签到成功' : '分享成功',
+                    food: this.data.spFood1RewardNum,
+                    water: this.data.spFood2RewardNum,
+                });
+            }
             MainDispatcher.dispatchEvent('getTaskInfo');
             MainIns().mainUI.getPropInfo();
         };

egret/src/Scenes/MainScene/Const.ts

@@ -8,6 +8,8 @@ export enum CROP_TYPE {
     CATTLE = 4,     // 牛
     POTATO = 5,     // 土豆
     WALNUT = 6,     // 核桃
+    APPLE = 7,//苹果
+    PAPAYA=8,//木瓜
 }
 
 export let petData = {
@@ -90,6 +92,28 @@ export let petData = {
         catherImg: '核桃',
         introduce: '16小时即可长成 每八小时浇水一次 长成后预计可得4袋核桃',
     },
+    [CROP_TYPE.APPLE]: {    // 苹果
+        key: 'apple',
+        name: '苹果',
+        type: 'plant',
+        pos: [-32, -130],
+        propId: 'sp_food_2',
+        optionSvga: 'ready_water',
+        option: 'water',
+        catherImg: '苹果',
+        introduce: '16小时即可长成 每八小时浇水一次 长成后预计可得4袋苹果',
+    },
+    [CROP_TYPE.PAPAYA]: {    // 木瓜
+        key: 'papaya',
+        name: '木瓜',
+        type: 'plant',
+        pos: [-32, -135],
+        propId: 'sp_food_2',
+        optionSvga: 'ready_water',
+        option: 'water',
+        catherImg: '木瓜',
+        introduce: '16小时即可长成 每八小时浇水一次 长成后预计可得4袋木瓜',
+    },
 };
 
 export function getToken() {

egret/src/Scenes/MainScene/MainUI.ts

 import ComponentBase from "../../components/ComponentBase";
-import {M_HideOption} from "./Objs/OptionPanel";
+import { M_HideOption } from "./Objs/OptionPanel";
 import PanelCtrl from "../../ctrls/panelCtrl";
-import {ModuleTypes} from "../../types/sceneTypes";
-import {btnDelay, showToast} from "../../comm/UtilsConst";
-import {MainIns} from "./MainScene";
-import {NetManager} from "../../../libs/tw/manager/NetManager";
-import {DataManager} from "../../../libs/tw/manager/DataManager";
-import {loadSvga} from "../../comm/loadSvga";
-import {getSvga} from "../../utils";
+import { ModuleTypes } from "../../types/sceneTypes";
+import { btnDelay, showToast } from "../../comm/UtilsConst";
+import { MainIns } from "./MainScene";
+import { NetManager } from "../../../libs/tw/manager/NetManager";
+import { DataManager } from "../../../libs/tw/manager/DataManager";
+import { loadSvga } from "../../comm/loadSvga";
+import { getSvga } from "../../utils";
 import SceneCtrl from "../../ctrls/sceneCtrl";
-import {G_GetHomeDataByKey, G_SetHomeDataByKey, G_UpdateHomeData, HOME} from "../Home";
+import { G_GetHomeDataByKey, G_SetHomeDataByKey, G_UpdateHomeData, HOME } from "../Home";
 import RulePanel from "../../Panels/RulePanel";
 import WareHousePanel from "../../Panels/WareHousePanel";
 import NewUserPanel from "../../Panels/NewUserPanel";
@@ -18,17 +18,17 @@ import GameGroupPanel from "../../Panels/GameGroupPanel";
 import Guide from "../../Panels/Guide";
 import ShopPanel from "../../Panels/ShopPanel";
 import TopLayerCtrl from "../../ctrls/topLayerCtrl";
-import {Tools} from "../../Tools";
-import {getlogItem} from "../../comm/getlogItem";
-import {NetName} from "../../../libs/tw/enum/NetName";
-import {getToken} from "./Const";
-import {wait} from "../../comm/GameConst";
+import { Tools } from "../../Tools";
+import { getlogItem } from "../../comm/getlogItem";
+import { NetName } from "../../../libs/tw/enum/NetName";
+import { getToken } from "./Const";
+import { wait } from "../../comm/GameConst";
 import Event = egret.Event;
 
 export let propData = {
-    sp_food_1: {name: 'food',},
-    sp_food_2: {name: 'water',},
-    sp_prop_1: {name: 'speed',},
+    sp_food_1: { name: 'food', },
+    sp_food_2: { name: 'water', },
+    sp_prop_1: { name: 'speed', },
 };
 
 export default class MainUI extends ComponentBase {
@@ -197,7 +197,7 @@ export default class MainUI extends ComponentBase {
             this.tip1.x--;
             this.tip2.x = this.tip1.x + this.tip1.width
 
-            if(this.tip1.x <= -860){
+            if (this.tip1.x <= -860) {
                 let temp = this.tip2;
                 this.tip2 = this.tip1;
                 this.tip1 = temp;
@@ -221,8 +221,8 @@ export default class MainUI extends ComponentBase {
         // 0s(100%,100%)-0.1s(120%,80%)-0.2s(100%,100%)
         egret.Tween.removeTweens(this.warehouseBtn);
         egret.Tween.get(this.warehouseBtn)
-            .to({scaleX: 1.2, scaleY: 0.8}, 100, egret.Ease.quadInOut)
-            .to({scaleX: 1, scaleY: 1}, 100, egret.Ease.quadInOut);
+            .to({ scaleX: 1.2, scaleY: 0.8 }, 100, egret.Ease.quadInOut)
+            .to({ scaleX: 1, scaleY: 1 }, 100, egret.Ease.quadInOut);
     }
 
     public async getPropInfo() {
@@ -244,14 +244,14 @@ export default class MainUI extends ComponentBase {
         for (let k in propData) {
             let maxcount = 100;
             let textflow = [];
-            if(data[k]>maxcount){
+            if (data[k] > maxcount) {
                 textflow = [
-                    {text:maxcount+"/",style:{textColor:0xFFFFFF}},
-                    {text:data[k],style:{textColor:0xff0000}},
+                    { text: maxcount + "/", style: { textColor: 0xFFFFFF } },
+                    { text: data[k], style: { textColor: 0xff0000 } },
                 ];
-            }else{
+            } else {
                 textflow = [
-                    {text:data[k]+"/"+maxcount,style:{textColor:0xFFFFFF}},
+                    { text: data[k] + "/" + maxcount, style: { textColor: 0xFFFFFF } },
                 ];
             }
             this[`${propData[k].name}Num`].textFlow = textflow;
@@ -266,7 +266,7 @@ export default class MainUI extends ComponentBase {
 
     public setPropInfo() {
         this.setPropInfoByBI();
-        
+
         // const data = G_GetHomeDataByKey(HOME.PROP);
         // for (let k in propData) {
         //     this[`${propData[k].name}Num`].text = '× ' + data[k];
@@ -297,13 +297,12 @@ export default class MainUI extends ComponentBase {
             return;
         }
 
-        const {newUser, nickname, ifLogin, popup, loginPresent} = consumerInfo;
+        const { newUser, nickname, ifLogin, popup, loginPresent } = consumerInfo;
         this.userName.text = (!consumerInfo || !nickname || (nickname == 'null'))
             ? '小e' : ((nickname.length > 7) ? nickname.slice(0, 7) + '...' : nickname);
 
         // 登陆奖励
         const loginPrize = async () => {
-
             if (ifLogin) {
                 Tools.consumerInfo.ifLogin = false;
                 // NetManager.ins.doTask((success, res) => {
@@ -318,12 +317,14 @@ export default class MainUI extends ComponentBase {
                 //     MainIns().mainUI.getPropInfo();
                 // }, 1);
 
-                await wait(800);
-                TopLayerCtrl.instance.show(ModuleTypes.TASK_TOAST, {
-                    title: '登陆奖励',
-                    food: loginPresent['sp_food_1'] || 0,
-                    water: loginPresent['sp_food_2'] || 0,
-                });
+                if (loginPresent['sp_food_1'] || loginPresent['sp_food_2']) {
+                    await wait(800);
+                    TopLayerCtrl.instance.show(ModuleTypes.TASK_TOAST, {
+                        title: '登陆奖励',
+                        food: loginPresent['sp_food_1'] || 0,
+                        water: loginPresent['sp_food_2'] || 0,
+                    });
+                }
             }
         };
 
@@ -352,7 +353,7 @@ export default class MainUI extends ComponentBase {
                 call: () => {
                     if (popup) {
                         Tools.consumerInfo.popup = false;
-                        PanelCtrl.instance.show(NewUserPanel, {f: loginPrize});
+                        PanelCtrl.instance.show(NewUserPanel, { f: loginPrize });
                     }
                     return popup;
                 },
@@ -360,7 +361,7 @@ export default class MainUI extends ComponentBase {
             }, false);
         } else if (popup) { // 不是新用户，但是要弹弹窗
             Tools.consumerInfo.popup = false;
-            PanelCtrl.instance.show(OldUserPanel, {f: loginPrize});
+            PanelCtrl.instance.show(OldUserPanel, { f: loginPrize });
         } else if (ifLogin) {
             loginPrize();   // 首次登陆
         }

egret/src/Scenes/MainScene/Objs/OptionPanel.ts

-import {getSkinPath} from "../../../utils";
-import {MainDispatcher, MainIns} from "../MainScene";
-import {NetManager} from "../../../../libs/tw/manager/NetManager";
-import {btnDelay, showToast} from "../../../comm/UtilsConst";
-import {M_Plant} from "../LandMgr";
+import { getSkinPath } from "../../../utils";
+import { MainDispatcher, MainIns } from "../MainScene";
+import { NetManager } from "../../../../libs/tw/manager/NetManager";
+import { btnDelay, showToast } from "../../../comm/UtilsConst";
+import { M_Plant } from "../LandMgr";
 import M_EVENT from "../MSceneEnum";
-import {G_GetHomeDataByKey, G_UpdateHomeData, HOME} from "../../Home";
+import { G_GetHomeDataByKey, G_UpdateHomeData, HOME } from "../../Home";
 import PanelCtrl from "../../../ctrls/panelCtrl";
 import IntroducePanel from "../../../Panels/IntroducePanel";
 import Tween = egret.Tween;
 import Ease = egret.Ease;
-import {CROP_TYPE} from "../Const";
+import { CROP_TYPE } from "../Const";
 import TouchEvent = egret.TouchEvent;
 import Component = eui.Component;
-import {Tools} from "../../../Tools";
+import { Tools } from "../../../Tools";
 
 // 触发Option隐藏
 const M_HideOption = function () {
@@ -22,7 +22,7 @@ const M_HideOption = function () {
 const M_ShowOption = function (data: { index: number }) {
     MainDispatcher.dispatchEvent(M_EVENT.SHOW_OPTION, data);
 };
-export {M_HideOption, M_ShowOption};
+export { M_HideOption, M_ShowOption };
 
 const seedKV = {
     sp_seed_1: 'chick',   // 鸡
@@ -45,9 +45,9 @@ export default class OptionPanel extends Component {
     public wheatBtn: eui.Group;
     public walnutBtn: eui.Group;
     public potatoBtn: eui.Group;
-    public leftBtn:eui.Image;
-    public rightBtn:eui.Image;
-    public petScroll:eui.Scroller;
+    public leftBtn: eui.Image;
+    public rightBtn: eui.Image;
+    public petScroll: eui.Scroller;
 
     private data = null;
 
@@ -84,6 +84,8 @@ export default class OptionPanel extends Component {
             this.cornBtn,
             this.potatoBtn,
             this.walnutBtn,
+            this.appleBtn,
+            this.papayaBtn,
             this.leftBtn,
             this.rightBtn
         ].forEach((v) => {
@@ -101,6 +103,8 @@ export default class OptionPanel extends Component {
             this.cornBtn,
             this.potatoBtn,
             this.walnutBtn,
+            this.appleBtn,
+            this.papayaBtn,
             this.leftBtn,
             this.rightBtn
         ].forEach((v) => {
@@ -127,7 +131,7 @@ export default class OptionPanel extends Component {
             return;
         }
         this.visible = true;
-        Tween.get(this).set({alpha: 0}).to({alpha: 1}, 170);
+        Tween.get(this).set({ alpha: 0 }).to({ alpha: 1 }, 170);
     }
 
     // 查查有几个种子
@@ -161,7 +165,7 @@ export default class OptionPanel extends Component {
         this.touchEnabled = false;
         this.touchChildren = false;
         Tween.removeTweens(this);
-        Tween.get(this).to({alpha: 0}, 170).call(() => {
+        Tween.get(this).to({ alpha: 0 }, 170).call(() => {
             this.visible = false;
         });
     }
@@ -198,17 +202,24 @@ export default class OptionPanel extends Component {
             case this.walnutBtn: // 核桃
                 petId = CROP_TYPE.WALNUT;
                 break;
+            case this.appleBtn: // 土豆
+                petId = CROP_TYPE.APPLE;
+                break;
+
+            case this.papayaBtn: // 核桃
+                petId = CROP_TYPE.PAPAYA;
+                break;
             case this.leftBtn:
                 var contentWidth = this.petScroll.viewport.contentWidth;
                 var toscrollh = this.petScroll.viewport.scrollH - 150;
-                if(toscrollh<0)toscrollh=0;
+                if (toscrollh < 0) toscrollh = 0;
                 this.petScroll.viewport.scrollH = 0;
                 return;
             case this.rightBtn:
                 var contentWidth = this.petScroll.viewport.contentWidth;
-                var toscrollh = this.petScroll.viewport.scrollH+150;
-                if(toscrollh>contentWidth-531)toscrollh=contentWidth-531;
-                this.petScroll.viewport.scrollH = contentWidth-531;
+                var toscrollh = this.petScroll.viewport.scrollH + 150;
+                if (toscrollh > contentWidth - 531) toscrollh = contentWidth - 531;
+                this.petScroll.viewport.scrollH = contentWidth - 531;
                 return;
             default:
                 break;
@@ -216,21 +227,21 @@ export default class OptionPanel extends Component {
 
         const call = () => {
             // 0s（100%,100%）-0.1s(120%,120%)-0.2s(100%,100%)
-            Tween.get(target).to({scaleX: 1.2, scaleY: 1.2}, 100, Ease.quadIn)
-                .to({scaleX: 1, scaleY: 1}, 100, Ease.quadOut).call(() => {
-                M_HideOption();
-                console.log(this.data.index, petId);
-                NetManager.ins.doPlant((success) => {
-                    if (!success) {
-                        return;
-                    }
-                    M_Plant({landId: this.data.index, petId: petId});
-
-                    G_UpdateHomeData();
-                    Tools.judgeMedalPanel();    // 检查是否可以弹出勋章
-
-                }, this.data.index, petId);
-            });
+            Tween.get(target).to({ scaleX: 1.2, scaleY: 1.2 }, 100, Ease.quadIn)
+                .to({ scaleX: 1, scaleY: 1 }, 100, Ease.quadOut).call(() => {
+                    M_HideOption();
+                    console.log(this.data.index, petId);
+                    NetManager.ins.doPlant((success) => {
+                        if (!success) {
+                            return;
+                        }
+                        M_Plant({ landId: this.data.index, petId: petId });
+
+                        G_UpdateHomeData();
+                        Tools.judgeMedalPanel();    // 检查是否可以弹出勋章
+
+                    }, this.data.index, petId);
+                });
         }
 
         M_HideOption();

mock/joyousManor/consumerInfo.json

@@ -2,11 +2,11 @@
   "code": null,
   "data": {
     "popup": true,
-    "ifLogin": false,
+    "ifLogin": true,
     "newUser": true,
     "nickname": "4l60053306590_",
     "loginPresent": {
-      "sp_food_2": 2
+      "sp_food_2": 0
     }
   },
   "message": null,

mock/joyousManor/getLandInfo.json

@@ -48,7 +48,7 @@
             "feedNum": 30,
             "id": 5,
             "level": 3,
-            "petId": 1,
+            "petId": 7,
             "lock": false
         },
         {
@@ -58,7 +58,7 @@
             "feedNum": 20,
             "id": 6,
             "level": 4,
-            "petId": 1,
+            "petId": 8,
             "lock": true
         }
     ],