iwnc2020/CapersProject
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0.3.4.14

Browse Source
This commit is contained in:
SweetJJuya 2024-11-19 23:19:54 +09:00
parent 0b3cb03a9d
commit a90dc55ab5
4 changed files with 114 additions and 6464 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6546
Assets/01.Scenes/00.TycoonTitle.unity
View File

File diff suppressed because it is too large Load Diff

16
Assets/02.Scripts/ShaderUnscaledTime.cs
View File

@ -1,26 +1,18 @@
using System; using System;
using BlueWater.Titles;
using UnityEngine; using UnityEngine;
using UnityEngine.UI; using UnityEngine.UI;
public class ShaderUnscaledTime : MonoBehaviour public class ShaderUnscaledTime : MonoBehaviour
{ {
[SerializeField] [SerializeField]
private Image _ink; private TycoonTitle _tycoonTitle;
private Material _inkMaterialInstance;
private void Start()
{
_inkMaterialInstance = Instantiate(_ink.material);
_ink.material = _inkMaterialInstance;
}
void Update() void Update()
{ {
if (_inkMaterialInstance != null) if (_tycoonTitle.inkMaterialInstance != null)
{ {
// 사용자 정의 변수 "_CustomTime"에 unscaledTime 값 전달 _tycoonTitle.inkMaterialInstance.SetFloat("_CustomTime", Time.unscaledTime);
_inkMaterialInstance.SetFloat("_CustomTime", Time.unscaledTime);
} }
} }
} }

12
Assets/02.Scripts/Ui/Title/TycoonTitle.cs
View File

@ -53,7 +53,7 @@ namespace BlueWater.Titles
[SerializeField] [SerializeField]
private Image _ink; private Image _ink;
private Material _inkMaterialInstance; public Material inkMaterialInstance { get; private set; }
private PlayerInputKeyManager _playerInputKeyManager; private PlayerInputKeyManager _playerInputKeyManager;
private SceneController _sceneController; private SceneController _sceneController;
@ -100,8 +100,8 @@ namespace BlueWater.Titles
titleQuit.CloseQuit = HideQuitUi; titleQuit.CloseQuit = HideQuitUi;
_versionText.text = GetVersion(); _versionText.text = GetVersion();
_inkMaterialInstance = Instantiate(_ink.material); inkMaterialInstance = Instantiate(_ink.material);
_ink.material = _inkMaterialInstance; _ink.material = inkMaterialInstance;
} }
private void OnDestroy() private void OnDestroy()
@ -289,7 +289,7 @@ namespace BlueWater.Titles
{ {
float timer = 0f; float timer = 0f;
var orgPos = _inkMaterialInstance.GetFloat("_Position"); // 기존 _Position 값 가져오기. var orgPos = inkMaterialInstance.GetFloat("_Position"); // 기존 _Position 값 가져오기.
while (timer < 0.3f) while (timer < 0.3f)
{ {
@ -299,13 +299,13 @@ namespace BlueWater.Titles
float easedT = EaseEffect.ExpoOut(t); float easedT = EaseEffect.ExpoOut(t);
// Lerp로 계산한 값을 SetFloat으로 설정. // Lerp로 계산한 값을 SetFloat으로 설정.
_inkMaterialInstance.SetFloat("_Position", Mathf.Lerp(orgPos, pos, easedT)); inkMaterialInstance.SetFloat("_Position", Mathf.Lerp(orgPos, pos, easedT));
yield return null; yield return null;
} }
// 마지막에 정확히 목표값 설정. // 마지막에 정확히 목표값 설정.
_inkMaterialInstance.SetFloat("_Position", pos); inkMaterialInstance.SetFloat("_Position", pos);
} }
public void MoveLobbyScene() public void MoveLobbyScene()

4
Assets/05.Prefabs/Uis/Tycoons/TycoonTitleMenuCanvas.prefab
View File

@ -9765,8 +9765,7 @@ 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:
_ink: {fileID: 8241840109796323035} _tycoonTitle: {fileID: 3484035362484606752}
_inkMaterialInstance: {fileID: 0}
--- !u!1 &7055048572422567791 --- !u!1 &7055048572422567791
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -11365,7 +11364,6 @@ MonoBehaviour:
_versionText: {fileID: 408792858244141541} _versionText: {fileID: 408792858244141541}
_dailyBgm: TycoonTitleBgm02 _dailyBgm: TycoonTitleBgm02
_ink: {fileID: 8241840109796323035} _ink: {fileID: 8241840109796323035}
_inkMaterialInstance: {fileID: 0}
--- !u!114 &9207272460605448926 --- !u!114 &9207272460605448926
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0