Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
8b74daae36
|
|
@ -76,10 +76,8 @@ function BattleLogic.Init(data, _userData, maxRound)
|
||||||
-- 监听英雄受到治疗
|
-- 监听英雄受到治疗
|
||||||
BattleLogic.Event:AddEvent(BattleEventName.RoleBeTreated,function (castRole, realTreat, treat)
|
BattleLogic.Event:AddEvent(BattleEventName.RoleBeTreated,function (castRole, realTreat, treat)
|
||||||
if castRole.camp==0 then
|
if castRole.camp==0 then
|
||||||
LogBattle("我方 英雄治疗"..treat)
|
|
||||||
allHeroDamage=allHeroDamage+treat
|
allHeroDamage=allHeroDamage+treat
|
||||||
else
|
else
|
||||||
LogBattle("敌方 英雄治疗"..treat)
|
|
||||||
allEnemyDamage=allEnemyDamage+treat
|
allEnemyDamage=allEnemyDamage+treat
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
|
|
@ -88,11 +86,9 @@ function BattleLogic.Init(data, _userData, maxRound)
|
||||||
--我方阵营总攻击
|
--我方阵营总攻击
|
||||||
if atkRole.camp==0 then
|
if atkRole.camp==0 then
|
||||||
allHeroDamage=allHeroDamage+damage
|
allHeroDamage=allHeroDamage+damage
|
||||||
LogBattle("我方 英雄攻击"..damage)
|
|
||||||
--敌方阵营
|
--敌方阵营
|
||||||
else
|
else
|
||||||
allEnemyDamage=allEnemyDamage+damage
|
allEnemyDamage=allEnemyDamage+damage
|
||||||
LogBattle("敌方 英雄攻击"..damage)
|
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -103,6 +103,8 @@ function SoulPrintPopUp:BindEvent()
|
||||||
UIManager.OpenPanel(UIName.SoulPrintPopUpV2,2,curHeroData,localData,function()
|
UIManager.OpenPanel(UIName.SoulPrintPopUpV2,2,curHeroData,localData,function()
|
||||||
self:ClosePanel()
|
self:ClosePanel()
|
||||||
SoulPrintPanel.RefreshShow()
|
SoulPrintPanel.RefreshShow()
|
||||||
|
--对比战力并更新战力值 播放战力变更动画
|
||||||
|
HeroManager.CompareWarPower(curHeroData.dynamicId)
|
||||||
end)
|
end)
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
@ -126,6 +128,8 @@ function SoulPrintPopUp:BindEvent()
|
||||||
HeroManager.AddSoulPrintUpHeroDynamicId(curHeroData.dynamicId,localData.id,pos)
|
HeroManager.AddSoulPrintUpHeroDynamicId(curHeroData.dynamicId,localData.id,pos)
|
||||||
PopupTipPanel.ShowTip(Language[11604])
|
PopupTipPanel.ShowTip(Language[11604])
|
||||||
SoulPrintPanel.RefreshShow()
|
SoulPrintPanel.RefreshShow()
|
||||||
|
--对比战力并更新战力值 播放战力变更动画
|
||||||
|
HeroManager.CompareWarPower(curHeroData.dynamicId)
|
||||||
self:ClosePanel()
|
self:ClosePanel()
|
||||||
end)
|
end)
|
||||||
end)
|
end)
|
||||||
|
|
|
||||||
|
|
@ -198,7 +198,7 @@ function this.RefreshShow()
|
||||||
this.SetHero()
|
this.SetHero()
|
||||||
this.SetScrollData()
|
this.SetScrollData()
|
||||||
--对比战力并更新战力值 播放战力变更动画
|
--对比战力并更新战力值 播放战力变更动画
|
||||||
HeroManager.CompareWarPower(curHeroData.dynamicId)
|
-- HeroManager.CompareWarPower(curHeroData.dynamicId)
|
||||||
-- local allPro = HeroManager.CalculateHeroAllProValList(1, curHeroData.dynamicId, false)
|
-- local allPro = HeroManager.CalculateHeroAllProValList(1, curHeroData.dynamicId, false)
|
||||||
local allAddProVal
|
local allAddProVal
|
||||||
--计算面板属性
|
--计算面板属性
|
||||||
|
|
@ -310,6 +310,8 @@ function this.SetLoopPre(root,type,index,data,curIndex)
|
||||||
UIManager.OpenPanel(UIName.SoulPrintPopUp,2,curHeroData.dynamicId,data.equipId,pos,function()
|
UIManager.OpenPanel(UIName.SoulPrintPopUp,2,curHeroData.dynamicId,data.equipId,pos,function()
|
||||||
PopupTipPanel.ShowTip(Language[11949])
|
PopupTipPanel.ShowTip(Language[11949])
|
||||||
this.RefreshShow()
|
this.RefreshShow()
|
||||||
|
--对比战力并更新战力值 播放战力变更动画
|
||||||
|
HeroManager.CompareWarPower(curHeroData.dynamicId)
|
||||||
end)
|
end)
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
@ -415,6 +417,8 @@ function this.SetScrollPre(root,data)
|
||||||
UIManager.OpenPanel(UIName.SoulPrintPopUp,1,curHeroData.dynamicId,data.id,pos,function()
|
UIManager.OpenPanel(UIName.SoulPrintPopUp,1,curHeroData.dynamicId,data.id,pos,function()
|
||||||
PopupTipPanel.ShowTip(Language[11604])
|
PopupTipPanel.ShowTip(Language[11604])
|
||||||
this.RefreshShow()
|
this.RefreshShow()
|
||||||
|
--对比战力并更新战力值 播放战力变更动画
|
||||||
|
HeroManager.CompareWarPower(curHeroData.dynamicId)
|
||||||
end,data)
|
end,data)
|
||||||
-- end
|
-- end
|
||||||
end)
|
end)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue