diff --git a/Assets/02.Scripts/ShaderUnscaledTime.cs b/Assets/02.Scripts/ShaderUnscaledTime.cs index 8d62be465..ab0893da2 100644 --- a/Assets/02.Scripts/ShaderUnscaledTime.cs +++ b/Assets/02.Scripts/ShaderUnscaledTime.cs @@ -1,15 +1,26 @@ +using System; using UnityEngine; +using UnityEngine.UI; public class ShaderUnscaledTime : MonoBehaviour { - public Material material; // 쉐이더가 포함된 Material + [SerializeField] + private Image _ink; + + private Material _inkMaterialInstance; + + private void Start() + { + _inkMaterialInstance = Instantiate(_ink.material); + _ink.material = _inkMaterialInstance; + } void Update() { - if (material != null) + if (_inkMaterialInstance != null) { // 사용자 정의 변수 "_CustomTime"에 unscaledTime 값 전달 - material.SetFloat("_CustomTime", Time.unscaledTime); + _inkMaterialInstance.SetFloat("_CustomTime", Time.unscaledTime); } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Ui/Title/TycoonTitle.cs b/Assets/02.Scripts/Ui/Title/TycoonTitle.cs index 32d6ba1a3..a7fb58750 100644 --- a/Assets/02.Scripts/Ui/Title/TycoonTitle.cs +++ b/Assets/02.Scripts/Ui/Title/TycoonTitle.cs @@ -7,6 +7,7 @@ using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.InputSystem; using UnityEngine.SceneManagement; +using UnityEngine.Serialization; using UnityEngine.UI; namespace BlueWater.Titles @@ -48,9 +49,11 @@ namespace BlueWater.Titles [SerializeField] private string _dailyBgm = "DailyBgm1"; - + [SerializeField] - public Material _backgroundInkMaterial; + private Image _ink; + + private Material _inkMaterialInstance; private PlayerInputKeyManager _playerInputKeyManager; private SceneController _sceneController; @@ -96,6 +99,9 @@ namespace BlueWater.Titles titleOptions.CloseOptions = HideSettingUi; titleQuit.CloseQuit = HideQuitUi; _versionText.text = GetVersion(); + + _inkMaterialInstance = Instantiate(_ink.material); + _ink.material = _inkMaterialInstance; } private void OnDestroy() @@ -283,7 +289,7 @@ namespace BlueWater.Titles { float timer = 0f; - var orgPos = _backgroundInkMaterial.GetFloat("_Position"); // 기존 _Position 값 가져오기. + var orgPos = _inkMaterialInstance.GetFloat("_Position"); // 기존 _Position 값 가져오기. while (timer < 0.3f) { @@ -293,13 +299,13 @@ namespace BlueWater.Titles float easedT = EaseEffect.ExpoOut(t); // Lerp로 계산한 값을 SetFloat으로 설정. - _backgroundInkMaterial.SetFloat("_Position", Mathf.Lerp(orgPos, pos, easedT)); + _inkMaterialInstance.SetFloat("_Position", Mathf.Lerp(orgPos, pos, easedT)); yield return null; } // 마지막에 정확히 목표값 설정. - _backgroundInkMaterial.SetFloat("_Position", pos); + _inkMaterialInstance.SetFloat("_Position", pos); } public void MoveLobbyScene() diff --git a/Assets/03.Images/Ui/Title/TitleCharacter.png b/Assets/03.Images/Ui/Title/TitleCharacter.png index 9cafc9006..a52f24180 100644 Binary files a/Assets/03.Images/Ui/Title/TitleCharacter.png and b/Assets/03.Images/Ui/Title/TitleCharacter.png differ diff --git a/Assets/04.Materials/Ink.mat b/Assets/04.Materials/Ink.mat index c17f5fa56..33cab203d 100644 --- a/Assets/04.Materials/Ink.mat +++ b/Assets/04.Materials/Ink.mat @@ -93,7 +93,7 @@ Material: - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 - _Cull: 2 - - _CustomTime: 35.194923 + - _CustomTime: 19.609552 - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 diff --git a/Assets/05.Prefabs/Uis/Tycoons/TycoonTitleMenuCanvas.prefab b/Assets/05.Prefabs/Uis/Tycoons/TycoonTitleMenuCanvas.prefab index df3ed5798..322b5b028 100644 --- a/Assets/05.Prefabs/Uis/Tycoons/TycoonTitleMenuCanvas.prefab +++ b/Assets/05.Prefabs/Uis/Tycoons/TycoonTitleMenuCanvas.prefab @@ -3020,8 +3020,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 450, y: 0} - m_SizeDelta: {x: -820, y: -100} + m_AnchoredPosition: {x: 430, y: 0} + m_SizeDelta: {x: -860, y: -100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2087581744713290713 CanvasRenderer: @@ -9765,7 +9765,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bf906d99280c73d45a290761969d7bc5, type: 3} m_Name: m_EditorClassIdentifier: - material: {fileID: 2100000, guid: 10f8236f36b04a54aaf175b5763f7ef6, type: 2} + _ink: {fileID: 8241840109796323035} + _inkMaterialInstance: {fileID: 0} --- !u!1 &7055048572422567791 GameObject: m_ObjectHideFlags: 0 @@ -11363,7 +11364,8 @@ MonoBehaviour: _isTitleScene: 1 _versionText: {fileID: 408792858244141541} _dailyBgm: TycoonTitleBgm02 - _backgroundInkMaterial: {fileID: 2100000, guid: 10f8236f36b04a54aaf175b5763f7ef6, type: 2} + _ink: {fileID: 8241840109796323035} + _inkMaterialInstance: {fileID: 0} --- !u!114 &9207272460605448926 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 85eb8eec3..ab89a77a2 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -140,7 +140,7 @@ PlayerSettings: loadStoreDebugModeEnabled: 0 visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 - bundleVersion: 0.3.4.10 + bundleVersion: 0.3.4.13 preloadedAssets: - {fileID: -944628639613478452, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3} - {fileID: 11400000, guid: 112e4950c7d9b7a429feb9bb058a93a7, type: 2}