From 5184ced8c8e0a65ca1398644e7d82e7d45e2778e Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Sat, 19 Jun 2021 16:41:00 +0800 Subject: [PATCH 1/2] =?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=E5=85=8D=E7=96=ABbuff=E6=B8=85=E9=99=A4?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=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/Buff.lua | 6 +++--- .../~Lua/Modules/Battle/Logic/Base/Passivity.lua | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Buff.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Buff.lua index 8859bf7f93..2130d9be3e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Buff.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Buff.lua @@ -242,13 +242,13 @@ function BuffManager:ClearBuff(target, func) while idx <= list.size do local buff = list.buffer[idx] if buff.target == target and (not func or (func and buff.clear and func(buff))) then - if func and func(buff) then + -- if func and func(buff) then if buff.type== BuffName.Shield then buff.target.Event:DispatchEvent(BattleEventName.ShowHintText, BattleArtFontType.Shield) - elseif buff.type== BuffName.DOT or buff.type==BuffName.Control or buff.type==BuffName.Immune then + elseif buff.type== BuffName.DOT or buff.type==BuffName.Control then buff.target.Event:DispatchEvent(BattleEventName.ShowHintText, BattleArtFontType.clear) end - end + -- end buff:OnEnd() buff.target.Event:DispatchEvent(BattleEventName.BuffEnd, buff) putBuff(buff) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua index 6f68666d5d..4226fe072c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua @@ -5708,7 +5708,7 @@ local passivityList = { BattleUtil.RandomAction(pro, function() BattleLogic.BuffMgr:ClearBuff(defRole, function(buff) if buff.type == BuffName.Immune and (buff.immuneType == 4 or buff.immuneType == 2) then - -- buff.target.Event:DispatchEvent(BattleEventName.ShowHintText, BattleArtFontType.clear) + buff.target.Event:DispatchEvent(BattleEventName.ShowHintText, BattleArtFontType.clear) return true end return false From 15361c2ef5d3f6c8ac135d725e19a8fe94f8ab91 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Sat, 19 Jun 2021 17:07:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=A7=E5=9C=A3=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/GlobalDefine.lua | 2 ++ Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua | 3 +++ 2 files changed, 5 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 21d69c683e..6b7d3f8fe3 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1042,6 +1042,8 @@ JumpType = { SheJiDaDianShangDian = 20060, --社稷大典商店 XinJiangLaiXiShangDian = 20200, --社稷大典商店 XingChenShangDian = 20059, --星辰商店 + + ChaoFanRuSheng = 20061, } NPCPosType={ diff --git a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua index 21dfd80cc2..229361386f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua @@ -666,6 +666,9 @@ local jumpDic = { [JumpType.EndlessXingDongliBuy] = function(data) UIManager.OpenPanel(UIName.QuickPurchasePanel, { type = 1 }) end, + [JumpType.ChaoFanRuSheng] = function(data) + this.JumpActivity(ActivityTypeDef.ChaoFanRuSheng,data[1]) + end, } function this.JumpActivity(data,skipfactor)