Merge branch 'master' of http://git.mokasz.com/zouyong/tower_sanguo

tower_sanguo/assets/scripts/module/drawRecruit/YBExchange.ts

@@ -49,6 +49,7 @@ export default class YBExchange extends BaseUI {
                     GameController.gameData.player.setProp(PLAYERPROP.YB,data.data.data.Yb);
                     GameController.gameData.player.setProp(PLAYERPROP.USER_EXCHANGE_TIMES,data.data.data.UserExchangeTimes);
                     this.updateInfo();
+                    GameController.uiM.showToast("兑换成功");
                 } else {
                     GameController.uiM.showToast(data.data.msg);
                 }

tower_sanguo/assets/scripts/net/HttpCommand.ts

@@ -225,7 +225,7 @@ export default class HttpCommand {
         this.sendData(url, data, callback);
     }
     /** 领取宝箱 */
-    exchangeTreasureChest(data = { isDouble: 0, taskId: 0 }, callback) {
+    exchangeTreasureChest(data = { isDouble: 0, taskId: 0, testEcpm: 0, }, callback) {//testEcpm: 0,
         this.sendData(HTTPTYPE.exchangeTreasureChest, data, callback);
     }
     /** 领取昨日任务红包币 */
@@ -352,7 +352,6 @@ export default class HttpCommand {
      */
     getPiggyBox() {
         let data = {
-
         };
         this.sendData(HTTPTYPE.getPiggyBox, data, (data) => {
             XXEvent.emit('http-piggyBox-getPiggyBox', data)
@@ -364,9 +363,11 @@ export default class HttpCommand {
      */
     savePiggyBox() {
         let data = {
-
+            testAverageEcpm: 150,
+            testLoginDays: 3,
+            testTrainTimes: 100,
         };
-        this.sendData(HTTPTYPE.savePiggyBox, data, (data) => {
+        this.sendData(HTTPTYPE.savePiggyBox, data, (data) => {//piggyBox/savePiggyBoxDeme
             XXEvent.emit('http-piggyBox-savePiggyBox', data)
         });
     }
@@ -376,9 +377,10 @@ export default class HttpCommand {
      */
     getStageReward() {
         let data = {
-
+            testEcpm: 150,
+            testVideoIncome: 3,
+            testVideoTimes: 100,
         };
-        //getStageRewardDemo getStageReward
         this.sendData(HTTPTYPE.getStageReward, data, (data) => {
             XXEvent.emit('http-stage-getStageReward', data)
         });
@@ -572,7 +574,7 @@ export enum HTTPTYPE {
     updateADLog = 'updateADLog',
     exchangeTreasureChest = 'dailytask/exchangeTreasureChestDemo',// exchangeTreasureChest exchangeTreasureChestDemo
     getPiggyBox = 'piggyBox/getPiggyBox',//提取存钱罐
-    savePiggyBox = 'piggyBox/savePiggyBoxDeme',//存钱罐进账 savePiggyBox savePiggyBoxDeme
+    savePiggyBox = 'piggyBox/savePiggyBoxDemo',//存钱罐进账 savePiggyBox savePiggyBoxDemo
     getStageReward = 'stage/getStageReward',//领取通关红包 getStageReward getStageRewardDemo
     saveStageReward = 'stage/saveStageReward',//掉落通关红包
     //-------ZNH