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-04-21 21:21:54 +08:00
commit 7c2e50a338
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -392,14 +392,26 @@ function BattleController:enterEliminationBegin()
-- end -- end
-- end, 2) -- end, 2)
self:enterElimination() self:enterElimination(true)
end end
end) end)
end end
function BattleController:enterElimination() function BattleController:enterElimination(needDelay)
if self.showSelectSkillSid then
ModuleManager.BattleManager:unscheduleGlobal(self.showSelectSkillSid)
self.showSelectSkillSid = nil
end
if self.battleData:useAddlvCount() then if self.battleData:useAddlvCount() then
if needDelay then
self.showSelectSkillSid = ModuleManager.BattleManager:performWithDelayGlobal(function()
ModuleManager.BattleManager:showSelectSkillUI(self:getRandomSkillList()) ModuleManager.BattleManager:showSelectSkillUI(self:getRandomSkillList())
self.showSelectSkillSid = nil
end, 1)
else
ModuleManager.BattleManager:showSelectSkillUI(self:getRandomSkillList())
end
else else
self.roundStep = BattleConst.BATTLE_ROUND_STEP.ON_ELIMINATION self.roundStep = BattleConst.BATTLE_ROUND_STEP.ON_ELIMINATION
end end

1
lua/app/module/tutorial/tutorial_manager.lua
View File

@ -218,7 +218,6 @@ end
function TutorialManager:showFuncTutorial(id) function TutorialManager:showFuncTutorial(id)
self:sendTutorialId(id, function(success) self:sendTutorialId(id, function(success)
Logger.logHighlight(success)
if success then if success then
if not DataManager.TutorialData:getIsFuncTutorialFinished(id) then if not DataManager.TutorialData:getIsFuncTutorialFinished(id) then
DataManager.TutorialData:markFuncTutorialFinish(id) DataManager.TutorialData:markFuncTutorialFinish(id)

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

@ -796,7 +796,7 @@ function BattleUI:hideGenerateSkillGridCells()
local uiMap = self.root:genAllChildren() local uiMap = self.root:genAllChildren()
self.generateSkillGridEntities = {} self.generateSkillGridEntities = {}
for name, elementType in pairs(GConst.BattleConst.ELEMENT_TYPE) do for name, elementType in pairs(GConst.BattleConst.ELEMENT_TYPE) do
local obj = uiMap["battle_ui.bg_2.board_node.ani_node.grid_cell_" .. elementType] local obj = uiMap["battle_ui.bg_2.ani_node.grid_cell_" .. elementType]
if obj then if obj then
local cell = CellManager:addCellComp(obj, GRID_CELL) local cell = CellManager:addCellComp(obj, GRID_CELL)
local entity = DataManager.BattleData:getNewGridEntity() local entity = DataManager.BattleData:getNewGridEntity()