Start of settings scene

Assets/AnswerLineInfoScript.cs

@@ -26,7 +26,7 @@ public class AnswerLineInfoScript : MonoBehaviour
     private void Start() {
         nextPlayerButton.onClick.AddListener(ShowNextPlayerAnswerLine);
         prevPlayerButton.onClick.AddListener(ShowPrevPlayerAnswerLine);
-        currentPlayerShown = GameManagerScript.GetCurrentPlayer();
+        currentPlayerShown = Database.Instance.GetSignedInUser().Value;
         signedInName = Database.Instance.GetSignedInUser().Value;
         lockedQuestionsText.resizeTextMaxSize = unlockedQuestionsText.resizeTextMaxSize;
         gameManagerScript = gameManager.GetComponent<GameManagerScript>();
@@ -46,7 +46,7 @@ public class AnswerLineInfoScript : MonoBehaviour
     private void SetQuestionClickable() {
         List<KeyValuePair<string, int>> players = gameManagerScript.GetPlayers();
         if (gameManagerScript.GameStatus == null || !gameManagerScript.GameStatus.Equals("FINISHED")) {
-            if (gameManagerScript.GetGameMode().Equals("ONLINE")) {
+            if (gameManagerScript.GameMode.Equals("ONLINE")) {
                 if (players.Count > 1 && currentPlayerShown != null) {
                     if (GameManagerScript.GetCurrentPlayer().Equals(currentPlayerShown, StringComparison.InvariantCultureIgnoreCase)) {
                         newQuestion.GetComponent<NewQuestionCardController>().BackClickable = true;
@@ -74,9 +74,9 @@ public class AnswerLineInfoScript : MonoBehaviour
             nextPlayerButton.gameObject.SetActive(true);
             prevPlayerButton.gameObject.SetActive(true);
 
-            if (gameManagerScript.GetGameMode().Equals("Online") && currentPlayerShown == null) { // fungerar enbart vid online
+            if (gameManagerScript.GameMode.Equals("Online") && currentPlayerShown == null) { // fungerar enbart vid online
                 currentPlayerShown = signedInName;
-            } else if (gameManagerScript.GetGameMode().Equals("Local") && currentPlayerShown == null) {
+            } else if (gameManagerScript.GameMode.Equals("Local") && currentPlayerShown == null) {
                 currentPlayerShown = Database.Instance.GetCurrentPlayer(gameManagerScript.GameId,gameManagerScript.GameMode);
             }
 
@@ -206,18 +206,22 @@ public class AnswerLineInfoScript : MonoBehaviour
         ScrollViewScript scrollViewScript = scrollView.GetComponent<ScrollViewScript>();
         scrollViewScript.RemoveEverythingFromAnswerline();
         scrollViewScript.SetQuestionsInAnswerLine(questions);
-        if (gameManagerScript.GetGameMode().Equals("Online")) {
+        if (gameManagerScript.GameMode.Equals("Online")) {
             if (Database.Instance.GetSignedInUser().Value.Equals(currentPlayerShown, StringComparison.InvariantCultureIgnoreCase)) {
                 scrollViewScript.SetQuestionsFrosted(false);
             } else {
                 scrollViewScript.SetQuestionsFrosted(true);
             }
         } else  {
-            if (currentPlayerShown.Equals(Database.Instance.GetCurrentPlayer(gameManagerScript.GameId, gameManagerScript.GameMode))) {
+            if (currentPlayerShown.Equals(Database.Instance.GetCurrentPlayer(gameManagerScript.GameId, gameManagerScript.GameMode), StringComparison.InvariantCultureIgnoreCase)) {
                 scrollViewScript.SetQuestionsFrosted(false);
             } else {
                 scrollViewScript.SetQuestionsFrosted(true);
             }
         }
     }
+
+    public String getCurrentPlayerShown() {
+        return currentPlayerShown;
+    }
 }

Assets/Prefab/InviteSearchResult.prefab

@@ -83,8 +83,6 @@ MonoBehaviour:
   onValueChanged:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.Toggle+ToggleEvent, Unity.ugui, Version=1.0.0.0, Culture=neutral,
-      PublicKeyToken=null
   m_IsOn: 0
 --- !u!1 &263645073784785556
 GameObject:
@@ -120,8 +118,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -44.999966, y: 0}
-  m_SizeDelta: {x: -90, y: 30}
+  m_AnchoredPosition: {x: -44.99998, y: 0}
+  m_SizeDelta: {x: -90.00003, y: 30}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &263645073784785563
 CanvasRenderer:
@@ -146,11 +144,10 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
   m_RaycastTarget: 1
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, Unity.ugui,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_FontData:
     m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
     m_FontSize: 14
@@ -226,11 +223,10 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, Unity.ugui,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
@@ -304,11 +300,10 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 0.392}
   m_RaycastTarget: 1
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, Unity.ugui,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
@@ -393,11 +388,10 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, Unity.ugui,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 0
   m_PreserveAspect: 0

Assets/Scenes/NewGame.unity

@@ -1115,7 +1115,7 @@ MonoBehaviour:
   searchField: {fileID: 55366263}
   inviteSearchResultPrefab: {fileID: 263645073911821523, guid: dfb5e100c9a6c8c41a5021b533703fc1,
     type: 3}
-  searchResultPanel: {fileID: 2051797571}
+  searchResultPanel: {fileID: 1922274975}
   OnlineGameSettingsPanel: {fileID: 520705534}
   findRandomPlayerButton: {fileID: 143712429}
 --- !u!114 &97177672
@@ -2649,6 +2649,42 @@ MonoBehaviour:
           m_StringArgument: 
           m_BoolArgument: 0
         m_CallState: 2
+--- !u!1 &277504631
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 277504632}
+  m_Layer: 5
+  m_Name: Sliding Area
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &277504632
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 277504631}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 680225868}
+  m_Father: {fileID: 2011198547}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: -20, y: -20}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &318839169
 GameObject:
   m_ObjectHideFlags: 0
@@ -5154,6 +5190,80 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 380, y: 30}
   m_Pivot: {x: 0, y: 1}
+--- !u!1 &680225867
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 680225868}
+  - component: {fileID: 680225870}
+  - component: {fileID: 680225869}
+  m_Layer: 5
+  m_Name: Handle
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &680225868
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 680225867}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 277504632}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 20, y: 20}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &680225869
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 680225867}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &680225870
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 680225867}
+  m_CullTransparentMesh: 0
 --- !u!1 &693348041
 GameObject:
   m_ObjectHideFlags: 0
