client/pubgv3
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复战斗结算问题

Browse Source
This commit is contained in:
aozhiwei 2022-05-31 16:44:35 +08:00
parent 4cc4fddbbe
commit 9ccf8a6009
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
assets/scripts/netBattle/battlenetmanage.js
View File

@ -1,6 +1,7 @@
var jsMatchvs = require("jcmatchvs"); var jsMatchvs = require("jcmatchvs");
// var jcmsghandler = require("jcmsghandler"); // var jcmsghandler = require("jcmsghandler");
var SDKManage = require("SDKManage"); var SDKManage = require("SDKManage");
var NetManage = require("NetManage");
var wxvoice = require("wxVoice"); var wxvoice = require("wxVoice");
var jcfwlogin = require("jcfw").login; var jcfwlogin = require("jcfw").login;
@ -273,7 +274,7 @@ var NetWorkManage = function () {
server_id: 1, server_id: 1,
team_uuid: this.opt.team_uuid, team_uuid: this.opt.team_uuid,
account_id: this.opt.account_id, account_id: this.opt.account_id,
session_id: SDKManage.session_id, session_id: NetManage.session_id,
room_uuid: this.roomid, room_uuid: this.roomid,
server_info: this.server_info, server_info: this.server_info,
}); });
@ -300,7 +301,7 @@ var NetWorkManage = function () {
weapons: opt.weapons, weapons: opt.weapons,
skins: opt.skins, skins: opt.skins,
prepare_items: opt.prepare_items, prepare_items: opt.prepare_items,
session_id: SDKManage.session_id, session_id: NetManage.session_id,
atk_add: opt.atk_add, atk_add: opt.atk_add,
pre_settlement_info: opt.pre_settlement_info, pre_settlement_info: opt.pre_settlement_info,
auto_fill: opt.auto_fill, auto_fill: opt.auto_fill,

3
assets/scripts/tools/wxVoice.js
View File

@ -8,6 +8,7 @@
// - [Chinese] http://docs.cocos.com/creator/manual/zh/scripting/life-cycle-callbacks.html // - [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 // - [English] http://www.cocos2d-x.org/docs/creator/en/scripting/life-cycle-callbacks.html
var SDKManage = require("SDKManage") var SDKManage = require("SDKManage")
var NetManage = require("NetManage")
var wxVoice = cc.Class({ var wxVoice = cc.Class({
init(){ init(){
}, },
@ -54,7 +55,7 @@ var wxVoice = cc.Class({
filePath: res.tempFilePath, filePath: res.tempFilePath,
success: function(res) { success: function(res) {
wx.request({ 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", method: "POST",
data: res.data, data: res.data,
header: { header: {