From 24c71edd357dccac639993112188af85bfede038 Mon Sep 17 00:00:00 2001 From: chenxi Date: Tue, 6 Jun 2023 11:59:36 +0800 Subject: [PATCH 1/2] loading --- lua/app/ui/loading/loading_cloud_ui.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/app/ui/loading/loading_cloud_ui.lua b/lua/app/ui/loading/loading_cloud_ui.lua index d62e0bca..bb099404 100644 --- a/lua/app/ui/loading/loading_cloud_ui.lua +++ b/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) From 2c4aec0178ee07c6b212d7fc350435828c41a519 Mon Sep 17 00:00:00 2001 From: CloudJ Date: Tue, 6 Jun 2023 12:00:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=88=90=E9=95=BF=E7=A4=BC=E5=8C=85?= =?UTF-8?q?=E5=B1=8F=E8=94=BD=E6=BB=A1=E7=BA=A7=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lua/app/userdata/shop/shop_data.lua | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lua/app/userdata/shop/shop_data.lua b/lua/app/userdata/shop/shop_data.lua index 16e85187..1fab764a 100644 --- a/lua/app/userdata/shop/shop_data.lua +++ b/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