From 9362f341a6c1d3083446fbd3b1521d53a0cf9888 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Fri, 26 Feb 2021 17:00:05 +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=E8=A2=AB=E5=8A=A8200=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E6=B7=B7=E4=B9=B1=E7=8A=B6=E6=80=81=E4=B8=8B=E7=9A=84=E6=89=80?= =?UTF-8?q?=E6=9C=89=E6=94=BB=E5=87=BB=E6=96=B9=E5=BC=8F=E9=83=BD=E5=8F=98?= =?UTF-8?q?=E4=B8=BA=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/Base/Passivity.lua | 2 +- .../~Lua/Modules/Battle/Logic/Role/RoleLogic.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index c73422277a..32cd446d50 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -4053,7 +4053,7 @@ local passivityList = { damagingFunc(shareDamage) end -- 分担伤害 - BattleUtil.FinalDamage(nil, atkRole, role, shareDamage,bCrit,damageType,dotType,true) + BattleUtil.ApplyDamage(skill, atkRole, role, shareDamage,false,damageType,dotType,true) end end BattleLogic.Event:AddEvent(BattleEventName.FinalDamage, onFinalDamage) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua index fbc310bcc7..3c6a7460bd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Role/RoleLogic.lua @@ -362,7 +362,7 @@ function RoleLogic:AddSkill(type, isRage, isAdd, targets) local effectData = type == BattleSkillType.Normal and self.skill or self.superSkill --角色被混乱后 local isTriggerJudge=true - if self.ctrl_chaos and isRage then + if self.ctrl_chaos then type=BattleSkillType.ChaosNormal --混乱普攻使用普攻特效 effectData={self.skill[1],self.skill[2],self.skill[3],self.skill[4],{100001,{1,1,1}}}