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-06-06 11:59:44 +08:00
commit 48cc41ba97
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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)

10
lua/app/userdata/shop/shop_data.lua
View File

@ -682,10 +682,16 @@ function ShopData:getValidGrowUpGifts()
local triggerTime = gift.trigger_at // 1000 local triggerTime = gift.trigger_at // 1000
local maxDurationTime = triggerTime + durationTime local maxDurationTime = triggerTime + durationTime
local buyLimit = cfgInfo.limit or 0 local buyLimit = cfgInfo.limit or 0
-- 是否英雄已满级
local isMaxLv = false
local heroId = cfgInfo.hero_id
local heroEntity = DataManager.HeroData:getHeroById(heroId)
if heroEntity then
isMaxLv = heroEntity:isMaxLv()
end
-- 是否在有效范围内 -- 是否在有效范围内
local isInDurationTime = Time:getServerTime() < maxDurationTime local isInDurationTime = Time:getServerTime() < maxDurationTime
if isInDurationTime then if not isMaxLv and isInDurationTime then
-- 如果是最后一档 默认有效 -- 如果是最后一档 默认有效
if cfgInfo.last then if cfgInfo.last then
isValid = true isValid = true