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-05 10:32:54 +08:00
commit d37872ad7b
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lua/app/module/battle/battle_const.lua
View File

@ -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.HALF_COLUMN_COUNT = 4 -- 计算偏移 math.ceil(COLUMN_COUNT / 2)
BattleConst.GRID_STEP_H = 94 BattleConst.GRID_STEP_H = 94
BattleConst.ROW_STEP = 10 BattleConst.ROW_STEP = 10
BattleConst.ONE_STEP_TIME = 0.2 BattleConst.ONE_STEP_TIME = 0.1
BattleConst.ELEMENT_TYPE_COUNT = 5 BattleConst.ELEMENT_TYPE_COUNT = 5
BattleConst.ELEMENT_WIGHT = 100 BattleConst.ELEMENT_WIGHT = 100
BattleConst.MAX_ELEMENT_WIGHT = 500 BattleConst.MAX_ELEMENT_WIGHT = 500

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

@ -1128,7 +1128,8 @@ function BattleUI:fallGrid(listInfo, callback)
cell.fallSeq = baseObject:createBindTweenSequence() cell.fallSeq = baseObject:createBindTweenSequence()
baseObject:setAnchoredPosition(info[1].x, info[1].y) baseObject:setAnchoredPosition(info[1].x, info[1].y)
local count = #info 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.InQuad))
cell.fallSeq:AppendCallback(function() cell.fallSeq:AppendCallback(function()
self.fallAniCount = self.fallAniCount - 1 self.fallAniCount = self.fallAniCount - 1
if self.fallAniCount == 0 then if self.fallAniCount == 0 then
@ -1137,6 +1138,9 @@ function BattleUI:fallGrid(listInfo, callback)
end end
end end
end) end)
cell.fallSeq:InsertCallback(time + math.random() * 0.1 - 0.2, function()
cell:showAni()
end)
end end
end end
if self.fallAniCount == 0 and callback then if self.fallAniCount == 0 and callback then