ggg
ff
Merge branch 'master' of https://github.com/4liumingliang/CocosBattle
ff
ff
ff
Merge branch 'master' of https://github.com/4liumingliang/CocosBattle

Conflicts:
	Classes/NBBattleScene/NBBattleScene.cpp
Merge branch 'master' of https://github.com/4liumingliang/CocosBattle

Conflicts:
	proj.ios_mac/CocosBattleGame.xcodeproj/project.pbxproj
fff