Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
c78b9d4e27
|
@ -3917,16 +3917,20 @@ local passivityList = {
|
||||||
-- a[float]
|
-- a[float]
|
||||||
[187] = function(role, args,id,judge)
|
[187] = function(role, args,id,judge)
|
||||||
local f1 = args[1]
|
local f1 = args[1]
|
||||||
|
local isMustCrit=false
|
||||||
local function onSkillCast(skill)
|
local function onSkillCast(skill)
|
||||||
if skill.type == BattleSkillType.Normal then
|
if skill.type == BattleSkillType.Normal then
|
||||||
role.data:AddValue(RoleDataName.Crit, f1)
|
-- role.data:AddValue(RoleDataName.Crit, f1)
|
||||||
|
isMustCrit=role.mustCrit
|
||||||
|
role.mustCrit=true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
role.Event:AddEvent(BattleEventName.SkillCast, onSkillCast,nil,nil,role)
|
role.Event:AddEvent(BattleEventName.SkillCast, onSkillCast,nil,nil,role)
|
||||||
|
|
||||||
local function onSkillCastEnd(skill)
|
local function onSkillCastEnd(skill)
|
||||||
if skill.type == BattleSkillType.Normal then
|
if skill.type == BattleSkillType.Normal then
|
||||||
role.data:SubValue(RoleDataName.Crit, f1)
|
--role.data:SubValue(RoleDataName.Crit, f1)
|
||||||
|
role.mustCrit=isMustCrit
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
role.Event:AddEvent(BattleEventName.SkillCastEnd, onSkillCastEnd,nil,nil,role)
|
role.Event:AddEvent(BattleEventName.SkillCastEnd, onSkillCastEnd,nil,nil,role)
|
||||||
|
@ -6277,7 +6281,11 @@ local passivityList = {
|
||||||
for i = 1, #list do
|
for i = 1, #list do
|
||||||
if i<=num then
|
if i<=num then
|
||||||
if not list[i]:IsDead() then
|
if not list[i]:IsDead() then
|
||||||
local buff=Buff.Create(role, BuffName.Immune,round,1)
|
local ctrls={1,2,7}
|
||||||
|
local immune = function(buff)
|
||||||
|
return buff.type == BuffName.Control and (BattleUtil.ChecklistIsContainValue(ctrls,buff.ctrlType)),role
|
||||||
|
end
|
||||||
|
local buff=Buff.Create(role, BuffName.Immune,round,4,immune)
|
||||||
list[i]:AddBuff(buff)
|
list[i]:AddBuff(buff)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -136,7 +136,7 @@ function RoleLogic:Init(uid, data, position)
|
||||||
if #coverArgs>=i+i+1 then
|
if #coverArgs>=i+i+1 then
|
||||||
value=coverArgs[i+i+1]
|
value=coverArgs[i+i+1]
|
||||||
end
|
end
|
||||||
if id~=0 and value~=0 and #args>=id and args[id] then
|
if id~=0 and #args>=id and args[id] then
|
||||||
args[id]=value
|
args[id]=value
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -371,6 +371,7 @@ function RoleLogic:AddBuff(buff,_ignorePro)
|
||||||
"id", buff.id,
|
"id", buff.id,
|
||||||
"type", buff.type)
|
"type", buff.type)
|
||||||
BattleLogic.BuffMgr:PutBuff(buff)
|
BattleLogic.BuffMgr:PutBuff(buff)
|
||||||
|
self.Event:DispatchEvent(BattleEventName.ShowHintText, BattleArtFontType.Immune)
|
||||||
BattleLogic.Event:DispatchEvent(BattleEventName.ImmuneDebuffSuccess,buff,self,immCaster)
|
BattleLogic.Event:DispatchEvent(BattleEventName.ImmuneDebuffSuccess,buff,self,immCaster)
|
||||||
BattleLogic.Event:DispatchEvent(BattleEventName.RoleAddBuffFail,buff,self)
|
BattleLogic.Event:DispatchEvent(BattleEventName.RoleAddBuffFail,buff,self)
|
||||||
return
|
return
|
||||||
|
|
Loading…
Reference in New Issue