From 020d8b1b05785ce7096c49a0ce5b3b3f7b9200fd Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Wed, 15 Dec 2021 15:07:20 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=3D=3D=3D=3D=3D=3D=3D?= =?UTF-8?q?=E6=88=98=E6=96=97=E7=BB=9F=E8=AE=A1=E6=AD=BB=E4=BA=A1=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E7=81=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/View/DamageResultPanel.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua index 36133bd614..72ad8a8990 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua @@ -437,7 +437,7 @@ function this.HeadAdapter(head,data,type) frame.sprite = this.spLoader:LoadSprite(GetHeroQuantityImageByquality(SpiritAnimal[id].Quality)) icon:GetComponent("Image").sprite = this.spLoader:LoadSprite(GetResourcePath(SpiritAnimal[id].Icon)) end - if data.isRealDead and (type==1 or type==2) then + if data.isRealDead and (type==1 or type==2 or type==3) then Util.SetGray(icon.gameObject ,true) deadObj:SetActive(true) else From b46519d9c87edae65b34266c78380f19abf696b4 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Wed, 15 Dec 2021 18:06:48 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E6=88=98=E6=96=97=E3=80=91=3D=3D?= =?UTF-8?q?=3D=3D=3D=3D=3D=E5=8F=8D=E4=BC=A4=E7=9B=BE=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=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/BattleLogic.lua | 1 + .../~Lua/Modules/Battle/Logic/Buff/Shield.lua | 5 +++-- .../~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua index 9300b13d47..b6689f89e4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua @@ -488,6 +488,7 @@ function BattleLogic.Update() end if CurRound > MaxRound then if BattleLogic.Type == BATTLE_SERVER_TYPE.TOPFight -- 巅峰赛 + or BattleLogic.Type == BATTLE_SERVER_TYPE.ArenaFight or BattleLogic.Type == BATTLE_SERVER_TYPE.Firend or BattleLogic.Type == BATTLE_SERVER_TYPE.CrossYuxuLunDaoFight or BattleLogic.Type == BATTLE_SERVER_TYPE.LINGMAIMIJING diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Shield.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Shield.lua index ed16f15b9e..39c3aca002 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Shield.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/Shield.lua @@ -5,7 +5,7 @@ local onRoleBeHit=nil --初始化Buff,通过传入一些自定义参数控制成长相关的数值 function Shield:SetData(...) - self.shieldType, -- 护盾类型(1 固定减伤盾 2 百分比减伤盾 3 无敌盾) + self.shieldType, -- 护盾类型(1 固定减伤盾 2 百分比减伤盾 3 无敌盾 5.反伤盾 ) self.shieldValue, -- 护盾值(固定减伤盾:减伤值 百分比减伤盾:减伤百分比 无敌盾:吸血率) self.dmgReboundFactor = ... --伤害反弹系数 self.damageSum = 0 --记录承受的伤害 @@ -16,7 +16,8 @@ function Shield:SetData(...) -- 刷新排序等级 self.sort = 4 immune0=function(buff) - return buff.type == BuffName.Control or buff.isDeBuff or buff.type == BuffName.DOT or buff.caster.camp~=self.target.camp + return buff.type == BuffName.Control or buff.isDeBuff or buff.type == BuffName.DOT or (buff.caster.camp~=self.target.camp and buff.type~= BuffName.Exile + ) end onRoleBeHit=function(atkRole, damage, bCrit, finalDmg, damageType, skill) --damagetype为3 是 舍身济世分摊伤害 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua index 49ded718ac..5acf4b1f54 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Misc/BattleDefine.lua @@ -333,7 +333,7 @@ ShieldTypeName = { NormalReduce = 1, -- 固定值减伤 RateReduce = 2, -- 百分比减伤 AllReduce = 3, -- 无敌护盾 - ThornsReduce = 4, --反伤盾 + ThornsReduce = 5, --反伤盾 } --额外释放技能