diff --git a/Assets/Resources.meta b/Assets/Resources.meta new file mode 100644 index 0000000..9ca4435 --- /dev/null +++ b/Assets/Resources.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8e54e8713bba31e40b6f2ebe6be8090f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/GameScene/Title.unity b/Assets/Scenes/GameScene/Title.unity index 18540f1..7262623 100644 --- a/Assets/Scenes/GameScene/Title.unity +++ b/Assets/Scenes/GameScene/Title.unity @@ -687,6 +687,7 @@ GameObject: m_Component: - component: {fileID: 1604020941} - component: {fileID: 1604020942} + - component: {fileID: 1604020943} m_Layer: 5 m_Name: Buttons m_TagString: Untagged @@ -701,7 +702,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1604020940} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -741,6 +742,20 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!114 &1604020943 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1604020940} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 68f6bf7a0efe7484689d6333cfcdfcb9, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::TitleScene + startButton: {fileID: 548649948} + exitButton: {fileID: 1342387909} --- !u!1 &1662607961 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Replay/RecordingManager.cs b/Assets/Scripts/Replay/RecordingManager.cs index d7a1dde..9534429 100644 --- a/Assets/Scripts/Replay/RecordingManager.cs +++ b/Assets/Scripts/Replay/RecordingManager.cs @@ -38,7 +38,9 @@ public class RecordingManager : MonoBehaviour private void Start() { - PlayerAllRecord(); + SpawnPlayer(); + CameraEffect effect = Camera.main.GetComponent(); + effect.PlayPreView(); } private void FixedUpdate() @@ -71,18 +73,14 @@ public class RecordingManager : MonoBehaviour isPlaying = true; currentReplayIndex = 0; - - currentPlayer = Instantiate(playerPrefab, spawnPoint.position, Quaternion.identity); - currentPlayerRecorder = currentPlayer.GetComponent(); - currentPlayerRecorder.StartRecording(); - GameManager.instance.currentState = GameState.Playing; + SpawnPlayer(); + GameManager.instance.PlayerAlive(); activeGhostList.Clear(); if (!(allRecordedFrames.Count > 0)) { return; } - GameManager.instance.PlayerAlive(); foreach (var record in allRecordedFrames) { @@ -100,6 +98,13 @@ public class RecordingManager : MonoBehaviour } } + private void SpawnPlayer() + { + currentPlayer = Instantiate(playerPrefab, spawnPoint.position, Quaternion.identity); + currentPlayerRecorder = currentPlayer.GetComponent(); + currentPlayerRecorder.StartRecording(); + } + public void StopPlayingRecord() { CancelInvoke("PlayerAllRecord"); diff --git a/Assets/Scripts/Scene/TitleScene.cs b/Assets/Scripts/Scene/TitleScene.cs new file mode 100644 index 0000000..8708269 --- /dev/null +++ b/Assets/Scripts/Scene/TitleScene.cs @@ -0,0 +1,25 @@ +using UnityEngine; +using UnityEngine.SceneManagement; +using UnityEngine.UI; + +public class TitleScene : MonoBehaviour +{ + [SerializeField] private Button startButton; + [SerializeField] private Button exitButton; + + private void Start() + { + startButton.onClick.AddListener(OnClickStart); + exitButton.onClick.AddListener(OnClickExit); + } + + public void OnClickStart() + { + SceneManager.LoadScene("LevelSelction"); + } + + public void OnClickExit() + { + Application.Quit(); + } +} diff --git a/Assets/Scripts/Scene/TitleScene.cs.meta b/Assets/Scripts/Scene/TitleScene.cs.meta new file mode 100644 index 0000000..986ca1e --- /dev/null +++ b/Assets/Scripts/Scene/TitleScene.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 68f6bf7a0efe7484689d6333cfcdfcb9 \ No newline at end of file diff --git a/Assets/Scripts/Utility/CameraEffect.cs b/Assets/Scripts/Utility/CameraEffect.cs index a797e25..0322514 100644 --- a/Assets/Scripts/Utility/CameraEffect.cs +++ b/Assets/Scripts/Utility/CameraEffect.cs @@ -20,5 +20,27 @@ public class CameraEffect : MonoBehaviour Vector3 targetPosition = target.position + offset; transform.position = Vector3.SmoothDamp(transform.position, targetPosition, ref _velocity, smoothTime); } + + public void PlayPreView() + { + StartCoroutine(PlayStartSequence()); + } + public IEnumerator PlayStartSequence() + { + Transform player = GameObject.FindGameObjectWithTag("Player").transform; + target = player; + yield return new WaitForSeconds(2f); + + GameObject cheese = GameObject.FindGameObjectWithTag("Cheese"); + if (cheese != null) + { + target = cheese.transform; + yield return new WaitForSeconds(2f); + } + + target = player; + yield return new WaitForSeconds(2f); + GameManager.instance.PlayerAlive(); + } } \ No newline at end of file diff --git a/Assets/Scripts/Utility/Editor.meta b/Assets/Scripts/Utility/Editor.meta new file mode 100644 index 0000000..143f539 --- /dev/null +++ b/Assets/Scripts/Utility/Editor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d6d834ca247cea6438a27b85cb5a946b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Utility/ResetPlayerPrefs.cs b/Assets/Scripts/Utility/Editor/ResetPlayerPrefs.cs similarity index 80% rename from Assets/Scripts/Utility/ResetPlayerPrefs.cs rename to Assets/Scripts/Utility/Editor/ResetPlayerPrefs.cs index fdab258..83e91a2 100644 --- a/Assets/Scripts/Utility/ResetPlayerPrefs.cs +++ b/Assets/Scripts/Utility/Editor/ResetPlayerPrefs.cs @@ -3,7 +3,7 @@ using UnityEditor; public class ResetPlayerPrefs : MonoBehaviour { - [MenuItem("Window/PlayerPrefs 초기화")] + [MenuItem("Window/PlayerPrefs Init")] private static void ResetPrefs() { PlayerPrefs.SetInt("ClearLevelIndex", 1); diff --git a/Assets/Scripts/Utility/ResetPlayerPrefs.cs.meta b/Assets/Scripts/Utility/Editor/ResetPlayerPrefs.cs.meta similarity index 100% rename from Assets/Scripts/Utility/ResetPlayerPrefs.cs.meta rename to Assets/Scripts/Utility/Editor/ResetPlayerPrefs.cs.meta diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 8276790..7ef300b 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -6,17 +6,17 @@ EditorBuildSettings: serializedVersion: 2 m_Scenes: - enabled: 1 - path: Assets/Scenes/TestScene/DemoScene.unity - guid: bb931a7a3356d534292f2ae3358f9d4f - - enabled: 0 + path: Assets/Scenes/GameScene/Title.unity + guid: 1bf6ded80832a1f418b558e23a2c3bcd + - enabled: 1 path: Assets/Scenes/GameScene/LevelSelction.unity guid: bec08e84ebed4d246b980f3181db14fe - enabled: 1 path: Assets/Scenes/LevelScene/Level_1.unity - guid: 19730c5e0a058ef469ec0d38e07ea7cd + guid: 9b5baeaf0c333cd41b9f5b78efeaf971 - enabled: 1 path: Assets/Scenes/LevelScene/Level_2.unity - guid: e8659922057195140b7822feae614f92 + guid: f26e7773abc948940ad5bbd0d020ca78 - enabled: 1 path: Assets/Scenes/LevelScene/Level_3.unity guid: e0537ae71a6ab824c8926b9deabb99cc diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index b7811f3..6787703 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -144,7 +144,8 @@ PlayerSettings: visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 bundleVersion: 1.0 - preloadedAssets: [] + preloadedAssets: + - {fileID: -944628639613478452, guid: 2bcd2660ca9b64942af0de543d8d7100, type: 3} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1