@@ -6776,7 +6886,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 1253787365}
-  - {fileID: 2051797572}
+  - {fileID: 1176778907}
   - {fileID: 143712427}
   - {fileID: 699978708}
   m_Father: {fileID: 1556559696}
@@ -9291,6 +9401,113 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1174788234}
   m_CullTransparentMesh: 0
+--- !u!1 &1176778906
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1176778907}
+  - component: {fileID: 1176778910}
+  - component: {fileID: 1176778909}
+  - component: {fileID: 1176778908}
+  m_Layer: 5
+  m_Name: Scroll View
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1176778907
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1176778906}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 1464050831}
+  - {fileID: 2011198547}
+  m_Father: {fileID: 857440324}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 0, y: -15}
+  m_SizeDelta: {x: 500, y: -90}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!114 &1176778908
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1176778906}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Content: {fileID: 1922274976}
+  m_Horizontal: 0
+  m_Vertical: 1
+  m_MovementType: 1
+  m_Elasticity: 0.1
+  m_Inertia: 1
+  m_DecelerationRate: 0.135
+  m_ScrollSensitivity: 1
+  m_Viewport: {fileID: 1464050831}
+  m_HorizontalScrollbar: {fileID: 0}
+  m_VerticalScrollbar: {fileID: 2011198548}
+  m_HorizontalScrollbarVisibility: 2
+  m_VerticalScrollbarVisibility: 2
+  m_HorizontalScrollbarSpacing: -3
+  m_VerticalScrollbarSpacing: -3
+  m_OnValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &1176778909
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1176778906}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.392}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1176778910
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1176778906}
+  m_CullTransparentMesh: 0
 --- !u!1 &1195782636
 GameObject:
   m_ObjectHideFlags: 0
@@ -10732,6 +10949,95 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1460213092}
   m_CullTransparentMesh: 0
