From f1a8a740c7ca2da694006e3b958fc1b9df369095 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Tue, 6 Apr 2021 11:52:44 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90ID1008091=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?=E5=9F=BA=E9=87=91=E8=B4=AD=E4=B9=B0=E5=90=8E=EF=BC=8C=E4=B8=BB?= =?UTF-8?q?=E5=9F=8E=E8=B6=85=E5=80=BC=E5=9F=BA=E9=87=91=E5=85=A5=E5=8F=A3?= =?UTF-8?q?=E5=80=92=E8=AE=A1=E6=97=B6=E6=B6=88=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Main/MainPanel.lua | 25 ++++++------------- .../Modules/Operating/OperatingManager.lua | 3 +++ 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index a892381cb3..0ae242b615 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -649,7 +649,10 @@ function this.CreatActivity() if v.ActiveType > 0 then local activityId = ActivityGiftManager.IsActivityTypeOpen(v.ActiveType) if activityId and activityId > 0 and ActivityGiftManager.IsQualifiled(v.ActiveType) and v.ActiveType ~= 42 then - local tempConfig = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.ActivityGroups,"ActId",activityId,"PageType",0) + local tempConfig = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.ActivityGroups,"ActId",GlobalActConfig[activityId].ShowArt,"PageType",0,"ActiveType:"..v.ActiveType) + if not tempConfig then + tempConfig = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.ActivityGroups,"ActId",activityId,"PageType",0) + end if tempConfig then activityTabs[k].img.sprite = Util.LoadSprite(tempConfig.Icon[1]) else @@ -662,22 +665,6 @@ function this.CreatActivity() activityTabs[k].img.sprite = Util.LoadSprite(v.Icon[1]) end - --开发用 - -- LogGreen("v.ActiveType:"..v.ActiveType) - -- if v.ActiveType == 62 then - -- local activityId = ActivityGiftManager.IsActivityTypeOpen(v.ActiveType) - -- LogRed("activityId:"..tostring(activityId)) - -- LogRed("IsQualifiled:"..tostring(ActivityGiftManager.IsQualifiled(v.ActiveType))) - -- local tempConfig = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.ActivityGroups,"ActId",activityId,"PageType",0) - -- local imageName = "" - -- if activityId and activityId > 0 and tempConfig then - -- imageName = tempConfig.Icon[1] - -- else - -- imageName = v.Icon[1] - -- end - -- LogRed("imageName:"..tostring(imageName)) - -- end - activityTabs[k].img:SetNativeSize() Util.AddOnceClick(activityTabs[k].go,function() if v.ActiveType > 0 then @@ -966,7 +953,9 @@ function this.TimeFormat() activityTabs[k].go.gameObject:SetActive(false) else activityTabs[k].go.gameObject:SetActive(true) - if time >= 86400 then + if OperatingManager.GetGoodsBuyTime(GoodsTypeDef.MONTHCARD_128) > 0 and OperatingManager.GetGoodsBuyTime(GoodsTypeDef.MONTHCARD_328) > 0 then + activityTabs[k].timeImg.gameObject:SetActive(false) + elseif time >= 86400 then activityTabs[k].timeText.text = TimeToDH(time) else activityTabs[k].timeText.text = TimeToHMS(time) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua index 6720ec1e08..0010258ad1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua @@ -185,6 +185,9 @@ function this.GetGoodsBuyTime(type, goodsId) return 0 end for k,v in pairs(giftGoodsInfoList[type]) do + if not goodsId then + return v.buyTimes + end if v.goodsId == goodsId then return v.buyTimes end