diff --git a/Assets/0_Scenes/Title.unity b/Assets/0_Scenes/Title.unity index a44d487..65c6980 100644 --- a/Assets/0_Scenes/Title.unity +++ b/Assets/0_Scenes/Title.unity @@ -129,7 +129,6 @@ GameObject: m_Component: - component: {fileID: 519420032} - component: {fileID: 519420031} - - component: {fileID: 519420029} - component: {fileID: 519420030} m_Layer: 0 m_Name: Main Camera @@ -138,14 +137,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!81 &519420029 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 519420028} - m_Enabled: 1 --- !u!114 &519420030 MonoBehaviour: m_ObjectHideFlags: 0 @@ -508,6 +499,7 @@ MonoBehaviour: buttonSuond: [] eftSuond: [] nowMusic: 0 + eftSound: {fileID: 0} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Assets/1_Script/System/GameManager.cs b/Assets/1_Script/System/GameManager.cs index 57fee39..47653eb 100644 --- a/Assets/1_Script/System/GameManager.cs +++ b/Assets/1_Script/System/GameManager.cs @@ -1,9 +1,30 @@ using UnityEngine; +using UnityEngine.SceneManagement; public class GameManager : DontDestroy { + eScene nowScene; protected override void OnAwake() { - Application.targetFrameRate = 100; + Application.targetFrameRate = 120; + nowScene = eScene.Title; + } + + public enum eScene + { + Title = 0, + Main, + Game + } + + public void NextScene(eScene GoingScene) + { + nowScene = GoingScene; + SceneManager.LoadScene((int)nowScene); + } + public void NextScene() + { + nowScene = nowScene + 1; + SceneManager.LoadScene((int)nowScene); } }