From 8410ac0c78cb8428a46879827032f6454cebc012 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Thu, 4 May 2023 17:32:01 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=80=E4=B8=8B?= =?UTF-8?q?=E4=B8=8B=E8=90=BD=E5=8A=A8=E7=94=BB=E8=8A=82=E5=A5=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/battle/battle_ui.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lua/app/ui/battle/battle_ui.lua b/lua/app/ui/battle/battle_ui.lua index 4d6d2512..55f0abf3 100644 --- a/lua/app/ui/battle/battle_ui.lua +++ b/lua/app/ui/battle/battle_ui.lua @@ -1128,7 +1128,8 @@ function BattleUI:fallGrid(listInfo, callback) cell.fallSeq = baseObject:createBindTweenSequence() baseObject:setAnchoredPosition(info[1].x, info[1].y) local count = #info - cell.fallSeq:Append(baseObject:getTransform():DOLocalPath(info, GConst.BattleConst.ONE_STEP_TIME * count):SetEase(CS.DG.Tweening.Ease.InOutQuint)) + local time = GConst.BattleConst.ONE_STEP_TIME * count + cell.fallSeq:Append(baseObject:getTransform():DOLocalPath(info, time):SetEase(CS.DG.Tweening.Ease.InCirc)) cell.fallSeq:AppendCallback(function() self.fallAniCount = self.fallAniCount - 1 if self.fallAniCount == 0 then @@ -1137,6 +1138,9 @@ function BattleUI:fallGrid(listInfo, callback) end end end) + cell.fallSeq:InsertCallback(time + math.random() * 0.1 - 0.2, function() + cell:showAni() + end) end end if self.fallAniCount == 0 and callback then From 4d2dd8a0137e460cc00fbc5a0efa9c188ab57b2d Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Thu, 4 May 2023 17:41:52 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=8A=82=E5=A5=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/ui/battle/battle_ui.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/app/ui/battle/battle_ui.lua b/lua/app/ui/battle/battle_ui.lua index 55f0abf3..7f58f0df 100644 --- a/lua/app/ui/battle/battle_ui.lua +++ b/lua/app/ui/battle/battle_ui.lua @@ -1129,7 +1129,7 @@ function BattleUI:fallGrid(listInfo, callback) baseObject:setAnchoredPosition(info[1].x, info[1].y) local count = #info local time = GConst.BattleConst.ONE_STEP_TIME * count - cell.fallSeq:Append(baseObject:getTransform():DOLocalPath(info, time):SetEase(CS.DG.Tweening.Ease.InCirc)) + cell.fallSeq:Append(baseObject:getTransform():DOLocalPath(info, time):SetEase(CS.DG.Tweening.Ease.InQuint)) cell.fallSeq:AppendCallback(function() self.fallAniCount = self.fallAniCount - 1 if self.fallAniCount == 0 then From 07b11eea6f091bc7ccc6fdf8297596b83e8e0171 Mon Sep 17 00:00:00 2001 From: xiekaidong Date: Thu, 4 May 2023 18:06:03 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=8A=82=E5=A5=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/module/battle/battle_const.lua | 2 +- lua/app/ui/battle/battle_ui.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/app/module/battle/battle_const.lua b/lua/app/module/battle/battle_const.lua index e4a4a498..f50c61c6 100644 --- a/lua/app/module/battle/battle_const.lua +++ b/lua/app/module/battle/battle_const.lua @@ -6,7 +6,7 @@ BattleConst.HALF_ROW_COUNT = 4 -- 计算偏移 math.ceil(ROW_COUNT / 2) BattleConst.HALF_COLUMN_COUNT = 4 -- 计算偏移 math.ceil(COLUMN_COUNT / 2) BattleConst.GRID_STEP_H = 94 BattleConst.ROW_STEP = 10 -BattleConst.ONE_STEP_TIME = 0.2 +BattleConst.ONE_STEP_TIME = 0.1 BattleConst.ELEMENT_TYPE_COUNT = 5 BattleConst.ELEMENT_WIGHT = 100 BattleConst.MAX_ELEMENT_WIGHT = 500 diff --git a/lua/app/ui/battle/battle_ui.lua b/lua/app/ui/battle/battle_ui.lua index 7f58f0df..aff5a1fd 100644 --- a/lua/app/ui/battle/battle_ui.lua +++ b/lua/app/ui/battle/battle_ui.lua @@ -1129,7 +1129,7 @@ function BattleUI:fallGrid(listInfo, callback) baseObject:setAnchoredPosition(info[1].x, info[1].y) local count = #info local time = GConst.BattleConst.ONE_STEP_TIME * count - cell.fallSeq:Append(baseObject:getTransform():DOLocalPath(info, time):SetEase(CS.DG.Tweening.Ease.InQuint)) + cell.fallSeq:Append(baseObject:getTransform():DOLocalPath(info, time):SetEase(CS.DG.Tweening.Ease.InQuad)) cell.fallSeq:AppendCallback(function() self.fallAniCount = self.fallAniCount - 1 if self.fallAniCount == 0 then