diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua index 309052f510..4fe18f3163 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.lua @@ -339,6 +339,7 @@ function this.BtnClick(id) else JumpManager.GoJump(64001) end + NetManager.TreasureOfHeavenScoreRequest() else if ExpeditionManager.ExpeditionState == 2 then PopupTipPanel.ShowTip(Language[12195]) diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua index 8f198cf75f..3f96b237fc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMainPanel.lua @@ -184,7 +184,15 @@ function ExpeditionMainPanel:OnShow() endTime = ExpeditionManager.startTime + tonumber(ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,JumpType.Expedition).SeasonEnd) - GetTimeStamp() + ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,JumpType.Expedition).SeasonInterval * 60 self:RemainTimeDown(self.timeTextGo,self.timeText,endTime) + self:IsTreasureOpen() end + +--大闹天宫入口是否开启 +function ExpeditionMainPanel:IsTreasureOpen() + self.Btn4:SetActive(TreasureOfHeavenManger.GetLimitTime() ~= -1) + Util.GetGameObject(self.parent, "upLeftGo/Image"):SetActive(TreasureOfHeavenManger.GetLimitTime() ~= -1) +end + --实例化层数信息 function ExpeditionMainPanel:OnShowNodeData(isMoveGrid) isPlayerMove = false diff --git a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenPanel.lua b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenPanel.lua index 625ef228e3..68b314e9d3 100644 --- a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/TreasureOfHeavenPanel.lua @@ -77,13 +77,11 @@ function TreasureOfHeavenPanel:refresh() treasureState = TreasureOfHeavenManger.GetTreasureState()--秘宝礼包状态 0:可购买 1:已购买 rewardStateData = TreasureOfHeavenManger.GetState()--任务状态 if #rewardStateData <= 0 then - NetManager.TreasureOfHeavenScoreRequest(function(msg) - curScore = TreasureOfHeavenManger.GetScore()--当前分数 - rewardStateData = TreasureOfHeavenManger.GetState()--任务状态 + curScore = TreasureOfHeavenManger.GetScore()--当前分数 + rewardStateData = TreasureOfHeavenManger.GetState()--任务状态 - TreasureOfHeavenPanel:topBar() - TreasureOfHeavenPanel:showTaskList() - end) + TreasureOfHeavenPanel:topBar() + TreasureOfHeavenPanel:showTaskList() else curScore = TreasureOfHeavenManger.GetScore()--当前分数 TreasureOfHeavenPanel:topBar()