From e0b7df420611223f9c011f4ce031faf34477cb8a Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Fri, 22 Oct 2021 13:57:51 +0800 Subject: [PATCH 1/4] =?UTF-8?q?[=E6=88=98=E6=96=97]=3D=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=3D=3D=3D=E8=A2=AB=E5=8A=A8199=20=20=20=E5=8E=86=E6=88=98?= =?UTF-8?q?=E4=B9=8B=E8=BA=AF=20=E8=A2=AB=E5=8A=A8=E4=BF=AE=E6=94=B9=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/Logic/Base/Effect.lua | 3 ++- .../~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua index 9f2294ecb0..0dba8b90ba 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua @@ -2405,7 +2405,8 @@ local effectList = { [128] = function(caster, target, args, interval, skill) local pro = args[1] local round = args[2] - BattleLogic.WaitForTrigger(interval, function () + BattleLogic.WaitForTrigger(interval, function () + --LogError("teamdamage=="..caster.teamDamage.." pro=="..pro.." round=="..round) local damage=floor(caster.teamDamage*pro)+round BattleUtil.FinalDamageCountShield(nil,caster, target,damage) end) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua index 08e3d85424..96907c8e52 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleUtil.lua @@ -750,6 +750,13 @@ function BattleUtil.FinalDamage(skill, atkRole, defRole, damage, bCrit, damageTy realDamage=math.abs(defRole.bloodShield:CountBloodValue(damage)) -- damage=realDamage end + --检测历战之躯 + -- 造成的最终伤害 + local damagingFunc = function(dmgDeduction) + realDamage = realDamage - dmgDeduction + damage=realDamage + end + defRole.Event:DispatchEvent(BattleEventName.CheckLiZhanZhiQu, damagingFunc, atkRole, realDamage, skill, dotType, bCrit, damageType,isDirect) --御甲过滤后的伤害只会处理扣血 by: wangzhenxing shihongyi 2021/09/27 local finalDmg = defRole.data:SubValue(RoleDataName.Hp,realDamage) if finalDmg >= 0 then From 8035e3f6f3832f35e924853afe719073dbdbf2b3 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Fri, 22 Oct 2021 14:04:15 +0800 Subject: [PATCH 2/4] =?UTF-8?q?[=E6=88=98=E6=96=97]=3D=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=3D=3D=3D=3D=3D=3D=3D=E6=88=98=E6=96=97=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=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/Misc/BattleDefine.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua index c459156242..af8db45bbb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua @@ -174,6 +174,7 @@ BattleEventName = { HitRoleInBurn = indexAdd(), --击中在燃烧状态得敌人 ActionOperateAngerBefore =indexAdd(),--角色行动操作怒气前 BloodValueChange = indexAdd(), --御甲只发发生改变 + CheckLiZhanZhiQu = indexAdd(),--检测历战之躯 } BattleMaxFrame = 1000000 @@ -207,7 +208,7 @@ RoleDataName = { DarkDamageReduceFactor = indexAdd(), --暗系伤害减免系数（%） ElementDamageBocusFactor = indexAdd(), --属性伤害加成系数（%） InitRage = indexAdd(), --初始怒气值 - CheckLiZhanZhiQu = indexAdd(),--检测历战之躯 + } BuffName = { From fc3edefd820b7916fa89d0087816c659aea7ee0f Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Fri, 22 Oct 2021 14:11:25 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91=3D=3D?= =?UTF-8?q?=3D=3D=3Dhot=20buff=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Modules/Battle/Logic/Buff/HOT.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/HOT.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/HOT.lua index 1592d597a3..1fb3e144b2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/HOT.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/HOT.lua @@ -37,10 +37,10 @@ function HOT:OnTrigger() value=0 end if self.healValue-value>0 then - if target.bloodShield then - target.bloodShield:AddValue(self.healValue-value) + if self.target.bloodShield then + self.target.bloodShield:AddValue(self.healValue-value) else - target:AddBuff(Buff.Create(self.caster,BuffName.Blood,0,self.healValue-value)) + self.target:AddBuff(Buff.Create(self.caster,BuffName.Blood,0,self.healValue-value)) end end else From 8125b21af3d5261811b336daa2557f50a4ecd4d6 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Wed, 10 Nov 2021 00:56:37 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E3=80=90=E8=B7=A8=E6=9C=8D=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=83=E7=95=8C=E8=AF=95=E7=82=BC=E7=BA=A2?= =?UTF-8?q?=E7=82=B9=E5=88=B7=E6=96=B0=E4=B8=8D=E5=8F=8A=E6=97=B6=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/JumpServer/JumpServerManager.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerManager.lua b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerManager.lua index 0703b82ecb..c6c44ae6ca 100644 --- a/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/JumpServer/JumpServerManager.lua @@ -246,6 +246,8 @@ end function this.CheckJumpServerhightLadderMainCityRedPoint() CheckRedPointStatus(RedPointType.JumpServer_HightLadder_Worship) CheckRedPointStatus(RedPointType.JumpServer_HightLadder_HaveMianFeiPanel) + -- 检测七界试炼红点 + CheckRedPointStatus(RedPointType.QiJieShiLian) end --剩余免费挑战次数红点 function this.JumpServerHightLadderMianFeiNumRedPoint()