Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c

dev_chengFeng
jiaoyangna 2021-06-19 17:07:20 +08:00
commit b85b94fa68
2 changed files with 4 additions and 4 deletions

View File

@ -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)

View File

@ -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