Merge branch 'dev' of git.juzugame.com:b6-client/b6-lua into dev

lua/app/ui/battle/battle_ui.lua

@@ -2026,6 +2026,7 @@ function BattleUI:showTutorialFinger(posIdList)
     if self.showTutorialFingerSeq then
         self.showTutorialFingerSeq:Kill()
         self.showTutorialFingerSeq = nil
+        self.battleController:clearGridSequence()
     end
 
     if not self.tutorialFinger then
@@ -2054,9 +2055,9 @@ function BattleUI:showTutorialFinger(posIdList)
         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
-        local time = (index - 1.4) * 0.7
+        local time = (index - 1.2) * 0.5
         if time < 0 then
             time = 0
         end
@@ -2070,6 +2071,7 @@ function BattleUI:showTutorialFinger(posIdList)
             self.battleController:onTouchEvent(eventType, posId, true)
         end)
     end
+    self.showTutorialFingerSeq:AppendInterval(0.15)
     self.showTutorialFingerSeq:AppendCallback(function()
         self.battleController:clearGridSequence()
         self.tutorialFinger:setAnchoredPositionX(DEFAULT_X)

lua/app/userdata/shop/shop_data.lua

@@ -682,10 +682,16 @@ function ShopData:getValidGrowUpGifts()
             local triggerTime = gift.trigger_at // 1000
             local maxDurationTime = triggerTime + durationTime
             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
-            if isInDurationTime then
+            if not isMaxLv and isInDurationTime then
                 -- 如果是最后一档 默认有效
                 if cfgInfo.last then
                     isValid = true