puxuan/c1_lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev

Browse Source
This commit is contained in:
chenxi 2023-05-31 21:16:36 +08:00
commit 4a1fc3e0ab
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lua/app/module/battle/controller/battle_controller.lua
View File

@ -119,6 +119,7 @@ function BattleController:onDefDead(callback)
if callback then if callback then
callback() callback()
end end
self:handleBuffs(BattleConst.SIDE_DEF)
end) end)
else else
if callback then if callback then

1
lua/app/module/battle/controller/battle_controller_stage.lua
View File

@ -60,6 +60,7 @@ function BattleControllerStage:_stageGenerateNextMonster()
local monsterComp = spineObject:addLuaComponent(GConst.BattleConst.TYPEOF_LUA_COMP.BATTLE_MONSTER_COMPONENT) local monsterComp = spineObject:addLuaComponent(GConst.BattleConst.TYPEOF_LUA_COMP.BATTLE_MONSTER_COMPONENT)
monsterComp:initWithEntity(modelId, unitEntity, self) monsterComp:initWithEntity(modelId, unitEntity, self)
self.defTeam:addUnit(monsterComp, true) self.defTeam:addUnit(monsterComp, true)
self:handleBuffs(GConst.BattleConst.SIDE_DEF)
self.battleUI:refreshDefHp(unitEntity:getHp(), unitEntity:getHpPercent()) self.battleUI:refreshDefHp(unitEntity:getHp(), unitEntity:getHpPercent())
local bornTime = monsterComp:getAnimationDuration(GConst.BattleConst.SPINE_ANIMATION_NAME.BORN) local bornTime = monsterComp:getAnimationDuration(GConst.BattleConst.SPINE_ANIMATION_NAME.BORN)
if isBoss then -- 如果是boss就跑过去 if isBoss then -- 如果是boss就跑过去

2
lua/app/module/battle/team/battle_team.lua
View File

@ -293,7 +293,7 @@ function BattleTeam:removeAllBuff()
local count = #self.buffList local count = #self.buffList
for i = count, 1, -1 do for i = count, 1, -1 do
buffEffect = self.buffList[i] buffEffect = self.buffList[i]
if buffEffect and not buffEffect.buff:isCantRemove() then if buffEffect then
self:updateBuffState(buffEffect.buff, -1) self:updateBuffState(buffEffect.buff, -1)
table.remove(self.buffList, i) table.remove(self.buffList, i)
BattleBuffHandle.removeBuff(self.mainUnit, buffEffect) BattleBuffHandle.removeBuff(self.mainUnit, buffEffect)