ffffa
no message
+ 添加碰撞检测
Merge branch 'master' of https://github.com/4liumingliang/CocosBattle

Conflicts:
	CocosBattleGame/Classes/NBBattleScene/NBActionSprite.cpp
	CocosBattleGame/Classes/NBBattleScene/NBActionSprite.h
	CocosBattleGame/Classes/NBBattleScene/NBBattleScene.cpp
	CocosBattleGame/Resources/nb_leader/hero.json
	CocosBattleGame/Resources/nb_leader/hero.png