Smal fixes

Assets/Scenes/MainMenu.unity

@@ -3243,7 +3243,7 @@ MonoBehaviour:
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 1
-  m_ChildControlHeight: 1
+  m_ChildControlHeight: 0
   m_ChildScaleWidth: 0
   m_ChildScaleHeight: 0
 --- !u!1 &877975416
@@ -6711,7 +6711,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0.78431374}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_Maskable: 1
   m_OnCullStateChanged:

Assets/Scripts/Database/OnlineDatabase.cs

@@ -9,8 +9,8 @@ using System.IO;
 using System.Text;
 
 public class OnlineDatabase : MonoBehaviour {
-    private const string onlineQuestionsUrl = "narkampen.nordh.xyz/narKampen/dbFiles/Question.php";
-    private const string serverUrl = "narkampen.nordh.xyz/narKampen/dbFiles/";
+    private const string onlineQuestionsUrl = "nordh.xyz/narKampen/dbFiles/Question.php";
+    private const string serverUrl = "nordh.xyz/narKampen/dbFiles/";
     string gameMode;
     int winAmount = -1;
 
@@ -312,25 +312,29 @@ public class OnlineDatabase : MonoBehaviour {
                 ogs = onlineGameObject.GetComponent<OnlineGameScript>();
                 gameId = currentGameId;
 
-                if (game.currentPlayer.Equals(game.userId)) {
+                if (game.currentPlayer.Equals(userId.ToString())) {
                     playerToAct = game.username;
                     ogs.CurrentPlayer = game.username;
                     ogs.addPlayer(game.username);
                     ogs.SetGameStatus("YOUR_TURN");
+                } else if (game.currentPlayer.Equals(game.userId)) {
+                    ogs.CurrentPlayer = game.username;
                 }
             } else {
                 ogs.addPlayer(game.username);
-                if (game.currentPlayer.Equals(game.userId)) {
+                if (game.currentPlayer.Equals(userId.ToString())) {
                     ogs.SetGameStatus("YOUR_TURN");
                     playerToAct = game.username;
                     ogs.CurrentPlayer = game.username;
                     ogs.addPlayer(game.username);
+                } else if (game.currentPlayer.Equals(game.userId)) {
+                    ogs.CurrentPlayer = game.username;
                 }
             }
             
             ogs.SetGameStatus(game.status);
             //ogs.CurrentPlayer = game.currentPlayer;
-            List<KeyValuePair<string, string>> playerInfos = GetGameInfo(gameId);
+            List<KeyValuePair<string, string>> playerInfos = GetGameInfo(gameId); // TODO, This is not good, too many db calls!
             if (game.status.Equals("PENDING")) {
                 string extraInfo = "";
                 foreach (KeyValuePair<string, string> s in playerInfos) {
@@ -700,7 +704,7 @@ public class OnlineDatabase : MonoBehaviour {
         form.AddField("f", "FindRandomPlayers");
 
         String response = CallOnlineDatabaseWithResponse("PlayerSearch.php", form);
-        
+        response = "{\"usernamesList\" :  " + response + " }";
         UserNames uNames = new UserNames();
 
         JsonUtility.FromJsonOverwrite(response, uNames);

Assets/Scripts/Login/Login.cs

@@ -26,7 +26,7 @@ public class Login : MonoBehaviour {
 
     private string Username;
     private string Password;
-    private string loginUrl = "http://narkampen.nordh.xyz/narKampen/dbFiles/Login.php?";
+    private string loginUrl = "http://nordh.xyz/narKampen/dbFiles/Login.php?";
     private Color errorColor;
     private EventSystem system;
 

Assets/Scripts/NewGameScene/InvitePanelScript.cs

@@ -118,8 +118,8 @@ public class InvitePanelScript : MonoBehaviour {
                 }
             }
             if (!skip) {
-                GameObject question = Instantiate(inviteSearchResultPrefab, new Vector2(0, 0), Quaternion.identity) as GameObject;
-                InviteSearchResult res = question.GetComponent<InviteSearchResult>();
+                GameObject invSearchRes = Instantiate(inviteSearchResultPrefab, new Vector2(0, 0), Quaternion.identity) as GameObject;
+                InviteSearchResult res = invSearchRes.GetComponent<InviteSearchResult>();
                 res.SetName(un.username);
                 res.SetId(un.id);
                 res.transform.SetParent(searchResultPanel.transform, false);

Assets/Scripts/NewGameScene/OnlineGameScript.cs

@@ -108,8 +108,6 @@ public class OnlineGameScript : MonoBehaviour {
         } else if ("INVITED".Equals(status)) {
             image.color = statusColors[4];
         } else if ("ACTIVE".Equals(status)) {
-            //Int32.TryParse(CurrentPlayer, out int currentPlayerId);
-            //if (currentPlayerId == Database.Instance.GetSignedInUser().Key) {
             if (CurrentPlayer != null && CurrentPlayer.Equals(Database.Instance.GetSignedInUser().Value)) {
                 image.color = statusColors[2];
             } else {