diff --git a/SSLR/Assets/Scenes/Game Scene.unity b/SSLR/Assets/Scenes/Game Scene.unity index 4b1fdfe..40b61d8 100644 --- a/SSLR/Assets/Scenes/Game Scene.unity +++ b/SSLR/Assets/Scenes/Game Scene.unity @@ -6980,10 +6980,10 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 227548923} + m_TargetAssemblyTypeName: Tablet, Assembly-CSharp + m_MethodName: PauseGame + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -7377,7 +7377,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!114 &96628618 MonoBehaviour: m_ObjectHideFlags: 0 @@ -8438,10 +8438,10 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 227548923} + m_TargetAssemblyTypeName: Tablet, Assembly-CSharp + m_MethodName: PauseGame + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -15641,6 +15641,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 55eb55e50dc0ccf4999b017b5dfd68e4, type: 3} m_Name: m_EditorClassIdentifier: + pausePanel: {fileID: 966008672} --- !u!1001 &232082409 PrefabInstance: m_ObjectHideFlags: 0 @@ -19220,10 +19221,10 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 227548923} + m_TargetAssemblyTypeName: Tablet, Assembly-CSharp + m_MethodName: PauseGame + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -32734,10 +32735,10 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 227548923} + m_TargetAssemblyTypeName: Tablet, Assembly-CSharp + m_MethodName: PauseGame + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -35470,10 +35471,10 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 227548923} + m_TargetAssemblyTypeName: Tablet, Assembly-CSharp + m_MethodName: PauseGame + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -36739,10 +36740,10 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 227548923} + m_TargetAssemblyTypeName: Tablet, Assembly-CSharp + m_MethodName: PauseGame + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -44640,10 +44641,10 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 227548923} + m_TargetAssemblyTypeName: Tablet, Assembly-CSharp + m_MethodName: PauseGame + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -48788,7 +48789,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1561602183} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 227548923} + m_TargetAssemblyTypeName: Tablet, Assembly-CSharp + m_MethodName: ResumeGame + 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 &1561602183 MonoBehaviour: m_ObjectHideFlags: 0 @@ -52225,10 +52238,10 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 227548923} + m_TargetAssemblyTypeName: Tablet, Assembly-CSharp + m_MethodName: PauseGame + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -54974,10 +54987,10 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 227548923} + m_TargetAssemblyTypeName: Tablet, Assembly-CSharp + m_MethodName: PauseGame + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -60509,10 +60522,10 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 0} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 227548923} + m_TargetAssemblyTypeName: Tablet, Assembly-CSharp + m_MethodName: PauseGame + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine diff --git a/SSLR/Assets/Scenes/Game Scene/NavMesh-Game Manager.asset b/SSLR/Assets/Scenes/Game Scene/NavMesh-Game Manager.asset index 3f0b1ce..4d67ce6 100644 Binary files a/SSLR/Assets/Scenes/Game Scene/NavMesh-Game Manager.asset and b/SSLR/Assets/Scenes/Game Scene/NavMesh-Game Manager.asset differ diff --git a/SSLR/Assets/Scripts/Tablet.cs b/SSLR/Assets/Scripts/Tablet.cs index efde853..e80b762 100644 --- a/SSLR/Assets/Scripts/Tablet.cs +++ b/SSLR/Assets/Scripts/Tablet.cs @@ -5,22 +5,35 @@ using UnityEngine.AI; public class Tablet : MonoBehaviour { + [SerializeField] private GameObject pausePanel; + + void Awake() + { + pausePanel.SetActive(false); + } + public void PauseGame() { + pausePanel.SetActive(true); Time.timeScale = 0; var temp=GetComponents(); foreach (var agent in temp) { agent.isStopped = true; } + + Debug.Log("Paused"); } public void ResumeGame() { + pausePanel.SetActive(false); Time.timeScale = 1; var temp = GetComponents(); foreach (var agent in temp) { agent.isStopped = false; } + + Debug.Log("Unpaused"); } }