diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Control.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Control.lua index ecbdd72d10..f740b8d43f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Control.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Control.lua @@ -23,7 +23,7 @@ function Control:OnStart() self.target.ctrl_slient = true elseif self.ctrlType == 3 then --嘲讽(包括沉默) self.target.lockTarget = self.caster - self.target.ctrl_slient = true + self.target.ctrl_lock = true self.caster.Event:AddEvent(BattleEventName.RoleDead,lockTargetFun,nil,nil,self.target) elseif self.ctrlType == 4 then --禁疗 self.target.ctrl_noheal = true @@ -57,7 +57,7 @@ function Control:OnEnd() self.target.ctrl_slient = false elseif self.ctrlType == 3 then --嘲讽(包括沉默) self.target.lockTarget = nil - self.target.ctrl_slient = false + self.target.ctrl_lock = false elseif self.ctrlType == 4 then --禁疗 local isHave=self.target:CheckHavePassive(315) if not isHave then diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua index f5641885cc..ba36eff27c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua @@ -83,6 +83,7 @@ function RoleLogic:Init(uid, data, position) self.IsDebug = false self.enemyType = EnemyType.normal self.lockTarget = nil --嘲讽 + self.ctrl_lock = false --是否被嘲讽 self.ctrl_dizzy = false --眩晕 不能释放所有技能 self.ctrl_slient = false --沉默 只能1技能 self.ctrl_palsy = false --麻痹 只能2技能 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/SkillManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/SkillManager.lua index 88ef42689c..d060533337 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/SkillManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/SkillManager.lua @@ -108,6 +108,13 @@ function this.InsertSkill(caster, effectData, type, targets, isAdd, isRage,isTri effectData={caster.skill[1],caster.skill[2],caster.skill[3],caster.skill[4],{100001,{1,1,1}}} isTriggerJudge=false end + + if caster.ctrl_lock and type~=BattleSkillType.DeadSkill then + type=BattleSkillType.ChaosNormal + --嘲讽普攻使用普攻特效 + effectData={caster.skill[1],caster.skill[2],caster.skill[3],caster.skill[4],{200221,{1,1,1}}} + isTriggerJudge=false + end skill:Init(caster, effectData, type, targets, isAdd, isRage,isTriggerJudge) skill.isNotLoop=isLoop if type == BattleSkillType.DeadSkill then -- 死亡技能加入单独的对列