diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua index c3330786c3..1504ef8076 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua @@ -58,7 +58,7 @@ function EndLessCarbonPanel:BindEvent() -- !!!! PS: 这里必须是主动打开副本选择界面,从地图中返回时,这个界面的上一级是地图界面, -- 如果只是关闭自己,则会打开地图界面,不会打开副本选择界面,导致报错 -- PlayerManager.carbonType = 1 - UIManager.OpenPanel(UIName.MainPanel) + UIManager.OpenPanel(UIName.CarbonsPanel) --检测到上一个面板打开之后,关闭自己 CallBackOnPanelOpen(UIName.CarbonsPanel, function() diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua index 619e8086d6..fd3deeabc9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua @@ -163,25 +163,41 @@ function CarbonsPanel:TipShow(_go,_value) time:SetActive(true) local expeditionData = systemConfig[JumpType.Expedition] self.timeList[_value.id] = {} - self.timeList[_value.id].Text = timeText - self.timeList[_value.id].time = ExpeditionManager.startTime + tonumber(expeditionData.SeasonEnd) - GetTimeStamp() + expeditionData.SeasonInterval * 60 + if ExpeditionManager.ExpeditionState == 2 or ExpeditionManager.ExpeditionState == 3 then--大闹天宫重置阶段 + self.timeList[_value.id].TextObj = timeText + self.timeList[_value.id].Text = "重置时间:" + self.timeList[_value.id].time = CalculateSecondsNowTo_N_OClock(24) + else--正常阶段 + self.timeList[_value.id].TextObj = timeText + self.timeList[_value.id].Text = "剩余时间:" + self.timeList[_value.id].time = ExpeditionManager.startTime + tonumber(expeditionData.SeasonEnd) - GetTimeStamp() + expeditionData.SeasonInterval * 60 + end elseif _value.id == FUNCTION_OPEN_TYPE.ENDLESS then--无尽副本 time:SetActive(true) self.timeList[_value.id] = {} - self.timeList[_value.id].Text = timeText + self.timeList[_value.id].TextObj = timeText + self.timeList[_value.id].Text = "剩余时间:" self.timeList[_value.id].time = ActTimeCtrlManager.GetSerDataByTypeId(FUNCTION_OPEN_TYPE.ENDLESS).endTime - GetTimeStamp() elseif _value.id == FUNCTION_OPEN_TYPE.TRIAL then--森罗幻境 time:SetActive(true) self.timeList[_value.id] = {} - self.timeList[_value.id].Text = timeText + self.timeList[_value.id].TextObj = timeText + self.timeList[_value.id].Text = "剩余时间:" self.timeList[_value.id].time = ActTimeCtrlManager.GetSerDataByTypeId(FUNCTION_OPEN_TYPE.TRIAL).endTime - GetTimeStamp() end if self.timeList[_value.id] then - timeText.text = string.format("重置时间:%s",TimeToFelaxible(self.timeList[_value.id].time)) + timeText.text = string.format("%s%s",self.timeList[_value.id].Text,TimeToFelaxible(self.timeList[_value.id].time)) end else openLevel:SetActive(true) openLevelText.text = string.format("%s级开启",systemConfig[_value.id].OpenRules[2]) + if (_value.id == FUNCTION_OPEN_TYPE.ENDLESS or _value.id == FUNCTION_OPEN_TYPE.TRIAL) and ActTimeCtrlManager.IsQualifiled(_value.id) then--无尽副本、森罗幻境 + openLevel:SetActive(false) + self.timeList[_value.id] = {} + self.timeList[_value.id].TextObj = timeText + self.timeList[_value.id].Text = "重置时间:" + self.timeList[_value.id].time = CalculateSecondsNowTo_N_OClock(24) + end end end @@ -192,7 +208,7 @@ function CarbonsPanel:SetTime() end self.timer = Timer.New(function () for key, item in pairs(self.timeList) do - item.Text.text = string.format("重置时间:%s",TimeToFelaxible(item.time)) + item.TextObj.text = string.format("%s%s",item.Text,TimeToFelaxible(item.time)) item.time = item.time - 1 if item.time <= 0 then self:OnShow() diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 2a46c0eee4..7f442b1cdd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -146,6 +146,7 @@ function this:InitComponent() this.btnWaiDi = Util.GetGameObject(this.gameObject, "scene/layer4/btnWaiDi") this.btnColorfulWorld = Util.GetGameObject(this.gameObject, "scene/layer6/btnColorfulWorld") this.btnWaiDi:SetActive(false) + this.btnColorfulWorld:SetActive(false) this.btnCompoundHero = Util.GetGameObject(this.gameObject, "scene/layer3/btnCompoundHero") this.btnTianShuMiJuan = Util.GetGameObject(this.gameObject, "scene/layer6/btnTianShuMiJuan") this.btnXingYunTanBao = Util.GetGameObject(this.gameObject, "bg/btnXingYunTanBao") @@ -153,7 +154,7 @@ function this:InitComponent() [FUNCTION_OPEN_TYPE.SHOP] = this:AddFuncItem(this.btnShangdian, 50), [FUNCTION_OPEN_TYPE.HERO_RESOLVE] = this:AddFuncItem(this.btnFenjie, -1100), [FUNCTION_OPEN_TYPE.ARENA] = this:AddFuncItem(this.btnJingjichang, -200), - [FUNCTION_OPEN_TYPE.ENDLESS] = this:AddFuncItem(this.btnColorfulWorld, -1500), + -- [FUNCTION_OPEN_TYPE.ENDLESS] = this:AddFuncItem(this.btnColorfulWorld, -1500), [FUNCTION_OPEN_TYPE.COMPOUND] = this:AddFuncItem(this.btnEquipCompound, -200), [FUNCTION_OPEN_TYPE.RECURITY] = this:AddFuncItem(this.btnRecruit, -56), [FUNCTION_OPEN_TYPE.ELEMENT_RECURITY] = this:AddFuncItem(this.btnElementDrawCard, 0), @@ -167,7 +168,7 @@ function this:InitComponent() [FUNCTION_OPEN_TYPE.SHOP] = this:InsertNewText(this.btnShangdian), [FUNCTION_OPEN_TYPE.HERO_RESOLVE] = this:InsertNewText(this.btnFenjie), [FUNCTION_OPEN_TYPE.ARENA] = this:InsertNewText(this.btnJingjichang), - [FUNCTION_OPEN_TYPE.ENDLESS] = this:InsertNewText(this.btnColorfulWorld), + -- [FUNCTION_OPEN_TYPE.ENDLESS] = this:InsertNewText(this.btnColorfulWorld), [FUNCTION_OPEN_TYPE.COMPOUND] = this:InsertNewText(this.btnEquipCompound), [FUNCTION_OPEN_TYPE.RECURITY] = this:InsertNewText(this.btnRecruit), [FUNCTION_OPEN_TYPE.ELEMENT_RECURITY] = this:InsertNewText(this.btnElementDrawCard), @@ -186,7 +187,7 @@ function this:InitComponent() this.rpSecretBox = Util.GetGameObject(this.btnSecretBox, "redPoint") this.rpYiYao = Util.GetGameObject(this.btnYiYao, "redPoint") this.rpAlien = Util.GetGameObject(this.btnWaiDi, "redPoint") - this.rpColorfulWorld = Util.GetGameObject(this.btnColorfulWorld, "redPoint") + -- this.rpColorfulWorld = Util.GetGameObject(this.btnColorfulWorld, "redPoint") this.rpCompoundHero = Util.GetGameObject(this.btnCompoundHero, "redPoint")--神将合成、置换 this.rpPokemon = Util.GetGameObject(this.btnPokemon, "redPoint")--灵兽 this.rpbtnTianShuMiJuan = Util.GetGameObject(this.btnTianShuMiJuan, "redPoint")--灵兽 @@ -447,16 +448,16 @@ function this:BindEvent() end this.ScenceBtnClick(FUNCTION_OPEN_TYPE.ARENA) end) - Util.AddClick(this.btnColorfulWorld, function() - if ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.ENDLESS) then - -- PlayerManager.carbonType = 2 - UIManager.OpenPanel(UIName.CarbonsPanel) - else - local config = ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,FUNCTION_OPEN_TYPE.ENDLESS) - PopupTipPanel.ShowTip(string.format(Language[10279],config.OpenRules[2])) - end - this.ScenceBtnClick(FUNCTION_OPEN_TYPE.ENDLESS) - end) + -- Util.AddClick(this.btnColorfulWorld, function() + -- if ActTimeCtrlManager.IsQualifiled(FUNCTION_OPEN_TYPE.ENDLESS) then + -- -- PlayerManager.carbonType = 2 + -- UIManager.OpenPanel(UIName.CarbonsPanel) + -- else + -- local config = ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,FUNCTION_OPEN_TYPE.ENDLESS) + -- PopupTipPanel.ShowTip(string.format(Language[10279],config.OpenRules[2])) + -- end + -- this.ScenceBtnClick(FUNCTION_OPEN_TYPE.ENDLESS) + -- end) Util.AddClick(this.btnFenjie, function() JumpManager.GoJump(24001) this.ScenceBtnClick(FUNCTION_OPEN_TYPE.HERO_RESOLVE) @@ -1025,25 +1026,25 @@ function this.CheckScreenRightRedPoint() if not this.btnPokemon then return end - if not this.btnColorfulWorld then - return - end + -- if not this.btnColorfulWorld then + -- return + -- end if not this.btnPokemon.gameObject then return end - if not this.btnColorfulWorld.gameObject then - return - end + -- if not this.btnColorfulWorld.gameObject then + -- return + -- end if not this.btnPokemon.gameObject.transform then return end - if not this.btnColorfulWorld.gameObject.transform then - return - end + -- if not this.btnColorfulWorld.gameObject.transform then + -- return + -- end pos1=RectTransformUtility.WorldToScreenPoint(UIManager.camera,this.btnPokemon.transform.position) - pos2=RectTransformUtility.WorldToScreenPoint(UIManager.camera,this.btnColorfulWorld.transform.position) - if (pos1.x>Screen.width and RedpotManager.GetRedPointStatus(RedPointType.PokemonMainCity)==RedPointStatus.Show) or (pos2.x>Screen.width and RedpotManager.GetRedPointStatus(RedPointType.Vientiane)==RedPointStatus.Show) then + -- pos2=RectTransformUtility.WorldToScreenPoint(UIManager.camera,this.btnColorfulWorld.transform.position) + if (pos1.x>Screen.width and RedpotManager.GetRedPointStatus(RedPointType.PokemonMainCity)==RedPointStatus.Show) then--or (pos2.x>Screen.width and RedpotManager.GetRedPointStatus(RedPointType.Vientiane)==RedPointStatus.Show) then this.jiantouObj:SetActive(true) else this.jiantouObj:SetActive(false) diff --git a/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua index 5a3979ba07..d8018bb970 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/MapPanel.lua @@ -590,7 +590,7 @@ function this.BackHome() MissionManager.carBonMission = {} SwitchPanel.ClosePanel(UIName.MainPanel, function() UIManager.CloseAllStack(true) - UIManager.OpenPanel(UIName.MainPanel) + UIManager.OpenPanel(UIName.CarbonsPanel) end) poolManager:ClearPool() end