diff --git a/Assets/Scenes/GameOver.unity b/Assets/Scenes/GameOver.unity index f8b1056f16eb04c9d0c48566e2789023e266a800..9e226297fd9d8d6d8ee780769fe084dce4e18966 100644 --- a/Assets/Scenes/GameOver.unity +++ b/Assets/Scenes/GameOver.unity @@ -123,6 +123,140 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &76293339 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 76293344} + - component: {fileID: 76293343} + - component: {fileID: 76293342} + - component: {fileID: 76293341} + m_Layer: 5 + m_Name: Try Again + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &76293341 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 76293339} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 76293342} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 764329883} + m_TargetAssemblyTypeName: RetryGameManager, Assembly-CSharp + m_MethodName: RetryToLevel1 + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &76293342 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 76293339} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &76293343 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 76293339} + m_CullTransparentMesh: 1 +--- !u!224 &76293344 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 76293339} + 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 + m_Children: + - {fileID: 572848216} + m_Father: {fileID: 764329879} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: -153.84026, y: 63.1} + m_SizeDelta: {x: 307.6805, y: 78.5758} + m_Pivot: {x: 0, y: 0} --- !u!1 &140295793 GameObject: m_ObjectHideFlags: 0 @@ -425,6 +559,141 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 498582930} m_CullTransparentMesh: 1 +--- !u!1 &572848215 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 572848216} + - component: {fileID: 572848218} + - component: {fileID: 572848217} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &572848216 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 572848215} + 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 + m_Children: [] + m_Father: {fileID: 76293344} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &572848217 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 572848215} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Try Again + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 125cb55b44b24c4393181402bc6200e6, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 125cb55b44b24c4393181402bc6200e6, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 24 + m_fontSizeBase: 24 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &572848218 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 572848215} + m_CullTransparentMesh: 1 --- !u!1 &764329878 GameObject: m_ObjectHideFlags: 0 @@ -437,6 +706,7 @@ GameObject: - component: {fileID: 764329882} - component: {fileID: 764329881} - component: {fileID: 764329880} + - component: {fileID: 764329883} m_Layer: 5 m_Name: CutsceneCanvas m_TagString: Untagged @@ -457,6 +727,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 498582931} + - {fileID: 76293344} m_Father: {fileID: 0} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -526,6 +797,18 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 +--- !u!114 &764329883 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 764329878} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 03ff3b175c111a047bec4c5d8be52167, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &776088646 GameObject: m_ObjectHideFlags: 0 @@ -970,11 +1253,18 @@ PlayableDirector: value: {fileID: 212700394} - key: {fileID: 6385088734934427215, guid: 8118d7d2360018840bd5a58cb7f8b721, type: 2} value: {fileID: 0} + - key: {fileID: 5334973313309480880, guid: 8118d7d2360018840bd5a58cb7f8b721, type: 2} + value: {fileID: 76293339} + - key: {fileID: 3105804146456125153, guid: 8118d7d2360018840bd5a58cb7f8b721, type: 2} + value: {fileID: 76293339} m_ExposedReferences: m_References: - dd9cea05000d0ed4ba98174621c5a233: {fileID: 140295793} - e4288266b3aa14f4fa534ab97807a1aa: {fileID: 1082960936} - 71abf996a020b3e4ba2261449440c6de: {fileID: 366938223} + - c6b3aac9e1c4d7e4aa8f8a73e9dd140c: {fileID: 76293339} + - e7fc0c23e029c09499bd955b51d06b8f: {fileID: 76293339} + - 84e06458a84e21845a2992ab99543151: {fileID: 76293339} --- !u!4 &1285426476 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Managers/RetryGameManager.cs b/Assets/Scripts/Managers/RetryGameManager.cs new file mode 100644 index 0000000000000000000000000000000000000000..7cf536dc619def87953d115940227665a58e5cc4 --- /dev/null +++ b/Assets/Scripts/Managers/RetryGameManager.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.SceneManagement; + +public class RetryGameManager : MonoBehaviour +{ + void Start() + { + Debug.Log("Started Retry Manager"); + } + // Start is called before the first frame update + void RetryToLevel1() + { + Debug.Log("Try Again Clicked"); + SceneManager.LoadScene("Level_01"); + } +} \ No newline at end of file diff --git a/Assets/Scripts/Managers/RetryGameManager.cs.meta b/Assets/Scripts/Managers/RetryGameManager.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..1e110c8174cce5d07c03068cbc68d72748c187e4 --- /dev/null +++ b/Assets/Scripts/Managers/RetryGameManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 03ff3b175c111a047bec4c5d8be52167 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Timeline/GameOver.playable b/Assets/Timeline/GameOver.playable index 67e84a8b1001981eaecf63fa8391495ce60a66db..cc74193c087a656b1fc4631a47ecc55710bb55c2 100644 --- a/Assets/Timeline/GameOver.playable +++ b/Assets/Timeline/GameOver.playable @@ -40,29 +40,6 @@ MonoBehaviour: m_bufferingTime: 0.1 m_ClipProperties: volume: 0.112 ---- !u!114 &-5629423741901131117 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 48853ae485fa386428341ac1ea122570, type: 3} - m_Name: ControlPlayableAsset - m_EditorClassIdentifier: - sourceGameObject: - exposedName: dd9cea05000d0ed4ba98174621c5a233 - defaultValue: {fileID: 0} - prefabGameObject: {fileID: 0} - updateParticle: 1 - particleRandomSeed: 6428 - updateDirector: 1 - updateITimeControl: 1 - searchHierarchy: 0 - active: 1 - postPlayback: 2 --- !u!114 &-3888966287766738632 MonoBehaviour: m_ObjectHideFlags: 1 @@ -213,6 +190,7 @@ MonoBehaviour: - {fileID: -3888966287766738632} - {fileID: 6385088734934427215} - {fileID: 7517559949988463186} + - {fileID: 3105804146456125153} m_FixedDuration: 0 m_EditorSettings: m_Framerate: 60 @@ -241,7 +219,7 @@ MonoBehaviour: m_Loop: 0 m_Version: 1 m_Rotation: {x: 0, y: 0, z: 0, w: 1} ---- !u!114 &6385088734934427215 +--- !u!114 &3105804146456125153 MonoBehaviour: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -250,8 +228,8 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8b22792c3b570444eb18cb78c2af3a74, type: 3} - m_Name: Audio Track (1) + m_Script: {fileID: 11500000, guid: 21bf7f712d84d26478ebe6a299f21738, type: 3} + m_Name: Activation Track m_EditorClassIdentifier: m_Version: 3 m_AnimClip: {fileID: 0} @@ -263,16 +241,16 @@ MonoBehaviour: m_Children: [] m_Clips: - m_Version: 1 - m_Start: 0 + m_Start: 3.6333333333333333 m_ClipIn: 0 - m_Asset: {fileID: -6763605703777586842} - m_Duration: 3.6333333333333333 + m_Asset: {fileID: 3445955138353844916} + m_Duration: 8.283333333333333 m_TimeScale: 1 - m_ParentTrack: {fileID: 6385088734934427215} + m_ParentTrack: {fileID: 3105804146456125153} m_EaseInDuration: 0 m_EaseOutDuration: 0 - m_BlendInDuration: -1 - m_BlendOutDuration: -1 + m_BlendInDuration: 0 + m_BlendOutDuration: 0 m_MixInCurve: serializedVersion: 2 m_Curve: @@ -330,14 +308,11 @@ MonoBehaviour: m_PreExtrapolationMode: 0 m_PostExtrapolationTime: 0 m_PreExtrapolationTime: 0 - m_DisplayName: Lose Sound + m_DisplayName: Active m_Markers: m_Objects: [] - m_TrackProperties: - volume: 1 - stereoPan: 0 - spatialBlend: 0 ---- !u!114 &7517559949988463186 + m_PostPlaybackState: 3 +--- !u!114 &3445955138353844916 MonoBehaviour: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -346,8 +321,20 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 15e0374501f39d54eb30235764636e0e, type: 3} - m_Name: Control Track + m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3} + m_Name: ActivationPlayableAsset + m_EditorClassIdentifier: +--- !u!114 &6385088734934427215 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8b22792c3b570444eb18cb78c2af3a74, type: 3} + m_Name: Audio Track (1) m_EditorClassIdentifier: m_Version: 3 m_AnimClip: {fileID: 0} @@ -361,14 +348,14 @@ MonoBehaviour: - m_Version: 1 m_Start: 0 m_ClipIn: 0 - m_Asset: {fileID: -3138560448198942331} + m_Asset: {fileID: -6763605703777586842} m_Duration: 3.6333333333333333 m_TimeScale: 1 - m_ParentTrack: {fileID: 7517559949988463186} + m_ParentTrack: {fileID: 6385088734934427215} m_EaseInDuration: 0 m_EaseOutDuration: 0 - m_BlendInDuration: 0 - m_BlendOutDuration: 0 + m_BlendInDuration: -1 + m_BlendOutDuration: -1 m_MixInCurve: serializedVersion: 2 m_Curve: @@ -426,12 +413,39 @@ MonoBehaviour: m_PreExtrapolationMode: 0 m_PostExtrapolationTime: 0 m_PreExtrapolationTime: 0 - m_DisplayName: CJ + m_DisplayName: Lose Sound + m_Markers: + m_Objects: [] + m_TrackProperties: + volume: 1 + stereoPan: 0 + spatialBlend: 0 +--- !u!114 &7517559949988463186 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 15e0374501f39d54eb30235764636e0e, type: 3} + m_Name: Control Track + m_EditorClassIdentifier: + m_Version: 3 + m_AnimClip: {fileID: 0} + m_Locked: 0 + m_Muted: 0 + m_CustomPlayableFullTypename: + m_Curves: {fileID: 0} + m_Parent: {fileID: 11400000} + m_Children: [] + m_Clips: - m_Version: 1 - m_Start: 3.6333333333333333 + m_Start: 0 m_ClipIn: 0 - m_Asset: {fileID: -6990790481619438696} - m_Duration: 5 + m_Asset: {fileID: -3138560448198942331} + m_Duration: 3.6333333333333333 m_TimeScale: 1 m_ParentTrack: {fileID: 7517559949988463186} m_EaseInDuration: 0 @@ -495,12 +509,12 @@ MonoBehaviour: m_PreExtrapolationMode: 0 m_PostExtrapolationTime: 0 m_PreExtrapolationTime: 0 - m_DisplayName: Makam + m_DisplayName: CJ - m_Version: 1 - m_Start: 8.633333333333333 + m_Start: 3.6333333333333333 m_ClipIn: 0 - m_Asset: {fileID: -5629423741901131117} - m_Duration: 1.8499999999999996 + m_Asset: {fileID: -6990790481619438696} + m_Duration: 8.283333333333333 m_TimeScale: 1 m_ParentTrack: {fileID: 7517559949988463186} m_EaseInDuration: 0 @@ -564,6 +578,6 @@ MonoBehaviour: m_PreExtrapolationMode: 0 m_PostExtrapolationTime: 0 m_PreExtrapolationTime: 0 - m_DisplayName: NextMainMenu + m_DisplayName: Makam m_Markers: m_Objects: []