Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c
commit
b85b94fa68
|
@ -242,13 +242,13 @@ function BuffManager:ClearBuff(target, func)
|
|||
while idx <= list.size do
|
||||
local buff = list.buffer[idx]
|
||||
if buff.target == target and (not func or (func and buff.clear and func(buff))) then
|
||||
if func and func(buff) then
|
||||
-- if func and func(buff) then
|
||||
if buff.type== BuffName.Shield then
|
||||
buff.target.Event:DispatchEvent(BattleEventName.ShowHintText, BattleArtFontType.Shield)
|
||||
elseif buff.type== BuffName.DOT or buff.type==BuffName.Control or buff.type==BuffName.Immune then
|
||||
elseif buff.type== BuffName.DOT or buff.type==BuffName.Control then
|
||||
buff.target.Event:DispatchEvent(BattleEventName.ShowHintText, BattleArtFontType.clear)
|
||||
end
|
||||
end
|
||||
-- end
|
||||
buff:OnEnd()
|
||||
buff.target.Event:DispatchEvent(BattleEventName.BuffEnd, buff)
|
||||
putBuff(buff)
|
||||
|
|
|
@ -5708,7 +5708,7 @@ local passivityList = {
|
|||
BattleUtil.RandomAction(pro, function()
|
||||
BattleLogic.BuffMgr:ClearBuff(defRole, function(buff)
|
||||
if buff.type == BuffName.Immune and (buff.immuneType == 4 or buff.immuneType == 2) then
|
||||
-- buff.target.Event:DispatchEvent(BattleEventName.ShowHintText, BattleArtFontType.clear)
|
||||
buff.target.Event:DispatchEvent(BattleEventName.ShowHintText, BattleArtFontType.clear)
|
||||
return true
|
||||
end
|
||||
return false
|
||||
|
|
Loading…
Reference in New Issue