Merge remote-tracking branch 'origin/sound'

js/BGMsound.js

@@ -23,18 +23,19 @@ Audio.loadSound = function(scene)
     scene.load.audio('Phase3', 'assets/sound/Phase3.ogg');
     
     // 승패 BGM
-    scene.load.audio('defeat', 'assets/sound/victory.ogg');
-    scene.load.audio('victory', 'assets/sound/defeat.ogg');
+    scene.load.audio('victory', 'assets/sound/victory.ogg');
+    scene.load.audio('defeat', 'assets/sound/defeat.ogg');
 }
 
 Audio.playSound = function(scene, title) // 한 번만 재생할 때 사용
 {
-    bgm = scene.sound.add(title); // 추후 수정 예정
-    bgm.play();
+    let sound = scene.sound.add(title);
+    sound.play();
 }
 
 Audio.loopSound = function(scene, title) // 반복재생할 때 사용
 {
+    if (bgm != null) this.killSound(scene, title);
     bgm = scene.sound.add(title);
     bgm.setLoop(true);
     bgm.play();

js/Client.js

@@ -354,6 +354,7 @@ socket.on('defeat', function(msg) // object player
     }
     if(msg.id == RoomData.myself.id)
     {
+        Audio.loopSound(ScenesData.gameScene, 'defeat');
         RoomData.myself = RoomData.players[msg.index];
         setTimeout(() => {
             gameEndMenu(false);
@@ -371,10 +372,10 @@ socket.on('gameEnd', function(msg) // number winnerId
     if(WordSpace.CurrentPhase == 3)
         Audio.killSound(ScenesData.gameScene, 'Phase3');
 
-    Audio.playSound(ScenesData.gameScene, 'victory');
     console.log(winner.nickname + ' Win!!!!!!');
     if(msg == RoomData.myself.id)
     {
+        Audio.loopSound(ScenesData.gameScene, 'victory');
         RoomData.myself.rank = 1;
         setTimeout(() => {
             gameEndMenu(true);

js/Input.js

@@ -387,7 +387,7 @@ Input.inputField =
 
 Input.pushInput = function(inputKey)
 {
-    if ((ScenesData.currentScene != 'gameScene' || RoomData.myself.isAlive) && this.justPressed != inputKey)
+    if (!WordSpace.isGameOver && RoomData.myself.isAlive && this.justPressed != inputKey)
     {
         this.justPressed = inputKey;
         let output;

js/ScenesData.js

@@ -600,13 +600,6 @@ var gameScene = new Phaser.Class(
         BackGround.drawCharacter(this);
         Audio.playSound(this, 'startGame');
 
-        if(WordSpace.CurrentPhase == 1)
-            Audio.loopSound(this, 'Phase1');
-        else if(WordSpace.CurrentPhase == 2)
-            Audio.loopSound(this, 'Phase2');
-        else
-            Audio.loopSound(this, 'Phase3');
-
         WordSpace.attackPaperGroup = this.physics.add.group();
         WordSpace.wordPhysicsGroup = this.physics.add.group();
             

js/WordSpace.js

@@ -224,8 +224,6 @@ function gameOver()
         Audio.killSound(ScenesData.gameScene, 'Phase2');
     if(WordSpace.CurrentPhase == 3)
         Audio.killSound(ScenesData.gameScene, 'Phase3');
-
-    Audio.playSound(ScenesData.gameScene, 'defeat');
     
     socket.emit('defeated');
     console.log('defeat');
@@ -495,11 +493,11 @@ WordSpace.changePhase = function(newPhase)
     WordSpace.CurrentPhase = newPhase;
 
     if(WordSpace.CurrentPhase == 1)
-        Audio.killSound('gameScene', 'Phase1');
+        Audio.loopSound(ScenesData.currentScene, 'Phase1');
     else if(WordSpace.CurrentPhase == 2)
-        Audio.killSound('gameScene', 'Phase2');
+        Audio.loopSound(ScenesData.currentScene, 'Phase2');
     else
-        Audio.killSound('gameScene', 'Phase3');
+        Audio.loopSound(ScenesData.currentScene, 'Phase3');
 
     //WordSpace.pauseCycle(true);
     // 여기서 종이 드르륵 열면됨