From 55972b70d787feb0ce9c633a85447ec242be2ced Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Fri, 26 Feb 2021 18:19:54 +0900 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91=3D=3D=3D?= =?UTF-8?q?=3D=3D=3D=3D=3D=3D=3D=E9=99=A4=E6=AD=BB=E4=BA=A1=E6=8A=80?= =?UTF-8?q?=E8=83=BD=E5=A4=96=EF=BC=8C=E6=B7=B7=E4=B9=B1=E5=90=8E=E7=9A=84?= =?UTF-8?q?=E6=89=80=E6=9C=89=E6=8A=80=E8=83=BD=E9=83=BD=E5=8F=98=E4=B8=BA?= =?UTF-8?q?=E6=B7=B7=E4=B9=B1=E6=99=AE=E6=94=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/Logic/Role/RoleLogic.lua | 4 +++- .../~Lua/Modules/Battle/Logic/SkillManager.lua | 10 +++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua index 3c6a7460bd..51135071ff 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua @@ -384,14 +384,16 @@ end --加入额外技能,用于额外释放技能 by:王振兴 function RoleLogic:InsertExtraSkill(id,type) local effectData=BattleUtil.GetExtraSkillbyId(id) + if effectData then local skillType=BattleSkillType.Extra --如果type为1则按绝技处理,不为1的话按额外技能处理(额外技能因为被动判断会判断是否是绝技类型,所以不会触发) if type==1 then skillType=BattleSkillType.Special end + --和老史,佳琦确认果 附加技能算绝技 被沉默无法释放 可以套娃 递归触发 by:王振兴 - SkillManager.InsertSkill(self, effectData, skillType, nil, true, false) + SkillManager.InsertSkill(self, effectData, skillType, nil, true, false,true) BattleLogManager.Log( "Insert Extra Skill", "camp", self.camp, diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/SkillManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/SkillManager.lua index 6eda1237e5..394d35a6ab 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/SkillManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/SkillManager.lua @@ -57,12 +57,20 @@ function this.AddSkill(caster, effectData, type, targets, isAdd, isRage,isTrigge return skill end -- 插入技能到技能列表首位 -function this.InsertSkill(caster, effectData, type, targets, isAdd, isRage) +function this.InsertSkill(caster, effectData, type, targets, isAdd, isRage,isTriggerJudge) -- 如果超出最大限制则不再追加技能 if not this.CheckMaxCount() then return end local skill = skillPool:Get() + --角色被混乱后 + isTriggerJudge=true + if caster.ctrl_chaos and type~=BattleSkillType.DeadSkill then + type=BattleSkillType.ChaosNormal + --混乱普攻使用普攻特效 + effectData={caster.skill[1],caster.skill[2],caster.skill[3],caster.skill[4],{100001,{1,1,1}}} + isTriggerJudge=false + end skill:Init(caster, effectData, type, targets, isAdd, isRage) if type == BattleSkillType.DeadSkill then -- 死亡技能加入单独的对列 table.insert(this.DeadSkillList, 1, skill)