math-pixel/La-Fabrik
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into feat/mission-2

Browse Source 
# Conflicts:
#	package-lock.json
#	package.json
#	src/App.tsx
#	src/components/three/interaction/CentralObject.tsx
#	src/components/three/interaction/VillageoisHelperObject.tsx
#	src/managers/GameStepManager.ts
#	src/stateManager/AudioManager.ts
#	src/world/World.tsx
#	src/world/player/PlayerController.tsx
This commit is contained in:
Tom Boullay
2026-05-11 17:46:42 +02:00
parent f7b968abe7 e05c67ee73
commit 91ebea8d99
945 changed files with 26164 additions and 1569 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/ui/IntroUI.tsx
+6 -6
View File
@@ -1,10 +1,10 @@
import { useState } from "react";
import { useGameStore } from "@/stores/gameStore";
import { useMissionFlowStore } from "@/managers/stores/useMissionFlowStore";
export function IntroUI(): React.JSX.Element | null {
const step = useGameStore((state) => state.step);
const setPlayerName = useGameStore((state) => state.setPlayerName);
const setStep = useGameStore((state) => state.setStep);
const step = useMissionFlowStore((state) => state.step);
const setPlayerName = useMissionFlowStore((state) => state.setPlayerName);
const setStep = useMissionFlowStore((state) => state.setStep);
const [inputValue, setInputValue] = useState("");
if (step !== "naming") return null;
@@ -100,8 +100,8 @@ export function IntroUI(): React.JSX.Element | null {
}
export function BienvenueDisplay(): React.JSX.Element | null {
const step = useGameStore((state) => state.step);
const playerName = useGameStore((state) => state.playerName);
const step = useMissionFlowStore((state) => state.step);
const playerName = useMissionFlowStore((state) => state.playerName);
if (step !== "bienvenue") return null;