From 3f3741719cf376a605b5e88770c9b8765476fd27 Mon Sep 17 00:00:00 2001 From: user Date: Thu, 19 Mar 2026 22:15:45 +0900 Subject: [PATCH] =?UTF-8?q?Fix=20:=20=EA=B5=AC=EC=8A=AC=EC=9A=94=20?= =?UTF-8?q?=EB=AF=B8=EB=8B=88=20=EC=BD=98=20=EC=8A=A4=ED=85=8C=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=20=EB=94=94=ED=85=8C=EC=9D=BC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Glb/mtl/floor.mat | 3 +- .../Glb/mtl/plant/lyrata.mat | 4 +- .../Glb/mtl/plant/plant5/calathea.mat | 17 +++-- .../Scene/[구슬요]미니콘 스테이지 - 바다 위 중정.unity | 4 +- .../Global Volume Profile.asset | 2 +- .../Background/SkyboxTimeController.cs | 70 +++++++++++++++++++ 6 files changed, 87 insertions(+), 13 deletions(-) diff --git a/Assets/ResourcesData/Background/[구슬요]미니콘 스테이지 - 바다 위 중정/Glb/mtl/floor.mat b/Assets/ResourcesData/Background/[구슬요]미니콘 스테이지 - 바다 위 중정/Glb/mtl/floor.mat index 69ed25b9b..2a4afd6f6 100644 --- a/Assets/ResourcesData/Background/[구슬요]미니콘 스테이지 - 바다 위 중정/Glb/mtl/floor.mat +++ b/Assets/ResourcesData/Background/[구슬요]미니콘 스테이지 - 바다 위 중정/Glb/mtl/floor.mat @@ -26,7 +26,6 @@ Material: m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _NORMALMAP - - _RECEIVE_NILOTOON_CHAR_SHADOW m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -178,7 +177,7 @@ Material: - _OcclusionStrength: 1 - _Parallax: 0.005 - _QueueOffset: 0 - - _ReceiveNiloToonCharShadow: 1 + - _ReceiveNiloToonCharShadow: 0 - _ReceiveShadows: 1 - _ScreenSpaceOutlineIntensity: 1 - _ScreenSpaceOutlineWidth: 1 diff --git a/Assets/ResourcesData/Background/[구슬요]미니콘 스테이지 - 바다 위 중정/Glb/mtl/plant/lyrata.mat b/Assets/ResourcesData/Background/[구슬요]미니콘 스테이지 - 바다 위 중정/Glb/mtl/plant/lyrata.mat index baa10e1fd..a3081c654 100644 --- a/Assets/ResourcesData/Background/[구슬요]미니콘 스테이지 - 바다 위 중정/Glb/mtl/plant/lyrata.mat +++ b/Assets/ResourcesData/Background/[구슬요]미니콘 스테이지 - 바다 위 중정/Glb/mtl/plant/lyrata.mat @@ -177,7 +177,7 @@ Material: - _GlossyReflections: 0 - _Metallic: 0 - _NiloToonCharShadowStrength: 1 - - _NoiseScale: 4 + - _NoiseScale: 1 - _OcclusionStrength: 1 - _Parallax: 0.005 - _QueueControl: 0 @@ -209,7 +209,7 @@ Material: - _SplatSmoothnessMultiplierR: 1 - _SrcBlend: 1 - _SrcBlendAlpha: 1 - - _Strength: 0.032 + - _Strength: 0.03 - _Surface: 0 - _WorkflowMode: 1 - _XRMotionVectorsPass: 1 diff --git a/Assets/ResourcesData/Background/[구슬요]미니콘 스테이지 - 바다 위 중정/Glb/mtl/plant/plant5/calathea.mat b/Assets/ResourcesData/Background/[구슬요]미니콘 스테이지 - 바다 위 중정/Glb/mtl/plant/plant5/calathea.mat index ca5b9e514..4187dfe60 100644 --- a/Assets/ResourcesData/Background/[구슬요]미니콘 스테이지 - 바다 위 중정/Glb/mtl/plant/plant5/calathea.mat +++ b/Assets/ResourcesData/Background/[구슬요]미니콘 스테이지 - 바다 위 중정/Glb/mtl/plant/plant5/calathea.mat @@ -21,19 +21,16 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: calathea - m_Shader: {fileID: 4800000, guid: 50e19b7c9fbe3324e978246ad9789e96, type: 3} + m_Shader: {fileID: 4800000, guid: 50439395ad6c0394282a25cec0a9dc85, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: - - _DETAIL_SCALED - - _NORMALMAP + m_ValidKeywords: [] m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 1 m_CustomRenderQueue: -1 - stringTagMap: - RenderType: Opaque + stringTagMap: {} disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: @@ -139,6 +136,10 @@ Material: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + - _texcoord: + 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} @@ -155,6 +156,7 @@ Material: m_Floats: - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaCutoff: 0.5 - _AlphaToMask: 0 - _Blend: 0 - _BlendModePreserveSpecular: 1 @@ -175,8 +177,10 @@ Material: - _GlossyReflections: 0 - _Metallic: 0 - _NiloToonCharShadowStrength: 1 + - _NoiseScale: 1 - _OcclusionStrength: 1 - _Parallax: 0.005 + - _QueueControl: 0 - _QueueOffset: 0 - _ReceiveNiloToonCharShadow: 0 - _ReceiveShadows: 1 @@ -205,6 +209,7 @@ Material: - _SplatSmoothnessMultiplierR: 1 - _SrcBlend: 1 - _SrcBlendAlpha: 1 + - _Strength: 0.02 - _Surface: 0 - _WorkflowMode: 1 - _XRMotionVectorsPass: 1 diff --git a/Assets/ResourcesData/Background/[구슬요]미니콘 스테이지 - 바다 위 중정/Scene/[구슬요]미니콘 스테이지 - 바다 위 중정.unity b/Assets/ResourcesData/Background/[구슬요]미니콘 스테이지 - 바다 위 중정/Scene/[구슬요]미니콘 스테이지 - 바다 위 중정.unity index 2849adc57..5cecb5755 100644 --- a/Assets/ResourcesData/Background/[구슬요]미니콘 스테이지 - 바다 위 중정/Scene/[구슬요]미니콘 스테이지 - 바다 위 중정.unity +++ b/Assets/ResourcesData/Background/[구슬요]미니콘 스테이지 - 바다 위 중정/Scene/[구슬요]미니콘 스테이지 - 바다 위 중정.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:877e65e6321f1e16fb7c568288f099221a22b763db7d07491366e021f117cbb0 -size 439018 +oid sha256:6d9fc62ef9fe78722f114f08fac1bbaec297ca68ed8ba70493df427bcf14478f +size 439929 diff --git a/Assets/ResourcesData/Background/[구슬요]미니콘 스테이지 - 바다 위 중정/Scene/[구슬요]미니콘 스테이지 - 바다 위 중정/Global Volume Profile.asset b/Assets/ResourcesData/Background/[구슬요]미니콘 스테이지 - 바다 위 중정/Scene/[구슬요]미니콘 스테이지 - 바다 위 중정/Global Volume Profile.asset index c7ba77bed..bc30514fe 100644 --- a/Assets/ResourcesData/Background/[구슬요]미니콘 스테이지 - 바다 위 중정/Scene/[구슬요]미니콘 스테이지 - 바다 위 중정/Global Volume Profile.asset +++ b/Assets/ResourcesData/Background/[구슬요]미니콘 스테이지 - 바다 위 중정/Scene/[구슬요]미니콘 스테이지 - 바다 위 중정/Global Volume Profile.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:184915a59bf4650dc05981fe728be6b7e1bc8d0848ca4ee14a6409ed3162f0bb +oid sha256:10be68994cd87866e3bc50a73b57b4c89094943e01475cb128fce758bf911f8e size 31996 diff --git a/Assets/Scripts/Streamingle/StreamingleControl/Background/SkyboxTimeController.cs b/Assets/Scripts/Streamingle/StreamingleControl/Background/SkyboxTimeController.cs index d022f3ee7..58b7fee4d 100644 --- a/Assets/Scripts/Streamingle/StreamingleControl/Background/SkyboxTimeController.cs +++ b/Assets/Scripts/Streamingle/StreamingleControl/Background/SkyboxTimeController.cs @@ -230,12 +230,82 @@ namespace Streamingle.Background } } + /// timeOfDay를 직접 지정 (0~1) public void SetTime(float t) { timeOfDay = Mathf.Clamp01(t); Apply(); } + /// Stage 1 (timeOfDay = 0) 으로 즉시 이동 + public void GoToStage1() => SetTime(0f); + + /// Stage 2 (timeOfDay = 0.5) 으로 즉시 이동 + public void GoToStage2() => SetTime(0.5f); + + /// Stage 3 (timeOfDay = 1) 으로 즉시 이동 + public void GoToStage3() => SetTime(1f); + + /// 지정한 Stage로 duration초 동안 부드럽게 블렌딩 + public void BlendToStage(int stage, float duration) + { + float target = stage switch + { + 1 => 0f, + 2 => 0.5f, + 3 => 1f, + _ => Mathf.Clamp01((stage - 1) * 0.5f), + }; + BlendTo(target, duration); + } + + /// Stage 1으로 duration초 동안 블렌딩 + public void BlendToStage1(float duration) => BlendTo(0f, duration); + + /// Stage 2로 duration초 동안 블렌딩 + public void BlendToStage2(float duration) => BlendTo(0.5f, duration); + + /// Stage 3으로 duration초 동안 블렌딩 + public void BlendToStage3(float duration) => BlendTo(1f, duration); + + /// 임의 timeOfDay 값으로 duration초 동안 블렌딩 + public void BlendTo(float targetTime, float duration) + { + if (_blendCoroutine != null) StopCoroutine(_blendCoroutine); + _blendCoroutine = StartCoroutine(BlendCoroutine(targetTime, duration)); + } + + /// 현재 진행 중인 블렌딩 중단 + public void StopBlend() + { + if (_blendCoroutine != null) + { + StopCoroutine(_blendCoroutine); + _blendCoroutine = null; + } + } + + private Coroutine _blendCoroutine; + + private System.Collections.IEnumerator BlendCoroutine(float target, float duration) + { + float start = timeOfDay; + float elapsed = 0f; + duration = Mathf.Max(0.001f, duration); + + while (elapsed < duration) + { + elapsed += Time.deltaTime; + timeOfDay = Mathf.Lerp(start, target, elapsed / duration); + Apply(); + yield return null; + } + + timeOfDay = target; + Apply(); + _blendCoroutine = null; + } + public Material GetActiveMaterial() { return _instanceMaterial != null ? _instanceMaterial : skyboxMaterial;