From d8bf6274d8377099b1e3dec633b28e3791d2aeac Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Sun, 23 Apr 2023 14:19:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E7=94=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/battle/battle_ui.lua | 10 +++++++++- lua/app/ui/battle/cell/grid_cell.lua | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lua/app/ui/battle/battle_ui.lua b/lua/app/ui/battle/battle_ui.lua index 4b521293..d4a59469 100644 --- a/lua/app/ui/battle/battle_ui.lua +++ b/lua/app/ui/battle/battle_ui.lua @@ -728,13 +728,21 @@ function BattleUI:eliminationAni(sequence, callback) else self.eliminationAniSeq:Insert(index * 0.01, baseObject:getTransform():DOScale(1.3, 0.1)) self.eliminationAniSeq:Insert(index * 0.01 + 0.2, baseObject:getTransform():DOAnchorPos(self:getElementSkillPos(entity:getElementType()), 0.3)) - self.eliminationAniSeq:Insert(index * 0.01 + 0.2, baseObject:getTransform():DOScale(1, 0.3)) + self.eliminationAniSeq:Insert(index * 0.01 + 0.2, baseObject:getTransform():DOScale(0.5, 0.3)) end end end end self.eliminationAniSeq:AppendCallback(function() + for posId, _ in pairs(self.posIdMap) do + local entity = DataManager.BattleData:getGridEntity(posId) + + if entity and entity:getCell() then + entity:getCell():hideAni() + end + end + self.posIdMap = {} if self.boardMask2D then self.boardMask2D.enabled = true diff --git a/lua/app/ui/battle/cell/grid_cell.lua b/lua/app/ui/battle/cell/grid_cell.lua index 2895d37b..3c3b0da3 100644 --- a/lua/app/ui/battle/cell/grid_cell.lua +++ b/lua/app/ui/battle/cell/grid_cell.lua @@ -133,6 +133,7 @@ end function GridCell:resetTranform() local uiMap = self:getUIMap() + self.baseObject:setLocalScale(1, 1, 1) uiMap["grid_cell.touch_node.ani_node"]:setAnchoredPosition(0, 0) uiMap["grid_cell.touch_node.ani_node"]:setLocalScale(1, 1, 1) end