Commit 2352a6cb authored by Ashley's avatar Ashley

trying to fix pause menu

parent 360cbc0b
......@@ -1078,6 +1078,53 @@ Prefab:
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: b716b8b03f9c92c45ad932874cab0d8f, type: 2}
m_IsPrefabParent: 0
--- !u!1001 &709456983
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 4925115359248076, guid: 6977313581605ab4caeb63aed765b88c, type: 2}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4925115359248076, guid: 6977313581605ab4caeb63aed765b88c, type: 2}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4925115359248076, guid: 6977313581605ab4caeb63aed765b88c, type: 2}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4925115359248076, guid: 6977313581605ab4caeb63aed765b88c, type: 2}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4925115359248076, guid: 6977313581605ab4caeb63aed765b88c, type: 2}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4925115359248076, guid: 6977313581605ab4caeb63aed765b88c, type: 2}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4925115359248076, guid: 6977313581605ab4caeb63aed765b88c, type: 2}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4925115359248076, guid: 6977313581605ab4caeb63aed765b88c, type: 2}
propertyPath: m_RootOrder
value: 10
objectReference: {fileID: 0}
- target: {fileID: 114705734518377386, guid: 6977313581605ab4caeb63aed765b88c,
type: 2}
propertyPath: pauseMenu
value:
objectReference: {fileID: 931606536}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 6977313581605ab4caeb63aed765b88c, type: 2}
m_IsPrefabParent: 0
--- !u!4 &711420698 stripped
Transform:
m_PrefabParentObject: {fileID: 4119761789307654, guid: 62ae6ed35b2b21e44addf1fac24fab7f,
......@@ -1304,7 +1351,7 @@ ParticleSystem:
m_GameObject: {fileID: 920148520}
serializedVersion: 5
lengthInSec: 0.1
speed: 1
simulationSpeed: 1
looping: 1
prewarm: 0
playOnAwake: 1
......@@ -3933,6 +3980,11 @@ ParticleSystem:
minColor: {r: 1, g: 1, b: 1, a: 1}
maxColor: {r: 1, g: 1, b: 1, a: 1}
minMaxState: 0
--- !u!1 &931606536 stripped
GameObject:
m_PrefabParentObject: {fileID: 1960887437048796, guid: 4b32869774338904a875250168c72931,
type: 2}
m_PrefabInternal: {fileID: 1776203235}
--- !u!1001 &933542338
Prefab:
m_ObjectHideFlags: 0
......@@ -4417,6 +4469,7 @@ RectTransform:
m_LocalScale: {x: 0, y: 0, z: 0}
m_Children:
- {fileID: 1670713437}
- {fileID: 1776203236}
m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -4540,6 +4593,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1288981517}
- {fileID: 47748003}
- {fileID: 1328617950}
- {fileID: 216344514}
- {fileID: 407241375}
......@@ -4589,7 +4643,6 @@ Transform:
- {fileID: 1727240399}
- {fileID: 992313189}
- {fileID: 182365961}
- {fileID: 47748003}
- {fileID: 242534398}
- {fileID: 762486095}
m_Father: {fileID: 0}
......@@ -5046,7 +5099,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a707327fed739e346b5480ab597dbb23, type: 3}
m_Name:
m_EditorClassIdentifier:
smoothSpeed: 1
--- !u!1001 &1398096626
Prefab:
m_ObjectHideFlags: 0
......@@ -5499,6 +5551,116 @@ Transform:
m_PrefabParentObject: {fileID: 4728263013554854, guid: 0af6fb48888b94243a01de07bd9d35ce,
type: 2}
m_PrefabInternal: {fileID: 127313769}
--- !u!1001 &1776203235
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1118525862}
m_Modifications:
- target: {fileID: 224641396611505108, guid: 4b32869774338904a875250168c72931,
type: 2}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224641396611505108, guid: 4b32869774338904a875250168c72931,
type: 2}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224641396611505108, guid: 4b32869774338904a875250168c72931,
type: 2}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224641396611505108, guid: 4b32869774338904a875250168c72931,
type: 2}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 224641396611505108, guid: 4b32869774338904a875250168c72931,
type: 2}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 224641396611505108, guid: 4b32869774338904a875250168c72931,
type: 2}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 224641396611505108, guid: 4b32869774338904a875250168c72931,
type: 2}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 224641396611505108, guid: 4b32869774338904a875250168c72931,
type: 2}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 224641396611505108, guid: 4b32869774338904a875250168c72931,
type: 2}
propertyPath: m_AnchoredPosition.x
value: -0.000061035156
objectReference: {fileID: 0}
- target: {fileID: 224641396611505108, guid: 4b32869774338904a875250168c72931,
type: 2}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 224641396611505108, guid: 4b32869774338904a875250168c72931,
type: 2}
propertyPath: m_SizeDelta.x
value: 400
objectReference: {fileID: 0}
- target: {fileID: 224641396611505108, guid: 4b32869774338904a875250168c72931,
type: 2}
propertyPath: m_SizeDelta.y
value: 256
objectReference: {fileID: 0}
- target: {fileID: 224641396611505108, guid: 4b32869774338904a875250168c72931,
type: 2}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 224641396611505108, guid: 4b32869774338904a875250168c72931,
type: 2}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 224641396611505108, guid: 4b32869774338904a875250168c72931,
type: 2}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 224641396611505108, guid: 4b32869774338904a875250168c72931,
type: 2}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 224641396611505108, guid: 4b32869774338904a875250168c72931,
type: 2}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 224641396611505108, guid: 4b32869774338904a875250168c72931,
type: 2}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1960887437048796, guid: 4b32869774338904a875250168c72931, type: 2}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 114824675588022588, guid: 4b32869774338904a875250168c72931, type: 2}
m_ParentPrefab: {fileID: 100100000, guid: 4b32869774338904a875250168c72931, type: 2}
m_IsPrefabParent: 0
--- !u!224 &1776203236 stripped
RectTransform:
m_PrefabParentObject: {fileID: 224641396611505108, guid: 4b32869774338904a875250168c72931,
type: 2}
m_PrefabInternal: {fileID: 1776203235}
--- !u!1001 &1794190592
Prefab:
m_ObjectHideFlags: 0
......@@ -5983,7 +6145,7 @@ ParticleSystem:
m_GameObject: {fileID: 2100709141}
serializedVersion: 5
lengthInSec: 0.1
speed: 1
simulationSpeed: 1
looping: 0
prewarm: 0
playOnAwake: 1
......
......@@ -12,14 +12,12 @@ public class GameManager : SingletonBehaviour<GameManager>
private float _levelTimer;
public Text timerText;
private GameObject birb;
private GameObject pauseMenu;
public GameObject pauseMenu;
void Awake()
{
birb = GameObject.Find("Player");
GameObject pauseMenu = gameObject.GetComponent<PauseMenu>().gameObject;
DontDestroyOnLoad(this);
//isPaused = true;
}
public bool isPaused
......@@ -33,11 +31,10 @@ public class GameManager : SingletonBehaviour<GameManager>
if (isPaused)
{
//set timescale back to normal
Time.timeScale = 1;
pauseMenu.SetActive(false);
Debug.Log("Game is unpaused");
}
else
else if(!isPaused)
{
//set timescale to zero
Time.timeScale = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment