Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
yuanshuai 2022-07-11 15:43:11 +08:00
commit 92b971ad82
2 changed files with 4 additions and 0 deletions

View File

@ -1239,6 +1239,7 @@ JumpType = {
zhongzhichengcheng = 96001, --众志成城
zhongzhichengcheng_Explor = 96002,--众志成城跳转探索功能
player =108, --主角界面
}
NPCPosType={

View File

@ -815,6 +815,9 @@ local jumpDic = {
UIManager.OpenPanel(UIName.PracticePanel)
UIManager.OpenPanel(UIName.FourQuadrantPopup)
end,
[JumpType.player] = function(data)
UIManager.OpenPanel(UIName.PracticePanel)
end,
[JumpType.YuJianXingShangDian] = function (data) --御剑行商店
local activityId = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.YuJianXing)
if activityId and activityId > 0 and ActivityGiftManager.IsQualifiled(ActivityTypeDef.YuJianXing) then