修改skill效果
Merge branch 'master' of https://github.com/4liumingliang/CocosBattle

Conflicts:
	Classes/NBBattleScene/ActionDefine.h
	Classes/NBBattleScene/BoneDefine.h
	Classes/NBBattleScene/EventDefine.h
	Classes/NBBattleScene/ParamDefine.h
	Classes/NBBattleScene/StateDefine.h
	CocosBattleGame/Classes/NBBattleScene/ActionDefine.h
	CocosBattleGame/Classes/NBBattleScene/BoneDefine.h
	CocosBattleGame/Classes/NBBattleScene/EventDefine.h
	CocosBattleGame/Classes/NBBattleScene/NBActionSprite.cpp
	CocosBattleGame/Classes/NBBattleScene/NBActionSprite.h
	CocosBattleGame/Classes/NBBattleScene/NBBattleScene.cpp
	CocosBattleGame/Classes/NBBattleScene/NBBattleScene.h
	CocosBattleGame/Classes/NBBattleScene/ParamDefine.h
	CocosBattleGame/Classes/NBBattleScene/StateDefine.h
	CocosBattleGame/Classes/NBRole/NBEnemy.cpp
	CocosBattleGame/Classes/NBRole/NBEnemy.h