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

dev_chengFeng
liujiaqi 2020-08-04 18:24:09 +08:00
commit 9fd25a6c98
1 changed files with 5 additions and 16 deletions

View File

@ -454,22 +454,11 @@ function this.ExecuteLoading()
end
StoryManager.EventTrigger(100001, exBattle)
else
if PlayerManager.curMapId ~= 0 then
NetManager.MapInfoRequest(PlayerManager.curMapId, FormationTypeDef.FORMATION_DREAMLAND, function(msg)
MapManager.isReloadEnter = false
MapTrialManager.firstEnter = true
MapManager.SetViewSize(20)--设置视野范围(明雷形式)
MapManager.curAreaId =FormationTypeDef.FORMATION_DREAMLAND
MapManager.trialHeroInfo=msg.infos
UIManager.OpenPanelAsync(UIName.MapPanel, LoadingPanel.End)
end)
else
PatFaceManager.isLogin = true
UIManager.OpenPanelAsync(UIName.MainPanel, function ()
UIManager.OpenPanel(UIName.FightPointPassMainPanel)
LoadingPanel.End()
end)
end
PatFaceManager.isLogin = true
UIManager.OpenPanelAsync(UIName.MainPanel, function ()
UIManager.OpenPanel(UIName.FightPointPassMainPanel)
LoadingPanel.End()
end)
end
else
UIManager.OpenPanelAsync(UIName.MainPanel, function()