From 46cf4f0bb622d9d9f32adc56680511cb0b3c9d15 Mon Sep 17 00:00:00 2001 From: Alex Ayerdi Date: Sun, 15 Mar 2015 23:09:10 -0500 Subject: [PATCH 1/2] pathfinder improvement, enemies don't stick to mountains --- Assets/Resources/Mountain.prefab | 2 +- Assets/Resources/Resource.prefab | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/Resources/Mountain.prefab b/Assets/Resources/Mountain.prefab index c90e5d1..d2e1881 100644 --- a/Assets/Resources/Mountain.prefab +++ b/Assets/Resources/Mountain.prefab @@ -107,7 +107,7 @@ BoxCollider: m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 2} + m_Size: {x: 1.29999995, y: 1.29999995, z: 2} m_Center: {x: 0, y: 0, z: 0} --- !u!1001 &100100000 Prefab: diff --git a/Assets/Resources/Resource.prefab b/Assets/Resources/Resource.prefab index 518ba67..b850599 100644 --- a/Assets/Resources/Resource.prefab +++ b/Assets/Resources/Resource.prefab @@ -80,7 +80,7 @@ BoxCollider: m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 2} + m_Size: {x: 1.29999995, y: 1.29999995, z: 2} m_Center: {x: 0, y: 0, z: 0} --- !u!114 &11465728 MonoBehaviour: From 52ff9ebb8656ee523e51f9e96cc86802fdfd1c4c Mon Sep 17 00:00:00 2001 From: Alex Ayerdi Date: Mon, 16 Mar 2015 12:38:08 -0500 Subject: [PATCH 2/2] pause button bug with tower placement --- Assets/Base/Placements/Placement.cs | 2 +- Assets/GUI/PauseButton.cs | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Assets/Base/Placements/Placement.cs b/Assets/Base/Placements/Placement.cs index c20cbfc..d141e59 100644 --- a/Assets/Base/Placements/Placement.cs +++ b/Assets/Base/Placements/Placement.cs @@ -91,7 +91,7 @@ void OnMouseExit () // Use this for initialization void OnMouseDown() { - if (GUIManager.Instance.OnTutorialScreen) return; + if (GUIManager.Instance.OnTutorialScreen || Time.timeScale == 0) return; BaseCohesionManager.UnMarkAllAttachments(); diff --git a/Assets/GUI/PauseButton.cs b/Assets/GUI/PauseButton.cs index 7b5002d..d2f43ed 100644 --- a/Assets/GUI/PauseButton.cs +++ b/Assets/GUI/PauseButton.cs @@ -4,6 +4,14 @@ public class PauseButton : MonoBehaviour { void OnMouseDown () { WorldManager.instance.PauseButton (); + + if (!GUIManager.Instance.OnTutorialScreen) + { + Placement.StopPlacement(); + GUIManager.Instance.MouseOverUI = false; + + SellingManager.Instance.SetVisibility(false); + } } void OnMouseEnter () {