0.3.4.14
This commit is contained in:
parent
0b3cb03a9d
commit
a90dc55ab5
File diff suppressed because it is too large
Load Diff
@ -1,26 +1,18 @@
|
||||
using System;
|
||||
using BlueWater.Titles;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
public class ShaderUnscaledTime : MonoBehaviour
|
||||
{
|
||||
[SerializeField]
|
||||
private Image _ink;
|
||||
|
||||
private Material _inkMaterialInstance;
|
||||
|
||||
private void Start()
|
||||
{
|
||||
_inkMaterialInstance = Instantiate(_ink.material);
|
||||
_ink.material = _inkMaterialInstance;
|
||||
}
|
||||
private TycoonTitle _tycoonTitle;
|
||||
|
||||
void Update()
|
||||
{
|
||||
if (_inkMaterialInstance != null)
|
||||
if (_tycoonTitle.inkMaterialInstance != null)
|
||||
{
|
||||
// 사용자 정의 변수 "_CustomTime"에 unscaledTime 값 전달
|
||||
_inkMaterialInstance.SetFloat("_CustomTime", Time.unscaledTime);
|
||||
_tycoonTitle.inkMaterialInstance.SetFloat("_CustomTime", Time.unscaledTime);
|
||||
}
|
||||
}
|
||||
}
|
@ -53,7 +53,7 @@ namespace BlueWater.Titles
|
||||
[SerializeField]
|
||||
private Image _ink;
|
||||
|
||||
private Material _inkMaterialInstance;
|
||||
public Material inkMaterialInstance { get; private set; }
|
||||
|
||||
private PlayerInputKeyManager _playerInputKeyManager;
|
||||
private SceneController _sceneController;
|
||||
@ -100,8 +100,8 @@ namespace BlueWater.Titles
|
||||
titleQuit.CloseQuit = HideQuitUi;
|
||||
_versionText.text = GetVersion();
|
||||
|
||||
_inkMaterialInstance = Instantiate(_ink.material);
|
||||
_ink.material = _inkMaterialInstance;
|
||||
inkMaterialInstance = Instantiate(_ink.material);
|
||||
_ink.material = inkMaterialInstance;
|
||||
}
|
||||
|
||||
private void OnDestroy()
|
||||
@ -289,7 +289,7 @@ namespace BlueWater.Titles
|
||||
{
|
||||
|
||||
float timer = 0f;
|
||||
var orgPos = _inkMaterialInstance.GetFloat("_Position"); // 기존 _Position 값 가져오기.
|
||||
var orgPos = inkMaterialInstance.GetFloat("_Position"); // 기존 _Position 값 가져오기.
|
||||
|
||||
while (timer < 0.3f)
|
||||
{
|
||||
@ -299,13 +299,13 @@ namespace BlueWater.Titles
|
||||
float easedT = EaseEffect.ExpoOut(t);
|
||||
|
||||
// Lerp로 계산한 값을 SetFloat으로 설정.
|
||||
_inkMaterialInstance.SetFloat("_Position", Mathf.Lerp(orgPos, pos, easedT));
|
||||
inkMaterialInstance.SetFloat("_Position", Mathf.Lerp(orgPos, pos, easedT));
|
||||
|
||||
yield return null;
|
||||
}
|
||||
|
||||
// 마지막에 정확히 목표값 설정.
|
||||
_inkMaterialInstance.SetFloat("_Position", pos);
|
||||
inkMaterialInstance.SetFloat("_Position", pos);
|
||||
}
|
||||
|
||||
public void MoveLobbyScene()
|
||||
|
@ -9765,8 +9765,7 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: bf906d99280c73d45a290761969d7bc5, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_ink: {fileID: 8241840109796323035}
|
||||
_inkMaterialInstance: {fileID: 0}
|
||||
_tycoonTitle: {fileID: 3484035362484606752}
|
||||
--- !u!1 &7055048572422567791
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -11365,7 +11364,6 @@ MonoBehaviour:
|
||||
_versionText: {fileID: 408792858244141541}
|
||||
_dailyBgm: TycoonTitleBgm02
|
||||
_ink: {fileID: 8241840109796323035}
|
||||
_inkMaterialInstance: {fileID: 0}
|
||||
--- !u!114 &9207272460605448926
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
Loading…
Reference in New Issue
Block a user