Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
041f21d530
|
@ -1203,6 +1203,7 @@ JumpType = {
|
||||||
ContinuePackage = 20290,--连购礼包
|
ContinuePackage = 20290,--连购礼包
|
||||||
|
|
||||||
tehuishangcheng = 18888,--特惠商城
|
tehuishangcheng = 18888,--特惠商城
|
||||||
|
TreasureStoreSeason2 = 20300,--新百宝商会
|
||||||
}
|
}
|
||||||
|
|
||||||
NPCPosType={
|
NPCPosType={
|
||||||
|
|
|
@ -875,6 +875,14 @@ local jumpDic = {
|
||||||
[JumpType.Explor] = function(data,args)
|
[JumpType.Explor] = function(data,args)
|
||||||
UIManager.OpenPanel(UIName.ExploreMainPanel)
|
UIManager.OpenPanel(UIName.ExploreMainPanel)
|
||||||
end,
|
end,
|
||||||
|
[JumpType.TreasureStoreSeason2] = function(data,args)
|
||||||
|
local activityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.TreasureStoreSeason2)
|
||||||
|
if activityId and activityId > 0 and ActivityGiftManager.IsQualifiled(ActivityTypeDef.TreasureStoreSeason2) then
|
||||||
|
UIManager.OpenPanel(UIName.TreasureStoreSeason2)
|
||||||
|
else
|
||||||
|
PopupTipPanel.ShowTip("活动尚未开启")
|
||||||
|
end
|
||||||
|
end,
|
||||||
}
|
}
|
||||||
|
|
||||||
function this.JumpActivity(data,skipfactor)
|
function this.JumpActivity(data,skipfactor)
|
||||||
|
|
Loading…
Reference in New Issue