From 51dfdede03fbff0d5d6f66c10aa8ced9d72947a4 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Fri, 5 Nov 2021 09:50:28 +0800 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=E8=A2=AB=E5=8A=A8371=20=20368=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/Base/Passivity.lua | 4 ++-- .../~Lua/Modules/Battle/View/Unit/BuffCtrl.lua | 8 ++++++++ 2 files changed, 10 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 9c4e81a23f..e3a694229c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -8830,7 +8830,7 @@ local passivityList = { local onRoleTreat=function(target,realTreat,treat) local hp=treat- realTreat - if hp>0 and realTreat>0 then + if hp>0 then addHp=addHp+hp*count end end @@ -8946,7 +8946,7 @@ local passivityList = { return end - if skill.type~= BattleSkillType.Special or skill.type~= BattleSkillType.Extra then + if skill.type~= BattleSkillType.Special and skill.type~= BattleSkillType.Extra then return end local arr=skill:GetDirectTargetsNoExile() diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua index cf3dba7cb5..d0f291a180 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua @@ -106,6 +106,14 @@ function BuffCtrl:AddBuffEffect(buffName, isTrigger, offset) local sortingOrder if self.owner.camp == 0 then sortingOrder = self.owner.GameObject:GetComponent("Canvas").sortingOrder + --混乱特效因为贴图不显示特殊处理 + if buffName=="TongYong_Effect_buff_hunluan_1" then + sortingOrder=sortingOrder+1 + end + end + --混乱特效因为贴图不显示特殊处理 + if sortingOrder==nil and buffName=="TongYong_Effect_buff_hunluan_1" then + sortingOrder=BattleManager.GetBattleSorting()+1 end local node = BattleManager.LoadAsset(buffName, sortingOrder) -- node.transform:SetParent(self.RootPanel.transform)