[战斗]========被动112 258修改
parent
047e5cbe72
commit
ed8ef42849
|
@ -2026,9 +2026,13 @@ local passivityList = {
|
||||||
if not type then
|
if not type then
|
||||||
type=0
|
type=0
|
||||||
end
|
end
|
||||||
|
|
||||||
local function onRoleDamageAfter(target)
|
local function onRoleDamageAfter(target)
|
||||||
target.isFlagCrit = false
|
target.isFlagCrit = false
|
||||||
role.Event:RemoveEvent(BattleEventName.RoleDamageAfter, onRoleDamageAfter)
|
local curRound=BattleLogic.GetCurRound()
|
||||||
|
if curRound>i1 then
|
||||||
|
role.Event:RemoveEvent(BattleEventName.RoleDamageAfter, onRoleDamageAfter)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
role.Event:AddEvent(BattleEventName.RoleDamageAfter, onRoleDamageAfter,nil,nil,role)
|
role.Event:AddEvent(BattleEventName.RoleDamageAfter, onRoleDamageAfter,nil,nil,role)
|
||||||
local function onRoleDamageBefore(critFunc,atkRole,defRole,skill)
|
local function onRoleDamageBefore(critFunc,atkRole,defRole,skill)
|
||||||
|
@ -2041,11 +2045,11 @@ local passivityList = {
|
||||||
if skill and not skill.isTriggerJudge and judge==1 then
|
if skill and not skill.isTriggerJudge and judge==1 then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
local curRound=BattleLogic.GetCurRound()
|
local curRound=BattleLogic.GetCurRound()
|
||||||
if (curRound== i1 and type==0) or (curRound<=i1 and type==1) then
|
if (curRound== i1 and type==0) or (curRound<=i1 and type==1) then
|
||||||
defRole.isFlagCrit = true
|
defRole.isFlagCrit = true
|
||||||
|
else
|
||||||
|
defRole.isFlagCrit=false
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
BattleLogic.Event:AddEvent(BattleEventName.TemporaryChangeCrit, onRoleDamageBefore,nil,nil,role)
|
BattleLogic.Event:AddEvent(BattleEventName.TemporaryChangeCrit, onRoleDamageBefore,nil,nil,role)
|
||||||
|
@ -5668,8 +5672,8 @@ local passivityList = {
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
if (f1==12 or f1==13) and p1 and p2 and p1~=0 and p2~=0 then
|
if (f1==12 or f1==13) and p1 and p2 and p1~=0 and p2~=0 then
|
||||||
local levelDamage = floor(defRole:GetRoleData(RoleDataName.MaxHp)*p1)
|
local levelDamage = floor(role:GetRoleData(RoleDataName.MaxHp)*p1)
|
||||||
local lostDamage = defRole:GetRoleData(RoleDataName.MaxHp) - defRole:GetRoleData(RoleDataName.Hp)
|
local lostDamage = role:GetRoleData(RoleDataName.MaxHp) - role:GetRoleData(RoleDataName.Hp)
|
||||||
local level = floor(lostDamage/levelDamage)
|
local level = floor(lostDamage/levelDamage)
|
||||||
dt=dt+(level*p2)
|
dt=dt+(level*p2)
|
||||||
end
|
end
|
||||||
|
|
|
@ -107,7 +107,8 @@ function BattleLogic.GetIsPvP()
|
||||||
BattleLogic.Type== BATTLE_SERVER_TYPE.ArenaFight or
|
BattleLogic.Type== BATTLE_SERVER_TYPE.ArenaFight or
|
||||||
BattleLogic.Type== BATTLE_SERVER_TYPE.CarPersonFight or
|
BattleLogic.Type== BATTLE_SERVER_TYPE.CarPersonFight or
|
||||||
BattleLogic.Type== BATTLE_SERVER_TYPE.CrossYuxuLunDaoFight or
|
BattleLogic.Type== BATTLE_SERVER_TYPE.CrossYuxuLunDaoFight or
|
||||||
BattleLogic.Type== BATTLE_SERVER_TYPE.NewArenaFight then
|
BattleLogic.Type== BATTLE_SERVER_TYPE.NewArenaFight or
|
||||||
|
BattleLogic.Type== BATTLE_SERVER_TYPE.LINGMAIMIJING then
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
return false
|
return false
|
||||||
|
|
|
@ -29,6 +29,7 @@ BATTLE_SERVER_TYPE = {
|
||||||
FightLevel = 20,--
|
FightLevel = 20,--
|
||||||
QiJieShiLian = 23,--七界试炼
|
QiJieShiLian = 23,--七界试炼
|
||||||
CrossYuxuLunDaoFight = 24,--玉虚论道
|
CrossYuxuLunDaoFight = 24,--玉虚论道
|
||||||
|
LINGMAIMIJING = 25, --灵脉秘境
|
||||||
}
|
}
|
||||||
|
|
||||||
BattleEventName = {
|
BattleEventName = {
|
||||||
|
|
Loading…
Reference in New Issue