From a0231b6896566ce8595d1e2cd5d26b6792867ece Mon Sep 17 00:00:00 2001
From: miepzerino <o.skotnik@gmail.com>
Date: Tue, 19 Dec 2023 00:02:24 +0000
Subject: [PATCH] Added pause panel
---
Assets/Scripts/PlayerController.cs | 1
Assets/Scenes/GameplayScene.unity | 115 ++++++++++++++++++++++++++++++++++----
Assets/Scripts/PauseMenu.cs | 11 +++
3 files changed, 112 insertions(+), 15 deletions(-)
diff --git a/Assets/Scenes/GameplayScene.unity b/Assets/Scenes/GameplayScene.unity
index 4bd30ce..0ffc0cc 100644
--- a/Assets/Scenes/GameplayScene.unity
+++ b/Assets/Scenes/GameplayScene.unity
@@ -273,7 +273,7 @@
serializedVersion: 2
m_Modification:
serializedVersion: 3
- m_TransformParent: {fileID: 1504282394}
+ m_TransformParent: {fileID: 1562124019}
m_Modifications:
- target: {fileID: 1215834543426048484, guid: 47c63926cfcae754f8e4a60d07d76385, type: 3}
propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Target
@@ -361,7 +361,7 @@
objectReference: {fileID: 0}
- target: {fileID: 2586922788493509811, guid: 47c63926cfcae754f8e4a60d07d76385, type: 3}
propertyPath: m_IsActive
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 4479350565916450642, guid: 47c63926cfcae754f8e4a60d07d76385, type: 3}
propertyPath: m_AnchorMax.x
@@ -423,9 +423,13 @@
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 5915849268451475553, guid: 47c63926cfcae754f8e4a60d07d76385, type: 3}
+ propertyPath: m_Enabled
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 7881494283742446616, guid: 47c63926cfcae754f8e4a60d07d76385, type: 3}
propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
- value: 4
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 7881494283742446616, guid: 47c63926cfcae754f8e4a60d07d76385, type: 3}
propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target
@@ -508,6 +512,14 @@
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8477961213873308391, guid: 47c63926cfcae754f8e4a60d07d76385, type: 3}
+ propertyPath: m_LocalScale.x
+ value: 0.75
+ objectReference: {fileID: 0}
+ - target: {fileID: 8477961213873308391, guid: 47c63926cfcae754f8e4a60d07d76385, type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.75
+ objectReference: {fileID: 0}
+ - target: {fileID: 8477961213873308391, guid: 47c63926cfcae754f8e4a60d07d76385, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
@@ -525,15 +537,15 @@
objectReference: {fileID: 0}
- target: {fileID: 8477961213873308391, guid: 47c63926cfcae754f8e4a60d07d76385, type: 3}
propertyPath: m_LocalRotation.x
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 8477961213873308391, guid: 47c63926cfcae754f8e4a60d07d76385, type: 3}
propertyPath: m_LocalRotation.y
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 8477961213873308391, guid: 47c63926cfcae754f8e4a60d07d76385, type: 3}
propertyPath: m_LocalRotation.z
- value: 0
+ value: -0
objectReference: {fileID: 0}
- target: {fileID: 8477961213873308391, guid: 47c63926cfcae754f8e4a60d07d76385, type: 3}
propertyPath: m_AnchoredPosition.x
@@ -1866,9 +1878,9 @@
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 851154475}
- 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_LocalScale: {x: 0.75, y: 0.75, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 596450200}
@@ -1877,7 +1889,7 @@
- {fileID: 658152002}
- {fileID: 105277890}
- {fileID: 2102810377}
- m_Father: {fileID: 1504282394}
+ m_Father: {fileID: 1562124019}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@@ -1891,7 +1903,7 @@
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 851154475}
- m_Enabled: 1
+ m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
@@ -3501,8 +3513,7 @@
m_LocalScale: {x: 0, y: 0, z: 0}
m_ConstrainProportionsScale: 0
m_Children:
- - {fileID: 851154476}
- - {fileID: 153917607}
+ - {fileID: 1562124019}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@@ -3524,6 +3535,7 @@
m_EditorClassIdentifier:
pauseMenuUI: {fileID: 851154475}
settingsMenuUI: {fileID: 109537919}
+ pausePanel: {fileID: 1562124018}
--- !u!1 &1520567227
GameObject:
m_ObjectHideFlags: 0
@@ -3560,6 +3572,83 @@
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &1562124018
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1562124019}
+ - component: {fileID: 1562124021}
+ - component: {fileID: 1562124020}
+ m_Layer: 5
+ m_Name: PausePanel
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!224 &1562124019
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1562124018}
+ 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: 851154476}
+ - {fileID: 153917607}
+ m_Father: {fileID: 1504282394}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 642, y: 361}
+ m_SizeDelta: {x: 640, y: 640}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1562124020
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1562124018}
+ 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: 0
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: -1184776484, guid: c8143482ecf8666459ff9177b919a871, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 1
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1562124021
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1562124018}
+ m_CullTransparentMesh: 1
--- !u!1 &1586625532
GameObject:
m_ObjectHideFlags: 3
@@ -5186,7 +5275,7 @@
objectReference: {fileID: 0}
- target: {fileID: 8463972149905527249, guid: 19b26cb080fd5b841970a693f820fc0f, type: 3}
propertyPath: m_AnchoredPosition.y
- value: -160
+ value: -80
objectReference: {fileID: 0}
- target: {fileID: 8463972149905527249, guid: 19b26cb080fd5b841970a693f820fc0f, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
diff --git a/Assets/Scripts/PauseMenu.cs b/Assets/Scripts/PauseMenu.cs
index 4888cd0..cf748c7 100644
--- a/Assets/Scripts/PauseMenu.cs
+++ b/Assets/Scripts/PauseMenu.cs
@@ -11,6 +11,12 @@
public GameObject pauseMenuUI;
public GameObject settingsMenuUI;
+ public GameObject pausePanel;
+
+ private void Awake()
+ {
+ GameIsPaused = false;
+ }
public void OnEscapedPressed(InputAction.CallbackContext context)
{
@@ -35,15 +41,16 @@
private void Resume()
{
// TODO make it dynamic (whichever UI is activ set it to falsen when unpaused)
- pauseMenuUI.SetActive(false);
- settingsMenuUI.SetActive(false);
+ pausePanel.SetActive(false);
Time.timeScale = 1f;
GameIsPaused = false;
}
private void Pause()
{
+ settingsMenuUI.SetActive(false);
pauseMenuUI.SetActive(true);
+ pausePanel.SetActive(true);
Time.timeScale = 0f;
GameIsPaused = true;
}
diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs
index 028469a..7d13b2e 100644
--- a/Assets/Scripts/PlayerController.cs
+++ b/Assets/Scripts/PlayerController.cs
@@ -63,6 +63,7 @@
{
get
{
+ Debug.Log("gameIsPaused: " + PauseMenu.GameIsPaused);
return animator.GetBool(AnimationStrings.canMove) && !PauseMenu.GameIsPaused;
}
}
--
Gitblit v1.9.3