Merge branch 'master_xma_local' of http://60.1.1.230/gaoxin/JL_Client into master_xma_local
commit
9424037d9e
|
@ -1536,8 +1536,8 @@ local passivityList = {
|
|||
[91] = function(role, args)
|
||||
local f1 = args[1]
|
||||
local ct = args[2]
|
||||
local passivityDamaging = function(func, caster, damage)
|
||||
if func then
|
||||
local passivityDamaging = function(func, caster, damage,skill, dotType, bCrit)
|
||||
if func and skill and (skill.type == BattleSkillType.Special or skill.type == BattleSkillType.Extra) then
|
||||
local dd = BattleUtil.CountValue(damage, f1, ct) - damage
|
||||
func(-floor(BattleUtil.ErrorCorrection(dd)))
|
||||
end
|
||||
|
@ -5306,7 +5306,9 @@ local passivityList = {
|
|||
local ele=args[1]
|
||||
local v1=args[2]
|
||||
local passiveBeBeDamage=function(damagingFunc, defRole, damage, skill)
|
||||
|
||||
if not skill then
|
||||
return
|
||||
end
|
||||
local list = RoleManager.Query(function(v) return role.camp == v.camp end)
|
||||
local num=0
|
||||
for _, r in pairs(list) do
|
||||
|
@ -5399,7 +5401,6 @@ local passivityList = {
|
|||
local onSkillEnd = function(skill)
|
||||
if skill and skill.owner==skiller then
|
||||
--if curBuff then
|
||||
LogError("清除buff")
|
||||
-- BattleLogic.BuffMgr:ClearBuff(role, function (buff)
|
||||
-- return buff==curBuff
|
||||
-- end)
|
||||
|
|
Loading…
Reference in New Issue