Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
9fd25a6c98
|
@ -454,22 +454,11 @@ function this.ExecuteLoading()
|
||||||
end
|
end
|
||||||
StoryManager.EventTrigger(100001, exBattle)
|
StoryManager.EventTrigger(100001, exBattle)
|
||||||
else
|
else
|
||||||
if PlayerManager.curMapId ~= 0 then
|
PatFaceManager.isLogin = true
|
||||||
NetManager.MapInfoRequest(PlayerManager.curMapId, FormationTypeDef.FORMATION_DREAMLAND, function(msg)
|
UIManager.OpenPanelAsync(UIName.MainPanel, function ()
|
||||||
MapManager.isReloadEnter = false
|
UIManager.OpenPanel(UIName.FightPointPassMainPanel)
|
||||||
MapTrialManager.firstEnter = true
|
LoadingPanel.End()
|
||||||
MapManager.SetViewSize(20)--设置视野范围(明雷形式)
|
end)
|
||||||
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
|
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
UIManager.OpenPanelAsync(UIName.MainPanel, function()
|
UIManager.OpenPanelAsync(UIName.MainPanel, function()
|
||||||
|
|
Loading…
Reference in New Issue