puxuan/c1_lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
xiekaidong 2023-06-06 14:12:53 +08:00
commit 0afa71888e
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lua/app/ui/loading/loading_cloud_ui.lua
View File

@ -10,7 +10,7 @@ end
function LoadingCloudUI:showLoading(callback) function LoadingCloudUI:showLoading(callback)
self.root:setActive(true) self.root:setActive(true)
local animator = self.root:getComponent(GConst.TYPEOF_UNITY_CLASS.ANIMATOR) 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 if self.scheduleShowId then
self:unscheduleGlobal(self.scheduleShowId) self:unscheduleGlobal(self.scheduleShowId)
@ -27,7 +27,7 @@ end
function LoadingCloudUI:hideLoading(callback) function LoadingCloudUI:hideLoading(callback)
local animator = self.root:getComponent(GConst.TYPEOF_UNITY_CLASS.ANIMATOR) 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 if self.scheduleHideId then
self:unscheduleGlobal(self.scheduleHideId) self:unscheduleGlobal(self.scheduleHideId)

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