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

tower_sanguo/assets/resources/module/fight/prefab/monster.prefab

@@ -2209,7 +2209,7 @@
       "__id__": 1
     },
     "_children": [],
-    "_active": false,
+    "_active": true,
     "_components": [
       {
         "__id__": 61
@@ -2228,8 +2228,8 @@
     },
     "_contentSize": {
       "__type__": "cc.Size",
-      "width": 69,
-      "height": 48
+      "width": 47,
+      "height": 47
     },
     "_anchorPoint": {
       "__type__": "cc.Vec2",
@@ -2281,7 +2281,7 @@
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
-      "__uuid__": "9ceb6b99-65e2-4472-9d6e-fc4349d9571f"
+      "__uuid__": "b7ad0b07-4335-4f21-b42a-fe5471ce242a"
     },
     "_type": 0,
     "_sizeMode": 1,

tower_sanguo/assets/scripts/data/CommonData.ts

@@ -49,6 +49,20 @@ export default class CommonData {
 
     /** app版本号 */
     appVersion = ''
+    test_http_data = {
+        /** 是否使用测试接口 */
+        use_test_http: false,
+        /** ecmp值 */
+        ecpm_value: 0,
+        /** 视频次数 */
+        video_times: 0,
+        /** 登陆日 */
+        loginDays: 0,
+        /** 视频收入 */
+        videoIncome: 0,
+        /** 兵营训练次数 */
+        train_times: 0,
+    }
 
     /** 是否授权 */
     isAuth = false

tower_sanguo/assets/scripts/module/gm/GmUI.ts

@@ -28,9 +28,49 @@ export default class GmUI extends BaseUI {
     }
 
     start() {
-
+        this.scheduleOnce(() => { this.initStyle() }, 0)
+    }
+    /** 初始化http demo数据状态 */
+    private initStyle() {
+        let node_http_demo = this.node.getChildByName('node_http_demo');
+        let edit_ecpm_value = node_http_demo.getChildByName('edit_ecpm_value').getComponent(cc.EditBox);
+        let edit_video_times = node_http_demo.getChildByName('edit_video_times').getComponent(cc.EditBox);
+        let edit_loginDays_times = node_http_demo.getChildByName('edit_loginDays_times').getComponent(cc.EditBox);
+        let edit_videoIncome = node_http_demo.getChildByName('edit_videoIncome').getComponent(cc.EditBox);
+        let edit_train_times = node_http_demo.getChildByName('edit_train_times').getComponent(cc.EditBox);
+        edit_ecpm_value.string = `${GameController.commonData.test_http_data.ecpm_value}`;
+        edit_video_times.string = `${GameController.commonData.test_http_data.video_times}`;
+        edit_loginDays_times.string = `${GameController.commonData.test_http_data.loginDays}`;
+        edit_videoIncome.string = `${GameController.commonData.test_http_data.videoIncome}`;
+        edit_train_times.string = `${GameController.commonData.test_http_data.train_times}`;
     }
+    /** 打开http demo数据状态 */
+    private onClickUseHttpDemo() {
+        let node_http_demo = this.node.getChildByName('node_http_demo');
+        let edit_ecpm_value = node_http_demo.getChildByName('edit_ecpm_value').getComponent(cc.EditBox);
+        let edit_video_times = node_http_demo.getChildByName('edit_video_times').getComponent(cc.EditBox);
+        let edit_loginDays_times = node_http_demo.getChildByName('edit_loginDays_times').getComponent(cc.EditBox);
+        let edit_videoIncome = node_http_demo.getChildByName('edit_videoIncome').getComponent(cc.EditBox);
+        let edit_train_times = node_http_demo.getChildByName('edit_train_times').getComponent(cc.EditBox);
 
+        GameController.commonData.test_http_data.use_test_http = true;
+        GameController.commonData.test_http_data.ecpm_value = parseInt(edit_ecpm_value.string) || 0;
+        GameController.commonData.test_http_data.video_times = parseInt(edit_video_times.string) || 0;
+        GameController.commonData.test_http_data.loginDays = parseInt(edit_loginDays_times.string) || 0;
+        GameController.commonData.test_http_data.videoIncome = parseInt(edit_videoIncome.string) || 0;
+        GameController.commonData.test_http_data.train_times = parseInt(edit_train_times.string) || 0;
+        this.initStyle()
+    }
+    /** 打开http demo数据状态 */
+    private onClickNoUseHttpDemo() {
+        GameController.commonData.test_http_data.use_test_http = false;
+        GameController.commonData.test_http_data.ecpm_value = 0;
+        GameController.commonData.test_http_data.video_times = 0;
+        GameController.commonData.test_http_data.loginDays = 0;
+        GameController.commonData.test_http_data.videoIncome = 0;
+        GameController.commonData.test_http_data.train_times = 0;
+        this.initStyle()
+    }
     clickBtn(e, data) {
         if (this.lbl_input.string.length == 0) {
             console.log("参数不能为空");
@@ -107,7 +147,7 @@ export default class GmUI extends BaseUI {
             arr.push(x);
             arr.push(y);
         }
-        FightUI.moveCroods = [arr,arr];
+        FightUI.moveCroods = [arr, arr];
     }
     private closeFight() {
         this.bg_crood.active = false;

tower_sanguo/assets/scripts/module/loading/LoadingUI.ts

@@ -44,6 +44,8 @@ export default class LoadingUI extends BaseUI {
         }
         else{
             this.lbl_server.string = 'http://172.16.15.167:9092/';
+            GameController.commonData.appid = 'wxef592f91d2d15555';
+            GameController.commonData.version = '1.0';
         }
     }
 

tower_sanguo/assets/scripts/net/HttpCommand.ts

@@ -225,7 +225,12 @@ 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,
+        if (GameController.commonData.test_http_data.use_test_http) {
+            data.testEcpm = GameController.commonData.test_http_data.ecpm_value;
+            this.sendData(HTTPTYPE.exchangeTreasureChestDemo, data, callback);
+            return
+        }
         this.sendData(HTTPTYPE.exchangeTreasureChest, data, callback);
     }
     /** 领取昨日任务红包币 */
@@ -352,7 +357,6 @@ export default class HttpCommand {
      */
     getPiggyBox() {
         let data = {
-
         };
         this.sendData(HTTPTYPE.getPiggyBox, data, (data) => {
             XXEvent.emit('http-piggyBox-getPiggyBox', data)
@@ -364,8 +368,19 @@ export default class HttpCommand {
      */
     savePiggyBox() {
         let data = {
-
+            testAverageEcpm: 0,
+            testLoginDays: 0,
+            testTrainTimes: 0,
         };
+        if (GameController.commonData.test_http_data.use_test_http) {
+            data.testAverageEcpm = GameController.commonData.test_http_data.ecpm_value;
+            data.testLoginDays = GameController.commonData.test_http_data.loginDays;
+            data.testTrainTimes = GameController.commonData.test_http_data.train_times;
+            this.sendData(HTTPTYPE.savePiggyBoxDemo, {}, (data) => {
+                XXEvent.emit('http-piggyBox-savePiggyBox', data)
+            });
+            return
+        }
         this.sendData(HTTPTYPE.savePiggyBox, data, (data) => {
             XXEvent.emit('http-piggyBox-savePiggyBox', data)
         });
@@ -376,9 +391,19 @@ export default class HttpCommand {
      */
     getStageReward() {
         let data = {
-
+            testEcpm: 0,
+            testVideoIncome: 0,
+            testVideoTimes: 0,
         };
-        //getStageRewardDemo getStageReward
+        if (GameController.commonData.test_http_data.use_test_http) {
+            data.testEcpm = GameController.commonData.test_http_data.ecpm_value;
+            data.testVideoIncome = GameController.commonData.test_http_data.videoIncome;
+            data.testVideoTimes = GameController.commonData.test_http_data.video_times;
+            this.sendData(HTTPTYPE.getStageRewardDemo, {}, (data) => {
+                XXEvent.emit('http-stage-getStageReward', data)
+            });
+            return
+        }
         this.sendData(HTTPTYPE.getStageReward, data, (data) => {
             XXEvent.emit('http-stage-getStageReward', data)
         });
@@ -570,10 +595,13 @@ export enum HTTPTYPE {
     reduceTimeInvestProject = 'invest/reduceTimeInvestProject',
 
     updateADLog = 'updateADLog',
-    exchangeTreasureChest = 'dailytask/exchangeTreasureChestDemo',// exchangeTreasureChest exchangeTreasureChestDemo
+    exchangeTreasureChest = 'dailytask/exchangeTreasureChest',// exchangeTreasureChest exchangeTreasureChestDemo
+    exchangeTreasureChestDemo = 'dailytask/exchangeTreasureChestDemo',
     getPiggyBox = 'piggyBox/getPiggyBox',//提取存钱罐
-    savePiggyBox = 'piggyBox/savePiggyBoxDeme',//存钱罐进账 savePiggyBox savePiggyBoxDeme
+    savePiggyBox = 'piggyBox/savePiggyBox',//存钱罐进账 savePiggyBox savePiggyBoxDemo
+    savePiggyBoxDemo = 'piggyBox/savePiggyBoxDemo',
     getStageReward = 'stage/getStageReward',//领取通关红包 getStageReward getStageRewardDemo
+    getStageRewardDemo = 'stage/getStageRewardDemo',
     saveStageReward = 'stage/saveStageReward',//掉落通关红包
     //-------ZNH
     /** 武将许愿*/