0.3.4.11
This commit is contained in:
parent
273df8d6ed
commit
826bc20b0c
@ -59,8 +59,7 @@ namespace BlueWater.Titles
|
|||||||
private bool _isQuitting;
|
private bool _isQuitting;
|
||||||
private bool _onButtonClicked;
|
private bool _onButtonClicked;
|
||||||
|
|
||||||
private Coroutine quitShowCoroutine;
|
private Coroutine _InkCoroutine;
|
||||||
private Coroutine quitHideCoroutine;
|
|
||||||
|
|
||||||
private void Start()
|
private void Start()
|
||||||
{
|
{
|
||||||
@ -72,6 +71,7 @@ namespace BlueWater.Titles
|
|||||||
{
|
{
|
||||||
_sceneController = SceneController.Instance;
|
_sceneController = SceneController.Instance;
|
||||||
_startGameButton.onClick.AddListener(_sceneController.FadeIn);
|
_startGameButton.onClick.AddListener(_sceneController.FadeIn);
|
||||||
|
//수정
|
||||||
AudioManager.Instance.PlayBgm(_dailyBgm);
|
AudioManager.Instance.PlayBgm(_dailyBgm);
|
||||||
|
|
||||||
Open();
|
Open();
|
||||||
@ -103,6 +103,7 @@ namespace BlueWater.Titles
|
|||||||
if (_startGameButton != null && _sceneController != null)
|
if (_startGameButton != null && _sceneController != null)
|
||||||
{
|
{
|
||||||
_startGameButton.onClick.RemoveListener(_sceneController.FadeIn);
|
_startGameButton.onClick.RemoveListener(_sceneController.FadeIn);
|
||||||
|
//수정
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -250,7 +251,13 @@ namespace BlueWater.Titles
|
|||||||
{
|
{
|
||||||
_titleMenuUiPanel.SetActive(false);
|
_titleMenuUiPanel.SetActive(false);
|
||||||
titleQuit.Open();
|
titleQuit.Open();
|
||||||
quitShowCoroutine = StartCoroutine(ShowQuitUiCoroutine());
|
|
||||||
|
if (_InkCoroutine != null)
|
||||||
|
{
|
||||||
|
StopCoroutine(_InkCoroutine);
|
||||||
|
}
|
||||||
|
|
||||||
|
_InkCoroutine = StartCoroutine(MoveInkBackground(1.0f));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -258,60 +265,36 @@ namespace BlueWater.Titles
|
|||||||
{
|
{
|
||||||
titleQuit.Close();
|
titleQuit.Close();
|
||||||
_titleMenuUiPanel.SetActive(true);
|
_titleMenuUiPanel.SetActive(true);
|
||||||
quitHideCoroutine = StartCoroutine(HideQuitUiCorutine());
|
|
||||||
|
if (_InkCoroutine != null)
|
||||||
|
{
|
||||||
|
StopCoroutine(_InkCoroutine);
|
||||||
}
|
}
|
||||||
|
|
||||||
private IEnumerator ShowQuitUiCoroutine()
|
_InkCoroutine = StartCoroutine(MoveInkBackground(0.4f));
|
||||||
{
|
|
||||||
if (quitHideCoroutine != null)
|
|
||||||
{
|
|
||||||
StopCoroutine(quitHideCoroutine);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private IEnumerator MoveInkBackground(float pos)
|
||||||
|
{
|
||||||
|
|
||||||
float timer = 0f;
|
float timer = 0f;
|
||||||
var orgPos = _backgroundInkMaterial.GetFloat("_Position"); // 기존 _Position 값 가져오기.
|
var orgPos = _backgroundInkMaterial.GetFloat("_Position"); // 기존 _Position 값 가져오기.
|
||||||
|
|
||||||
while (timer < 0.5f)
|
while (timer < 0.3f)
|
||||||
{
|
{
|
||||||
timer += Time.unscaledDeltaTime;
|
timer += Time.unscaledDeltaTime;
|
||||||
|
|
||||||
float t = timer;
|
float t = timer / 0.8f;
|
||||||
float easedT = EaseEffect.ExpoOut(t);
|
float easedT = EaseEffect.ExpoOut(t);
|
||||||
|
|
||||||
// Lerp로 계산한 값을 SetFloat으로 설정.
|
// Lerp로 계산한 값을 SetFloat으로 설정.
|
||||||
_backgroundInkMaterial.SetFloat("_Position", Mathf.Lerp(orgPos, 1.0f, easedT));
|
_backgroundInkMaterial.SetFloat("_Position", Mathf.Lerp(orgPos, pos, easedT));
|
||||||
|
|
||||||
yield return null;
|
yield return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 마지막에 정확히 목표값 설정.
|
// 마지막에 정확히 목표값 설정.
|
||||||
_backgroundInkMaterial.SetFloat("_Position", 1.0f);
|
_backgroundInkMaterial.SetFloat("_Position", pos);
|
||||||
}
|
|
||||||
|
|
||||||
private IEnumerator HideQuitUiCorutine()
|
|
||||||
{ if (quitShowCoroutine != null)
|
|
||||||
{
|
|
||||||
StopCoroutine(quitShowCoroutine);
|
|
||||||
}
|
|
||||||
|
|
||||||
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, 0.4f, easedT));
|
|
||||||
|
|
||||||
yield return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
// 마지막에 정확히 목표값 설정.
|
|
||||||
_backgroundInkMaterial.SetFloat("_Position", 0.4f);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void MoveLobbyScene()
|
public void MoveLobbyScene()
|
||||||
|
@ -93,7 +93,7 @@ Material:
|
|||||||
- _ClearCoatMask: 0
|
- _ClearCoatMask: 0
|
||||||
- _ClearCoatSmoothness: 0
|
- _ClearCoatSmoothness: 0
|
||||||
- _Cull: 2
|
- _Cull: 2
|
||||||
- _CustomTime: 31.315723
|
- _CustomTime: 35.194923
|
||||||
- _Cutoff: 0.5
|
- _Cutoff: 0.5
|
||||||
- _DetailAlbedoMapScale: 1
|
- _DetailAlbedoMapScale: 1
|
||||||
- _DetailNormalMapScale: 1
|
- _DetailNormalMapScale: 1
|
||||||
|
Loading…
Reference in New Issue
Block a user