Merge pull request #38 from RaoZiJian/myMaster

My master
modify attack time.
Merge branch 'master' of https://github.com/yuye-liu/cocostudioSampleGmae into myWork
Merge pull request #39 from shujunqiao/myWork

My work
set audio status.
Merge pull request #40 from shujunqiao/myWork

set audio status.
modify laser rect.
Merge branch 'master' of https://github.com/yuye-liu/cocostudioSampleGmae into myWork
1,redesign monster's action
2,fix the bug appear many manster
Merge pull request #41 from shujunqiao/myWork

My work
Merge branch 'master' of https://github.com/yuye-liu/cocostudioSampleGmae
Modify audio effect.
modify map res of h5.
Merge pull request #42 from shujunqiao/myWork

Modify audio effect.
fix game over issues.