From 3c1e1c389d43159fb2addf7da6867b97ec47468d Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Tue, 8 Nov 2022 18:33:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=90=8D=E6=9C=9B=E7=89=B9?= =?UTF-8?q?=E6=9D=83=E7=BA=A2=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Common/GlobalDefine.lua | 2 +- .../DynamicActivity/DynamicActivityManager.lua | 17 +++++++++++++++++ .../~Lua/Modules/Main/MainPanel.lua | 3 +++ .../~Lua/Modules/NewShenZun/GMMingWangPanel.lua | 4 ++-- .../~Lua/Modules/Operating/OperatingManager.lua | 4 ++++ .../~Lua/Modules/Player/RedpotManager.lua | 1 + 6 files changed, 28 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index e13714735c..9803bc4bd0 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1034,7 +1034,7 @@ RedPointType = { TreasureStoreSeason2 = 880,--主城 --新三界降魔 DemonSlayerNew = 890,--新三界降魔 - + MingWangPri =891,--名望特权 tailsmanSoul = 43601,-- 法宝之魂 tailsmanSoul_gold = 43602,-- diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua index 1ae5c6df80..12d9ee73f3 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua @@ -169,6 +169,7 @@ function this.GetMingWangLv(index) return 0 end + function this.ChangeMingWangLv() local growData = this.GetGiftDataByType({{2,95}}) local rechargeNum = BagManager.GetItemCountById(1351) --VipManager.GetChargedNum()--已经充值的金额 @@ -192,6 +193,22 @@ function this.ChangeMingWangLv() end end +--检测名望红点 +function this.CheckMingWangRed() + local growData = DynamicActivityManager.GetGiftDataByType({{2,95}}) + if growData then + for i = 1, 20 do + local curData = growData[i] + if curData.data.limitNum - curData.data.boughtNum > 0 and + BagManager.GetTotalItemNum(curData.data.costId) >= curData.data.price and + BagManager.GetItemCountById(1351) >=DynamicActivityManager.GetMingWangLv(curData.data.shopItemData.BuyRule[2]-1) then + return true + end + end + end + return false +end + function this.SheJiCheckRedPoint() local ActInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.Celebration)--活动数据 diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 926a9f1bf5..31722dc593 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -791,6 +791,7 @@ function this.BindRedPoint() BindRedPointObject(RedPointType.ExploreFunc, this.btnExploreRed) BindRedPointObject(RedPointType.FestevalRed, this.FestevaBtnRed) BindRedPointObject(RedPointType.EightLoginReward, this.sgRedPoint) + BindRedPointObject(RedPointType.MingWangPri,this.mwRedPoint) end -- 绑定红点 function this.ClearRedPoint() @@ -819,6 +820,7 @@ function this.ClearRedPoint() ClearRedPointObject(RedPointType.ExploreFunc, this.btnExploreRed) ClearRedPointObject(RedPointType.FestevalRed, this.FestevaBtnRed) ClearRedPointObject(RedPointType.EightLoginReward, this.sgRedPoint) + ClearRedPointObject(RedPointType.MingWangPri,this.mwRedPoint) end --添加事件监听(用于子类重写) @@ -1313,6 +1315,7 @@ function this:OnShow() HarmonyManager.CheckRedPoinStatusUpTowerMainCityRed() --山河试炼红点 CheckRedPointStatus(RedPointType.FightLevelTrial) + CheckRedPointStatus(RedPointType.MingWangPri) if addUpDateNum <= 0 then FixedUpdateBeat:Add(this.OnUpdate, self)--长按方法注册 addUpDateNum = addUpDateNum + 1 diff --git a/Assets/ManagedResources/~Lua/Modules/NewShenZun/GMMingWangPanel.lua b/Assets/ManagedResources/~Lua/Modules/NewShenZun/GMMingWangPanel.lua index 3509e5d590..2b93305ac7 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewShenZun/GMMingWangPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewShenZun/GMMingWangPanel.lua @@ -227,7 +227,7 @@ function this.RefreshReward(Data) this.cost:SetActive(true) this.btnGet:GetComponent("Button").interactable = true Util.SetGray(this.btnGet, false) - LogError("rechargenum=="..rechargeNum.." neednum=="..needNum) + --LogError("rechargenum=="..rechargeNum.." neednum=="..needNum) if rechargeNum >= needNum then this.btnGet:GetComponent("Image").sprite = this.spLoader:LoadSprite("s_slbz_1anniuongse") if BagManager.GetTotalItemNum(Data.data.costId) >= Data.data.price then @@ -315,7 +315,7 @@ end --界面关闭时调用(用于子类重写) function this:OnClose() - + CheckRedPointStatus(RedPointType.MingWangPri) end function this:OnDestroy() diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua index a3b983d770..ea5317d498 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua @@ -855,6 +855,10 @@ function this.CheckTimeLimitHeroStoreRedPoint() end end end + local red=DynamicActivityManager.CheckMingWangRed() + if red then + return true + end return false diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index 2916dc7d29..d76299cc35 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -689,6 +689,7 @@ function this.RegisterRedCheckFunc() RPData:AddCheckFunc(RedPointType.eastSeaFindGod4,CommonActPageManager.GetRedPointEastSeaFindGodnew) --数字游戏 RPData:AddCheckFunc(RedPointType.numberGame,RatioNumberManager.CheckRedPoint) + RPData:AddCheckFunc(RedPointType.MingWangPri,DynamicActivityManager.CheckMingWangRed) end -- 向红点绑定物体