From e7cf0b723501fc1ee51a51282c66fa1d39fffa45 Mon Sep 17 00:00:00 2001 From: kingjuulian06 <128752981+kingjuulian06@users.noreply.github.com> Date: Thu, 23 Nov 2023 00:41:36 +0100 Subject: [PATCH] PauseMenuUpdated --- .plastic/plastic.changes | Bin 6526 -> 8751 bytes .plastic/plastic.wktree | Bin 12669 -> 14936 bytes Assets/Scenes/Level_01.unity | 10 ++++++++- Assets/Scripts/Block2Script.cs | 2 +- Assets/Scripts/Block2SpawnerScript.cs | 4 +++- Assets/Scripts/BlockScript.cs | 11 ++++++++-- Assets/Scripts/LogicScript.cs | 14 +++++++++---- Assets/Scripts/PauseMenu.cs | 5 ++++- Assets/Scripts/SmallSpikeScript.cs | 2 +- Assets/Scripts/SpikeScript.cs | 2 +- Assets/Scripts/jumppad_script.cs | 2 +- ProjectSettings/PackageManagerSettings.asset | 21 +++++++------------ 12 files changed, 46 insertions(+), 27 deletions(-) diff --git a/.plastic/plastic.changes b/.plastic/plastic.changes index 83dbe42e40a458845cda2a3efe9422b5283f3138..ab3c98186e601f0278e8fe6aa8b599cbdd7842ec 100644 GIT binary patch delta 595 zcmexowBBXHZ$`F_e>%j3g%}tZ_)Ha?@>5dt^a_en(-M;=KV+6>+&lRoyEVTsn#@8b z1;#yK8K54Q)a2|`WIelKdQfCQdUk`4spI($- zT#T$|GstpLNv!f9?VC`vXXm75qJ-c^RP8A8AnhAKeh~CeO3jPM@Zb8$irm=bK>F5! z%oP?2&P~k8!3@o{U|Df2vLL-{K(doN#8bF9gHnt0ON)|Ii^0*o8YrPP@g1)a6EHpS d2IM4GrWPTG#VU|SJ|R>IkclfdZxlbv2mp3f(arz> delta 25 hcmZ4Q^3Q0(Z${RQe>%h_H;A)L=9Ev_JXc{7BLJ1`3Qzz5 diff --git a/.plastic/plastic.wktree b/.plastic/plastic.wktree index 50229889ef97d49a53d17bb49e47027a872976c2..fcfc8479c15459b4589861584324e606d5f91ef7 100644 GIT binary patch delta 611 zcmeyHbfaX0loTV|W@)J}V!}cU3=Djx3QqYcsd;(@MX70tNs|M$q!{;3J}6_yFN`L$ zP)43{4^YM)sKq5UIXe|u%Wjw!6d90~T_71j0jJD#h2VlrR9!p4a-tY=AbmSPa=biF zIr+)i$Tn>UiwmNNgVb-E9H?Q>4;GF$Fhtg|6{JHz1YHWGX$we7RK%+^x1b;~B|g0< zzqlA#>t?XLBvyHl{!OU*vvX22Q9^Pfs(uuCkp2xIc_Bgnq}0546d!@2VLez<3{w)M za~()hSSUC*F((HzVAq0W#j(hO^sWKPP8K#yl2>Ad2 diff --git a/Assets/Scenes/Level_01.unity b/Assets/Scenes/Level_01.unity index 903f6e4c..507f2311 100644 --- a/Assets/Scenes/Level_01.unity +++ b/Assets/Scenes/Level_01.unity @@ -486,6 +486,7 @@ MonoBehaviour: m_SpriteB: {fileID: 21300000, guid: 8774469666b72e64981b972de94e1cc9, type: 3} duration: 0.1 m_SR: {fileID: 0} + logic: {fileID: 0} --- !u!70 &180622470 CapsuleCollider2D: m_ObjectHideFlags: 0 @@ -1229,8 +1230,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3cdc8fa984cc5fe4a8816920234d1169, type: 3} m_Name: m_EditorClassIdentifier: - scoreText: {fileID: 0} + player: {fileID: 0} + IsFreezed: 0 gameOverScreen: {fileID: 1282931088} + pauseMenu: {fileID: 1947065555} BG_Music: {fileID: 1710401282} bgscript: {fileID: 1489183630} jumpsText: {fileID: 629075521} @@ -1269,6 +1272,7 @@ MonoBehaviour: pauseMenu: {fileID: 1947065555} BG_Music: {fileID: 1710401282} bgscript: {fileID: 1489183630} + logic: {fileID: 0} --- !u!1 &391698955 GameObject: m_ObjectHideFlags: 0 @@ -2797,6 +2801,7 @@ MonoBehaviour: Block: {fileID: 3997803213758825311, guid: f432afb7d9785944985921bd4551a51d, type: 3} spawnRate: 0.1 player: {fileID: 0} + logic: {fileID: 0} --- !u!4 &1295304553 Transform: m_ObjectHideFlags: 0 @@ -4623,6 +4628,7 @@ MonoBehaviour: m_SpriteB: {fileID: 21300000, guid: 703cea753b75d7240b3d4ec518997518, type: 3} duration: 0.1 m_SR: {fileID: 0} + logic: {fileID: 0} --- !u!1001 &1929532885 PrefabInstance: m_ObjectHideFlags: 0 @@ -6484,6 +6490,7 @@ MonoBehaviour: moveSpeed: 0 deadZone: -15 player: {fileID: 0} + logic: {fileID: 0} --- !u!4 &3997803212941429622 Transform: m_ObjectHideFlags: 0 @@ -6533,6 +6540,7 @@ MonoBehaviour: moveSpeed: 0 deadZone: -15 player: {fileID: 0} + logic: {fileID: 0} --- !u!61 &3997803213657427970 BoxCollider2D: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Block2Script.cs b/Assets/Scripts/Block2Script.cs index f2da1dd8..ff6ff202 100644 --- a/Assets/Scripts/Block2Script.cs +++ b/Assets/Scripts/Block2Script.cs @@ -20,7 +20,7 @@ public class Block2Script : MonoBehaviour // Update is called once per frame void Update() { - if (player.IsAlive||!logic.IsFreezed) { + if (player.IsAlive&&!logic.IsFreezed) { transform.position = transform.position + (Vector3.left * moveSpeed) * Time.deltaTime; } diff --git a/Assets/Scripts/Block2SpawnerScript.cs b/Assets/Scripts/Block2SpawnerScript.cs index bbf864fd..3ef43992 100644 --- a/Assets/Scripts/Block2SpawnerScript.cs +++ b/Assets/Scripts/Block2SpawnerScript.cs @@ -9,11 +9,13 @@ public class Block2SpawnerScript : MonoBehaviour public float spawnRate = 0; private float timer = 0; public BlockScript player; + public LogicScript logic; // Start is called before the first frame update void Start() { player = GameObject.FindGameObjectWithTag("Player").GetComponent(); + logic = GameObject.FindGameObjectWithTag("Logic").GetComponent(); } // Update is called once per frame @@ -30,7 +32,7 @@ public class Block2SpawnerScript : MonoBehaviour } void spawnBlock(){ - if (player.IsAlive) { + if (player.IsAlive&&!logic.IsFreezed) { Instantiate(Block, transform.position, transform.rotation); } } diff --git a/Assets/Scripts/BlockScript.cs b/Assets/Scripts/BlockScript.cs index 69689ed0..d9e798d7 100644 --- a/Assets/Scripts/BlockScript.cs +++ b/Assets/Scripts/BlockScript.cs @@ -6,6 +6,7 @@ using UnityEngine; public class BlockScript : MonoBehaviour { + public Vector2 velocity; public Rigidbody2D myRigidbody; public float blockStrength; public bool IsAlive = true; @@ -27,17 +28,23 @@ public class BlockScript : MonoBehaviour void Update() { - if (IsFlying) { + if (IsFlying && !logic.IsFreezed) { rotation = Vector3.back; transform.Rotate(rotation * speed * Time.deltaTime); } - if(Input.GetKeyDown(KeyCode.Space) && IsAlive && IsFlying==false) { + if(Input.GetKeyDown(KeyCode.Space) && IsAlive && !IsFlying && !logic.IsFreezed) { IsFlying = true; JumpSound.Play(); myRigidbody.velocity = Vector2.up * blockStrength; } + if(logic.IsFreezed) { + velocity = myRigidbody.velocity; + myRigidbody.velocity = Vector2.zero; + myRigidbody.gravityScale = 0; + } + } void OnCollisionEnter2D(Collision2D collision) { diff --git a/Assets/Scripts/LogicScript.cs b/Assets/Scripts/LogicScript.cs index 3ce4ffc3..c7bd9e0b 100644 --- a/Assets/Scripts/LogicScript.cs +++ b/Assets/Scripts/LogicScript.cs @@ -7,6 +7,7 @@ using UnityEngine.SceneManagement; public class LogicScript : MonoBehaviour { + public BlockScript player; public bool IsFreezed = false; public GameObject gameOverScreen; public GameObject pauseMenu; @@ -23,6 +24,7 @@ public class LogicScript : MonoBehaviour void Start() { bgscript = GameObject.FindGameObjectWithTag("Background").GetComponent(); + player = GameObject.FindGameObjectWithTag("Player").GetComponent(); } public void addJump() { @@ -45,18 +47,22 @@ public class LogicScript : MonoBehaviour bgscript.ScrollSpeed = 0f; } - void Update() { - if (Input.GetKeyDown(KeyCode.Escape)||!IsFreezed) { + void Update() + { + if (Input.GetKeyDown(KeyCode.Escape) && !IsFreezed && player.IsAlive) { IsFreezed = true; pauseMenu.SetActive(true); BG_Music.Stop(); bgscript.ScrollSpeed = 0f; } - else { - IsFreezed = false; + + else if (Input.GetKeyDown(KeyCode.Escape) && IsFreezed && player.IsAlive) { pauseMenu.SetActive(false); BG_Music.Play(); bgscript.ScrollSpeed = 1f; + player.myRigidbody.gravityScale = 2; + player.myRigidbody.velocity = player.velocity; + IsFreezed = false; } } } diff --git a/Assets/Scripts/PauseMenu.cs b/Assets/Scripts/PauseMenu.cs index 297f50a3..b6c18b93 100644 --- a/Assets/Scripts/PauseMenu.cs +++ b/Assets/Scripts/PauseMenu.cs @@ -9,15 +9,18 @@ public class PauseMenu : MonoBehaviour public AudioSource BG_Music; public BackgroundScroller bgscript; + public LogicScript logic; + void Start() { bgscript = GameObject.FindGameObjectWithTag("Background").GetComponent(); + logic = GetComponent(); } void Update() { - if (Input.GetKeyDown(KeyCode.Escape)) { + if (Input.GetKeyDown(KeyCode.Escape)&&!logic.IsFreezed) { pauseMenu.SetActive(true); BG_Music.Stop(); bgscript.ScrollSpeed = 0f; diff --git a/Assets/Scripts/SmallSpikeScript.cs b/Assets/Scripts/SmallSpikeScript.cs index 807acdef..f370caab 100644 --- a/Assets/Scripts/SmallSpikeScript.cs +++ b/Assets/Scripts/SmallSpikeScript.cs @@ -20,7 +20,7 @@ public class SmallSpikeScript : MonoBehaviour // Update is called once per frame void Update() { - if (player.IsAlive||!logic.IsFreezed) { + if (player.IsAlive&&!logic.IsFreezed) { transform.position = transform.position + (Vector3.left * moveSpeed) * Time.deltaTime; } diff --git a/Assets/Scripts/SpikeScript.cs b/Assets/Scripts/SpikeScript.cs index 8f9649f3..d56e1a78 100644 --- a/Assets/Scripts/SpikeScript.cs +++ b/Assets/Scripts/SpikeScript.cs @@ -20,7 +20,7 @@ public class SpikeScript : MonoBehaviour // Update is called once per frame void Update() { - if (player.IsAlive||!logic.IsFreezed) { + if (player.IsAlive&&!logic.IsFreezed) { transform.position = transform.position + (Vector3.left * moveSpeed) * Time.deltaTime; } diff --git a/Assets/Scripts/jumppad_script.cs b/Assets/Scripts/jumppad_script.cs index 2eea589b..b54279a9 100644 --- a/Assets/Scripts/jumppad_script.cs +++ b/Assets/Scripts/jumppad_script.cs @@ -26,7 +26,7 @@ public class jumppad_script : MonoBehaviour // Update is called once per frame void Update() { - if (player.IsAlive||!logic.IsFreezed) { + if (player.IsAlive&&!logic.IsFreezed) { transform.position = transform.position + (Vector3.left * moveSpeed) * Time.deltaTime; } diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset index b3a65dda..4f74716d 100644 --- a/ProjectSettings/PackageManagerSettings.asset +++ b/ProjectSettings/PackageManagerSettings.asset @@ -13,11 +13,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_EnablePreReleasePackages: 0 - m_EnablePackageDependencies: 0 m_AdvancedSettingsExpanded: 1 m_ScopedRegistriesSettingsExpanded: 1 m_SeeAllPackageVersions: 0 + m_DismissPreviewPackagesInUse: 0 oneTimeWarningShown: 0 + oneTimeDeprecatedPopUpShown: 1 m_Registries: - m_Id: main m_Name: @@ -25,20 +26,12 @@ MonoBehaviour: m_Scopes: [] m_IsDefault: 1 m_Capabilities: 7 + m_ConfigSource: 0 m_UserSelectedRegistryName: m_UserAddingNewScopedRegistry: 0 m_RegistryInfoDraft: - m_ErrorMessage: - m_Original: - m_Id: - m_Name: - m_Url: - m_Scopes: [] - m_IsDefault: 0 - m_Capabilities: 0 m_Modified: 0 - m_Name: - m_Url: - m_Scopes: - - - m_SelectedScopeIndex: 0 + m_ErrorMessage: + m_UserModificationsInstanceId: -856 + m_OriginalInstanceId: -858 + m_LoadAssets: 0