Merge branch 'main' of https://github.com/VRSDevs/XO-Rivals

VRSDevs · Nov 21, 2021 · 7fa94e7 · 7fa94e7
2 parents 59fc106 + 2aedd81
commit 7fa94e7
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 26 deletions.
diff --git a/XO Rivals/Assets/Scripts/TicTacToe/ButtonsScript.cs b/XO Rivals/Assets/Scripts/TicTacToe/ButtonsScript.cs
@@ -76,7 +76,23 @@ private void Awake() {
         //Initialize ScreenManager
         screenManager = FindObjectOfType<ScreenManager>();
     }
-
+    public void updateIconTurn()
+    {
+
+        //Activate player turn tile
+        if (thisMatch.WhosTurn == thisMatch.PlayerOName)
+        {
+            circleTurn.SetActive(true);
+            crossTurn.SetActive(false);
+
+
+        }
+        else
+        {
+            crossTurn.SetActive(true);
+            circleTurn.SetActive(false);
+        }
+    }
     public void Start(){
 
         Debug.Log("Player O name: " + thisMatch.PlayerOName);
@@ -88,18 +104,7 @@ public void Start(){
         + thisMatch.FilledPositions[1,0] + " " + thisMatch.FilledPositions[1,1] + " " + thisMatch.FilledPositions[1,2] + "\n" 
         + thisMatch.FilledPositions[2,0] + " " + thisMatch.FilledPositions[2,1] + " " + thisMatch.FilledPositions[2,2]);
         Debug.Log("Minigame chosen: " + thisMatch.MiniGameChosen);
-
-        //Activate player turn tile
-        if(thisMatch.WhosTurn == thisMatch.PlayerOName){
-            circleTurn.SetActive(true);
-            crossTurn.SetActive(false);
-
-
-        }
-        else{
-            crossTurn.SetActive(true);
-            circleTurn.SetActive(false);
-        }
+        updateIconTurn();
 
         //Set name to each player
         nameO.text = thisMatch.PlayerOName;
@@ -175,6 +180,7 @@ public void startGame()
         }else{
             //Disable interaction with tictac cause its not your turn
             screenManager.DisableButtons();
+
         }
     }
 
@@ -245,7 +251,7 @@ public void PlayMinigame(){
                     //SceneManager.LoadScene("PlatformMinigame", LoadSceneMode.Additive);
                 break;
                 case 3:
-                    SceneManager.LoadScene("Fantasmas3D");
+                    SceneManager.LoadScene(7);
                     //SceneManager.LoadScene("PlatformMinigame", LoadSceneMode.Additive);
                     break;
             }

diff --git a/XO Rivals/ProjectSettings/EditorBuildSettings.asset b/XO Rivals/ProjectSettings/EditorBuildSettings.asset
@@ -17,18 +17,6 @@ EditorBuildSettings:
   - enabled: 1
     path: Assets/Scenes/TicTacToe_Server.unity
     guid: 4b715a1e71a77684dacd49aa789d3b54
-  - enabled: 0
-    path: Assets/Scenes/TicTacToe.unity
-    guid: 0544b9456c782b14fafb17b1bcfc7de8
-  - enabled: 0
-    path: 
-    guid: 00000000000000000000000000000000
-  - enabled: 0
-    path: 
-    guid: 00000000000000000000000000000000
-  - enabled: 1
-    path: Assets/Scenes/Fanstasmas3D.unity
-    guid: f594e3e9a76eb564eabc6b9f84efa143
   - enabled: 1
     path: Assets/Scenes/PlatformMinigame.unity
     guid: 13414cc9793dc6d489cea673e7718cb0
@@ -38,4 +26,7 @@ EditorBuildSettings:
   - enabled: 1
     path: Assets/Scenes/Pistolero.unity
     guid: 4a4575736a555134aae06631f071b295
+  - enabled: 1
+    path: Assets/Scenes/Fanstasmas3D.unity
+    guid: f594e3e9a76eb564eabc6b9f84efa143
   m_configObjects: {}