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

tower_sanguo/assets/scripts/data/GameData.ts

@@ -406,7 +406,7 @@ export default class GameData {
         vo.miss = o.miss;
         vo.resource = o.resource;
         vo.type = o.type;
-        vo.award = o.award;
+        vo.award = parseInt(o.award);
         return vo;
     }
 
@@ -891,6 +891,11 @@ export default class GameData {
      * @param add 
      */
     updateProp(type: PLAYERPROP, value, add: boolean = false, callback = null) {
+        //这两个后端无法处理，要求单独做接口
+        if(type == PLAYERPROP.FOOD || type == PLAYERPROP.USESKILL_TIME){
+            this.updatePropSpecial(type,value,add,callback);
+            return;
+        }
         let prop = {} as UpdatePlayerProps;
         prop.add = add ? 1 : 0;
         prop.propType = type;
@@ -898,6 +903,16 @@ export default class GameData {
         this.updateProps([prop], callback);
     }
 
+    updatePropSpecial(type: PLAYERPROP, value, add: boolean = false, callback = null){
+        //这两个后端无法处理，要求单独做接口
+        if(type == PLAYERPROP.FOOD){
+
+        }
+        else if(type == PLAYERPROP.USESKILL_TIME){
+
+        }
+    }
+
     /**
      * 客户端向服务器发送更新玩家属性 ，多个
      * @param props 
@@ -909,7 +924,8 @@ export default class GameData {
             let arr = data.data.playPropBackList;
             for (let i = 0; i < arr.length; i++) {
                 let prop = arr[i];
-                self.player.setProp(prop.propType, prop.propValue);
+                let v = typeof prop.propValue == 'string' ? parseInt(prop.propValue) : prop.propValue; 
+                self.player.setProp(prop.propType, v);
             }
 
             if (callback) {

tower_sanguo/assets/scripts/module/barracks/barracksModel.ts

@@ -47,13 +47,11 @@ export default class barracksModel {
         let generals_bag = GameController.gameData.player.generals_bag;
         let generals = GameController.gameData.player.generals;
 
-        for (const key in generalNew) {
-            if (Object.prototype.hasOwnProperty.call(generalNew, key)) {
-                const element = generalNew[key];
-                let generalbg = generals_bag[key];
-                generalbg.exp = element.exp;
-                generalbg.lv = element.lv;
-            }
+        for (let i = 0; i < generalNew.length; i++) {
+            const element = generalNew[i];
+            let generalbg = generals_bag[element.id];
+            generalbg.exp = element.exp;
+            generalbg.lv = element.lv;
         }
         XXEvent.emit(XXConst.UpdateGenerals, generals);
     }

tower_sanguo/assets/scripts/module/barracks/barracksUI.ts

@@ -165,12 +165,12 @@ export default class barracksUI extends BaseUI {
                 return
             }
 
-            GameController.gameData.player.setProp(PLAYERPROP.PRESTIGE, msg.prestige);
-            GameController.gameData.player.setProp(PLAYERPROP.BARRACK, msg.barrack);
+            GameController.gameData.player.setProp(PLAYERPROP.PRESTIGE, msg.data.prestige);
+            GameController.gameData.player.setProp(PLAYERPROP.BARRACK, msg.data.barrack);
 
-            barracksModel.getInstance().updateGeneralsLevel(msg.generals);
+            barracksModel.getInstance().updateGeneralsLevel(msg.data.generalpack);
 
-            GameController.gameData.updateBarrack(msg.barrack);
+            GameController.gameData.updateBarrack(msg.data.barrack);
 
             GameController.uiM.openUI(barracksGradeUpUI, () => {
                 this.cool = false;

tower_sanguo/assets/scripts/module/general/GeneralInfoUI.ts

@@ -201,7 +201,7 @@ export default class GeneralInfoUI extends BaseUI {
     /** 升星事件触发 */
     private onClickShengXing() {
         // 发送数据
-        GameController.http.updateGeneralSX(this.onStarUpCall.bind(this), this.general_data)
+        GameController.http.composeGeneral(this.onStarUpCall.bind(this),this.general_data.id);
     }
     /** 升星事件回调 */
     private onStarUpCall(data) {
@@ -209,6 +209,7 @@ export default class GeneralInfoUI extends BaseUI {
             cc.log(data.errmsg);
             return;
         }
+        
         let star_ratio1 = parseInt(this.general_data.growvalues[this.general_data.star - 1])
         let old_attack = `${XXMath.finalAttackValue(this.general_data.attack, this.general_data.lv, star_ratio1)}`
         let old_general = {
@@ -217,7 +218,7 @@ export default class GeneralInfoUI extends BaseUI {
             star: this.general_data.star,
             attack: old_attack,
         };
-        const success_general: GeneralVO = data.general_data;
+        const success_general: GeneralVO = data.data.GeneralProp;
 
         let star_ratio2 = parseInt(this.general_data.growvalues[success_general.star - 1])
         let new_attack = `${XXMath.finalAttackValue(this.general_data.attack, this.general_data.lv, star_ratio2)}`

tower_sanguo/assets/scripts/module/general/GeneralZhenWeiUI.ts

@@ -476,8 +476,15 @@ export default class GeneralZhenWeiUI extends BaseUI {
             }
         }
         GeneralUIModel.is_change_embattle = true;
+        let arr = [];
+        for (let i = 0; i < this.temp_generals.length; i++) {
+            let g = this.temp_generals[i];
+            if (g != null) {
+                arr.push({ gid: g.id, pos: g.pos });
+            }
+        }
         // 发送数据
-        GameController.http.updateEmbattle(this.onGotoBattlel.bind(this), this.temp_generals)
+        GameController.http.updateEmbattle(this.onGotoBattlel.bind(this), arr);
 
         this.beChangeGeneral && cc.log(general_data.name + '请求换位,' + this.beChangeGeneral.name + '被更换')
     }

tower_sanguo/assets/scripts/module/general/general_card_info.ts

@@ -169,7 +169,7 @@ export default class general_card_info extends cc.Component {
             cc.log(data.errmsg);
             return;
         }
-        const success_general: GeneralVO = data.general_data;
+        const success_general: GeneralVO = data.data.GeneralProp;
         // 更新背包数据
         let generals_bag = GameController.gameData.player.generals_bag
         // const g_b_count = generals_bag.length;

tower_sanguo/assets/scripts/module/main/MainUI.ts

@@ -146,7 +146,7 @@ export default class MainUI extends BaseUI {
         let count = 0;
         this.schedule(() => {
             count++;
-            if (count % 10 == 0) {
+            if (count % 15 == 0) {
                 count = 1;
                 let vo: MissionVO = GameController.gameData.getMissionByID(GameController.gameData.player.current_mission);
                 GameController.gameData.updateProp(PLAYERPROP.FOOD, Math.floor(vo.foodRecover * 5), true);

tower_sanguo/assets/scripts/net/HttpCommand.ts

@@ -49,7 +49,8 @@ export default class HttpCommand {
     connectTest(callback) {
         GameController.commonData.ranKey = Utils.randomString()
         let data = {
-            "mac": "c1:65:e2:1c:b0:25,f6:60:e4:1a:b7:27",            "psk": GameController.commonData.ranKey,
+            "mac": "c3:65:e2:1c:b0:25,f6:60:e4:1a:b7:27",            
+            "psk": GameController.commonData.ranKey,
             "appId": GameController.commonData.appid
         }
         // data.mac = 'c1:65:e2:1c:b0:94,f6:60:e4:1a:b7:27'// xhx
@@ -237,31 +238,41 @@ export default class HttpCommand {
     }
     /** 增加任务进度 */
     addTaskBar(callback) {
-        this.httpM.sendRequest(HTTPTYPE.add_task_bar, 'POST', null, callback);
+        this.sendData(HTTPTYPE.add_task_bar, {}, callback);
     }
 
     getGeneralPack(callback) {
-        this.httpM.sendRequest(HTTPTYPE.generalpack, 'POST', null, callback);
+        this.sendData(HTTPTYPE.generalpack, {}, callback);
     }
 
     /** 更新武将属性 */
     updateGeneralProp(callback, msg: GeneralPropUpdateRequest) {
-        this.httpM.sendRequest(HTTPTYPE.updateGeneralProp, 'POST', msg, callback);
+        let data = {
+            
+        };
+        this.sendData(HTTPTYPE.updateGeneralProp, data, callback);
     }
     /** 升级武将星级 */
     updateGeneralSX(callback, msg: GeneralStarUpRequest) {
-        // let str = JSON.stringify(msg);
-        this.httpM.sendRequest(HTTPTYPE.updateGeneralXS, 'POST', msg, callback);
+        let data = {
+            
+        };
+        this.sendData(HTTPTYPE.updateGeneralXS, data, callback);
     }
 
     /** 更新布阵信息 */
-    updateEmbattle(callback, arr: { id: number, pos: number }[]) {
-        let str = JSON.stringify(arr);
-        this.httpM.sendRequest(HTTPTYPE.changeEmbattle, 'POST', str, callback);
+    updateEmbattle(callback, arr: { gid: number, pos: number }[]) {
+        let data = {
+            changeEmbattles:arr
+        };
+        this.sendData(HTTPTYPE.changeEmbattle, data, callback);
     }
     /** 合成武将 */
     composeGeneral(callback, id: number) {
-        this.httpM.sendRequest(HTTPTYPE.composeGeneral, 'POST', id, callback);
+        let data = {
+            id:id
+        };
+        this.sendData(HTTPTYPE.composeGeneral, data, callback);
     }
 
     /** 更新多个玩家属性 */
@@ -312,12 +323,13 @@ export default class HttpCommand {
     }
 
     addGeneralExp(callback) {
-        this.httpM.sendRequest(HTTPTYPE.generalExpUp, 'POST', null, callback);
+        this.sendData(HTTPTYPE.generalExpUp, {}, callback);
+        
     }
 
     /** 兵营升级 */
     barracksLvUp(callback) {
-        this.httpM.sendRequest(HTTPTYPE.barracksLvUp, 'POST', null, callback);
+        this.sendData(HTTPTYPE.barracksLvUp, {}, callback);
     }
 
     /** 增加道具
@@ -462,11 +474,11 @@ export enum HTTPTYPE {
     updateProp = 'updatePlayerProp',
     savePlayerProp = '/savePlayerProp',
     saveAllPlayerProp = '/saveAllPlayerProp',
-    changeEmbattle = 'changeEmbattle',
-    composeGeneral = 'composeGeneral',
+    changeEmbattle = 'general/changeEmbattle',
+    composeGeneral = 'general/composeGeneral',
     updateMission = 'general/updateMission',
-    generalExpUp = 'generalExpUp',
-    barracksLvUp = 'barracksLvUp',
+    generalExpUp = 'general/generalExpUp',
+    barracksLvUp = 'general/barracksLvUp',
     addItem = 'addItem',
     getInitGeneral = 'general/getInitGeneral',
     getInitGeneralDemo = 'general/getInitGeneralDemo',

tower_sanguo/assets/scripts/net/msg/BarracksLvUpResponse.ts

@@ -12,6 +12,8 @@ export default class BarracksLvUpResponse extends BaseResponse {
         super();
     }
 
+    data:any = {};
+
     /** 当前威望石数量 */
     prestige: number;
     /** 当前兵营等级 */

tower_sanguo/assets/scripts/net/servertest/ServerManager.ts

@@ -195,19 +195,21 @@ export default class ServerManager {
                 this.player.prestige -= cost;
                 this.player.barrack++;
 
+                let arr = [];
                 for (const key in this.generals) {
                     if (Object.prototype.hasOwnProperty.call(this.generals, key)) {
                         const element = this.generals[key];
                         if (this.player.barrack > element.lv) {
                             element.lv = this.player.barrack;
                             element.exp = 0;
+                            arr.push(element);
                         }
                     }
                 }
 
-                msg.generals = this.generals;
-                msg.prestige = this.player.prestige;
-                msg.barrack = this.player.barrack;
+                msg.data.generalpack = arr;
+                msg.data.prestige = this.player.prestige;
+                msg.data.barrack = this.player.barrack;
             }
         }
 
@@ -374,6 +376,8 @@ export default class ServerManager {
         }
         let msg = new GeneralStarUpResponse();
         msg.general_data = general_data;
+        msg.data = {};
+        msg.data.GeneralProp = general_data;
         this.respone(url, msg, callback);
     }
     /** 获取任务数据 */

tower_sanguo/assets/scripts/sdk/win/WindowTest.ts

@@ -64,7 +64,7 @@ export default class WindowTest {
             }
             d = Utils.Encrypt(GameController.commonData.uin, key, GameController.commonData.appid);
             GameController.storageData.setStorage(STORAGE_KEY.uin, d, 1);
-            LogUtil.logAndroid("wxLoginBack...uid..." + GameController.commonData.uin)
+            LogUtil.logAndroid("wxLoginBack...uin..." + GameController.commonData.uin)
             GameController.http.checkLogin(this.checkLoginBack.bind(this));
         }
     }