+--- !u!1 &1464050830
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1464050831}
+  - component: {fileID: 1464050834}
+  - component: {fileID: 1464050833}
+  - component: {fileID: 1464050832}
+  m_Layer: 5
+  m_Name: Viewport
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1464050831
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1464050830}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 1922274976}
+  m_Father: {fileID: 1176778907}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: -17, y: 0}
+  m_Pivot: {x: 0, y: 1}
+--- !u!114 &1464050832
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1464050830}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 0
+--- !u!114 &1464050833
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1464050830}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1464050834
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1464050830}
+  m_CullTransparentMesh: 0
 --- !u!1 &1465066244
 GameObject:
   m_ObjectHideFlags: 0
@@ -12317,6 +12623,82 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1920606958}
   m_CullTransparentMesh: 0
+--- !u!1 &1922274975
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1922274976}
+  - component: {fileID: 1922274977}
+  - component: {fileID: 1922274978}
+  m_Layer: 5
+  m_Name: InviteDialogSearchResultPanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1922274976
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1922274975}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 1464050831}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 184}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1922274977
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1922274975}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
+--- !u!114 &1922274978
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1922274975}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 0
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 1
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 1
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
 --- !u!1 &1923582485
 GameObject:
   m_ObjectHideFlags: 0
@@ -13679,7 +14061,7 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1993590440}
   m_CullTransparentMesh: 0
---- !u!1 &2036472387
+--- !u!1 &2011198546
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -13687,42 +14069,92 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 2036472388}
-  - component: {fileID: 2036472390}
-  - component: {fileID: 2036472389}
+  - component: {fileID: 2011198547}
+  - component: {fileID: 2011198550}
+  - component: {fileID: 2011198549}
+  - component: {fileID: 2011198548}
   m_Layer: 5
-  m_Name: Image
+  m_Name: Scrollbar Vertical
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &2036472388
+--- !u!224 &2011198547
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2036472387}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_GameObject: {fileID: 2011198546}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 183928369}
-  m_RootOrder: 0
+  m_Children:
+  - {fileID: 277504632}
+  m_Father: {fileID: 1176778907}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &2036472389
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 20, y: -92.5}
+  m_SizeDelta: {x: 20, y: 0}
+  m_Pivot: {x: 1, y: 1}
+--- !u!114 &2011198548
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2036472387}
+  m_GameObject: {fileID: 2011198546}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 680225869}
+  m_HandleRect: {fileID: 680225868}
+  m_Direction: 2
+  m_Value: 1
+  m_Size: 0
+  m_NumberOfSteps: 0
+  m_OnValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &2011198549
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2011198546}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
@@ -13735,8 +14167,8 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: ede5977f3b939a746b54eadb3ce0dba6, type: 3}
-  m_Type: 0
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -13745,15 +14177,15 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!222 &2036472390
+--- !u!222 &2011198550
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2036472387}
+  m_GameObject: {fileID: 2011198546}
   m_CullTransparentMesh: 0
---- !u!1 &2051797571
+--- !u!1 &2036472387
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -13761,103 +14193,56 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 2051797572}
-  - component: {fileID: 2051797576}
-  - component: {fileID: 2051797575}
-  - component: {fileID: 2051797574}
-  - component: {fileID: 2051797573}
+  - component: {fileID: 2036472388}
+  - component: {fileID: 2036472390}
+  - component: {fileID: 2036472389}
   m_Layer: 5
-  m_Name: InviteDialogSearchResultPanel
+  m_Name: Image
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!224 &2051797572
+--- !u!224 &2036472388
 RectTransform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2051797571}
