diff --git a/Assets/Prefabs/ShopKeeper/Item Template.prefab b/Assets/Prefabs/ShopKeeper/Item Template.prefab
index cfa3ad1d25252eb874ad0dc6e1e3bac85dfbd474..96673e1911c3d432d5683e8c70a90ffd27491c29 100644
--- a/Assets/Prefabs/ShopKeeper/Item Template.prefab
+++ b/Assets/Prefabs/ShopKeeper/Item Template.prefab
@@ -175,8 +175,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 195.9473, y: 346.3669}
+ m_AnchoredPosition: {x: 0, y: -13.110413}
+ m_SizeDelta: {x: 195.9473, y: 320.1462}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3829713824781694797
CanvasRenderer:
@@ -462,7 +462,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
- m_AnchoredPosition: {x: 46.6, y: -268}
+ m_AnchoredPosition: {x: 48, y: -257}
m_SizeDelta: {x: 80, y: 22.6077}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4233481473921023371
diff --git a/Assets/Scenes/Level01.unity b/Assets/Scenes/Level01.unity
index bab321f211d6ebd15738c54a50aad5f28e8a1f26..40c95e94a9dc246e901ac50f5d8d071481251926 100644
--- a/Assets/Scenes/Level01.unity
+++ b/Assets/Scenes/Level01.unity
@@ -2292,6 +2292,9 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
pauseMenu: {fileID: 591423028}
+ hudCanvas: {fileID: 264136412}
+ cheats: {fileID: 614175244}
+ isPaused: 0
--- !u!223 &264729923 stripped
Canvas:
m_CorrespondingSourceObject: {fileID: 3226171550272037462, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
@@ -7946,6 +7949,10 @@ PrefabInstance:
propertyPath: shopManager
value:
objectReference: {fileID: 798289378}
+ - target: {fileID: 3685030869706006963, guid: f0abd49340d3e184fa702d7fdc61499b, type: 3}
+ propertyPath: pauseManager
+ value:
+ objectReference: {fileID: 264136416}
- target: {fileID: 3685030869706006963, guid: f0abd49340d3e184fa702d7fdc61499b, type: 3}
propertyPath: playerHealth
value:
@@ -7954,6 +7961,10 @@ PrefabInstance:
propertyPath: WeaponManager
value:
objectReference: {fileID: 1608477377}
+ - target: {fileID: 3685030869706006963, guid: f0abd49340d3e184fa702d7fdc61499b, type: 3}
+ propertyPath: weaponManager
+ value:
+ objectReference: {fileID: 1608477377}
- target: {fileID: 3685030869706006963, guid: f0abd49340d3e184fa702d7fdc61499b, type: 3}
propertyPath: playerMovement
value:
@@ -11214,18 +11225,26 @@ PrefabInstance:
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 659049484802868554, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
+ propertyPath: m_Sprite
+ value:
+ objectReference: {fileID: 0}
- target: {fileID: 788451540850862775, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
propertyPath: m_SizeDelta.y
- value: -377.6389
+ value: -403.15
objectReference: {fileID: 0}
- target: {fileID: 788451540850862775, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
propertyPath: m_AnchoredPosition.y
- value: 188.81946
+ value: 201.58
objectReference: {fileID: 0}
- target: {fileID: 862538851093984440, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 1178717496164610987, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
+ propertyPath: m_Sprite
+ value:
+ objectReference: {fileID: 0}
- target: {fileID: 1212646825944863205, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
propertyPath: m_IsActive
value: 1
@@ -11236,27 +11255,35 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2526570798605016776, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
propertyPath: m_AnchorMax.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 2526570798605016776, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
propertyPath: m_AnchorMin.y
- value: 1
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 2526570798605016776, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 323.0601
objectReference: {fileID: 0}
- target: {fileID: 2526570798605016776, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
propertyPath: m_AnchoredPosition.x
- value: 112.97365
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 2526570798605016776, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
propertyPath: m_AnchoredPosition.y
- value: -173.18346
+ value: -161.53004
objectReference: {fileID: 0}
- target: {fileID: 2533470587971281730, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
propertyPath: m_SizeDelta.y
- value: -218.1306
+ value: -196.85
objectReference: {fileID: 0}
- target: {fileID: 2533470587971281730, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
propertyPath: m_AnchoredPosition.y
- value: -109.065285
+ value: -98.425
+ objectReference: {fileID: 0}
+ - target: {fileID: 3226171550272037462, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
+ propertyPath: m_SortingOrder
+ value: 10
objectReference: {fileID: 0}
- target: {fileID: 3308455176689711772, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
propertyPath: m_IsActive
@@ -11266,21 +11293,29 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 4065410176905423724, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
+ propertyPath: m_Sprite
+ value:
+ objectReference: {fileID: 0}
- target: {fileID: 4485382539556145118, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
propertyPath: m_AnchorMax.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 4485382539556145118, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
propertyPath: m_AnchorMin.y
- value: 1
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4485382539556145118, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 322.4444
objectReference: {fileID: 0}
- target: {fileID: 4485382539556145118, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
propertyPath: m_AnchoredPosition.x
- value: 112.97365
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 4485382539556145118, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
propertyPath: m_AnchoredPosition.y
- value: -173.18346
+ value: -161.53004
objectReference: {fileID: 0}
- target: {fileID: 5712293994674342005, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
propertyPath: m_AnchorMax.x
@@ -11292,19 +11327,19 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 5712293994674342005, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
propertyPath: m_SizeDelta.x
- value: 30
+ value: 1069.7365
objectReference: {fileID: 0}
- target: {fileID: 5712293994674342005, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
propertyPath: m_SizeDelta.y
- value: 10
+ value: 323.0601
objectReference: {fileID: 0}
- target: {fileID: 5712293994674342005, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
propertyPath: m_AnchoredPosition.x
- value: -695.26825
+ value: -547.31573
objectReference: {fileID: 0}
- target: {fileID: 5712293994674342005, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
propertyPath: m_AnchoredPosition.y
- value: 6
+ value: 33
objectReference: {fileID: 0}
- target: {fileID: 5757823145624144122, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
propertyPath: m_UiScaleMode
@@ -11340,19 +11375,23 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6812590292140128754, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
propertyPath: m_AnchorMax.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 6812590292140128754, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
propertyPath: m_AnchorMin.y
- value: 1
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 6812590292140128754, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 321.5121
objectReference: {fileID: 0}
- target: {fileID: 6812590292140128754, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
propertyPath: m_AnchoredPosition.x
- value: 112.97365
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 6812590292140128754, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
propertyPath: m_AnchoredPosition.y
- value: -173.18346
+ value: -161.53004
objectReference: {fileID: 0}
- target: {fileID: 6913258776438867350, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
propertyPath: m_Pivot.x
@@ -11470,37 +11509,49 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 7734649888587118177, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
+ propertyPath: m_CullTransparentMesh
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 7846561445780367296, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
propertyPath: m_AnchorMax.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 7846561445780367296, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
propertyPath: m_AnchorMin.y
- value: 1
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7846561445780367296, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 322.0967
objectReference: {fileID: 0}
- target: {fileID: 7846561445780367296, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
propertyPath: m_AnchoredPosition.x
- value: 112.97365
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 7846561445780367296, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
propertyPath: m_AnchoredPosition.y
- value: -173.18346
+ value: -161.53004
objectReference: {fileID: 0}
- target: {fileID: 7885068554289718964, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
propertyPath: m_AnchorMax.y
- value: 1
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 7885068554289718964, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
propertyPath: m_AnchorMin.y
- value: 1
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 7885068554289718964, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 320.8222
objectReference: {fileID: 0}
- target: {fileID: 7885068554289718964, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
propertyPath: m_AnchoredPosition.x
- value: 112.97365
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 7885068554289718964, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
propertyPath: m_AnchoredPosition.y
- value: -173.18346
+ value: -161.53004
objectReference: {fileID: 0}
- target: {fileID: 8249280381695449885, guid: ce41f0f1776a2c341b1fb70e0cb568f2, type: 3}
propertyPath: m_ChildAlignment
diff --git a/Assets/Scripts/Cheats/Cheats.cs b/Assets/Scripts/Cheats/Cheats.cs
index f9efd7e2c0e82c4f372ba21aa4ee5fc594ec4871..9042d7448d773f9ecac6c6164e1fb0349350d661 100644
--- a/Assets/Scripts/Cheats/Cheats.cs
+++ b/Assets/Scripts/Cheats/Cheats.cs
@@ -9,20 +9,21 @@ public class Cheats : MonoBehaviour
{
public Canvas cheatCanvas;
public PlayerHealth playerHealth;
- public WeaponManager WeaponManager;
+ public WeaponManager weaponManager;
public ShopManager shopManager;
public PlayerMovement playerMovement;
+ public PauseManager pauseManager;
private int initDamagePerShot = 20;
private float cheatCoins = Mathf.Infinity;
private bool isCheatCoins = false;
private bool isTwoTimeSpeed = false;
public bool playerInsideCheatCollider = false;
- private bool isCheatOpened = false;
+ public bool isCheatOpened = false;
public void Update()
{
- if (Input.GetKeyDown(KeyCode.P))
+ if (Input.GetKeyDown(KeyCode.P) && pauseManager.isPaused == false)
{
if (playerInsideCheatCollider)
@@ -65,7 +66,7 @@ public class Cheats : MonoBehaviour
public void oneHitKill()
{
- WeaponManager.Cheat();
+ weaponManager.Cheat();
}
public void motherlode()
diff --git a/Assets/Scripts/Managers/PauseManager.cs b/Assets/Scripts/Managers/PauseManager.cs
index 4d475019831e9269cd7d7a54601cd267a1975c24..5d4b5e35284cce88599a732058efc7f0ecf30cf1 100644
--- a/Assets/Scripts/Managers/PauseManager.cs
+++ b/Assets/Scripts/Managers/PauseManager.cs
@@ -7,25 +7,34 @@ using UnityEngine.UI;
public class PauseManager : MonoBehaviour
{
public GameObject pauseMenu;
+ public Canvas hudCanvas;
+ public Cheats cheats;
+ public bool isPaused = false;
void Update()
{
if (Input.GetKeyDown(KeyCode.Escape))
{
- if (Time.timeScale == 1) Pause();
+ if (!isPaused) Pause();
else Resume();
}
}
public void Pause()
{
+ hudCanvas.sortingOrder = 100;
pauseMenu.SetActive(true);
+ isPaused = true;
Time.timeScale = 0;
}
public void Resume()
{
+ hudCanvas.sortingOrder = 0;
pauseMenu.SetActive(false);
- Time.timeScale = 1;
+ isPaused = false;
+ if (!cheats.isCheatOpened){
+ Time.timeScale = 1;
+ }
}
}
diff --git a/Assets/Scripts/ShopKeeper/CollisionDetection.cs b/Assets/Scripts/ShopKeeper/CollisionDetection.cs
index 3cdc447d43f10f2632087d1cb3d75d0e3e96de5f..1181fc7aa7fc4bb76a168adc0c0d1160919ade4b 100644
--- a/Assets/Scripts/ShopKeeper/CollisionDetection.cs
+++ b/Assets/Scripts/ShopKeeper/CollisionDetection.cs
@@ -23,7 +23,7 @@ public class CollisionDetection : MonoBehaviour
if (timerUI.text != "Shop is closed")
{
- if (Input.GetKeyDown(KeyCode.Z))
+ if (Input.GetKeyDown(KeyCode.Z) && Time.timeScale == 1)
{
if (playerInsideCollider)