[KeeperManager] reset everything at every scene change

vgwb · Mar 16, 2017 · c04d19a · c04d19a
1 parent 1ef8026
commit c04d19a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/Assets/_app/_scripts/Managers/KeeperManager.cs b/Assets/_app/_scripts/Managers/KeeperManager.cs
@@ -10,6 +10,7 @@ namespace EA4S.Core
     public class KeeperManager : MonoBehaviour
     {
         public static KeeperManager I;
+        System.Action currentCallback;
 
         void Start()
         {
@@ -44,11 +45,11 @@ public void PlayDialog(Database.LocalizationData data, bool isKeeper = true, boo
         {
             if (autoClose) {
                 WidgetSubtitles.I.DisplaySentence(data, 2, isKeeper, null);
-                var callback = _callback;
+                currentCallback = _callback;
                 AudioManager.I.PlayDialogue(data, () => {
                     CloseDialog();
-                    if (callback != null)
-                        callback();
+                    if (currentCallback != null)
+                        currentCallback();
                 });
             } else {
                 WidgetSubtitles.I.DisplaySentence(data, 2, true, null);
@@ -61,5 +62,11 @@ public void CloseDialog(bool _immediate = false)
             WidgetSubtitles.I.Close(_immediate);
         }
 
+        public void ResetKeeper()
+        {
+            currentCallback = null;
+            WidgetSubtitles.I.Close(true);
+            AudioManager.I.StopDialogue(true);
+        }
     }
 }
diff --git a/Assets/_app/_scripts/Navigation/NavigationManager.cs b/Assets/_app/_scripts/Navigation/NavigationManager.cs
@@ -201,7 +201,7 @@ private void GoToScene(AppScene newScene, Database.MiniGameData minigameData = n
             NavData.CurrentScene = newScene;
 
             // check to have closed any possibile Keeper Dialog
-            KeeperManager.I.CloseDialog(true);
+            KeeperManager.I.ResetKeeper();
 
             GoToSceneByName(AppSceneHelper.GetSceneName(newScene, minigameData));
         }