no message
Merge branch 'master' of https://github.com/yuye-liu/cocostudioSampleGmae into myWork
fix setting bugs.
Merge pull request #33 from RaoZiJian/myMaster

fix setting bugs.
fix monster bug
Merge branch 'master' of https://github.com/yuye-liu/cocostudioSampleGmae
add attack audio.
Merge branch 'master' of https://github.com/yuye-liu/cocostudioSampleGmae into myWork
Merge pull request #34 from shujunqiao/myWork

My work
remove the update to gameScene
Merge branch 'master' of https://github.com/yuye-liu/cocostudioSampleGmae
modify Android.mk
Merge pull request #36 from shujunqiao/myWork

modify Android.mk
modify rect of IronMan.
Merge pull request #37 from shujunqiao/myWork

modify rect of IronMan.
fix back main menu issue.
Merge branch 'master' of https://github.com/yuye-liu/cocostudioSampleGmae into myMaster
Merge pull request #38 from RaoZiJian/myMaster

My master
modify attack time.
Merge branch 'master' of https://github.com/yuye-liu/cocostudioSampleGmae into myWork