Merge pull request #27 from shujunqiao/myWork

modify attack.
add boundingBox
Merge branch 'master' of https://github.com/yuye-liu/cocostudioSampleGmae

Conflicts:
	cocos2d-x-2.2.0/projects/Ironman/Classes/GameScenePlayLayer.cpp
add boundingbox
modify Laser.
Merge branch 'master' of https://github.com/yuye-liu/cocostudioSampleGmae into myWork