From cbb5b243a33d126581d3953739cb7140d2e52319 Mon Sep 17 00:00:00 2001 From: Sea10wood Date: Thu, 15 Aug 2024 17:27:25 +0900 Subject: [PATCH 1/7] =?UTF-8?q?add:=20yatai=E3=81=AE=E8=A3=85=E9=A3=BE(abs?= =?UTF-8?q?olute=E5=A4=9A=E7=94=A8=E3=81=AF=E3=81=93=E3=81=93=E3=81=AF?= =?UTF-8?q?=E8=A8=B1=E3=81=97=E3=81=A6=E6=AC=B2=E3=81=97=E3=81=84=E3=81=A7?= =?UTF-8?q?=E3=81=99=E3=80=81=E3=80=81=E3=80=81)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/garary/index.module.css | 61 ++++++++++++++++++++++++++ src/components/garary/index.tsx | 25 +++++++++++ src/pages/yatai/index.module.css | 1 + src/pages/yatai/index.tsx | 2 + 4 files changed, 89 insertions(+) create mode 100644 src/components/garary/index.module.css create mode 100644 src/components/garary/index.tsx diff --git a/src/components/garary/index.module.css b/src/components/garary/index.module.css new file mode 100644 index 0000000..b9df346 --- /dev/null +++ b/src/components/garary/index.module.css @@ -0,0 +1,61 @@ +h1{ + font-size: 40px; +} + +.title{ + position: absolute; + top: 0; + left: 0; + z-index: 1; + padding: 16px; + margin: 0; +} +.nobori img{ + position: absolute; + bottom: 0; + left: -240px; + height: 80vh; + aspect-ratio: 1 / 1; + z-index: -1; +} + +.light img{ + position: absolute; + top: 0; + left: 0px; + height: 80vh; + aspect-ratio: 1 / 1; + z-index: -1; +} + +.container { + display: flex; + align-items: flex-end; + position: absolute; + bottom: 16px; + left: 4vw; + z-index: 1; +} + +.logo img { + height: 16vh; + aspect-ratio: 1 / 1; + margin-right: 2vw; +} + +.shop { + color: var(--white); + font-size: 4vw; + padding: 16px; + margin: 0; +} + +.light-right img{ + position: absolute; + top: 0; + right: 0px; + height: 80vh; + aspect-ratio: 1 / 1; + z-index: -1; + transform: scale(-1, 1); +} \ No newline at end of file diff --git a/src/components/garary/index.tsx b/src/components/garary/index.tsx new file mode 100644 index 0000000..120093c --- /dev/null +++ b/src/components/garary/index.tsx @@ -0,0 +1,25 @@ +import styles from "./index.module.css" + +function Garally() { + return ( +
+

VIRTUAL_NATSUMATSURI

+
+ 夏祭り_のぼり +
+
+ 提灯 +
+
+
+ logo +
+

VIRTUAL_NATSUMATSURI

+
+
+ 提灯 +
+
+ ) +} +export default Garally; \ No newline at end of file diff --git a/src/pages/yatai/index.module.css b/src/pages/yatai/index.module.css index 660bbcf..86e4da0 100644 --- a/src/pages/yatai/index.module.css +++ b/src/pages/yatai/index.module.css @@ -12,6 +12,7 @@ .canvas { width: 100%; height: 100%; + background-color: transparent; } .target { diff --git a/src/pages/yatai/index.tsx b/src/pages/yatai/index.tsx index f43b213..40de604 100644 --- a/src/pages/yatai/index.tsx +++ b/src/pages/yatai/index.tsx @@ -16,6 +16,7 @@ import { type Target, } from "../../type/shooting"; import styles from "./index.module.css"; +import Garally from "../../components/garary"; const YataiStage = memo(() => { // 土台 @@ -216,6 +217,7 @@ function Yatai() {
+
); } From 453389e1129aec186a9a3870eabdbe8832a38c42 Mon Sep 17 00:00:00 2001 From: Sea10wood Date: Thu, 15 Aug 2024 17:33:18 +0900 Subject: [PATCH 2/7] =?UTF-8?q?Add:=20audio=E3=81=AE=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/garary/index.tsx | 46 +++++++++++++++++---------------- src/pages/yatai/index.tsx | 4 +-- 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/src/components/garary/index.tsx b/src/components/garary/index.tsx index 120093c..2206e33 100644 --- a/src/components/garary/index.tsx +++ b/src/components/garary/index.tsx @@ -1,25 +1,27 @@ -import styles from "./index.module.css" +import styles from "./index.module.css"; function Garally() { - return ( -
-

VIRTUAL_NATSUMATSURI

-
- 夏祭り_のぼり -
-
- 提灯 -
-
-
- logo -
-

VIRTUAL_NATSUMATSURI

-
-
- 提灯 -
-
- ) + return ( +
+ {/* biome-ignore lint/a11y/useMediaCaption: */} +
+ ); } -export default Garally; \ No newline at end of file +export default Garally; diff --git a/src/pages/yatai/index.tsx b/src/pages/yatai/index.tsx index 40de604..359bef4 100644 --- a/src/pages/yatai/index.tsx +++ b/src/pages/yatai/index.tsx @@ -9,6 +9,7 @@ import type { Object3DEventMap, } from "three"; import { randFloat } from "three/src/math/MathUtils.js"; +import Garally from "../../components/garary"; import { useSocketRefStore } from "../../store"; import { type ActionSchema, @@ -16,7 +17,6 @@ import { type Target, } from "../../type/shooting"; import styles from "./index.module.css"; -import Garally from "../../components/garary"; const YataiStage = memo(() => { // 土台 @@ -217,7 +217,7 @@ function Yatai() {
- +
); } From cf2c730285636f52855dd788f997bef062ffe558 Mon Sep 17 00:00:00 2001 From: Sea10wood Date: Thu, 15 Aug 2024 17:41:20 +0900 Subject: [PATCH 3/7] =?UTF-8?q?fix:=20cspell=5Fcheck=E3=81=AE=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0=E3=81=A8=E3=82=BF=E3=82=A4=E3=83=9D=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cspell.json | 2 +- src/components/{garary => Garally}/index.module.css | 0 src/components/{garary => Garally}/index.tsx | 0 src/pages/yatai/index.tsx | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) rename src/components/{garary => Garally}/index.module.css (100%) rename src/components/{garary => Garally}/index.tsx (100%) diff --git a/cspell.json b/cspell.json index 3da8c6e..3acb82b 100644 --- a/cspell.json +++ b/cspell.json @@ -2,5 +2,5 @@ "ignorePaths": ["node_modules/**", "*.svg"], "version": "0.2", "language": "en", - "words": ["NATSUMATSURI", "yatai", "Dela", "Yuji", "Syuku", "zustand", "wadaiko", "qrcode"] + "words": ["NATSUMATSURI", "yatai", "Dela", "Yuji", "Syuku", "zustand", "wadaiko", "qrcode","nobori","Garally","natsu","matsuri"] } diff --git a/src/components/garary/index.module.css b/src/components/Garally/index.module.css similarity index 100% rename from src/components/garary/index.module.css rename to src/components/Garally/index.module.css diff --git a/src/components/garary/index.tsx b/src/components/Garally/index.tsx similarity index 100% rename from src/components/garary/index.tsx rename to src/components/Garally/index.tsx diff --git a/src/pages/yatai/index.tsx b/src/pages/yatai/index.tsx index 359bef4..be196fa 100644 --- a/src/pages/yatai/index.tsx +++ b/src/pages/yatai/index.tsx @@ -9,7 +9,7 @@ import type { Object3DEventMap, } from "three"; import { randFloat } from "three/src/math/MathUtils.js"; -import Garally from "../../components/garary"; +import Garally from "../../components/Garally"; import { useSocketRefStore } from "../../store"; import { type ActionSchema, From 226bb028d733f547cc6387a566fe6238a67e91a9 Mon Sep 17 00:00:00 2001 From: Sea10wood Date: Thu, 15 Aug 2024 18:04:51 +0900 Subject: [PATCH 4/7] =?UTF-8?q?Fix:=20garelly=E3=81=AE=E3=82=BF=E3=82=A4?= =?UTF-8?q?=E3=83=9D=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cspell.json | 2 +- src/components/Garally/index.tsx | 4 ++-- src/pages/yatai/index.tsx | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cspell.json b/cspell.json index 3acb82b..28191e9 100644 --- a/cspell.json +++ b/cspell.json @@ -2,5 +2,5 @@ "ignorePaths": ["node_modules/**", "*.svg"], "version": "0.2", "language": "en", - "words": ["NATSUMATSURI", "yatai", "Dela", "Yuji", "Syuku", "zustand", "wadaiko", "qrcode","nobori","Garally","natsu","matsuri"] + "words": ["NATSUMATSURI", "yatai", "Dela", "Yuji", "Syuku", "zustand", "wadaiko", "qrcode","nobori","Garelly","natsu","matsuri"] } diff --git a/src/components/Garally/index.tsx b/src/components/Garally/index.tsx index 2206e33..abf3623 100644 --- a/src/components/Garally/index.tsx +++ b/src/components/Garally/index.tsx @@ -1,6 +1,6 @@ import styles from "./index.module.css"; -function Garally() { +function Garelly() { return (
{/* biome-ignore lint/a11y/useMediaCaption: */} @@ -24,4 +24,4 @@ function Garally() {
); } -export default Garally; +export default Garelly; diff --git a/src/pages/yatai/index.tsx b/src/pages/yatai/index.tsx index be196fa..78bbb59 100644 --- a/src/pages/yatai/index.tsx +++ b/src/pages/yatai/index.tsx @@ -9,7 +9,7 @@ import type { Object3DEventMap, } from "three"; import { randFloat } from "three/src/math/MathUtils.js"; -import Garally from "../../components/Garally"; +import Garelly from "../../components/Garelly"; import { useSocketRefStore } from "../../store"; import { type ActionSchema, @@ -217,7 +217,7 @@ function Yatai() {
- +
); } From d0083eb249419256aa8a34dc991fc3bdfd37372a Mon Sep 17 00:00:00 2001 From: Sea10wood Date: Thu, 15 Aug 2024 18:09:23 +0900 Subject: [PATCH 5/7] =?UTF-8?q?Fix:=20gallery=E3=81=AE=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/{Garally => Garelly}/index.module.css | 0 src/components/{Garally => Garelly}/index.tsx | 9 +++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) rename src/components/{Garally => Garelly}/index.module.css (100%) rename src/components/{Garally => Garelly}/index.tsx (78%) diff --git a/src/components/Garally/index.module.css b/src/components/Garelly/index.module.css similarity index 100% rename from src/components/Garally/index.module.css rename to src/components/Garelly/index.module.css diff --git a/src/components/Garally/index.tsx b/src/components/Garelly/index.tsx similarity index 78% rename from src/components/Garally/index.tsx rename to src/components/Garelly/index.tsx index abf3623..bd2871d 100644 --- a/src/components/Garally/index.tsx +++ b/src/components/Garelly/index.tsx @@ -3,8 +3,13 @@ import styles from "./index.module.css"; function Garelly() { return (
- {/* biome-ignore lint/a11y/useMediaCaption: */} -