From caa434c7265e4064e62ac32dd22dd03e8a92e57e Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 11 Feb 2022 15:18:20 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90ID1011130=E3=80=91=20=E3=80=90?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E4=BC=98=E5=8C=96=E3=80=91=E8=B6=85=E5=80=BC?= =?UTF-8?q?=E8=BF=94=E5=88=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua b/Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua index ab4d92c56b..36f1dd5d83 100644 --- a/Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua @@ -105,7 +105,8 @@ function PremiumRebatePanel:Refresh(isTop,isAni) this.actConfigData = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig,"ActivityId",this.actData.activityId) local missionConfig = ConfigManager.GetConfigDataByDoubleKey(ConfigName.ActivityRewardConfig,"ActivityId",this.actData.activityId,"Sort",this.actData.value + 1) local missionData = ActivityGiftManager.GetActivityInfo(this.actData.activityId,missionConfig.Id) - if missionData.state == 1 then + if missionData.state == 1 or + (missionData.state == 0 and missionData.progress >= activityRewardConfig[missionConfig.Id].Values[1][1]) then this.leftTime.text = string.format("累计天数:%s/15",this.actData.value + 1) else this.leftTime.text = string.format("累计天数:%s/15",this.actData.value) @@ -163,12 +164,14 @@ function PremiumRebatePanel:ShowSingleHero(go,_data,index) end btnText.gameObject:SetActive(true) red.gameObject:SetActive(false) + btnImg.sprite = this.spLoader:LoadSprite("s_slbz_1anniuhuangse") btnText.text = "前往"--_data.data.price if _data.state == 0 and index <= this.actData.value + 1 then Util.SetGray(btnGet,false) if _data.progress >= missionConfigData.Values[1][1] then btnText.text = "领取"--_data.data.price red.gameObject:SetActive(true) + btnImg.sprite = this.spLoader:LoadSprite("s_slbz_1anniuongse") Util.AddOnceClick(btnGet,function () -- PayManager.Pay(_data.data.shopData.goodsId, function(id) -- FirstRechargeManager.RefreshAccumRechargeValue(_data.data.shopData.goodsId) @@ -192,7 +195,7 @@ function PremiumRebatePanel:ShowSingleHero(go,_data,index) end) end elseif _data.state == 1 then - Util.SetGray(btnGet,false) + Util.SetGray(btnGet,true) btnText.text = "已领取" btnProgressText.gameObject:SetActive(false) Util.AddOnceClick(btnGet,function ()