Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/components/ui/selectionNumber/GuessNumber.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import React from "react";
import * as S from "./guessNumberStyle";
import NumberButton from "./NumberButton";

Expand All @@ -10,7 +11,9 @@ export default function GuessNumber() {
<S.numberContainer>
<S.leftContainer>
{numbers.map((num) => (
<NumberButton value={num} />
<React.Fragment key={num}>
<NumberButton value={num} />
</React.Fragment>
))}
</S.leftContainer>
<S.rightContaider>
Expand Down
10 changes: 9 additions & 1 deletion src/components/ui/selectionNumber/NumberButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,23 @@ import { useParams } from "react-router-dom";
import * as S from "./numberButtonStyle";
import { useSocketStore } from "../../../store/useSocketStore";
import { useCardIndexStore } from "../../../store/useGuessNumberStore";
import { useModal } from "../../../hooks/useModal";

export default function NumberButton({ value }: { value: number }) {
const params = useParams();
const roomId = Number(params.id);
const { socket } = useSocketStore();
const { cardIndex } = useCardIndexStore();

const { closeModal } = useModal();
const onClickNumber = () => {
if (!socket) return;
socket.emit("guessCard", { roomId, cardIndex, CardNumber: value });
console.log(
`방 ID: ${roomId}, 카드 인덱스: ${cardIndex}, 선택된 번호: ${value}`,
);
socket.emit("guessCard", { roomId, cardIndex, cardNumber: value });

closeModal();
};
return (
<S.numberButton onClick={onClickNumber}>
Expand Down
20 changes: 19 additions & 1 deletion src/pages/game/GameRoom.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,14 @@ interface IOponnentCard {
opponentCard: IOpponentColor[];
userId: number;
}

interface IWrongGuess {
cardIndex: number;
cardNumber: number;
finalHand: IFinalHand[];
message: string;
userId: number;
}
export default function GameRoom() {
const { socket, setSocket } = useSocketStore();
const params = useParams();
Expand All @@ -140,14 +148,16 @@ export default function GameRoom() {
const [newlyDrawn, setNewlyDrawn] = useState<IFinalHand>();
const [opponentIndex, setOpponentIndex] = useState<number>();
const [message, setMessage] = useState<string>();
const [wrongIndex, setWrongIndex] = useState<number>();

console.log(
"타입에러방지",
"타입에러방지용 콘솔",
arrangeCard,
fieldDeck,
opponent,
newlyDrawn,
message,
wrongIndex,
);
const { openModal } = useModal();

Expand Down Expand Up @@ -279,6 +289,13 @@ export default function GameRoom() {
setOpponentIndex(index);
};

const handleWrongGuess = async (data: IWrongGuess) => {
const { cardIndex, finalHand, message } = data;
setMessage(message);
setFinalHand(finalHand);
setWrongIndex(cardIndex);
};

socket.on("join", handleJoin);
socket.on("leave", handleLeave);
socket.on("ready", handleReady);
Expand All @@ -289,6 +306,7 @@ export default function GameRoom() {
socket.on("nowTurn", handleNowTurn);
socket.on("drawCard", handleDrawCard);
socket.on("opponentCard", handleOpponentCard);
socket.on("wrongGuess", handleWrongGuess);

return () => {
socket.disconnect();
Expand Down