diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index e73d503..35e172d 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -1745,6 +1745,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 02daecb0115395844b4932445d039051, type: 3} +--- !u!1 &829543639 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3028288566889208744, guid: 02daecb0115395844b4932445d039051, type: 3} + m_PrefabInstance: {fileID: 829543638} + m_PrefabAsset: {fileID: 0} --- !u!1 &884382837 GameObject: m_ObjectHideFlags: 0 @@ -1773,7 +1778,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 884382837} - 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: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 @@ -1972,9 +1977,9 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1760532842} - m_TargetAssemblyTypeName: ClickBehavior, GameAssembly - m_MethodName: stopGame + - m_Target: {fileID: 1760532843} + m_TargetAssemblyTypeName: PauseScript, GameAssembly + m_MethodName: Resume m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -3220,9 +3225,9 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1760532842} - m_TargetAssemblyTypeName: ClickBehavior, GameAssembly - m_MethodName: ChangeGameSpeed + - m_Target: {fileID: 1760532843} + m_TargetAssemblyTypeName: PauseScript, GameAssembly + m_MethodName: ToggleSpeed m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -3270,17 +3275,20 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1709530843} m_CullTransparentMesh: 1 ---- !u!114 &1760532842 stripped +--- !u!114 &1760532843 MonoBehaviour: - m_CorrespondingSourceObject: {fileID: -245230096461627285, guid: 02daecb0115395844b4932445d039051, type: 3} - m_PrefabInstance: {fileID: 829543638} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} + m_GameObject: {fileID: 829543639} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 37c0aa967043d974783120d6ea9b136c, type: 3} + m_Script: {fileID: 11500000, guid: 6efea9f36ef864748a8a69a0b5ce4db0, type: 3} m_Name: m_EditorClassIdentifier: + _pauseButton: {fileID: 2019202048} + _speedButton: {fileID: 1709530845} --- !u!1 &1761692192 GameObject: m_ObjectHideFlags: 0 @@ -3499,9 +3507,9 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1760532842} - m_TargetAssemblyTypeName: ClickBehavior, GameAssembly - m_MethodName: StopGame + - m_Target: {fileID: 1760532843} + m_TargetAssemblyTypeName: PauseScript, GameAssembly + m_MethodName: Pause m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} diff --git a/Assets/Scripts/PlayerAction/ClickBehavior.cs b/Assets/Scripts/PlayerAction/ClickBehavior.cs index d5ffb42..b890cb5 100644 --- a/Assets/Scripts/PlayerAction/ClickBehavior.cs +++ b/Assets/Scripts/PlayerAction/ClickBehavior.cs @@ -6,9 +6,6 @@ using UnityEngine.UI; /// public class ClickBehavior : MonoBehaviour { - - private float unpausedTime = 1f; - private void Update() { if (Input.GetMouseButton(0)) @@ -27,46 +24,13 @@ public class ClickBehavior : MonoBehaviour } } - public void ChangeGameSpeed() - { - if (Time.timeScale != 0f) - { - if (Time.timeScale == 1f) - { - GameObject.Find("btn_speedup").GetComponent