From 7df9cf85b213aa7e86422a1d4cb9d1b1650437f5 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?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua | 3 +++ .../~Lua/Modules/Operating/OperatingManager.lua | 3 +++ 2 files changed, 6 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 9c31304705..96e8baf0a2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -1456,6 +1456,9 @@ function this.TimeFormat() local data = OperatingManager.GetGiftGoodsInfo(cardType) if data then local time = data.endTime - PlayerManager.serverTime + if OperatingManager.GetGoodsBuyTime(GoodsTypeDef.MONTHCARD_128) > 0 and OperatingManager.GetGoodsBuyTime(GoodsTypeDef.MONTHCARD_328) > 0 then + this.upperMonthCardTime.gameObject:SetActive(false) + else if time>= 86400 then this.upperMonthCardTime.text = TimeToDH(time) else diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua index d05a2bf48d..5bb36c3973 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