diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorManager.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorManager.lua index 0ecfcbac85..acebce4394 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorManager.lua @@ -66,7 +66,7 @@ function this.InitMirrorData() end function this.CarbonRedCheck() - if not ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.TRIAL) then + if not ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.PEOPLE_MIRROR) then return false end this.GetTimeTip() diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua index 8f9e7701f1..04594ac401 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua @@ -85,7 +85,8 @@ function FormationEditPopup:BindEvent() if func~=nil then --保存完毕后 将英雄did合集传递过去 此时我拥有这些英雄 不用担心英雄已被删除 func(dids) end - PlayerPrefs.SetInt(PlayerManager.uid.."TrialIsOpen",1)--设置森罗红点关 + PlayerPrefs.SetInt(PlayerManager.uid.."Trial",1)--设置森罗红点关 + CheckRedPointStatus(RedPointType.Trial) self:ClosePanel() end) else diff --git a/Assets/ManagedResources/~Lua/Modules/Map/MapTrialManager.lua b/Assets/ManagedResources/~Lua/Modules/Map/MapTrialManager.lua index 321611df69..a58c830d9b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/MapTrialManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/MapTrialManager.lua @@ -237,6 +237,7 @@ end --设置试练已杀小怪数量 function this.SetKillCount(v) CheckRedPointStatus(RedPointType.TrialReward) + CheckRedPointStatus(RedPointType.Trial) this.killCount=v end --获取已杀小怪数量 @@ -300,19 +301,11 @@ function this.SetHeroHp(data,did,func) end function this.TrialRedCheck() - local var - - if PlayerPrefs.HasKey(PlayerManager.uid.."TrialIsOpen") then - var = PlayerPrefs.GetInt(PlayerManager.uid.."TrialIsOpen") - else - PlayerPrefs.SetInt(PlayerManager.uid.."TrialIsOpen",0) - end - - if var == 1 then - return false - elseif var == 0 and ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.TRIAL) then + local var = PlayerPrefs.GetInt(PlayerManager.uid.."Trial") + if var == 0 and ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.TRIAL) then return true end + return MapTrialManager.TrialRewardRedPointCheck() end return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua index 2864ab2fed..b28587d29b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua @@ -56,15 +56,17 @@ function this.ResetLocalData() local text =PlayerManager.uid.."fiveTime" local curTime = GetTimeStamp() - if PlayerPrefs.HasKey(text) then - if PlayerPrefs.GetInt(text) > curTime then - func() - PlayerPrefs.SetInt(text,Today_N_OClockTimeStamp(5)+86400) - end - else + if not PlayerPrefs.HasKey(text) then + func() + PlayerPrefs.SetInt(text,Today_N_OClockTimeStamp(5)) + 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() diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index b9740984cf..ff90df806a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -107,7 +107,7 @@ function this.InitRedPointAllRelate() RPData:SetParent(RedPointType.People_Mirror, RedPointType.Vientiane) RPData:SetParent(RedPointType.Trial, RedPointType.Vientiane) - RPData:SetParent(RedPointType.TrialReward, RedPointType.Trial) + -- RPData:SetParent(RedPointType.TrialReward, RedPointType.Trial) RPData:SetParent(RedPointType.EndLess, RedPointType.Vientiane) RPData:SetParent(RedPointType.LuckyCat_GetReward, RedPointType.LuckyCat) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua index b7502cdc11..06db0ecad3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua @@ -109,6 +109,7 @@ function this.SetScrollPre(root,data) getBtn:SetActive(false) this.RefreshPanel() CheckRedPointStatus(RedPointType.TrialReward) + CheckRedPointStatus(RedPointType.Trial) end) end) end)