kittyteam/kittyFE
3
1
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 5 Wiki Activity

fix: games physics

Browse Source
This commit is contained in:
Pc
2025-12-30 19:33:28 +01:00
parent bca5fc03a8
commit 502543d6ac
2 changed files with 124 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
kittyurl-frontend/src/components/KittyGame.tsx
View File

@@ -1,7 +1,7 @@
import React, { useState, useEffect, useRef, useCallback } from 'react';
import { ArrowLeft, Trophy, Sparkles, Moon, Sun } from 'lucide-react';
// --- ZAAWANSOWANY MODEL KOTA (DetailedKitty) ---
// --- ZAAWANSOWANY MODEL KOTA (Bez zmian w UI) ---
interface DetailedKittyProps {
isJumping: boolean;
isNight: boolean;
@@ -15,8 +15,6 @@ const DetailedKitty: React.FC<DetailedKittyProps> = ({ isJumping, isNight, isGam
return (
<div className={`relative w-20 h-14 transition-all duration-200 ${isJumping ? '-rotate-6 scale-110' : ''}`}>
{/* OGON */}
<div
className="absolute -left-4 top-4 w-8 h-3 rounded-full origin-right rotate-[-20deg]"
style={{
@@ -24,39 +22,27 @@ const DetailedKitty: React.FC<DetailedKittyProps> = ({ isJumping, isNight, isGam
animation: !isGameOver ? 'tail-wag 0.8s ease-in-out infinite' : 'none'
}}
/>
{/* TUŁÓW */}
<div className="absolute inset-0 rounded-[2rem] overflow-hidden shadow-sm" style={{ backgroundColor: mainColor }}>
{/* Paski dekoracyjne */}
<div className="absolute top-0 left-1/4 w-2 h-4 rounded-full opacity-30" style={{ backgroundColor: stripeColor }} />
<div className="absolute top-0 left-1/2 w-2 h-4 rounded-full opacity-30" style={{ backgroundColor: stripeColor }} />
</div>
{/* GŁOWA */}
<div className="absolute -right-4 -top-6 w-14 h-13 rounded-full shadow-sm" style={{ backgroundColor: mainColor }}>
{/* Uszy */}
<div className="absolute -top-2 left-1 w-5 h-6 rounded-t-full rotate-[-15deg]" style={{ backgroundColor: mainColor }}>
<div className="absolute inset-1 rounded-t-full" style={{ backgroundColor: earColor }} />
</div>
<div className="absolute -top-2 right-1 w-5 h-6 rounded-t-full rotate-[15deg]" style={{ backgroundColor: mainColor }}>
<div className="absolute inset-1 rounded-t-full" style={{ backgroundColor: earColor }} />
</div>
{/* Oczy */}
<div className={`absolute top-5 left-3 w-2.5 h-2.5 rounded-full ${isGameOver ? 'bg-slate-500 text-[10px] flex items-center justify-center' : 'bg-slate-900'}`}>
{isGameOver ? 'x' : <div className="absolute top-0.5 left-0.5 w-1 h-1 bg-white rounded-full opacity-70" />}
</div>
<div className={`absolute top-5 right-3 w-2.5 h-2.5 rounded-full ${isGameOver ? 'bg-slate-500 text-[10px] flex items-center justify-center' : 'bg-slate-900'}`}>
{isGameOver ? 'x' : <div className="absolute top-0.5 left-0.5 w-1 h-1 bg-white rounded-full opacity-70" />}
</div>
{/* Wąsy */}
<div className="absolute top-7 -left-2 w-3 h-[1px] bg-slate-300 rotate-[10deg] opacity-40" />
<div className="absolute top-9 -left-2 w-3 h-[1px] bg-slate-300 rotate-[-10deg] opacity-40" />
<div className="absolute top-8 left-1/2 -translate-x-1/2 w-2 h-1.5 bg-pink-400 rounded-full" />
</div>
{/* ŁAPKI (Animowane) */}
<div className="absolute bottom-[-10px] left-4 w-3 h-6 rounded-full origin-top"
style={{
backgroundColor: mainColor,
@@ -77,7 +63,7 @@ const DetailedKitty: React.FC<DetailedKittyProps> = ({ isJumping, isNight, isGam
);
};
// --- GŁÓWNY KOMPONENT GRY ---
// --- GŁÓWNY KOMPONENT GRY (Zoptymalizowany pod Delta Time) ---
export const KittyGame: React.FC<{ onBack: () => void }> = ({ onBack }) => {
const [isPlaying, setIsPlaying] = useState(false);
const [gameOver, setGameOver] = useState(false);
@@ -92,14 +78,19 @@ export const KittyGame: React.FC<{ onBack: () => void }> = ({ onBack }) => {
const isNight = Math.floor(score / 10) % 2 === 1;
// Referencje do fizyki
const kittyYRef = useRef(0);
const obstacleXRef = useRef(600);
const velocityRef = useRef(0);
const scoreRef = useRef(0);
const requestRef = useRef<number>(0);
const lastTimeRef = useRef<number>(0);
const GRAVITY = 0.6;
const JUMP_STRENGTH = -11;
// STAŁE FIZYKI (Wartości na sekundę)
const GRAVITY = 1800; // px/s^2
const JUMP_FORCE = -550; // Moc skoku
const INITIAL_SPEED = 350; // px/s
const SPEED_INCREMENT = 15; // Przyspieszenie z każdym punktem
const GROUND_Y = 0;
const endGame = useCallback(() => {
@@ -118,38 +109,51 @@ export const KittyGame: React.FC<{ onBack: () => void }> = ({ onBack }) => {
setScore(0);
scoreRef.current = 0;
kittyYRef.current = 0;
obstacleXRef.current = 600;
obstacleXRef.current = 650;
velocityRef.current = 0;
lastTimeRef.current = performance.now(); // Reset czasu startu
setDisplayKittyY(0);
setDisplayObstacleX(600);
setDisplayObstacleX(650);
}, []);
const jump = useCallback(() => {
if (kittyYRef.current <= GROUND_Y && !gameOver && isPlaying) {
velocityRef.current = JUMP_STRENGTH;
velocityRef.current = JUMP_FORCE;
}
}, [gameOver, isPlaying]);
useEffect(() => {
const update = () => {
const update = (time: number) => {
if (gameOver || !isPlaying) return;
velocityRef.current += GRAVITY;
kittyYRef.current -= velocityRef.current;
// Oblicz delta time (czas w sekundach)
const deltaTime = (time - lastTimeRef.current) / 1000;
lastTimeRef.current = time;
// Ogranicz deltaTime, aby uniknąć gigantycznych skoków przy lagach
const dt = Math.min(deltaTime, 0.1);
// Fizyka Skoku
velocityRef.current += GRAVITY * dt;
kittyYRef.current -= velocityRef.current * dt;
if (kittyYRef.current <= GROUND_Y) {
kittyYRef.current = GROUND_Y;
velocityRef.current = 0;
}
obstacleXRef.current -= 5 + (scoreRef.current * 0.2);
if (obstacleXRef.current < -50) {
obstacleXRef.current = 650;
// Fizyka Przeszkody
const currentSpeed = INITIAL_SPEED + (scoreRef.current * SPEED_INCREMENT);
obstacleXRef.current -= currentSpeed * dt;
if (obstacleXRef.current < -60) {
obstacleXRef.current = 700;
scoreRef.current += 1;
setScore(scoreRef.current);
}
// DOSTOSOWANA KOLIZJA: Uwzględnia większy model kota
if (obstacleXRef.current < 110 && obstacleXRef.current > 30 && kittyYRef.current < 45) {
// Kolizja
if (obstacleXRef.current < 90 && obstacleXRef.current > 20 && kittyYRef.current < 45) {
endGame();
return;
}
@@ -177,25 +181,25 @@ export const KittyGame: React.FC<{ onBack: () => void }> = ({ onBack }) => {
}, [isPlaying, gameOver, startGame, jump]);
return (
<div className="flex flex-col items-center justify-center min-h-[70vh] p-4">
<div className="flex flex-col items-center justify-center min-h-[70vh] p-4 font-sans">
<button onClick={onBack} className="mb-6 flex items-center gap-2 text-pink-500 font-bold hover:scale-105 transition-all outline-none">
<ArrowLeft size={20} /> Back to Home
</button>
<div
className={`relative w-full max-w-[650px] h-[320px] rounded-[3.5rem] shadow-2xl border-4 transition-colors duration-1000 overflow-hidden cursor-pointer select-none
${isNight ? 'bg-slate-950 border-indigo-500 shadow-indigo-500/20' : 'bg-white border-pink-100 shadow-pink-200/50'}`}
${isNight ? 'bg-slate-950 border-indigo-500 shadow-indigo-500/20' : 'bg-white border-pink-100 shadow-pink-200/50'}`}
onClick={() => { if (!isPlaying || gameOver) startGame(); else jump(); }}
>
{/* Niebo */}
{/* Niebo i Słońce/Księżyc */}
<div className={`absolute top-10 left-12 transition-all duration-1000 ${isNight ? 'translate-y-0 opacity-100' : '-translate-y-20 opacity-0'}`}>
<Moon className="text-indigo-200 fill-indigo-100" size={48} />
</div>
<div className={`absolute top-10 left-12 transition-all duration-1000 ${isNight ? '-translate-y-20 opacity-0' : 'translate-y-0 opacity-100'}`}>
<Sun className="text-yellow-400 fill-yellow-200 animate-spin-slow" size={48} />
<Sun className="text-yellow-400 fill-yellow-200" size={48} />
</div>
{/* Wyniki */}
{/* Score UI */}
<div className={`absolute top-6 right-8 text-right z-10 font-black transition-colors duration-1000 ${isNight ? 'text-indigo-100' : 'text-pink-500'}`}>
<div className="text-3xl tracking-tighter">Score: {score}</div>
<div className={`text-sm flex items-center justify-end gap-1 ${isNight ? 'text-indigo-400' : 'text-pink-300'}`}>
@@ -208,10 +212,10 @@ export const KittyGame: React.FC<{ onBack: () => void }> = ({ onBack }) => {
<DetailedKitty isJumping={displayKittyY > 2} isNight={isNight} isGameOver={gameOver} />
</div>
{/* PRZESZKODA (Kłębek wełny) */}
{/* PRZESZKODA */}
<div
className={`absolute bottom-12 w-12 h-12 rounded-full border-2 flex items-center justify-center animate-spin transition-colors duration-1000
${isNight ? 'bg-indigo-900 border-indigo-400 shadow-lg shadow-indigo-500/30' : 'bg-pink-200 border-pink-400'}`}
${isNight ? 'bg-indigo-900 border-indigo-400 shadow-lg shadow-indigo-500/30' : 'bg-pink-200 border-pink-400'}`}
style={{ left: `${displayObstacleX}px` }}
>
<div className={`w-8 h-1 border-t-2 rotate-45 ${isNight ? 'border-indigo-300' : 'border-pink-400'}`}></div>
@@ -219,7 +223,7 @@ export const KittyGame: React.FC<{ onBack: () => void }> = ({ onBack }) => {
{/* Ziemia */}
<div className={`absolute bottom-0 w-full h-12 border-t-4 transition-colors duration-1000 flex items-center justify-around
${isNight ? 'bg-slate-900 border-indigo-900 text-indigo-900' : 'bg-pink-50 border-pink-100 text-pink-200'}`}>
${isNight ? 'bg-slate-900 border-indigo-900 text-indigo-900' : 'bg-pink-50 border-pink-100 text-pink-200'}`}>
{[...Array(9)].map((_, i) => <span key={i} className="text-2xl">🐾</span>)}
</div>
@@ -237,7 +241,7 @@ export const KittyGame: React.FC<{ onBack: () => void }> = ({ onBack }) => {
{gameOver && (
<div className={`absolute inset-0 backdrop-blur-md flex flex-col items-center justify-center text-center p-6 transition-colors duration-1000
${isNight ? 'bg-slate-950/90' : 'bg-pink-50/90'}`}>
${isNight ? 'bg-slate-950/90' : 'bg-pink-50/90'}`}>
<h3 className={`text-5xl font-black mb-4 ${isNight ? 'text-white' : 'text-pink-600'}`}>Meow! 😿</h3>
<p className={`font-bold mb-8 text-2xl ${isNight ? 'text-indigo-300' : 'text-pink-400'}`}>Score: {score}</p>
<button className="bg-pink-500 text-white border-4 border-white px-12 py-4 rounded-2xl font-black text-xl hover:bg-pink-600 transition-all shadow-xl">