diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua index 32d546374b..d9879c2bd1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua @@ -400,6 +400,9 @@ function this.BtnClick(id) end elseif id == FUNCTION_OPEN_TYPE.ENDLESS then if ActTimeCtrlManager.SingleFuncState(id) then + local serData = ActTimeCtrlManager.GetSerDataByTypeId() + PlayerPrefs.SetInt("WuJin1"..PlayerManager.uid,serData.endTime) + CheckRedPointStatus(RedPointType.EndlessPanel) MapManager.curCarbonType = CarBonTypeId.ENDLESS MapManager.SetViewSize(3)--设置视野范围(明雷形式) MapManager.isTimeOut = false diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua index 7c2ac7066d..e64825900b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua @@ -145,19 +145,16 @@ end function this.EnterMap() CarbonManager.difficulty = CARBON_TYPE.ENDLESS CarbonManager.carbonType = CARBON_TYPE.ENDLESS - --UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.CARBON, MapManager.curMapId) local serData = ActTimeCtrlManager.GetSerDataByTypeId(FUNCTION_OPEN_TYPE.ENDLESS) if not PlayerPrefs.HasKey("WuJin"..PlayerManager.uid) then PlayerPrefs.SetInt("WuJin"..PlayerManager.uid ,0) end local note = PlayerPrefs.GetInt("WuJin"..PlayerManager.uid) - LogGreen("note:"..note.." serData.endTime:"..serData.endTime) MapManager.curMapId = EndLessMapManager.openMapId if serData.endTime ~= note then PlayerPrefs.SetInt("WuJin"..PlayerManager.uid,serData.endTime) UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.CARBON, MapManager.curMapId) else - LogGreen("EndLessMapManager.openMapId:"..EndLessMapManager.openMapId.." MapManager.curMapId:"..MapManager.curMapId) MapManager.curCarbonType = CarBonTypeId.ENDLESS NetManager.MapInfoRequest(MapManager.curCarbonType, function() MapManager.isReloadEnter = false @@ -227,6 +224,7 @@ function this.ShowCountTime() this.timer1 = Timer.New(function () freshData = freshData - 1 if freshData < 0 then + ChecRedPointEndLess(RedPointType.EndlessPanel) this:ClosePanel() else updateTime() diff --git a/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua b/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua index 2899599398..7590904acb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua @@ -877,5 +877,23 @@ function this.CheckoutRedPointMission() end return false end +function this.ChecRedPointEndLess() + if not ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.ENDLESS) then + return false + end + if not PlayerPrefs.HasKey("WuJin1"..PlayerManager.uid) then + PlayerPrefs.SetInt("WuJin1"..PlayerManager.uid ,0) + end + local note = PlayerPrefs.GetInt("WuJin1"..PlayerManager.uid) + local serData = ActTimeCtrlManager.GetSerDataByTypeId() + if serData.endTime ~= note then + return true + end + local isShow = this.CheckoutRedPointTreasure() + if not isShow then + isShow = this.CheckoutRedPointMission() + end + return isShow +end ------------------------------------------------------------------------------------------------------------- return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index eb129789f9..2393ea4127 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -110,8 +110,6 @@ function this.InitRedPointAllRelate() -- RPData:SetParent(RedPointType.TrialReward, RedPointType.Trial) RPData:SetParent(RedPointType.EndLess, RedPointType.Vientiane) RPData:SetParent(RedPointType.EndlessPanel, RedPointType.EndLess) - RPData:SetParent(RedPointType.wujinMission, RedPointType.EndlessPanel) - RPData:SetParent(RedPointType.wujinTreasure, RedPointType.EndlessPanel) RPData:SetParent(RedPointType.LuckyCat_GetReward, RedPointType.LuckyCat) -- 充值 @@ -530,6 +528,7 @@ function this.RegisterRedCheckFunc() RPData:AddCheckFunc(RedPointType.wujinTreasure,EndLessMapManager.CheckoutRedPointTreasure) RPData:AddCheckFunc(RedPointType.wujinMission,EndLessMapManager.CheckoutRedPointMission) + RPData:SetParent(RedPointType.EndlessPanel, EndLessMapManager.ChecRedPointEndLess) --化虚坛英雄合成 RPData:AddCheckFunc(RedPointType.Huaxutan_CompoundHero,HeroManager.GetAllHeroCompoundRedPoint) --主角修行