Merge branch 'china/dev' into china/local

dev_chengFeng
JieLing 2021-04-28 03:30:42 +08:00
commit e24e6cbebe
2 changed files with 23 additions and 22 deletions

View File

@ -672,7 +672,7 @@ end
function this.CreatActivity()
for k,v in ipairs(activitys) do
if not activityTabs[k] then
if not activityTabs[k] then
activityTabs[k] = {}
activityTabs[k].go = newObjToParent(this.activityTabPrefab,this.RightUp)
activityTabs[k].img = Util.GetGameObject(activityTabs[k].go, "icon"):GetComponent("Image")
@ -1000,11 +1000,11 @@ function this.TimeFormat()
end
elseif v.ActId == 668 then
-- 加入对月卡的判断
local isMonthCardActive = OperatingManager.IsMonthCardActive()
-- local isMonthCardActive = OperatingManager.IsMonthCardActive()
local isOpen_128 = OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_128)
local isOpen_328 = OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_328)
activityTabs[k].go.gameObject:SetActive(isMonthCardActive and (isOpen_128 or isOpen_328))
if isMonthCardActive then
activityTabs[k].go.gameObject:SetActive( (isOpen_128 or isOpen_328))--isMonthCardActive and
-- if isMonthCardActive then
local cardType = nil
if isOpen_328 then
cardType = GoodsTypeDef.MONTHCARD_328
@ -1030,7 +1030,7 @@ function this.TimeFormat()
end
end
end
end
-- end
elseif v.ActId == 667 then
local limitSkinGift = OperatingManager.GetTimeLimitSkinInfoList()
if not limitSkinGift then
@ -1200,10 +1200,10 @@ function this.RefreshGiftBtnShow()
local ishow = DynamicActivityManager.IsQualifiled(v.Id)
if v.ActId == 668 and ishow then
-- 加入对月卡的判断
local isMonthCardActive = OperatingManager.IsMonthCardActive()
-- local isMonthCardActive = OperatingManager.IsMonthCardActive()
local isOpen_128 = OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_128)
local isOpen_328 = OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_328)
activityTabs[k].go.gameObject:SetActive(isMonthCardActive and (isOpen_128 or isOpen_328))
activityTabs[k].go.gameObject:SetActive( (isOpen_128 or isOpen_328))--isMonthCardActive and
end
end
end
@ -1275,11 +1275,11 @@ function this.RefreshActivityShow()
elseif v.ActId == 668 then
--超值基金
-- 加入对月卡的判断
local isMonthCardActive = OperatingManager.IsMonthCardActive()
-- local isMonthCardActive = OperatingManager.IsMonthCardActive()
local isOpen_128 = OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_128)
local isOpen_328 = OperatingManager.IsBaseOpen(GoodsTypeDef.MONTHCARD_328)
activityTabs[k].go.gameObject:SetActive(isMonthCardActive and (isOpen_128 or isOpen_328))
if isMonthCardActive then
activityTabs[k].go.gameObject:SetActive( (isOpen_128 or isOpen_328))--isMonthCardActive and
-- if isMonthCardActive then
local cardType = nil
if isOpen_328 then
cardType = GoodsTypeDef.MONTHCARD_328
@ -1298,7 +1298,7 @@ function this.RefreshActivityShow()
end
end
end
end
-- end
end
elseif v.ActiveType > 0 then
local activityId = ActivityGiftManager.IsActivityTypeOpen(v.ActiveType)

View File

@ -77,17 +77,17 @@ function UpperMonthCard:BindEvent()
end)
Util.AddOnceClick(self.btnBuy, function()
local isActive = VipManager.GetMonthCardOpenState()
if not isActive then
MsgPanel.ShowTwo(Language[11387], function()
end, function(isShow)
JumpManager.GoJump(36004)
end, Language[10731], Language[10019],nil, false)
else
-- local isActive = VipManager.GetMonthCardOpenState()
-- if not isActive then
-- MsgPanel.ShowTwo(Language[11387], function()
-- end, function(isShow)
-- JumpManager.GoJump(36004)
-- end, Language[10731], Language[10019],nil, false)
-- else
PayManager.Pay(self.baseType, function(id)
self:RechargeSuccessFunc(id)
end)
end
-- end
end)
end
@ -169,14 +169,15 @@ end
--- 根据是否购买了显示信息
function UpperMonthCard:SetBuyState()
local isActive = VipManager.GetMonthCardOpenState()
-- local isActive = VipManager.GetMonthCardOpenState()
-- local isBought = OperatingManager.IsBaseBuy(self.chargerBaseType)
local canBuyNum = OperatingManager.GetLeftBuyTime(self.chargerBaseType, self.baseType)
local isBought = canBuyNum and canBuyNum <= 0
self.boughtPanel:SetActive(isBought)
self.buyPanel:SetActive(not isBought)
Util.SetGray(self.btnBuy, not isActive)
self.textBuy.text = isActive and (string.format(MoneyUtil.GetMoneyUnitName(),MoneyUtil.GetMoney(chargeConfig[self.baseType].Price))) or (string.format(MoneyUtil.GetMoneyUnitName(),MoneyUtil.GetMoney(chargeConfig[self.baseType].Price)))-- .. MoneyUtil.GetMoneyUnitName())
-- Util.SetGray(self.btnBuy, not isActive)
--isActive and
self.textBuy.text = (string.format(MoneyUtil.GetMoneyUnitName(),MoneyUtil.GetMoney(chargeConfig[self.baseType].Price))) or (string.format(MoneyUtil.GetMoneyUnitName(),MoneyUtil.GetMoney(chargeConfig[self.baseType].Price)))-- .. MoneyUtil.GetMoneyUnitName())
self.actLeftTime.gameObject:SetActive(false)
if not isBought then