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

lua/app/ui/loading/loading_cloud_ui.lua

@@ -10,7 +10,7 @@ end
 function LoadingCloudUI:showLoading(callback)
 	self.root:setActive(true)
 	local animator = self.root:getComponent(GConst.TYPEOF_UNITY_CLASS.ANIMATOR)
-	animator:Play("loading_cloud_close", -1, 0)
+	animator:Play(623542868, -1, 0)
 
 	if self.scheduleShowId then
 		self:unscheduleGlobal(self.scheduleShowId)
@@ -27,7 +27,7 @@ end
 
 function LoadingCloudUI:hideLoading(callback)
 	local animator = self.root:getComponent(GConst.TYPEOF_UNITY_CLASS.ANIMATOR)
-	animator:Play("loading_cloud_open", -1, 0)
+	animator:Play(-1942362866, -1, 0)
 
 	if self.scheduleHideId then
 		self:unscheduleGlobal(self.scheduleHideId)

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