+  m_GameObject: {fileID: 2036472387}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 857440324}
-  m_RootOrder: 1
+  m_Father: {fileID: 183928369}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 0, y: -15}
-  m_SizeDelta: {x: 500, y: -90}
-  m_Pivot: {x: 0, y: 0.5}
---- !u!114 &2051797573
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2051797571}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Padding:
-    m_Left: 5
-    m_Right: 5
-    m_Top: 0
-    m_Bottom: 0
-  m_ChildAlignment: 0
-  m_Spacing: 5
-  m_ChildForceExpandWidth: 1
-  m_ChildForceExpandHeight: 0
-  m_ChildControlWidth: 1
-  m_ChildControlHeight: 0
-  m_ChildScaleWidth: 0
-  m_ChildScaleHeight: 0
---- !u!114 &2051797574
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2051797571}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreLayout: 0
-  m_MinWidth: -1
-  m_MinHeight: -1
-  m_PreferredWidth: -1
-  m_PreferredHeight: 200
-  m_FlexibleWidth: -1
-  m_FlexibleHeight: 1
-  m_LayoutPriority: 1
---- !u!114 &2051797575
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &2036472389
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2051797571}
+  m_GameObject: {fileID: 2036472387}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 0.392}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
-  m_Type: 1
+  m_Sprite: {fileID: 21300000, guid: ede5977f3b939a746b54eadb3ce0dba6, type: 3}
+  m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 4
@@ -13866,13 +14251,13 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
---- !u!222 &2051797576
+--- !u!222 &2036472390
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2051797571}
+  m_GameObject: {fileID: 2036472387}
   m_CullTransparentMesh: 0
 --- !u!1 &2088181013
 GameObject:

Assets/Scenes/User.unity

@@ -421,7 +421,7 @@ RectTransform:
   - {fileID: 506867441}
   - {fileID: 838024550}
   m_Father: {fileID: 1262297231}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -647,7 +647,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1262297231}
-  m_RootOrder: 6
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1354,7 +1354,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1262297231}
-  m_RootOrder: 0
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -1757,7 +1757,7 @@ RectTransform:
   - {fileID: 711762741}
   - {fileID: 797570565}
   m_Father: {fileID: 1262297231}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -2144,7 +2144,7 @@ RectTransform:
   m_Children:
   - {fileID: 1856687808}
   m_Father: {fileID: 1262297231}
-  m_RootOrder: 4
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -2498,7 +2498,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1262297231}
-  m_RootOrder: 7
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 0}
@@ -2661,7 +2661,6 @@ RectTransform:
   - {fileID: 1197443346}
   - {fileID: 1190930875}
   - {fileID: 27433607}
-  - {fileID: 1846551966}
   m_Father: {fileID: 1551309669}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -3021,6 +3020,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
+  - {fileID: 1846551966}
   - {fileID: 413862298}
   - {fileID: 2118721993}
   - {fileID: 39834637}
@@ -3585,7 +3585,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1262297231}
-  m_RootOrder: 5
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -3837,19 +3837,19 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1846551965}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 922987121}
-  m_Father: {fileID: 1172685348}
-  m_RootOrder: 9
+  m_Father: {fileID: 1262297231}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: -0.000011444, y: 430}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0, y: -5}
   m_SizeDelta: {x: 120, y: 30}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &1846551967
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -4504,7 +4504,7 @@ RectTransform:
   - {fileID: 251466684}
   - {fileID: 648284402}
   m_Father: {fileID: 1262297231}
-  m_RootOrder: 1
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}

Assets/Scenes/narKampen.unity

@@ -1304,6 +1304,9 @@ MonoBehaviour:
   statsValues: {fileID: 0}
   statsLinePrefab: {fileID: 4647862445024647967, guid: 534976da5d7fe5d4bb2528ea394a0258,
     type: 3}
+  gameManager: {fileID: 225506176}
+  answerLine: {fileID: 189632753}
+  answerLineInfo: {fileID: 210243973}
 --- !u!114 &432797767
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2633,11 +2636,11 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_IgnoreLayout: 0
   m_MinWidth: -1
-  m_MinHeight: 120
+  m_MinHeight: -1
   m_PreferredWidth: -1
   m_PreferredHeight: -1
   m_FlexibleWidth: -1
-  m_FlexibleHeight: 1
+  m_FlexibleHeight: 100
   m_LayoutPriority: 1
 --- !u!1 &1259553346
 GameObject:
@@ -2943,7 +2946,7 @@ MonoBehaviour:
   m_PreferredWidth: -1
   m_PreferredHeight: -1
   m_FlexibleWidth: -1
-  m_FlexibleHeight: 1
+  m_FlexibleHeight: 50
   m_LayoutPriority: 1
 --- !u!114 &1283900513
 MonoBehaviour:
@@ -3067,7 +3070,7 @@ MonoBehaviour:
   m_ChildAlignment: 0
   m_Spacing: 5
   m_ChildForceExpandWidth: 1
