diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua index 8b7eab3d03..e3f646e1a0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGiftNew.lua @@ -69,14 +69,20 @@ function EveryDayGiftNew:InitComponent() end function EveryDayGiftNew:BindEvent() + Util.AddOnceClick(self.btn2,function () - PayManager.Pay(onKeyPackId, function(id) - FirstRechargeManager.RefreshAccumRechargeValue(onKeyPackId) - PlayerPrefs.SetInt(PlayerManager.uid.."czlb", 0) - CheckRedPointStatus(RedPointType.GrowthPackage) - MonthCardManager.CheckMonthCardPatFace() - self:RefreshData(nil,false,false) - end) + local actData = ActivityGiftManager.GetActivityTypeInfo(89) + if actData then + PopupTipPanel.ShowTip("需要未购买每日礼包时才可使用!") + else + PayManager.Pay(onKeyPackId, function(id) + FirstRechargeManager.RefreshAccumRechargeValue(onKeyPackId) + PlayerPrefs.SetInt(PlayerManager.uid.."czlb", 0) + CheckRedPointStatus(RedPointType.GrowthPackage) + MonthCardManager.CheckMonthCardPatFace() + self:RefreshData(nil,false,false) + end) + end end) end @@ -263,7 +269,7 @@ function EveryDayGiftNew:RefreshReward(Data) NotEnoughPopup:Show(Data.data.costId) end else - PopupTipPanel.ShowTip(Language[11701]) + PopupTipPanel.ShowTip(string.format("名望等级不足,请升至%s级后才可购买!",DynamicActivityManager.Index-1)) end end end) @@ -397,11 +403,11 @@ function EveryDayGiftNew:RefreshOneKeyShow() local actData = ActivityGiftManager.GetActivityTypeInfo(89) if actData then Util.SetGray(self.btn2,true) - self.btn2:GetComponent("Button").interactable = false + -- self.btn2:GetComponent("Button").interactable = false self.btn2Text.text = string.format("剩余%s天",math.ceil((actData.endTime - GetTimeStamp())/86400)) else Util.SetGray(self.btn2,false) - self.btn2:GetComponent("Button").interactable = true + -- self.btn2:GetComponent("Button").interactable = true self.btn2Text.text = string.format("60元七天特惠") end end diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua index 6007aabd48..b05b4cb218 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua @@ -186,7 +186,7 @@ function RechargeViewNew:RefreshReward(Data) NotEnoughPopup:Show(Data.data.costId) end else - PopupTipPanel.ShowTip(Language[11701]) + PopupTipPanel.ShowTip(string.format("名望等级不足,请升至%s级后才可购买!",DynamicActivityManager.Index-1)) end end end)