Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

dev_chengFeng
JieLing 2020-08-25 09:44:23 +08:00
commit 6a2ce4b305
4 changed files with 23 additions and 27 deletions

View File

@ -9024,7 +9024,7 @@ ParticleSystem:
--- !u!199 &3612650515471756776
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -15958,7 +15958,7 @@ ParticleSystem:
--- !u!199 &2077135144819501974
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -21521,7 +21521,7 @@ ParticleSystem:
--- !u!199 &5382233283546536858
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -29548,7 +29548,7 @@ ParticleSystem:
--- !u!199 &7853653569377049714
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -35524,7 +35524,7 @@ ParticleSystem:
--- !u!199 &4678487443364567018
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -41036,7 +41036,7 @@ ParticleSystem:
--- !u!199 &3301434479282110283
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -47077,7 +47077,7 @@ ParticleSystem:
--- !u!199 &8426323061574149814
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -52296,7 +52296,7 @@ ParticleSystem:
--- !u!199 &3988090302360095373
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -57881,7 +57881,7 @@ ParticleSystem:
--- !u!199 &5461926455895321923
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -63005,7 +63005,7 @@ ParticleSystem:
--- !u!199 &6960492284779320589
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -69400,7 +69400,7 @@ ParticleSystem:
--- !u!199 &4261467272199160834
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -73974,7 +73974,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -300, y: -507}
m_AnchoredPosition: {x: -296.8, y: -508.8}
m_SizeDelta: {x: 1765, y: 924}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5804918802543886501
@ -78914,7 +78914,7 @@ ParticleSystem:
--- !u!199 &6383407699291000078
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -85056,7 +85056,7 @@ ParticleSystem:
--- !u!199 &1706209193022837301
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -91703,7 +91703,7 @@ ParticleSystem:
--- !u!199 &8234207848460451360
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
@ -96615,7 +96615,7 @@ ParticleSystem:
--- !u!199 &3615746855071839570
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_ObjectHideFlags: 2
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}

View File

@ -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

View File

@ -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 = {}

View File

@ -57,11 +57,12 @@ function this:OnShow(_parent,...)
rewardStateData = TreasureOfHeavenManger.GetState()
rewardData = TreasureOfHeavenManger.GetAllRewardData()
this:showRewardTianGong()
this.tip.text = "<color=#60A22C>解锁高阶战令,激活进阶</color><color=#95523B>专属奖励</color>"
elseif curType == 2 then
rewardData = QinglongSerectTreasureManager.GetAllRewardData()
this:showRewardQinglong()
this.tip.text = "<color=#60A22C>解锁高阶战令,激活进阶</color><color=#95523B>专属奖励+直升15级</color>"
end
this.tip.text = "<color=#60A22C>解锁高阶战令,激活进阶</color><color=#95523B>专属奖励+直升15级</color>"
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)