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

Merge branch 'lmg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg

Browse Source
This commit is contained in:
NTG_Lenovo 2024-10-31 14:29:08 +09:00
commit 72281e727c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/01.Scenes/_A.LMG.unity
View File

@ -9619,7 +9619,7 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1 m_Maskable: 1
m_OnCullStateChanged: m_OnCullStateChanged:

2
Assets/02.Scripts/Tycoon/TycoonGameOver.cs
View File

@ -60,7 +60,6 @@ public class TycoonGameOver : MonoBehaviour
_shipRectTransform = _ship.GetComponent<RectTransform>(); _shipRectTransform = _ship.GetComponent<RectTransform>();
originalPosition = _shipRectTransform.anchoredPosition; originalPosition = _shipRectTransform.anchoredPosition;
} }
private void OnDestroy() private void OnDestroy()
{ {
EventManager.OnDead -= GameOver_Start; EventManager.OnDead -= GameOver_Start;
@ -77,6 +76,7 @@ public class TycoonGameOver : MonoBehaviour
// 코루틴 정의 // 코루틴 정의
IEnumerator MoveObject() IEnumerator MoveObject()
{ {
VisualFeedbackManager.Instance.SetBaseTimeScale(0.0f);
_panel.SetActive(true); _panel.SetActive(true);
// 2.0초 동안은 흔들리기만 함 // 2.0초 동안은 흔들리기만 함
float timer = 0f; float timer = 0f;