diff --git a/lua/app/module/battle/helper/battle_buff_special.lua b/lua/app/module/battle/helper/battle_buff_special.lua index 652f3962..8dc8310f 100644 --- a/lua/app/module/battle/helper/battle_buff_special.lua +++ b/lua/app/module/battle/helper/battle_buff_special.lua @@ -54,7 +54,8 @@ local function _undeadOff(buffSender, target, buff, buffEffect) end local function _imprisonOn(buffSender, buff, target, buffEffect) - return target.unitEntity:addActiveSkillLimit(buff:getName()) + target.unitEntity:addActiveSkillLimit(buff:getName()) + return 1 end local function _imprisonOff(buffSender, target, buff, buffEffect) @@ -65,7 +66,8 @@ local function _frozenOn(buffSender, buff, target, buffEffect) if not target.unitEntity:getIsFrozen() then target:putCacheBuffByDecr(BattleConst.BUFF_DECR_TYPE.INCREASE_GAIN) end - return target.unitEntity:addLimit(buff:getName(), buffEffect) + target.unitEntity:addLimit(buff:getName(), buffEffect) + return 1 end local function _frozenOff(buffSender, target, buff, buffEffect) diff --git a/lua/app/userdata/battle/team/battle_team_entity.lua b/lua/app/userdata/battle/team/battle_team_entity.lua index 3e068fa1..4ced81f9 100644 --- a/lua/app/userdata/battle/team/battle_team_entity.lua +++ b/lua/app/userdata/battle/team/battle_team_entity.lua @@ -236,7 +236,6 @@ function BattleTeamEntity:addLimit(name, buffEffect) self.frozenCount = self.frozenCount + 1 end self.limitAll = self.limitAll + 1 - return 1 end function BattleTeamEntity:removeLimit(name) @@ -248,7 +247,6 @@ function BattleTeamEntity:removeLimit(name) self.frozenCount = self.frozenCount - 1 end self.limitAll = self.limitAll - 1 - return 1 end function BattleTeamEntity:getIsLimit() diff --git a/lua/app/userdata/battle/team/battle_unit_entity.lua b/lua/app/userdata/battle/team/battle_unit_entity.lua index 4e2b184f..616af888 100644 --- a/lua/app/userdata/battle/team/battle_unit_entity.lua +++ b/lua/app/userdata/battle/team/battle_unit_entity.lua @@ -339,7 +339,7 @@ function BattleUnitEntity:getActiveSkillLimit() end function BattleUnitEntity:addActiveSkillLimit(name) - self.team:addActiveSkillLimit(name) + return self.team:addActiveSkillLimit(name) end function BattleUnitEntity:removeActiveSkillLimit(name) @@ -422,7 +422,9 @@ end function BattleUnitEntity:onRoundEnd() for k, v in ipairs(self.activeSkills) do - v:cooldown() + if not self:getActiveSkillLimit() then + v:cooldown() + end end end