Axel Nordh преди 5 години
родител
ревизия
d89a484a7b
променени са 3 файла, в които са добавени 12 реда и са изтрити 6 реда
  1. 1 0
      .gitignore
  2. 10 5
      Assets/Scripts/GameManagerScript.cs
  3. 1 1
      dbFiles/NewOnlineGame.php

+ 1 - 0
.gitignore

@@ -49,3 +49,4 @@ sysinfo.txt
 
 # Crashlytics generated file
 crashlytics-build.properties
+Assets/narKampenLocal.db

+ 10 - 5
Assets/Scripts/GameManagerScript.cs

@@ -3,6 +3,7 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
+using UnityEngine.SceneManagement;
 
 public class GameManagerScript : MonoBehaviour {
 
@@ -58,7 +59,9 @@ public class GameManagerScript : MonoBehaviour {
             scrollViewScript = answerLineObject.transform.parent.parent.GetComponent<ScrollViewScript>();
         }
         
-        currentPlayer = Database.Instance.GetCurrentPlayer(GameId, GetGameMode());
+        if (SceneManager.GetActiveScene().name.Equals("narKampen")) {
+            currentPlayer = Database.Instance.GetCurrentPlayer(GameId, GetGameMode());
+        }
     }
 
     public void StartTimer()
@@ -75,10 +78,12 @@ public class GameManagerScript : MonoBehaviour {
 
     void Awake()
     {
-        GameId = PlayerPrefs.GetInt("GameId");
-        GameMode = PlayerPrefs.GetString("GameMode");
-        if (Database.Instance.GetRoundValue(GameId, GameMode) == 1) {
-            StartCoroutine(startAnimation());
+        if (SceneManager.GetActiveScene().name.Equals("narKampen")) {
+            GameId = PlayerPrefs.GetInt("GameId");
+            GameMode = PlayerPrefs.GetString("GameMode");
+            if (Database.Instance.GetRoundValue(GameId, GameMode) == 1) {
+                StartCoroutine(startAnimation());
+            }
         }
     }
 

+ 1 - 1
dbFiles/NewOnlineGame.php

@@ -72,7 +72,7 @@
 	}
 
 	$categoryValues = "";
-	$categoryIdsArray = explode($categoryIds, ",");
+	$categoryIdsArray = explode(",", $categoryIds);
 	foreach ($categoryIdsArray AS $catId) {
 		$categoryValues .= "($gameId, $catId),";
 	}