Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

dev_chengFeng
jiaoyangna 2020-08-27 21:42:25 +08:00
commit 94e0dc10df
2 changed files with 4 additions and 4 deletions

View File

@ -96,9 +96,9 @@ function DailyRechargePanel:RefreshPanel()
else
self.extraIcon.sprite = Util.LoadSprite(rechargeBgDef[4])
self.dollar:SetActive(true)
local remainValue = actRewardConfig.Values[1][1] - DailyRechargeManager.GetRechargeValue()
remainValue = remainValue < 0 and 0 or remainValue
self.desc.text = remainValue
-- local remainValue = actRewardConfig.Values[1][1] - DailyRechargeManager.GetRechargeValue()
-- remainValue = remainValue < 0 and 0 or remainValue
self.desc.text = actRewardConfig.Values[1][1]--remainValue
self.dealText.text = Language[10436]
end
end

View File

@ -101,7 +101,7 @@ end
-- 判断相应显示类型的礼包是否存在用于判断是否开启了相应的充值活动
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
for _, goods in ipairs(list) do
if this.GetGiftGoodsInfo(goods.Type, goods.Id) then