Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
1f9275e9d8
|
@ -10779,10 +10779,12 @@ local passivityList = {
|
|||
local p2=args[3]
|
||||
local v2=args[4]
|
||||
if target~=role and target.camp==role.camp and not BattleUtil.CheckIsNoDead(target) then
|
||||
local tv = floor(BattleUtil.ErrorCorrection(role:GetRoleData(BattlePropList[p1]) * v1))
|
||||
local tv2 = floor(BattleUtil.ErrorCorrection(role:GetRoleData(BattlePropList[p2]) * v2))
|
||||
BattleUtil.FinalTreat(role,role,tv)
|
||||
BattleUtil.AddBlood(role,tv2)
|
||||
BattleLogic.WaitForTrigger(BattleLogic.GameDeltaTime*2, function ()
|
||||
local tv = floor(BattleUtil.ErrorCorrection(role:GetRoleData(BattlePropList[p1]) * v1))
|
||||
local tv2 = floor(BattleUtil.ErrorCorrection(role:GetRoleData(BattlePropList[p2]) * v2))
|
||||
BattleUtil.FinalTreat(role,role,tv)
|
||||
BattleUtil.AddBlood(role,tv2)
|
||||
end)
|
||||
end
|
||||
end
|
||||
BattleLogic.Event:AddEvent(BattleEventName.BattleRoleDead,onRoleDead,nil,nil,role)
|
||||
|
|
Loading…
Reference in New Issue