-  m_ChildForceExpandHeight: 1
+  m_ChildForceExpandHeight: 0
   m_ChildControlWidth: 1
   m_ChildControlHeight: 1
   m_ChildScaleWidth: 0

Assets/Scripts/Database/Database.cs

@@ -336,6 +336,12 @@ public class Database : MonoBehaviour {
         return games;
     }
 
+    internal void IncreasePlayerRound(int gameId, string currentPlayer) {
+        WWWForm form = new WWWForm();
+        form.AddField("player",currentPlayer);
+        form.AddField("gameId", gameId);
+    }
+
     internal void SetQuestionsLost(int gameId, string playerName, int questionsLost) {
 
         string sql = "UPDATE localGamePlayers SET questionsLost = questionsLost + " + questionsLost + " WHERE gameId = " + gameId + " AND playerId = (SELECT id FROM localUsers WHERE  name = '" + playerName + "')";

Assets/Scripts/GameManagerScript.cs

@@ -66,7 +66,7 @@ public class GameManagerScript : MonoBehaviour {
         }
         
         if (SceneManager.GetActiveScene().name.Equals("narKampen")) {
-            currentPlayer = Database.Instance.GetCurrentPlayer(GameId, GetGameMode());
+            currentPlayer = Database.Instance.GetCurrentPlayer(GameId, GameMode);
         }
     }
 
@@ -245,11 +245,15 @@ public class GameManagerScript : MonoBehaviour {
         }
         scrollViewScript.SetAllQuestionsLocked(true);
         scrollViewScript.RemoveEverythingFromAnswerline();
