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

# 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
945 changed files with 26164 additions and 1569 deletions
+6 -6
View File
@@ -1,13 +1,13 @@
import { useEffect, useRef } from "react";
import { useGameStore } from "@/stores/gameStore";
import { AudioManager } from "@/stateManager/AudioManager";
import { AudioManager } from "@/managers/AudioManager";
import { useMissionFlowStore } from "@/managers/stores/useMissionFlowStore";
import { AUDIO_PATHS } from "@/data/audioConfig";
export function GameFlow(): null {
const step = useGameStore((state) => state.step);
const setStep = useGameStore((state) => state.setStep);
const setActivityCity = useGameStore((state) => state.setActivityCity);
const setCanMove = useGameStore((state) => state.setCanMove);
const step = useMissionFlowStore((state) => state.step);
const setStep = useMissionFlowStore((state) => state.setStep);
const setActivityCity = useMissionFlowStore((state) => state.setActivityCity);
const setCanMove = useMissionFlowStore((state) => state.setCanMove);
const hasInitialized = useRef(false);
useEffect(() => {