diff --git a/MuseumGame/Assets/Scenes/MainMenu.unity b/MuseumGame/Assets/Scenes/MainMenu.unity index 3c1a086..0b197b2 100644 --- a/MuseumGame/Assets/Scenes/MainMenu.unity +++ b/MuseumGame/Assets/Scenes/MainMenu.unity @@ -190,7 +190,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &176759823 RectTransform: m_ObjectHideFlags: 0 @@ -204,11 +204,11 @@ RectTransform: m_Children: - {fileID: 1148340315} m_Father: {fileID: 937695572} - m_RootOrder: 4 + m_RootOrder: 5 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: -1.9000244, y: -16.000015} + m_AnchoredPosition: {x: 287, y: 169} m_SizeDelta: {x: 125, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &176759824 @@ -355,7 +355,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 0.392} + m_Color: {r: 0, g: 0, b: 0, a: 0.7411765} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -740,7 +740,7 @@ RectTransform: m_Children: - {fileID: 1632089108} m_Father: {fileID: 937695572} - m_RootOrder: 11 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1223,10 +1223,10 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 20 + m_fontSize: 22.05 m_fontSizeBase: 20 m_fontWeight: 400 - m_enableAutoSizing: 0 + m_enableAutoSizing: 1 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 1 @@ -1941,6 +1941,7 @@ RectTransform: - {fileID: 655160808} - {fileID: 283377688} - {fileID: 799432637} + - {fileID: 1056557236} - {fileID: 176759823} - {fileID: 1433247955} - {fileID: 1590398591} @@ -2119,7 +2120,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 937695572} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2164,6 +2165,139 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1034874535} m_CullTransparentMesh: 1 +--- !u!1 &1056557235 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1056557236} + - component: {fileID: 1056557239} + - component: {fileID: 1056557238} + - component: {fileID: 1056557237} + m_Layer: 5 + m_Name: PauseButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1056557236 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1056557235} + 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_Children: + - {fileID: 1760857109} + m_Father: {fileID: 937695572} + m_RootOrder: 4 + 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: -1.9000244, y: -16.000015} + m_SizeDelta: {x: 125, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1056557237 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1056557235} + 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: 1056557238} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1874083437} + m_TargetAssemblyTypeName: GameManager, Assembly-CSharp + m_MethodName: PauseButton + 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 &1056557238 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1056557235} + m_Enabled: 0 + 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 &1056557239 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1056557235} + m_CullTransparentMesh: 1 --- !u!1 &1148340314 GameObject: m_ObjectHideFlags: 0 @@ -2198,7 +2332,7 @@ RectTransform: 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: 249, y: 196} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1148340316 @@ -2334,7 +2468,7 @@ RectTransform: - {fileID: 847247612} - {fileID: 829770869} m_Father: {fileID: 937695572} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2511,7 +2645,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 937695572} - m_RootOrder: 5 + 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} @@ -2588,7 +2722,7 @@ RectTransform: - {fileID: 1941456386} - {fileID: 154104104} m_Father: {fileID: 937695572} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -2687,7 +2821,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3} propertyPath: m_RootOrder - value: 7 + value: 8 objectReference: {fileID: 0} - target: {fileID: 675858816841602993, guid: 9add303577184004ab77878cb3cdcf57, type: 3} propertyPath: m_AnchorMax.x @@ -3137,6 +3271,140 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1747188708} m_CullTransparentMesh: 1 +--- !u!1 &1760857108 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1760857109} + - component: {fileID: 1760857111} + - component: {fileID: 1760857110} + 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 &1760857109 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1760857108} + 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_Children: [] + m_Father: {fileID: 1056557236} + m_RootOrder: 0 + 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: -340.4, y: -187.4} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1760857110 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1760857108} + 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: Menu + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190328 + m_fontColor: {r: 0.9716981, g: 0, b: 0, 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: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + 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: 1 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: -0.3814064, 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 &1760857111 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1760857108} + m_CullTransparentMesh: 1 --- !u!1001 &1831256036 PrefabInstance: m_ObjectHideFlags: 0 @@ -3405,6 +3673,7 @@ MonoBehaviour: healthbar: {fileID: 830277152} startButton: {fileID: 283377687} galleryButton: {fileID: 799432636} + pauseButton: {fileID: 1056557235} title: {fileID: 655160807} panel: {fileID: 182368510} art: @@ -3758,7 +4027,7 @@ GameObject: - component: {fileID: 2102808486} - component: {fileID: 2102808485} m_Layer: 5 - m_Name: Text (TMP) + m_Name: Text m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -4017,7 +4286,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3367381689256731762, guid: 70cd530c6dffee4498f4893d4eb450c8, type: 3} propertyPath: m_RootOrder - value: 6 + value: 7 objectReference: {fileID: 0} - target: {fileID: 3367381689256731762, guid: 70cd530c6dffee4498f4893d4eb450c8, type: 3} propertyPath: m_AnchorMax.x diff --git a/MuseumGame/Assets/Scripts/GameManager.cs b/MuseumGame/Assets/Scripts/GameManager.cs index 24a8d8e..2276367 100644 --- a/MuseumGame/Assets/Scripts/GameManager.cs +++ b/MuseumGame/Assets/Scripts/GameManager.cs @@ -21,6 +21,7 @@ public class GameManager : MonoBehaviour public GameObject healthbar; public GameObject startButton; public GameObject galleryButton; + public GameObject pauseButton; public GameObject title; public GameObject panel; @@ -59,6 +60,8 @@ public class GameManager : MonoBehaviour private bool shrinkButtonPressed = false; + private bool paused = false; + void Awake() { if (Instance == null) @@ -176,8 +179,11 @@ public class GameManager : MonoBehaviour panel.SetActive(false); healthbar.SetActive(true); powerUps.SetActive(true); + pauseButton.SetActive(true); disableAllPowerups(); LoadLevel(sceneToLoad, new Vector3(0, 0, 0)); + title.GetComponent().text = "Menu"; + startButton.transform.Find("Text").GetComponent().text = "Restart"; } @@ -233,14 +239,33 @@ public class GameManager : MonoBehaviour public void CloseButton() { - if (scrollSpace.activeSelf) { - for (int i = 0; i < galleryArt.Length; i++) { + if (scrollSpace.activeSelf) + { + for (int i = 0; i < galleryArt.Length; i++) + { Destroy(galleryArt[i]); Destroy(galleryDialog[i]); - scrollSpace.SetActive(false); + } + scrollSpace.SetActive(false); + if (!paused) + { hideGalleryButton.SetActive(false); } } + else + { + paused = false; + pauseButton.SetActive(true); + hideGalleryButton.SetActive(false); + startButton.SetActive(false); + galleryButton.SetActive(false); + title.SetActive(false); + panel.SetActive(false); + healthbar.SetActive(true); + powerUps.SetActive(true); + } + + artImage.SetActive(false); dialogBox.SetActive(false); } @@ -255,6 +280,26 @@ public class GameManager : MonoBehaviour /* artImage.GetComponent().SetNativeSize(); artImage.GetComponent().anchoredPosition = new Vector2(-artImage.GetComponent().sprite.rect.width / 2, 0);*/ } + + public void PauseButton() + { + paused = true; + pauseButton.SetActive(false); + hideGalleryButton.SetActive(true); + startButton.SetActive(true); + galleryButton.SetActive(true); + title.SetActive(true); + panel.SetActive(true); + healthbar.SetActive(false); + powerUps.SetActive(false); + + + } + + public bool isPaused() + { + return paused; + } public GameObject GetEnemyHealthBar() { return enemyHealthBar; diff --git a/MuseumGame/Assets/Scripts/movement.cs b/MuseumGame/Assets/Scripts/movement.cs index b8c738a..473b3b9 100644 --- a/MuseumGame/Assets/Scripts/movement.cs +++ b/MuseumGame/Assets/Scripts/movement.cs @@ -37,7 +37,7 @@ public class movement : MonoBehaviour void Update() { - if (Input.GetKeyDown("space") && numJumps > 0) + if (Input.GetKeyDown("space") && numJumps > 0 && !GameManager.Instance.isPaused()) { rb2d.velocity = new Vector2(rb2d.velocity.x, 0); rb2d.AddForce(new Vector2(0, jumpForce)); @@ -48,9 +48,18 @@ public class movement : MonoBehaviour private void FixedUpdate() { - horizontal = Input.GetAxisRaw("Horizontal"); - vertical = Input.GetAxisRaw("Vertical"); - animator.SetFloat("horizontal", horizontal); + + if (!GameManager.Instance.isPaused()) + { + horizontal = Input.GetAxisRaw("Horizontal"); + vertical = Input.GetAxisRaw("Vertical"); + animator.SetFloat("horizontal", horizontal); + } + else + { + horizontal = 0; + vertical = 0; + } if (horizontal < 0)