-        NewQuestionCard.GetComponent<NewQuestionCardController>().GenerateNewQuestion(); // Borde inte behövas
         NextPlayer();
     }
 
     private void NextPlayer() {
+        Database.Instance.IncreasePlayerRound(GameId, currentPlayer);
+        if (GameMode.Equals("Online")) {
+            statsScript.IncreaseRoundValue();
+        }
+
         for (int i = 0; i < players.Count; i++) {
             if (players[i].Key.Equals(currentPlayer, StringComparison.InvariantCultureIgnoreCase)) {
                 if (i + 1 < players.Count) {
@@ -257,7 +261,9 @@ public class GameManagerScript : MonoBehaviour {
                     break;
                 } else {
                     currentPlayer = players[0].Key;
-                    statsScript.IncreaseRoundValue();
+                    if (GameMode.Equals("Local")) {
+                        statsScript.IncreaseRoundValue();
+                    }
                     break;
                 }
             }
@@ -269,38 +275,29 @@ public class GameManagerScript : MonoBehaviour {
         dialog.SetMessage(String.Format(message, currentPlayer));
         dialog.SetOnAccept(LocalizationManager.Instance.GetText("OK"), () => {
             scrollViewScript.RemoveEverythingFromAnswerline();
-            string gameMode = GetGameMode();
             List<NewQuestionData> questions = new List<NewQuestionData>();
-            if (gameMode.Equals("Online")) {
+            if (GameMode.Equals("Online")) {
                 questions = Database.Instance.GetPlayerQuestions(GameId, Database.Instance.GetSignedInUser().Value, gameMode);
             } else {
                 questions = Database.Instance.GetPlayerQuestions(GameId, currentPlayer, gameMode);
             }
             scrollViewScript.SetQuestionsInAnswerLine(questions);
 
-            statsScript.SetQuestionsLost(Database.Instance.GetQuestionsLost(GameId, currentPlayer, GetGameMode()));
+            statsScript.SetQuestionsLost(Database.Instance.GetQuestionsLost(GameId, currentPlayer, GameMode));
 
             statsScript.MakeBold(currentPlayer);
-            Database.Instance.SetCurrentPlayer(GameId, currentPlayer, GetGameMode());
+            Database.Instance.SetCurrentPlayer(GameId, currentPlayer, GameMode);
             InformationPanelScript ips = GameObject.Find("InformationPanel").GetComponent<InformationPanelScript>();
 
             if (GameMode.Equals("Online")) {
                 OnlineDatabase.Instance.SendNextPlayerMessage(GameId, currentPlayer);
             }
-
             dialog.Hide();
         });
         dialog.SetOnDecline("", () => dialog.Hide());
         dialog.Show();
     }
 
-    public string GetGameMode() {
-        if (gameMode == null) {
-            gameMode = PlayerPrefs.GetString("GameMode");
-        }
-        return gameMode;
-    }
-
     public static string GetCurrentPlayer() {
         return currentPlayer;
     }

Assets/Scripts/MainGame/NewQuestionCardController.cs

@@ -82,8 +82,7 @@ public class NewQuestionCardController : MonoBehaviour, IPointerClickHandler {
 
         resetPosition();
         ShowBackside();
-        string gameMode = gameManager.GetComponent<GameManagerScript>().GetGameMode();
-        if (gameMode.Equals("Online")) {
+        if (gameManager.GetComponent<GameManagerScript>().GameMode.Equals("Online")) {
             if (currentPlayer.Equals(SignedInUser.Value, StringComparison.InvariantCultureIgnoreCase)) {
                 BackClickable = true;
             } else {

Assets/Scripts/MainGame/StatsScript.cs

@@ -14,28 +14,41 @@ public class StatsScript : MonoBehaviour {
 
     private string roundText;
     private string questionsLostText;
-    GameManagerScript gms;
     private string gameMode;
+    private string currenPlayer;
+    [SerializeField] GameObject gameManager;
+    [SerializeField] GameObject answerLine;
+    [SerializeField] GameObject answerLineInfo;
+    GameManagerScript gameManagerScript;
+    AnswerLineInfoScript answerLineInfoScript;
+    ScrollViewScript svc;
 
     private void Start() {
-        gms = GameObject.Find("GameManager").GetComponent<GameManagerScript>();
+        gameManagerScript = gameManager.GetComponent<GameManagerScript>();
+        answerLineInfoScript = answerLineInfo.GetComponent<AnswerLineInfoScript>();
+        svc = answerLine.transform.parent.parent.GetComponent<ScrollViewScript>();
         roundText = LocalizationManager.Instance.GetText("ROUND");
         questionsLostText = LocalizationManager.Instance.GetText("QUESTIONS_LOST");
+        currenPlayer = GameManagerScript.GetCurrentPlayer();
         CreateStandardStats();
-        AddPlayersToStats(Database.Instance.GetPlayersForGame(gms.GameId, GetGameMode()));
+        AddPlayersToStats(Database.Instance.GetPlayersForGame(gameManagerScript.GameId, gameManagerScript.GameMode));
     }
 
-    private string GetGameMode() {
-        if (gameMode == null) {
-            gameMode = PlayerPrefs.GetString("GameMode");
-        }
-        return gameMode;
+    void Update()
+    {
+        UpdatePlayerAnswer();
+    }
+
+    private void UpdatePlayerAnswer() {
+        String currentPlayerShown = answerLineInfoScript.getCurrentPlayerShown();
+        int answerCount = svc.GetQuestionIdsInAnswerLine().Count;
+        SetQuestionsInAnswerLine(currentPlayerShown, answerCount);
     }
 
     private void CreateStandardStats() {
         StatsLine round = CreateStatLine();
         round.SetStatName(roundText);
-        int roundValue = Database.Instance.GetRoundValue(gms.GameId, GetGameMode());
+        int roundValue = Database.Instance.GetRoundValue(gameManagerScript.GameId, gameManagerScript.GameMode);
 
         round.SetLocalizationKey("ROUND");
 
@@ -87,16 +100,12 @@ public class StatsScript : MonoBehaviour {
                 Int32.TryParse(sl.GetValue(), out int round);
                 round++;
                 sl.SetStatValue(round);
-                Database.Instance.SetRoundValue(gms.GameId, round, GetGameMode());
+                Database.Instance.SetRoundValue(gameManagerScript.GameId, round, gameManagerScript.GameMode);
                 break;
             }
         }
     }
 
-    public int GetRound() {
-        return statLines.Find(s => s.GetName().Equals(roundText)).GetIntValue();
-    }
-
     public void MakeBold(string playerName) {
         foreach (StatsLine sl in statLines) {
             if (sl.GetName().Equals(playerName)) {
@@ -120,8 +129,4 @@ public class StatsScript : MonoBehaviour {
         StatsLine sl = statLines.Find(s => s.GetName().Equals(questionsLostText));
         sl.SetStatValue(sl.GetIntValue() + value);
     }
-
-    public int GetQuestionsLost() {
-        return statLines.Find(s => s.GetName().Equals(questionsLostText)).GetIntValue();
-    }
 }

Assets/Scripts/MainMenu.cs

@@ -24,6 +24,14 @@ public class MainMenu : MonoBehaviour {
     private void Start() {
         startNewGameButton.onClick.AddListener(StartNewGameAction);
         quitButton.onClick.AddListener(() => { Application.Quit(); });
+        
+        GetGames();
+        UpdateOnlineGamesLists();
+        if (lastPlayedLocal > lastPlayedOnline) {
+            localGamesPanelTitle.GetComponent<GamesScrollController>().expandThis(localGamesPanelTitle.name);
+        } else {
+            onlineGamesPanelTitle.GetComponent<GamesScrollController>().expandThis(onlineGamesPanelTitle.name);
+        }
     }
 
 

Assets/Scripts/NewGameScene/InvitePanelScript.cs

@@ -117,12 +117,14 @@ public class InvitePanelScript : MonoBehaviour {
                     break;
                 }
             }
+            int resCount = 0;
             if (!skip) {
                 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);
+                res.transform.SetSiblingIndex(resCount++);
             }
         }
     }

Assets/Scripts/PrivacyPolicy.cs

@@ -7,7 +7,7 @@ using UnityEngine.UI;
 public class PrivacyPolicy : MonoBehaviour
 {
     Button pp;
-    private string privacyPolicyLink = "http://narkampen.nordh.xyz/narKampen/PrivacyPolicy/privacy_policy.html";
+    private string privacyPolicyLink = "http://nordh.xyz/narKampen/privacy_policy.html";
 
     // Start is called before the first frame update
     void Start()

Assets/Translations/ENGLISH.xml

@@ -64,7 +64,7 @@
   <text key="INVITE_DIALOG_SEARCH_FIELD_PLACEHOLDER">Search players</text>
   <text key="INVITE_DIALOG_NAME_DIALOG_TEXT">Playername</text>
   <text key="INVITE_DIALOG_INVITE_TEXT">Invite</text>
-  <text key="INVITE_PANEL_DIALOG_RANDOM_BUTTON">Find random players</text>
+  <text key="INVITE_PANEL_DIALOG_RANDOM_BUTTON">Random players</text>
   <text key="INVITE_PANEL_DIALOG_BUTTON">Done</text>
   <text key="INVITE_COUNT_TEXT">Invite {0} players</text>
   <text key="INVITED_PLAYERS_TEXT">players invited</text>

Assets/Translations/SWEDISH.xml

@@ -65,7 +65,7 @@
   <text key="INVITE_DIALOG_SEARCH_FIELD_PLACEHOLDER">Sök spelare</text>
   <text key="INVITE_DIALOG_NAME_DIALOG_TEXT">Spelarnamn</text>
   <text key="INVITE_DIALOG_INVITE_TEXT">Bjud in</text>
-  <text key="INVITE_PANEL_DIALOG_RANDOM_BUTTON">Sök slumpade spelare</text>
+  <text key="INVITE_PANEL_DIALOG_RANDOM_BUTTON">Slumpade spelare</text>
   <text key="INVITE_PANEL_DIALOG_BUTTON">Färdig</text>
   <text key="INVITE_COUNT_TEXT">Bjud in {0} spelare</text>
   <text key="INVITED_PLAYERS_TEXT">spelare inbjudna</text>

dbFiles/OnlineGames.php

@@ -179,6 +179,10 @@
 		if (!$result) {
 			echo "Failed to update current player for game with id $gameId - error: " . $conn->error;
 		}
+	} else if ($callFunction === "SetPlayerRound") {
+		$player = $_POST['player'];
+		$sql = "UPDATE gamePlayers SET playerRound = playerRound + 1 WHERE playerId = (Select id FROM users WHERE username = '" . $player . "' AND gameId = $gameId";
+		$conn->query($sql);
 	} else if ($callFunction === "GetRound") {
 		$sql = "SELECT round FROM game WHERE id = $gameId";
 		$result = $conn->query($sql);