0.3.4.13
This commit is contained in:
parent
d38a40cde4
commit
0b3cb03a9d
@ -1,15 +1,26 @@
|
|||||||
|
using System;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
using UnityEngine.UI;
|
||||||
|
|
||||||
public class ShaderUnscaledTime : MonoBehaviour
|
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()
|
void Update()
|
||||||
{
|
{
|
||||||
if (material != null)
|
if (_inkMaterialInstance != null)
|
||||||
{
|
{
|
||||||
// 사용자 정의 변수 "_CustomTime"에 unscaledTime 값 전달
|
// 사용자 정의 변수 "_CustomTime"에 unscaledTime 값 전달
|
||||||
material.SetFloat("_CustomTime", Time.unscaledTime);
|
_inkMaterialInstance.SetFloat("_CustomTime", Time.unscaledTime);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -7,6 +7,7 @@ using UnityEngine;
|
|||||||
using UnityEngine.EventSystems;
|
using UnityEngine.EventSystems;
|
||||||
using UnityEngine.InputSystem;
|
using UnityEngine.InputSystem;
|
||||||
using UnityEngine.SceneManagement;
|
using UnityEngine.SceneManagement;
|
||||||
|
using UnityEngine.Serialization;
|
||||||
using UnityEngine.UI;
|
using UnityEngine.UI;
|
||||||
|
|
||||||
namespace BlueWater.Titles
|
namespace BlueWater.Titles
|
||||||
@ -48,9 +49,11 @@ namespace BlueWater.Titles
|
|||||||
|
|
||||||
[SerializeField]
|
[SerializeField]
|
||||||
private string _dailyBgm = "DailyBgm1";
|
private string _dailyBgm = "DailyBgm1";
|
||||||
|
|
||||||
[SerializeField]
|
[SerializeField]
|
||||||
public Material _backgroundInkMaterial;
|
private Image _ink;
|
||||||
|
|
||||||
|
private Material _inkMaterialInstance;
|
||||||
|
|
||||||
private PlayerInputKeyManager _playerInputKeyManager;
|
private PlayerInputKeyManager _playerInputKeyManager;
|
||||||
private SceneController _sceneController;
|
private SceneController _sceneController;
|
||||||
@ -96,6 +99,9 @@ namespace BlueWater.Titles
|
|||||||
titleOptions.CloseOptions = HideSettingUi;
|
titleOptions.CloseOptions = HideSettingUi;
|
||||||
titleQuit.CloseQuit = HideQuitUi;
|
titleQuit.CloseQuit = HideQuitUi;
|
||||||
_versionText.text = GetVersion();
|
_versionText.text = GetVersion();
|
||||||
|
|
||||||
|
_inkMaterialInstance = Instantiate(_ink.material);
|
||||||
|
_ink.material = _inkMaterialInstance;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void OnDestroy()
|
private void OnDestroy()
|
||||||
@ -283,7 +289,7 @@ namespace BlueWater.Titles
|
|||||||
{
|
{
|
||||||
|
|
||||||
float timer = 0f;
|
float timer = 0f;
|
||||||
var orgPos = _backgroundInkMaterial.GetFloat("_Position"); // 기존 _Position 값 가져오기.
|
var orgPos = _inkMaterialInstance.GetFloat("_Position"); // 기존 _Position 값 가져오기.
|
||||||
|
|
||||||
while (timer < 0.3f)
|
while (timer < 0.3f)
|
||||||
{
|
{
|
||||||
@ -293,13 +299,13 @@ namespace BlueWater.Titles
|
|||||||
float easedT = EaseEffect.ExpoOut(t);
|
float easedT = EaseEffect.ExpoOut(t);
|
||||||
|
|
||||||
// Lerp로 계산한 값을 SetFloat으로 설정.
|
// Lerp로 계산한 값을 SetFloat으로 설정.
|
||||||
_backgroundInkMaterial.SetFloat("_Position", Mathf.Lerp(orgPos, pos, easedT));
|
_inkMaterialInstance.SetFloat("_Position", Mathf.Lerp(orgPos, pos, easedT));
|
||||||
|
|
||||||
yield return null;
|
yield return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 마지막에 정확히 목표값 설정.
|
// 마지막에 정확히 목표값 설정.
|
||||||
_backgroundInkMaterial.SetFloat("_Position", pos);
|
_inkMaterialInstance.SetFloat("_Position", pos);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void MoveLobbyScene()
|
public void MoveLobbyScene()
|
||||||
|
Binary file not shown.
Before Width: | Height: | Size: 327 KiB After Width: | Height: | Size: 689 KiB |
@ -93,7 +93,7 @@ Material:
|
|||||||
- _ClearCoatMask: 0
|
- _ClearCoatMask: 0
|
||||||
- _ClearCoatSmoothness: 0
|
- _ClearCoatSmoothness: 0
|
||||||
- _Cull: 2
|
- _Cull: 2
|
||||||
- _CustomTime: 35.194923
|
- _CustomTime: 19.609552
|
||||||
- _Cutoff: 0.5
|
- _Cutoff: 0.5
|
||||||
- _DetailAlbedoMapScale: 1
|
- _DetailAlbedoMapScale: 1
|
||||||
- _DetailNormalMapScale: 1
|
- _DetailNormalMapScale: 1
|
||||||
|
@ -3020,8 +3020,8 @@ RectTransform:
|
|||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 0}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 1, y: 1}
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
m_AnchoredPosition: {x: 450, y: 0}
|
m_AnchoredPosition: {x: 430, y: 0}
|
||||||
m_SizeDelta: {x: -820, y: -100}
|
m_SizeDelta: {x: -860, y: -100}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &2087581744713290713
|
--- !u!222 &2087581744713290713
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
@ -9765,7 +9765,8 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: bf906d99280c73d45a290761969d7bc5, type: 3}
|
m_Script: {fileID: 11500000, guid: bf906d99280c73d45a290761969d7bc5, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
material: {fileID: 2100000, guid: 10f8236f36b04a54aaf175b5763f7ef6, type: 2}
|
_ink: {fileID: 8241840109796323035}
|
||||||
|
_inkMaterialInstance: {fileID: 0}
|
||||||
--- !u!1 &7055048572422567791
|
--- !u!1 &7055048572422567791
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -11363,7 +11364,8 @@ MonoBehaviour:
|
|||||||
_isTitleScene: 1
|
_isTitleScene: 1
|
||||||
_versionText: {fileID: 408792858244141541}
|
_versionText: {fileID: 408792858244141541}
|
||||||
_dailyBgm: TycoonTitleBgm02
|
_dailyBgm: TycoonTitleBgm02
|
||||||
_backgroundInkMaterial: {fileID: 2100000, guid: 10f8236f36b04a54aaf175b5763f7ef6, type: 2}
|
_ink: {fileID: 8241840109796323035}
|
||||||
|
_inkMaterialInstance: {fileID: 0}
|
||||||
--- !u!114 &9207272460605448926
|
--- !u!114 &9207272460605448926
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -140,7 +140,7 @@ PlayerSettings:
|
|||||||
loadStoreDebugModeEnabled: 0
|
loadStoreDebugModeEnabled: 0
|
||||||
visionOSBundleVersion: 1.0
|
visionOSBundleVersion: 1.0
|
||||||
tvOSBundleVersion: 1.0
|
tvOSBundleVersion: 1.0
|
||||||
bundleVersion: 0.3.4.10
|
bundleVersion: 0.3.4.13
|
||||||
preloadedAssets:
|
preloadedAssets:
|
||||||
- {fileID: -944628639613478452, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3}
|
- {fileID: -944628639613478452, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3}
|
||||||
- {fileID: 11400000, guid: 112e4950c7d9b7a429feb9bb058a93a7, type: 2}
|
- {fileID: 11400000, guid: 112e4950c7d9b7a429feb9bb058a93a7, type: 2}
|
||||||
|
Loading…
Reference in New Issue
Block a user