From d09bc60b5e4805fff865d269062cf12731122e16 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 6 Jan 2021 17:30:48 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=A3=AE=E7=BD=97=E5=B9=BB=E5=A2=83?= =?UTF-8?q?=E3=80=91=E7=BA=A2=E7=82=B9=E5=88=B7=E6=96=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Map/MapTrialManager.lua | 13 +++++++ .../~Lua/Modules/Net/IndicationManager.lua | 8 ++--- .../~Lua/Modules/Net/NetManager.lua | 2 +- .../~Lua/Modules/Player/PlayerManager.lua | 35 ++++++++++--------- 4 files changed, 34 insertions(+), 24 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Map/MapTrialManager.lua b/Assets/ManagedResources/~Lua/Modules/Map/MapTrialManager.lua index dc311ca178..8fc926cc15 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/MapTrialManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/MapTrialManager.lua @@ -299,6 +299,19 @@ function this.SetHeroHp(data,did,func) end function this.TrialRedCheck() + local text =PlayerManager.uid.."TrialReset" + local cTime = GetTimeStamp() + local freshTime = ActTimeCtrlManager.GetSerDataByTypeId(30).endTime + + if not PlayerPrefs.HasKey(text) then + PlayerPrefs.SetInt(PlayerManager.uid.."Trial",0)--森罗每两天五点刷新重置红点 + PlayerPrefs.SetInt(text,freshTime) + end + if PlayerPrefs.GetInt(text) < cTime then + PlayerPrefs.SetInt(PlayerManager.uid.."Trial",0)--森罗每两天五点刷新重置红点 + PlayerPrefs.SetInt(text,freshTime) + end + local var = PlayerPrefs.GetInt(PlayerManager.uid.."Trial") if var == 0 and ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.TRIAL) then return true diff --git a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua index bca78d7905..3e9d67fa89 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua @@ -193,12 +193,8 @@ function this.RefreshUpdateIndication(buffer) LuckyTurnTableManager.SetTimes(msg.hadLuckTime,msg.hadAdvanceLuckyTime) CheckRedPointStatus(RedPointType.Arena_Free) - --三个抽奖勾选重置 - PlayerPrefs.SetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.Ten,0) - PlayerPrefs.SetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.TimeLimitTen,0) - PlayerPrefs.SetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.QianKunBoxTen,0) - - PlayerPrefs.SetInt(PlayerManager.uid.."Trial",0)--森罗五点刷新重置红点 + --抽奖勾选重置 + PlayerManager.ResetLocalData(1)--初始化所有本地的每日一刷--1是五点推送、2是登陆检测 GuildTranscriptManager.SetCanSweep1() end diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 4724091a3c..59f305a03e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -161,7 +161,7 @@ function this.PlayerInfoRequest(func) QuestionnaireManager.SetQuestionState(msg.QuestionState) PlayerManager.SetMaxEnergy() - PlayerManager.ResetLocalData()--初始化所有本地的每日一刷 + PlayerManager.ResetLocalData(2)--初始化所有本地的每日一刷--1是五点推送、2是登陆检测 PlayerManager.InitServerTime() GuideManager.InitData(msg.newPlayerGuidePoint) --临时初始化地图探索的静态数据 diff --git a/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua index d8aae47b23..029282032b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua @@ -46,30 +46,31 @@ function this.InitServerTime() UpdateBeat:Add(update, this) end -function this.ResetLocalData() - local func = function () - --三个抽奖勾选重置 +function this.ResetLocalData(var)--初始化所有本地的每日一刷--1是五点推送、2是登陆检测 + local func1 = function () PlayerPrefs.SetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.Ten,0) PlayerPrefs.SetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.TimeLimitTen,0) PlayerPrefs.SetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.QianKunBoxTen,0) PlayerPrefs.SetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.LingShowTen,0) - PlayerPrefs.SetInt(PlayerManager.uid.."Trial",0)--森罗五点刷新重置红点 + PlayerPrefs.SetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.XiangYaoTen,0) + PlayerPrefs.SetInt(PlayerManager.uid.."GeneralPopup_RecruitConfirm"..RecruitType.BaoGeTen,0) end - local text =PlayerManager.uid.."fiveTime" - local curTime = GetTimeStamp() - - if not PlayerPrefs.HasKey(text) then - func() - PlayerPrefs.SetInt(text,Today_N_OClockTimeStamp(5)) + if var == 1 then + func1() + MapTrialManager.TrialRedCheck() + elseif var == 2 then + local text1 =PlayerManager.uid.."fiveTime" + local curTime = GetTimeStamp() + if not PlayerPrefs.HasKey(text1) then + func1() + PlayerPrefs.SetInt(text1,Today_N_OClockTimeStamp(5)) + end + if PlayerPrefs.GetInt(text1) < curTime then + func1() + PlayerPrefs.SetInt(text1,Today_N_OClockTimeStamp(5)+86400) + end end - -- LogPink("PlayerPrefs.GetInt(text)"..PlayerPrefs.GetInt(text).." curTime"..curTime) - if PlayerPrefs.GetInt(text) < curTime then - func() - PlayerPrefs.SetInt(text,Today_N_OClockTimeStamp(5)+86400) - end - -- LogGreen("PlayerPrefs.GetInt(text)"..PlayerPrefs.GetInt(text).." curTime"..curTime) - -- LogPurple(PlayerPrefs.GetInt(PlayerManager.uid.."Trial")) end function this.OnGoldChange()