Teel-Software · AnesVijay · Oct 10, 2023 · Oct 10, 2023
diff --git a/Assets/MainCanvasScript.cs b/Assets/MainCanvasScript.cs
@@ -5,13 +5,15 @@
 public class MainCanvasScript : MonoBehaviour
 {
     [SerializeField] private GameObject _obj;
+    [SerializeField] private GameObject pausePanel;
 
     void Start()
     {
         if (PlayerPrefs.GetInt("destroy") == 1)
         {
             _obj.SetActive(true);
             gameObject.SetActive(false);
+            pausePanel.SetActive(true);
             Time.timeScale = 1;
             PlayerPrefs.SetInt("destroy", 0);
         }

diff --git a/Assets/TimeScaleFactorMenu.cs b/Assets/TimeScaleFactorMenu.cs
@@ -1,10 +1,11 @@
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
 public class TimeScaleFactorMenu : MonoBehaviour
 {
-    private void Start()
+    // AnesVijay: изменил Start на OnEnable, чтобы время останавливалось не только на первой заставке, но и при возникновении экрана паузы (чтобы игра на фоне не шла)
+    private void OnEnable()
     {
         Time.timeScale = 0;
     }

diff --git a/Assets/_Game/Scenes/GameScene.unity b/Assets/_Game/Scenes/GameScene.unity
@@ -824,6 +824,83 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 8ce08dbc076252f4b88ae51b57f46d24, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!1 &376525403
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 376525404}
+  - component: {fileID: 376525406}
+  - component: {fileID: 376525405}
+  m_Layer: 5
+  m_Name: PauseButton_panel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &376525404
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 376525403}
+  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: 556466633}
+  m_Father: {fileID: 741547132}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 131.16486, y: -124}
+  m_SizeDelta: {x: 262.3297, y: 248}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &376525405
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 376525403}
+  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: 0}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &376525406
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 376525403}
+  m_CullTransparentMesh: 1
 --- !u!1 &395845782
 GameObject:
   m_ObjectHideFlags: 0
@@ -1518,27 +1595,28 @@ GameObject:
   - component: {fileID: 556466636}
   - component: {fileID: 556466635}
   - component: {fileID: 556466634}
+  - component: {fileID: 556466638}
   m_Layer: 5
   m_Name: PauseButton
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &556466633
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 556466632}
-  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_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 741547132}
-  m_RootOrder: 1
+  m_Father: {fileID: 376525404}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -1625,30 +1703,6 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
-      - m_Target: {fileID: 2034160953}
-        m_TargetAssemblyTypeName: UnityEngine.Behaviour, UnityEngine
-        m_MethodName: set_enabled
-        m_Mode: 6
-        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
-      - m_Target: {fileID: 2034160952}
-        m_TargetAssemblyTypeName: UnityEngine.Behaviour, UnityEngine
-        m_MethodName: set_enabled
-        m_Mode: 6
-        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 &556466636
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1687,6 +1741,47 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 556466632}
   m_CullTransparentMesh: 1
+--- !u!114 &556466638
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 556466632}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Delegates:
+  - eventID: 2
+    callback:
+      m_PersistentCalls:
+        m_Calls:
+        - m_Target: {fileID: 2034160952}
+          m_TargetAssemblyTypeName: FlyControlling, Assembly-CSharp
+          m_MethodName: ChangePauseButtonToPressed
+          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
+        - m_Target: {fileID: 2034160953}
+          m_TargetAssemblyTypeName: UnityEngine.Behaviour, UnityEngine
+          m_MethodName: set_enabled
+          m_Mode: 6
+          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!1 &595044269
 GameObject:
   m_ObjectHideFlags: 0
@@ -1817,6 +1912,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   _obj: {fileID: 1004120374}
+  pausePanel: {fileID: 376525403}
 --- !u!1 &676747202
 GameObject:
   m_ObjectHideFlags: 0
@@ -1938,6 +2034,30 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+      - m_Target: {fileID: 828766194}
+        m_TargetAssemblyTypeName: TimeScaleFactorMenu, Assembly-CSharp
+        m_MethodName: DoScaleFactorMagic
+        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
+      - m_Target: {fileID: 2034160952}
+        m_TargetAssemblyTypeName: FlyControlling, Assembly-CSharp
+        m_MethodName: ChangePauseButtonToUnpressed
+        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 &676747206
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2225,8 +2345,8 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1387215902}
-  - {fileID: 556466633}
   - {fileID: 1004120375}
