解决冲突提交
parent
d3adb8d753
commit
7df9cf85b2
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue