From 5dbc9b0a06d3768738cb5cd3892df8d2efb36d7d Mon Sep 17 00:00:00 2001 From: nakjun Date: Tue, 28 Jul 2026 21:25:17 +0900 Subject: [PATCH 1/3] =?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: From ca04eb1c0b53801ae78d697d294d421e669989f8 Mon Sep 17 00:00:00 2001 From: nakjun Date: Wed, 29 Jul 2026 11:35:37 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EB=B3=B4=EC=9D=B4=EC=8A=A4,BGM=20=EB=B3=BC?= =?UTF-8?q?=EB=A5=A8=20=EB=AF=B9=EC=84=9C=20(=EC=82=AC=EC=9D=B4=EB=93=9C?= =?UTF-8?q?=EC=B2=B4=EC=9D=B8,=20=EC=BB=B4=ED=94=84=EB=A0=88=EC=84=9C,=20?= =?UTF-8?q?=ED=8C=8C=EB=9D=BC=EB=AF=B8=ED=84=B0EQ)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/11_Audio/MainMixer.mixer | 122 ++++++++++++++++++ .../XR/Settings/OpenXR Package Settings.asset | 4 +- 2 files changed, 124 insertions(+), 2 deletions(-) diff --git a/Assets/11_Audio/MainMixer.mixer b/Assets/11_Audio/MainMixer.mixer index d5e6272a..ebc8028a 100644 --- a/Assets/11_Audio/MainMixer.mixer +++ b/Assets/11_Audio/MainMixer.mixer @@ -15,6 +15,9 @@ AudioMixerGroupController: m_Send: 00000000000000000000000000000000 m_Effects: - {fileID: 6499960502945122} + - {fileID: 4754378330777255674} + - {fileID: -5274263231835176847} + - {fileID: 901220893356080106} m_UserColorIndex: 0 m_Mute: 0 m_Solo: 0 @@ -34,10 +37,62 @@ AudioMixerGroupController: m_Send: 00000000000000000000000000000000 m_Effects: - {fileID: -1111153668822042352} + - {fileID: -1454759029808046165} + - {fileID: -4734788075015124645} m_UserColorIndex: 0 m_Mute: 0 m_Solo: 0 m_BypassEffects: 0 +--- !u!244 &-5274263231835176847 +AudioMixerEffectController: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_EffectID: a43cf80ca87e4534889a1df64a7ada22 + m_EffectName: Compressor + m_MixLevel: 1a889bbed9253a845863a659d8e35e8d + m_Parameters: + - m_ParameterName: Threshold + m_GUID: 851cd56ca0178c242b10f0b893c02081 + - m_ParameterName: Attack + m_GUID: f003eff2a47bd23418873b3ba5470d88 + - m_ParameterName: Release + m_GUID: 0887b662687a00a4b9001b3754bdee24 + - m_ParameterName: Make up gain + m_GUID: 166d69f6c67935d449fa2d654abf8bd7 + m_SendTarget: {fileID: 0} + m_EnableWetMix: 0 + m_Bypass: 0 +--- !u!244 &-4734788075015124645 +AudioMixerEffectController: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_EffectID: fbac7017bfe42ce4ea3f04bcb3631c61 + m_EffectName: Duck Volume + m_MixLevel: 37178e86e67671d49afa5a35865baff6 + m_Parameters: + - m_ParameterName: Threshold + m_GUID: 5eeafa51b290d974b8c74f0e51b62184 + - m_ParameterName: Ratio + m_GUID: 6758627ec830d1f4cad307f333d68e43 + - m_ParameterName: Attack Time + m_GUID: 6d0726fe668bab543b881317bef54793 + - m_ParameterName: Release Time + m_GUID: a323a4cbeb78c974e94650c463a7b535 + - m_ParameterName: Make-up Gain + m_GUID: 119fe712fdb353b4cb365b3f68655b8e + - m_ParameterName: Knee + m_GUID: d075844a196366a4f94e52ee387a836b + - m_ParameterName: Sidechain Mix + m_GUID: eea963575e5bf934ea206a48f34bde1b + m_SendTarget: {fileID: 0} + m_EnableWetMix: 0 + m_Bypass: 0 --- !u!244 &-1496916555325082197 AudioMixerEffectController: m_ObjectHideFlags: 3 @@ -52,6 +107,26 @@ AudioMixerEffectController: m_SendTarget: {fileID: 0} m_EnableWetMix: 0 m_Bypass: 0 +--- !u!244 &-1454759029808046165 +AudioMixerEffectController: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_EffectID: 7739f898165ea4b459b28a6c8c4b3c5b + m_EffectName: ParamEQ + m_MixLevel: b512e51876101a94a81790457e3357db + m_Parameters: + - m_ParameterName: Center freq + m_GUID: 07cf4c877a798e947bf4dd24444439f8 + - m_ParameterName: Octave range + m_GUID: 0d93648c9b517844896e719950ea4f25 + - m_ParameterName: Frequency gain + m_GUID: 329a0c2a5a9393f4798af66f6dd69578 + m_SendTarget: {fileID: 0} + m_EnableWetMix: 0 + m_Bypass: 0 --- !u!244 &-1111153668822042352 AudioMixerEffectController: m_ObjectHideFlags: 3 @@ -143,7 +218,20 @@ AudioMixerSnapshotController: m_AudioMixer: {fileID: 24100000} m_SnapshotID: 65a440c2a830da0468487d2a92c4cb88 m_FloatValues: + 586c7fb068c4c544eb223f4c762b32d6: 1.3 + 5eeafa51b290d974b8c74f0e51b62184: -20 + 9cb35485508d2a94985383dd03a3e971: 1.6 + bfe25c26ae55123488247b46094af1c1: -1 + 166d69f6c67935d449fa2d654abf8bd7: 2 + 07cf4c877a798e947bf4dd24444439f8: 2000 8e7ec41ac6b2c6349b35bd772cadbda0: 5 + 329a0c2a5a9393f4798af66f6dd69578: 0.7 + 0014edda5c9fa5d4eb0a88b63d7e6363: 2000 + a323a4cbeb78c974e94650c463a7b535: 1.5 + 851cd56ca0178c242b10f0b893c02081: -10 + 0d93648c9b517844896e719950ea4f25: 1.6 + 6758627ec830d1f4cad307f333d68e43: 3.5 + 6d0726fe668bab543b881317bef54793: 0.1 m_TransitionOverrides: {} --- !u!244 &6499960502945122 AudioMixerEffectController: @@ -159,6 +247,20 @@ AudioMixerEffectController: m_SendTarget: {fileID: 0} m_EnableWetMix: 0 m_Bypass: 0 +--- !u!244 &901220893356080106 +AudioMixerEffectController: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_EffectID: 5d23f94540edb474ea8c155f85e761bf + m_EffectName: Send + m_MixLevel: bfe25c26ae55123488247b46094af1c1 + m_Parameters: [] + m_SendTarget: {fileID: -4734788075015124645} + m_EnableWetMix: 0 + m_Bypass: 0 --- !u!243 &3851611846971593479 AudioMixerGroupController: m_ObjectHideFlags: 0 @@ -178,3 +280,23 @@ AudioMixerGroupController: m_Mute: 0 m_Solo: 0 m_BypassEffects: 0 +--- !u!244 &4754378330777255674 +AudioMixerEffectController: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_EffectID: eda358ec43a23a546862e1d78a51ad2e + m_EffectName: ParamEQ + m_MixLevel: 3344792be8e4b334f9390af8d52fc4ac + m_Parameters: + - m_ParameterName: Center freq + m_GUID: 0014edda5c9fa5d4eb0a88b63d7e6363 + - m_ParameterName: Octave range + m_GUID: 9cb35485508d2a94985383dd03a3e971 + - m_ParameterName: Frequency gain + m_GUID: 586c7fb068c4c544eb223f4c762b32d6 + m_SendTarget: {fileID: 0} + m_EnableWetMix: 0 + m_Bypass: 0 diff --git a/Assets/XR/Settings/OpenXR Package Settings.asset b/Assets/XR/Settings/OpenXR Package Settings.asset index 56e89ae7..4b543cf4 100644 --- a/Assets/XR/Settings/OpenXR Package Settings.asset +++ b/Assets/XR/Settings/OpenXR Package Settings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4cd8653ad3e114a6fa69b7b93f3f81a5a81b50a3d273277f3db78930618267cd -size 287 +oid sha256:f481b6e42e147ba73088636a9befecd57fc6a471ed2accdea98d095d06d604d0 +size 93963 From fb1a927342d6b579ff0f1f836dafafac56d637bd Mon Sep 17 00:00:00 2001 From: nakjun Date: Wed, 29 Jul 2026 12:41:20 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EC=A0=96=EC=9D=80=20=EA=B8=B0=ED=9A=8D?= =?UTF-8?q?=EC=84=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/01_Scenes/Festival_Chapter5.unity | 2 +- Assets/01_Scenes/Hischool_Chapter1.unity | 4 +- Assets/05_Textures/WetProjectProposal.png | 3 + .../05_Textures/WetProjectProposal.png.meta | 156 ++++++++++++++++++ Assets/06_Materials/WetProjectProposal.mat | 142 ++++++++++++++++ .../06_Materials/WetProjectProposal.mat.meta | 8 + .../XR/Settings/OpenXR Package Settings.asset | 4 +- 7 files changed, 314 insertions(+), 5 deletions(-) create mode 100644 Assets/05_Textures/WetProjectProposal.png create mode 100644 Assets/05_Textures/WetProjectProposal.png.meta create mode 100644 Assets/06_Materials/WetProjectProposal.mat create mode 100644 Assets/06_Materials/WetProjectProposal.mat.meta diff --git a/Assets/01_Scenes/Festival_Chapter5.unity b/Assets/01_Scenes/Festival_Chapter5.unity index 78657eea..43e77c03 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:7b953e3013c6734c165df9eba5fef3c3b2ab2fc3bbcb14e79820235d4ed46d3e +oid sha256:4bbbe6627d2b894c7a03f1db5cf6b5a60efd036e1cca8c69ab89eef276fcd9a9 size 1943641 diff --git a/Assets/01_Scenes/Hischool_Chapter1.unity b/Assets/01_Scenes/Hischool_Chapter1.unity index e60842d0..b766e0d8 100644 --- a/Assets/01_Scenes/Hischool_Chapter1.unity +++ b/Assets/01_Scenes/Hischool_Chapter1.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:958d24f86ae192fb6e19c74f4d5cddd1b089c0150bb7148090c75efeff1cff8a -size 4271416 +oid sha256:08ca16f028efbe11abdd6d28163fc943fecba8761b0fc3f0891e886279fa00bf +size 4274580 diff --git a/Assets/05_Textures/WetProjectProposal.png b/Assets/05_Textures/WetProjectProposal.png new file mode 100644 index 00000000..c3f517ad --- /dev/null +++ b/Assets/05_Textures/WetProjectProposal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0c9f5b70eb29965d6a5722d58f271adcf20eedad33697a716512dd36f204fff6 +size 366131 diff --git a/Assets/05_Textures/WetProjectProposal.png.meta b/Assets/05_Textures/WetProjectProposal.png.meta new file mode 100644 index 00000000..9937b957 --- /dev/null +++ b/Assets/05_Textures/WetProjectProposal.png.meta @@ -0,0 +1,156 @@ +fileFormatVersion: 2 +guid: 365aca18daafc6d43b97a32eaf19b15a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 1024 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/06_Materials/WetProjectProposal.mat b/Assets/06_Materials/WetProjectProposal.mat new file mode 100644 index 00000000..3a8dc34d --- /dev/null +++ b/Assets/06_Materials/WetProjectProposal.mat @@ -0,0 +1,142 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: WetProjectProposal + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON + - _ALPHATEST_ON + - _SURFACE_TYPE_TRANSPARENT + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: + - MOTIONVECTORS + - DepthOnly + - SHADOWCASTER + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 365aca18daafc6d43b97a32eaf19b15a, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 365aca18daafc6d43b97a32eaf19b15a, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 1 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 10 + - _DstBlendAlpha: 10 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 1 + - _WorkflowMode: 1 + - _XRMotionVectorsPass: 1 + - _ZWrite: 0 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &8243918870500824734 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion + version: 10 diff --git a/Assets/06_Materials/WetProjectProposal.mat.meta b/Assets/06_Materials/WetProjectProposal.mat.meta new file mode 100644 index 00000000..8f83a399 --- /dev/null +++ b/Assets/06_Materials/WetProjectProposal.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 939c4b26b2483c34791af6b56e669691 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/XR/Settings/OpenXR Package Settings.asset b/Assets/XR/Settings/OpenXR Package Settings.asset index 4b543cf4..bf2efe65 100644 --- a/Assets/XR/Settings/OpenXR Package Settings.asset +++ b/Assets/XR/Settings/OpenXR Package Settings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f481b6e42e147ba73088636a9befecd57fc6a471ed2accdea98d095d06d604d0 -size 93963 +oid sha256:20b08d546f0cfc8cc5c9ce7035c743b6498f65210a4caac05cb8fff0db629670 +size 93965