Skip to content

S
sejong25
Commit 6f6149a7 authored by 18손재민's avatar 18손재민
Browse files
Options

Merge branch 'wordspace' into release

parents 52234806 e1bc4116
Hide whitespace changes
Inline Side-by-side
Showing with 730 additions and 413 deletions
GameServer.js
View file @ 6f6149a7
...@@ -15,7 +15,7 @@ GameServer.findRoom = function(roomId) ...@@ -15,7 +15,7 @@ GameServer.findRoom = function(roomId)
{ {
if (GameServer.playingRoom[i].roomId === roomId) return GameServer.playingRoom[i]; if (GameServer.playingRoom[i].roomId === roomId) return GameServer.playingRoom[i];
} }
console.log('[ERR] no room with num ' + roomId); console.log(new Date().toLocaleTimeString('ko-KR') + ' [ERR] no room with num ' + roomId);
} }
GameServer.findPlayerSocket = function(playerId) GameServer.findPlayerSocket = function(playerId)
{ {
...@@ -26,7 +26,7 @@ GameServer.findPlayerSocket = function(playerId) ...@@ -26,7 +26,7 @@ GameServer.findPlayerSocket = function(playerId)
if (idx != -1) return this.currentPlayer[idx]; if (idx != -1) return this.currentPlayer[idx];
else else
{ {
console.log('[ERR] wrong playerId('+ playerId +') to find'); console.log(new Date().toLocaleTimeString('ko-KR') + ' [ERR] wrong playerId('+ playerId +') to find');
return null; return null;
} }
} }
...@@ -82,7 +82,7 @@ class GameRoom ...@@ -82,7 +82,7 @@ class GameRoom
{ {
this.roomId = GameServer.getRoomNumber(); this.roomId = GameServer.getRoomNumber();
this.roomIndex = -1; this.roomIndex = -1;
this.startCount = 2; this.startCount = 5;
this.maxPlayer = 100; this.maxPlayer = 100;
this.nextRank = 100; this.nextRank = 100;
...@@ -115,7 +115,7 @@ class GameRoom ...@@ -115,7 +115,7 @@ class GameRoom
{ {
GameServer.playingRoom[this.roomIndex] = this; GameServer.playingRoom[this.roomIndex] = this;
} }
console.log('[LOG] new room #'+this.roomId+' made, roomCount: ' + GameServer.playingRoom.length); console.log(new Date().toLocaleTimeString('ko-KR') + ' [LOG] new room #'+this.roomId+' made, roomCount: ' + GameServer.playingRoom.length);
} }
checkHopae(newHopae) checkHopae(newHopae)
...@@ -136,14 +136,14 @@ class GameRoom ...@@ -136,14 +136,14 @@ class GameRoom
this.announceToTarget(playerInst.id, 'syncRoomScene', this.currentPlayer); this.announceToTarget(playerInst.id, 'syncRoomScene', this.currentPlayer);
this.currentPlayer.push(playerInst); this.currentPlayer.push(playerInst);
console.log('[' + playerInst.id + '] entered to room #' + this.roomId); console.log(new Date().toLocaleTimeString('ko-KR') + ' [' + playerInst.id + '] entered to room #' + this.roomId);
this.aliveCount++; this.aliveCount++;
if (this.currentPlayer.length >= this.startCount) if (this.currentPlayer.length >= this.startCount)
{ {
if (this.currentPhase === GameServer.Phase.READY) if (this.currentPhase === GameServer.Phase.READY)
{ {
this.endTime = Date.now() + 10000; // 테스트용 10초 this.endTime = Date.now() + 30000; // 방 대기 시간
this.announceToRoom('setRoomCount', this.announceToRoom('setRoomCount',
{ {
isEnable: true, endTime: this.endTime, playerCount: this.currentPlayer.length, isEnable: true, endTime: this.endTime, playerCount: this.currentPlayer.length,
...@@ -190,7 +190,6 @@ class GameRoom ...@@ -190,7 +190,6 @@ class GameRoom
isEnter: false, player: this.currentPlayer[i] isEnter: false, player: this.currentPlayer[i]
}); });
this.currentPhase = GameServer.Phase.READY; this.currentPhase = GameServer.Phase.READY;
this.refreshRoom();
} }
else this.announceToRoom('setRoomCount', else this.announceToRoom('setRoomCount',
{ {
...@@ -202,7 +201,7 @@ class GameRoom ...@@ -202,7 +201,7 @@ class GameRoom
return; return;
} }
} }
console.log('[ERR] No player who have ' + playerId); console.log(new Date().toLocaleTimeString('ko-KR') + ' [ERR] No player who have ' + playerId);
return; return;
} }
...@@ -223,7 +222,7 @@ class GameRoom ...@@ -223,7 +222,7 @@ class GameRoom
isEnable: false, endTime: 0, playerCount: this.currentPlayer.length, isEnable: false, endTime: 0, playerCount: this.currentPlayer.length,
isEnter: false, player: {id: -1} isEnter: false, player: {id: -1}
}); });
console.error('[ROOM#' + this.roomId + '] room Refreshed'); console.error(new Date().toLocaleTimeString('ko-KR') + ' [ROOM#' + this.roomId + '] room Refreshed');
} }
else else
{ {
...@@ -238,7 +237,7 @@ class GameRoom ...@@ -238,7 +237,7 @@ class GameRoom
this.rateArrangePoint = 300; this.rateArrangePoint = 300;
this.maxTypingPlayer = null; this.maxTypingPlayer = null;
this.minTypingPlayer = null; this.minTypingPlayer = null;
console.log('[ROOM#' + this.roomId + '] room Refreshed with End of Game'); console.log(new Date().toLocaleTimeString('ko-KR') + ' [ROOM#' + this.roomId + '] room Refreshed with End of Game');
} }
} }
...@@ -261,7 +260,7 @@ class GameRoom ...@@ -261,7 +260,7 @@ class GameRoom
}; };
this.announceToRoom('syncRoomData', toSync); this.announceToRoom('syncRoomData', toSync);
console.log('[ROOM#'+this.roomId+'] Game Start with ' + this.currentPlayer.length + ' players'); console.log(new Date().toLocaleTimeString('ko-KR') + ' [ROOM#'+this.roomId+'] Game Start with ' + this.currentPlayer.length + ' players');
console.table(this.currentPlayer); console.table(this.currentPlayer);
this.announceToRoom('startGame'); this.announceToRoom('startGame');
this.startTime = Date.now(); this.startTime = Date.now();
...@@ -309,7 +308,7 @@ class GameRoom ...@@ -309,7 +308,7 @@ class GameRoom
{ {
if (this.aliveCount > 0) if (this.aliveCount > 0)
{ {
console.log('[ERR] can not destroy room#' + this.roomId + ', cause player left'); console.log(new Date().toLocaleTimeString('ko-KR') + ' [ERR] can not destroy room#' + this.roomId + ', cause player left');
} }
else else
{ {
...@@ -358,10 +357,12 @@ class Player ...@@ -358,10 +357,12 @@ class Player
this.index = gameRoom.currentPlayer.length; this.index = gameRoom.currentPlayer.length;
this.nickname = playerData.nickname; this.nickname = playerData.nickname;
this.playerImage = null; this.playerImage = null;
this.mat = null;
this.position = null; this.position = null;
this.killCount = 0; this.killCount = 0;
this.earnedStrongHopae = 0; this.earnedStrongHopae = 0;
this.attackSucceed = 0; this.attackSucceed = 0;
this.skin = playerData.skin;
this.isAlive = false; this.isAlive = false;
this.isInThisRoom = true; this.isInThisRoom = true;
...@@ -406,7 +407,7 @@ class Player ...@@ -406,7 +407,7 @@ class Player
} }
room.announceToRoom('defeat', this); room.announceToRoom('defeat', this);
console.log('[' + this.id + '] defeated, rank: ' + this.rank + ', ' + room.aliveCount + ' player left'); console.log(new Date().toLocaleTimeString('ko-KR') + ' [' + this.id + '] defeated, rank: ' + this.rank + ', ' + room.aliveCount + ' player left');
if (room.aliveCount === 1) if (room.aliveCount === 1)
{ {
...@@ -418,7 +419,7 @@ class Player ...@@ -418,7 +419,7 @@ class Player
room.announceToRoom('gameEnd', winner.id); room.announceToRoom('gameEnd', winner.id);
room.announceToTarget(winner.id, 'alert', 'gameWin'); room.announceToTarget(winner.id, 'alert', 'gameWin');
room.currentPhase = GameServer.Phase.GAMEEND; room.currentPhase = GameServer.Phase.GAMEEND;
console.log('['+winner.id+']' + ' winner! ' + winner.nickname); console.log(new Date().toLocaleTimeString('ko-KR') + ' ['+winner.id+']' + ' winner! ' + winner.nickname);
} }
} }
} }
......
assets/sound/login.ogg
View file @ 6f6149a7
No preview for this file type
index.html
View file @ 6f6149a7
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<style media='screen' type='text/css'> <style media='screen' type='text/css'>
@font-face { @font-face {
font-family: sejongFont; font-family: sejongFont;
src: url('assets/font/EBS주시경B.ttf'); src: url('assets/font/EBS훈민정음새론SB.ttf');
font-weight:400; font-weight:400;
font-weight:normal; font-weight:normal;
} }
...@@ -31,6 +31,8 @@ ...@@ -31,6 +31,8 @@
<style> <style>
img { position: relative; width: 100%; height: 100%; z-index: 0;} img { position: relative; width: 100%; height: 100%; z-index: 0;}
#dvLogin { position: absolute; left: 65%; top: 35%; width: 30%; height: 30%; padding: 10px; background: black; z-index: 1;} #dvLogin { position: absolute; left: 65%; top: 35%; width: 30%; height: 30%; padding: 10px; background: black; z-index: 1;}
#dvNewEmail { position:absolute; left: 35%; top: 35%; width: 30%; height: 30%; padding: 10px; background: black; z-index: 1; display: none; }
#notSupport { position: absolute; left: 25%; top: 25%; background: white; z-index: 2; width: 50%; height: 50%; display: none;}
</style> </style>
</head> </head>
<body> <body>
...@@ -39,10 +41,19 @@ ...@@ -39,10 +41,19 @@
<div id="dvLogin"> <div id="dvLogin">
<input id="userEmail" type="email" placeholder="email" style="width: 100%; height: 10%;"></br> <input id="userEmail" type="email" placeholder="email" style="width: 100%; height: 10%;"></br>
<input id="userPassword" type="password" placeholder="password" maxlength="17" style="width: 100%; height: 10%;"></br> <input id="userPassword" type="password" placeholder="password" maxlength="17" style="width: 100%; height: 10%;"></br>
<button id="joinBtn" style="width: 100%; height: 10%;">이메일로 가입하기</button></br> <button id="joinOpenBtn" style="width: 100%; height: 10%;">이메일로 가입하기</button></br>
<button id="emailBtn" style="width: 100%; height: 10%;">이메일로 로그인</button></br> <button id="emailBtn" style="width: 100%; height: 10%;">이메일로 로그인</button></br>
<button id="googleBtn" style="width: 10%; height: 10%;"><img src="/assets/title/googleBtn.png" style="object-fit: contain"></button></br> <button id="googleBtn" style="width: 10%; height: 10%;"><img src="/assets/title/googleBtn.png" style="object-fit: contain"></button></br>
</div> </div>
<div id="dvNewEmail">
<input id="newEmail" type="email" placeholder="email" style="width: 100%; height: 10%;"></br>
<input id="newPassword" type="password" placeholder="password" maxlength="17" style="width: 100%; height: 10%;"></br>
<input id="newPasswordCheck" type="password" placeholder="password again" maxlength="17" style="width: 100%; height: 10%;"></br>
<input id="newName" placeholder="user name" maxlength="8" style="width: 100%; height: 10%;"></br>
<button id="joinBtn" style="width: 50%; height: 10%;">가입하기</button>
<button id="joinCancelBtn" style="width: 50%; height: 10%;">취소</button>
</div>
<p id="notSupport">해당하는 환경에서는 지원되지 않습니다. PC에서 이용 부탁드립니다.</p>
</div> </div>
<script src="https://www.gstatic.com/firebasejs/6.3.3/firebase-app.js"></script> <script src="https://www.gstatic.com/firebasejs/6.3.3/firebase-app.js"></script>
......
js/BGMsound.js
View file @ 6f6149a7
...@@ -3,10 +3,28 @@ var Audio = Audio || {} ...@@ -3,10 +3,28 @@ var Audio = Audio || {}
var bgm; var bgm;
Audio.loadSound = function(scene) Audio.loadSound = function(scene)
{ {
scene.load.audio('login', 'assets/sound/newLogin.ogg'); // 게임 시작 전 BGM
scene.load.audio('login', 'assets/sound/login.ogg');
scene.load.audio('inRoom', 'assets/sound/waitingRoom.ogg');
// 징 소리
scene.load.audio('startGame', 'assets/sound/startGame.ogg'); scene.load.audio('startGame', 'assets/sound/startGame.ogg');
// 게임 진행 중 효과음들
scene.load.audio('attack', 'assets/sound/attackShort.ogg'); scene.load.audio('attack', 'assets/sound/attackShort.ogg');
scene.load.audio('inRoom', 'assets/sound/roomBGM.ogg'); scene.load.audio('Bagazi', 'assets/sound/Bagazi_ddak.ogg');
scene.load.audio('getItem', 'assets/sound/getItem.ogg');
scene.load.audio('killLog', 'assets/sound/killLog.ogg');
scene.load.audio('killWord', 'assets/sound/killWord.ogg');
// 페이즈별 인게임 BGM
scene.load.audio('Phase1', 'assets/sound/Phase1.ogg');
scene.load.audio('Phase2', 'assets/sound/Phase2.ogg');
scene.load.audio('Phase3', 'assets/sound/Phase3.ogg');
// 승패 BGM
scene.load.audio('victory', 'assets/sound/victory.ogg');
scene.load.audio('defeat', 'assets/sound/defeat.ogg');
} }
Audio.playSound = function(scene, title) // 한 번만 재생할 때 사용 Audio.playSound = function(scene, title) // 한 번만 재생할 때 사용
...@@ -36,6 +54,5 @@ Audio.killSound = function(scene, title) ...@@ -36,6 +54,5 @@ Audio.killSound = function(scene, title)
{ {
bgm.setLoop(false); bgm.setLoop(false);
bgm.stop(); bgm.stop();
console.log('killSound');
} }
js/Background.js
View file @ 6f6149a7
...@@ -13,15 +13,22 @@ BackGround.otherCharacters = []; ...@@ -13,15 +13,22 @@ BackGround.otherCharacters = [];
BackGround.drawCharacter = function(scene) BackGround.drawCharacter = function(scene)
{ {
RoomData.myself.playerImage = scene.add.sprite(game.config.width / 2, game.config.height * 41 / 48, 'pyeongminWrite').setScale(0.45).setDepth(5); RoomData.myself.playerImage = scene.add.sprite(game.config.width / 2, game.config.height * 41 / 48, Enums.characterSkin[PlayerData.userData.skin] + 'Write')
RoomData.myself.position = new Phaser.Math.Vector2(RoomData.myself.playerImage.x, RoomData.myself.playerImage.y); .setScale(0.45).setDepth(5);
RoomData.myself.position = new Phaser.Math.Vector2(RoomData.myself.playerImage.x - 20, RoomData.myself.playerImage.y - 20);
RoomData.myself.mat = scene.add.sprite(RoomData.myself.position.x, RoomData.myself.position.y, 'mat')
.setScale(0.45).setDepth(4);
BackGround.characterPos = BackGround.characterPos.sort(function(){return 0.5-Math.random()}); BackGround.characterPos = BackGround.characterPos.sort(function(){return 0.5-Math.random()});
RoomData.players.forEach(function(element){ RoomData.players.forEach(function(element){
if(element.id != RoomData.myself.id) if(element.id != RoomData.myself.id)
{ {
element.position = BackGround.characterPos.pop(); element.position = BackGround.characterPos.pop();
element.playerImage = scene.add.sprite(element.position.x, element.position.y, 'pyeongminWrite').setScale(0.315).setDepth(5); element.playerImage = scene.add.sprite(element.position.x, element.position.y, Enums.characterSkin[element.skin] + 'Write')
.setScale(0.315).setDepth(5);
element.playerImage.flipX = element.position.x < game.config.width / 2 ? true : false; element.playerImage.flipX = element.position.x < game.config.width / 2 ? true : false;
element.mat = scene.add.sprite(element.position.x - 14 * (element.position.x < game.config.width / 2 ? -1 : 1), element.position.y - 14, 'mat')
.setScale(0.315).setDepth(4);
element.mat.flipX = element.position.x < game.config.width / 2 ? true : false;
element.nicknameText = scene.add.text(element.position.x, element.position.y - 90, element.nickname) element.nicknameText = scene.add.text(element.position.x, element.position.y - 90, element.nickname)
.setOrigin(0.5,0.5).setColor('#000000').setPadding(0.5,0.5,0.5,0.5).setDepth(5.1); .setOrigin(0.5,0.5).setColor('#000000').setPadding(0.5,0.5,0.5,0.5).setDepth(5.1);
6 } 6 }
......
js/Client.js
View file @ 6f6149a7
...@@ -85,7 +85,7 @@ socket.on('setRoomCount', function(msg) ...@@ -85,7 +85,7 @@ socket.on('setRoomCount', function(msg)
} }
ScenesData.roomScene.players.push(playerSet); ScenesData.roomScene.players.push(playerSet);
} }
else // remove character else if (msg.id != -1) // remove character
{ {
let idx = ScenesData.roomScene.players.findIndex(function(element) let idx = ScenesData.roomScene.players.findIndex(function(element)
{ {
...@@ -152,7 +152,9 @@ socket.on('someoneAttacked', function(msg) // {Id attackerId, Id victimId} ...@@ -152,7 +152,9 @@ socket.on('someoneAttacked', function(msg) // {Id attackerId, Id victimId}
WordSpace.makeAttackPaper(ScenesData.gameScene, attackerPos, victimPos, msg.multiple); WordSpace.makeAttackPaper(ScenesData.gameScene, attackerPos, victimPos, msg.multiple);
}); });
socket.on('attacked', function(msg) // object attackData socket.on('attacked', function(msg) // object attackData
{ {
Audio.playSound(ScenesData.gameScene, 'Bagazi');
let attackedEvent = new Cycle(function() let attackedEvent = new Cycle(function()
{ {
if(!WordSpace.isInvincible) if(!WordSpace.isInvincible)
...@@ -203,20 +205,34 @@ socket.on('defeat', function(msg) // object player ...@@ -203,20 +205,34 @@ socket.on('defeat', function(msg) // object player
let playerImage = RoomData.findPlayer(msg.id).playerImage; let playerImage = RoomData.findPlayer(msg.id).playerImage;
let position = RoomData.findPlayer(msg.id).position; let position = RoomData.findPlayer(msg.id).position;
let nicknameText = RoomData.findPlayer(msg.id).nicknameText; let nicknameText = RoomData.findPlayer(msg.id).nicknameText;
let earnedStrongHopae = RoomData.findPlayer(msg.id).earnedStrongHopae;
if(WordSpace.CurrentPhase == 1)
Audio.killSound(ScenesData.gameScene, 'Phase1');
if(WordSpace.CurrentPhase == 2)
Audio.killSound(ScenesData.gameScene, 'Phase2');
if(WordSpace.CurrentPhase == 3)
Audio.killSound(ScenesData.gameScene, 'Phase3');
Audio.playSound(ScenesData.gameScene, 'defeat');
RoomData.players[msg.index] = msg; RoomData.players[msg.index] = msg;
RoomData.players[msg.index].playerImage = playerImage; RoomData.players[msg.index].playerImage = playerImage;
RoomData.players[msg.index].position = position; RoomData.players[msg.index].position = position;
RoomData.players[msg.index].nicknameText = nicknameText; RoomData.players[msg.index].nicknameText = nicknameText;
RoomData.players[msg.index].earnedStrongHopae = earnedStrongHopae;
let victim = RoomData.findPlayer(msg.id); let victim = RoomData.findPlayer(msg.id);
RoomData.aliveCount--; RoomData.aliveCount--;
victim.playerImage.play(WordSpace.pyeongminAnims[Enums.characterAnim.gameOver]); victim.playerImage.play(WordSpace.characterAnims[victim.skin][Enums.characterAnim.gameOver]);
if (msg.lastAttack != null) if (msg.lastAttack != null)
{ {
let lastAttacker = RoomData.findPlayer(msg.lastAttack.attackerId); let lastAttacker = RoomData.findPlayer(msg.lastAttack.attackerId);
let attackWord = msg.lastAttack.word; let attackWord = msg.lastAttack.word;
Audio.playSound(ScenesData.gameScene, 'killLog');
console.log(victim.nickname + ' defeated by ' + lastAttacker.nickname + ', with ' + msg.lastAttack.word); console.log(victim.nickname + ' defeated by ' + lastAttacker.nickname + ', with ' + msg.lastAttack.word);
if(WordSpace.lastAttackGroup.length != 0) if(WordSpace.lastAttackGroup.length != 0)
{ {
...@@ -256,7 +272,7 @@ socket.on('defeat', function(msg) // object player ...@@ -256,7 +272,7 @@ socket.on('defeat', function(msg) // object player
duration: 500, duration: 500,
repeat: 0, // -1: infinity repeat: 0, // -1: infinity
yoyo: false }); yoyo: false });
}, 1000); }, 5000);
}, },
}) })
...@@ -297,6 +313,7 @@ socket.on('defeat', function(msg) // object player ...@@ -297,6 +313,7 @@ socket.on('defeat', function(msg) // object player
{ {
var keys = Object.keys(Enums.item); var keys = Object.keys(Enums.item);
WordSpace.generateWord.Item(ScenesData.gameScene, Enums.item[keys[keys.length * Math.random() << 0]]); WordSpace.generateWord.Item(ScenesData.gameScene, Enums.item[keys[keys.length * Math.random() << 0]]);
Audio.playSound(ScenesData.gameScene, 'getItem');
RoomData.myself.killCount++; RoomData.myself.killCount++;
} }
} }
...@@ -341,20 +358,27 @@ socket.on('defeat', function(msg) // object player ...@@ -341,20 +358,27 @@ socket.on('defeat', function(msg) // object player
}, 1000); }, 1000);
} }
}) })
} }
if(msg.id == RoomData.myself.id) if(msg.id == RoomData.myself.id)
{ {
RoomData.myself = RoomData.players[msg.index]; RoomData.myself = RoomData.players[msg.index];
setTimeout(() => { setTimeout(() => {
gameEndMenu(true); gameEndMenu(false);
}, 2000); }, 2000);
} }
}); });
socket.on('gameEnd', function(msg) // number winnerId socket.on('gameEnd', function(msg) // number winnerId
{ {
const winner = RoomData.findPlayer(msg); const winner = RoomData.findPlayer(msg);
if(WordSpace.CurrentPhase == 1)
Audio.killSound(ScenesData.gameScene, 'Phase1');
if(WordSpace.CurrentPhase == 2)
Audio.killSound(ScenesData.gameScene, 'Phase2');
if(WordSpace.CurrentPhase == 3)
Audio.killSound(ScenesData.gameScene, 'Phase3');
Audio.playSound(ScenesData.gameScene, 'victory');
console.log(winner.nickname + ' Win!!!!!!'); console.log(winner.nickname + ' Win!!!!!!');
if(msg == RoomData.myself.id) if(msg == RoomData.myself.id)
{ {
...@@ -369,6 +393,7 @@ socket.on('attackSucceed', function(msg) ...@@ -369,6 +393,7 @@ socket.on('attackSucceed', function(msg)
{ {
//console.log('client'); //console.log('client');
let tempWord = WordSpace.generateWord.Name(ScenesData.gameScene, true, RoomData.findPlayer(msg.victimId)); let tempWord = WordSpace.generateWord.Name(ScenesData.gameScene, true, RoomData.findPlayer(msg.victimId));
tempWord.instantiate(ScenesData.gameScene);
let victimPos = RoomData.findPlayer(msg.victimId).position; let victimPos = RoomData.findPlayer(msg.victimId).position;
tempWord.physicsObj.setPosition(victimPos.x, victimPos.y); tempWord.physicsObj.setPosition(victimPos.x, victimPos.y);
tempWord.wordObj.setPosition(tempWord.physicsObj.x, tempWord.physicsObj.y); tempWord.wordObj.setPosition(tempWord.physicsObj.x, tempWord.physicsObj.y);
...@@ -392,13 +417,14 @@ var gameEndMenu = function(isWin) ...@@ -392,13 +417,14 @@ var gameEndMenu = function(isWin)
let earnedMoney = 0; let earnedMoney = 0;
if(isWin) earnedMoney += 20; if(isWin) earnedMoney += 20;
earnedMoney += RoomData.myself.killCount * 3; earnedMoney += RoomData.myself.killCount * 3;
earnedMoney += parseInt(WordSpace.playerTypingRate / 10); earnedMoney += parseInt(WordSpace.playerTyping / 10);
earnedMoney += Math.max(20, Math.pow(RoomData.myself.attackSucceed, 2)); earnedMoney += Math.max(20, Math.pow(RoomData.myself.attackSucceed, 2));
earnedMoney += parseInt(20 * (1 - (RoomData.myself.rank - 1) / (RoomData.players.length - 1))); earnedMoney += parseInt(20 * (1 - (RoomData.myself.rank - 1) / (RoomData.players.length - 1)));
earnedMoney = parseInt(earnedMoney / 40);
Input.inputField.text.destroy(); Input.inputField.text.destroy();
var temp = function(){ var endGame = function(){
socket.emit('exitFromRoom', RoomData.myself.id); socket.emit('exitFromRoom', RoomData.myself.id);
fbClient.updateUserData('killCount', RoomData.myself.killCount); fbClient.updateUserData('killCount', RoomData.myself.killCount);
...@@ -406,25 +432,29 @@ var gameEndMenu = function(isWin) ...@@ -406,25 +432,29 @@ var gameEndMenu = function(isWin)
ScenesData.changeScene('menuScene'); ScenesData.changeScene('menuScene');
} }
ScenesData.gameScene.backToMenuDialog = ScenesData.gameScene.rexUI.add.dialog({ ScenesData.gameScene.backToMenuDialog = ScenesData.gameScene.rexUI.add.dialog({
x: game.config.width / 2, x: game.config.width / 2,
y: game.config.height / 2, y: game.config.height / 2,
background: ScenesData.gameScene.add.sprite(game.config.width / 2, game.config.height / 2, 'panel').setOrigin(0.5, 0.5), background: ScenesData.gameScene.add.sprite(game.config.width / 2, game.config.height / 2, 'resultDialog').setOrigin(0.5, 0.5),
content: ScenesData.gameScene.rexUI.add.dialog({ content: ScenesData.gameScene.rexUI.add.dialog({
x: game.config.width / 2, x: game.config.width / 2,
y: game.config.height / 2, y: game.config.height / 2,
choices: [ choices: [
UIObject.createLabel(ScenesData.gameScene, game.config.width / 2 - 100, game.config.height / 2 - 100, 10.2, 'playerStand', 0.7, 'center'), ScenesData.gameScene.add.sprite(game.config.width / 2 - 200, game.config.height / 2 - 100, Enums.characterSkin[PlayerData.userData.skin] + 'Stand')
UIObject.createLabel(ScenesData.gameScene, game.config.width / 2 + 120, game.config.height / 2 - 150, 10.2, .setOrigin(0.5, 0.5).setDepth(10.2).setScale(0.7),
'button', 1, 'center', '등수 : ' + RoomData.myself.rank + '등', 30).layout(), ScenesData.gameScene.add.text(game.config.width / 2 + 400, game.config.height / 2 - 220, RoomData.myself.rank + '등')
UIObject.createLabel(ScenesData.gameScene, game.config.width / 2 + 120, game.config.height / 2 - 50, 10.2, .setOrigin(1, 0.5).setColor('#000000').setDepth(10.2).setPadding(5,5,5,5).setFont('50pt sejongFont'),
'button', 1, 'center', '킬 수 : ' + RoomData.myself.killCount + '킬', 30).layout(), ScenesData.gameScene.add.text(game.config.width / 2 + 400, game.config.height / 2 - 80, RoomData.myself.killCount + '회')
UIObject.createLabel(ScenesData.gameScene, game.config.width / 2 + 120, game.config.height / 2 + 50, 10.2, .setOrigin(1, 0.5).setColor('#000000').setDepth(10.2).setPadding(5,5,5,5).setFont('50pt sejongFont'),
'button', 1, 'center', '획득 강호패 : ' + RoomData.myself.earnedStrongHopae + '개', 30).layout(), ScenesData.gameScene.add.text(game.config.width / 2 + 400, game.config.height / 2 + 80, RoomData.myself.earnedStrongHopae + '개')
UIObject.createLabel(ScenesData.gameScene, game.config.width / 2 + 120, game.config.height / 2 + 150, 10.2, .setOrigin(1, 0.5).setColor('#000000').setDepth(10.2).setPadding(5,5,5,5).setFont('50pt sejongFont'),
'button', 1, 'center', '획득 골드 : ' + earnedMoney + '원', 30).layout() ScenesData.gameScene.add.text(game.config.width / 2 + 400, game.config.height / 2 + 220, '+' + earnedMoney + '냥')
.setOrigin(1, 0.5).setColor('#000000').setDepth(10.2).setPadding(5,5,5,5).setFont('50pt sejongFont'),
UIObject.createLabel(ScenesData.gameScene, game.config.width / 2 - 250, game.config.height / 2 + 220, 10.2, 'nameBgr' + RoomData.myself.nickname.length, 2,
'center', RoomData.myself.nickname, 50, '#ffffff', 0.45, 0.5)
], ],
align: { align: {
...@@ -432,31 +462,33 @@ var gameEndMenu = function(isWin) ...@@ -432,31 +462,33 @@ var gameEndMenu = function(isWin)
} }
}), }),
actions: [ actions: [
UIObject.createLabel(ScenesData.gameScene, game.config.width / 2 - 120, game.config.height / 2 + 300, 10.2, 'button', 1, 'center', '나가기').layout(), UIObject.createLabel(ScenesData.gameScene, game.config.width / 2 - 200, game.config.height / 2 + 350, 10.2, 'exitBtn', 1, 'center', ' ').layout(),
UIObject.createLabel(ScenesData.gameScene, game.config.width / 2 + 120, game.config.height / 2 + 300, 10.2, 'button', 1, 'center', '관전하기').layout() UIObject.createLabel(ScenesData.gameScene, game.config.width / 2 + 200, game.config.height / 2 + 350, 10.2, 'spectateBtn', 1, 'center', ' ').layout()
], ],
space: { space: {
action: 10, action: 10,
left: 20, left: 50, right: 50, top: 50, bottom: 50,
right: 20,
top: 20,
bottom: 20,
}, },
align: { align: {
actions: 'center' // 'center'|'left'|'right' actions: 'center' // 'center'|'left'|'right'
} }
}).setDepth(10.2); }).setDepth(10.2);
if(isWin) ScenesData.gameScene.winMark =
ScenesData.gameScene.add.sprite(game.config.width / 2 + 500, game.config.height / 2 + 400, 'resultStamp').setOrigin(0.5, 0.5).setDepth(10.2);
ScenesData.gameScene.backToMenuDialog ScenesData.gameScene.backToMenuDialog
.on('button.click', function (button, groupName, index) { .on('button.click', function (button, groupName, index) {
if(index == 0) temp(); if(index == 0) endGame();
else else
{ {
if(isWin) ScenesData.gameScene.winMark.destroy();
ScenesData.gameScene.backToMenuDialog.setVisible(false); ScenesData.gameScene.backToMenuDialog.setVisible(false);
ScenesData.gameScene.backToMenuBtn = UIObject.createButton(ScenesData.gameScene, UIObject.createLabel(ScenesData.gameScene, 100, 900, 10.2, 'pyeongminThrow', 0.5, 'center'), 1, 0, 2, temp); ScenesData.gameScene.backToMenuBtn = UIObject.createButton(ScenesData.gameScene,
UIObject.createLabel(ScenesData.gameScene, 200, 900, 10.2, 'spectateBtn', 1, 'center'), -1, -1, -1, endGame);
} }
}, ScenesData.gameScene) }, ScenesData.gameScene)
.on('button.over', function (button, groupName, index) { .on('button.over', function (button, groupName, index) {
......
js/Enums.js
View file @ 6f6149a7
var Enums = Enums || {}; var Enums = Enums || {};
Enums.characterAnim = { sit: 0, write: 1, notBurning: 2, smallBurning: 3, bigBurning: 4, throw: 5, hit: 6, gameOver: 7 } Enums.characterAnim = { sit: 0, write: 1, notBurning: 2, smallBurning: 3, bigBurning: 4, throw: 5, hit: 6, gameOver: 7 }
Enums.item = {invincible: "무적", nameList: "명단", charge: "충전", clean: "청소", heavy: "중량", dark: "암흑"} Enums.item = {invincible: "무적", nameList: "명단", charge: "충전", clean: "청소", heavy: "중량", dark: "암흑"}
\ No newline at end of file Enums.characterSkin = ["pyeongmin", "sunbi"]
\ No newline at end of file
js/FirebaseClient.js
View file @ 6f6149a7
...@@ -20,6 +20,17 @@ FirebaseClient.prototype.initEvent = function() ...@@ -20,6 +20,17 @@ FirebaseClient.prototype.initEvent = function()
this.googleBtn.addEventListener('click', this.onGoogleBtnClick.bind(this)); this.googleBtn.addEventListener('click', this.onGoogleBtnClick.bind(this));
this.emailBtn.addEventListener('click', this.onEmailBtnClick.bind(this)); this.emailBtn.addEventListener('click', this.onEmailBtnClick.bind(this));
this.joinBtn.addEventListener('click', this.createEmailUser.bind(this)); this.joinBtn.addEventListener('click', this.createEmailUser.bind(this));
document.getElementById('joinOpenBtn').addEventListener('click', function()
{
document.getElementById('dvNewEmail').style.display = 'block';
document.getElementById('dvLogin').style.display = 'none';
});
document.getElementById('joinCancelBtn').addEventListener('click', function()
{
document.getElementById('dvNewEmail').style.display = 'none';
document.getElementById('dvLogin').style.display = 'block';
})
} }
FirebaseClient.prototype.logOut = function() FirebaseClient.prototype.logOut = function()
...@@ -125,56 +136,76 @@ FirebaseClient.prototype.onEmailBtnClick = function() ...@@ -125,56 +136,76 @@ FirebaseClient.prototype.onEmailBtnClick = function()
FirebaseClient.prototype.createEmailUser = function() FirebaseClient.prototype.createEmailUser = function()
{ {
var email = document.getElementById('userEmail').value.trim(); var email = document.getElementById('newEmail').value.trim();
var password = document.getElementById('userPassword').value.trim(); var password = document.getElementById('newPassword').value.trim();
var passCheck = document.getElementById('newPasswordCheck').value.trim();
var newUserName = document.getElementById('newName').value.trim();
// 유효성 검증 // 유효성 검증
if (/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/.test(email)) if (!(/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/.test(email)))
{
alert('잘못된 이메일입니다.');
return;
}
else if (password != passCheck)
{ {
alert('비밀번호와 비밀번호 확인이 다릅니다.')
return;
}
else if (newUserName.length === 0)
{
alert('닉네임을 작성해주세요.')
return;
}
else
{
var cbCreateUserWithEmail = function(user){ var cbCreateUserWithEmail = function(user){
console.log('이메일 가입 성공 : ', JSON.stringify(user)); console.log('이메일 가입 성공 : ', JSON.stringify(user));
//프로필 업데이트 - 이메일 가입시 유저이름 파라미터를 보내지 않으므로 가입 성공 후 처리 //프로필 업데이트 - 이메일 가입시 유저이름 파라미터를 보내지 않으므로 가입 성공 후 처리
firebase.auth().currentUser.updateProfile({ firebase.auth().currentUser.updateProfile({
displayName: email, displayName: newUserName,
}).then(function() { }).then(function() {
console.log('userName 업데이트 성공') console.log('userName 업데이트 성공')
}).catch(function(error) { }).catch(function(error) {
console.error('userName 업데이트 실패 : ', error ); console.error('userName 업데이트 실패 : ', error );
}); });
/* /*
//인증 메일 발송 //인증 메일 발송
this.auth.useDeviceLanguage(); // 이메일 기기언어로 세팅 this.auth.useDeviceLanguage(); // 이메일 기기언어로 세팅
user.sendEmailVerification().then(function() { user.sendEmailVerification().then(function() {
console.log('인증메일 발송 성공') console.log('인증메일 발송 성공')
}).catch(function(error) { }).catch(function(error) {
console.error('인증메일 발송 에러', error); console.error('인증메일 발송 에러', error);
});*/ });*/
} }
document.getElementById('dvLogin').style.display = 'block';
document.getElementById('dvNewEmail').style.display = 'block';
var cbAfterPersistence = function(){ var cbAfterPersistence = function(){
return this.auth.createUserWithEmailAndPassword(email, password) return this.auth.createUserWithEmailAndPassword(email, password)
.then(cbCreateUserWithEmail.bind(this)) .then(cbCreateUserWithEmail.bind(this))
.catch(function(error) { .catch(function(error) {
console.error('이메일 가입시 에러 : ', error); console.error('이메일 가입시 에러 : ', error);
switch(error.code){ switch(error.code){
case "auth/email-already-in-use": case "auth/email-already-in-use":
alert('이미 사용중인 이메일 입니다.'); alert('이미 사용중인 이메일 입니다.');
break; break;
case "auth/invalid-email": case "auth/invalid-email":
alert('유효하지 않은 메일입니다'); alert('유효하지 않은 메일입니다');
break; break;
case "auth/operation-not-allowed": case "auth/operation-not-allowed":
alert('이메일 가입이 중지되었습니다.'); alert('이메일 가입이 중지되었습니다.');
break; break;
case "auth/weak-password": case "auth/weak-password":
alert("비밀번호를 6자리 이상 필요합니다"); alert("비밀번호를 6자리 이상 필요합니다");
break; break;
} }
}); });
} }
this.auth.setPersistence(firebase.auth.Auth.Persistence.SESSION) this.auth.setPersistence(firebase.auth.Auth.Persistence.SESSION)
.then(cbAfterPersistence.bind(this)) .then(cbAfterPersistence.bind(this))
.catch(function(error) { .catch(function(error) {
console.error('인증 상태 설정 중 에러 발생' , error); console.error('인증 상태 설정 중 에러 발생' , error);
}); });
} }
} }
...@@ -233,6 +264,8 @@ FirebaseClient.prototype.updateUserData = function(key, valueChanged, replace = ...@@ -233,6 +264,8 @@ FirebaseClient.prototype.updateUserData = function(key, valueChanged, replace =
case 'killCount': case 'killCount':
beforeData.killCount = replace ? (valueChanged) : (beforeData.killCount + valueChanged); beforeData.killCount = replace ? (valueChanged) : (beforeData.killCount + valueChanged);
break; break;
case 'skin':
beforeData.skin = valueChanged;
default: default:
console.log('[ERROR] database has no key for ' + key); console.log('[ERROR] database has no key for ' + key);
break; break;
...@@ -243,34 +276,45 @@ FirebaseClient.prototype.updateUserData = function(key, valueChanged, replace = ...@@ -243,34 +276,45 @@ FirebaseClient.prototype.updateUserData = function(key, valueChanged, replace =
document.addEventListener('DOMContentLoaded', function() document.addEventListener('DOMContentLoaded', function()
{ {
window.fbClient = new FirebaseClient(); var filter = "win16|win32|win64|mac|macintel";
document.onkeydown = function(e) if ( navigator.platform ){
{ if ( filter.indexOf(navigator.platform.toLowerCase())<0 ){
if (!fbClient.isGameStarted && e.keyCode === 13) document.getElementById('dvLogin').style.display = 'none';
document.getElementById('notSupport').style.display = 'block';
}
else
{ {
fbClient.onEmailBtnClick(); window.fbClient = new FirebaseClient();
document.onkeydown = function(e)
{
if (!fbClient.isGameStarted && e.keyCode === 13)
{
fbClient.onEmailBtnClick();
}
else if (fbClient.isGameStarted && e.keyCode === 27)
{
fbClient.logOut();
}
}
} }
} }
console.log('done load'); console.log('done load');
}); });
document.onkeydown = function(e)
{
if (fbClient.isGameStarted && e.keyCode === 27) fbClient.logOut();
}
class UserData class UserData
{ {
constructor() constructor()
{ {
this.userName = prompt("유저의 이름을 입력해주세요."); this.userName = fbClient.auth.currentUser.displayName;
this.exp = 0; this.exp = 0;
this.rank = -1; this.rank = -1;
this.hopae = []; this.hopae = [];
this.recentHopae = null; this.recentHopae = null;
this.title = []; this.title = [];
this.money = 0; this.money = 0;
this.item = []; this.item = [0];
this.killCount = 0; this.killCount = 0;
this.skin = 0;
} }
} }
\ No newline at end of file
js/Input.js
View file @ 6f6149a7
...@@ -4,6 +4,7 @@ Input.input = []; ...@@ -4,6 +4,7 @@ Input.input = [];
Input.converted = ''; Input.converted = '';
Input.convInput = ''; // converted input Input.convInput = ''; // converted input
Input.finalInput = ''; Input.finalInput = '';
Input.lastSuccess = '';
Input.isShifted = false; Input.isShifted = false;
Input.isEntered = false; Input.isEntered = false;
...@@ -23,26 +24,16 @@ Input.gameSceneEnterReaction = function() ...@@ -23,26 +24,16 @@ Input.gameSceneEnterReaction = function()
{ {
if (RoomData.myself.isAlive && !Input.isEntered) if (RoomData.myself.isAlive && !Input.isEntered)
{ {
if (Input.attackMode) WordSpace.attack(Input.removeConVow(Input.finalInput), Input.attackOption.wordGrade); if (Input.attackMode)
{
WordSpace.attack(Input.removeConVow(Input.finalInput), Input.attackOption.wordGrade);
Input.inputField.inputBackground.setFrame(4);
}
else WordSpace.findWord(Input.finalInput); else WordSpace.findWord(Input.finalInput);
Input.reset(); Input.reset();
Input.isEntered = true; Input.isEntered = true;
} }
} }
Input.menuSceneEnterReaction = function()
{
Input.finalInput = Input.removeConVow(Input.finalInput);
if (Input.finalInput.length > 1)
{
PlayerData.nickname = Input.finalInput;
Input.reset();
}
else
{
alert('정확한 가명을 입력해주세요.');
Input.reset();
}
}
Input.reset = function() Input.reset = function()
{ {
...@@ -209,7 +200,12 @@ Input.convert = function() ...@@ -209,7 +200,12 @@ Input.convert = function()
this.convInput = this.convInput.slice(1, 2); this.convInput = this.convInput.slice(1, 2);
} }
Input.finalInput = Input.converted + Input.convInput; Input.finalInput = Input.converted + Input.convInput;
return true; if (Input.finalInput.length > 6) return false;
else
{
this.lastSuccess = this.finalInput;
return true;
}
//console.log('_____end_convert_____'); //console.log('_____end_convert_____');
} }
...@@ -318,17 +314,24 @@ Input.removeConVow = function(_wordText) ...@@ -318,17 +314,24 @@ Input.removeConVow = function(_wordText)
Input.inputField = Input.inputField =
{ {
generate: function(scene, enterCallback, text, isHopaeScene = false) generate: function(scene, enterCallback, text)
{ {
this.text = text; this.text = text.getElement('text');
this.inputBackground = text.getElement('background');
if(ScenesData.currentScene == ScenesData.gameScene) Input.inputField.inputBackground.setFrame(4);
scene.input.keyboard.on('keyup', function() {Input.pressCount--; Input.justPressed = ''; scene.input.keyboard.on('keydown', function() {
if(isHopaeScene) if(ScenesData.currentScene == ScenesData.hopaeScene && Input.finalInput.length > 1) Input.inputField.inputBackground.setFrame(Input.finalInput.length - 2);
})
scene.input.keyboard.on('keyup', function() {Input.pressCount--; Input.justPressed = '';
if(ScenesData.currentScene == ScenesData.hopaeScene)
{ {
ScenesData.hopaeScene.checkBtn.setEnable(Input.checkProperInput(Input.inputField.text.text) ? true : false); ScenesData.hopaeScene.checkBtn.setEnable(Input.checkProperInput(Input.inputField.text.text) && (Input.finalInput.length > 1) ? true : false);
if(Input.finalInput.length > 4) ScenesData.hopaeScene.warningText.setVisible(true); ScenesData.hopaeScene.warningText.setVisible(WordReader.getWordTyping(Input.finalInput) > 9 ? true : false);
else ScenesData.hopaeScene.warningText.setVisible(false); }
}}) })
scene.input.keyboard.on('keydown-SHIFT', function() {Input.isShifted = true}); scene.input.keyboard.on('keydown-SHIFT', function() {Input.isShifted = true});
scene.input.keyboard.on('keyup-SHIFT', function() {Input.isShifted = false}); scene.input.keyboard.on('keyup-SHIFT', function() {Input.isShifted = false});
scene.input.keyboard.on('keydown-DELETE', function() {Input.reset()}); scene.input.keyboard.on('keydown-DELETE', function() {Input.reset()});
...@@ -403,11 +406,14 @@ Input.pushInput = function(inputKey) ...@@ -403,11 +406,14 @@ Input.pushInput = function(inputKey)
} }
} }
else output = inputKey.charCodeAt(0); else output = inputKey.charCodeAt(0);
this.input.push(output); if (this.finalInput.length <= this.maxInput) this.input.push(output);
//console.log(Input.input); //console.log(Input.input);
if (!this.convert() || this.finalInput.length > this.maxInput) if (!this.convert() || this.finalInput.length > this.maxInput)
{ {
this.input.pop(); this.converted = this.lastSuccess;
this.finalInput = this.lastSuccess;
this.convInput = '';
this.input = [];
this.convert(); this.convert();
} }
this.inputField.text.setText(Input.finalInput); this.inputField.text.setText(Input.finalInput);
......
js/ResourceLoader.js
View file @ 6f6149a7
...@@ -5,13 +5,12 @@ ResourceLoader.loadBackGround = function(scene) ...@@ -5,13 +5,12 @@ ResourceLoader.loadBackGround = function(scene)
scene.load.image('weightWarning', 'assets/image/background/weightWarning.png'); scene.load.image('weightWarning', 'assets/image/background/weightWarning.png');
scene.load.image('baseBackground', 'assets/image/background/yellowBack.png'); scene.load.image('baseBackground', 'assets/image/background/yellowBack.png');
scene.load.image('gameBackground', 'assets/image/background/background_brain.png'); scene.load.image('gameBackground', 'assets/image/background/background_brain.png');
scene.load.image('menuBackground', 'assets/placeholder/menuBackground.png'); scene.load.image('menuBackground', 'assets/image/UI/main/mainBackground.png');
scene.load.image('roomBackground', 'assets/placeholder/roomBackground.png'); scene.load.image('roomBackground', 'assets/placeholder/roomBackground.png');
} }
ResourceLoader.loadImage = function(scene) ResourceLoader.loadImage = function(scene)
{ {
scene.load.image('inputfield', 'assets/image/etc/wordspace.png');
for (let i = 0; i < 4; i++) for (let i = 0; i < 4; i++)
{ {
for (let j = 2; j < 7; j++) for (let j = 2; j < 7; j++)
...@@ -41,14 +40,48 @@ ResourceLoader.loadImage = function(scene) ...@@ -41,14 +40,48 @@ ResourceLoader.loadImage = function(scene)
scene.load.spritesheet('pyeongminGameOver', 'assets/image/character/pyeongmin/balladang/pyeong_balladang.png', { frameWidth: 720, frameHeight: 700 }); scene.load.spritesheet('pyeongminGameOver', 'assets/image/character/pyeongmin/balladang/pyeong_balladang.png', { frameWidth: 720, frameHeight: 700 });
scene.load.image('pyeongminStand', 'assets/image/character/pyeongmin/pyeong_stand.png'); scene.load.image('pyeongminStand', 'assets/image/character/pyeongmin/pyeong_stand.png');
scene.load.spritesheet('sunbiSit', 'assets/image/character/sunbi/sunbi_sit.png', { frameWidth: 521, frameHeight: 610 });
scene.load.spritesheet('sunbiWrite', 'assets/image/character/sunbi/sunbi_write.png', { frameWidth: 521, frameHeight: 610 });
scene.load.spritesheet('sunbiThrow', 'assets/image/character/sunbi/sunbi_throw.png', { frameWidth: 521, frameHeight: 610 });
scene.load.spritesheet('sunbiBurningSmall', 'assets/image/character/sunbi/sunbi_burning_small.png', { frameWidth: 521, frameHeight: 610 });
scene.load.spritesheet('sunbiBurningBig', 'assets/image/character/sunbi/sunbi_burning_big.png', { frameWidth: 521, frameHeight: 610 });
scene.load.spritesheet('sunbiGameOver', 'assets/image/character/sunbi/sunbi_die.png', { frameWidth: 720, frameHeight: 700 });
scene.load.image('sunbiStand', 'assets/image/character/sunbi/sunbi_stand.png');
scene.load.spritesheet('wordBreak', 'assets/image/word/wordbreak.png', { frameWidth: 180, frameHeight: 180 }); scene.load.spritesheet('wordBreak', 'assets/image/word/wordbreak.png', { frameWidth: 180, frameHeight: 180 });
scene.load.spritesheet('hopaeSceneInput', 'assets/image/word/hopaeSceneInput.png', { frameWidth: 239, frameHeight: 45 });
scene.load.spritesheet('gameSceneInput', 'assets/image/etc/wordSpace/wordspace.png', { frameWidth: 253, frameHeight: 67 });
scene.load.image('attackPaper', 'assets/image/etc/paper_crumbled.png');
scene.load.image('itemBag', 'assets/image/etc/itembag2.png');
scene.load.image('mat', 'assets/image/etc/mat.png');
scene.load.image('button', 'assets/placeholder/button.png');
scene.load.image('panel', 'assets/placeholder/panel.png');
scene.load.image('dialog1', 'assets/image/UI/dialog/dialog1.png');
scene.load.image('dialog2', 'assets/image/UI/dialog/dialog2.png');
scene.load.image('resultDialog', 'assets/image/UI/dialog/result_background.png');
scene.load.image('resultStamp', 'assets/image/UI/dialog/result_stamp.png');
scene.load.image('friendlyPlayBtn', 'assets/image/UI/main/friendlyPlay.png');
scene.load.image('rankPlayBtn', 'assets/image/UI/main/rankPlay.png');
scene.load.image('shopBtn', 'assets/image/UI/main/shop.png');
scene.load.image('hopaeManageBtn', 'assets/image/UI/main/hopaeManage.png');
scene.load.image('helpBtn', 'assets/image/UI/main/help.png');
scene.load.image('cancelBtn', 'assets/image/UI/decisionBtn/cancel.png');
scene.load.image('confirmBtn', 'assets/image/UI/decisionBtn/confirm.png');
scene.load.image('exitBtn', 'assets/image/UI/decisionBtn/exit.png');
scene.load.image('noBtn', 'assets/image/UI/decisionBtn/no.png');
scene.load.image('spectateBtn', 'assets/image/UI/decisionBtn/spectate.png');
scene.load.image('yesBtn', 'assets/image/UI/decisionBtn/yes.png');
scene.load.spritesheet('phase1', 'assets/image/etc/scroll/startPhase/startPhase.png', { frameWidth: 280, frameHeight: 920 }); scene.load.spritesheet('phase1', 'assets/image/etc/scroll/startPhase/startPhase.png', { frameWidth: 280, frameHeight: 920 });
scene.load.spritesheet('phase2', 'assets/image/etc/scroll/bonPhase/bonPhase.png', { frameWidth: 280, frameHeight: 920 }); scene.load.spritesheet('phase2', 'assets/image/etc/scroll/bonPhase/bonPhase.png', { frameWidth: 280, frameHeight: 920 });
scene.load.spritesheet('phase3', 'assets/image/etc/scroll/poongPhase/poongPhase.png', { frameWidth: 280, frameHeight: 920 }); scene.load.spritesheet('phase3', 'assets/image/etc/scroll/poongPhase/poongPhase.png', { frameWidth: 280, frameHeight: 920 });
scene.load.image('attackPaper', 'assets/image/etc/paper_crumbled.png'); scene.load.spritesheet('tutorialImage', 'assets/image/UI/tutorial/tutorialImages.png', { frameWidth: 1080, frameHeight: 615 });
scene.load.image('panel', 'assets/placeholder/panel.png');
scene.load.image('button', 'assets/placeholder/button.png');
scene.load.image('itemBag', 'assets/image/etc/itembag2.png');
} }
ResourceLoader.loadAnimation = function(scene) ResourceLoader.loadAnimation = function(scene)
...@@ -77,46 +110,52 @@ ResourceLoader.loadAnimation = function(scene) ...@@ -77,46 +110,52 @@ ResourceLoader.loadAnimation = function(scene)
frameRate: 20, frameRate: 20,
repeat: 0 repeat: 0
}); });
WordSpace.pyeongminAnims[Enums.characterAnim.sit] = scene.anims.create({
key: 'pyeongminSitAnim', for(let i = 0; i < 2; i++)
frames: scene.anims.generateFrameNumbers('pyeongminSit'), {
frameRate: 10, WordSpace.characterAnims[i][Enums.characterAnim.sit] = scene.anims.create({
repeat: 0 key: Enums.characterSkin[i] + 'SitAnim',
}); frames: scene.anims.generateFrameNumbers(Enums.characterSkin[i] + 'Sit'),
WordSpace.pyeongminAnims[Enums.characterAnim.write] = scene.anims.create({ frameRate: 10,
key: 'pyeongminWriteAnim', repeat: 0
frames: scene.anims.generateFrameNumbers('pyeongminWrite'), });
frameRate: 10, WordSpace.characterAnims[i][Enums.characterAnim.write] = scene.anims.create({
repeat: 0 key: Enums.characterSkin[i] + 'WriteAnim',
}); frames: scene.anims.generateFrameNumbers(Enums.characterSkin[i] + 'Write'),
WordSpace.pyeongminAnims[Enums.characterAnim.notBurning] = scene.anims.create({ frameRate: 10,
key: 'pyeongminnotBurningAnim', repeat: 0
frames: scene.anims.generateFrameNumbers('pyeongminWrite'), });
frameRate: 10, WordSpace.characterAnims[i][Enums.characterAnim.notBurning] = scene.anims.create({
repeat: -1 key: Enums.characterSkin[i] + 'notBurningAnim',
}); frames: scene.anims.generateFrameNumbers(Enums.characterSkin[i] + 'Write'),
WordSpace.pyeongminAnims[Enums.characterAnim.smallBurning] = scene.anims.create({ frameRate: 10,
key: 'pyeongminsmallBurningAnim', repeat: -1
frames: scene.anims.generateFrameNumbers('pyeongminBurningSmall'), });
frameRate: 10, WordSpace.characterAnims[i][Enums.characterAnim.smallBurning] = scene.anims.create({
repeat: -1 key: Enums.characterSkin[i] + 'smallBurningAnim',
}); frames: scene.anims.generateFrameNumbers(Enums.characterSkin[i] + 'BurningSmall'),
WordSpace.pyeongminAnims[Enums.characterAnim.bigBurning] = scene.anims.create({ frameRate: 10,
key: 'pyeongminbigBurningAnim', repeat: -1
frames: scene.anims.generateFrameNumbers('pyeongminBurningBig'), });
frameRate: 10, WordSpace.characterAnims[i][Enums.characterAnim.bigBurning] = scene.anims.create({
repeat: -1 key: Enums.characterSkin[i] + 'bigBurningAnim',
}); frames: scene.anims.generateFrameNumbers(Enums.characterSkin[i] + 'BurningBig'),
WordSpace.pyeongminAnims[Enums.characterAnim.throw] = scene.anims.create({ frameRate: 10,
key: 'pyeongminThrowAnim', repeat: -1
frames: scene.anims.generateFrameNumbers('pyeongminThrow'), });
frameRate: 10, WordSpace.characterAnims[i][Enums.characterAnim.throw] = scene.anims.create({
repeat: 0 key: Enums.characterSkin[i] + 'ThrowAnim',
}); frames: scene.anims.generateFrameNumbers(Enums.characterSkin[i] + 'Throw'),
WordSpace.pyeongminAnims[Enums.characterAnim.gameOver] = scene.anims.create({ frameRate: 10,
key: 'pyeongminGameOverAnim', repeat: 0
frames: scene.anims.generateFrameNumbers('pyeongminGameOver'), });
frameRate: 10, WordSpace.characterAnims[i][Enums.characterAnim.gameOver] = scene.anims.create({
repeat: 0 key: Enums.characterSkin[i] + 'GameOverAnim',
}); frames: scene.anims.generateFrameNumbers(Enums.characterSkin[i] + 'GameOver'),
frameRate: 10,
repeat: 0
});
}
} }
\ No newline at end of file
js/ScenesData.js
View file @ 6f6149a7
...@@ -20,6 +20,7 @@ var menuScene = new Phaser.Class( ...@@ -20,6 +20,7 @@ var menuScene = new Phaser.Class(
ResourceLoader.loadImage(this); ResourceLoader.loadImage(this);
CSVParsing.loadText(this); CSVParsing.loadText(this);
Audio.loadSound(this); Audio.loadSound(this);
this.load.scenePlugin({ this.load.scenePlugin({
key: 'rexuiplugin', key: 'rexuiplugin',
url: 'https://raw.githubusercontent.com/rexrainbow/phaser3-rex-notes/master/plugins/dist/rexuiplugin.min.js', url: 'https://raw.githubusercontent.com/rexrainbow/phaser3-rex-notes/master/plugins/dist/rexuiplugin.min.js',
...@@ -34,157 +35,188 @@ var menuScene = new Phaser.Class( ...@@ -34,157 +35,188 @@ var menuScene = new Phaser.Class(
create: function() create: function()
{ {
BackGround.drawBackground(this); ResourceLoader.loadAnimation(this);
Audio.loopSound(this, 'login'); BackGround.drawMenu(this);
if(PlayerData.userData.hopae === undefined || PlayerData.userData.hopae.length == 0) Audio.playSound(this, 'login');
ScenesData.menuScene.tutorialFrame = 0;
ScenesData.menuScene.tutorialImage = UIObject.createButton(this, UIObject.createLabel(this, game.config.width / 2, game.config.height / 2, 11,
'tutorialImage', 1, 'center'), -2, -2, -2,
function()
{
ScenesData.menuScene.tutorialFrame = (ScenesData.menuScene.tutorialFrame + 1) % 9;
if(ScenesData.menuScene.tutorialFrame >= 8)
{
ScenesData.menuScene.tutorialImage.getBackground().setFrame(0);
if(PlayerData.userData.hopae === undefined || PlayerData.userData.hopae.length == 0) ScenesData.changeScene('hopaeScene');
else
{
ScenesData.menuScene.tutorialFrame = 0;
ScenesData.menuScene.tutorialImage.setVisible(false);
ScenesData.menuScene.helpBtn.setEnable(true);
ScenesData.menuScene.gameStartBtn.setEnable(true);
ScenesData.menuScene.shopBtn.setEnable(true);
ScenesData.menuScene.hopaeBtn.setEnable(true);
ScenesData.menuScene.currentHopaeBtn.setEnable(true);
}
}
ScenesData.menuScene.tutorialImage.getBackground().setFrame(ScenesData.menuScene.tutorialFrame);
}).setVisible(false);
if(PlayerData.userData.hopae === undefined || PlayerData.userData.hopae.length == 0) ScenesData.menuScene.tutorialImage.setVisible(true).popUp(1000);
else
{ {
PlayerData.userData.money += 1; PlayerData.currentHopae = (PlayerData.userData.recentHopae == null) ? PlayerData.userData.hopae[0] : PlayerData.userData.recentHopae;
ScenesData.changeScene('hopaeScene'); PlayerData.nickname = PlayerData.currentHopae.name;
return;
}
PlayerData.currentHopae = (PlayerData.userData.recentHopae == null) ? PlayerData.userData.hopae[0] : PlayerData.userData.recentHopae;
PlayerData.nickname = PlayerData.currentHopae.name;
this.userName = this.add.text(100, 100, '내 이름 : ' + PlayerData.userData.userName).setOrigin(0, 0.5).setColor('#000000').setDepth(9.9).setPadding(5,5,5,5).setFontSize(40); this.userName = this.add.text(250, 75, PlayerData.userData.userName).setOrigin(0, 0.5).setColor('#000000').setDepth(9.9).setPadding(5,5,5,5).setFont('40pt sejongFont');
this.money = this.add.text(100, 200, '소지 엽전 : ' + PlayerData.userData.money).setOrigin(0, 0.5).setColor('#000000').setDepth(9.9).setPadding(5,5,5,5).setFontSize(40); this.money = this.add.text(950, 70, PlayerData.userData.money).setOrigin(1, 0.5).setColor('#ffffff').setDepth(9.9).setPadding(5,5,5,5).setFont('40pt sejongFont');
this.organizeHopae = function() this.organizeHopae = function()
{ {
this.myHopae = []; this.myHopae = [];
this.myHopae.push({ this.myHopae.push({
name: PlayerData.currentHopae.name, name: PlayerData.currentHopae.name,
type: PlayerData.currentHopae.type, type: PlayerData.currentHopae.type,
}); });
for(let i = 0; i < PlayerData.userData.hopae.length; i++) for(let i = 0; i < PlayerData.userData.hopae.length; i++)
if(PlayerData.userData.hopae[i].name != PlayerData.currentHopae.name) if(PlayerData.userData.hopae[i].name != PlayerData.currentHopae.name)
this.myHopae.push({ this.myHopae.push({
name: PlayerData.userData.hopae[i].name, name: PlayerData.userData.hopae[i].name,
type: PlayerData.userData.hopae[i].type, type: PlayerData.userData.hopae[i].type,
});
}
this.createHopaeMenu = function()
{
this.hopaeMenuObject = [];
for(let i = 0; i < this.myHopae.length; i++)
{
let temp = UIObject.createButton(this, UIObject.createLabel(this, 100, 300, 5,
'nameBgr' + ScenesData.menuScene.myHopae[i].name.length, 1, 'left', ScenesData.menuScene.myHopae[i].name, 25, '#ffffff', 0.45, 0.5), 0, 0, 0,
function()
{
PlayerData.currentHopae = ScenesData.menuScene.myHopae[i];
PlayerData.nickname = ScenesData.menuScene.myHopae[i].name;
ScenesData.menuScene.organizeHopae();
ScenesData.menuScene.currentHopaeBtn.destroy();
ScenesData.menuScene.createCurrentHopae();
ScenesData.menuScene.hopaeMenuObject.forEach(function(element){
ScenesData.menuScene.tweens.add({
targets: element,
y: 0,
duration: 200,
ease: 'Linear',
loop: 0,
onComplete: function(){element.destroy();}
});
});
}); });
} ScenesData.menuScene.tweens.add({
targets: temp,
y: 50 * i,
duration: 500,
ease: 'Bounce',
loop: 0
});
this.hopaeMenuObject.push(temp);
}
}
this.createHopaeMenu = function() this.createCurrentHopae = function()
{
this.hopaeMenuObject = [];
for(let i = 0; i < this.myHopae.length; i++)
{ {
let temp = UIObject.createButton(this, UIObject.createLabel(this, 100, 300, 5, this.currentHopaeBtn = UIObject.createButton(this, UIObject.createLabel(this, 100, 300, 5,
'nameBgr' + ScenesData.menuScene.myHopae[i].name.length, 1, 'left', ScenesData.menuScene.myHopae[i].name, 25, '#ffffff', 0.45, 0.5), 0, 0, 0, 'nameBgr' + PlayerData.nickname.length, 1, 'left', PlayerData.nickname, 25, '#ffffff', 0.45, 0.5), 0, 0, 0,
function() function()
{ {
PlayerData.currentHopae = ScenesData.menuScene.myHopae[i];
PlayerData.nickname = ScenesData.menuScene.myHopae[i].name;
ScenesData.menuScene.organizeHopae();
ScenesData.menuScene.currentHopaeBtn.destroy(); ScenesData.menuScene.currentHopaeBtn.destroy();
ScenesData.menuScene.createCurrentHopae(); ScenesData.menuScene.createHopaeMenu();
ScenesData.menuScene.hopaeMenuObject.forEach(function(element){ })
ScenesData.menuScene.tweens.add({
targets: element,
y: 0,
duration: 200,
ease: 'Linear',
loop: 0,
onComplete: function(){element.destroy();}
});
});
});
ScenesData.menuScene.tweens.add({
targets: temp,
y: 50 * i,
duration: 500,
ease: 'Bounce',
loop: 0
});
this.hopaeMenuObject.push(temp);
} }
}
this.createCurrentHopae = function() this.organizeHopae();
{ this.createCurrentHopae();
this.currentHopaeBtn = UIObject.createButton(this, UIObject.createLabel(this, 100, 300, 5,
'nameBgr' + PlayerData.nickname.length, 1, 'left', PlayerData.nickname, 25, '#ffffff', 0.45, 0.5), 0, 0, 0,
function()
{
ScenesData.menuScene.currentHopaeBtn.destroy();
ScenesData.menuScene.createHopaeMenu();
})
}
this.organizeHopae(); this.myCharacter = this.add.sprite(game.config.width / 2, game.config.height / 2, Enums.characterSkin[PlayerData.userData.skin] + 'Stand')
this.createCurrentHopae(); .setOrigin(0.5, 0.5).setDepth(5).setScale(0.8);
this.myCharacter = this.add.sprite(game.config.width / 2, game.config.height / 2 - 200, 'pyeongminStand').setOrigin(0.5, 0.5).setDepth(5).setScale(0.8); this.roomEnterDialog = this.rexUI.add.dialog({
x: game.config.width / 2,
y: game.config.height / 2,
this.roomEnterDialog = this.rexUI.add.dialog({ background: this.add.sprite(game.config.width / 2, game.config.height / 2, 'dialog1').setOrigin(0.5, 0.5),
x: game.config.width / 2,
y: game.config.height / 2, content: this.add.text(game.config.width / 2, game.config.height / 2, '대기실에 참가하시겠습니까?', {
font: '50pt sejongFont'
}).setColor('#000000'),
background: this.add.sprite(game.config.width / 2, game.config.height / 2, 'panel').setOrigin(0.5, 0.5), actions: [
UIObject.createLabel(this, 0, 0, 0, 'yesBtn', 1, 'center', ' '),
content: this.add.text(0, 0, '대기실에 참가하시겠습니까?', { UIObject.createLabel(this, 0, 0, 0, 'noBtn', 1, 'center', ' ')
font: '50pt sejongFont' ],
}),
actions: [ space: {
UIObject.createLabel(this, 0, 0, 0, 'button', 1, 'center', '예', 50), content: 25, action: 100,
UIObject.createLabel(this, 0, 0, 0, 'button', 1, 'center', '아니오', 50)
],
space: { left: 50, right: 50, top: 50, bottom: 50,
content: 25, },
action: 100,
left: 20, align: {
right: 20, actions: 'center' // 'center'|'left'|'right'
top: 20, },
bottom: 20,
},
align: { expand: {
actions: 'center' // 'center'|'left'|'right' content: false, // Content is a pure text object
}, }
}).layout().setDepth(11).setVisible(false);
expand: { this.roomEnterDialog
content: false, // Content is a pure text object .on('button.click', function (button, groupName, index) {
} if(index == 0) socket.emit('enterRoom', {nickname: PlayerData.nickname, skin: PlayerData.userData.skin});
}).layout().setDepth(11).setVisible(false); else
{
this.roomEnterDialog.setVisible(false);
this.gameStartBtn.setEnable(true);
}
}, this)
.on('button.over', function (button, groupName, index) {
//console.log('button over');
})
.on('button.out', function (button, groupName, index) {
//console.log('button out');
});
this.roomEnterDialog
.on('button.click', function (button, groupName, index) { this.gameStartBtn = UIObject.createButton(this, UIObject.createLabel(this, game.config.width / 2, 950, 5, 'friendlyPlayBtn', 1, 'center', '게임 시작', 50), -1, -1, -1,
if(index == 0) socket.emit('enterRoom', PlayerData.nickname); function()
else
{ {
this.roomEnterDialog.setVisible(false); ScenesData.menuScene.gameStartBtn.setEnable(false);
this.gameStartBtn.setEnable(true); ScenesData.menuScene.roomEnterDialog.setVisible(true);
} ScenesData.menuScene.roomEnterDialog.popUp(200);
}, this) })
.on('button.over', function (button, groupName, index) {
//console.log('button over'); this.shopBtn = UIObject.createButton(this, UIObject.createLabel(this, game.config.width - 100, 950, 5, 'shopBtn', 1, 'center'), -1, -1, -1,
}) function()
.on('button.out', function (button, groupName, index) { {
//console.log('button out'); ScenesData.changeScene('shopScene');
}); })
this.hopaeBtn = UIObject.createButton(this, UIObject.createLabel(this, 100, 950, 5, 'hopaeManageBtn', 1, 'center'), -1, -1, -1,
this.gameStartBtn = UIObject.createButton(this, UIObject.createLabel(this, game.config.width / 2, 900, 5, 'pyeongminWrite', 0.5, 'center'), 1, 0, 2, function()
function() {
{ if(PlayerData.userData.hopae.length > 4) console.log('호패가 5개입니다.');
ScenesData.menuScene.gameStartBtn.setEnable(false); else ScenesData.changeScene('hopaeScene');
ScenesData.menuScene.roomEnterDialog.setVisible(true); })
ScenesData.menuScene.roomEnterDialog.popUp(200); this.helpBtn = UIObject.createButton(this, UIObject.createLabel(this, game.config.width - 100, 75, 5, 'helpBtn', 1, 'center'), -1, -1, -1,
}) function()
{
this.shopBtn = UIObject.createButton(this, UIObject.createLabel(this, game.config.width - 100, 900, 5, 'pyeongminThrow', 0.5, 'center'), 1, 0, 2, ScenesData.menuScene.tutorialImage.setVisible(true).popUp(200);
function() ScenesData.menuScene.helpBtn.setEnable(false);
{ ScenesData.menuScene.gameStartBtn.setEnable(false);
console.log('상점 입장'); ScenesData.menuScene.shopBtn.setEnable(false);
}) ScenesData.menuScene.hopaeBtn.setEnable(false);
ScenesData.menuScene.currentHopaeBtn.setEnable(false);
this.hopaeBtn = UIObject.createButton(this, UIObject.createLabel(this, 100, 900, 5, 'pyeongminThrow', 0.5, 'center'), 1, 0, 2, })
function() }
{
ScenesData.changeScene('hopaeScene');
})
} }
}); });
...@@ -216,65 +248,56 @@ var hopaeScene = new Phaser.Class( ...@@ -216,65 +248,56 @@ var hopaeScene = new Phaser.Class(
create: function() create: function()
{ {
BackGround.drawBackground(this); BackGround.drawMenu(this);
if(!(PlayerData.userData.hopae === undefined || PlayerData.userData.hopae.length == 0))
Input.inputField.generate(this, function(){}, {
UIObject.createLabel(this, game.config.width / 2, game.config.height / 2, 10, 'nameBgr6', 2, 'center', '', 50, '#ffffff').getElement('text').setOrigin(0.45,0.5), true); this.userName = this.add.text(250, 75, PlayerData.userData.userName).setOrigin(0, 0.5).setColor('#000000').setDepth(9.9).setPadding(5,5,5,5).setFont('40pt sejongFont');
this.money = this.add.text(950, 70, PlayerData.userData.money).setOrigin(1, 0.5).setColor('#ffffff').setDepth(9.9).setPadding(5,5,5,5).setFont('40pt sejongFont');
UIObject.createLabel(this, game.config.width / 2, game.config.height / 2 - 200, 2, 'panel', 1, 'center', }
this.inputBackground = UIObject.createLabel(this, game.config.width / 2, game.config.height / 2, 10, 'hopaeSceneInput', 2, 'center', '', 50, '#ffffff', 0.45, 0.5);
Input.inputField.generate(this, function(){}, this.inputBackground);
UIObject.createLabel(this, game.config.width / 2, game.config.height / 2 - 200, 2, 'dialog2', 1, 'center',
'호패는 오직 한글만 입력이 가능합니다.\n띄어쓰기도 사용할 수 없습니다.', 50, '#000000').layout(); '호패는 오직 한글만 입력이 가능합니다.\n띄어쓰기도 사용할 수 없습니다.', 50, '#000000').layout();
this.checkDialog = this.rexUI.add.dialog({ this.checkDialog = this.rexUI.add.dialog({
x: game.config.width / 2, x: game.config.width / 2,
y: game.config.height / 2, y: game.config.height / 2,
background: this.add.sprite(game.config.width / 2, game.config.height / 2, 'panel').setOrigin(0.5, 0.5), background: this.add.sprite(game.config.width / 2, game.config.height / 2, 'dialog1').setOrigin(0.5, 0.5),
content: this.add.text(0, 0, '이 이름으로 하시겠습니까?' + (PlayerData.userData.hopae.length == 0 ? '\n(최초 호패는 비용이 들지 않습니다.)' : '\n변경에는 엽전이 소모됩니다.'), { content: this.add.text(0, 0, '이 이름으로 하시겠습니까?' + (PlayerData.userData.hopae === undefined || PlayerData.userData.hopae.length == 0 ?
font: '50pt sejongFont', '\n(최초 호패는 비용이 들지 않습니다.)' : '\n변경에는 엽전이 소모됩니다.'), {
color: '#000000', font: '50pt sejongFont', color: '#000000', align: 'center'
align: 'center'
}), }),
actions: [ actions: [
UIObject.createLabel(this, 0, 0, 0, 'button', 1, 'center', '예', 50), UIObject.createLabel(this, 0, 0, 0, 'yesBtn', 1, 'center', ' '),
UIObject.createLabel(this, 0, 0, 0, 'button', 1, 'center', '아니오', 50) UIObject.createLabel(this, 0, 0, 0, 'noBtn', 1, 'center', ' ')
], ],
space: { space: {
content: 25, content: 25, action: 100,
action: 100, left: 50, right: 50, top: 50, bottom: 50,
left: 20,
right: 20,
top: 20,
bottom: 20,
},
align: {
actions: 'center' // 'center'|'left'|'right'
}, },
expand: { align: { actions: 'center' },
content: false, // Content is a pure text object expand: { content: false }
}
}).layout().setDepth(11).setVisible(false); }).layout().setDepth(11).setVisible(false);
this.checkDialog this.checkDialog
.on('button.click', function (button, groupName, index) { .on('button.click', function (button, groupName, index) {
if(index == 0) if(index == 0)
{ {
if(PlayerData.userData.money > 0) if(PlayerData.userData.hopae === undefined || PlayerData.userData.hopae.length == 0 || PlayerData.userData.money > 0)
{ {
fbClient.updateUserData('hopae', {name: Input.inputField.text.text, type: 'wood'}); fbClient.updateUserData('hopae', {name: Input.inputField.text.text, type: 'wood'});
fbClient.updateUserData('money', -1); if(PlayerData.userData.hopae === undefined || PlayerData.userData.hopae.length == 0) fbClient.updateUserData('money', -1);
ScenesData.changeScene('menuScene'); ScenesData.changeScene('menuScene');
} }
else else
{ {
this.checkDialog.setVisible(false); this.checkDialog.setVisible(false);
this.errorMsg = UIObject.createButton(this, UIObject.createLabel(this, game.config.width / 2, game.config.height / 2, 10, 'dialog1', 1, 'center',
this.errorMsg = UIObject.createButton(this, UIObject.createLabel(this, game.config.width / 2, game.config.height / 2, 10, 'panel', 1, 'center',
'엽전이 부족합니다', 50, '#000000').layout().popUp(200), 0, 0, 0, '엽전이 부족합니다', 50, '#000000').layout().popUp(200), 0, 0, 0,
function() function()
{ {
...@@ -295,10 +318,9 @@ var hopaeScene = new Phaser.Class( ...@@ -295,10 +318,9 @@ var hopaeScene = new Phaser.Class(
.on('button.out', function (button, groupName, index) { .on('button.out', function (button, groupName, index) {
//console.log('button out'); //console.log('button out');
}); });
this.warningText = UIObject.createLabel(this, game.config.width / 2, game.config.height / 2 - 100, 5, 'panel', 1, 'center', this.warningText = UIObject.createLabel(this, game.config.width / 2, game.config.height / 2 - 100, 5, 'dialog1', 1, 'center',
'이름 타수가 많아 플레이에 패널티가 있을 수 있습니다', 40, '#000000').setVisible(false).layout(); '이름 타수가 많아 플레이에 패널티가 있을 수 있습니다', 40, '#000000').setVisible(false).layout();
this.checkBtn = UIObject.createButton(this, UIObject.createLabel(this, game.config.width / 2, 900, 5, 'confirmBtn', 1, 'center', ' '), -2, -2, -2,
this.checkBtn = UIObject.createButton(this, UIObject.createLabel(this, game.config.width / 2, 900, 5, 'pyeongminWrite', 0.5, 'center'), 1, 0, 2,
function() function()
{ {
if(Input.checkProperInput(Input.inputField.text.text)) if(Input.checkProperInput(Input.inputField.text.text))
...@@ -306,10 +328,10 @@ var hopaeScene = new Phaser.Class( ...@@ -306,10 +328,10 @@ var hopaeScene = new Phaser.Class(
ScenesData.hopaeScene.checkBtn.setEnable(false); ScenesData.hopaeScene.checkBtn.setEnable(false);
ScenesData.hopaeScene.checkDialog.setVisible(true).popUp(200); ScenesData.hopaeScene.checkDialog.setVisible(true).popUp(200);
} }
}) }).setEnable(false);
if(!(PlayerData.userData.hopae === undefined || PlayerData.userData.hopae.length == 0)) if(!(PlayerData.userData.hopae === undefined || PlayerData.userData.hopae.length == 0))
{ {
this.backBtn = UIObject.createButton(this, UIObject.createLabel(this, 100, 900, 5, 'pyeongminWrite', 0.5, 'center'), 1, 0, 2, this.backBtn = UIObject.createButton(this, UIObject.createLabel(this, 200, 900, 5, 'exitBtn', 1, 'center', ' '), -2, -2, -2,
function() function()
{ {
ScenesData.changeScene('menuScene'); ScenesData.changeScene('menuScene');
...@@ -318,6 +340,135 @@ var hopaeScene = new Phaser.Class( ...@@ -318,6 +340,135 @@ var hopaeScene = new Phaser.Class(
} }
}); });
var shopScene = new Phaser.Class(
{
Extends: Phaser.Scene,
initialize:
function shopScene ()
{
Phaser.Scene.call(this, {key: 'shopScene'});
},
preload: function()
{
ScenesData.shopScene = this;
this.load.scenePlugin({
key: 'rexuiplugin',
url: 'https://raw.githubusercontent.com/rexrainbow/phaser3-rex-notes/master/plugins/dist/rexuiplugin.min.js',
sceneKey: 'rexUI'
});
this.load.scenePlugin({
key: 'rexbuttonplugin',
url: 'https://raw.githubusercontent.com/rexrainbow/phaser3-rex-notes/master/plugins/dist/rexbuttonplugin.min.js',
sceneKey: 'button'
});
},
create: function()
{
BackGround.drawBackground(this);
this.currentSkin = this.add.sprite(500, game.config.height / 2, Enums.characterSkin[PlayerData.userData.skin] + 'Stand')
.setOrigin(0.5, 0.5).setDepth(5).setScale(0.8);
this.money = this.add.text(200, 70, PlayerData.userData.money + "냥").setOrigin(1, 0.5).setColor('#000000').setDepth(9.9).setPadding(5,5,5,5).setFont('40pt sejongFont');
this.pyeongminItem = {
price: 0,
itemName: this.add.text(game.config.width - 500, 300, '평민').setOrigin(1, 0.5).setColor('#000000').setDepth(9.9).setPadding(5,5,5,5).setFont('40pt sejongFont'),
itemPrice: this.add.text(game.config.width - 200, 300, '0냥').setOrigin(1, 0.5).setColor('#000000').setDepth(9.9).setPadding(5,5,5,5).setFont('40pt sejongFont'),
buyBtn: UIObject.createButton(this, UIObject.createLabel(this, game.config.width - 600, 300, 5, 'button', 1, 'center', '구매하기'), -1, -1, -1,
function()
{
if(PlayerData.userData.money >= ScenesData.shopScene.pyeongminItem.price)
{
ScenesData.shopScene.pyeongminItem.buyBtn.setVisible(false);
ScenesData.shopScene.pyeongminItem.itemPrice.setText('보유중');
fbClient.updateUserData('item', 0);
fbClient.updateUserData('money', -ScenesData.shopScene.pyeongminItem.price);
ScenesData.shopScene.money.setText(PlayerData.userData.money + '냥');
ScenesData.shopScene.pyeongminItem.useBtn.setVisible(true);
}
}),
useBtn: UIObject.createButton(this, UIObject.createLabel(this, game.config.width - 800, 300, 5, 'button', 1, 'center', '사용하기'), -1, -1, -1,
function()
{
if(PlayerData.userData.item.includes(0))
{
ScenesData.shopScene.pyeongminItem.useBtn.setVisible(false);
ScenesData.shopScene.sunbiItem.useBtn.setVisible(true);
fbClient.updateUserData('skin', 0);
ScenesData.shopScene.currentSkin.destroy();
ScenesData.shopScene.currentSkin = ScenesData.shopScene.add.sprite(500, game.config.height / 2, Enums.characterSkin[PlayerData.userData.skin] + 'Stand')
.setOrigin(0.5, 0.5).setDepth(5).setScale(0.8);
}
})
}
this.pyeongminItem.buyBtn.setEnable(PlayerData.userData.money < ScenesData.shopScene.pyeongminItem.price ? false : true);
if(PlayerData.userData.item.includes(0))
{
this.pyeongminItem.buyBtn.setVisible(false);
this.pyeongminItem.itemPrice.setText('보유중');
}
if(PlayerData.userData.skin == 0 || !PlayerData.userData.item.includes(0)) this.pyeongminItem.useBtn.setVisible(false);
this.sunbiItem = {
price: 100,
itemName: this.add.text(game.config.width - 500, 400, '선비').setOrigin(1, 0.5).setColor('#000000').setDepth(9.9).setPadding(5,5,5,5).setFont('40pt sejongFont'),
itemPrice: this.add.text(game.config.width - 200, 400, '100냥').setOrigin(1, 0.5).setColor('#000000').setDepth(9.9).setPadding(5,5,5,5).setFont('40pt sejongFont'),
buyBtn: UIObject.createButton(this, UIObject.createLabel(this, game.config.width - 800, 400, 5, 'button', 1, 'center', '구매하기'), -1, -1, -1,
function()
{
if(PlayerData.userData.money >= ScenesData.shopScene.sunbiItem.price)
{
ScenesData.shopScene.sunbiItem.buyBtn.setVisible(false);
ScenesData.shopScene.sunbiItem.itemPrice.setText('보유중');
fbClient.updateUserData('item', 1);
fbClient.updateUserData('money', -ScenesData.shopScene.sunbiItem.price);
ScenesData.shopScene.money.setText(PlayerData.userData.money + '냥');
ScenesData.shopScene.sunbiItem.useBtn.setVisible(true);
}
}),
useBtn: UIObject.createButton(this, UIObject.createLabel(this, game.config.width - 800, 400, 5, 'button', 1, 'center', '사용하기'), -1, -1, -1,
function()
{
if(PlayerData.userData.item.includes(1))
{
ScenesData.shopScene.sunbiItem.useBtn.setVisible(false);
ScenesData.shopScene.pyeongminItem.useBtn.setVisible(true);
fbClient.updateUserData('skin', 1);
ScenesData.shopScene.currentSkin.destroy();
ScenesData.shopScene.currentSkin = ScenesData.shopScene.add.sprite(500, game.config.height / 2, Enums.characterSkin[PlayerData.userData.skin] + 'Stand')
.setOrigin(0.5, 0.5).setDepth(5).setScale(0.8);
}
})
}
this.sunbiItem.buyBtn.setEnable(PlayerData.userData.money < ScenesData.shopScene.sunbiItem.price ? false : true);
if(PlayerData.userData.item.includes(1))
{
this.sunbiItem.buyBtn.setVisible(false);
this.sunbiItem.itemPrice.setText('보유중');
}
if(PlayerData.userData.skin == 1 || !PlayerData.userData.item.includes(1)) this.sunbiItem.useBtn.setVisible(false);
this.backBtn = UIObject.createButton(this, UIObject.createLabel(this, 200, 900, 5, 'exitBtn', 1, 'center', ' '), -2, -2, -2,
function()
{
ScenesData.changeScene('menuScene');
});
}
});
var roomScene = new Phaser.Class( var roomScene = new Phaser.Class(
{ {
Extends: Phaser.Scene, Extends: Phaser.Scene,
...@@ -420,6 +571,7 @@ var gameScene = new Phaser.Class( ...@@ -420,6 +571,7 @@ var gameScene = new Phaser.Class(
preload: function() preload: function()
{ {
ScenesData.gameScene = this; ScenesData.gameScene = this;
Audio.loadSound(this);
this.load.scenePlugin({ this.load.scenePlugin({
key: 'rexuiplugin', key: 'rexuiplugin',
url: 'https://raw.githubusercontent.com/rexrainbow/phaser3-rex-notes/master/plugins/dist/rexuiplugin.min.js', url: 'https://raw.githubusercontent.com/rexrainbow/phaser3-rex-notes/master/plugins/dist/rexuiplugin.min.js',
...@@ -437,17 +589,24 @@ var gameScene = new Phaser.Class( ...@@ -437,17 +589,24 @@ var gameScene = new Phaser.Class(
{ {
WordSpace.gameTimer = new Phaser.Time.Clock(this); WordSpace.gameTimer = new Phaser.Time.Clock(this);
WordSpace.gameTimer.start(); WordSpace.gameTimer.start();
ResourceLoader.loadAnimation(this);
CSVParsing.CSVParse(this); CSVParsing.CSVParse(this);
BackGround.drawBackground(this); BackGround.drawBackground(this);
BackGround.drawBrain(this); BackGround.drawBrain(this);
BackGround.drawCharacter(this); BackGround.drawCharacter(this);
Audio.playSound(this, 'startGame'); 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.attackPaperGroup = this.physics.add.group();
WordSpace.wordPhysicsGroup = this.physics.add.group(); WordSpace.wordPhysicsGroup = this.physics.add.group();
Input.inputField.generate(this, Input.gameSceneEnterReaction, Input.inputField.generate(this, Input.gameSceneEnterReaction,
UIObject.createLabel(ScenesData.gameScene, game.config.width / 2, game.config.height * 25 / 36, 10, 'inputfield', 1, 'center', '', 25, '#000000').getElement('text')); UIObject.createLabel(ScenesData.gameScene, game.config.width / 2, game.config.height * 25 / 36, 10, 'gameSceneInput', 1, 'center', '', 25, '#000000'));
WordSpace.attackGauge.generate(this); WordSpace.attackGauge.generate(this);
WordSpace.spaceInitiate(this); WordSpace.spaceInitiate(this);
...@@ -455,8 +614,6 @@ var gameScene = new Phaser.Class( ...@@ -455,8 +614,6 @@ var gameScene = new Phaser.Class(
WordSpace.startCycle(this); WordSpace.startCycle(this);
WordSpace.setPlayerTyping.initiate(this);
WordSpace.nameQueue.initiate(); WordSpace.nameQueue.initiate();
this.warningImage = this.add.sprite(game.config.width / 2, game.config.height / 2, 'weightWarning').setDisplaySize(game.config.width, game.config.height).setDepth(0.1).setAlpha(0) this.warningImage = this.add.sprite(game.config.width / 2, game.config.height / 2, 'weightWarning').setDisplaySize(game.config.width, game.config.height).setDepth(0.1).setAlpha(0)
...@@ -479,17 +636,9 @@ var gameScene = new Phaser.Class( ...@@ -479,17 +636,9 @@ var gameScene = new Phaser.Class(
if(ScenesData.currentScene == ScenesData.gameScene && WordSpace.gameTimer != null) if(ScenesData.currentScene == ScenesData.gameScene && WordSpace.gameTimer != null)
{ {
WordSpace.deltaTime = this.sys.game.loop.delta; WordSpace.deltaTime = this.sys.game.loop.delta;
WordSpace.wordForcedGroup.forEach(function(element) WordSpace.wordForcedGroup.forEach(function(element) { element.attract(); });
{ WordSpace.nameGroup.forEach(function(element) { element.attract(); });
element.attract(); WordSpace.attackPaperGroup.getChildren().forEach(function(element) { element.moveObject(element); });
});
WordSpace.nameGroup.forEach(function(element)
{
element.attract();
})
WordSpace.attackPaperGroup.getChildren().forEach(function(element){
element.moveObject(element);
});
WordSpace.setPlayerTyping.add(''); WordSpace.setPlayerTyping.add('');
...@@ -506,6 +655,7 @@ var gameScene = new Phaser.Class( ...@@ -506,6 +655,7 @@ var gameScene = new Phaser.Class(
ScenesData.changeScene = function(sceneKey) ScenesData.changeScene = function(sceneKey)
{ {
Audio.killSound(ScenesData.menuScene, 'login');
ScenesData.currentScene.scene.start(sceneKey); ScenesData.currentScene.scene.start(sceneKey);
Input.input = []; Input.input = [];
Input.converted = ''; Input.converted = '';
......
js/UIObject.js
View file @ 6f6149a7
...@@ -12,7 +12,7 @@ UIObject.createLabel = function (scene, x, y, depth, image, size, align, text = ...@@ -12,7 +12,7 @@ UIObject.createLabel = function (scene, x, y, depth, image, size, align, text =
text: scene.add.text(x, y, text, { text: scene.add.text(x, y, text, {
font: textSize + 'pt sejongFont', font: textSize + 'pt sejongFont',
align: 'center' align: 'center'
}).setDepth(depth).setOrigin(textOriginX, textOriginY).setColor(textColor), }).setDepth(depth).setOrigin(textOriginX, textOriginY).setColor(textColor).setPadding(30, 30, 30, 30),
space: { space: {
left: 10, left: 10,
...@@ -52,33 +52,41 @@ UIObject.createButton = function(scene, buttonGameObject, overFrame, outFrame, d ...@@ -52,33 +52,41 @@ UIObject.createButton = function(scene, buttonGameObject, overFrame, outFrame, d
clickInterval: 100 clickInterval: 100
} }
}); });
buttonGameObject = buttonGameObject.getElement('background'); let buttonGameObjectBackground = buttonGameObject.getElement('background');
temp.enabled = true; temp.enabled = true;
buttonGameObject.setFrame(outFrame).setInteractive() buttonGameObjectBackground.setFrame(outFrame > 0 ? outFrame : 0).setInteractive()
.on('pointerover', () => { .on('pointerover', () => {
if(temp.enabled) if(temp.enabled)
{ {
buttonGameObject.setFrame(overFrame); if(overFrame > 0) buttonGameObjectBackground.setFrame(overFrame);
if(overFrame != -2) buttonGameObject.setScale(1.1);
} }
}) })
.on('pointerdown', () => { .on('pointerdown', () => {
if(temp.enabled) if(temp.enabled)
{ {
buttonGameObject.setFrame(downFrame); if(downFrame > 0) buttonGameObjectBackground.setFrame(downFrame);
if(downFrame != -2) buttonGameObject.setScale(0.9);
clickCallback(); clickCallback();
} }
}) })
.on('pointerup', () => { .on('pointerup', () => {
buttonGameObject.setFrame(overFrame); if(temp.enabled)
{
if(overFrame > 0) buttonGameObjectBackground.setFrame(overFrame);
if(overFrame != -2) buttonGameObject.setScale(1.1);
}
}) })
.on('pointerout', () => { .on('pointerout', () => {
buttonGameObject.setFrame(outFrame); if(outFrame > 0) buttonGameObjectBackground.setFrame(outFrame);
if(outFrame != -2) buttonGameObject.setScale(1);
}) })
temp.setEnable = function(isEnable) temp.setEnable = function(isEnable)
{ {
temp.enabled = isEnable; temp.enabled = isEnable;
return temp; return temp;
} }
temp.getBackground = function() { return buttonGameObjectBackground; }
return temp; return temp;
} }
\ No newline at end of file
js/WordObject.js
View file @ 6f6149a7
...@@ -57,8 +57,6 @@ class WordObject ...@@ -57,8 +57,6 @@ class WordObject
setTimeout(function() { setTimeout(function() {
breakAnim.destroy(); breakAnim.destroy();
}, 200); }, 200);
RoomData.myself.playerImage.play(WordSpace.pyeongminAnims[Enums.characterAnim.write]);
RoomData.myself.playerImage.anims.chain(WordSpace.pyeongminAnims[Enums.characterAnim.sit]);
} }
attract() attract()
...@@ -110,6 +108,9 @@ class NormalWord extends WordObject ...@@ -110,6 +108,9 @@ class NormalWord extends WordObject
super.destroy(); super.destroy();
if(isNormallyRemoved) if(isNormallyRemoved)
{ {
Audio.playSound(ScenesData.gameScene, 'killWord');
RoomData.myself.playerImage.play(WordSpace.characterAnims[PlayerData.userData.skin][Enums.characterAnim.write]);
RoomData.myself.playerImage.anims.chain(WordSpace.characterAnims[PlayerData.userData.skin][Enums.characterAnim.sit]);
switch(this.wordGrade) switch(this.wordGrade)
{ {
case 0: WordSpace.attackGauge.add(2.5); break; case 0: WordSpace.attackGauge.add(2.5); break;
...@@ -148,8 +149,8 @@ class AttackWord extends WordObject ...@@ -148,8 +149,8 @@ class AttackWord extends WordObject
let textColor = '#000000' let textColor = '#000000'
super.instantiate(scene, spriteName, textColor, lenRate); super.instantiate(scene, spriteName, textColor, lenRate);
this.maskBackground = scene.physics.add.sprite(this.physicsObj.x, this.physicsObj.y, 'wordBgr' + this.wordGrade + '_' + Math.min(Math.max(2, this.wordText.length), 6)) this.maskBackground = scene.physics.add.sprite(this.physicsObj.x, this.physicsObj.y, 'wordBgr' + this.wordGrade + '_' + Math.min(Math.max(2, this.wordText.length), 6))
.setTint(Phaser.Display.Color.GetColor(120, 120, 120)).setScale(this.scale); .setTint(Phaser.Display.Color.GetColor(40, 40, 40)).setScale(this.scale).setDepth(1.1);
this.maskBackground.alpha = this.isDark ? 1 : 0.5; this.maskBackground.alpha = this.isDark ? 1 : 0.7;
this.shape = scene.make.graphics(); this.shape = scene.make.graphics();
var rect = new Phaser.Geom.Rectangle(0, 0, this.maskBackground.width * this.scale, this.maskBackground.height * this.scale); var rect = new Phaser.Geom.Rectangle(0, 0, this.maskBackground.width * this.scale, this.maskBackground.height * this.scale);
this.shape.fillStyle(0xffffff).fillRectShape(rect); this.shape.fillStyle(0xffffff).fillRectShape(rect);
...@@ -189,6 +190,9 @@ class AttackWord extends WordObject ...@@ -189,6 +190,9 @@ class AttackWord extends WordObject
super.destroy(); super.destroy();
if(isNormallyRemoved) if(isNormallyRemoved)
{ {
Audio.playSound(ScenesData.gameScene, 'killWord');
RoomData.myself.playerImage.play(WordSpace.characterAnims[PlayerData.userData.skin][Enums.characterAnim.write]);
RoomData.myself.playerImage.anims.chain(WordSpace.characterAnims[PlayerData.userData.skin][Enums.characterAnim.sit]);
switch(this.wordGrade) switch(this.wordGrade)
{ {
case 0: WordSpace.attackGauge.add(2.5); break; case 0: WordSpace.attackGauge.add(2.5); break;
...@@ -259,10 +263,7 @@ class NameWord extends WordObject ...@@ -259,10 +263,7 @@ class NameWord extends WordObject
if(this.isStrong) if(this.isStrong)
{ {
this.physicsObj.setScale(this.follower.t < 0.2 ? 0.2 : this.follower.t * this.scale); this.physicsObj.setScale(this.follower.t < 0.2 ? 0.2 : this.follower.t * this.scale);
this.wordObj.setFont({ this.wordObj.setScale((this.follower.t < 0.2 ? 0.2 : this.follower.t * this.scale) * 0.9);
font: (this.follower.t < 0.2 ? 0.05 : this.follower.t * this.scale * this.fontScale) +'pt sejongFont',
fontStyle: (this.wordWeight > 5 ? 'bold' : '')
});
} }
} }
} }
...@@ -271,6 +272,9 @@ class NameWord extends WordObject ...@@ -271,6 +272,9 @@ class NameWord extends WordObject
super.destroy(); super.destroy();
if(isNormallyRemoved) if(isNormallyRemoved)
{ {
Audio.playSound(ScenesData.gameScene, 'killWord');
RoomData.myself.playerImage.play(WordSpace.characterAnims[PlayerData.userData.skin][Enums.characterAnim.write]);
RoomData.myself.playerImage.anims.chain(WordSpace.characterAnims[PlayerData.userData.skin][Enums.characterAnim.sit]);
ScenesData.gameScene.physics.world.removeCollider(this.physicsObj.wordCollider); ScenesData.gameScene.physics.world.removeCollider(this.physicsObj.wordCollider);
WordSpace.wordGroup.forEach(function(element) WordSpace.wordGroup.forEach(function(element)
{ {
...@@ -298,10 +302,6 @@ class NameWord extends WordObject ...@@ -298,10 +302,6 @@ class NameWord extends WordObject
duration: 2000, duration: 2000,
repeat: 0 repeat: 0
}); });
//이동경로 디버그
/*var graphics = ScenesData.gameScene.add.graphics();
graphics.lineStyle(2, 0xffffff, 1);
this.path.draw(graphics);*/
} }
} }
} }
...@@ -356,6 +356,9 @@ class ItemWord extends WordObject ...@@ -356,6 +356,9 @@ class ItemWord extends WordObject
super.destroy(); super.destroy();
if(isNormallyRemoved) if(isNormallyRemoved)
{ {
Audio.playSound(ScenesData.gameScene, 'killWord');
RoomData.myself.playerImage.play(WordSpace.characterAnims[PlayerData.userData.skin][Enums.characterAnim.write]);
RoomData.myself.playerImage.anims.chain(WordSpace.characterAnims[PlayerData.userData.skin][Enums.characterAnim.sit]);
WordSpace.attackGauge.add(0.5); WordSpace.attackGauge.add(0.5);
switch(this.itemType) switch(this.itemType)
{ {
......
js/WordSpace.js
View file @ 6f6149a7
...@@ -12,6 +12,9 @@ WordSpace.isTimerOn = false; ...@@ -12,6 +12,9 @@ WordSpace.isTimerOn = false;
WordSpace.isInvincible = false; WordSpace.isInvincible = false;
WordSpace.pyeongminAnims = []; WordSpace.pyeongminAnims = [];
WordSpace.characterAnims = Array(2).fill(null).map(() => Array());
WordSpace.wordGroup = []; WordSpace.wordGroup = [];
WordSpace.nameGroup = []; WordSpace.nameGroup = [];
WordSpace.attackPaperGroup = null; WordSpace.attackPaperGroup = null;
...@@ -117,14 +120,12 @@ WordSpace.attackGauge = ...@@ -117,14 +120,12 @@ WordSpace.attackGauge =
if (this.value + plus > 11) this.value = 11; if (this.value + plus > 11) this.value = 11;
else this.value += plus; else this.value += plus;
this.setRect(); this.setRect();
this.text.setText('게이지: ' + this.value.toFixed(1));
}, },
sub: function(minus) sub: function(minus)
{ {
if (this.value - minus < 0) this.value = 0; if (this.value - minus < 0) this.value = 0;
else this.value -= minus; else this.value -= minus;
this.setRect(); this.setRect();
this.text.setText('게이지: ' + this.value.toFixed(1));
}, },
resetValue: function() {this.value = 0;}, resetValue: function() {this.value = 0;},
cutValue: function(cutOut) {this.value *= (1-cutOut);}, cutValue: function(cutOut) {this.value *= (1-cutOut);},
...@@ -141,7 +142,6 @@ WordSpace.attackGauge = ...@@ -141,7 +142,6 @@ WordSpace.attackGauge =
}; };
this.currentCycle = scene.time.addEvent(option); this.currentCycle = scene.time.addEvent(option);
this.text = scene.add.text(100,100,'게이지: ' + this.value.toFixed(1)).setDepth(9.9).setColor('#000000');
//this.rectUI.setColor(this.gradeColor[0]); //this.rectUI.setColor(this.gradeColor[0]);
}, },
pauseCycle: function(bool) {this.currentCycle.paused = bool;}, pauseCycle: function(bool) {this.currentCycle.paused = bool;},
...@@ -265,7 +265,7 @@ WordSpace.findWord = function(wordText) ...@@ -265,7 +265,7 @@ WordSpace.findWord = function(wordText)
} }
WordSpace.setPlayerTyping.add(wordText); WordSpace.setPlayerTyping.add(wordText);
} }
else if (wordText === '공격' && WordSpace.attackGauge.value >= 3 && WordSpace.nameGroup.length > 0) // 공격모드 진입. else if (wordText === '공격' && WordSpace.attackGauge.value >= 2 && WordSpace.nameGroup.length > 0) // 공격모드 진입.
{ {
console.log('attack mode'); console.log('attack mode');
let tempAttackOption = this.attackGauge.getAttackOption(); let tempAttackOption = this.attackGauge.getAttackOption();
...@@ -273,21 +273,22 @@ WordSpace.findWord = function(wordText) ...@@ -273,21 +273,22 @@ WordSpace.findWord = function(wordText)
Input.attackOption.wordGrade = tempAttackOption.wordGrade; Input.attackOption.wordGrade = tempAttackOption.wordGrade;
Input.maxInput = Input.attackOption.wordCount; Input.maxInput = Input.attackOption.wordCount;
Input.attackMode = true; Input.attackMode = true;
Input.inputField.inputBackground.setFrame(Input.maxInput - 2);
WordSpace.attackGauge.pauseCycle(true); WordSpace.attackGauge.pauseCycle(true);
WordSpace.setPlayerTyping.add(wordText); WordSpace.setPlayerTyping.add(wordText);
switch(tempAttackOption.wordCount) switch(tempAttackOption.wordCount)
{ {
case 2: case 2:
RoomData.myself.playerImage.play(WordSpace.pyeongminAnims[Enums.characterAnim.notBurning]); RoomData.myself.playerImage.play(WordSpace.characterAnims[PlayerData.userData.skin][Enums.characterAnim.notBurning]);
break; break;
case 3: case 3:
RoomData.myself.playerImage.play(WordSpace.pyeongminAnims[Enums.characterAnim.smallBurning]); RoomData.myself.playerImage.play(WordSpace.characterAnims[PlayerData.userData.skin][Enums.characterAnim.smallBurning]);
break; break;
case 4: case 4:
RoomData.myself.playerImage.play(WordSpace.pyeongminAnims[Enums.characterAnim.smallBurning]); RoomData.myself.playerImage.play(WordSpace.characterAnims[PlayerData.userData.skin][Enums.characterAnim.smallBurning]);
break; break;
case 5: case 5:
RoomData.myself.playerImage.play(WordSpace.pyeongminAnims[Enums.characterAnim.bigBurning]); RoomData.myself.playerImage.play(WordSpace.characterAnims[PlayerData.userData.skin][Enums.characterAnim.bigBurning]);
break; break;
default: default:
console.log('Improper attack option.'); console.log('Improper attack option.');
...@@ -336,13 +337,8 @@ WordSpace.setPlayerTyping = ...@@ -336,13 +337,8 @@ WordSpace.setPlayerTyping =
{ {
this.totalTyping += wordText != null ? WordReader.getWordTyping(wordText) : 0; this.totalTyping += wordText != null ? WordReader.getWordTyping(wordText) : 0;
WordSpace.playerTyping = this.totalTyping / WordSpace.gameTimer.now * 60 * 1000; WordSpace.playerTyping = this.totalTyping / WordSpace.gameTimer.now * 60 * 1000;
this.text.setText('현재 타수 : ' + WordSpace.playerTyping.toFixed(1));
this.writeWord = wordText != '' ? true : false; this.writeWord = wordText != '' ? true : false;
}, },
initiate: function(scene)
{
this.text = scene.add.text(100,200,'현재 타수 : ' + WordSpace.playerTyping.toFixed(1)).setDepth(9.9).setColor('#000000');
},
reset: function() reset: function()
{ {
this.totalTyping = 0; this.totalTyping = 0;
...@@ -402,8 +398,8 @@ WordSpace.attack = function(wordText, grade) ...@@ -402,8 +398,8 @@ WordSpace.attack = function(wordText, grade)
WordSpace.attackGauge.resetValue(); WordSpace.attackGauge.resetValue();
WordSpace.setPlayerTyping.add(wordText); WordSpace.setPlayerTyping.add(wordText);
RoomData.myself.playerImage.play(WordSpace.pyeongminAnims[Enums.characterAnim.throw]); RoomData.myself.playerImage.play(WordSpace.characterAnims[PlayerData.userData.skin][Enums.characterAnim.throw]);
RoomData.myself.playerImage.anims.chain(WordSpace.pyeongminAnims[Enums.characterAnim.sit]); RoomData.myself.playerImage.anims.chain(WordSpace.characterAnims[PlayerData.userData.skin][Enums.characterAnim.sit]);
Input.attackOption.isHeavy = false; Input.attackOption.isHeavy = false;
Input.attackOption.isDark = false; Input.attackOption.isDark = false;
} }
...@@ -473,12 +469,8 @@ WordSpace.nameQueue = ...@@ -473,12 +469,8 @@ WordSpace.nameQueue =
getCount: function(player) getCount: function(player)
{ {
WordSpace.nameQueue.counter = 0; WordSpace.nameQueue.counter = 0;
WordSpace.nameGroup.forEach(function(element){ WordSpace.nameGroup.forEach(function(element){ if(element.ownerId == player.id) WordSpace.nameQueue.counter++; });
if(element.id == player.id) WordSpace.nameQueue.counter++; WordSpace.wordGroup.forEach(function(element){ if(element instanceof NameWord && element.ownerId == player.id) WordSpace.nameQueue.counter++; });
})
WordSpace.wordGroup.forEach(function(element){
if(element instanceof NameWord && element.ownerId == player.id) WordSpace.nameQueue.counter++;
})
return WordSpace.nameQueue.counter; return WordSpace.nameQueue.counter;
}, },
counter: 0, counter: 0,
...@@ -493,9 +485,17 @@ WordSpace.changePhase = function(newPhase) ...@@ -493,9 +485,17 @@ WordSpace.changePhase = function(newPhase)
console.log('phase changed from ' + WordSpace.CurrentPhase + ' to ' + newPhase); console.log('phase changed from ' + WordSpace.CurrentPhase + ' to ' + newPhase);
WordSpace.CurrentPhase = newPhase; WordSpace.CurrentPhase = newPhase;
if(WordSpace.CurrentPhase == 1)
Audio.killSound('gameScene', 'Phase1');
else if(WordSpace.CurrentPhase == 2)
Audio.killSound('gameScene', 'Phase2');
else
Audio.killSound('gameScene', 'Phase3');
//WordSpace.pauseCycle(true); //WordSpace.pauseCycle(true);
// 여기서 종이 드르륵 열면됨 // 여기서 종이 드르륵 열면됨
let phaseChangeBgr = ScenesData.gameScene.add.sprite(game.config.width / 2, game.config.height / 2, 'phase' + newPhase).setOrigin(0.5, 0.5).setDepth(9.9).play('phase' + newPhase + 'Anim'); let phaseChangeBgr = ScenesData.gameScene.add.sprite(game.config.width / 2, game.config.height / 2, 'phase' + newPhase).setOrigin(0.5, 0.5).setDepth(9.9)
.play('phase' + newPhase + 'Anim');
//ScenesData.gameScene.scene.pause('gameScene'); //ScenesData.gameScene.scene.pause('gameScene');
setTimeout(function() setTimeout(function()
{ {
...@@ -518,7 +518,6 @@ WordSpace.resetGame = function() ...@@ -518,7 +518,6 @@ WordSpace.resetGame = function()
WordSpace.isGameOver = false; WordSpace.isGameOver = false;
WordSpace.isTimerOn = false; WordSpace.isTimerOn = false;
WordSpace.isInvincible = false; WordSpace.isInvincible = false;
WordSpace.pyeongminAnims = [];
WordSpace.wordGroup = []; WordSpace.wordGroup = [];
WordSpace.nameGroup = []; WordSpace.nameGroup = [];
......
js/main.js
View file @ 6f6149a7
...@@ -14,7 +14,7 @@ var config = { ...@@ -14,7 +14,7 @@ var config = {
} }
}, },
backgroundColor: Phaser.Display.Color.HexStringToColor('#ffffff').color,//GetColor(245,208,138), backgroundColor: Phaser.Display.Color.HexStringToColor('#ffffff').color,//GetColor(245,208,138),
scene: [ menuScene, hopaeScene, roomScene, gameScene ] scene: [ menuScene, hopaeScene, shopScene, roomScene, gameScene ]
}; };
var game = null; var game = null;
......
server.js
View file @ 6f6149a7
...@@ -14,9 +14,9 @@ app.get('/', function(req, res) { ...@@ -14,9 +14,9 @@ app.get('/', function(req, res) {
// http 기본 포트(80)에 서버 열기 // http 기본 포트(80)에 서버 열기
server.listen(80, function() { server.listen(80, function() {
console.log('[SERVER] Listening on port ' + server.address().port); console.log(new Date().toLocaleTimeString('ko-KR') + ' [SERVER] Listening on port ' + server.address().port);
GameServer.serverNumber = Math.floor(Math.random() * 1000 + 1); GameServer.serverNumber = Math.floor(Math.random() * 1000 + 1);
console.log('[SERVER] server number is ' + GameServer.serverNumber); console.log(new Date().toLocaleTimeString('ko-KR') + ' [SERVER] server number is ' + GameServer.serverNumber);
}); });
...@@ -29,12 +29,13 @@ io.on('connection', function(socket) ...@@ -29,12 +29,13 @@ io.on('connection', function(socket)
{ {
id: GameServer.getPlayerNumber(), id: GameServer.getPlayerNumber(),
nickname: '게스트', nickname: '게스트',
skin: 0,
currentRoom: null, currentRoom: null,
playingData: null, playingData: null,
isReceivable: false isReceivable: false
}; };
GameServer.currentPlayer.push(socket); GameServer.currentPlayer.push(socket);
console.log('['+socket.playerData.id+'] client request'); console.log(new Date().toLocaleTimeString('ko-KR') + ' ['+socket.playerData.id+'] client request');
socket.emit('setId', socket.emit('setId',
{ {
str: 'your number is ' + socket.playerData.id, str: 'your number is ' + socket.playerData.id,
...@@ -45,11 +46,12 @@ io.on('connection', function(socket) ...@@ -45,11 +46,12 @@ io.on('connection', function(socket)
socket.on('enterRoom', function(msg) // string new_nickname socket.on('enterRoom', function(msg) // string new_nickname
{ {
if(msg.length < 1) socket.emit('alert' ,'errNicknameEmpty'); if(msg.nickname.length < 1) socket.emit('alert' ,'errNicknameEmpty');
else else
{ {
socket.playerData.nickname = msg; socket.playerData.nickname = msg.nickname;
console.log('['+socket.playerData.id+'] nickname set to ' + msg); socket.playerData.skiin = msg.skin;
console.log(new Date().toLocaleTimeString('ko-KR') + ' ['+socket.playerData.id+'] nickname set to ' + msg.nickname);
GameServer.enterEmptyRoom(socket); GameServer.enterEmptyRoom(socket);
} }
}); });
...@@ -100,7 +102,7 @@ io.on('connection', function(socket) ...@@ -100,7 +102,7 @@ io.on('connection', function(socket)
}, 1000); }, 1000);
} }
catch (e) { catch (e) {
console.error('[ERR] error catched on setPlayerTyping (' + e + ')'); console.error(new Date().toLocaleTimeString('ko-KR') + ' [ERR] error catched on setPlayerTyping (' + e + ')');
socket.disconnect(); socket.disconnect();
} }
}); });
...@@ -110,6 +112,7 @@ io.on('connection', function(socket) ...@@ -110,6 +112,7 @@ io.on('connection', function(socket)
socket.playerData.currentRoom.aliveCount--; socket.playerData.currentRoom.aliveCount--;
//console.log('counted, ' + socket.playerData.currentRoom.aliveCount); //console.log('counted, ' + socket.playerData.currentRoom.aliveCount);
socket.playerData.playingData.isAlive = true; socket.playerData.playingData.isAlive = true;
if (socket.playerData.currentRoom.currentPhase != GameServer.Phase.COUNT) socket.disconnect();
if (socket.playerData.currentRoom.aliveCount === 0 && socket.playerData.currentRoom.currentPlayer.length >= socket.playerData.currentRoom.startCount) if (socket.playerData.currentRoom.aliveCount === 0 && socket.playerData.currentRoom.currentPlayer.length >= socket.playerData.currentRoom.startCount)
{ {
socket.playerData.currentRoom.startRoom(); socket.playerData.currentRoom.startRoom();
...@@ -121,25 +124,21 @@ io.on('connection', function(socket) ...@@ -121,25 +124,21 @@ io.on('connection', function(socket)
room.startTimer = setTimeout(function() room.startTimer = setTimeout(function()
{ {
let deads = room.currentPlayer.filter(element => !element.isAlive); let deads = room.currentPlayer.filter(element => !element.isAlive);
if (room.aliveCount != 0 && room.currentPlayer.length - deads.length >= room.startCount) deads.forEach(function(element)
{
console.error('[ROOM#'+room.roomId+'] FORCE START!!!');
room.startRoom();
deads.forEach(function(element)
{ {
element.defeat(); room.currentSocket[element.index].disconnect();
room.exitRoom(element.id);
}); });
clearTimeout(room.startTimer); if (room.aliveCount != 0 && room.currentPlayer.length >= room.startCount)
{
console.error(new Date().toLocaleTimeString('ko-KR') + ' [ROOM#'+room.roomId+'] FORCE START!!!');
room.startRoom();
} }
else if (deads.length > 0) else if (deads.length > 0)
{ {
deads.forEach(function(element)
{
room.currentSocket[element.index].disconnect();
room.exitRoom(element.id);
});
room.refreshRoom(); room.refreshRoom();
} }
clearTimeout(room.startTimer);
}, 2000); }, 2000);
} }
}); });
...@@ -202,7 +201,7 @@ io.on('connection', function(socket) ...@@ -202,7 +201,7 @@ io.on('connection', function(socket)
let data = socket.playerData; let data = socket.playerData;
if (data === undefined) if (data === undefined)
{ {
console.error('[ERROR] data is undefined'); console.error(new Date().toLocaleTimeString('ko-KR') + ' [ERROR] data is undefined');
console.table(GameServer.currentPlayer); console.table(GameServer.currentPlayer);
GameServer.disconnectCount--; GameServer.disconnectCount--;
} }
...@@ -223,7 +222,7 @@ io.on('connection', function(socket) ...@@ -223,7 +222,7 @@ io.on('connection', function(socket)
var disconnectUser = function(data, reason) var disconnectUser = function(data, reason)
{ {
console.log('['+ data.id +'] client disconnected, reason: ' + reason); console.log(new Date().toLocaleTimeString('ko-KR') + ' ['+ data.id +'] client disconnected, reason: ' + reason);
let idxToDel = GameServer.currentPlayer.findIndex(function(element) let idxToDel = GameServer.currentPlayer.findIndex(function(element)
{ {
return element.playerData.id === data.id; return element.playerData.id === data.id;
...@@ -245,5 +244,5 @@ var disconnectUser = function(data, reason) ...@@ -245,5 +244,5 @@ var disconnectUser = function(data, reason)
} }
GameServer.currentPlayer.splice(idxToDel, 1); GameServer.currentPlayer.splice(idxToDel, 1);
} }
console.log('['+ data.id +'] disconnect complete'); //console.log('['+ data.id +'] disconnect complete');
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment