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-30 14:30:05 +08:00
commit 2f720561f5
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -511,9 +511,6 @@ function BattleController:enterNextWave()
self.eliminateCount = 0 self.eliminateCount = 0
self.isBossWave = self.defTeam:getMainUnit().unitEntity:getIsBoss() self.isBossWave = self.defTeam:getMainUnit().unitEntity:getIsBoss()
if self.isBossWave then
self:showBuffTips(BattleConst.SIDE_DEF, true)
end
self:postFightStart() self:postFightStart()
self:enterRoundBegin() self:enterRoundBegin()
end end

2
lua/app/ui/battle/battle_ui.lua
View File

@ -2046,6 +2046,7 @@ function BattleUI:showBossEnterAni(bornTime, bossName, monsterComp, callback)
if callback then if callback then
callback() callback()
end end
self.battleController:showBuffTips(GConst.BattleConst.SIDE_DEF, true)
return return
end end
self.bossEnterNode:setVisible(true) self.bossEnterNode:setVisible(true)
@ -2066,6 +2067,7 @@ function BattleUI:showBossEnterAni(bornTime, bossName, monsterComp, callback)
if callback then if callback then
callback() callback()
end end
self.battleController:showBuffTips(GConst.BattleConst.SIDE_DEF, true)
end) end)
self.bossEnterAniSeq:AppendInterval(bornTime) self.bossEnterAniSeq:AppendInterval(bornTime)
self.bossEnterAniSeq:AppendCallback(function() self.bossEnterAniSeq:AppendCallback(function()

19
lua/app/userdata/battle/skill/battle_buff_entity.lua
View File

@ -32,15 +32,16 @@ function BattleBuffEntity:getHostSkill()
end end
function BattleBuffEntity:getDesc() function BattleBuffEntity:getDesc()
if self.desc == nil then return GFunc.getBuffDesc(self:getName(), self:getEffectNum())
local buff18NInfo = I18N:getConfigWithOtherKey("buff", "name")[self.name] -- if self.desc == nil then
if buff18NInfo then -- local buff18NInfo = I18N:getConfigWithOtherKey("buff", "name")[self.name]
self.desc = buff18NInfo.desc or GConst.EMPTY_STRING -- if buff18NInfo then
else -- self.desc = buff18NInfo.desc or GConst.EMPTY_STRING
self.desc = GConst.EMPTY_STRING -- else
end -- self.desc = GConst.EMPTY_STRING
end -- end
return self.desc -- end
-- return self.desc
end end
function BattleBuffEntity:getBuffType() function BattleBuffEntity:getBuffType()