Merge

Razsiel · Apr 19, 2018 · 4728f6b · 4728f6b
2 parents 39dade3 + ec19f14
commit 4728f6b
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 428 deletions.
diff --git a/Assets/Models/Tiles/Materials/trackfield_middleMat.mat.meta b/Assets/Models/Tiles/Materials/trackfield_middleMat.mat.meta
diff --git a/Assets/Scripts/Photon/RoomManager.cs b/Assets/Scripts/Photon/RoomManager.cs
@@ -228,9 +228,12 @@ public void StartExecution(PhotonMessageInfo info)
     [PunRPC]
     public void StopExecution(PhotonMessageInfo info)
     {
-        foreach (TGEPlayer p in gameManager.Players)
+        foreach(TGEPlayer p in gameManager.Players)
         {
-            p.Player.StopExecution();
+            p.Player.StopAllCoroutines();
+            p.Player.IsReady = false;
+            EventManager.OnLevelReset(gameManager.LevelData,
+                            gameManager.Players.Select(x => x.Player).ToList());
         }
     }
 

diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs
@@ -136,6 +136,7 @@ IEnumerator ExecuteCommands()
                 yield return new WaitForSeconds(delay);
             }
             OnPlayerSequenceRan?.Invoke();
+            OnPlayerSequenceRan = null;
         }
 
         public void AddOrInsertCommandAt(BaseCommand command, int index)

diff --git a/Assets/Scripts/Sound/SfxBehaviour.cs b/Assets/Scripts/Sound/SfxBehaviour.cs
@@ -17,6 +17,7 @@ void Awake()
 
 	void Initialize ()
 	{
+        print("audio init");
 	    sfxPlayer = GetComponent<AudioSource>();
 	    prefabContainer = GameManager.GetInstance().PrefabContainer;