Compare commits
4 Commits
c4c08c64c3
...
v1.3.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
98b5984a6b | ||
|
|
b0eb3bd637 | ||
|
|
1a68ed2a5c | ||
|
|
904bd80bd5 |
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "resistencia-client",
|
"name": "resistencia-client",
|
||||||
"version": "1.1.2",
|
"version": "1.3.0",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "next dev",
|
"dev": "next dev",
|
||||||
|
|||||||
@@ -252,7 +252,7 @@ export default function Dashboard() {
|
|||||||
</div>
|
</div>
|
||||||
{game.currentRound > 0 && (
|
{game.currentRound > 0 && (
|
||||||
<div className="bg-white/10 px-3 py-1 rounded text-[10px] font-black uppercase tracking-widest border border-white/10">
|
<div className="bg-white/10 px-3 py-1 rounded text-[10px] font-black uppercase tracking-widest border border-white/10">
|
||||||
Ronda {game.currentRound}
|
{game.matchNumber > 1 ? `P${game.matchNumber} - R${game.currentRound}` : `Ronda ${game.currentRound}`}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
<ChevronDown
|
<ChevronDown
|
||||||
@@ -388,24 +388,26 @@ export default function Dashboard() {
|
|||||||
<span>AGENTES:</span>
|
<span>AGENTES:</span>
|
||||||
<span className="text-gray-300">{entry.players.split(',').length}</span>
|
<span className="text-gray-300">{entry.players.split(',').length}</span>
|
||||||
</div>
|
</div>
|
||||||
{entry.rounds_played > 0 && (
|
{entry.matches_played > 0 && (
|
||||||
<>
|
<>
|
||||||
<div className="flex justify-between">
|
<div className="flex justify-between">
|
||||||
<span>RONDAS:</span>
|
<span>PARTIDAS:</span>
|
||||||
<span className="text-gray-300">{entry.rounds_played}</span>
|
<span className="text-gray-300">{entry.matches_played}</span>
|
||||||
</div>
|
</div>
|
||||||
<div className="flex justify-between items-center pt-2">
|
{entry.match_results && entry.match_results.length > 0 && (
|
||||||
<span>RESULTADOS:</span>
|
<div className="flex justify-between items-center pt-2">
|
||||||
<div className="flex gap-1">
|
<span>RESULTADOS:</span>
|
||||||
{entry.round_results && entry.round_results.split(',').map((res: string, idx: number) => (
|
<div className="flex gap-1">
|
||||||
<div
|
{entry.match_results.split(',').map((res: string, idx: number) => (
|
||||||
key={idx}
|
<div
|
||||||
className={`w-3 h-3 rounded-full ${res === 'true' ? 'bg-blue-500' : 'bg-red-500'}`}
|
key={idx}
|
||||||
title={res === 'true' ? 'Victoria Resistencia' : 'Victoria Espías'}
|
className={`w-3 h-3 rounded-full ${res === 'aliados' ? 'bg-blue-500' : 'bg-red-500'}`}
|
||||||
/>
|
title={res === 'aliados' ? 'Victoria Aliados' : 'Victoria Nazis'}
|
||||||
))}
|
/>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
)}
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
{entry.players && (
|
{entry.players && (
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { motion } from 'framer-motion';
|
import { motion } from 'framer-motion';
|
||||||
import { useEffect } from 'react';
|
import { useEffect, useMemo } from 'react';
|
||||||
import Image from 'next/image';
|
import Image from 'next/image';
|
||||||
|
|
||||||
interface MissionRevealProps {
|
interface MissionRevealProps {
|
||||||
@@ -8,6 +8,16 @@ interface MissionRevealProps {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export default function MissionReveal({ votes, onFinished }: MissionRevealProps) {
|
export default function MissionReveal({ votes, onFinished }: MissionRevealProps) {
|
||||||
|
// Barajar votos de forma aleatoria en cada cliente (orden diferente para cada jugador)
|
||||||
|
const shuffledVotes = useMemo(() => {
|
||||||
|
const shuffled = [...votes];
|
||||||
|
for (let i = shuffled.length - 1; i > 0; i--) {
|
||||||
|
const j = Math.floor(Math.random() * (i + 1));
|
||||||
|
[shuffled[i], shuffled[j]] = [shuffled[j], shuffled[i]];
|
||||||
|
}
|
||||||
|
return shuffled;
|
||||||
|
}, [votes]);
|
||||||
|
|
||||||
// Timer de seguridad: 5 segundos y avanza
|
// Timer de seguridad: 5 segundos y avanza
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const timer = setTimeout(() => {
|
const timer = setTimeout(() => {
|
||||||
@@ -28,7 +38,7 @@ export default function MissionReveal({ votes, onFinished }: MissionRevealProps)
|
|||||||
</h2>
|
</h2>
|
||||||
|
|
||||||
<div className="flex gap-4 justify-center mb-12 flex-wrap max-w-[90vw]">
|
<div className="flex gap-4 justify-center mb-12 flex-wrap max-w-[90vw]">
|
||||||
{votes.map((vote, idx) => (
|
{shuffledVotes.map((vote, idx) => (
|
||||||
<motion.div
|
<motion.div
|
||||||
key={idx}
|
key={idx}
|
||||||
className="w-32 h-48 rounded-xl flex items-center justify-center shadow-2xl relative overflow-hidden"
|
className="w-32 h-48 rounded-xl flex items-center justify-center shadow-2xl relative overflow-hidden"
|
||||||
@@ -55,7 +65,7 @@ export default function MissionReveal({ votes, onFinished }: MissionRevealProps)
|
|||||||
className="text-white text-xl font-mono mt-8 text-center"
|
className="text-white text-xl font-mono mt-8 text-center"
|
||||||
initial={{ opacity: 0 }}
|
initial={{ opacity: 0 }}
|
||||||
animate={{ opacity: 1 }}
|
animate={{ opacity: 1 }}
|
||||||
transition={{ delay: votes.length * 0.3 + 0.5 }}
|
transition={{ delay: shuffledVotes.length * 0.3 + 0.5 }}
|
||||||
>
|
>
|
||||||
<span className="animate-pulse">Analizando resultado estratégico...</span>
|
<span className="animate-pulse">Analizando resultado estratégico...</span>
|
||||||
</motion.div>
|
</motion.div>
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "resistencia-server",
|
"name": "resistencia-server",
|
||||||
"version": "1.1.2",
|
"version": "1.3.0",
|
||||||
"description": "Backend para el juego La Resistencia",
|
"description": "Backend para el juego La Resistencia",
|
||||||
"main": "src/index.ts",
|
"main": "src/index.ts",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
@@ -30,7 +30,9 @@ export const initDb = async () => {
|
|||||||
await client.query(`
|
await client.query(`
|
||||||
ALTER TABLE game_logs
|
ALTER TABLE game_logs
|
||||||
ADD COLUMN IF NOT EXISTS rounds_played INTEGER DEFAULT 0,
|
ADD COLUMN IF NOT EXISTS rounds_played INTEGER DEFAULT 0,
|
||||||
ADD COLUMN IF NOT EXISTS round_results TEXT DEFAULT '';
|
ADD COLUMN IF NOT EXISTS round_results TEXT DEFAULT '',
|
||||||
|
ADD COLUMN IF NOT EXISTS matches_played INTEGER DEFAULT 1,
|
||||||
|
ADD COLUMN IF NOT EXISTS match_results TEXT DEFAULT '';
|
||||||
`);
|
`);
|
||||||
|
|
||||||
console.log('[DB] Base de datos inicializada correctamente');
|
console.log('[DB] Base de datos inicializada correctamente');
|
||||||
@@ -71,15 +73,19 @@ export const logGameEnd = async (
|
|||||||
winner: string | null = null,
|
winner: string | null = null,
|
||||||
aborted: boolean = false,
|
aborted: boolean = false,
|
||||||
roundsPlayed: number = 0,
|
roundsPlayed: number = 0,
|
||||||
roundResults: boolean[] = []
|
roundResults: boolean[] = [],
|
||||||
|
matchesPlayed: number = 1,
|
||||||
|
matchResults: string[] = []
|
||||||
) => {
|
) => {
|
||||||
try {
|
try {
|
||||||
// Convert boolean[] to string "true,false,true" or simplified "W,L,W"
|
// Convert boolean[] to string "true,false,true"
|
||||||
const resultsStr = roundResults.join(',');
|
const roundResultsStr = roundResults.map(r => r === true ? 'true' : r === false ? 'false' : '').filter(r => r).join(',');
|
||||||
|
// matchResults is already string[] like ["aliados", "alemanes"]
|
||||||
|
const matchResultsStr = matchResults.join(',');
|
||||||
|
|
||||||
await pool.query(
|
await pool.query(
|
||||||
'UPDATE game_logs SET finished_at = CURRENT_TIMESTAMP, winner = $1, status = $2, rounds_played = $3, round_results = $4 WHERE room_id = $5 AND status = $6',
|
'UPDATE game_logs SET finished_at = CURRENT_TIMESTAMP, winner = $1, status = $2, rounds_played = $3, round_results = $4, matches_played = $5, match_results = $6 WHERE room_id = $7 AND status = $8',
|
||||||
[winner, aborted ? 'aborted' : 'finished', roundsPlayed, resultsStr, roomId, 'active']
|
[winner, aborted ? 'aborted' : 'finished', roundsPlayed, roundResultsStr, matchesPlayed, matchResultsStr, roomId, 'active']
|
||||||
);
|
);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error('[DB] Error al registrar fin de partida:', err);
|
console.error('[DB] Error al registrar fin de partida:', err);
|
||||||
|
|||||||
@@ -91,6 +91,7 @@ const getAdminData = async () => {
|
|||||||
currentPlayers: g.state.players.length,
|
currentPlayers: g.state.players.length,
|
||||||
maxPlayers: g.maxPlayers,
|
maxPlayers: g.maxPlayers,
|
||||||
currentRound: g.state.currentRound,
|
currentRound: g.state.currentRound,
|
||||||
|
matchNumber: g.state.matchNumber,
|
||||||
players: g.state.players.map(p => ({ id: p.id, name: p.name }))
|
players: g.state.players.map(p => ({ id: p.id, name: p.name }))
|
||||||
}));
|
}));
|
||||||
|
|
||||||
@@ -348,8 +349,10 @@ io.on('connection', (socket) => {
|
|||||||
// Desconectar a todos los jugadores de la sala
|
// Desconectar a todos los jugadores de la sala
|
||||||
io.in(roomId).socketsLeave(roomId);
|
io.in(roomId).socketsLeave(roomId);
|
||||||
|
|
||||||
// LOG EN DB
|
// LOG EN DB - Incluir resultado de la partida actual en matchResults
|
||||||
logGameEnd(roomId, game.state.winner, false, game.state.currentRound, game.state.questResults);
|
const finalMatchResults = [...game.state.matchResults];
|
||||||
|
if (game.state.winner) finalMatchResults.push(game.state.winner);
|
||||||
|
logGameEnd(roomId, game.state.winner, false, game.state.currentRound, game.state.questResults, game.state.matchNumber, finalMatchResults);
|
||||||
broadcastAdminUpdate();
|
broadcastAdminUpdate();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -382,7 +385,9 @@ io.on('connection', (socket) => {
|
|||||||
io.in(roomId).socketsLeave(roomId);
|
io.in(roomId).socketsLeave(roomId);
|
||||||
|
|
||||||
// LOG EN DB COMO ABORTADA
|
// LOG EN DB COMO ABORTADA
|
||||||
logGameEnd(roomId, null, true, game.state.currentRound, game.state.questResults);
|
const finalMatchResults = [...game.state.matchResults];
|
||||||
|
if (game.state.winner) finalMatchResults.push(game.state.winner);
|
||||||
|
logGameEnd(roomId, null, true, game.state.currentRound, game.state.questResults, game.state.matchNumber, finalMatchResults);
|
||||||
broadcastAdminUpdate();
|
broadcastAdminUpdate();
|
||||||
|
|
||||||
console.log(`[LEAVE_GAME] ${playerName} abandonó la partida ${roomId}. Partida eliminada.`);
|
console.log(`[LEAVE_GAME] ${playerName} abandonó la partida ${roomId}. Partida eliminada.`);
|
||||||
@@ -470,7 +475,9 @@ io.on('connection', (socket) => {
|
|||||||
io.in(roomId).socketsLeave(roomId);
|
io.in(roomId).socketsLeave(roomId);
|
||||||
|
|
||||||
// Log como abortada por admin
|
// Log como abortada por admin
|
||||||
await logGameEnd(roomId, null, true, game.state.currentRound, game.state.questResults);
|
const finalMatchResults = [...game.state.matchResults];
|
||||||
|
if (game.state.winner) finalMatchResults.push(game.state.winner);
|
||||||
|
await logGameEnd(roomId, null, true, game.state.currentRound, game.state.questResults, game.state.matchNumber, finalMatchResults);
|
||||||
socket.emit('admin_action_success');
|
socket.emit('admin_action_success');
|
||||||
broadcastAdminUpdate();
|
broadcastAdminUpdate();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -43,7 +43,9 @@ export class Game {
|
|||||||
missionHistory: [],
|
missionHistory: [],
|
||||||
revealedVotes: [],
|
revealedVotes: [],
|
||||||
history: [],
|
history: [],
|
||||||
hostId: hostId
|
hostId: hostId,
|
||||||
|
matchNumber: 1,
|
||||||
|
matchResults: []
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -369,7 +371,13 @@ export class Game {
|
|||||||
restartGame() {
|
restartGame() {
|
||||||
this.log('=== REINICIANDO PARTIDA ===');
|
this.log('=== REINICIANDO PARTIDA ===');
|
||||||
|
|
||||||
// Resetear variables de juego
|
// Guardar resultado de la partida actual antes de resetear
|
||||||
|
if (this.state.winner) {
|
||||||
|
this.state.matchResults.push(this.state.winner);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Incrementar contador de partidas y resetear variables de juego
|
||||||
|
this.state.matchNumber++;
|
||||||
this.state.currentRound = 1;
|
this.state.currentRound = 1;
|
||||||
this.state.failedVotesCount = 0;
|
this.state.failedVotesCount = 0;
|
||||||
this.state.questResults = [null, null, null, null, null];
|
this.state.questResults = [null, null, null, null, null];
|
||||||
|
|||||||
@@ -89,6 +89,8 @@ export interface GameState {
|
|||||||
|
|
||||||
winner?: Faction;
|
winner?: Faction;
|
||||||
history: string[]; // Log de acciones para mostrar en pantalla
|
history: string[]; // Log de acciones para mostrar en pantalla
|
||||||
|
matchNumber: number; // Número de partida en esta operación (se incrementa con cada restart)
|
||||||
|
matchResults: Faction[]; // Resultados de cada partida (quién ganó)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Configuración de jugadores por partida (según tus reglas)
|
// Configuración de jugadores por partida (según tus reglas)
|
||||||
|
|||||||
Reference in New Issue
Block a user