diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptManager.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptManager.lua index 5eb3bfdb4c..747981c0df 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptManager.lua @@ -159,6 +159,9 @@ function this.GetBlood() end return blood end +function this.SetCanSweep1() + canSweep = 0 +end function this.GetCanSweep() return canSweep end diff --git a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua index c16b34a30d..975f6016c4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua @@ -195,6 +195,7 @@ function this.RefreshUpdateIndication(buffer) PlayerPrefs.SetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.QianKunBoxTen,0) PlayerPrefs.SetInt(PlayerManager.uid.."Trial",0)--森罗五点刷新重置红点 + GuildTranscriptManager.SetCanSweep1() end --服务器推送红点信息 diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua index b48830a1b4..070285266b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua @@ -136,7 +136,17 @@ function this.GetGiftGoodsInfo(goodsType, Id) end function this.GetGiftGoodsInfoList(type) - return giftGoodsInfoList[type] and giftGoodsInfoList[type] or {} + -- return giftGoodsInfoList[type] and giftGoodsInfoList[type] or {} + if not giftGoodsInfoList[type] then + return {} + end + local newGiftGoodsInfoList = {} + for k,v in pairs(giftGoodsInfoList[type]) do + if rechargeConfig[v.goodsId] and PlayerManager.level >= rechargeConfig[v.goodsId].LevelLinit[1] and PlayerManager.level <= rechargeConfig[v.goodsId].LevelLinit[2] then + table.insert(newGiftGoodsInfoList,v) + end + end + return newGiftGoodsInfoList end function this.RefreshGiftGoodsBuyTimes(goodsType, goodsId, buyTimes)