This commit is contained in:
chenxi 2023-04-21 20:22:27 +08:00
parent 3a6d68db2f
commit 6ecbce4127
2 changed files with 29 additions and 6 deletions

View File

@ -361,7 +361,6 @@ function BattleController:enterNextWave()
if self.waveIndex == 1 then -- 第一波 if self.waveIndex == 1 then -- 第一波
self:generateBoard(true) self:generateBoard(true)
end end
self.defTeam:prepare() self.defTeam:prepare()
self:enterRoundBegin() self:enterRoundBegin()
self.isBossWave = self.defTeam:getMainUnit().unitEntity:getIsBoss() self.isBossWave = self.defTeam:getMainUnit().unitEntity:getIsBoss()
@ -905,11 +904,28 @@ function BattleController:generateInstructions(skillEntity, elementType, lineCou
---- 技能 ---- 技能
if skillEntity then if skillEntity then
table.insert(self.instructions, { if elementType == skillEntity:getMatchType() then
name = BattleConst.INSTRUCTION_NAME.PLAY_SKILL, table.insert(self.instructions, {
skillMatch = elementType, name = BattleConst.INSTRUCTION_NAME.PLAY_SKILL,
count = elementTypeCount, skillMatch = elementType,
}) count = elementTypeCount,
})
else
if skillEntity:getSkillEffectType() ~= nil then
table.insert(self.instructions, {
name = BattleConst.INSTRUCTION_NAME.PLAY_SKILL,
skillMatch = skillEntity:getPosition(),
count = 0,
})
end
if elementTypeCount > 0 then
table.insert(self.instructions, {
name = BattleConst.INSTRUCTION_NAME.GENERAL_ATTACK,
skillMatch = elementType,
count = elementTypeCount,
})
end
end
else else
---- 普攻 ---- 普攻
if elementTypeCount > 0 then if elementTypeCount > 0 then

View File

@ -81,6 +81,13 @@ function BattleBoardSkillEntity:getSkillTypeParameter()
return self.config.skill_type_parameter return self.config.skill_type_parameter
end end
function BattleBoardSkillEntity:getSkillEffectType()
if not self.config then
return nil
end
return self.config.effect_type
end
function BattleBoardSkillEntity:getBoardRange() function BattleBoardSkillEntity:getBoardRange()
if not self.config or not self.config.boardrange then if not self.config or not self.config.boardrange then
return return