Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev
This commit is contained in:
commit
8052cfa716
@ -2026,6 +2026,7 @@ function BattleUI:showTutorialFinger(posIdList)
|
|||||||
if self.showTutorialFingerSeq then
|
if self.showTutorialFingerSeq then
|
||||||
self.showTutorialFingerSeq:Kill()
|
self.showTutorialFingerSeq:Kill()
|
||||||
self.showTutorialFingerSeq = nil
|
self.showTutorialFingerSeq = nil
|
||||||
|
self.battleController:clearGridSequence()
|
||||||
end
|
end
|
||||||
|
|
||||||
if not self.tutorialFinger then
|
if not self.tutorialFinger then
|
||||||
@ -2054,9 +2055,9 @@ function BattleUI:showTutorialFinger(posIdList)
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
self.showTutorialFingerSeq:Append(self.tutorialFinger:getTransform():DOLocalPath(path, count * 0.7):SetEase(CS.DG.Tweening.Ease.Linear))
|
self.showTutorialFingerSeq:Append(self.tutorialFinger:getTransform():DOLocalPath(path, count * 0.5):SetEase(CS.DG.Tweening.Ease.Linear))
|
||||||
for index, posId in ipairs(posIdList) do
|
for index, posId in ipairs(posIdList) do
|
||||||
local time = (index - 1.4) * 0.7
|
local time = (index - 1.2) * 0.5
|
||||||
if time < 0 then
|
if time < 0 then
|
||||||
time = 0
|
time = 0
|
||||||
end
|
end
|
||||||
@ -2070,6 +2071,7 @@ function BattleUI:showTutorialFinger(posIdList)
|
|||||||
self.battleController:onTouchEvent(eventType, posId, true)
|
self.battleController:onTouchEvent(eventType, posId, true)
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
self.showTutorialFingerSeq:AppendInterval(0.15)
|
||||||
self.showTutorialFingerSeq:AppendCallback(function()
|
self.showTutorialFingerSeq:AppendCallback(function()
|
||||||
self.battleController:clearGridSequence()
|
self.battleController:clearGridSequence()
|
||||||
self.tutorialFinger:setAnchoredPositionX(DEFAULT_X)
|
self.tutorialFinger:setAnchoredPositionX(DEFAULT_X)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user