diff --git a/Assets/InputSystem/PlayerInputActions.inputactions b/Assets/InputSystem/PlayerInputActions.inputactions index 959de5a..ee82f07 100644 --- a/Assets/InputSystem/PlayerInputActions.inputactions +++ b/Assets/InputSystem/PlayerInputActions.inputactions @@ -282,6 +282,195 @@ "isPartOfComposite": true } ] + }, + { + "name": "UI", + "id": "6f134e62-674f-4370-94ea-dd8e473463e1", + "actions": [ + { + "name": "Escape", + "type": "Button", + "id": "46112f3b-9ac3-4e18-a7ad-1b01a7174b41", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "FastForward", + "type": "Button", + "id": "f6c252cc-6a82-4629-bd41-884bbc40f8e5", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, + { + "name": "AnyKeyPressed", + "type": "Button", + "id": "d5b5b3b7-c75b-479b-a4e0-7ab365318863", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false + } + ], + "bindings": [ + { + "name": "", + "id": "045e422e-4fb9-40e2-9184-948030cf19a0", + "path": "/escape", + "interactions": "", + "processors": "", + "groups": "", + "action": "Escape", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "af6ba96c-2b45-4720-ad85-6091f3eebc02", + "path": "/buttonEast", + "interactions": "", + "processors": "", + "groups": "", + "action": "Escape", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "3f1e2917-4cd7-4a38-b9f4-6ee0452223bf", + "path": "/space", + "interactions": "", + "processors": "", + "groups": "", + "action": "FastForward", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "75af4be2-6009-4ff6-861b-5739eef8decf", + "path": "/escape", + "interactions": "", + "processors": "", + "groups": "", + "action": "FastForward", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "2be25d35-d4e4-4d47-ae37-1bab2efc8b77", + "path": "/start", + "interactions": "", + "processors": "", + "groups": "", + "action": "FastForward", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "7fde1a64-e822-4f4b-8723-585ca9323a63", + "path": "/buttonSouth", + "interactions": "", + "processors": "", + "groups": "", + "action": "FastForward", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "c6290f8a-1ca9-41d3-84b5-7afb4184212f", + "path": "/buttonEast", + "interactions": "", + "processors": "", + "groups": "", + "action": "FastForward", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "b8dff556-873e-4c98-bf05-8c4f2b03f664", + "path": "/leftButton", + "interactions": "", + "processors": "", + "groups": "", + "action": "FastForward", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "f743856b-a552-4d76-865f-7d96a8e03f6f", + "path": "/anyKey", + "interactions": "", + "processors": "", + "groups": "", + "action": "AnyKeyPressed", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "460ef968-d47d-4b34-b0c8-13df5d28be50", + "path": "/buttonEast", + "interactions": "", + "processors": "", + "groups": "", + "action": "AnyKeyPressed", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "d4df63d3-de60-47dd-aae7-78d8407b0280", + "path": "/buttonNorth", + "interactions": "", + "processors": "", + "groups": "", + "action": "AnyKeyPressed", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "95ef83b3-a6c8-4c8a-b7bb-c96d855343c7", + "path": "/buttonSouth", + "interactions": "", + "processors": "", + "groups": "", + "action": "AnyKeyPressed", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "af7be75c-72ef-44bd-af66-6fcc4f144ec6", + "path": "/buttonWest", + "interactions": "", + "processors": "", + "groups": "", + "action": "AnyKeyPressed", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "da5d7e38-ee17-41f3-88fa-61448b91d8e6", + "path": "/start", + "interactions": "", + "processors": "", + "groups": "", + "action": "AnyKeyPressed", + "isComposite": false, + "isPartOfComposite": false + } + ] } ], "controlSchemes": [ diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index 892949c..3cdb008 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -150,17 +150,17 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 973612} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -0.000015849426} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 1 m_Children: [] - m_Father: {fileID: 1703051054} - m_RootOrder: 1 + m_Father: {fileID: 753457328} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 26.218} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 270.54602, y: -225.6675} + m_SizeDelta: {x: 88.91, y: 26.218} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &973614 MonoBehaviour: @@ -220,6 +220,90 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!1 &33971260 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 33971261} + - component: {fileID: 33971262} + m_Layer: 0 + m_Name: arrow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &33971261 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 33971260} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -78.2, y: 8.9, z: 0} + m_LocalScale: {x: 27.375479, y: 21.313286, z: 15.685496} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1498768358} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &33971262 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 33971260} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 386ee8da7560f8243aa6f350bde0278b, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 0} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.97, y: 0.41} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1001 &58598868 PrefabInstance: m_ObjectHideFlags: 0 @@ -1224,6 +1308,24 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1378811986} m_PrefabAsset: {fileID: 0} +--- !u!1 &314979219 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8571589110344635516, guid: 92a7b11ea4b35924a9caf2ab6d443449, + type: 3} + m_PrefabInstance: {fileID: 1744226569} + m_PrefabAsset: {fileID: 0} +--- !u!114 &314979222 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 314979219} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 421f931d3e036474ab2a8a255ab3038d, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!4 &386624302 stripped Transform: m_CorrespondingSourceObject: {fileID: 730722532988957807, guid: 7039573d66660ae4bae794886465b05e, @@ -1367,6 +1469,245 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 +--- !u!1 &492585372 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 492585373} + - component: {fileID: 492585375} + - component: {fileID: 492585374} + m_Layer: 0 + m_Name: Devs + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &492585373 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 492585372} + 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: 1 + m_Children: [] + m_Father: {fileID: 1703051054} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &492585374 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 492585372} + 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: 'Jean Lamarre - Programmer + + - + + Guillaume Langlois - Programmer + + - + + Yann + Dupont - Artist + + - + + Alain - Level Designer + + - + + William Gingras + - Programmer/Level Designer + + - + + Soulaha D.Balde - Programmer + + - + + Louis + Horlaville - Programmer' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 6181db7d5cb7fc142848739fc63ba013, type: 2} + m_sharedMaterial: {fileID: 6836464531899165666, guid: 6181db7d5cb7fc142848739fc63ba013, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, 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: 6 + m_fontSizeBase: 6 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 16 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 256 + 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: -216.96461, y: 2.1897957, z: 121.145515, w: -68.354485} + 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 &492585375 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 492585372} + m_CullTransparentMesh: 1 +--- !u!1 &505834412 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 505834413} + - component: {fileID: 505834415} + - component: {fileID: 505834414} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &505834413 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 505834412} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 103.6} + m_LocalScale: {x: 1.30619, y: 2.5221002, z: 0.48136437} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 613219755} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -84.8, y: -218} + m_SizeDelta: {x: 88.91, y: 66.2} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &505834414 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 505834412} + 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: 0, g: 0, b: 0, a: 0.6666667} + 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: 0} + m_Type: 0 + 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 &505834415 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 505834412} + m_CullTransparentMesh: 1 --- !u!1001 &566024504 PrefabInstance: m_ObjectHideFlags: 0 @@ -1689,13 +2030,14 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 613219754} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 77.70698, y: 264.4835, z: -205.14502} + m_LocalPosition: {x: 77.70698, y: 151.2, z: -205.14502} m_LocalScale: {x: 2.0774286, y: 2.0774286, z: 2.0774286} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 505834413} - {fileID: 1703051054} m_Father: {fileID: 753457328} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &653794181 PrefabInstance: @@ -2105,9 +2447,11 @@ RectTransform: m_Children: - {fileID: 1451380980} - {fileID: 1281004661} + - {fileID: 973613} - {fileID: 1303706980} - {fileID: 613219755} - {fileID: 2078984883} + - {fileID: 1498768358} m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: -0.012, y: 0.165, z: -0.292} @@ -2250,18 +2594,18 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 'Made by Conjure ETS members: Soulaha, Louis, Guillaume, Jean, Alain, Yann - and William' + m_text: Made with love, sweat and care for thee, band of fools m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 6181db7d5cb7fc142848739fc63ba013, type: 2} + m_sharedMaterial: {fileID: 6836464531899165666, guid: 6181db7d5cb7fc142848739fc63ba013, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4278190080 - m_fontColor: {r: 0, g: 0, b: 0, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -2284,8 +2628,8 @@ MonoBehaviour: m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 4 + m_fontStyle: 17 + m_HorizontalAlignment: 2 m_VerticalAlignment: 1024 m_textAlignment: 65535 m_characterSpacing: 0 @@ -2314,7 +2658,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: -26.79, y: 0, z: 0, w: 0} + m_margin: {x: -196.64009, y: -5.17445, z: 147.48137, w: 15.9268055} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -3394,6 +3738,11 @@ PrefabInstance: propertyPath: m_Name value: Button-Credits objectReference: {fileID: 0} + - target: {fileID: 5917528464644539590, guid: 0bdc45a9254ade843b7ba60aaab62301, + type: 3} + propertyPath: m_Interactable + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5917528464644539590, guid: 0bdc45a9254ade843b7ba60aaab62301, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size @@ -4060,7 +4409,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -58.600006, y: -39.300003} + m_AnchoredPosition: {x: -49.299988, y: -39.30002} m_SizeDelta: {x: 154.907, y: 106.963} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1281004662 @@ -4147,7 +4496,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} + m_margin: {x: 0, y: 0, z: -2.6960297, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -4193,7 +4542,7 @@ RectTransform: m_Children: - {fileID: 574174949} m_Father: {fileID: 753457328} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -4983,6 +5332,143 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 7039573d66660ae4bae794886465b05e, type: 3} +--- !u!1 &1498768357 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1498768358} + - component: {fileID: 1498768360} + - component: {fileID: 1498768359} + m_Layer: 5 + m_Name: SkipCredits + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1498768358 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1498768357} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -11.6} + m_LocalScale: {x: 0.45, y: 0.45, z: 0.45} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 33971261} + m_Father: {fileID: 753457328} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -101.5, y: -114.2} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1498768359 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1498768357} + 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: Skip + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 6181db7d5cb7fc142848739fc63ba013, type: 2} + m_sharedMaterial: {fileID: 6836464531899165666, guid: 6181db7d5cb7fc142848739fc63ba013, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 16777215 + m_fontColor: {r: 1, g: 1, b: 1, a: 0} + 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: 13 + m_fontSizeBase: 13 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + 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 &1498768360 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1498768357} + m_CullTransparentMesh: 1 --- !u!1001 &1500012753 PrefabInstance: m_ObjectHideFlags: 0 @@ -5471,6 +5957,142 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 5917528464004223745} m_PrefabAsset: {fileID: 0} +--- !u!1 &1589141380 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1589141381} + - component: {fileID: 1589141383} + - component: {fileID: 1589141382} + m_Layer: 5 + m_Name: School name + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1589141381 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1589141380} + 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: 1703051054} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1589141382 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1589141380} + 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: CONJURE - ETS + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 6181db7d5cb7fc142848739fc63ba013, type: 2} + m_sharedMaterial: {fileID: 6836464531899165666, guid: 6181db7d5cb7fc142848739fc63ba013, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, 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: 15 + m_fontSizeBase: 15 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 16 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 256 + 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: -200.57097, y: 11.139682, z: 146.08304, 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 &1589141383 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1589141380} + m_CullTransparentMesh: 1 --- !u!1001 &1663108163 PrefabInstance: m_ObjectHideFlags: 0 @@ -5799,18 +6421,20 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1703051053} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 98.74949} + m_LocalPosition: {x: 0, y: 0, z: 89.7} m_LocalScale: {x: 0.48136434, y: 0.48136434, z: 0.48136434} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 779369316} - - {fileID: 973613} + - {fileID: 1589141381} + - {fileID: 492585373} + - {fileID: 2018359807} m_Father: {fileID: 613219755} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 2.329342, y: -164.8} + m_AnchoredPosition: {x: 0.1, y: -165.78} m_SizeDelta: {x: 154.91, y: 90.28233} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1703051055 @@ -5979,6 +6603,7 @@ GameObject: m_Component: - component: {fileID: 1779102552} - component: {fileID: 1779102551} + - component: {fileID: 1779102553} m_Layer: 0 m_Name: MenuController m_TagString: Untagged @@ -5999,7 +6624,13 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mainMenu: {fileID: 1303706979} - fadeSpeed: 150 + skipCreditsText: {fileID: 1498768357} + skipCreditsIcon: {fileID: 33971260} + credits: {fileID: 613219754} + creditsButton: {fileID: 1928383182} + menuFadeSpeed: 150 + creditsScrollSpeed: 10 + textAlphaFadeSpeed: 2 --- !u!224 &1779102552 RectTransform: m_ObjectHideFlags: 0 @@ -6020,6 +6651,109 @@ RectTransform: m_AnchoredPosition: {x: 9.178803, y: -89.05786} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1779102553 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1779102550} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Actions: {fileID: -944628639613478452, guid: 582d10d6a3775d649a7511ffad450745, + type: 3} + m_NotificationBehavior: 2 + m_UIInputModule: {fileID: 0} + m_DeviceLostEvent: + m_PersistentCalls: + m_Calls: [] + m_DeviceRegainedEvent: + m_PersistentCalls: + m_Calls: [] + m_ControlsChangedEvent: + m_PersistentCalls: + m_Calls: [] + m_ActionEvents: + - m_PersistentCalls: + m_Calls: [] + m_ActionId: a7460f10-3547-4a03-b2cf-17c79377189f + m_ActionName: Player/Walk[/Keyboard/a,/Keyboard/d] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: e09d302b-d2bc-4e8e-a3a4-8cb74814c2cc + m_ActionName: Player/Jump[/Keyboard/space] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 7d1c4cb5-032a-4799-ac7b-841a778c389d + m_ActionName: Player/ShootGrapple[/Mouse/leftButton] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: abdcd477-96c8-41e2-a4ff-70e14e18f036 + m_ActionName: Player/Aim[/Mouse/position] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: dcc9ba8a-9503-43ef-a481-d6fc1abc5880 + m_ActionName: Player/BoostToAnchor[/Mouse/rightButton] + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 098de720-4946-4b02-bafc-25d0f86614c6 + m_ActionName: Player/RaiseLowerGrapple[/Keyboard/w,/Keyboard/s] + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1779102551} + m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp + m_MethodName: StopCredits + m_Mode: 0 + 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 + m_ActionId: 46112f3b-9ac3-4e18-a7ad-1b01a7174b41 + m_ActionName: UI/Escape[/Keyboard/escape] + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1779102551} + m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp + m_MethodName: StopCredits + m_Mode: 0 + 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 + m_ActionId: f6c252cc-6a82-4629-bd41-884bbc40f8e5 + m_ActionName: UI/FastForward[/Keyboard/space,/Keyboard/escape] + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1779102551} + m_TargetAssemblyTypeName: MainMenu, Assembly-CSharp + m_MethodName: AnyKeyPressed + m_Mode: 0 + 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 + m_ActionId: d5b5b3b7-c75b-479b-a4e0-7ab365318863 + m_ActionName: UI/AnyKeyPressed[/Keyboard/anyKey] + m_NeverAutoSwitchControlSchemes: 0 + m_DefaultControlScheme: + m_DefaultActionMap: UI + m_SplitScreenIndex: -1 + m_Camera: {fileID: 0} --- !u!4 &1784071868 stripped Transform: m_CorrespondingSourceObject: {fileID: 1147862724755703955, guid: 1405c23d1ab31154fa37e1ae7887f53e, @@ -6281,6 +7015,18 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1152075832} m_PrefabAsset: {fileID: 0} +--- !u!114 &1928383182 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5917528464644539590, guid: 0bdc45a9254ade843b7ba60aaab62301, + type: 3} + m_PrefabInstance: {fileID: 1152075832} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!4 &1944839174 stripped Transform: m_CorrespondingSourceObject: {fileID: 730722532988957807, guid: 7039573d66660ae4bae794886465b05e, @@ -6530,6 +7276,144 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1405c23d1ab31154fa37e1ae7887f53e, type: 3} +--- !u!1 &2018359806 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2018359807} + - component: {fileID: 2018359809} + - component: {fileID: 2018359808} + m_Layer: 5 + m_Name: Final message + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2018359807 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2018359806} + 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: 1703051054} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2018359808 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2018359806} + 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: 'God spede you + + my sweeting' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 6181db7d5cb7fc142848739fc63ba013, type: 2} + m_sharedMaterial: {fileID: 6836464531899165666, guid: 6181db7d5cb7fc142848739fc63ba013, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, 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: 10 + m_fontSizeBase: 10 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 16 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 256 + 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: -201.32787, y: 87.09678, z: 145.45828, w: -73.254944} + 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 &2018359809 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2018359806} + m_CullTransparentMesh: 1 --- !u!1 &2031627398 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8256007898828206372, guid: cdba33ca476098a4caafd2d568d4250c, @@ -6833,7 +7717,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 753457328} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &2100946602 stripped Transform: @@ -7067,17 +7951,17 @@ PrefabInstance: - target: {fileID: 5917528464644539590, guid: 0bdc45a9254ade843b7ba60aaab62301, type: 3} propertyPath: m_Colors.m_HighlightedColor.b - value: 0.7169812 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5917528464644539590, guid: 0bdc45a9254ade843b7ba60aaab62301, type: 3} propertyPath: m_Colors.m_HighlightedColor.g - value: 0.7169812 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5917528464644539590, guid: 0bdc45a9254ade843b7ba60aaab62301, type: 3} propertyPath: m_Colors.m_HighlightedColor.r - value: 0.7169812 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5917528464644539590, guid: 0bdc45a9254ade843b7ba60aaab62301, type: 3} diff --git a/Assets/Scripts/MusicController.cs b/Assets/Scripts/MusicController.cs new file mode 100644 index 0000000..dc7fdd7 --- /dev/null +++ b/Assets/Scripts/MusicController.cs @@ -0,0 +1,11 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class MusicController : MonoBehaviour +{ + void Awake() + { + DontDestroyOnLoad(this.gameObject); + } +} diff --git a/Assets/Scripts/MusicController.cs.meta b/Assets/Scripts/MusicController.cs.meta new file mode 100644 index 0000000..1669fce --- /dev/null +++ b/Assets/Scripts/MusicController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 421f931d3e036474ab2a8a255ab3038d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/UI/MainMenu.cs b/Assets/Scripts/UI/MainMenu.cs index 64b3fab..fb598de 100644 --- a/Assets/Scripts/UI/MainMenu.cs +++ b/Assets/Scripts/UI/MainMenu.cs @@ -1,24 +1,81 @@ using System.Collections; using System.Collections.Generic; +using TMPro; using UnityEngine; +using UnityEngine.InputSystem; using UnityEngine.UI; public class MainMenu : MonoBehaviour { [SerializeField] GameObject mainMenu; - [SerializeField] float fadeSpeed; + [SerializeField] GameObject skipCreditsText; + [SerializeField] GameObject skipCreditsIcon; + [SerializeField] GameObject credits; + [SerializeField] Button creditsButton; + [SerializeField] float menuFadeSpeed; + [SerializeField] float creditsScrollSpeed; + [SerializeField] float textAlphaFadeSpeed; + RectMask2D mainMenuMask; + private bool isCreditScrolling = false; + private bool skipCuePopped = false; private void Start() { mainMenuMask = mainMenu.GetComponent(); } + + public void AnyKeyPressed(InputAction.CallbackContext context) + { + if (context.performed) + { + if (isCreditScrolling) + { + StartCoroutine("RevealSkipCue", 0f); + } + } + } + + public void StopCredits(InputAction.CallbackContext context) + { + if (!isCreditScrolling) return; + else + { + if (context.performed && skipCuePopped) + { + isCreditScrolling = false; + ResetMenu(); + } + } + } + + private void Update() + { + Debug.Log(Input.GetKeyDown(KeyCode.Escape)); + if (isCreditScrolling && Input.GetKeyDown(KeyCode.Escape)) + { + isCreditScrolling = false; + } + } + public void CreditButtonPress() { - StartCoroutine("MainMenuFadeOut", 0f); + creditsButton.interactable = false; + StartCoroutine("PlayCredits", 0f); } + public IEnumerator PlayCredits() + { + isCreditScrolling = true; + yield return MainMenuFadeOut(); + yield return new WaitForSeconds(1.5f); + yield return CreditsScrollUp(); + yield return new WaitForSeconds(.5f); + yield return MainMenuFadeIn(); + } + + public IEnumerator MainMenuFadeOut() { float paddingAmount; @@ -26,12 +83,87 @@ public class MainMenu : MonoBehaviour while (mainMenuMask.padding.y <= 20) { - Debug.Log(mainMenuMask.padding.y); - paddingAmount = mainMenuMask.padding.y + (fadeSpeed * Time.deltaTime); + paddingAmount = mainMenuMask.padding.y + (menuFadeSpeed * Time.deltaTime); padding = new Vector4(mainMenuMask.padding.x, paddingAmount, mainMenuMask.padding.z, mainMenuMask.padding.w); mainMenuMask.padding = padding; yield return null; } } + + public IEnumerator MainMenuFadeIn() + { + float paddingAmount; + Vector4 padding; + + while (mainMenuMask.padding.y >= -110) + { + paddingAmount = mainMenuMask.padding.y - (menuFadeSpeed * Time.deltaTime); + padding = new Vector4(mainMenuMask.padding.x, paddingAmount, mainMenuMask.padding.z, mainMenuMask.padding.w); + mainMenuMask.padding = padding; + + yield return null; + } + ResetMenu(); + } + + public IEnumerator CreditsScrollUp() + { + float startingScrollPos = credits.transform.position.y; + isCreditScrolling = true; + + float scrollAmount; + Vector3 pos; + while (credits.transform.position.y < 375 && isCreditScrolling) + { + scrollAmount = credits.transform.position.y + (creditsScrollSpeed * Time.deltaTime); + pos = new Vector3(credits.transform.position.x, scrollAmount, credits.transform.position.z); + credits.transform.position = pos; + yield return null; + } + + credits.transform.position = new Vector3(credits.transform.position.x, startingScrollPos, credits.transform.position.z); + + } + + public IEnumerator RevealSkipCue() + { + skipCreditsText.SetActive(true); + skipCreditsIcon.SetActive(true); + + Color textColor = skipCreditsText.GetComponent().color; + Color iconColor = skipCreditsIcon.GetComponent().color; + float fadeAmount; + while (skipCreditsText.GetComponent().color.a<=1 || skipCreditsIcon.GetComponent().color.a<=1) + { + fadeAmount = textColor.a + (textAlphaFadeSpeed * Time.deltaTime); + textColor = new Color(textColor.r, textColor.g, textColor.b, fadeAmount); + iconColor = new Color(iconColor.r, iconColor.g, iconColor.b, fadeAmount); + skipCreditsText.GetComponent().color = textColor; + skipCreditsIcon.GetComponent().color = iconColor; + yield return null; + } + + skipCuePopped = true; + } + + void ResetMenu() + { + skipCuePopped = false; + creditsButton.interactable = true; + + //Reset Skip Credits Cue + Color textColor = skipCreditsText.GetComponent().color; + Color iconColor = skipCreditsIcon.GetComponent().color; + textColor = new Color(textColor.r, textColor.g, textColor.b, 0); + iconColor = new Color(iconColor.r, iconColor.g, iconColor.b, 0); + skipCreditsText.GetComponent().color = textColor; + skipCreditsIcon.GetComponent().color = iconColor; + + skipCreditsText.SetActive(false); + skipCreditsIcon.SetActive(false); + + + } + } diff --git a/Assets/Sprites/arrow.png b/Assets/Sprites/arrow.png new file mode 100644 index 0000000..d941796 Binary files /dev/null and b/Assets/Sprites/arrow.png differ diff --git a/Assets/Sprites/arrow.png.meta b/Assets/Sprites/arrow.png.meta new file mode 100644 index 0000000..e09f87b --- /dev/null +++ b/Assets/Sprites/arrow.png.meta @@ -0,0 +1,159 @@ +fileFormatVersion: 2 +guid: 386ee8da7560f8243aa6f350bde0278b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: