Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
94e0dc10df
|
@ -96,9 +96,9 @@ function DailyRechargePanel:RefreshPanel()
|
||||||
else
|
else
|
||||||
self.extraIcon.sprite = Util.LoadSprite(rechargeBgDef[4])
|
self.extraIcon.sprite = Util.LoadSprite(rechargeBgDef[4])
|
||||||
self.dollar:SetActive(true)
|
self.dollar:SetActive(true)
|
||||||
local remainValue = actRewardConfig.Values[1][1] - DailyRechargeManager.GetRechargeValue()
|
-- local remainValue = actRewardConfig.Values[1][1] - DailyRechargeManager.GetRechargeValue()
|
||||||
remainValue = remainValue < 0 and 0 or remainValue
|
-- remainValue = remainValue < 0 and 0 or remainValue
|
||||||
self.desc.text = remainValue
|
self.desc.text = actRewardConfig.Values[1][1]--remainValue
|
||||||
self.dealText.text = Language[10436]
|
self.dealText.text = Language[10436]
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -101,7 +101,7 @@ end
|
||||||
|
|
||||||
-- 判断相应显示类型的礼包是否存在用于判断是否开启了相应的充值活动
|
-- 判断相应显示类型的礼包是否存在用于判断是否开启了相应的充值活动
|
||||||
function this.HasGoodsByShowType(showType)
|
function this.HasGoodsByShowType(showType)
|
||||||
local list = ConfigManager.GetConfigDataByKey(ConfigName.RechargeCommodityConfig, "ShowType", showType)
|
local list = ConfigManager.GetAllConfigsDataByKey(ConfigName.RechargeCommodityConfig, "ShowType", showType)
|
||||||
if not list then return false end
|
if not list then return false end
|
||||||
for _, goods in ipairs(list) do
|
for _, goods in ipairs(list) do
|
||||||
if this.GetGiftGoodsInfo(goods.Type, goods.Id) then
|
if this.GetGiftGoodsInfo(goods.Type, goods.Id) then
|
||||||
|
|
Loading…
Reference in New Issue