From 5dbc9b0a06d3768738cb5cd3892df8d2efb36d7d Mon Sep 17 00:00:00 2001 From: nakjun Date: Tue, 28 Jul 2026 21:25:17 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B8=8C=EA=B8=88=20=EC=B6=94=EA=B0=80.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/01_Scenes/Festival_Chapter5.unity | 4 ++-- .../02_Scripts/Managers/SceneLoadManager.cs | 23 +++++++++++++++++++ ...•ด ์ค„๋ž˜ (feat. Bizniz)_์ด์Šน๊ธฐ_๊ฒฐํ˜ผํ•ด ์ค„๋ž˜.mp3 | 3 +++ ...„๋ž˜ (feat. Bizniz)_์ด์Šน๊ธฐ_๊ฒฐํ˜ผํ•ด ์ค„๋ž˜.mp3.meta | 23 +++++++++++++++++++ 4 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 Assets/11_Audio/BGM/Etc/๊ฒฐํ˜ผํ•ด ์ค„๋ž˜ (feat. Bizniz)_์ด์Šน๊ธฐ_๊ฒฐํ˜ผํ•ด ์ค„๋ž˜.mp3 create mode 100644 Assets/11_Audio/BGM/Etc/๊ฒฐํ˜ผํ•ด ์ค„๋ž˜ (feat. Bizniz)_์ด์Šน๊ธฐ_๊ฒฐํ˜ผํ•ด ์ค„๋ž˜.mp3.meta diff --git a/Assets/01_Scenes/Festival_Chapter5.unity b/Assets/01_Scenes/Festival_Chapter5.unity index 90a588a9..78657eea 100644 --- a/Assets/01_Scenes/Festival_Chapter5.unity +++ b/Assets/01_Scenes/Festival_Chapter5.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:80d95d375ea0e2208336390d8c6522e0f9e200bd01134655b4ee266b78664655 -size 1941812 +oid sha256:7b953e3013c6734c165df9eba5fef3c3b2ab2fc3bbcb14e79820235d4ed46d3e +size 1943641 diff --git a/Assets/02_Scripts/Managers/SceneLoadManager.cs b/Assets/02_Scripts/Managers/SceneLoadManager.cs index 931c5194..8cbcacbc 100644 --- a/Assets/02_Scripts/Managers/SceneLoadManager.cs +++ b/Assets/02_Scripts/Managers/SceneLoadManager.cs @@ -204,6 +204,26 @@ private void MovePlayerToLoadingArea() if (cc != null) cc.enabled = true; } + // ๋กœ๋”ฉ ๋ฃธ(๋กœ๋”ฉ๋ฐ” ํฌํ•จ)์„ ํ”Œ๋ ˆ์ด์–ด๊ฐ€ ์ง€๊ธˆ ๋ณด๊ณ  ์žˆ๋Š” ๋ฐฉํ–ฅ์œผ๋กœ ํ•œ ๋ฒˆ ๋Œ๋ ค๋†“๋Š”๋‹ค. + // Update์—์„œ๋Š” ์œ„์น˜๋งŒ ๋”ฐ๋ผ๊ฐ€๋ฏ€๋กœ, ์—ฌ๊ธฐ์„œ ์žก์•„๋‘” ๋ฐฉํ–ฅ์ด ๋กœ๋”ฉ ๋‚ด๋‚ด ์œ ์ง€๋œ๋‹ค. + // ๋งค ํ”„๋ ˆ์ž„ ๋Œ๋ฆฌ๋ฉด UI๊ฐ€ ์–ผ๊ตด์— ๋ถ™์–ด๋‹ค๋…€ ๋ฉ€๋ฏธ๊ฐ€ ๋‚˜๋ฏ€๋กœ ์ „ํ™˜ ์‹œ์ ์— ํ•œ ๋ฒˆ๋งŒ ๋งž์ถ˜๋‹ค. + private void AlignLoadingRootToPlayerView() + { + if (_loadingRoot == null || _loadingCamTargetTransform == null) return; + + // ๊ณ ๊ฐœ๋ฅผ ๋“ค๊ฑฐ๋‚˜ ์ˆ™์ธ ๊ฐ๋„๋Š” ๋ฒ„๋ฆฌ๊ณ  ์ขŒ์šฐ(yaw) ๋ฐฉํ–ฅ๋งŒ ์“ด๋‹ค + var forward = Vector3.ProjectOnPlane(_loadingCamTargetTransform.forward, Vector3.up); + + // ์ •์ˆ˜๋ฆฌ๋‚˜ ๋ฐœ๋์„ ๋ณด๊ณ  ์žˆ์œผ๋ฉด ์ˆ˜ํ‰ ์„ฑ๋ถ„์ด 0์— ๊ฐ€๊นŒ์›Œ์ง„๋‹ค โ€” ์ด๋•Œ๋Š” yaw ๊ฐ’์„ ์ง์ ‘ ์“ด๋‹ค + if (forward.sqrMagnitude < 0.0001f) + { + _loadingRoot.transform.rotation = Quaternion.Euler(0f, _loadingCamTargetTransform.eulerAngles.y, 0f); + return; + } + + _loadingRoot.transform.rotation = Quaternion.LookRotation(forward, Vector3.up); + } + // ํ™”๋ฉด์ด ์–ด๋‘์›Œ์ง„ ๋’ค, HideDuringLoading ๋งˆ์ปค๊ฐ€ ๋ถ™์€ ์˜ค๋ธŒ์ ํŠธ๋ฅผ ์ „๋ถ€ ๋ˆ๋‹ค (๋กœ๋”ฉ ์ค‘ ๋…ธ์ถœ/๊นœ๋นก์ž„ ๋ฐฉ์ง€). // ๊ธ€๋กœ๋ฒŒ ๋งค๋‹ˆ์ €๋ผ ์”ฌ ์˜ค๋ธŒ์ ํŠธ๋ฅผ ์ง์ ‘ ์ฐธ์กฐํ•  ์ˆ˜ ์—†์œผ๋ฏ€๋กœ(์”ฌ ์ „ํ™˜ ์‹œ ์ฐธ์กฐ๊ฐ€ ๋Š๊น€) ๋Ÿฐํƒ€์ž„์— ์”ฌ์—์„œ ์ฐพ๋Š”๋‹ค. private void DisableDarkObjects() @@ -241,6 +261,9 @@ private async Awaitable SceneChange(string sceneName) // (๋กœ๋”ฉ ๋ฃธ์€ ์นด๋ฉ”๋ผ๋ฅผ ๋”ฐ๋ผ๋‹ค๋‹ˆ๋ฏ€๋กœ ํ•จ๊ป˜ ์ด๋™ํ•œ๋‹ค) MovePlayerToLoadingArea(); + // ํ”Œ๋ ˆ์ด์–ด๊ฐ€ ๋’ค๋ฅผ ๋ณด๊ณ  ์žˆ์–ด๋„ ๋กœ๋”ฉ๋ฐ”๊ฐ€ ์ •๋ฉด์— ์˜ค๋„๋ก ๋กœ๋”ฉ ๋ฃธ์„ ์‹œ์„  ๋ฐฉํ–ฅ์œผ๋กœ ์ •๋ ฌ + AlignLoadingRootToPlayerView(); + // ์–ด๋‘์›Œ์ง„ ์ƒํƒœ์—์„œ ์ง€์ • ์˜ค๋ธŒ์ ํŠธ๋“ค ๋„๊ธฐ (๋กœ๋”ฉ ์ค‘ ๋ณด์ด๋ฉด ์•ˆ ๋˜๋Š” ๊ฒƒ๋“ค) DisableDarkObjects(); diff --git a/Assets/11_Audio/BGM/Etc/๊ฒฐํ˜ผํ•ด ์ค„๋ž˜ (feat. Bizniz)_์ด์Šน๊ธฐ_๊ฒฐํ˜ผํ•ด ์ค„๋ž˜.mp3 b/Assets/11_Audio/BGM/Etc/๊ฒฐํ˜ผํ•ด ์ค„๋ž˜ (feat. Bizniz)_์ด์Šน๊ธฐ_๊ฒฐํ˜ผํ•ด ์ค„๋ž˜.mp3 new file mode 100644 index 00000000..8f2e777a --- /dev/null +++ b/Assets/11_Audio/BGM/Etc/๊ฒฐํ˜ผํ•ด ์ค„๋ž˜ (feat. Bizniz)_์ด์Šน๊ธฐ_๊ฒฐํ˜ผํ•ด ์ค„๋ž˜.mp3 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1a25a94ecffcddcc6701ed876dd41b16a4a1ddf1fbab45c2997c7db29a8940ea +size 9396298 diff --git a/Assets/11_Audio/BGM/Etc/๊ฒฐํ˜ผํ•ด ์ค„๋ž˜ (feat. Bizniz)_์ด์Šน๊ธฐ_๊ฒฐํ˜ผํ•ด ์ค„๋ž˜.mp3.meta b/Assets/11_Audio/BGM/Etc/๊ฒฐํ˜ผํ•ด ์ค„๋ž˜ (feat. Bizniz)_์ด์Šน๊ธฐ_๊ฒฐํ˜ผํ•ด ์ค„๋ž˜.mp3.meta new file mode 100644 index 00000000..68905699 --- /dev/null +++ b/Assets/11_Audio/BGM/Etc/๊ฒฐํ˜ผํ•ด ์ค„๋ž˜ (feat. Bizniz)_์ด์Šน๊ธฐ_๊ฒฐํ˜ผํ•ด ์ค„๋ž˜.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 30a26f56eb9d3ce4ba2f2148e8c639c9 +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: