diff --git a/lua/app/common/bi_report.lua b/lua/app/common/bi_report.lua index 820817ff..8f66ffcc 100644 --- a/lua/app/common/bi_report.lua +++ b/lua/app/common/bi_report.lua @@ -1048,21 +1048,23 @@ function BIReport:postAppLovinAdRevenue(msg) end -- 竞技场进入消耗上报 -function BIReport:postArenaConsume(todayConsume) +function BIReport:postArenaConsume(gradingId, todayConsume) local args = { event_type = BIReport.ARENA_OPT_TYPE.CONSUME, + grading_id = gradingId, today_consume = todayConsume, } self:report(EVENT_NAME_ARENA_OPT, args) end -- 竞技场结算数据上报 -function BIReport:postArenaSettlement(gradingId, round, winRate) +function BIReport:postArenaSettlement(gradingId, round, winRate, win) local args = { event_type = BIReport.ARENA_OPT_TYPE.SETTLEMENT, grading_id = gradingId, round = round, win_rate = winRate, + win = win, } self:report(EVENT_NAME_ARENA_OPT, args) end diff --git a/lua/app/module/arena/arena_manager.lua b/lua/app/module/arena/arena_manager.lua index c251b19e..7021b839 100644 --- a/lua/app/module/arena/arena_manager.lua +++ b/lua/app/module/arena/arena_manager.lua @@ -107,7 +107,7 @@ function ArenaManager:rspChallenge(result) --bi上报 LocalData:recordTodayArenaBattle() - BIReport:postArenaConsume(LocalData:getTodayArenaBattleCount()) + BIReport:postArenaConsume(DataManager.ArenaData:getGradingId(), LocalData:getTodayArenaBattleCount()) end end @@ -142,7 +142,7 @@ function ArenaManager:rspSettlement(result) --bi上报 local winRate = result.total_win_count / (result.total_win_count + result.total_lose_count) - BIReport:postArenaSettlement(DataManager.ArenaData:getGradingId(), reqData.battleReport.round, winRate) + BIReport:postArenaSettlement(DataManager.ArenaData:getGradingId(), reqData.battleReport.round, winRate, result.settlement.win) end end diff --git a/lua/app/userdata/formation/formation_data.lua b/lua/app/userdata/formation/formation_data.lua index 076fed1d..4125bdb4 100644 --- a/lua/app/userdata/formation/formation_data.lua +++ b/lua/app/userdata/formation/formation_data.lua @@ -134,6 +134,8 @@ function FormationData:getStageFormationBIStr() allHp = allHp + entity:getHp() end end + allAtk = allAtk // GConst.BattleConst.DEFAULT_FACTOR + allHp = allHp // GConst.BattleConst.DEFAULT_FACTOR return str, totalLevel, allAtk, allHp end diff --git a/lua/app/userdata/hero/hero_entity.lua b/lua/app/userdata/hero/hero_entity.lua index 1176378c..6bcd2eea 100644 --- a/lua/app/userdata/hero/hero_entity.lua +++ b/lua/app/userdata/hero/hero_entity.lua @@ -134,7 +134,8 @@ function HeroEntity:getAttrValue(name) end function HeroEntity:getAtk() - return self:getAttrValue(GConst.BattleConst.ATTR_NAME.ATK) + local atkName = GConst.MATCH_ATTACK_NAME[self:getMatchType()] + return self:getAttrValue(atkName) end function HeroEntity:getHp()