Merge branch 'physics' into release

js/BGMsound.js

@@ -2,34 +2,39 @@ var Audio = Audio || {}
 
 Audio.loadSound = function(scene)
 {
-    scene.load.audio('BGM', 'assets/sound/login.ogg');
+    scene.load.audio('login', 'assets/sound/login.ogg');
+    scene.load.audio('startGame', 'assets/sound/startGame.ogg');
 }
 
-Audio.playSound = function(scene)
+Audio.playSound = function(scene, title) // 한 번만 재생할 때 사용
 {
-    var bgm = scene.sound.add('BGM');
-    bgm.setLoop(true);
+    var bgm = scene.sound.add(title);
     bgm.play();
-    console.log('PlayMusic');
+}
 
+Audio.loopSound = function(scene, title) // 반복재생할 때 사용
+{
+    var bgm = scene.sound.add(title);
+    bgm.setLoop(true);
+    bgm.play();
 }
 
-Audio.pauseSound = function(scene)
+Audio.pauseSound = function(scene, title)
 {
-    var bgm = scene.sound.add('BGM');
+    var bgm = scene.sound.add(title);
     bgm.pause();
 }
 
-Audio.resumeSound = function(scene)
+Audio.resumeSound = function(scene, title)
 {
-    var bgm = scene.sound.add('BGM');
+    var bgm = scene.sound.add(title);
     bgm = scene.sound.resume();
 }
 
-Audio.stopSound = function(scene)
+Audio.stopSound = function(scene, title)
 {
-    var bgm = scene.sound.add('BGM');
+    var bgm = scene.sound.add(title);
+    bgm.setLoop(false);
     bgm.stop();
-    console.log('StopMusic');
 }
 

js/ScenesData.js

@@ -21,7 +21,7 @@ var menuScene = new Phaser.Class(
 
     create: function()
     {
-        Audio.playSound(this);
+        Audio.loopSound(this, 'login');
         Input.inputField.generate(this, Input.menuSceneEnterReaction);
         BackGround.drawMenu(this);
     }
@@ -86,13 +86,14 @@ var gameScene = new Phaser.Class(
         WordSpace.loadImage(this);
         Input.inputField.loadImage(this);
         CSVParsing.loadText(this);
+        Audio.loadSound(this);
     },
     
     create: function()
     {
         CSVParsing.CSVParse(this);
         BackGround.drawBrain(this);
- 
+        Audio.playSound(this, 'startGame');
         WordSpace.wordPhysicsGroup = this.physics.add.group();
 
         Input.inputField.generate(this, Input.gameSceneEnterReaction);