all repos — RPG @ 6d7a51de9b74ca4bbe58a33eca073580fb7044ef

Fully functional 3D turn based role playing game coded in C# and base Unity.

fix pause + dialogue bug
Marco Andronaco andronacomarco@gmail.com
Wed, 15 Apr 2020 19:37:02 +0200
commit

6d7a51de9b74ca4bbe58a33eca073580fb7044ef

parent

5dd0e2789567908ea2c44449a4112f14377fcaf7

3 files changed, 5 insertions(+), 2 deletions(-)

jump to
M Assets/Scenes/Level0.unity → Assets/Scenes/Level0.unity 
@@ -17034,6 +17034,7 @@ m_Script: {fileID: 11500000, guid: 00f225f6fb6e4764c9b323a08dab3c30, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   ui: {fileID: 1894257712}
+  dm: {fileID: 963634863}
 --- !u!1 &1950166455
 GameObject:
   m_ObjectHideFlags: 0
M Assets/Scenes/Level1.unity → Assets/Scenes/Level1.unity 
@@ -947,6 +947,7 @@ m_Script: {fileID: 11500000, guid: 00f225f6fb6e4764c9b323a08dab3c30, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   ui: {fileID: 1894257712}
+  dm: {fileID: 963634863}
 --- !u!1 &2002645272 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 2167011348411117962, guid: a4e442e0015c9b5459a7b2ecdd0cc233,
M Assets/Scripts/Overworld/PauseMenuManager.cs → Assets/Scripts/Overworld/PauseMenuManager.cs 
@@ -4,12 +4,13 @@
 public class PauseMenuManager : MonoBehaviour
 {
     public OverworldUIManager ui;
-    
+    public DialogueManager dm;
     void Update()
     {
         if (Input.GetKeyDown(KeyCode.Escape))
         {
-            ui.showPause(togglePause());
+            if(dm.alreadyTalking == null)
+                ui.showPause(togglePause());
         }
         
     }