시즌 15호 머지

GameServer.js

@@ -80,7 +80,7 @@ class GameRoom
     {
         this.roomId = GameServer.getRoomNumber();
         this.roomIndex = -1;
-        this.startCount = 3;
+        this.startCount = 5;
         this.maxPlayer = 100;
         this.nextRank = 100;
 

js/FirebaseClient.js

@@ -230,7 +230,6 @@ FirebaseClient.prototype.updateUserData = function(key, valueChanged, replace =
 			break;
 	}
 	PlayerData.userData = beforeData;
-	console.log(beforeData);
 	return this.database.ref('/user-data/' + this.auth.currentUser.uid).update(beforeData);
 }
 

js/ScenesData.js

@@ -164,7 +164,8 @@ var menuScene = new Phaser.Class(
             function()
             {
                 ScenesData.menuScene.gameStartBtn.setEnable(false);
-                ScenesData.menuScene.roomEnterDialog.setVisible(true).popUp(200);
+                ScenesData.menuScene.roomEnterDialog.setVisible(true);
+                ScenesData.menuScene.roomEnterDialog.popUp(200);
             })
         
         this.shopBtn = UIObject.createButton(this, UIObject.createLabel(this, game.config.width - 100, 900, 5, 'pyeongminThrow', 0.5, 'center'), 1, 0, 2, 
@@ -473,8 +474,7 @@ var gameScene = new Phaser.Class(
 
 ScenesData.changeScene = function(sceneKey)
 {
-    ScenesData.currentScene.scene.switch(sceneKey);
-
+    ScenesData.currentScene.scene.start(sceneKey);
     Input.input = [];
     Input.converted = '';
     Input.convInput = '';

server.js

@@ -13,7 +13,7 @@ app.get('/', function(req, res) {
 });
 
 // http 기본 포트(80)에 서버 열기
-server.listen(8080, function() {
+server.listen(80, function() {
     console.log('[SERVER] Listening on port ' + server.address().port);
     GameServer.serverNumber = Math.floor(Math.random() * 1000 + 1);
     console.log('[SERVER] server number is ${GameServer.serverNumber}');