diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 7f4bc067e0..4f9dfaab00 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -679,7 +679,7 @@ RedPointType = { ----礼包相关------ Operating = 201, --运营(主界面礼包) CumulativeSignIn = 202,--累计签到 - GrowthGift = 203,--成长礼金 + GrowthGift = 203,--成长基金--花费98领取一堆奖励 ContinuityRecharge = 204,--连续充值 VipPrivilege = 205,--特权 SevenDayCarnival = 206,--七日狂欢 @@ -689,7 +689,7 @@ RedPointType = { DailyGift = 2012, -- 每日礼包 HERO_STAR_GIFT = 2013, --- 星级礼包 MonthCard = 2014, --月卡 - GrowthPackage = 2015,--成长礼包!礼包!!礼包!!(重要的说三遍 和礼金区分) + GrowthPackage = 2015,--成长礼包!礼包!!礼包!!(重要的说三遍 和礼金区分)根据充值金额可购买商品 QianKunBox = 2016,--乾坤包囊 DynamicAct = 2017,--破阵诛仙 DynamicActTask_MeiRi = 20169,--破阵诛仙每日任务 diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index a1f10bc9f9..7d3ddac52c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -123,7 +123,7 @@ function this.InitRedPointAllRelate() -- RPData:SetParent(RedPointType.Shop_Page_Recharge, RedPointType.Recharge) RPData:SetParent(RedPointType.VIP_SHOP_DETAIL, RedPointType.Shop_Page_Recharge) -- RPData:SetParent(RedPointType.DailyGift, RedPointType.Recharge) - -- RPData:SetParent(RedPointType.GrowthPackage, RedPointType.Recharge)--成长礼包 + RPData:SetParent(RedPointType.GrowthPackage, RedPointType.Recharge)--成长礼包 -- 主界面商店 RPData:SetParent(RedPointType.Shop_Page_General, RedPointType.Shop) RPData:SetParent(RedPointType.Shop_Page_Coin, RedPointType.Shop) diff --git a/Assets/ManagedResources/~Lua/Modules/Vip/VipManager.lua b/Assets/ManagedResources/~Lua/Modules/Vip/VipManager.lua index a3f473e1ba..d075c9c942 100644 --- a/Assets/ManagedResources/~Lua/Modules/Vip/VipManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Vip/VipManager.lua @@ -426,12 +426,7 @@ function this.CheckGrowthPackagePointStatus()--成长礼包 local boughtNum = ShopManager.GetShopItemHadBuyTimes(SHOP_TYPE.VIP_GIFT, shopData[i].id) if rechargeNum >= shopItemConfig[shopData[i].id].BuyRule[2] and boughtNum == 0 then local costId,finalNum,oriCostNum = ShopManager.calculateBuyCost(SHOP_TYPE.VIP_GIFT, shopData[i].id, 1) - if finalNum <= 0 then - return true - end - local redointTime = PlayerPrefs.GetInt(PlayerManager.uid.."czlb"..shopData[i].id) - --LogGreen("redointTimeL:"..redointTime) - if redointTime == 0 then + if finalNum <= BagManager.GetTotalItemNum(shopItemConfig[shopData[i].id].Cost[1][1]) then return true end end