连击bug
This commit is contained in:
parent
d62c7b8d54
commit
fe39dbe13c
@ -85,6 +85,10 @@ BattleConst.MIN_NODE_HEIGHT = {
|
|||||||
[3] = 34
|
[3] = 34
|
||||||
}
|
}
|
||||||
|
|
||||||
|
BattleConst.BUFF_TYPE = {
|
||||||
|
DIRECT_HURT = 3
|
||||||
|
}
|
||||||
|
|
||||||
BattleConst.SKILL_MOVE_TYPE = {
|
BattleConst.SKILL_MOVE_TYPE = {
|
||||||
MOVE = 1, -- 移动到目标跟前使用
|
MOVE = 1, -- 移动到目标跟前使用
|
||||||
STAND = 2, -- 原地使用
|
STAND = 2, -- 原地使用
|
||||||
|
|||||||
@ -1113,7 +1113,9 @@ function BattleUnitComp:onSkillTakeEffect(skill)
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
if succ then
|
if succ then
|
||||||
self.team:addCombo()
|
if skill:getIsHurtType() then
|
||||||
|
self.team:addCombo()
|
||||||
|
end
|
||||||
if skill:getIsNormalType() then -- 普攻攻击成功的话
|
if skill:getIsNormalType() then -- 普攻攻击成功的话
|
||||||
self:checkPassiveEvent(PASSIVE_EVENT.USE_NORMAL_SKILL, target)
|
self:checkPassiveEvent(PASSIVE_EVENT.USE_NORMAL_SKILL, target)
|
||||||
elseif skill:getIsActiveType() then
|
elseif skill:getIsActiveType() then
|
||||||
|
|||||||
@ -1,5 +1,8 @@
|
|||||||
|
local BattleConst = require "app/module/battle/battle_const"
|
||||||
local BattleBuffEntity = class("BattleBuffEntity", BaseData)
|
local BattleBuffEntity = class("BattleBuffEntity", BaseData)
|
||||||
|
|
||||||
|
local BUFF_TYPE_DIRECT_HURT = BattleConst.BUFF_TYPE.DIRECT_HURT
|
||||||
|
|
||||||
function BattleBuffEntity:ctor()
|
function BattleBuffEntity:ctor()
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -38,6 +41,10 @@ function BattleBuffEntity:getBuffType()
|
|||||||
return self.buffType
|
return self.buffType
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function BattleBuffEntity:getIsHurtType()
|
||||||
|
return self.buffType == BUFF_TYPE_DIRECT_HURT
|
||||||
|
end
|
||||||
|
|
||||||
function BattleBuffEntity:getEffectNum()
|
function BattleBuffEntity:getEffectNum()
|
||||||
return self.effectNum
|
return self.effectNum
|
||||||
end
|
end
|
||||||
|
|||||||
@ -33,10 +33,14 @@ end
|
|||||||
|
|
||||||
function BattleSkillEntity:initSkillEffect()
|
function BattleSkillEntity:initSkillEffect()
|
||||||
self.effectList = {}
|
self.effectList = {}
|
||||||
|
self.isHurtType = false
|
||||||
if self.skillInfo.effect then
|
if self.skillInfo.effect then
|
||||||
for k, v in ipairs(self.skillInfo.effect) do
|
for k, v in ipairs(self.skillInfo.effect) do
|
||||||
local buffEntity = BattleBuffEntity:create()
|
local buffEntity = BattleBuffEntity:create()
|
||||||
buffEntity:init(v, self.owner)
|
buffEntity:init(v, self.owner)
|
||||||
|
if buffEntity:getIsHurtType() then
|
||||||
|
self.isHurtType = true
|
||||||
|
end
|
||||||
table.insert(self.effectList, buffEntity)
|
table.insert(self.effectList, buffEntity)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@ -223,4 +227,8 @@ function BattleSkillEntity:getSlowDownBulletTimeParams()
|
|||||||
return self.skillInfo.bullet_time
|
return self.skillInfo.bullet_time
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function BattleSkillEntity:getIsHurtType()
|
||||||
|
return self.isHurtType
|
||||||
|
end
|
||||||
|
|
||||||
return BattleSkillEntity
|
return BattleSkillEntity
|
||||||
Loading…
x
Reference in New Issue
Block a user