Merge pull request #1248 from dingpinglv/develop

dingpinglv · dingpinglv · commit 91029f19fa14 · 2014-12-29T18:36:39.000+08:00
Update the reference of cocos2d-html5
diff --git a/frameworks/cocos2d-html5 b/frameworks/cocos2d-html5
@@ -1 +1 @@
-Subproject commit 69e72833fab65f11cab93a085e69ccc9e37459b1
+Subproject commit a0cee92a3f345aefb5f973074a9222eabc941ea4
diff --git a/samples/js-moonwarriors/src/GameOver.js b/samples/js-moonwarriors/src/GameOver.js
@@ -98,7 +98,7 @@ var GameOver = cc.Layer.extend({
 
 
         if(MW.SOUND){
-            cc.audioEngine.playMusic(res.mainMainMusic_mp3);
+            cc.audioEngine.playMusic(res.mainMainMusic_mp3, true);
         }
 
         return true;
diff --git a/samples/js-moonwarriors/src/config/GameConfig.js b/samples/js-moonwarriors/src/config/GameConfig.js
@@ -56,7 +56,7 @@ MW.LIFE = 4;
 MW.SCORE = 0;
 
 //sound
-MW.SOUND = false;
+MW.SOUND = true;
 
 //enemy move type
 MW.ENEMY_MOVE_TYPE = {

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ var GameOver = cc.Layer.extend({`
`98`	`98`
`99`	`99`
`100`	`100`	`if(MW.SOUND){`
`101`		`- cc.audioEngine.playMusic(res.mainMainMusic_mp3);`
	`101`	`+ cc.audioEngine.playMusic(res.mainMainMusic_mp3, true);`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`return true;`