Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
# Conflicts: # Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.luadev_chengFeng
commit
c98f2c1f02
|
@ -5696,11 +5696,12 @@ local passivityList = {
|
|||
end
|
||||
role.Event:AddEvent(BattleEventName.PassiveDamaging, onPassiveDamaging,nil,nil,role)
|
||||
end,
|
||||
--本次技能中如果有[a]目标,额外回复[b]点怒气
|
||||
-- a[持续伤害状态],b[int]
|
||||
--本次技能中如果有[a]目标,额外回复[b]点怒气,[c]buff的类型(a 填效果类型里面的具体类型; c 不填/1为dot, 2为controll )
|
||||
-- a[持续伤害状态],b[int],c[int ]
|
||||
[261]=function(role,args,id,judge)
|
||||
local dot=args[1]
|
||||
local i1 = args[2]--defRole, damage, bCrit, finalDmg, damageType, skill
|
||||
local i1 = args[2]
|
||||
local type = args[3]
|
||||
local OnRoleHit = function(skill)
|
||||
-- if skill and skill.owner==role and (skill.type==BattleSkillType.Special or skill.type==BattleSkillType.Extra) and role.camp~=defRole.camp and defRole and BattleLogic.BuffMgr:HasBuff(defRole, BuffName.DOT, function(buff) return buff.damageType == dot end) then
|
||||
-- role:AddRage(i1, CountTypeName.Add)
|
||||
|
@ -5714,8 +5715,18 @@ local passivityList = {
|
|||
return
|
||||
end
|
||||
local num=0
|
||||
local buffName=BuffName.DOT
|
||||
if type then
|
||||
if type==1 then
|
||||
buffName=BuffName.DOT
|
||||
elseif type==2 then
|
||||
buffName=BuffName.Control
|
||||
end
|
||||
end
|
||||
for key, value in pairs(list) do
|
||||
local isHave=BattleLogic.BuffMgr:HasBuff(value, BuffName.DOT, function(buff) return buff.damageType == dot and buff.caster==role and buff.startRound == BattleLogic.GetCurRound() end,role,dot)
|
||||
local isHave=BattleLogic.BuffMgr:HasBuff(value, buffName,function(buff) return
|
||||
(buffName==BuffName.DOT and buff.damageType==dot or buff.ctrlType==dot) and buff.caster==role and buff.startRound == BattleLogic.GetCurRound()
|
||||
end,role,dot)
|
||||
if isHave then
|
||||
num=num+1
|
||||
end
|
||||
|
|
|
@ -183,7 +183,7 @@ function this:Refresh()
|
|||
for k,v in pairs(activityType) do
|
||||
Util.GetGameObject(self.gameObject,v.comp):SetActive(false)
|
||||
end
|
||||
Util.GetGameObject(self.gameObject,activityType[curType].comp):SetActive(true)
|
||||
Util.GetGameObject(self.gameObject, activityType[curType].comp):SetActive(true)
|
||||
|
||||
rechargeNum= VipManager.GetChargedNum()
|
||||
curGiftId = rechargeData.goodsId
|
||||
|
|
Loading…
Reference in New Issue