From f0a4cec7675db1996908dcf527f2799cf835959c Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 29 Dec 2021 17:10:48 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90ID1010975=E3=80=91=20=E3=80=90?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=91=E8=B6=85=E5=80=BC=E8=BF=94=E5=88=A9?= =?UTF-8?q?=E6=AF=8F=E6=97=A5=E9=A6=96=E6=AC=A1=E7=99=BB=E9=99=86=E6=9C=89?= =?UTF-8?q?=E7=BA=A2=E7=82=B9=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Common/GlobalDefine.lua | 2 ++ Assets/ManagedResources/~Lua/Common/functions.lua | 6 ++++++ .../Modules/ContinuePackage/PremiumRebatePanel.lua | 6 ++++++ .../DynamicActivity/DynamicActivityManager.lua | 13 +++++++++++++ .../~Lua/Modules/Main/MainPanel.lua | 3 +++ .../~Lua/Modules/Net/IndicationManager.lua | 1 + .../~Lua/Modules/Player/RedpotManager.lua | 2 ++ 7 files changed, 33 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 843d78826d..ec897da158 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1026,6 +1026,8 @@ RedPointType = { recruitTreasure_two = 7012, recruitTreasure_three = 7013, LingMaiMiJing = 920,--灵脉秘境 + + chaozhifanli = 90001, } RedPointStatus = { diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index 74326c2d4c..9af5f0d5fc 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -1353,6 +1353,12 @@ function TimeToDHM(second) return string.format(Language[11390],day, hour, minute) end +--- 将一段时间转换为天 +function TimeToD(second) + local day = math.floor(second / (24 * 3600)) + return day,string.format("%s天",day) +end + --- 将一段时间转换为天时 function TimeToDH(second) local day = math.floor(second / (24 * 3600)) diff --git a/Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua b/Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua index dbbc6318cf..135d7b201f 100644 --- a/Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua @@ -123,6 +123,12 @@ function PremiumRebatePanel:ShowSingleHero(go,_data,index) local btnText = Util.GetGameObject(go, "btnGet/Text"):GetComponent("Text") local btnImg = Util.GetGameObject(go, "btnGet"):GetComponent("Image") local missionConfigData = this.actConfigData[index] + if missionConfigData then + go.gameObject:SetActive(false) + return + else + go.gameObject:SetActive(true) + end title.text = missionConfigData.ContentsShow if not this.itemViewList[go] then this.itemViewList[go] = {} diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua index 67a1fce1a4..d071e1995c 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua @@ -608,6 +608,7 @@ function this.IsActivityOpenByJumpIndex(pageIndex, jumpIndex) end + -- 玩家是否有资格开启 function this.IsQualifiled(id) -- 相同类型活动解锁类型相同,所以只判断第一个 @@ -843,4 +844,16 @@ function this.XunBaoMiZongRedCheck() end end +function this.CheckRedPointPremium() + local day = TimeToD(GetTimeStamp()) + if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.chaozhifanli) then + if PlayerPrefs.GetInt("chaozhifanli"..PlayerManager.uid) ~= day then + return true + else + return false + end + end + return false +end + return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 821f13357a..78592edd5e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -1073,6 +1073,9 @@ function this:TabBtnAction(id,actType,data) UIManager.OpenPanel(UIName.ArenaTrialPanel) elseif id == ActivityTypeDef.chaozhifanli then UIManager.OpenPanel(UIName.PremiumRebatePanel) + local day = TimeToD(GetTimeStamp()) + PlayerPrefs.SetInt("chaozhifanli"..PlayerManager.uid,day) + CheckRedPointStatus(RedPointType.chaozhifanli) end elseif actType == 2 then if id == FUNCTION_OPEN_TYPE.SERVER_START_GIFT then diff --git a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua index ac67007652..e6c47750b2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua @@ -354,6 +354,7 @@ function this.RefreshUpdateIndication(buffer) PlayerManager.ResetLocalData(1)--初始化所有本地的每日一刷--1是五点推送、2是登陆检测 GuildTranscriptManager.SetCanSweep1() DeathPosManager.InitData()--十绝阵跨天状态刷新 + CheckRedPointStatus(RedPointType.chaozhifanli) end function this.ZeroRefreshUpdateIndication() diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index 29d915c005..0a3678c47c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -647,6 +647,8 @@ function this.RegisterRedCheckFunc() RPData:AddCheckFunc(RedPointType.recruitTreasure_three,RecruitTreasureManager.GetRedPointStatus) --命格 RPData:AddCheckFunc(RedPointType.Gem,GemManager.RedPointCheck,FUNCTION_OPEN_TYPE.Gem) + + RPData:AddCheckFunc(RedPointType.chaozhifanli,DynamicActivityManager.CheckRedPointPremium) end -- 向红点绑定物体