Merge branch 'master' of http://47.100.37.243:10080/wutt/game

# Conflicts:
#	minigame/WebContent/js/main.js

minigame/WebContent/js/main.js

@@ -13,7 +13,7 @@ createjs.Sound.registerSound("sound/start/ymc.mp3", "ymc");
 createjs.Sound.registerSound("sound/start/swy.mp3", "swy");
 createjs.Sound.registerSound("sound/start/qcdf.mp3", "qcdf");
 createjs.Sound.registerSound("sound/background_music.mp3", "bgm");
-createjs.Sound.play("bgm", {loop: -1});
+
 window.user_info = {
     uid: 0,
     logo:'http://img5q.duitang.com/uploads/item/201502/25/20150225060808_wuANL.jpeg',//用户头像
@@ -32,6 +32,7 @@ for (i=0; i < params.length ; i++){
 
 
 function init() {
+    createjs.Sound.play("bgm", {loop: -1});
     var comp = AdobeAn.getComposition("5529E26743974F469545223C44E61D22");
     var lib = comp.getLibrary();
     var loader = new createjs.LoadQueue(false);