diff --git a/Assets/ManagedResources/~Lua/Modules/Message/MissionDailyTipPanel.lua b/Assets/ManagedResources/~Lua/Modules/Message/MissionDailyTipPanel.lua index f619590422..30d90d0c65 100644 --- a/Assets/ManagedResources/~Lua/Modules/Message/MissionDailyTipPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Message/MissionDailyTipPanel.lua @@ -31,11 +31,7 @@ function MissionDailyTipPanel:BindEvent() PopupTipPanel.ShowTip(Language[11347]) return end - if showType == 4 then - UIManager.OpenPanel(UIName.MissionDailyPanel,2) - else - UIManager.OpenPanel(UIName.MissionDailyPanel,showType) - end + UIManager.OpenPanel(UIName.MissionDailyPanel,showType == 1 and 1 or 4) self:ClosePanel() end) end diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel.lua b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel.lua index 7551e1c640..9ba17e153b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel.lua @@ -89,6 +89,7 @@ end --界面打开或者重新打开后,界面刷新时调用(用于子类重写) function MissionDailyPanel:OnShow() this.TabCtrl:SetTabAdapter(this.TabAdapter) + if (not ActivityGiftManager.GetActivityOpenStatus(ActivityTypeDef.TreasureOfSomeBody)) and index ~=1 then index = 2 end this.TabCtrl:SetChangeTabCallBack(this.SwitchView) this.TabCtrl:Init(this.tabBox, _TabData, index) redPointList = {} diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua index a543f0699d..62bebf260a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua @@ -57,11 +57,12 @@ function this:OnShow(_parent,...) rewardStateData = TreasureOfHeavenManger.GetState() rewardData = TreasureOfHeavenManger.GetAllRewardData() this:showRewardTianGong() + this.tip.text = "解锁高阶战令,激活进阶专属奖励" elseif curType == 2 then rewardData = QinglongSerectTreasureManager.GetAllRewardData() this:showRewardQinglong() + this.tip.text = "解锁高阶战令,激活进阶专属奖励+直升15级" end - this.tip.text = "解锁高阶战令,激活进阶专属奖励+直升15级" end --充值成功 @@ -86,7 +87,6 @@ function this:showRewardTianGong() local curScore = TreasureOfHeavenManger.GetScore()--当前分数 for i = 1, #rewardData do - LogRed("state:"..rewardStateData[rewardData[i].Id].state) if curScore >= rewardData[i].Integral then if rewardStateData[i].state == 1 or rewardStateData[i].state == 0 then--已达成但不能领取的 -- body @@ -108,7 +108,6 @@ function this:showRewardTianGong() direct[k2] = direct[k2] + v2 end else - -- elseif rewardStateData[i].state == 0 then--未达成且不能领取的 local reward = rewardData[i] local k1 = reward.TreasureReward[1][1] local v1 = reward.TreasureReward[1][2] @@ -166,13 +165,13 @@ function this:showRewardQinglong() local direct = {} local indirect ={} - for i = 1, #rewardData do + for i = 1, #rewardData do -- body local reward = rewardData[i] for j=1,#reward.Reward do local id = reward.Reward[j].item[1] local num = reward.Reward[j].item[2] - if reward.Reward[j].type == 2 then + if reward.Reward[j].type == 2 then if reward.state == 1 or reward.state == 0 then if not direct[id] then direct[id] = 0 @@ -185,7 +184,7 @@ function this:showRewardQinglong() indirect[id] = indirect[id] + num end end - end + end end for i = 1,#this.taskList do this.taskList[i].gameObject:SetActive(false)