Merge branch 'main' into fix/pointer

src/App.tsx

@@ -6,14 +6,12 @@ import Yatai from "./pages/yatai";
 
 const AppRoutes = () => {
 	return (
-		<>
-			<Routes>
-				<Route path="/" element={<Home />} />
-				<Route path="/shooter" element={<Shooter />} />
-				<Route path="/yatai" element={<Yatai />} />
-				<Route path="/result" element={<Result />} />
-			</Routes>
-		</>
+		<Routes>
+			<Route path="/" element={<Home />} />
+			<Route path="/shooter" element={<Shooter />} />
+			<Route path="/result" element={<Result score={0} />} />
+			<Route path="/yatai" element={<Yatai />} />
+		</Routes>
 	);
 };
 

src/components/Yatai/YataiFoundation.tsx

@@ -31,7 +31,7 @@ export const YataiFoundation = (props: ThreeElements["mesh"]) => {
 			receiveShadow
 		>
 			<boxGeometry args={[...args]} />
-			<meshStandardMaterial color={"red"} />
+			<meshStandardMaterial color={"#B22D35"} />
 		</mesh>
 	);
 };

src/pages/result/index.tsx

@@ -2,13 +2,15 @@ import GetImage from "../../components/GetImage";
 import { DefaultButton } from "../../components/ui/Button";
 import styles from "./index.module.css";
 
-function Result() {
-	const images = [
-		"/drink/bottle0.webp",
-		"/drink/bottle1.webp",
-		"/drink/bottle2.webp",
-		"/drink/bottle3.webp",
-	];
+type ResultProps = {
+	score: number;
+};
+
+const Result = ({ score }: ResultProps) => {
+	const image =
+		score >= 0 && score <= 3
+			? `/drink/bottle${score}.webp`
+			: "/drink/bottle0.webp";
 
 	return (
 		<div>
@@ -17,8 +19,8 @@ function Result() {
 			</div>
 			<div className={styles["get-image-container"]}>
 				<GetImage
-					images={images}
-					alt="ランダムに表示されるボトル画像"
+					images={[image]}
+					alt={`スコア ${score} に対応するボトル画像`}
 					width={160}
 					height={160}
 				/>
@@ -32,11 +34,11 @@ function Result() {
 				/>
 			</div>
 			<div className={styles["get-text"]}>
-				<p>Bottle Get!</p>
+				<p>{score}本倒した！</p>
 			</div>
 			<div className={styles["share-btn"]}>
 				<a
-					href="https://twitter.com/intent/tweet?text=Webの射的で遊んだよ.%20%23virtualnatsumatsuri%20%23炎上開発%20%23鹿児島ハッカソン"
+					href={`https://twitter.com/intent/tweet?text=Webの射的で遊んだよ。${score}本倒した！%20%23ハックツ夏祭り`}
 					target="_blank"
 					rel="noopener noreferrer"
 				>
@@ -50,6 +52,6 @@ function Result() {
 			</div>
 		</div>
 	);
-}
+};
 
 export default Result;