+  - {fileID: 376525404}
   - {fileID: 828766193}
   - {fileID: 987121519}
   m_Father: {fileID: 0}
@@ -2456,6 +2576,7 @@ GameObject:
   - component: {fileID: 828766193}
   - component: {fileID: 828766192}
   - component: {fileID: 828766191}
+  - component: {fileID: 828766194}
   m_Layer: 5
   m_Name: PausePanel
   m_TagString: Untagged
@@ -2525,6 +2646,18 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 900, y: 1250}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &828766194
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 828766190}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e2cd92cc99a9c484490f0870292c8641, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &857164341
 GameObject:
   m_ObjectHideFlags: 0
@@ -2681,7 +2814,7 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 1
         m_CallState: 2
-      - m_Target: {fileID: 556466632}
+      - m_Target: {fileID: 376525403}
         m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine
         m_MethodName: SetActive
         m_Mode: 6
@@ -3294,7 +3427,7 @@ RectTransform:
   m_Children:
   - {fileID: 2006875039}
   m_Father: {fileID: 741547132}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}

diff --git a/Assets/_Game/Scripts/CheckLanding.cs b/Assets/_Game/Scripts/CheckLanding.cs
@@ -27,7 +27,11 @@ public void OnWin(GameObject collider)
         //startPos.position = transform.position;
         gameObject.GetComponent<ForceAdding>().enabled = true;
         Debug.Log(gameObject.GetComponent<FlyControlling>().ToString());
+
+        // AnesVijay: 32 строку трогать не стал, добавил 33-ю, чтобы двойной прыжок перезаряжался при приземлении в тостер.
+        // Также переменную isDoubleJumpPressed сделал публичной, чтобы тут так можно было пробросить
         gameObject.GetComponent<FlyControlling>().enabled = false;
+        gameObject.GetComponent<FlyControlling>().isDoubleJumpPressed = false;
         //if (!collider.Equals(PrevCollider))
         //PlanesGenerator.GenerateNextPanel();
         //PrevCollider = collider;

diff --git a/Assets/_Game/Scripts/FlyControlling.cs b/Assets/_Game/Scripts/FlyControlling.cs
@@ -1,27 +1,43 @@
-using System;
+using System;
 using TMPro;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.UI;
 
 public class FlyControlling : MonoBehaviour
 {
     private Rigidbody physics;
-    private bool isDoubleJumpPressed = false;
+    public bool isDoubleJumpPressed;
 
     private float startTime;
     private const float MAX_TIME = 5;
 
+    private bool pausePressed;
+
     private void Start()
     {
         physics = gameObject.GetComponent<Rigidbody>();
     }
 
     private void OnEnable()
     {
+
         isDoubleJumpPressed = false;
     }
 
+    // AnesVijay: ChangePauseButtonToPressed и ChangePauseButtonToUnpressed нужны для того, чтобы не срабатывал двойной прыжок при нажатии на паузу,
+    // переменная pausePressed служит для этого флагом
+    public void ChangePauseButtonToPressed()
+    {
+        pausePressed = true;
+    }
+
+    public void ChangePauseButtonToUnpressed()
+    {
+        pausePressed = false;
+    }
+
     void Update()
     {
         //bool phonePress = Input.touchCount > 0 && (Input.GetTouch(0).phase == TouchPhase.Moved || Input.GetTouch(0).phase == TouchPhase.Stationary);
@@ -31,7 +47,7 @@ void Update()
         //}
 
         bool phonePress = Input.touchCount > 0 && Input.GetTouch(0).phase == TouchPhase.Began;
-        if ((phonePress || Input.GetMouseButtonDown(0)) && !isDoubleJumpPressed)
+        if ((phonePress || Input.GetMouseButtonDown(0)) && !isDoubleJumpPressed && !pausePressed)
         {
             if(physics.velocity.y < 0)
                 physics.velocity = new Vector3(physics.velocity.x, 0f, physics.velocity.z);