+常用按钮 tab切换按钮 进度条
Merge branch 'master' of https://github.com/4liumingliang/CocosBattle

Conflicts:
	Classes/NBBattleScene/NBBattleScene.cpp
	proj.ios_mac/CocosBattleGame.xcodeproj/project.pbxproj