diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua index b01df9d2bb..880868d643 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua @@ -199,6 +199,12 @@ function CarbonsPanel:TipShow(_go,_value) local free,buy = XuanYuanMirrorManager.RetrunFreeAndBuyTimes() freetimesText.text = string.format("免费挑战次数:%s",free) buytimesText.text = string.format("剩余购买次数:%s",buy) + elseif _value.id == FUNCTION_OPEN_TYPE.EXPEDITION then + freetimes:SetActive(true) + buytimes:SetActive(false) + local free = ExpeditionManager.GetCurNodeInfo().lay-1+(ExpeditionManager.expeditionLeve-1)*10 + local num = free <= 30 and free or 30 + freetimesText.text = string.format("进度:%s/%s",num,30) end --刷新时间 if _value.id == FUNCTION_OPEN_TYPE.EXPEDITION then--大闹天宫 @@ -208,18 +214,18 @@ function CarbonsPanel:TipShow(_go,_value) 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 - 300 - elseif _value.id == FUNCTION_OPEN_TYPE.ENDLESS then--无尽副本 + elseif _value.id == FUNCTION_OPEN_TYPE.ENDLESS or _value.id == FUNCTION_OPEN_TYPE.TRIAL then--无尽副本\森罗幻境 time:SetActive(true) self.timeList[_value.id] = {} 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].TextObj = timeText - self.timeList[_value.id].Text = "剩余时间:" - self.timeList[_value.id].time = ActTimeCtrlManager.GetSerDataByTypeId(FUNCTION_OPEN_TYPE.TRIAL).endTime - GetTimeStamp() + self.timeList[_value.id].time = ActTimeCtrlManager.GetSerDataByTypeId(_value.id).endTime - GetTimeStamp() + -- elseif _value.id == FUNCTION_OPEN_TYPE.TRIAL then--森罗幻境 + -- time:SetActive(true) + -- self.timeList[_value.id] = {} + -- 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%s",self.timeList[_value.id].Text,TimeToFelaxible(self.timeList[_value.id].time))