diff --git a/apps/server/src/rooms/apple.room.test.ts b/apps/server/src/rooms/apple.room.test.ts index 6203482..9b7883a 100644 --- a/apps/server/src/rooms/apple.room.test.ts +++ b/apps/server/src/rooms/apple.room.test.ts @@ -95,8 +95,40 @@ describe('사과 게임 room flow', () => { room.onTimer(); expect(s().phase).toBe('playing'); expect(s().status.B).toBe('playing'); - h.clock.advance(s().endsAt - h.clock.now()); + h.clock.advance(s().endsAt! - h.clock.now()); room.onTimer(); expect(room.game!.finished).toBe(true); }); + test('제한 시간 무제한: 타이머가 돌지 않고, 끊긴 사람은 유예 뒤 한 번만 여기까지 처리(바쁜 루프 없음), 남은 사람이 여기까지 하면 끝', () => { + const h = harness(); + const r = h.manager.create('A', 'apple', 'private'); + if (typeof r === 'string') throw new Error(r); + const room = r as Room; + rooms.push(room); + const a = h.conn('A'); + const b = h.conn('B'); + room.join(a, 'player'); + room.join(b, 'player'); + room.ready('B', true); + expect(room.configure('A', { options: { timeLimitSec: null } })).toBeNull(); + expect(room.start('A')).toBeNull(); + h.clock.advance(3000); + room.onTimer(); + const s = () => room.game!.state as AppleState; + expect(s().phase).toBe('playing'); + expect(s().endsAt).toBeNull(); + expect(room.effectiveDeadline()).toBeNull(); + room.disconnect(b); + const d = room.effectiveDeadline()!; + expect(d).toBeGreaterThan(h.clock.now()); + h.clock.advance(d - h.clock.now()); + room.onTimer(); + expect(s().status.B).toBe('done'); + expect(s().status.A).toBe('playing'); + // Nothing else is due: no timer fires again for B. + expect(room.effectiveDeadline()).toBeNull(); + room.act('A', 1, { type: 'stop' }); + expect(room.game!.finished).toBe(true); + expect(s().final!.summary).toContain('모두 끝냈어요'); + }); }); diff --git a/apps/web/src/games/apple/help.test.ts b/apps/web/src/games/apple/help.test.ts index 276e3f0..5ca0f34 100644 --- a/apps/web/src/games/apple/help.test.ts +++ b/apps/web/src/games/apple/help.test.ts @@ -40,3 +40,14 @@ test('사과 게임: 막힘 / 나감 / 끝', () => { s.final = { endReason: 'time', ranking: [], summary: '시간이 다 됐어요. 사과를 가장 많이 지운 사람이 이겼어요' }; expect(helpNow(view(s, 'A'), 'A', users)).toContain('시간이 다 됐어요'); }); + +test('사과 게임: 제한 시간 무제한 / 여기까지', () => { + const { state: s0 } = setupGame('apple', 3, { timeLimitSec: null }); + expect(helpNow(view(s0, 'A'), 'A', users)).toContain('제한 시간은 없어요'); + const s = playing({ timeLimitSec: null }); + expect(helpNow(view(s, 'A'), 'A', users)).toContain('[여기까지 할래요]'); + expect(helpNow(view(s, null), null, users)).toContain('모두 끝냈을 때'); + s.status.A = 'done'; + s.score.A = 30; + expect(helpNow(view(s, 'A'), 'A', users)).toContain('여기까지 했어요. 사과 30개'); +}); diff --git a/apps/web/src/games/apple/help.ts b/apps/web/src/games/apple/help.ts index 9c3da14..b2c6922 100644 --- a/apps/web/src/games/apple/help.ts +++ b/apps/web/src/games/apple/help.ts @@ -17,17 +17,20 @@ function leaders(v: AppleView, players: Record, me: string | export function helpNow(v: AppleView, me: string | null, players: Record): string { if (v.phase === 'ended') return `게임이 끝났어요. ${v.result?.summary ?? ''}`.trim() + '\n최종 순위에서 각자 지운 사과 개수를 볼 수 있어요.'; const secs = v.options.timeLimitSec; - const limit = secs % 60 === 0 ? `${secs / 60}분` : `${secs}초`; - if (v.phase === 'countdown') return `곧 시작해요. 모두 똑같은 사과 판을 각자 풀어요. 제한 시간은 ${limit}이에요.\n${HOW}`; + const limitLine = secs === null ? '제한 시간은 없어요. 모두 끝낼 때까지 해요.' : `제한 시간은 ${secs % 60 === 0 ? `${secs / 60}분` : `${secs}초`}이에요.`; + if (v.phase === 'countdown') return `곧 시작해요. 모두 똑같은 사과 판을 각자 풀어요. ${limitLine}\n${HOW}`; const mine = v.seats.find((s) => s.id === me) ?? null; const lead = leaders(v, players, me); - if (!mine) return `모두 똑같은 판을 각자 풀고 있어요. 시간이 끝났을 때 사과를 가장 많이 지운 사람이 이겨요.${lead ? `\n${lead}` : ''}`; + const winLine = secs === null ? '모두 끝냈을 때' : '시간이 끝났을 때'; + if (!mine) return `모두 똑같은 판을 각자 풀고 있어요. ${winLine} 사과를 가장 많이 지운 사람이 이겨요.${lead ? `\n${lead}` : ''}`; if (mine.status === 'left') return '게임에서 나갔어요. 남은 사람들이 끝날 때까지 기다려 주세요.'; if (mine.status === 'stuck') { - return `내 판에는 이제 합이 10이 되는 사과 묶음이 없어요. 사과 ${mine.score}개를 지웠어요. 시간이 끝나거나 모두 막히면 순위가 나와요.${lead ? `\n${lead}` : ''}`; + return `내 판에는 이제 합이 10이 되는 사과 묶음이 없어요. 사과 ${mine.score}개를 지웠어요. ${secs === null ? '모두 끝내면' : '시간이 끝나거나 모두 막히면'} 순위가 나와요.${lead ? `\n${lead}` : ''}`; } + if (mine.status === 'done') return `여기까지 했어요. 사과 ${mine.score}개를 지웠어요. 모두 끝내면 순위가 나와요.${lead ? `\n${lead}` : ''}`; const lines = [HOW, '빈 칸은 합에 들어가지 않아서, 사이가 비어 있어도 멀리 있는 사과끼리 묶을 수 있어요.', `지금 내 점수는 사과 ${mine.score}개예요.`]; if (lead) lines.push(lead); + if (secs === null) lines.push('제한 시간이 없어요. 그만하고 싶으면 아래 [여기까지 할래요]를 두 번 눌러요.'); lines.push(KEYS); return lines.join('\n'); } diff --git a/apps/web/src/games/apple/index.tsx b/apps/web/src/games/apple/index.tsx index 10a882b..fece8c3 100644 --- a/apps/web/src/games/apple/index.tsx +++ b/apps/web/src/games/apple/index.tsx @@ -1,10 +1,10 @@ /** 사과 게임 화면 (docs/games/apple.md §9). */ -import { useEffect, useMemo, useRef, useState, type KeyboardEvent as ReactKeyboardEvent, type PointerEvent as ReactPointerEvent, type ReactNode } from 'react'; +import { useEffect, useMemo, useRef, useState, type CSSProperties, type KeyboardEvent as ReactKeyboardEvent, type PointerEvent as ReactPointerEvent, type ReactNode } from 'react'; import type { AppleOptions, AppleView, SeatView } from '@bg/games/apple'; import type { PublicUser } from '@bg/shared/lite'; import { Avatar } from '../../components/ui'; import { useServerNow } from '../../components/TurnTimer'; -import { haptic, sounds } from '../../lib/feedback'; +import { haptic, sfx, tone } from '../../lib/feedback'; import { socket } from '../../net/socket'; import type { BoardProps, GameUI, OptionsProps } from '../types'; import { helpNow } from './help'; @@ -49,7 +49,26 @@ const clock = (ms: number) => { const s = Math.ceil(Math.max(0, ms) / 1000); return `${Math.floor(s / 60)}:${String(s % 60).padStart(2, '0')}`; }; -const limitLabel = (sec: number) => (sec % 60 === 0 ? `${sec / 60}분` : `${sec}초`); +const limitLabel = (sec: number | null) => (sec === null ? '무제한' : sec % 60 === 0 ? `${sec / 60}분` : `${sec}초`); + +/** Game sounds on top of the shared palette (site volume applies). */ +const apSound = { + /** Apples popping: one rising pop per apple (up to 5), quick enough to finish while they vanish. */ + clear: (n: number) => { + for (let i = 0; i < Math.min(5, n); i++) tone(520 + i * 110, 80, 'sine', 0.16, i * 38, { slideTo: 1100 + i * 160 }); + }, + /** Let go on a sum that is not 10: a soft "thud", no penalty. */ + miss: () => tone(230, 90, 'triangle', 0.09, 0, { slideTo: 180 }), + /** The box being dragged just added up to 10. */ + ten: () => tone(1320, 45, 'triangle', 0.07), + count: () => tone(660, 90, 'triangle', 0.12), + go: () => { + tone(988, 120, 'triangle', 0.14); + tone(1318, 200, 'triangle', 0.12, 90); + }, +}; + +const statusSuffix = (s: SeatView) => (s.status === 'stuck' ? ', 더 지울 사과 없음' : s.status === 'done' ? ', 여기까지 함' : s.status === 'left' ? ', 나감' : ''); /** Ranks by score (ties share), players who left last. */ function ranked(seats: SeatView[]): (SeatView & { rank: number })[] { @@ -89,6 +108,11 @@ const CSS = ` :root[data-theme='dark'] .ap-board { background: #3b2f22; box-shadow: var(--shadow), inset 0 0 0 3px #6b4f2a; } @media (prefers-color-scheme: dark) { :root[data-theme='auto'] .ap-board { background: #3b2f22; box-shadow: var(--shadow), inset 0 0 0 3px #6b4f2a; } } .ap-pop { animation: ap-pop .42s ease-out forwards; transform-box: fill-box; transform-origin: center; pointer-events: none; } +.ap-burst { animation: ap-burst .45s ease-out forwards; transform-box: fill-box; transform-origin: center; pointer-events: none; } +.ap-in { animation: ap-in .34s cubic-bezier(.3,1.5,.5,1) both; animation-delay: var(--d, 0ms); transform-box: fill-box; transform-origin: center; } +.ap-pill b, .ap-others li b { display: inline-block; } +.ap-over.count b { display: block; animation: ap-count .9s ease-out both; } +.ap-stop { min-height: 40px; } .ap-over { position: absolute; inset: 0; display: flex; flex-direction: column; align-items: center; justify-content: center; gap: 6px; pointer-events: none; border-radius: 14px; text-align: center; padding: 12px; } .ap-over.count { background: rgba(0,0,0,.35); color: #fff; font-size: 5rem; font-weight: 900; text-shadow: 0 3px 8px rgba(0,0,0,.5); } @@ -99,9 +123,12 @@ const CSS = ` .ap-flash.ok { color: var(--success); border: 3px solid var(--success); } .ap-flash.bad { color: var(--text-sub); border: 3px solid var(--border); } .ap-keys { color: var(--text-sub); font-size: .85rem; font-weight: 600; text-align: center; margin: 0; } +@keyframes ap-burst { 0% { transform: scale(.5); opacity: .9; } 100% { transform: scale(1.6); opacity: 0; } } +@keyframes ap-in { from { transform: scale(0); opacity: 0; } } +@keyframes ap-count { 0% { transform: scale(1.8); opacity: 0; } 25% { transform: scale(1); opacity: 1; } 100% { transform: scale(.85); opacity: .85; } } @keyframes ap-pop { 0% { transform: scale(1); opacity: 1; } 40% { transform: scale(1.25); opacity: .9; } 100% { transform: scale(.2) translateY(-30px); opacity: 0; } } @keyframes ap-flash { 0% { opacity: 0; transform: translateX(-50%) scale(.8); } 15% { opacity: 1; transform: translateX(-50%) scale(1.05); } 70% { opacity: 1; } 100% { opacity: 0; } } -@media (prefers-reduced-motion: reduce) { .ap-pop { animation-duration: .01s; } .ap-flash { animation: none; } } +@media (prefers-reduced-motion: reduce) { .ap-pop { animation-duration: .01s; } .ap-flash, .ap-in, .ap-burst, .ap-over.count b { animation: none; } .ap-burst { display: none; } } `; // ---------------------------------------------------------------- art @@ -125,13 +152,19 @@ function AppleDefs() { ); } -function AppleCell({ x, y, n }: { x: number; y: number; n: number }) { - return ( - +function AppleCell({ x, y, n, introDelay }: { x: number; y: number; n: number; introDelay?: number }) { + const apple = ( + <> {n} + + ); + return ( + + {/* The CSS animation goes on an inner group: it would replace the SVG translate on the outer one. */} + {introDelay === undefined ? apple : {apple}} ); } @@ -185,7 +218,27 @@ function AppleBoard({ view: v, me, players, act }: BoardProps) { const seq = useRef(0); const mine = v.seats.find((s) => s.id === me) ?? null; - const canPlay = !!mine && mine.status === 'playing' && v.phase === 'playing' && !!v.cells && now < v.endsAt; + const canPlay = !!mine && mine.status === 'playing' && v.phase === 'playing' && !!v.cells && (v.endsAt === null || now < v.endsAt); + const unlimited = v.endsAt === null; + const [stopAsk, setStopAsk] = useState(false); + // The board appearing (after the countdown, or when I open the room) pops the apples in, row by row. + const [intro, setIntro] = useState(false); + const hadCells = useRef(null); + useEffect(() => { + const has = !!v.cells; + if (hadCells.current === false && has) setIntro(true); + hadCells.current = has; + }, [v.cells]); + useEffect(() => { + if (!intro) return; + const t = setTimeout(() => setIntro(false), 900); + return () => clearTimeout(t); + }, [intro]); + useEffect(() => { + if (!stopAsk) return; + const t = setTimeout(() => setStopAsk(false), 3000); + return () => clearTimeout(t); + }, [stopAsk]); // My board as I see it: the server's, minus the apples I just cleared and the server has not confirmed yet. const cells = useMemo(() => { @@ -240,17 +293,18 @@ function AppleBoard({ view: v, me, players, act }: BoardProps) { } if (sum !== 10) { if (idx.length >= 2 || fromKey) { + apSound.miss(); setFlash({ key: ++seq.current, ok: false, text: `합 ${sum} · 10이 아니에요` }); say(`합이 ${sum}이에요. 딱 10이 되게 골라 주세요.`); } return; } + act({ type: 'select', ...rect }); setGone((g) => [...g, ...idx]); setPops((p) => [...p, { key: ++seq.current, cells: idx.map((i) => ({ i, n: cells.charCodeAt(i) - 48 })) }]); setFlash({ key: ++seq.current, ok: true, text: `+${idx.length}` }); - sounds.stone(); + apSound.clear(idx.length); haptic(15); - act({ type: 'select', ...rect }); say(`사과 ${idx.length}개를 지웠어요.`); }; @@ -316,9 +370,24 @@ function AppleBoard({ view: v, me, players, act }: BoardProps) { } }; - const left = Math.max(0, v.endsAt - Math.max(now, v.countdownEndsAt)); + const left = v.endsAt === null ? null : Math.max(0, v.endsAt - Math.max(now, v.countdownEndsAt)); const countdown = v.phase === 'countdown' ? Math.max(1, Math.ceil((v.countdownEndsAt - now) / 1000)) : 0; const sumState = !sel || sel.idx.length === 0 ? 'idle' : sel.sum === 10 ? 'ok' : sel.sum > 10 ? 'over' : 'under'; + // Sounds that follow the clock and the state: 3·2·1, start, last 10 seconds, "10!" while dragging, finished. + const lastSec = v.phase === 'playing' && left !== null && left > 0 && left <= 10_000 ? Math.ceil(left / 1000) : 0; + const heard = useRef({ countdown: 0, lastSec: 0, sum: 'idle', status: mine?.status ?? null }); + useEffect(() => { + const was = heard.current; + if (countdown !== was.countdown) { + if (countdown > 0) apSound.count(); + else if (was.countdown > 0 && v.phase === 'playing') apSound.go(); + } + if (lastSec && lastSec !== was.lastSec) sfx.tick(); + if (sumState === 'ok' && was.sum !== 'ok') apSound.ten(); + const st = mine?.status ?? null; + if (st !== was.status && was.status === 'playing' && (st === 'stuck' || st === 'done') && v.phase === 'playing') sfx.good(); + heard.current = { countdown, lastSec, sum: sumState, status: st }; + }); const others = ranked(v.seats); // Selection rectangle in display coordinates. @@ -348,12 +417,21 @@ function AppleBoard({ view: v, me, players, act }: BoardProps) {
- - ⏱ {clock(left)} - + {left === null ? ( + + ⏱ 무제한 + + ) : ( + + ⏱ {clock(left)} + + )} {mine && ( - 🍎 {mine.score} + 🍎{' '} + + {mine.score} + )} {mine && v.phase !== 'ended' && ( @@ -365,11 +443,13 @@ function AppleBoard({ view: v, me, players, act }: BoardProps) { {v.seats.length > 1 && (
    {others.map((s) => ( -
  1. +
  2. {s.id === me ? '나' : nick(players, s.id)} - {s.score} - {s.status === 'stuck' && ✔} + + {s.score} + + {(s.status === 'stuck' || s.status === 'done') && ✔}
  3. ))}
@@ -403,14 +483,17 @@ function AppleBoard({ view: v, me, players, act }: BoardProps) { const n = ch.charCodeAt(0) - 48; if (n <= 0) return null; const [dr, dc] = toDisp([Math.floor(i / COLS), i % COLS]); - return ; + return ; })} {pops.map((p) => p.cells.map(({ i, n }) => { const [dr, dc] = toDisp([Math.floor(i / COLS), i % COLS]); return ( - - + + + + + ); }), @@ -425,7 +508,7 @@ function AppleBoard({ view: v, me, players, act }: BoardProps) { )} {countdown > 0 && (
- {countdown} + {countdown} 합이 10이 되게 사과를 묶어요!
)} @@ -434,9 +517,27 @@ function AppleBoard({ view: v, me, players, act }: BoardProps) { 더 지울 수 있는 사과가 없어요! 사과 {mine.score}개 · 끝날 때까지 기다려요
)} + {mine && mine.status === 'done' && v.phase === 'playing' && ( +
+ 여기까지 했어요! 사과 {mine.score}개 · 모두 끝날 때까지 기다려요 +
+ )} {mine && mine.status === 'left' && v.phase !== 'ended' &&
게임에서 나갔어요.
} {!mine && v.phase !== 'ended' &&
관전 중이에요 · 위에서 점수를 볼 수 있어요
}
+ {unlimited && canPlay && ( + + )} {!phone && mine && v.phase !== 'ended' &&

마우스로 드래그해서 합이 10이면 손을 떼요 · 키보드: 화살표 + 스페이스(시작점·끝점), Esc 취소

}

{announce} @@ -454,14 +555,14 @@ function AppleSide({ view: v, me, players }: BoardProps) {

사과 게임{v.phase === 'ended' ? ' · 게임 끝' : ''} - 17×10 판 · 제한 시간 {limitLabel(v.options.timeLimitSec)} · 모두 같은 판 + 17×10 판 · 제한 시간 {limitLabel(v.options.timeLimitSec)}{v.options.timeLimitSec === null ? '(모두 끝낼 때까지)' : ''} · 모두 같은 판
    {rows.map((s) => (
  1. {s.rank}등 @@ -470,7 +571,7 @@ function AppleSide({ view: v, me, players }: BoardProps) { {nick(players, s.id)} {s.id === me ? ' (나)' : ''} - {s.status === 'stuck' ? ' · 다 지움' : s.status === 'left' ? ' · 나감' : ''} + {s.status === 'stuck' ? ' · 다 지움' : s.status === 'done' ? ' · 여기까지' : s.status === 'left' ? ' · 나감' : ''} 🍎 {s.score} @@ -514,12 +615,13 @@ function statusText(v: AppleView, me: string | null, players: Record({ value, options, onChange, label }: { value: T; options: [T, string][]; onChange: (v: T) => void; label: string }) { +function Seg({ value, options, onChange, label }: { value: T; options: [T, string][]; onChange: (v: T) => void; label: string }) { return (
    {options.map(([k, l]) => ( @@ -543,10 +645,15 @@ function Options({ value: o, onChange }: OptionsProps) { [60, '1분'], [120, '2분'], [180, '3분'], + [null, '무제한'], ]} onChange={(timeLimitSec) => onChange({ ...o, timeLimitSec })} /> - 원래 게임은 2분이에요. 시간이 끝났을 때 사과를 가장 많이 지운 사람이 이겨요. + + {o.timeLimitSec === null + ? '시간 제한 없이 각자 더 지울 사과가 없거나 [여기까지 할래요]를 누를 때까지 해요. 모두 끝나면 가장 많이 지운 사람이 이겨요.' + : '원래 게임은 2분이에요. 시간이 끝났을 때 사과를 가장 많이 지운 사람이 이겨요.'} +
); @@ -559,7 +666,8 @@ function optionsSummary(o: AppleOptions): string { // ---------------------------------------------------------------- rules function Rules({ options }: { options?: AppleOptions }) { - const limit = limitLabel(options?.timeLimitSec ?? 120); + const limitSec = options ? options.timeLimitSec : 120; + const limit = limitLabel(limitSec); return (

@@ -576,7 +684,10 @@ function Rules({ options }: { options?: AppleOptions }) { 일어나지 않고 벌칙도 없어요. 지운 자리는 빈 칸이 되고 빈 칸은 합에 들어가지 않아서, 사이가 비면 멀리 있는 사과끼리도 묶을 수 있어요.

- 제한 시간은 {limit}이에요. 시간이 끝나면 사과를 가장 많이 지운 사람이 이기고, 개수가 같으면 같은 순위예요. 모두 더 지울 수 있는 묶음이 없으면 조금 일찍 끝나요. 혼자서도 할 수 있어요. + {limitSec === null + ? '이 방은 제한 시간이 없어요. 각자 더 지울 수 있는 묶음이 없거나 [여기까지 할래요]를 누르면 끝나고, 모두 끝나면 사과를 가장 많이 지운 사람이 이겨요. 개수가 같으면 같은 순위예요. 연결이 끊긴 채 오래 돌아오지 않으면 그때까지 점수로 끝낸 것으로 봐요.' + : `제한 시간은 ${limit}이에요. 시간이 끝나면 사과를 가장 많이 지운 사람이 이기고, 개수가 같으면 같은 순위예요. 모두 더 지울 수 있는 묶음이 없으면 조금 일찍 끝나요.`}{' '} + 혼자서도 할 수 있어요.

휴대폰에서는 판을 세로로 돌려서 보여 줘요. 키보드로는 화살표로 칸을 옮기고 스페이스(또는 Enter)로 시작점, 한 번 더 눌러 끝점을 정해요. Esc는 취소예요. diff --git a/apps/web/src/games/dobble/index.tsx b/apps/web/src/games/dobble/index.tsx index cbe3521..990b8c5 100644 --- a/apps/web/src/games/dobble/index.tsx +++ b/apps/web/src/games/dobble/index.tsx @@ -4,7 +4,7 @@ import type { CardView, ClaimPair, DobbleOptions, DobbleView, LogEntry, MiniGame import type { PublicUser } from '@bg/shared/lite'; import { Avatar } from '../../components/ui'; import { useServerNow } from '../../components/TurnTimer'; -import { haptic, sounds } from '../../lib/feedback'; +import { haptic, sfx, sounds, tone } from '../../lib/feedback'; import { useSeatRows } from '../../lib/seat-rows'; import { socket, useRoom } from '../../net/socket'; import type { BoardProps, GameUI, OptionsProps } from '../types'; @@ -21,6 +21,22 @@ const userOf = (players: Record, id: string): PublicUser => players[id] ?? { id, nickname: '알 수 없음', avatar: null, kind: 'guest' }; const who = (players: Record, me: string | null, id: string) => (id === me ? '내가' : `${nick(players, id)}님이`); +/** Game sounds on top of the shared palette (site volume applies). */ +const dbSound = { + /** Soft tap the moment a symbol is pressed (the verdict comes from the server). */ + tap: () => tone(1500, 25, 'triangle', 0.06), + /** "찾았다!" two-note chime, a little brighter than the shared one. */ + found: () => { + tone(1047, 80, 'triangle', 0.15); + tone(1568, 160, 'triangle', 0.13, 70); + }, + count: () => tone(660, 90, 'triangle', 0.12), + go: () => { + tone(988, 120, 'triangle', 0.14); + tone(1318, 200, 'triangle', 0.12, 90); + }, +}; + const CSS = ` .db { width: 100%; max-width: 1060px; display: flex; flex-direction: column; gap: 10px; align-self: center; --cd: min(440px, 50vh, calc(50% - 14px)); } .db-top { display: flex; flex-wrap: wrap; gap: 6px 8px; align-items: center; justify-content: space-between; font-weight: 700; } @@ -47,6 +63,12 @@ button.db-seat { cursor: pointer; } .db-card { position: relative; width: 100%; aspect-ratio: 1; border-radius: 50%; background: #fffdf6; border: 4px solid #d6c7a1; box-shadow: 0 6px 0 rgba(0,0,0,.18), 0 10px 22px rgba(0,0,0,.28); } .db-card.empty { background: rgba(255,255,255,.1); border: 3px dashed rgba(255,255,255,.55); box-shadow: none; display: flex; align-items: center; justify-content: center; color: #fff; font-weight: 800; text-align: center; padding: 18%; } .db-card[data-shake='true'] { animation: db-shake .4s ease; } +.db-card.slap { animation: db-slap .2s ease-out; } +.db-seat .meta .n { display: inline-block; } +.db-seat[data-done='true'] { border-color: #16a34a; } +.db-count b { display: block; animation: db-count .9s ease-out both; } +@keyframes db-slap { from { transform: scale(1.07) rotate(-3deg); } } +@keyframes db-count { 0% { transform: scale(1.8); opacity: 0; } 25% { transform: scale(1); opacity: 1; } 100% { transform: scale(.85); opacity: .85; } } .db-sym { position: absolute; border-radius: 50%; border: 0; padding: 0; margin: 0; background: transparent; cursor: pointer; display: flex; align-items: center; justify-content: center; -webkit-tap-highlight-color: transparent; touch-action: manipulation; } .db-sym:disabled { cursor: default; } @media (hover: hover) { .db-sym:hover:not(:disabled) { background: rgba(37, 99, 235, .08); } } @@ -101,7 +123,7 @@ button.db-seat { cursor: pointer; } .db-count { font-size: 4rem; } } @media (prefers-reduced-motion: reduce) { - .db-card[data-shake='true'], .db-sym .ic.in, .db-bubble, .db-sym[data-hint='true'] { animation: none; } + .db-card[data-shake='true'], .db-card.slap, .db-count b, .db-sym .ic.in, .db-bubble, .db-sym[data-hint='true'] { animation: none; } .db-sym[data-hit='true'] .ic { transition: none; } } `; @@ -144,7 +166,7 @@ function DobbleCard({ children?: ReactNode; }) { return ( -

+
{card.items.map((it, i) => { const d = it.r * 100; return ( @@ -286,7 +308,6 @@ function DobbleBoard({ view: v, me, players, act, pending }: BoardProps 0) setBubble({ key: `lk${Date.now()}`, kind: 'late', text: `잠깐! ${Math.ceil(lockedLeft / 1000)}초 뒤에 다시 눌러요` }); return; } - haptic(15); act({ type: 'claim', base: pair.base, @@ -295,6 +316,9 @@ function DobbleBoard({ view: v, me, players, act, pending }: BoardProps (s.status === 'finished' || s.status === 'escaped') && p.seats.find((x) => x.id === s.id)?.status === 'playing'); + if (done.length && v.phase !== 'ended') sfx.good(); + // The stall hint just appeared. + if (v.hint.length && v.hintUntil !== p.hintUntil && v.hintUntil > 0) sfx.select(); }, [v]); // eslint-disable-line react-hooks/exhaustive-deps useEffect(() => { @@ -373,6 +406,16 @@ function DobbleBoard({ view: v, me, players, act, pending }: BoardProps { + const was = beeped.current; + beeped.current = beep; + if (beep === was) return; + if (beep > 0 && beep <= 3) dbSound.count(); + else if (beep === -1 && was >= 0 && playing) dbSound.go(); + }, [beep, playing]); const hint = v.hintUntil > now ? v.hint : []; const tapper = canTap || (!!pair && playing && lockedLeft > 0) ? claim : null; @@ -464,7 +507,9 @@ function DobbleBoard({ view: v, me, players, act, pending }: BoardProps{nick(players, s.id)} - {countText(mode, s)} + + {countText(mode, s)} + {s.lockedUntil > now && s.status === 'playing' ? ' · 잠금' : ''} {v.options.showRtt && } @@ -486,7 +531,7 @@ function DobbleBoard({ view: v, me, players, act, pending }: BoardProps ) : ( -
+
{inner}
)} @@ -507,7 +552,7 @@ function DobbleBoard({ view: v, me, players, act, pending }: BoardProps 0 && (
- {countdown} + {countdown} {v.phase === 'roundEnd' ? '다음 라운드를 준비해요' : '두 카드에 똑같이 있는 그림을 찾아요!'}
)} diff --git a/apps/web/src/games/halli-galli/help.ts b/apps/web/src/games/halli-galli/help.ts index 9298cf5..eb633dd 100644 --- a/apps/web/src/games/halli-galli/help.ts +++ b/apps/web/src/games/halli-galli/help.ts @@ -33,6 +33,7 @@ export function helpNow(v: HalliGalliView, me: string | null, players: Record, id: string): PublicUser => players[id] ?? { id, nickname: '알 수 없음', avatar: null, kind: 'guest' }; const cardName = (c: Pick) => `${FRUIT_KO[c.fruit]} ${c.count}개`; +/** Game sounds on top of the shared palette (site volume applies). */ +const hgSound = { + /** Countdown 3·2·1 and the start beep. */ + count: () => tone(660, 90, 'triangle', 0.12), + go: () => { + tone(988, 120, 'triangle', 0.14); + tone(1318, 200, 'triangle', 0.12, 90); + }, + /** Every face-up card swept to the winner. */ + sweep: (cards: number) => { + sfx.whoosh(); + sfx.deal(Math.min(6, Math.max(2, Math.ceil(cards / 3))), 45); + }, +}; + const CSS = ` .hg { width: 100%; max-width: 1100px; display: flex; flex-direction: column; gap: 10px; align-self: center; } .hg-top { display: flex; flex-wrap: wrap; gap: 6px 10px; align-items: center; justify-content: space-between; font-weight: 700; } @@ -82,6 +97,12 @@ const CSS = ` .hg-panel { background: var(--surface); border-radius: 16px; box-shadow: var(--shadow); padding: 12px; } .hg-log { list-style: none; margin: 8px 0 0; padding: 0; display: grid; gap: 3px; max-height: 220px; overflow: auto; } .hg-fruit-ic { width: 26px; height: 26px; display: inline-block; vertical-align: middle; } +.hg-seat[data-shake='true'] .hg-pile { animation: anim-shake .45s ease; } +.hg-seat[data-out='true'] .hg-pile { filter: grayscale(.7); transition: filter .4s ease; } +.hg-meta .gain { display: inline-block; } +.hg-count b { display: block; animation: hg-count .9s ease-out both; } +.hg-flipbtn.anim-glow { animation-duration: 1.1s; } +@keyframes hg-count { 0% { transform: scale(1.8); opacity: 0; } 25% { transform: scale(1); opacity: 1; } 100% { transform: scale(.85); opacity: .85; } } @keyframes hg-blink { 0%,100% { box-shadow: 0 0 0 0 rgba(253,224,71,.0); } 50% { box-shadow: 0 0 0 6px rgba(253,224,71,.55); } } @keyframes hg-flip { from { transform: rotateY(85deg) scale(.9); } to { transform: none; } } @keyframes hg-pop { 0% { transform: translateX(-50%) scale(.6); opacity: 0; } 70% { transform: translateX(-50%) scale(1.06); opacity: 1; } 100% { transform: translateX(-50%) scale(1); } } @@ -96,7 +117,7 @@ const CSS = ` } @media (prefers-reduced-motion: reduce) { .hg-seat[data-turn='true'] { animation: none; box-shadow: 0 0 0 4px rgba(253,224,71,.55); } - .hg-pile .face, .hg-bell .art[data-ring='true'], .hg-bubble { animation: none; } + .hg-pile .face, .hg-bell .art[data-ring='true'], .hg-bubble, .hg-count b, .hg-seat[data-shake='true'] .hg-pile { animation: none; } .hg-ghost { display: none; } } `; @@ -296,14 +317,22 @@ function seatLabel(s: SeatView, players: Record, me: string return parts.join(', '); } -function Seat({ s, v, pos, players, me, now }: { s: SeatView; v: HalliGalliView; pos: Pos; players: Record; me: string | null; now: number }) { +function Seat({ s, v, pos, players, me, now, shake }: { s: SeatView; v: HalliGalliView; pos: Pos; players: Record; me: string | null; now: number; shake: boolean }) { const u = userOf(players, s.id); const locked = s.lockedUntil > now && s.status === 'playing'; + // The deck count bumps when it grows (cards won with the bell or given as a penalty). + const lastDeck = useRef(s.deck); + const [gain, setGain] = useState(0); + useEffect(() => { + if (s.deck > lastDeck.current) setGain((g) => g + 1); + lastDeck.current = s.deck; + }, [s.deck]); return (
  • )} - {s.isTurn && v.phase === 'playing' && } + {s.isTurn && v.phase === 'playing' && v.turnDeadline !== null && }
  • - + 0 ? 'gain anim-bump' : 'gain'}> {s.deck} {s.status === 'out' && ( @@ -384,6 +413,7 @@ function HalliGalliBoard({ view: v, me, players, act, pending }: BoardProps(null); const [ghosts, setGhosts] = useState([]); const [hit, setHit] = useState(0); + const [shake, setShake] = useState<{ id: string; seq: number } | null>(null); const [announce, setAnnounce] = useState(''); const sentFor = useRef(null); const prev = useRef(null); @@ -406,10 +436,11 @@ function HalliGalliBoard({ view: v, me, players, act, pending }: BoardProps { if (!canRing || sentFor.current === v.tableVersion) return; sentFor.current = v.tableVersion; + // Send first: the sound and the bell wobble must not delay the press by a frame. + act({ type: 'ring', version: v.tableVersion, ...(v.options.latencyComp === 'light' && rtt !== null ? { rtt } : {}) }); setHit((h) => h + 1); sounds.ding(); haptic(30); - act({ type: 'ring', version: v.tableVersion, ...(v.options.latencyComp === 'light' && rtt !== null ? { rtt } : {}) }); }; const flip = () => { if (!canFlip) return; @@ -469,13 +500,17 @@ function HalliGalliBoard({ view: v, me, players, act, pending }: BoardProps h + 1); if (b.correct) { if (b.player !== me) sounds.ding(); else haptic([40, 30, 80]); + hgSound.sweep(b.cards); p.seats.forEach((s, i) => s.top && fly.push({ key: `g${b.seq}-${s.id}`, from: posOf(s.id), to, card: s.top, delay: i * 40 })); if (p.pot > 0) fly.push({ key: `g${b.seq}-pot`, from: CENTER, to, card: null, delay: 0 }); } else { sounds.buzz(); + setShake({ id: b.player, seq: b.seq }); if (b.player === me) haptic([90, 50, 90]); const from = posOf(b.player); const targets = v.options.wrongToPot ? [CENTER] : p.seats.filter((s) => s.id !== b.player && s.status === 'playing').map((s) => posOf(s.id)); @@ -484,8 +519,10 @@ function HalliGalliBoard({ view: v, me, players, act, pending }: BoardProps s.status !== 'playing' && p.seats.find((x) => x.id === s.id)?.status === 'playing'); + if (outNow.length && v.phase !== 'ended') sfx.capture(); if (v.tableVersion !== p.tableVersion && v.lastFlipBy) { - sounds.stone(); + sfx.cardFlip(); const s = v.seats.find((x) => x.id === v.lastFlipBy); if (s?.top) setAnnounce(`${s.id === me ? '내가' : `${nick(players, s.id)}님이`} ${cardName(s.top)}를 뒤집었어요`); } @@ -503,6 +540,12 @@ function HalliGalliBoard({ view: v, me, players, act, pending }: BoardProps clearTimeout(t); }, [ghosts]); + useEffect(() => { + if (!shake) return; + const t = setTimeout(() => setShake(null), 500); + return () => clearTimeout(t); + }, [shake]); + useEffect(() => { if (!bubble) return; const t = setTimeout(() => setBubble(null), bubble.kind === 'late' ? 1300 : 1900); @@ -514,6 +557,19 @@ function HalliGalliBoard({ view: v, me, players, act, pending }: BoardProps ({ f, n: v.seats.reduce((a, s) => a + (s.top && s.top.fruit === f ? s.top.count : 0), 0) })); const timeLeft = v.endsAt !== null ? Math.max(0, v.endsAt - Math.max(now, v.countdownEndsAt)) : null; const ping = rtt; + // 3·2·1 beeps, a start beep, and ticks in the last 10 seconds of the game clock. + const beep = v.phase === 'countdown' ? countdown : -1; + const lastSec = playing && timeLeft !== null && timeLeft > 0 && timeLeft <= 10_000 ? Math.ceil(timeLeft / 1000) : 0; + const sounded = useRef({ beep: -1, lastSec: 0 }); + useEffect(() => { + const was = sounded.current; + if (beep !== was.beep) { + if (beep > 0) hgSound.count(); + else if (beep === -1 && was.beep >= 0 && playing) hgSound.go(); + } + if (lastSec && lastSec !== was.lastSec) sfx.tick(); + sounded.current = { beep, lastSec }; + }, [beep, lastSec, playing]); return (
    @@ -546,7 +602,7 @@ function HalliGalliBoard({ view: v, me, players, act, pending }: BoardProps
      {rot.map((s, i) => ( - + ))}
    @@ -603,7 +659,7 @@ function HalliGalliBoard({ view: v, me, players, act, pending }: BoardProps 0 && (
    - {countdown} + {countdown} 과일이 딱 5개가 되면 종을 쳐요!
    )} @@ -617,7 +673,7 @@ function HalliGalliBoard({ view: v, me, players, act, pending }: BoardProps {mine.deck}장
    -
    @@ -667,7 +723,8 @@ function logText(e: LogEntry, players: Record, me: string | function rulesLine(o: HalliGalliOptions): string { const parts = [o.endMode === 'official' ? '2명 남으면 다음 종에서 끝' : '한 명 남을 때까지', o.timeLimitMin ? `${o.timeLimitMin}분 제한` : '시간 제한 없음']; - parts.push(o.autoFlip ? `자동 뒤집기 ${o.kidMode ? 8 : o.flipSeconds}초` : `뒤집기 ${o.kidMode ? 8 : o.flipSeconds}초`); + const sec = o.flipSeconds === null ? (o.autoFlip ? (o.kidMode ? 8 : 3) : null) : o.kidMode ? 8 : o.flipSeconds; + parts.push(o.autoFlip ? `자동 뒤집기 ${sec}초` : sec === null ? '뒤집기 시간 무제한' : `뒤집기 ${sec}초`); if (o.wrongRingLockoutMs) parts.push(`틀리면 종 ${o.wrongRingLockoutMs / 1000}초 잠금`); if (o.penaltyEscalation) parts.push('벌칙 점점 늘어남'); if (o.wrongToPot) parts.push('벌칙은 종 밑으로'); @@ -815,7 +872,10 @@ function Options({ value: o, onChange }: OptionsProps) { onChange={(timeLimitMin) => set({ timeLimitMin })} /> - + ) { [3, '3초'], [5, '5초'], [8, '8초'], + [null, '무제한'], ]} onChange={(flipSeconds) => set({ flipSeconds })} /> - + set({ kidMode })} />