成就点击进入是青龙 问题修复
parent
4a80694e19
commit
1382118441
|
@ -31,11 +31,7 @@ function MissionDailyTipPanel:BindEvent()
|
||||||
PopupTipPanel.ShowTip(Language[11347])
|
PopupTipPanel.ShowTip(Language[11347])
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
if showType == 4 then
|
UIManager.OpenPanel(UIName.MissionDailyPanel,showType == 1 and 1 or 4)
|
||||||
UIManager.OpenPanel(UIName.MissionDailyPanel,2)
|
|
||||||
else
|
|
||||||
UIManager.OpenPanel(UIName.MissionDailyPanel,showType)
|
|
||||||
end
|
|
||||||
self:ClosePanel()
|
self:ClosePanel()
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
|
@ -89,6 +89,7 @@ end
|
||||||
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
|
--界面打开或者重新打开后,界面刷新时调用(用于子类重写)
|
||||||
function MissionDailyPanel:OnShow()
|
function MissionDailyPanel:OnShow()
|
||||||
this.TabCtrl:SetTabAdapter(this.TabAdapter)
|
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:SetChangeTabCallBack(this.SwitchView)
|
||||||
this.TabCtrl:Init(this.tabBox, _TabData, index)
|
this.TabCtrl:Init(this.tabBox, _TabData, index)
|
||||||
redPointList = {}
|
redPointList = {}
|
||||||
|
|
|
@ -57,11 +57,12 @@ function this:OnShow(_parent,...)
|
||||||
rewardStateData = TreasureOfHeavenManger.GetState()
|
rewardStateData = TreasureOfHeavenManger.GetState()
|
||||||
rewardData = TreasureOfHeavenManger.GetAllRewardData()
|
rewardData = TreasureOfHeavenManger.GetAllRewardData()
|
||||||
this:showRewardTianGong()
|
this:showRewardTianGong()
|
||||||
|
this.tip.text = "<color=#60A22C>解锁高阶战令,激活进阶</color><color=#95523B>专属奖励</color>"
|
||||||
elseif curType == 2 then
|
elseif curType == 2 then
|
||||||
rewardData = QinglongSerectTreasureManager.GetAllRewardData()
|
rewardData = QinglongSerectTreasureManager.GetAllRewardData()
|
||||||
this:showRewardQinglong()
|
this:showRewardQinglong()
|
||||||
|
this.tip.text = "<color=#60A22C>解锁高阶战令,激活进阶</color><color=#95523B>专属奖励+直升15级</color>"
|
||||||
end
|
end
|
||||||
this.tip.text = "<color=#60A22C>解锁高阶战令,激活进阶</color><color=#95523B>专属奖励+直升15级</color>"
|
|
||||||
end
|
end
|
||||||
|
|
||||||
--充值成功
|
--充值成功
|
||||||
|
@ -86,7 +87,6 @@ function this:showRewardTianGong()
|
||||||
local curScore = TreasureOfHeavenManger.GetScore()--当前分数
|
local curScore = TreasureOfHeavenManger.GetScore()--当前分数
|
||||||
|
|
||||||
for i = 1, #rewardData do
|
for i = 1, #rewardData do
|
||||||
LogRed("state:"..rewardStateData[rewardData[i].Id].state)
|
|
||||||
if curScore >= rewardData[i].Integral then
|
if curScore >= rewardData[i].Integral then
|
||||||
if rewardStateData[i].state == 1 or rewardStateData[i].state == 0 then--已达成但不能领取的
|
if rewardStateData[i].state == 1 or rewardStateData[i].state == 0 then--已达成但不能领取的
|
||||||
-- body
|
-- body
|
||||||
|
@ -108,7 +108,6 @@ function this:showRewardTianGong()
|
||||||
direct[k2] = direct[k2] + v2
|
direct[k2] = direct[k2] + v2
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
-- elseif rewardStateData[i].state == 0 then--未达成且不能领取的
|
|
||||||
local reward = rewardData[i]
|
local reward = rewardData[i]
|
||||||
local k1 = reward.TreasureReward[1][1]
|
local k1 = reward.TreasureReward[1][1]
|
||||||
local v1 = reward.TreasureReward[1][2]
|
local v1 = reward.TreasureReward[1][2]
|
||||||
|
@ -166,13 +165,13 @@ function this:showRewardQinglong()
|
||||||
local direct = {}
|
local direct = {}
|
||||||
local indirect ={}
|
local indirect ={}
|
||||||
|
|
||||||
for i = 1, #rewardData do
|
for i = 1, #rewardData do
|
||||||
-- body
|
-- body
|
||||||
local reward = rewardData[i]
|
local reward = rewardData[i]
|
||||||
for j=1,#reward.Reward do
|
for j=1,#reward.Reward do
|
||||||
local id = reward.Reward[j].item[1]
|
local id = reward.Reward[j].item[1]
|
||||||
local num = reward.Reward[j].item[2]
|
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 reward.state == 1 or reward.state == 0 then
|
||||||
if not direct[id] then
|
if not direct[id] then
|
||||||
direct[id] = 0
|
direct[id] = 0
|
||||||
|
@ -185,7 +184,7 @@ function this:showRewardQinglong()
|
||||||
indirect[id] = indirect[id] + num
|
indirect[id] = indirect[id] + num
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
for i = 1,#this.taskList do
|
for i = 1,#this.taskList do
|
||||||
this.taskList[i].gameObject:SetActive(false)
|
this.taskList[i].gameObject:SetActive(false)
|
||||||
|
|
Loading…
Reference in New Issue