From 4bf948f67023cfe2dfcc24136d556a9627e9f4a4 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Thu, 11 May 2023 20:14:59 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E7=8E=B0=E4=BF=AE=E6=94=B9=E4=B8=80?= =?UTF-8?q?=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/battle/controller/battle_controller.lua | 2 +- lua/app/ui/battle/battle_ui.lua | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lua/app/module/battle/controller/battle_controller.lua b/lua/app/module/battle/controller/battle_controller.lua index 540d080c..befd2749 100644 --- a/lua/app/module/battle/controller/battle_controller.lua +++ b/lua/app/module/battle/controller/battle_controller.lua @@ -1058,7 +1058,7 @@ function BattleController:fillBoard(isRoundBeginCheck) end end - self.battleUI:fallGrid(pathMap, function() + self.battleUI:fallGrid(pathMap, isRoundBeginCheck, function() self:onFillBoardOver(isRoundBeginCheck) self.battleUI:enableUITouch() end) diff --git a/lua/app/ui/battle/battle_ui.lua b/lua/app/ui/battle/battle_ui.lua index 99a534ad..d28929cf 100644 --- a/lua/app/ui/battle/battle_ui.lua +++ b/lua/app/ui/battle/battle_ui.lua @@ -1120,8 +1120,12 @@ function BattleUI:removeGridOutOfScreen(posIdList) end end -function BattleUI:fallGrid(listInfo, callback) - self:showMask(false) +function BattleUI:fallGrid(listInfo, isRoundBeginCheck, callback) + if isRoundBeginCheck then + self:showMask(false) + else + self.boardMask:getTransform():SetAsLastSibling() + end self.fallAniCount = 0 for posId, info in pairs(listInfo) do self.fallAniCount = self.fallAniCount + 1