diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/CommonSign.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/CommonSign.lua index 6dfe3b2721..49553cdc9b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/CommonSign.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Buff/CommonSign.lua @@ -18,10 +18,16 @@ local onRageChange=function(caster,target,func,type,value) end local onSkillCast=function(skill) + if skill.type~=BattleSkillType.Special and skill.type~=BattleSkillType.Extra and skill.type~=BattleSkillType.DeadSkill then + return + end skill.owner.Event:AddEvent(BattleEventName.RecordRageChange,onRageChange,nil,nil,skill.owner) end local onSkillCastEnd=function(skill) + if skill.type~=BattleSkillType.Special and skill.type~=BattleSkillType.Extra and skill.type~=BattleSkillType.DeadSkill then + return + end skill.owner.Event:RemoveEvent(BattleEventName.RecordRageChange,onRageChange,nil,nil,skill.owner) end diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/Monster.lua b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/Monster.lua index 35f96cc3d1..e87c747e15 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/Monster.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/Logic/Monster/Monster.lua @@ -25,6 +25,7 @@ function Monster:Init(data) self.teamDamage=data.teamDamage self.roleData = data self.sex=data.sex + self.addAttack=0 self.data:Init(self, data.property) self.buffFilter:Clear() --buff屏蔽列表 self.Event:ClearEvent() diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua index dda8d259f8..989c48c17d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua @@ -58,6 +58,7 @@ local function _GetBuffEffectConfig(buff) cType = 1 elseif bType==BuffName.CommonSign then cType = 1 + end local type = BuffTypeToConfigType[bType] @@ -342,6 +343,9 @@ function BuffCtrl:RemoveBuffIcon(buff) end return end + else + self.BuffIconList[key]:Dispose() + self.BuffIconList[key] = nil end end end