diff --git a/Assets/02.Scripts/Ui/Title/TycoonTitle.cs b/Assets/02.Scripts/Ui/Title/TycoonTitle.cs index 028c88563..9a693a356 100644 --- a/Assets/02.Scripts/Ui/Title/TycoonTitle.cs +++ b/Assets/02.Scripts/Ui/Title/TycoonTitle.cs @@ -59,8 +59,7 @@ namespace BlueWater.Titles private bool _isQuitting; private bool _onButtonClicked; - private Coroutine quitShowCoroutine; - private Coroutine quitHideCoroutine; + private Coroutine _InkCoroutine; private void Start() { @@ -72,6 +71,7 @@ namespace BlueWater.Titles { _sceneController = SceneController.Instance; _startGameButton.onClick.AddListener(_sceneController.FadeIn); + //수정 AudioManager.Instance.PlayBgm(_dailyBgm); Open(); @@ -103,6 +103,7 @@ namespace BlueWater.Titles if (_startGameButton != null && _sceneController != null) { _startGameButton.onClick.RemoveListener(_sceneController.FadeIn); + //수정 } } @@ -250,7 +251,13 @@ namespace BlueWater.Titles { _titleMenuUiPanel.SetActive(false); titleQuit.Open(); - quitShowCoroutine = StartCoroutine(ShowQuitUiCoroutine()); + + if (_InkCoroutine != null) + { + StopCoroutine(_InkCoroutine); + } + + _InkCoroutine = StartCoroutine(MoveInkBackground(1.0f)); } @@ -258,62 +265,38 @@ namespace BlueWater.Titles { titleQuit.Close(); _titleMenuUiPanel.SetActive(true); - quitHideCoroutine = StartCoroutine(HideQuitUiCorutine()); + + if (_InkCoroutine != null) + { + StopCoroutine(_InkCoroutine); + } + + _InkCoroutine = StartCoroutine(MoveInkBackground(0.4f)); } - private IEnumerator ShowQuitUiCoroutine() + private IEnumerator MoveInkBackground(float pos) { - if (quitHideCoroutine != null) - { - StopCoroutine(quitHideCoroutine); - } - - float timer = 0f; - var orgPos = _backgroundInkMaterial.GetFloat("_Position"); // 기존 _Position 값 가져오기. - - while (timer < 0.5f) - { - timer += Time.unscaledDeltaTime; - - float t = timer; - float easedT = EaseEffect.ExpoOut(t); - - // Lerp로 계산한 값을 SetFloat으로 설정. - _backgroundInkMaterial.SetFloat("_Position", Mathf.Lerp(orgPos, 1.0f, easedT)); - - yield return null; - } - - // 마지막에 정확히 목표값 설정. - _backgroundInkMaterial.SetFloat("_Position", 1.0f); - } - - private IEnumerator HideQuitUiCorutine() - { if (quitShowCoroutine != null) - { - StopCoroutine(quitShowCoroutine); - } float timer = 0f; var orgPos = _backgroundInkMaterial.GetFloat("_Position"); // 기존 _Position 값 가져오기. - while (timer < 0.5f) + while (timer < 0.3f) { timer += Time.unscaledDeltaTime; - float t = timer; + float t = timer / 0.8f; float easedT = EaseEffect.ExpoOut(t); // Lerp로 계산한 값을 SetFloat으로 설정. - _backgroundInkMaterial.SetFloat("_Position", Mathf.Lerp(orgPos, 0.4f, easedT)); + _backgroundInkMaterial.SetFloat("_Position", Mathf.Lerp(orgPos, pos, easedT)); yield return null; } // 마지막에 정확히 목표값 설정. - _backgroundInkMaterial.SetFloat("_Position", 0.4f); + _backgroundInkMaterial.SetFloat("_Position", pos); } - + public void MoveLobbyScene() { SceneManager.LoadScene("00.TycoonTitle"); diff --git a/Assets/04.Materials/Ink.mat b/Assets/04.Materials/Ink.mat index 60a44698b..c17f5fa56 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: 31.315723 + - _CustomTime: 35.194923 - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1