From ec2d76a5b519a2c4cd24ffc1075f335f799c433d Mon Sep 17 00:00:00 2001 From: sbyeol3 Date: Thu, 17 Dec 2020 14:40:53 +0900 Subject: [PATCH 1/3] =?UTF-8?q?Refacotr=20:=20=ED=97=9D=EA=B0=80=EB=A6=AC?= =?UTF-8?q?=EC=95=88=20=ED=91=9C=EA=B8=B0=EB=B2=95=20=EC=A0=81=EC=9A=A9=20?= =?UTF-8?q?(#199)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 크롱님 코드리뷰 : 함수가 아닌 변수는 is~가 아니라 b~로 해라! --- src/backend/game/User.js | 22 +++++++++++----------- src/backend/sockets/discussion.js | 6 +----- src/backend/sockets/waitingRoom.js | 8 ++++---- src/frontend/engine/DuckCursorObject.js | 4 ++-- src/frontend/scenes/waitingRoom/events.js | 6 +++--- src/frontend/scenes/waitingRoom/render.js | 2 +- src/frontend/socket/waitingRoom.js | 4 ++-- src/frontend/utils/Player.js | 10 +++++----- 8 files changed, 29 insertions(+), 33 deletions(-) diff --git a/src/backend/game/User.js b/src/backend/game/User.js index 485cf91d..76989bb0 100644 --- a/src/backend/game/User.js +++ b/src/backend/game/User.js @@ -14,8 +14,8 @@ class User { this.submittedCard = null; this.votedCard = null; - this.isReady = false; - this.isSkip = false; + this.bReady = false; + this.bSkip = false; } initOnStart({ turnID } = {}) { @@ -27,20 +27,20 @@ class User { initOnRound() { this.submittedCard = null; this.votedCard = null; - this.isReady = false; - this.isSkip = false; + this.bReady = false; + this.bSkip = false; } setTeller(boolean) { this.isTeller = boolean; } - setReady(isReady) { - this.isReady = isReady; + setReady(bReady) { + this.bReady = bReady; } setSkip() { - this.isSkip = true; + this.bSkip = true; } setColor(color) { @@ -86,7 +86,7 @@ class User { isTeller, cards, score, - isReady, + bReady, } = this; return { @@ -99,17 +99,17 @@ class User { isTeller, cards, score, - isReady, + bReady, }; } getProfile() { - const { nickname, color, score, isReady } = this; + const { nickname, color, score, bReady } = this; return { nickname, color, score, - isReady, + bReady, }; } diff --git a/src/backend/sockets/discussion.js b/src/backend/sockets/discussion.js index b1c976a8..ee3b587f 100644 --- a/src/backend/sockets/discussion.js +++ b/src/backend/sockets/discussion.js @@ -5,11 +5,7 @@ function onSkipPlayer() { if (!user || !game) return; user.setSkip(); - - // 모든 유저가 스킵을 눌렀을 경우 - if (game.getUsers().every((u) => u.isSkip)) { - game.endDiscussionScene(true); - } + if (game.getUsers().every((u) => u.bSkip)) game.endDiscussionScene(true); } export default function onDiscussion(socket) { diff --git a/src/backend/sockets/waitingRoom.js b/src/backend/sockets/waitingRoom.js index 702ae86f..1612d4ca 100644 --- a/src/backend/sockets/waitingRoom.js +++ b/src/backend/sockets/waitingRoom.js @@ -51,7 +51,7 @@ function onUpdatePlayer(updatedUserProfile = {}) { const timeoutMap = new Map(); const isPossibleStartGame = ({ users }) => { - const isAllReady = [...users].every(([, user]) => user.isReady); + const isAllReady = [...users].every(([, user]) => user.bReady); const isValidSize = users.size >= PLAYER.MIN && users.size <= PLAYER.MAX; return isAllReady && isValidSize; }; @@ -63,7 +63,7 @@ const deleteGameStartTimeout = (roomID) => { }; // 사용자가 레디를 눌렀을 때 or 레디를 풀었을 때 -function onReadyChange({ isReady }) { +function onReadyChange({ bReady }) { const socket = this; const { user, game } = socket; @@ -77,8 +77,8 @@ function onReadyChange({ isReady }) { const { users, roomID } = game; // 플레이어의 레디 상태를 변경 - users.get(socket.id).setReady(isReady); - socket.in(roomID).emit('ready player', { playerID: socket.id, isReady }); + users.get(socket.id).setReady(bReady); + socket.in(roomID).emit('ready player', { playerID: socket.id, bReady }); const validationToStart = isPossibleStartGame({ users }); // 모든 플레이어가 레디 상태일 때 diff --git a/src/frontend/engine/DuckCursorObject.js b/src/frontend/engine/DuckCursorObject.js index f074d750..090c393f 100644 --- a/src/frontend/engine/DuckCursorObject.js +++ b/src/frontend/engine/DuckCursorObject.js @@ -5,7 +5,7 @@ import TIME from '@type/time'; import DuckObejct from './DuckObject'; class DuckCursorObject extends DuckObejct { - constructor({ isReady, ...props }) { + constructor({ bReady, ...props }) { super(props); this.addClass('cursor-duck-wrapper'); this.setOriginCenter(); @@ -16,7 +16,7 @@ class DuckCursorObject extends DuckObejct { this.mouseHandler = this.makeFollowMouse.bind(this); this.width = 100; this.render(); - this.setVisibility(isReady); + this.setVisibility(bReady); } addMouseMoveEvent() { diff --git a/src/frontend/scenes/waitingRoom/events.js b/src/frontend/scenes/waitingRoom/events.js index 43812cc4..cbec1b32 100644 --- a/src/frontend/scenes/waitingRoom/events.js +++ b/src/frontend/scenes/waitingRoom/events.js @@ -34,15 +34,15 @@ export const changeNickname = (NicknameInput) => { export const toggleReady = ({ target }) => { const currentPlayer = PlayerManager.getCurrentPlayer(); - const { isReady } = currentPlayer; - const nextStatus = !isReady; + const { bReady } = currentPlayer; + const nextStatus = !bReady; target.innerText = nextStatus ? '준비 해제' : '준비 완료'; target.classList.toggle('button-primary'); target.classList.toggle('button-primary-clicked'); PlayerManager.getCurrentPlayer().setReady(nextStatus); - socket.emit('ready player', { isReady: nextStatus }); + socket.emit('ready player', { bReady: nextStatus }); }; export const changeColor = ({ target }) => { diff --git a/src/frontend/scenes/waitingRoom/render.js b/src/frontend/scenes/waitingRoom/render.js index f6543db8..8b8a080c 100644 --- a/src/frontend/scenes/waitingRoom/render.js +++ b/src/frontend/scenes/waitingRoom/render.js @@ -145,7 +145,7 @@ const renderWaitingRoom = (roomID = '') => { ButtonReady.setContent('준비 완료'); ButtonReady.addClass('button-primary'); ButtonReady.attachToObject(ActionWrapper); - ButtonReady.instance.dataset.data = JSON.stringify({ isReady: false }); + ButtonReady.instance.dataset.data = JSON.stringify({ bReady: false }); ButtonReady.addClickHandler(toggleReady); const GameCodeWrapper = new ButtonObject(); diff --git a/src/frontend/socket/waitingRoom.js b/src/frontend/socket/waitingRoom.js index 914d4324..0c04a7f0 100644 --- a/src/frontend/socket/waitingRoom.js +++ b/src/frontend/socket/waitingRoom.js @@ -46,10 +46,10 @@ const setupWaitingRoomSocket = () => { PlayerManager.delete(socketID); }; - const onReadyPlayer = ({ playerID, isReady }) => { + const onReadyPlayer = ({ playerID, bReady }) => { if (!SceneManager.isCurrentScene(WaitingRoom)) return; const player = PlayerManager.get(playerID); - if (player) player.setReady(isReady); + if (player) player.setReady(bReady); }; const onGetRoundData = ({ tellerID, cards, endTime }) => { diff --git a/src/frontend/utils/Player.js b/src/frontend/utils/Player.js index 296c20af..de630d33 100644 --- a/src/frontend/utils/Player.js +++ b/src/frontend/utils/Player.js @@ -8,7 +8,7 @@ const Player = class { color, isTeller = false, isCurrentPlayer = false, - isReady = false, + bReady = false, } = {}) { this.socketID = socketID; this.nickname = nickname; @@ -20,8 +20,8 @@ const Player = class { }; this.isTeller = isTeller; this.isCurrentPlayer = isCurrentPlayer; - this.isReady = isReady; - this.duck = new DuckCursorObject({ isReady, color }); + this.bReady = bReady; + this.duck = new DuckCursorObject({ bReady, color }); this.votedCardID = null; this.submittedCardID = null; } @@ -44,8 +44,8 @@ const Player = class { } setReady(value) { - if (this.isReady === value) return; - this.isReady = value; + if (this.bReady === value) return; + this.bReady = value; this.duck.setVisibility(value, this.isCurrentPlayer); } From 5540c984c567b3efa3a041738a55459993262ef4 Mon Sep 17 00:00:00 2001 From: sbyeol3 Date: Thu, 17 Dec 2020 15:07:05 +0900 Subject: [PATCH 2/3] =?UTF-8?q?Refactor=20:=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EB=A6=AC=ED=8C=A9=ED=86=A0=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/game/GameMethods/common.js | 5 +---- src/backend/game/GameMethods/scoreBoardScene.js | 10 ++++------ src/frontend/engine/CardObject.js | 3 ++- src/frontend/engine/ProgressBarObject.js | 9 +++++++-- src/frontend/scenes/discussion/events.js | 15 +++++++++------ src/frontend/scenes/discussion/index.js | 2 +- src/frontend/scenes/endGame/index.js | 2 +- src/frontend/scenes/guesserSelectCard/index.js | 2 +- src/frontend/scenes/guesserWaiting/index.js | 2 +- src/frontend/scenes/guesserWaiting/render.js | 4 +--- src/frontend/scenes/mixCard/index.js | 2 +- src/frontend/scenes/mixCard/render.js | 4 +--- src/frontend/scenes/playerWaiting/index.js | 2 +- src/frontend/scenes/playerWaiting/render.js | 4 ++-- src/frontend/scenes/scoreboard/index.js | 2 +- src/frontend/scenes/tellerSelectCard/index.js | 2 +- src/frontend/scenes/vote/index.js | 2 +- src/frontend/scenes/voteResult/index.js | 2 +- src/frontend/scenes/waitingRoom/index.js | 2 +- src/frontend/utils/CardManager.js | 6 +++--- src/frontend/utils/PlayerManager.js | 4 ++-- src/frontend/utils/SceneManager.js | 2 +- 22 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/backend/game/GameMethods/common.js b/src/backend/game/GameMethods/common.js index 44e2ee7b..27ed270b 100644 --- a/src/backend/game/GameMethods/common.js +++ b/src/backend/game/GameMethods/common.js @@ -28,10 +28,7 @@ function dealCards(count = 1) { } const setUserTeller = (users, tellerTurnID) => { - users.forEach((user) => { - if (tellerTurnID === user.turnID) user.setTeller(true); - else user.setTeller(false); - }); + users.forEach((user) => user.setTeller(tellerTurnID === user.turnID)); }; function startRound() { diff --git a/src/backend/game/GameMethods/scoreBoardScene.js b/src/backend/game/GameMethods/scoreBoardScene.js index 6e9c0596..65afdc02 100644 --- a/src/backend/game/GameMethods/scoreBoardScene.js +++ b/src/backend/game/GameMethods/scoreBoardScene.js @@ -7,10 +7,10 @@ const isGameOver = (game) => { if (game.status.unusedCards.length < game.getUsers().length) return true; // 플레이어 최소 한명이 30점을 넘겼을 경우 - if (game.getUsers().some((user) => user.score >= SCORE.WIN_SCORE)) - return true; - - return false; + const bHigherGoal = game + .getUsers() + .some((user) => user.score >= SCORE.WIN_SCORE); + return bHigherGoal; }; // 가장 높은 스코어를 가진 유저의 socketID를 리턴 @@ -49,8 +49,6 @@ function endScoreBoardScene() { if (isGameOver(this)) { this.emitGameEnd(); - - // WaitingScene 시작 this.setState(GAME_STATE.WAITING); } else { this.startTellerScene(); diff --git a/src/frontend/engine/CardObject.js b/src/frontend/engine/CardObject.js index ad2f1f75..c1d6a4fa 100644 --- a/src/frontend/engine/CardObject.js +++ b/src/frontend/engine/CardObject.js @@ -6,6 +6,7 @@ import ImageObject from './ImageObject'; const getFacingStyle = (isUp) => (isUp ? 'rotateY(0deg)' : 'rotateY(180deg)'); const deg2rad = (deg) => (deg * Math.PI) / 180; const MOVE_PERCENT = 10; +const HIGH_DEPTH = 7; const CardObject = class extends GameObject { constructor({ @@ -73,7 +74,7 @@ const CardObject = class extends GameObject { return () => { const movedX = this.fixedX + Math.sin(deg2rad(this.angle)) * MOVE_PERCENT; const movedY = this.fixedY - Math.cos(deg2rad(this.angle)) * MOVE_PERCENT; - this.setDepth('7'); + this.setDepth(HIGH_DEPTH); this.move(movedX, movedY); if (this.tellerCard) diff --git a/src/frontend/engine/ProgressBarObject.js b/src/frontend/engine/ProgressBarObject.js index dce6bcfd..f1f2d112 100644 --- a/src/frontend/engine/ProgressBarObject.js +++ b/src/frontend/engine/ProgressBarObject.js @@ -5,6 +5,8 @@ import GameObject from './GameObject'; const RED_COLOR = '#d82e21'; const YELLOW_COLOR = '#ffd600'; const GREEN_COLOR = '#3ed78d'; +const SMALL_WIDTH = 30; +const MID_WIDTH = 60; const ProgressBarObject = class extends GameObject { constructor() { @@ -64,8 +66,11 @@ const ProgressBarObject = class extends GameObject { const remainTime = endTime - new Date().getTime(); const widthSize = (remainTime / this.time) * 100; progressBar.style.width = `${widthSize}%`; - if (widthSize < 30) progressBar.style.backgroundColor = RED_COLOR; - else if (widthSize < 60) progressBar.style.backgroundColor = YELLOW_COLOR; + if (widthSize < SMALL_WIDTH) { + progressBar.style.backgroundColor = RED_COLOR; + } else if (widthSize < MID_WIDTH) { + progressBar.style.backgroundColor = YELLOW_COLOR; + } timeText.innerText = (remainTime / 1000).toFixed(0); }, TIME.HALF_SECOND); diff --git a/src/frontend/scenes/discussion/events.js b/src/frontend/scenes/discussion/events.js index 93d4bd6f..24b42baa 100644 --- a/src/frontend/scenes/discussion/events.js +++ b/src/frontend/scenes/discussion/events.js @@ -2,11 +2,15 @@ import socket from '@utils/socket'; import { $qs } from '@utils/dom'; import PlayerManager from '@utils/PlayerManager'; +const changeClass = ({ target }) => { + target.classList.remove('skip-button'); + target.classList.add('skip-button-clicked'); +}; + // eslint-disable-next-line import/prefer-default-export export const clickSkip = ({ target }) => { const warningBox = $qs('.warning-bubble'); - target.classList.remove('skip-button'); - target.classList.add('skip-button-clicked'); + changeClass({ target }); target.setAttribute('disabled', true); warningBox.style.visibility = 'hidden'; socket.emit('skip player'); @@ -23,11 +27,10 @@ export const mouseOutSkip = () => { }; export const initTeller = () => { - const isTeller = PlayerManager.isTeller(); + const bTeller = PlayerManager.isTeller(); const skipButton = $qs('.skip-button'); - if (isTeller) { - skipButton.classList.remove('skip-button'); - skipButton.classList.add('skip-button-clicked'); + if (bTeller) { + changeClass({ target: skipButton }); skipButton.setAttribute('disabled', true); socket.emit('skip player'); } diff --git a/src/frontend/scenes/discussion/index.js b/src/frontend/scenes/discussion/index.js index 1aa243b2..3e9f1650 100644 --- a/src/frontend/scenes/discussion/index.js +++ b/src/frontend/scenes/discussion/index.js @@ -12,7 +12,7 @@ const Discussion = class { this.arrayToBeRemoved = arrayToBeRemoved; } - wrapup() { + wrapUp() { this.arrayToBeRemoved.forEach((gameObject) => { gameObject.delete(); }); diff --git a/src/frontend/scenes/endGame/index.js b/src/frontend/scenes/endGame/index.js index 73b18e01..965cc03c 100644 --- a/src/frontend/scenes/endGame/index.js +++ b/src/frontend/scenes/endGame/index.js @@ -16,7 +16,7 @@ const EndGame = class { this.arrayToBeRemoved = arrayToBeRemoved; } - wrapup() { + wrapUp() { this.arrayToBeRemoved.forEach((gameObject) => { gameObject.delete(); }); diff --git a/src/frontend/scenes/guesserSelectCard/index.js b/src/frontend/scenes/guesserSelectCard/index.js index b5098c7d..c9c6ab01 100644 --- a/src/frontend/scenes/guesserSelectCard/index.js +++ b/src/frontend/scenes/guesserSelectCard/index.js @@ -12,7 +12,7 @@ const GuesserSelectCard = class { this.arrayToBeRemoved = arrayToBeRemoved; } - wrapup() { + wrapUp() { this.arrayToBeRemoved.forEach((gameObject) => { gameObject.delete(); }); diff --git a/src/frontend/scenes/guesserWaiting/index.js b/src/frontend/scenes/guesserWaiting/index.js index 90d5dc45..38fdb0ee 100644 --- a/src/frontend/scenes/guesserWaiting/index.js +++ b/src/frontend/scenes/guesserWaiting/index.js @@ -12,7 +12,7 @@ const GuesserWaiting = class { this.cards = cards; } - wrapup() { + wrapUp() { this.arrayToBeRemoved.forEach((gameObject) => { gameObject.delete(); }); diff --git a/src/frontend/scenes/guesserWaiting/render.js b/src/frontend/scenes/guesserWaiting/render.js index c8d52b03..2322118d 100644 --- a/src/frontend/scenes/guesserWaiting/render.js +++ b/src/frontend/scenes/guesserWaiting/render.js @@ -34,9 +34,7 @@ const renderGuesserWaiting = ({ endTime }) => { const { CardsWrapper, cards } = createCards(GUESSER_WAITING); CardsWrapper.attachToRoot(); - cards.forEach((card) => { - card.setAnimateMove(false); - }); + cards.forEach((card) => card.setAnimateMove(false)); const arrayToBeRemoved = [ NotifyingTellerText, diff --git a/src/frontend/scenes/mixCard/index.js b/src/frontend/scenes/mixCard/index.js index a476428b..fa9d0980 100644 --- a/src/frontend/scenes/mixCard/index.js +++ b/src/frontend/scenes/mixCard/index.js @@ -12,7 +12,7 @@ const MixCard = class { this.arrayToBeRemoved = arrayToBeRemoved; } - wrapup() { + wrapUp() { this.arrayToBeRemoved.forEach((gameObject) => { gameObject.delete(); }); diff --git a/src/frontend/scenes/mixCard/render.js b/src/frontend/scenes/mixCard/render.js index a04c61ab..48b59812 100644 --- a/src/frontend/scenes/mixCard/render.js +++ b/src/frontend/scenes/mixCard/render.js @@ -20,9 +20,7 @@ const stackCards = async ({ Cards, position }) => { }; const rotateCards = ({ Cards }) => { - Cards.forEach((card) => { - card.rotate(NUMBER.ZERO, NUMBER.ZERO); - }); + Cards.forEach((card) => card.rotate(NUMBER.ZERO, NUMBER.ZERO)); }; const shuffleCard = async ({ card, position, zindex = NUMBER.MAX_Z_INDEX }) => { diff --git a/src/frontend/scenes/playerWaiting/index.js b/src/frontend/scenes/playerWaiting/index.js index b5183e0f..6501af01 100644 --- a/src/frontend/scenes/playerWaiting/index.js +++ b/src/frontend/scenes/playerWaiting/index.js @@ -18,7 +18,7 @@ const PlayerWaiting = class { this.arrayToBeRemoved = arrayToBeRemoved; } - wrapup() { + wrapUp() { this.arrayToBeRemoved.forEach((gameObject) => { gameObject.delete(); }); diff --git a/src/frontend/scenes/playerWaiting/render.js b/src/frontend/scenes/playerWaiting/render.js index 3b27bcd0..a0002142 100644 --- a/src/frontend/scenes/playerWaiting/render.js +++ b/src/frontend/scenes/playerWaiting/render.js @@ -6,7 +6,7 @@ import TEXT from '@utils/text'; import { $qs } from '@utils/dom'; const renderPlayerWaiting = ({ endTime }) => { - const isTeller = PlayerManager.isTeller(); + const bTeller = PlayerManager.isTeller(); const currentPlayer = PlayerManager.getCurrentPlayer(); SceneManager.beforeSubmittingPlayers.forEach((playerID) => { @@ -20,7 +20,7 @@ const renderPlayerWaiting = ({ endTime }) => { modal.remove(); } - if (isTeller) { + if (bTeller) { const { ProgressBar } = SceneManager.sharedComponents; ProgressBar.setTime(endTime); ProgressBar.start(); diff --git a/src/frontend/scenes/scoreboard/index.js b/src/frontend/scenes/scoreboard/index.js index 901db4fe..dd786f20 100644 --- a/src/frontend/scenes/scoreboard/index.js +++ b/src/frontend/scenes/scoreboard/index.js @@ -16,7 +16,7 @@ const Scoreboard = class { this.arrayToBeRemoved = arrayToBeRemoved; } - wrapup() { + wrapUp() { PlayerManager.updateCurrentScore(); LeftTab.updateScore(this.players); this.arrayToBeRemoved.forEach((gameObject) => { diff --git a/src/frontend/scenes/tellerSelectCard/index.js b/src/frontend/scenes/tellerSelectCard/index.js index 4f75ed00..40955487 100644 --- a/src/frontend/scenes/tellerSelectCard/index.js +++ b/src/frontend/scenes/tellerSelectCard/index.js @@ -13,7 +13,7 @@ const TellerSelectCard = class { this.arrayToBeRemoved = arrayToBeRemoved; } - wrapup() { + wrapUp() { this.arrayToBeRemoved.forEach((gameObject) => { gameObject.delete(); }); diff --git a/src/frontend/scenes/vote/index.js b/src/frontend/scenes/vote/index.js index cb6915b4..19748a25 100644 --- a/src/frontend/scenes/vote/index.js +++ b/src/frontend/scenes/vote/index.js @@ -11,7 +11,7 @@ const Vote = class { this.arrayToBeRemoved = arrayToBeRemoved; } - wrapup() { + wrapUp() { this.arrayToBeRemoved.forEach((gameObject) => { gameObject.delete(); }); diff --git a/src/frontend/scenes/voteResult/index.js b/src/frontend/scenes/voteResult/index.js index 46991b97..a9851d80 100644 --- a/src/frontend/scenes/voteResult/index.js +++ b/src/frontend/scenes/voteResult/index.js @@ -6,7 +6,7 @@ const VoteResult = class { this.arrayToBeRemoved = arrayToBeRemoved; } - wrapup() { + wrapUp() { this.arrayToBeRemoved.forEach((gameObject) => { gameObject.delete(); }); diff --git a/src/frontend/scenes/waitingRoom/index.js b/src/frontend/scenes/waitingRoom/index.js index 447924d0..b825a6dc 100644 --- a/src/frontend/scenes/waitingRoom/index.js +++ b/src/frontend/scenes/waitingRoom/index.js @@ -26,7 +26,7 @@ const WaitingRoom = class { PlayerManager.onUpdate.push(this.onUpdate.bind(this)); } - wrapup() { + wrapUp() { const { AllReadyText } = SceneManager.sharedComponents; AllReadyText.delete(); diff --git a/src/frontend/utils/CardManager.js b/src/frontend/utils/CardManager.js index 677b73a4..5608cc6d 100644 --- a/src/frontend/utils/CardManager.js +++ b/src/frontend/utils/CardManager.js @@ -46,9 +46,9 @@ const CardManager = class { } updateCardInformation(cardIDs) { - this.submittedCards.forEach((card, idx) => { - card.setCardInformation(cardIDs[idx]); - }); + this.submittedCards.forEach((card, idx) => + card.setCardInformation(cardIDs[idx]), + ); } liftSelectedCardUp() { diff --git a/src/frontend/utils/PlayerManager.js b/src/frontend/utils/PlayerManager.js index 926bbdb6..cc98f120 100644 --- a/src/frontend/utils/PlayerManager.js +++ b/src/frontend/utils/PlayerManager.js @@ -23,10 +23,10 @@ const PlayerManager = class extends Map { setTellerID(tellerID = '') { this.tellerID = tellerID; this.forEach((player) => { - const isTeller = player.socketID === tellerID; + const bTeller = player.socketID === tellerID; this.set({ ...player, - isTeller, + bTeller, }); }); } diff --git a/src/frontend/utils/SceneManager.js b/src/frontend/utils/SceneManager.js index b9662144..ad8aa77f 100644 --- a/src/frontend/utils/SceneManager.js +++ b/src/frontend/utils/SceneManager.js @@ -42,7 +42,7 @@ const SceneManager = { if (this.currentScene) { if (!this.currentScene.passingTimerClear) ProgressBar.clear(); - this.currentScene.wrapup(); + this.currentScene.wrapUp(); wrapupInterval = this.currentScene.wrapupInterval || TIME.NONE_INTERVAL; } if (!scene.bMaintainDucks) this.hideAllDucks(); From 53ac89b9be3c8e676e39f2841744ef30684643ef Mon Sep 17 00:00:00 2001 From: sbyeol3 Date: Thu, 17 Dec 2020 17:12:50 +0900 Subject: [PATCH 3/3] =?UTF-8?q?Refactor=20:=20=ED=97=9D=EA=B0=80=EB=A6=AC?= =?UTF-8?q?=EC=95=88=20=ED=91=9C=EA=B8=B0=EB=B2=95=20+=20=EB=8B=89?= =?UTF-8?q?=EB=84=A4=EC=9E=84=20=EB=B9=84=EC=96=B4=EC=9E=88=EB=8A=94=20?= =?UTF-8?q?=EA=B1=B0=20=ED=95=98=EB=A0=A4=EB=A9=B4=20=EC=9D=B4=EC=A0=84?= =?UTF-8?q?=EA=BA=BC=EB=A1=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/game/GameMethods/user.js | 4 ++-- src/backend/game/User.js | 14 +++++--------- src/backend/sockets/waitingRoom.js | 6 +++--- src/backend/utils/calcScore.js | 4 ++-- src/frontend/game/LeftTab.js | 2 +- src/frontend/scenes/guesserWaiting/render.js | 2 +- src/frontend/scenes/scoreboard/render.js | 4 ++-- src/frontend/scenes/voteResult/render.js | 4 ++-- src/frontend/scenes/waitingRoom/events.js | 3 ++- src/frontend/socket/scoreboard.js | 4 ++-- src/frontend/socket/waitingRoom.js | 4 ++-- src/frontend/utils/Player.js | 4 ++-- src/frontend/utils/PlayerManager.js | 2 +- src/frontend/utils/voiceChatUtil.js | 4 ---- 14 files changed, 27 insertions(+), 34 deletions(-) diff --git a/src/backend/game/GameMethods/user.js b/src/backend/game/GameMethods/user.js index 90efc2ad..5dad9f1e 100644 --- a/src/backend/game/GameMethods/user.js +++ b/src/backend/game/GameMethods/user.js @@ -28,12 +28,12 @@ function getUsers() { } function getTeller() { - const [teller] = this.getUsers().filter((user) => user.isTeller); + const [teller] = this.getUsers().filter((user) => user.bTeller); return teller; } function getGuessers() { - return this.getUsers().filter((user) => !user.isTeller); + return this.getUsers().filter((user) => !user.bTeller); } function getUsersProfile() { diff --git a/src/backend/game/User.js b/src/backend/game/User.js index 76989bb0..7923d18e 100644 --- a/src/backend/game/User.js +++ b/src/backend/game/User.js @@ -6,7 +6,7 @@ class User { this.nickname = nickname; this.color = color; - this.isTeller = false; + this.bTeller = false; this.turnID = 0; this.score = 0; @@ -32,7 +32,7 @@ class User { } setTeller(boolean) { - this.isTeller = boolean; + this.bTeller = boolean; } setReady(bReady) { @@ -57,16 +57,12 @@ class User { submitCard(cardID) { this.submittedCard = cardID; - - // 뽑은 카드를 리스트에서 지움 this.cards = this.cards.filter((card) => card !== cardID); } voteCard(cardID) { - // 악성 유저가 있을까봐 자기 카드 선택하는거 방지 if (cardID === this.submittedCard) return; - // 텔러가 vote 못하게 막기 - if (this.isTeller) return; + if (this.bTeller) return; this.votedCard = cardID; } @@ -83,7 +79,7 @@ class User { turnID, submittedCard, votedCard, - isTeller, + bTeller, cards, score, bReady, @@ -96,7 +92,7 @@ class User { turnID, submittedCard, votedCard, - isTeller, + bTeller, cards, score, bReady, diff --git a/src/backend/sockets/waitingRoom.js b/src/backend/sockets/waitingRoom.js index 1612d4ca..d4029157 100644 --- a/src/backend/sockets/waitingRoom.js +++ b/src/backend/sockets/waitingRoom.js @@ -51,9 +51,9 @@ function onUpdatePlayer(updatedUserProfile = {}) { const timeoutMap = new Map(); const isPossibleStartGame = ({ users }) => { - const isAllReady = [...users].every(([, user]) => user.bReady); - const isValidSize = users.size >= PLAYER.MIN && users.size <= PLAYER.MAX; - return isAllReady && isValidSize; + const bAllReady = [...users].every(([, user]) => user.bReady); + const bValidSize = users.size >= PLAYER.MIN && users.size <= PLAYER.MAX; + return bAllReady && bValidSize; }; const deleteGameStartTimeout = (roomID) => { diff --git a/src/backend/utils/calcScore.js b/src/backend/utils/calcScore.js index ab36ab54..246c1ccb 100644 --- a/src/backend/utils/calcScore.js +++ b/src/backend/utils/calcScore.js @@ -30,8 +30,8 @@ const mapScore = (correctScore, bonusScore) => ({ correctScore, bonusScore }); const getScoreMap = (game) => { const scoreMap = new Map(); const users = game.getUsers(); - const [teller] = users.filter((user) => user.isTeller); - const guessers = users.filter((user) => !user.isTeller); + const [teller] = users.filter((user) => user.bTeller); + const guessers = users.filter((user) => !user.bTeller); // Teller // [다 맞추거나 아무도 못 맞춤]인지 [한명이라도 맞춤]인지 확인 diff --git a/src/frontend/game/LeftTab.js b/src/frontend/game/LeftTab.js index 6bc850e4..0e07c4b6 100644 --- a/src/frontend/game/LeftTab.js +++ b/src/frontend/game/LeftTab.js @@ -44,7 +44,7 @@ class LeftTab { updateDuck(playerInfo) { const updatedDuck = this.findDuck(playerInfo.socketID); if (updatedDuck) { - updatedDuck.setHat(playerInfo.isTeller); + updatedDuck.setHat(playerInfo.bTeller); updatedDuck.update(playerInfo); } else this.addDuck(playerInfo); } diff --git a/src/frontend/scenes/guesserWaiting/render.js b/src/frontend/scenes/guesserWaiting/render.js index 2322118d..35d5dca7 100644 --- a/src/frontend/scenes/guesserWaiting/render.js +++ b/src/frontend/scenes/guesserWaiting/render.js @@ -21,7 +21,7 @@ const renderGuesserWaiting = ({ endTime }) => { ProgressBar.start(); PlayerManager.getPlayers().forEach((player) => - player.duck.setVisibility(!player.isTeller, player.isCurrentPlayer), + player.duck.setVisibility(!player.bTeller, player.isCurrentPlayer), ); const tellerColor = PlayerManager.getTeller().color; diff --git a/src/frontend/scenes/scoreboard/render.js b/src/frontend/scenes/scoreboard/render.js index 09b3aa2f..e5778865 100644 --- a/src/frontend/scenes/scoreboard/render.js +++ b/src/frontend/scenes/scoreboard/render.js @@ -9,7 +9,7 @@ import template from './template.html'; const defineRenderRow = (TableBody) => (player) => { const { nickname, - isTeller, + bTeller, score: { current, correct, bonus }, } = player; const TableRow = new GameObject({ @@ -24,7 +24,7 @@ const defineRenderRow = (TableBody) => (player) => { width: 60, parent: PlayerInfoWrapper, }); - DuckIcon.setHat(isTeller); + DuckIcon.setHat(bTeller); const NicknameObject = new TextObject({ parent: PlayerInfoWrapper, }).setContent(nickname); diff --git a/src/frontend/scenes/voteResult/render.js b/src/frontend/scenes/voteResult/render.js index 7df3dd3f..412255f3 100644 --- a/src/frontend/scenes/voteResult/render.js +++ b/src/frontend/scenes/voteResult/render.js @@ -59,7 +59,7 @@ const renderVoteResult = () => { votedCardID, submittedCardID, nickname, - isTeller, + bTeller, score, } = player; @@ -82,7 +82,7 @@ const renderVoteResult = () => { bonusScore.attachToObject(scoreContainer); bonusScore.addClass('bonus-score'); - if (isTeller) { + if (bTeller) { const tellerCard = cards.find((card) => card.cardID === submittedCardID); tellerCard.addClass('card-glow-gold'); return [...prev, nameDuck, nicknameText, nameContainer]; diff --git a/src/frontend/scenes/waitingRoom/events.js b/src/frontend/scenes/waitingRoom/events.js index cbec1b32..b26a18fc 100644 --- a/src/frontend/scenes/waitingRoom/events.js +++ b/src/frontend/scenes/waitingRoom/events.js @@ -26,7 +26,8 @@ export const copyGameCode = (e) => { export const changeNickname = (NicknameInput) => { const newNickname = NicknameInput.instance.value; if (!newNickname || newNickname.length > 12) { - // 이전 닉네임으로 되돌아가는 기능 추가해야 함 + const { nickname } = PlayerManager.getCurrentPlayer(); + NicknameInput.setValue(nickname); return; } socket.emit('update player', { nickname: newNickname }); diff --git a/src/frontend/socket/scoreboard.js b/src/frontend/socket/scoreboard.js index 55cc0e56..b75cae36 100644 --- a/src/frontend/socket/scoreboard.js +++ b/src/frontend/socket/scoreboard.js @@ -17,8 +17,8 @@ const onTellerSelect = ({ tellerID, cards, endTime }) => { PlayerManager.setTellerID(tellerID); CardManager.initializeMyCards(cards); SceneManager.initializeSubmiitingPlayers(); - const { isTeller } = PlayerManager.getCurrentPlayer(); - const nextScene = isTeller + const { bTeller } = PlayerManager.getCurrentPlayer(); + const nextScene = bTeller ? new TellerSelectCard({ cards, endTime }) : new GuesserWaiting({ endTime }); SceneManager.renderNextScene(nextScene); diff --git a/src/frontend/socket/waitingRoom.js b/src/frontend/socket/waitingRoom.js index 0c04a7f0..370ee299 100644 --- a/src/frontend/socket/waitingRoom.js +++ b/src/frontend/socket/waitingRoom.js @@ -56,8 +56,8 @@ const setupWaitingRoomSocket = () => { if (!SceneManager.isCurrentScene(WaitingRoom)) return; PlayerManager.setTellerID(tellerID); CardManager.initializeMyCards(cards); - const { isTeller } = PlayerManager.getCurrentPlayer(); - const nextScene = isTeller + const { bTeller } = PlayerManager.getCurrentPlayer(); + const nextScene = bTeller ? new TellerSelectCard({ cards, endTime }) : new GuesserWaiting({ endTime }); SceneManager.renderNextScene(nextScene); diff --git a/src/frontend/utils/Player.js b/src/frontend/utils/Player.js index de630d33..87855c41 100644 --- a/src/frontend/utils/Player.js +++ b/src/frontend/utils/Player.js @@ -6,7 +6,7 @@ const Player = class { socketID, nickname, color, - isTeller = false, + bTeller = false, isCurrentPlayer = false, bReady = false, } = {}) { @@ -18,7 +18,7 @@ const Player = class { bonus: 0, current: 0, }; - this.isTeller = isTeller; + this.bTeller = bTeller; this.isCurrentPlayer = isCurrentPlayer; this.bReady = bReady; this.duck = new DuckCursorObject({ bReady, color }); diff --git a/src/frontend/utils/PlayerManager.js b/src/frontend/utils/PlayerManager.js index cc98f120..b488521f 100644 --- a/src/frontend/utils/PlayerManager.js +++ b/src/frontend/utils/PlayerManager.js @@ -94,7 +94,7 @@ const PlayerManager = class extends Map { getTeller() { if (this.tellerID) return this.get(this.tellerID); - return [...this.map].find((player) => player.isTeller) || null; + return [...this.map].find((player) => player.bTeller) || null; } isTeller() { diff --git a/src/frontend/utils/voiceChatUtil.js b/src/frontend/utils/voiceChatUtil.js index 44dfc6d6..41913535 100644 --- a/src/frontend/utils/voiceChatUtil.js +++ b/src/frontend/utils/voiceChatUtil.js @@ -26,17 +26,13 @@ const addAudioStream = ({ mediaConnection, peerMap }) => { }); }; -// socket을 통해 다른 사람이 접속한걸 받았을 때 -// 다른 사람에게 mediaConnection 요청을 보냄 const connectToNewUser = ({ peer, socketID, stream, peerMap }) => { const mediaConnection = peer.call(socketID, stream); addAudioStream({ mediaConnection, peerMap }); }; -// 내가 다른 사람의 mediaConnection 요청을 받았을 때 const setAnswerBehavior = ({ stream, peerMap, peer }) => { peer.on('call', (mediaConnection) => { - // 다른 사람의 요청에 answer를 날림 mediaConnection.answer(stream); addAudioStream({ mediaConnection, peerMap }); });