Commit f6afab40 authored by Mitchie Maluschnig's avatar Mitchie Maluschnig
Browse files

fixed bug where pausing in mime mime doe not pause the song

parent ee8cbb91
......@@ -448,15 +448,15 @@ Transform:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 124138635}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 10.47, y: 4.16, z: 0}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 10.47, y: 4.16, z: -2}
m_LocalScale: {x: 4, y: 3.7, z: 1}
m_Children:
- {fileID: 164542398}
- {fileID: 2080760845}
- {fileID: 764569484}
m_Father: {fileID: 0}
m_RootOrder: 9
m_Father: {fileID: 491873958}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &134449645
GameObject:
......@@ -1192,6 +1192,8 @@ Transform:
m_Children:
- {fileID: 1554845412}
- {fileID: 1866133753}
- {fileID: 124138637}
- {fileID: 503603553}
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -1255,15 +1257,15 @@ Transform:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 503603550}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -1.52, y: -1.55, z: 0.14648438}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -1.52, y: -1.55, z: -1.8535156}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1397976877}
- {fileID: 258363427}
- {fileID: 2138223315}
m_Father: {fileID: 0}
m_RootOrder: 10
m_Father: {fileID: 491873958}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &511771227
GameObject:
......@@ -16697,7 +16699,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!212 &1554845411
SpriteRenderer:
m_ObjectHideFlags: 0
......@@ -17260,7 +17262,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &1866133753
Transform:
m_ObjectHideFlags: 0
......
......@@ -1278,7 +1278,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1809696623}
m_RootOrder: 1
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &883848909
GameObject:
......@@ -2341,11 +2341,6 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1479546193 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4730625805961704, guid: bf8747e4259d9bd46acdd2b6e3588586,
type: 2}
m_PrefabInternal: {fileID: 1903350841}
--- !u!1 &1542602632
GameObject:
m_ObjectHideFlags: 0
......@@ -2840,7 +2835,6 @@ Transform:
m_LocalPosition: {x: 0.13, y: -1.34, z: 0}
m_LocalScale: {x: 2, y: 2, z: 1}
m_Children:
- {fileID: 1479546193}
- {fileID: 858685293}
m_Father: {fileID: 0}
m_RootOrder: 10
......@@ -2995,45 +2989,3 @@ CanvasRenderer:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1828139994}
m_CullTransparentMesh: 0
--- !u!1001 &1903350841
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1809696623}
m_Modifications:
- target: {fileID: 4730625805961704, guid: bf8747e4259d9bd46acdd2b6e3588586, type: 2}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4730625805961704, guid: bf8747e4259d9bd46acdd2b6e3588586, type: 2}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4730625805961704, guid: bf8747e4259d9bd46acdd2b6e3588586, type: 2}
propertyPath: m_LocalPosition.z
value: 90
objectReference: {fileID: 0}
- target: {fileID: 4730625805961704, guid: bf8747e4259d9bd46acdd2b6e3588586, type: 2}
propertyPath: m_LocalRotation.x
value: -0.7071068
objectReference: {fileID: 0}
- target: {fileID: 4730625805961704, guid: bf8747e4259d9bd46acdd2b6e3588586, type: 2}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4730625805961704, guid: bf8747e4259d9bd46acdd2b6e3588586, type: 2}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4730625805961704, guid: bf8747e4259d9bd46acdd2b6e3588586, type: 2}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 4730625805961704, guid: bf8747e4259d9bd46acdd2b6e3588586, type: 2}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: bf8747e4259d9bd46acdd2b6e3588586, type: 2}
m_IsPrefabAsset: 0
......@@ -7,11 +7,18 @@ public class PauseMenu : MonoBehaviour {
//private DaytimeManager dayManager;
public GameObject pauseMenu;
private AudioSource mimeAudio;
private bool pauseMenuActive = false;
void Awake() {
//dayManager = GameObject.FindWithTag("Manager").GetComponent<DaytimeManager>();
setPauseMenu(false);
if (GameObject.FindWithTag("LevelMaster")) {
mimeAudio = GameObject.FindWithTag("LevelMaster").GetComponent<AudioSource>();
} else {
mimeAudio = null;
}
}
void Update()
......@@ -39,10 +46,13 @@ public class PauseMenu : MonoBehaviour {
if (active)
{
Time.timeScale = 0;
if (mimeAudio != null) mimeAudio.Pause();
}
else
{
Time.timeScale = 1;
if (mimeAudio != null) mimeAudio.Play();
}
}
......
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