ccccc
no message
Merge branch 'master' of https://github.com/4liumingliang/CocosBattle

Conflicts:
	CocosBattleGame/Classes/NBBattleScene/NBActionSprite.cpp
	CocosBattleGame/Classes/NBBattleScene/NBBattleScene.cpp
	CocosBattleGame/Resources/nb_leader/hero.json
+ 动态换装测试
Merge branch 'master' of https://github.com/4liumingliang/CocosBattle

Conflicts:
	CocosBattleGame/Resources/nb_leader/hero.json
	CocosBattleGame/proj.ios_mac/CocosBattleGame.xcodeproj/project.pbxproj