增加layerid
登陆界面json
新增界面
调整UI跳转
Merge branch 'master' of https://github.com/4liumingliang/CocosBattle

Conflicts:
	Classes/AppDelegate.cpp
	Classes/Constant/LayerIDDef.h
	Classes/NBBattleScene/NBBattleScene.cpp
	proj.ios_mac/CocosBattleGame.xcodeproj/project.pbxproj
冲突解决
ui调整