From b3ac1b83c3cc27287caa4092b0383ac55e3ed4ed Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Fri, 29 Jan 2021 16:40:39 +0900 Subject: [PATCH] =?UTF-8?q?[=E6=88=98=E6=96=97]=3D=3D=3D=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=3D=3D=3D=3D=3D=3D=3D=3D=3D=E8=A2=AB=E5=8A=A8119=20=EF=BC=8C294?= =?UTF-8?q?=EF=BC=8C305=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/Logic/Base/Passivity.lua | 15 +++++++++++---- .../~Lua/Modules/Battle/Logic/Role/RoleLogic.lua | 2 +- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index 142a17e524..a51659113d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -2179,7 +2179,8 @@ local passivityList = { local onSkillEnd = function(skill) if skill.type == BattleSkillType.Normal then local buff = Buff.Create(role, BuffName.PropertyChange, i1, BattlePropList[pro], f1, ct) - buff.cover = true + --属性buff覆盖存在问题,暂时不覆盖 + buff.cover = false role:AddBuff(buff) end end @@ -6144,7 +6145,11 @@ local passivityList = { if buff.type == BuffName.HOT and buff.caster == role and buff.roundDuration>1 and buff.startRound==BattleLogic.GetCurRound() then buff:ChangeBuffDuration(ct,round) local immune = function(buff) - return buff.type == BuffName.Control and buff.ctrlType and buff.ctrlType==immune + if buff.type == BuffName.Control and buff.ctrlType and buff.ctrlType==immune then + role1.Event:DispatchEvent(BattleEventName.ShowHintText, BattleArtFontType.Immune) + return true + end + return false end local curBuff=Buff.Create(role, BuffName.Immune,buff.roundDuration,4,immune) role1:AddBuff(curBuff) @@ -6361,7 +6366,7 @@ local passivityList = { role.Event:AddEvent(BattleEventName.SkillEffectBefore, onSkillEffectBefore) end, -- 敌方死亡[a]人自身[b]就[c]改变[d]%,--第一回合检测敌方空位加属性 - -- a[int] b[int 属性id] c[int 改变类型] d[float] + -- [303] = function(role,args) local i1 = args[1] local p1 = args[2] @@ -6425,9 +6430,11 @@ local passivityList = { local f1 = args[1] local f2=args[2] local onRoleHit = function(deadRole) + BattleLogic.WaitForTrigger(BattleLogic.GameDeltaTime, function () if deadRole.camp~=role.camp then role:InsertExtraSkill(f1,f2) - end + end + end) end BattleLogic.Event:AddEvent(BattleEventName.RoleRealDead, onRoleHit) end, diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua index 11738cdbe5..22657a97e1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua @@ -366,7 +366,7 @@ function RoleLogic:AddSkill(type, isRage, isAdd, targets) type=BattleSkillType.ChaosNormal --混乱普攻使用普攻特效 effectData={self.skill[1],self.skill[2],self.skill[3],self.skill[4],{100001,{1,1,1}}} - isTriggerJudge=false + --isTriggerJudge=false end SkillManager.AddSkill(self, effectData, type, targets, isAdd, isRage,isTriggerJudge) --