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); }