Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
1700c3bf80
|
@ -589,7 +589,10 @@ function this.ExpterActivityIsShowRedPoint(activeIndex)
|
||||||
if expertRewardTabs.value >= value and expertRewardTabs.mission[i].progress >= 0 then
|
if expertRewardTabs.value >= value and expertRewardTabs.mission[i].progress >= 0 then
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
|
elseif activeType == ActivityTypeDef.FastExplore then
|
||||||
|
if expertRewardTabs.value >= value then
|
||||||
|
return true
|
||||||
|
end
|
||||||
else
|
else
|
||||||
if expertRewardTabs.value >= value then
|
if expertRewardTabs.value >= value then
|
||||||
--Log("限时红点 --------------- true")
|
--Log("限时红点 --------------- true")
|
||||||
|
|
|
@ -234,6 +234,7 @@ function Expert:ActivityRewardSingleShow(index,rewardData)
|
||||||
NetManager.GetActivityRewardRequest(rewardData.missionId, expertRewardTabs.activityId, function(drop)
|
NetManager.GetActivityRewardRequest(rewardData.missionId, expertRewardTabs.activityId, function(drop)
|
||||||
UIManager.OpenPanel(UIName.RewardItemPopup,drop,1,function()
|
UIManager.OpenPanel(UIName.RewardItemPopup,drop,1,function()
|
||||||
this:OnShowData(activeIndext)
|
this:OnShowData(activeIndext)
|
||||||
|
CheckRedPointStatus(RedPointType.Expert_FastExplore)
|
||||||
end)
|
end)
|
||||||
end)
|
end)
|
||||||
end)
|
end)
|
||||||
|
|
|
@ -215,6 +215,7 @@ function this.HandExplore()
|
||||||
this.RefreshItemNum()
|
this.RefreshItemNum()
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
CheckRedPointStatus(RedPointType.Expert_FastExplore)
|
||||||
else
|
else
|
||||||
PopupTipPanel.ShowTip(Language[10060])
|
PopupTipPanel.ShowTip(Language[10060])
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue