diff --git a/assets/scripts/netBattle/battlenetmanage.js b/assets/scripts/netBattle/battlenetmanage.js index a74bb77d..9de0ff1d 100644 --- a/assets/scripts/netBattle/battlenetmanage.js +++ b/assets/scripts/netBattle/battlenetmanage.js @@ -1,6 +1,7 @@ var jsMatchvs = require("jcmatchvs"); // var jcmsghandler = require("jcmsghandler"); var SDKManage = require("SDKManage"); +var NetManage = require("NetManage"); var wxvoice = require("wxVoice"); var jcfwlogin = require("jcfw").login; @@ -273,7 +274,7 @@ var NetWorkManage = function () { server_id: 1, team_uuid: this.opt.team_uuid, account_id: this.opt.account_id, - session_id: SDKManage.session_id, + session_id: NetManage.session_id, room_uuid: this.roomid, server_info: this.server_info, }); @@ -300,7 +301,7 @@ var NetWorkManage = function () { weapons: opt.weapons, skins: opt.skins, prepare_items: opt.prepare_items, - session_id: SDKManage.session_id, + session_id: NetManage.session_id, atk_add: opt.atk_add, pre_settlement_info: opt.pre_settlement_info, auto_fill: opt.auto_fill, diff --git a/assets/scripts/tools/wxVoice.js b/assets/scripts/tools/wxVoice.js index 4cc1bfdb..985c35cb 100644 --- a/assets/scripts/tools/wxVoice.js +++ b/assets/scripts/tools/wxVoice.js @@ -8,6 +8,7 @@ // - [Chinese] http://docs.cocos.com/creator/manual/zh/scripting/life-cycle-callbacks.html // - [English] http://www.cocos2d-x.org/docs/creator/en/scripting/life-cycle-callbacks.html var SDKManage = require("SDKManage") +var NetManage = require("NetManage") var wxVoice = cc.Class({ init(){ }, @@ -54,7 +55,7 @@ var wxVoice = cc.Class({ filePath: res.tempFilePath, success: function(res) { wx.request({ - url: self.url + "?c=Voice&a=upload&account_id=" + SDKManage.account_id +"&session_id="+ SDKManage.session_id+"&rd=" + new Date().getTime(), + url: self.url + "?c=Voice&a=upload&account_id=" + SDKManage.account_id +"&session_id="+ NetManage.session_id+"&rd=" + new Date().getTime(), method: "POST", data: res.data, header: {