fix: reserve auction points for remaining slots

This commit is contained in:
dahyeon committed 2026-06-22 04:37:06 -07:00
1 parent bac29ac933
commit b0dc857463
3 files changed
+175 -20

No files matched your search

+74 -20
View File
@@ -125,6 +125,7 @@ function pickLatestAuction(
}
const AUCTION_MAX_TEAM_SIZE = 5;
const AUCTION_MIN_BID_POINTS = 10;
const LANE_ROWS: Position[] = ['TOP', 'JGL', 'MID', 'ADC', 'SUP'];
const POSITION_TO_RIOT_LANE = {
TOP: 'TOP',
@@ -134,6 +135,24 @@ const POSITION_TO_RIOT_LANE = {
SUP: 'UTILITY',
} as const;
function getAuctionTeamSize(team: AuctionStateView['teams'][number]) {
return team.members.length + 1;
}
function getReservedPointsAfterCurrentBid(
team: AuctionStateView['teams'][number],
) {
const remainingSlotsAfterCurrentBid = Math.max(
0,
AUCTION_MAX_TEAM_SIZE - getAuctionTeamSize(team) - 1,
);
return remainingSlotsAfterCurrentBid * AUCTION_MIN_BID_POINTS;
}
function getMaxBidForTeam(team: AuctionStateView['teams'][number]) {
return Math.max(0, team.points - getReservedPointsAfterCurrentBid(team));
}
function PosBadge({ pos }: { pos: Position }) {
return (
<span className="inline-flex items-center gap-1.5 text-xs font-medium px-1.5 py-0.5 border border-primary/20 text-primary bg-primary/5">
@@ -291,7 +310,7 @@ function TeamPanel({
}) {
const { data: ddragon } = useDdragonManifest();
const tone = teamIndexColorClasses(team.teamIndex);
const teamSize = team.members.length + 1;
const teamSize = getAuctionTeamSize(team);
const isFull = teamSize >= AUCTION_MAX_TEAM_SIZE;
return (
@@ -553,16 +572,22 @@ function BidControls({
onBid: (teamIndex: number, amount: number) => void;
}) {
const [bidAmount, setBidAmount] = useState(100);
const minBid = state.currentBid + 10;
const minBid = state.currentBid + AUCTION_MIN_BID_POINTS;
const activeTeam = captainRole
? state.teams.find((team) => team.teamIndex === captainRole.teamIndex)
: null;
const activeTeamSize = activeTeam ? activeTeam.members.length + 1 : 0;
const activeTeamSize = activeTeam ? getAuctionTeamSize(activeTeam) : 0;
const isActiveTeamFull = activeTeamSize >= AUCTION_MAX_TEAM_SIZE;
const reservedPoints = activeTeam
? getReservedPointsAfterCurrentBid(activeTeam)
: 0;
const maxBid = activeTeam ? getMaxBidForTeam(activeTeam) : 0;
const canAffordNextBid = !isActiveTeamFull && maxBid >= minBid;
useEffect(() => {
setBidAmount(Math.max(minBid, Math.ceil(minBid / 10) * 10));
}, [state.currentBid, minBid]);
const nextBid = Math.max(minBid, Math.ceil(minBid / 10) * 10);
setBidAmount(activeTeam ? Math.min(maxBid, nextBid) : nextBid);
}, [activeTeam, maxBid, minBid]);
if (state.phase !== 'bidding') return null;
@@ -578,16 +603,40 @@ function BidControls({
return (
<div className="border border-base-content/10 bg-base-100 p-4">
<div className="mb-3 grid grid-cols-2 gap-2 text-xs sm:grid-cols-3">
<div className="border border-base-content/10 px-2.5 py-2">
<div className="text-base-content/30">보유</div>
<div className="mt-0.5 font-bold tabular-nums text-base-content">
{formatPoints(activeTeam.points)}P
</div>
</div>
<div className="border border-primary/20 bg-primary/5 px-2.5 py-2">
<div className="text-primary/70">이번 최대</div>
<div className="mt-0.5 font-black tabular-nums text-primary">
{formatPoints(maxBid)}P
</div>
</div>
<div
className="border border-base-content/10 px-2.5 py-2 text-base-content/45"
title={`현재 선수를 낙찰받은 뒤 남은 자리를 채우도록 자리당 ${AUCTION_MIN_BID_POINTS}P씩 보존합니다.`}
aria-label={`보존 ${reservedPoints}P. 현재 선수를 낙찰받은 뒤 남은 자리를 채우도록 자리당 ${AUCTION_MIN_BID_POINTS}P씩 보존합니다.`}
>
<div>보존</div>
<div className="mt-0.5 font-bold tabular-nums">
{formatPoints(reservedPoints)}P
</div>
</div>
</div>
<div className="flex items-center gap-2 mb-3 flex-wrap">
{presets.map((preset) => (
<button
key={preset}
onClick={() => setBidAmount(Math.max(minBid, preset))}
disabled={isActiveTeamFull}
onClick={() => setBidAmount(Math.min(maxBid, Math.max(minBid, preset)))}
disabled={!canAffordNextBid || Math.max(minBid, preset) > maxBid}
className={`text-xs px-2.5 py-1 border transition-colors ${
bidAmount === preset
? 'border-primary/40 bg-primary/10 text-primary'
: 'border-base-content/10 text-base-content/40 hover:border-base-content/20'
: 'border-base-content/10 text-base-content/40 hover:border-base-content/20 disabled:opacity-30 disabled:cursor-not-allowed'
}`}
>
{preset}P
@@ -597,18 +646,19 @@ function BidControls({
type="number"
value={bidAmount}
onChange={(event) =>
setBidAmount(Math.max(minBid, Number(event.target.value)))
setBidAmount(Math.min(maxBid, Math.max(minBid, Number(event.target.value))))
}
min={minBid}
disabled={isActiveTeamFull}
max={maxBid}
disabled={!canAffordNextBid}
className="w-24 text-xs px-2 py-1 border border-base-content/10 bg-transparent text-base-content tabular-nums text-right focus:outline-none focus:border-primary/30"
/>
</div>
<button
onClick={() => onBid(activeTeam.teamIndex, bidAmount)}
disabled={
isActiveTeamFull ||
bidAmount > activeTeam.points ||
!canAffordNextBid ||
bidAmount > maxBid ||
bidAmount <= state.currentBid
}
className={`w-full py-2 text-xs font-bold uppercase tracking-wide border transition-colors disabled:opacity-30 disabled:cursor-not-allowed ${
@@ -617,6 +667,8 @@ function BidControls({
>
{isActiveTeamFull
? `${teamIndexLabel(activeTeam.teamIndex, activeTeam.name)} 정원 완료 (${activeTeamSize}/${AUCTION_MAX_TEAM_SIZE})`
: !canAffordNextBid
? `입찰 불가 (다음 ${formatPoints(minBid)}P · 최대 ${formatPoints(maxBid)}P)`
: `${teamIndexLabel(activeTeam.teamIndex, activeTeam.name)} 입찰 (${formatPoints(bidAmount)}P)`}
</button>
</div>
@@ -624,10 +676,12 @@ function BidControls({
}
function BidLog({ bids }: { bids: AuctionStateView['bids'] }) {
const endRef = useRef<HTMLDivElement>(null);
const scrollRef = useRef<HTMLDivElement>(null);
useEffect(() => {
endRef.current?.scrollIntoView({ behavior: 'smooth' });
const scrollContainer = scrollRef.current;
if (!scrollContainer) return;
scrollContainer.scrollTop = scrollContainer.scrollHeight;
}, [bids.length]);
if (bids.length === 0) return null;
@@ -639,7 +693,7 @@ function BidLog({ bids }: { bids: AuctionStateView['bids'] }) {
입찰 기록
</span>
</div>
<div className="max-h-28 overflow-y-auto p-2 space-y-0.5">
<div ref={scrollRef} className="max-h-28 overflow-y-auto p-2 space-y-0.5">
{bids.map((bid, index) => (
<div key={`${bid.teamIndex}-${bid.timestamp}-${index}`} className="flex items-center gap-2 text-xs">
<span
@@ -653,7 +707,6 @@ function BidLog({ bids }: { bids: AuctionStateView['bids'] }) {
</span>
</div>
))}
<div ref={endRef} />
</div>
</div>
);
@@ -1391,13 +1444,15 @@ function ChatPanel({
className?: string;
}) {
const [draft, setDraft] = useState('');
const messagesEndRef = useRef<HTMLDivElement | null>(null);
const messagesScrollRef = useRef<HTMLDivElement | null>(null);
const trimmedDraft = draft.trim();
const isConnected = connectionStatus === 'connected';
const canSend = isConnected && trimmedDraft.length > 0;
useEffect(() => {
messagesEndRef.current?.scrollIntoView({ block: 'end' });
const scrollContainer = messagesScrollRef.current;
if (!scrollContainer) return;
scrollContainer.scrollTop = scrollContainer.scrollHeight;
}, [messages.length]);
function handleSubmit(event: FormEvent<HTMLFormElement>) {
@@ -1439,7 +1494,7 @@ function ChatPanel({
</span>
</div>
<div className="flex-1 min-h-0 overflow-y-auto px-3 py-3">
<div ref={messagesScrollRef} className="flex-1 min-h-0 overflow-y-auto px-3 py-3">
{messages.length === 0 ? (
<div className="flex h-full items-center justify-center text-center text-xs text-base-content/25">
아직 메시지가 없습니다
@@ -1463,7 +1518,6 @@ function ChatPanel({
))}
</ol>
)}
<div ref={messagesEndRef} />
</div>
<form onSubmit={handleSubmit} className="border-t border-base-content/10 p-2 space-y-2">