Merge branch 'xma/dev-b' of http://60.1.1.230/gaoxin/JL_Client into xma/dev-b
commit
ca5257e28d
|
@ -503,14 +503,14 @@ function this.ShowBattleResultByCarDeleayType()
|
|||
Timer.New(function()
|
||||
local bestData, allDamage= BattleRecordManager.GetBattleBestData()
|
||||
if bestData then
|
||||
--车迟挑战cd计时
|
||||
GuildCarDelayManager.SetCdTime(GuildCarDelayProType.Challenge)
|
||||
-- 胜利显示本场比赛的表现最好的英雄
|
||||
UIManager.OpenPanel(UIName.BattleBestPopup, bestData.roleId,bestData.skinId, bestData.damage, allDamage, function(_BattleBestPopup)
|
||||
-- 打开关卡奖励界面
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup,nil, 1,function(isBackBattle)--isBackBattle true时 为回放不走回调
|
||||
LogPink("isBackBattle "..tostring(isBackBattle))
|
||||
if not isBackBattle then
|
||||
--车迟挑战cd计时
|
||||
GuildCarDelayManager.SetCdTime(GuildCarDelayProType.Challenge)
|
||||
if _BattleBestPopup then
|
||||
_BattleBestPopup:ClosePanel()
|
||||
end
|
||||
|
|
|
@ -152,14 +152,14 @@ end
|
|||
function this.ShowBattleResultByCarDeleayType(drop)
|
||||
local bestData, allDamage= BattleRecordManager.GetBattleBestData()
|
||||
if bestData then
|
||||
--车迟抢夺cd计时
|
||||
GuildCarDelayManager.SetCdTime(GuildCarDelayProType.Loot)
|
||||
-- 胜利显示本场比赛的表现最好的英雄
|
||||
UIManager.OpenPanel(UIName.BattleBestPopup, bestData.roleId,bestData.skinId, bestData.damage, allDamage, function(_BattleBestPopup)
|
||||
-- 打开关卡奖励界面
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup,nil, 1,function(isBackBattle)--isBackBattle true时 为回放不走回调
|
||||
LogPink("isBackBattle "..tostring(isBackBattle))
|
||||
if not isBackBattle then
|
||||
--车迟抢夺cd计时
|
||||
GuildCarDelayManager.SetCdTime(GuildCarDelayProType.Loot)
|
||||
if _BattleBestPopup then
|
||||
_BattleBestPopup:ClosePanel()
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue