puxuan/c1_lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_20230919' of http://git.juzugame.com/b6-client/b6-lua into dev_20230919

Browse Source
This commit is contained in:
xiekaidong 2023-09-15 17:38:50 +08:00
commit 59d4dfdc61
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lua/app/module/arena/arena_manager.lua
View File

@ -127,7 +127,7 @@ function ArenaManager:rspSettlement(result)
if result.err_code == GConst.ERROR_STR.SUCCESS then if result.err_code == GConst.ERROR_STR.SUCCESS then
local reqData = result.reqData local reqData = result.reqData
DataManager.ArenaData:onBattleResultReceived(result.settlement, result) DataManager.ArenaData:onBattleResultReceived(result.score, result.settlement, result)
DataManager.ArenaData:initGiftInfo(result.act_arena_gift) DataManager.ArenaData:initGiftInfo(result.act_arena_gift)
local checkCount = 0 local checkCount = 0
if result.settlement.win then if result.settlement.win then

4
lua/app/userdata/arena/arena_data.lua
View File

@ -705,7 +705,7 @@ function ArenaData:onMatchInfoReceived(match)
end end
-- 结算战斗数据 -- 结算战斗数据
function ArenaData:onBattleResultReceived(settlement, result) function ArenaData:onBattleResultReceived(score, settlement, result)
self.matchInfo = nil self.matchInfo = nil
-- 战斗记录改变 -- 战斗记录改变
if self.recentBattle == nil then if self.recentBattle == nil then
@ -714,7 +714,7 @@ function ArenaData:onBattleResultReceived(settlement, result)
table.remove(self.recentBattle, #self.recentBattle) table.remove(self.recentBattle, #self.recentBattle)
table.insert(self.recentBattle, 1, settlement) table.insert(self.recentBattle, 1, settlement)
-- 积分改变 -- 积分改变
self.score = self.score + settlement.incr_score self.score = score
self.curGradingId = self:getGradingIdFromScore(self.score) self.curGradingId = self:getGradingIdFromScore(self.score)
local beforeMaxGrading = self.maxScore local beforeMaxGrading = self.maxScore