0.53 fix saker

Assets/CategorySelection.cs

@@ -1,4 +1,5 @@
-using System.Collections;
+using System;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
@@ -8,10 +9,21 @@ public class CategorySelection : MonoBehaviour
 
     [SerializeField] Text CategoryNameText;
     [SerializeField] Toggle selectionToggle;
+    private int questionCount;
+
+    private Boolean selected;
+
+    public int QuestionCount { get => questionCount; set => questionCount = value; }
+    public bool Selected { get => selected; set => selected = value; }
+
     // Start is called before the first frame update
     void Start()
     {
-        
+        selectionToggle.onValueChanged.AddListener(SelectionChanged);
+    }
+
+    private void SelectionChanged(bool arg0) {
+        Selected = arg0;
     }
 
     // Update is called once per frame

Assets/Prefab/LocalGame.prefab

@@ -60,6 +60,7 @@ 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: []
@@ -136,6 +137,7 @@ 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: []
@@ -234,6 +236,7 @@ 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: []
@@ -280,10 +283,10 @@ RectTransform:
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
-  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0, y: 0.5}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1679201117906561037
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -299,9 +302,9 @@ MonoBehaviour:
   m_Padding:
     m_Left: 0
     m_Right: 0
-    m_Top: 0
-    m_Bottom: 0
-  m_ChildAlignment: 0
+    m_Top: 2
+    m_Bottom: 2
+  m_ChildAlignment: 4
   m_Spacing: 2
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 0
@@ -321,7 +324,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_HorizontalFit: 2
+  m_HorizontalFit: 0
   m_VerticalFit: 2
 --- !u!1 &2075312345835932469
 GameObject:
@@ -386,6 +389,7 @@ 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: []
@@ -487,6 +491,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 0.6981132, g: 0.121840514, b: 0.121840514, a: 0.6627451}
   m_RaycastTarget: 1
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -626,6 +631,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 0.033775367, g: 0.6509434, b: 0.051546283, a: 0.7254902}
   m_RaycastTarget: 1
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -796,6 +802,7 @@ 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: []
@@ -892,6 +899,7 @@ 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: []
@@ -994,6 +1002,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 0.9411765}
   m_RaycastTarget: 1
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -1094,6 +1103,7 @@ 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: []
@@ -1210,6 +1220,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_RaycastTarget: 1
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -1348,6 +1359,7 @@ 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: []
@@ -1425,6 +1437,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 0.19607845, g: 0.19607845, b: 0.19607845, a: 1}
   m_RaycastTarget: 1
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -1504,6 +1517,7 @@ 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: []
@@ -1616,6 +1630,7 @@ 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: []
@@ -1729,6 +1744,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 0.9411765}
   m_RaycastTarget: 1
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -1886,6 +1902,7 @@ 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: []
@@ -1984,6 +2001,7 @@ 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: []
@@ -2063,6 +2081,7 @@ 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: []
@@ -2162,7 +2181,7 @@ RectTransform:
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0, y: 0.5}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &5739117512803278509
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2199,6 +2218,7 @@ 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: []
@@ -2275,6 +2295,7 @@ MonoBehaviour:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 0.9411765}
   m_RaycastTarget: 1
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -2385,6 +2406,7 @@ 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: []

Assets/Prefab/OnlineGamePlayerInfo.prefab

@@ -869,7 +869,7 @@ MonoBehaviour:
     m_FontStyle: 0
     m_BestFit: 1
     m_MinSize: 10
-    m_MaxSize: 28
+    m_MaxSize: 18
     m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1

Assets/Prefab/PlayerInfo.prefab

@@ -32,15 +32,15 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 3051462764174508475}
-  - {fileID: 6044339896983845255}
+  - {fileID: 2113870004414737959}
+  - {fileID: 2265581614379094288}
   m_Father: {fileID: 0}
   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.000015258789, y: 0}
-  m_SizeDelta: {x: 125, y: 20}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8355837596623320845
 CanvasRenderer:
@@ -59,17 +59,16 @@ MonoBehaviour:
   m_GameObject: {fileID: 1668827557623854269}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  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: 0.12941177}
   m_RaycastTarget: 1
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
   m_Type: 1
   m_PreserveAspect: 0
@@ -79,6 +78,7 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!114 &487875939721856792
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -88,14 +88,14 @@ MonoBehaviour:
   m_GameObject: {fileID: 1668827557623854269}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_IgnoreLayout: 0
   m_MinWidth: -1
   m_MinHeight: 20
   m_PreferredWidth: -1
-  m_PreferredHeight: 20
+  m_PreferredHeight: -1
   m_FlexibleWidth: 1
   m_FlexibleHeight: 0
   m_LayoutPriority: 1
@@ -122,7 +122,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 1668827557623854269}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Padding:
@@ -131,7 +131,7 @@ MonoBehaviour:
     m_Top: 0
     m_Bottom: 0
   m_ChildAlignment: 0
-  m_Spacing: 2
+  m_Spacing: 10
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 0
   m_ChildControlWidth: 1
@@ -149,7 +149,6 @@ GameObject:
   - component: {fileID: 3051462764174508475}
   - component: {fileID: 2950324220866648863}
   - component: {fileID: 8502294024371270356}
-  - component: {fileID: 5020330713745931875}
   m_Layer: 5
   m_Name: PlayerName
   m_TagString: Untagged
@@ -164,18 +163,18 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2189208103802656590}
-  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: []
-  m_Father: {fileID: 8182258568001242865}
+  m_Father: {fileID: 2113870004414737959}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 16}
-  m_Pivot: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 5, y: 0}
+  m_SizeDelta: {x: -10, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2950324220866648863
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -193,17 +192,16 @@ MonoBehaviour:
   m_GameObject: {fileID: 2189208103802656590}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   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, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_FontData:
     m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
     m_FontSize: 14
@@ -211,33 +209,13 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
-    m_Alignment: 0
+    m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: New Text
---- !u!114 &5020330713745931875
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2189208103802656590}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreLayout: 0
-  m_MinWidth: 50
-  m_MinHeight: -1
-  m_PreferredWidth: 100
-  m_PreferredHeight: -1
-  m_FlexibleWidth: 1
-  m_FlexibleHeight: -1
-  m_LayoutPriority: 1
 --- !u!1 &5650528250997615816
 GameObject:
   m_ObjectHideFlags: 0
@@ -249,7 +227,6 @@ GameObject:
   - component: {fileID: 6044339896983845255}
   - component: {fileID: 8850173315071199892}
   - component: {fileID: 8380995092262412217}
-  - component: {fileID: 6355233126203097465}
   m_Layer: 5
   m_Name: PlayerPoints
   m_TagString: Untagged
@@ -264,18 +241,18 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5650528250997615816}
-  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: []
-  m_Father: {fileID: 8182258568001242865}
-  m_RootOrder: 1
+  m_Father: {fileID: 2265581614379094288}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 16}
-  m_Pivot: {x: 1, y: 0.5}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8850173315071199892
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -293,17 +270,16 @@ MonoBehaviour:
   m_GameObject: {fileID: 5650528250997615816}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   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, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_FontData:
     m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
     m_FontSize: 14
@@ -311,29 +287,201 @@ MonoBehaviour:
     m_BestFit: 0
     m_MinSize: 10
     m_MaxSize: 40
-    m_Alignment: 0
+    m_Alignment: 4
     m_AlignByGeometry: 0
     m_RichText: 1
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: New Text
---- !u!114 &6355233126203097465
+--- !u!1 &6142008753517401199
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2113870004414737959}
+  - component: {fileID: 653781257893925430}
+  - component: {fileID: 2826211507665036786}
+  - component: {fileID: 7355410550280828792}
+  m_Layer: 5
+  m_Name: NamePanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2113870004414737959
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6142008753517401199}
+  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: 3051462764174508475}
+  m_Father: {fileID: 8182258568001242865}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 20}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!222 &653781257893925430
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6142008753517401199}
+  m_CullTransparentMesh: 0
+--- !u!114 &2826211507665036786
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5650528250997615816}
+  m_GameObject: {fileID: 6142008753517401199}
+  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}
+  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!114 &7355410550280828792
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6142008753517401199}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 0
+  m_MinWidth: 100
+  m_MinHeight: -1
+  m_PreferredWidth: -1
+  m_PreferredHeight: -1
+  m_FlexibleWidth: 1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
+--- !u!1 &8278852657622911528
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2265581614379094288}
+  - component: {fileID: 6280379646137699332}
+  - component: {fileID: 9149763683646833417}
+  - component: {fileID: 2397701629160257509}
+  m_Layer: 5
+  m_Name: PointsPanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2265581614379094288
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8278852657622911528}
+  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: 6044339896983845255}
+  m_Father: {fileID: 8182258568001242865}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 20}
+  m_Pivot: {x: 1, y: 0.5}
+--- !u!222 &6280379646137699332
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8278852657622911528}
+  m_CullTransparentMesh: 0
+--- !u!114 &9149763683646833417
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8278852657622911528}
+  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}
+  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!114 &2397701629160257509
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8278852657622911528}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_IgnoreLayout: 0
-  m_MinWidth: 0
+  m_MinWidth: 25
   m_MinHeight: -1
-  m_PreferredWidth: 25
+  m_PreferredWidth: 50
   m_PreferredHeight: -1
   m_FlexibleWidth: 1
   m_FlexibleHeight: -1

Assets/Scenes/MainMenu.unity

@@ -1196,8 +1196,8 @@ MonoBehaviour:
   m_Padding:
     m_Left: 5
     m_Right: 5
-    m_Top: 0
-    m_Bottom: 0
+    m_Top: 3
+    m_Bottom: 3
   m_ChildAlignment: 0
   m_Spacing: 3
   m_ChildForceExpandWidth: 1
@@ -2854,6 +2854,105 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 769825954}
   m_CullTransparentMesh: 0
+--- !u!1 &774651840
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 774651841}
+  - component: {fileID: 774651844}
+  - component: {fileID: 774651843}
+  - component: {fileID: 774651842}
+  m_Layer: 5
+  m_Name: GameIdText
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &774651841
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 774651840}
+  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: 1467582971}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 50, y: 30}
+  m_Pivot: {x: 0, y: 0.5}
+--- !u!114 &774651842
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 774651840}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 1
+  m_MinWidth: -1
+  m_MinHeight: -1
+  m_PreferredWidth: -1
+  m_PreferredHeight: -1
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
+--- !u!114 &774651843
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 774651840}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  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_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: New Text
+--- !u!222 &774651844
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 774651840}
+  m_CullTransparentMesh: 0
 --- !u!1 &777178505
 GameObject:
   m_ObjectHideFlags: 0
@@ -2906,8 +3005,8 @@ MonoBehaviour:
   m_Padding:
     m_Left: 5
     m_Right: 5
-    m_Top: 0
-    m_Bottom: 0
+    m_Top: 3
+    m_Bottom: 3
   m_ChildAlignment: 0
   m_Spacing: 3
   m_ChildForceExpandWidth: 1
@@ -2963,7 +3062,7 @@ RectTransform:
   m_Children:
   - {fileID: 1306049390}
   m_Father: {fileID: 1467582971}
-  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}
@@ -3075,9 +3174,10 @@ GameObject:
   - component: {fileID: 861639823}
   - component: {fileID: 861639822}
   - component: {fileID: 861639821}
+  - component: {fileID: 861639824}
   m_Layer: 5
   m_Name: LocalGames
-  m_TagString: Untagged
+  m_TagString: GamesPanelContent
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -3170,6 +3270,18 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+--- !u!225 &861639824
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 861639819}
+  m_Enabled: 1
+  m_Alpha: 1
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!1 &869200448
 GameObject:
   m_ObjectHideFlags: 0
@@ -3792,8 +3904,8 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 761483707}
   m_HandleRect: {fileID: 761483706}
   m_Direction: 2
-  m_Value: 0
-  m_Size: 1
+  m_Value: 0.9999816
+  m_Size: 0
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -4254,8 +4366,8 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1273003561}
-  - component: {fileID: 1273003563}
   - component: {fileID: 1273003562}
+  - component: {fileID: 1273003563}
   m_Layer: 5
   m_Name: FinishedGamesList
   m_TagString: Untagged
@@ -4278,10 +4390,10 @@ RectTransform:
   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.0000076293945}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: -0.0000038146973}
   m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0, y: 1}
+  m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &1273003562
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -4294,7 +4406,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_HorizontalFit: 2
+  m_HorizontalFit: 0
   m_VerticalFit: 2
 --- !u!114 &1273003563
 MonoBehaviour:
@@ -4309,16 +4421,16 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Padding:
-    m_Left: 0
-    m_Right: 0
-    m_Top: 10
-    m_Bottom: 10
+    m_Left: 5
+    m_Right: 5
+    m_Top: 3
+    m_Bottom: 3
   m_ChildAlignment: 0
-  m_Spacing: 2
+  m_Spacing: 3
   m_ChildForceExpandWidth: 1
-  m_ChildForceExpandHeight: 0
+  m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 1
-  m_ChildControlHeight: 0
+  m_ChildControlHeight: 1
   m_ChildScaleWidth: 0
   m_ChildScaleHeight: 0
 --- !u!1 &1291769276
@@ -4489,9 +4601,10 @@ GameObject:
   - component: {fileID: 1309186742}
   - component: {fileID: 1309186741}
   - component: {fileID: 1309186740}
+  - component: {fileID: 1309186738}
   m_Layer: 5
   m_Name: OnlineGames
-  m_TagString: Untagged
+  m_TagString: GamesPanelContent
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -4517,6 +4630,18 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: -15}
   m_SizeDelta: {x: 0, y: -30}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!225 &1309186738
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1309186736}
+  m_Enabled: 1
+  m_Alpha: 1
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!114 &1309186740
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -4870,9 +4995,10 @@ GameObject:
   - component: {fileID: 1442137826}
   - component: {fileID: 1442137825}
   - component: {fileID: 1442137824}
+  - component: {fileID: 1442137823}
   m_Layer: 5
   m_Name: FinishedGames
-  m_TagString: Untagged
+  m_TagString: GamesPanelContent
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
@@ -4894,10 +5020,22 @@ RectTransform:
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: -15}
+  m_SizeDelta: {x: 0, y: -30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!225 &1442137823
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1442137821}
+  m_Enabled: 1
+  m_Alpha: 1
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!114 &1442137824
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -4995,6 +5133,7 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
+  - {fileID: 774651841}
   - {fileID: 1949707973}
   - {fileID: 821322038}
   m_Father: {fileID: 1918349358}
@@ -5373,8 +5512,8 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 359479520}
   m_HandleRect: {fileID: 359479519}
   m_Direction: 2
-  m_Value: 0
-  m_Size: 1
+  m_Value: 0.99997556
+  m_Size: 0.16665691
   m_NumberOfSteps: 0
   m_OnValueChanged:
     m_PersistentCalls:
@@ -6473,7 +6612,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 974731453}
   m_HandleRect: {fileID: 974731452}
   m_Direction: 2
-  m_Value: 1.0000002
+  m_Value: 1.0000006
   m_Size: 0
   m_NumberOfSteps: 0
   m_OnValueChanged:
@@ -6698,6 +6837,7 @@ MonoBehaviour:
   answerTimeValueText: {fileID: 447160652}
   questionsToWinValueText: {fileID: 732727041}
   DaysToStartRoundValueText: {fileID: 1983562793}
+  GameIdText: {fileID: 774651843}
 --- !u!114 &1918349361
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -6979,7 +7119,7 @@ RectTransform:
   m_Children:
   - {fileID: 934498987}
   m_Father: {fileID: 1467582971}
-  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}

Assets/Scenes/NewGame.unity

@@ -3817,8 +3817,8 @@ RectTransform:
   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: -60}
+  m_AnchoredPosition: {x: 0, y: 15}
+  m_SizeDelta: {x: 0, y: -90}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &511402649
 MonoBehaviour:
@@ -6597,6 +6597,81 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 827356634}
   m_CullTransparentMesh: 0
+--- !u!1 &833363804
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 833363805}
+  - component: {fileID: 833363807}
+  - component: {fileID: 833363806}
+  m_Layer: 5
+  m_Name: TotalsPanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &833363805
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 833363804}
+  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: 2140736808}
+  m_Father: {fileID: 1272715544}
+  m_RootOrder: 2
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: 0, y: 30}
+  m_SizeDelta: {x: 0, y: 30}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!114 &833363806
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 833363804}
+  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 &833363807
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 833363804}
+  m_CullTransparentMesh: 0
 --- !u!1 &846943916
 GameObject:
   m_ObjectHideFlags: 0
@@ -9499,6 +9574,7 @@ RectTransform:
   m_Children:
   - {fileID: 21398510}
   - {fileID: 511402648}
+  - {fileID: 833363805}
   - {fileID: 1530473169}
   m_Father: {fileID: 1068393617}
   m_RootOrder: 1
@@ -10460,6 +10536,7 @@ MonoBehaviour:
     type: 3}
   SelectCategoryPanel: {fileID: 728032754}
   ContentPanel: {fileID: 362991290}
+  TotalsText: {fileID: 2140736810}
 --- !u!114 &1437860097
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -10840,7 +10917,7 @@ RectTransform:
   m_Children:
   - {fileID: 1355205733}
   m_Father: {fileID: 1272715544}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
@@ -13428,6 +13505,7 @@ MonoBehaviour:
   answerTimeValueText: {fileID: 0}
   questionsToWinValueText: {fileID: 0}
   DaysToStartRoundValueText: {fileID: 0}
+  GameIdText: {fileID: 0}
 --- !u!225 &1990535486
 CanvasGroup:
   m_ObjectHideFlags: 0
@@ -14597,3 +14675,95 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2140195008}
   m_CullTransparentMesh: 0
+--- !u!1 &2140736807
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2140736808}
+  - component: {fileID: 2140736811}
+  - component: {fileID: 2140736810}
+  - component: {fileID: 2140736809}
+  m_Layer: 5
+  m_Name: TotalsText
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2140736808
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2140736807}
+  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: 833363805}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &2140736809
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2140736807}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 539bd096d40d9934d916d02e161ee660, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  key: SELECT_CATEGORIES_TOTALS
+--- !u!114 &2140736810
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2140736807}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  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_FontData:
+    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 14
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: New Text
+--- !u!222 &2140736811
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2140736807}
+  m_CullTransparentMesh: 0

Assets/Scripts/Database/Database.cs

@@ -214,7 +214,10 @@ public class Database : MonoBehaviour {
         if (gameMode.Equals("Online")) {
             OnlineDatabase.Instance.SetGameFinished(gameId, gameMode);
         } else {
-
+            string sql = "UPDATE game SET finishedDate = DATETIME() WHERE id = " + gameId;
+            IDbCommand cmd = GetConnection();
+            cmd.CommandText = sql;
+            cmd.ExecuteNonQuery();
         }
     }
 
@@ -299,8 +302,6 @@ public class Database : MonoBehaviour {
         string currentPlayerName = "";
         int currentPoints = 0;
         while (reader.Read()) {
-
-
             if (currentGame != reader.GetInt32(0)) {
                 localGame = Instantiate(prefab, new Vector2(0, 0), Quaternion.identity) as GameObject;
                 lgs = localGame.GetComponent<LocalGameScript>();

Assets/Scripts/Database/OnlineDatabase.cs

@@ -207,10 +207,10 @@ public class OnlineDatabase : MonoBehaviour {
 
     public string QuestionString { get => questionString; set => questionString = value; }
 
-    internal void SendGameOverMessage(int gameId, List<KeyValuePair<string, int>> players, string currentPlayer)
+    internal void SendGameOverMessage(int gameId, List<KeyValuePair<string, int>> players, string currentPlayer, int rounds)
     {
-        string message = "Den som van var " + currentPlayer + "!"; //TODO
-        string title = "Spelet slut!";                              //TODO 
+        string message = String.Format(LocalizationManager.Instance.GetText("GAME_OVER_MESSAGE"), currentPlayer, rounds.ToString());
+        string title = LocalizationManager.Instance.GetText("GAME_OVER_TITLE"); 
 
         WWWForm form = new WWWForm();
         form.AddField("gameId", gameId);
@@ -302,11 +302,12 @@ public class OnlineDatabase : MonoBehaviour {
         List<OnlineGameScript> games = new List<OnlineGameScript>();
         int gameId = -1;
 
+    OnlineGame prevGame = null;
         foreach (OnlineGame game in og.onlineGamesList) {
             Int32.TryParse(game.id, out int currentGameId);
             if (gameId != currentGameId) { // Spel ej i listan
                 if (ogs != null) { // lägg till spel i listan, inte första gången
-                    SetGlobalGameInfo(userName, ogs, gameId, game);
+                    SetGlobalGameInfo(userName, ogs, gameId, prevGame);
                     if (game.currentPlayer.Equals(Database.Instance.GetSignedInUser().Value, StringComparison.InvariantCultureIgnoreCase)) {
                         ogs.SetGameStatus("YOUR_TURN");
                     }
@@ -318,9 +319,9 @@ public class OnlineDatabase : MonoBehaviour {
 
                 if (game.currentPlayer.Equals(game.userId)) { // om första raden i spelinfo är annan spelare och det är dennes tur att agera
                     ogs.CurrentPlayer = game.username;
-                    ogs.addPlayer(game.username);
-                    ogs.addPlayerInfo(game.username, game.playerStatus);
                 }
+                ogs.addPlayer(game.username);
+                ogs.addPlayerInfo(game.username, game.playerStatus);
             } else { // Spel redan i listan, fyll på med info
                 ogs.addPlayer(game.username);
                 ogs.addPlayerInfo(game.username, game.playerStatus);
@@ -328,8 +329,7 @@ public class OnlineDatabase : MonoBehaviour {
                     ogs.CurrentPlayer = game.username;
                 }
             }
-
-  
+            prevGame = game;
         }
         SetGlobalGameInfo(userName, ogs, gameId, og.onlineGamesList[og.onlineGamesList.Count - 1]);
         games.Add(ogs);

Assets/Scripts/GameManagerScript.cs

@@ -143,9 +143,10 @@ public class GameManagerScript : MonoBehaviour {
                 Database.Instance.GetRoundValue(GameId, GameMode)));
             dialog.SetOnAccept(LocalizationManager.Instance.GetText("OK"), () => {
                 Database.Instance.SetGameFinished(GameId, GameMode);
-
+                scrollViewScript.SetAllQuestionsLocked(true);
+                GameObject.Find("NewQuestion").GetComponent<NewQuestionCardController>().BackClickable = false;
                 if (GameMode.Equals("Online")) {
-                    OnlineDatabase.Instance.SendGameOverMessage(GameId, players, currentPlayer);
+                    OnlineDatabase.Instance.SendGameOverMessage(GameId, players, currentPlayer, Database.Instance.GetRoundValue(GameId, GameMode));
                 }
 
                 dialog.Hide();

Assets/Scripts/MainMenu.cs

@@ -88,7 +88,6 @@ public class MainMenu : MonoBehaviour {
             Destroy(lgs);
             Destroy(lgs.gameObject);
         }
-
        
         int localIndex = 1;
         int finishedIndex = 1;
@@ -101,7 +100,7 @@ public class MainMenu : MonoBehaviour {
                 lgs.transform.SetParent(localGamesList.transform, false);
                 lgs.transform.SetSiblingIndex(localIndex++);
             } else {
-                lgs.DisableStartButton();
+                lgs.DestroyStartButton();
                 lgs.transform.SetParent(finishedGamesList.transform, false);
                 lgs.transform.SetSiblingIndex(finishedIndex++);
             }

Assets/Scripts/NewGameScene/GameInfoScript.cs

@@ -22,6 +22,7 @@ public class GameInfoScript : MonoBehaviour {
     [SerializeField] Text questionsToWinValueText;
     [SerializeField] Text DaysToStartRoundValueText;
 
+    [SerializeField] Text GameIdText;
     // Start is called before the first frame update
     void Start() {
         cancelButton.onClick.AddListener(Hide);
@@ -57,6 +58,8 @@ public class GameInfoScript : MonoBehaviour {
             opi.transform.SetParent(playersPanel, false);
         }
 
+        GameIdText.text = onlineGameScript.GetId().ToString();
+
         acceptButton.enabled = false;
         acceptButton.interactable = false;
 

Assets/Scripts/NewGameScene/GamesScrollController.cs

@@ -44,12 +44,10 @@ public class GamesScrollController : MonoBehaviour, IPointerClickHandler {
         } else if (objectName.Equals("FinishedGamesTitle")) {
             if (finishExpanded) {
                 Minimize(finishedGamesPanel);
-                finishedGamesPanel.GetComponentInChildren<Scrollbar>().handleRect.parent.GetComponentInChildren<Image>().enabled = false;
             } else {
                 Maximize(finishedGamesPanel);
                 Minimize(localGamesPanel);
                 Minimize(onlineGamesPanel);
-                finishedGamesPanel.GetComponentInChildren<Scrollbar>().handleRect.parent.GetComponentInChildren<Image>().enabled = true;
             }
         }
     }
@@ -57,15 +55,28 @@ public class GamesScrollController : MonoBehaviour, IPointerClickHandler {
     public void OnPointerClick(PointerEventData eventData) {
         GameObject clickedObject = GameObject.Find(eventData.pointerPress.name);
         expandThis(clickedObject.name);
+        // Möjligt populera finished games när den expanderas
     }
 
     private void Maximize(GameObject activeObject) {
         float gamesPanelHeight = gamesPanel.GetComponent<RectTransform>().rect.height;
 
         activeObject.GetComponent<RectTransform>().sizeDelta = new Vector2(activeObject.GetComponent<RectTransform>().rect.width, gamesPanelHeight - 60f);
+        for (int i = 0; i < activeObject.transform.childCount; i++) {
+            if (activeObject.transform.GetChild(i).gameObject.tag.Equals("GamesPanelContent")) {
+                activeObject.transform.GetChild(i).GetComponent<CanvasGroup>().alpha = 1f;
+                break;
+            }
+        }
     }
 
     private void Minimize(GameObject activeObject) {
         activeObject.GetComponent<RectTransform>().sizeDelta = new Vector2(activeObject.GetComponent<RectTransform>().rect.width, 30f);
+        for (int i = 0; i < activeObject.transform.childCount; i++) {
+            if (activeObject.transform.GetChild(i).gameObject.tag.Equals("GamesPanelContent")) {
+                activeObject.transform.GetChild(i).GetComponent<CanvasGroup>().alpha = 0f;
+                break;
+            }
+        }
     }
 }

Assets/Scripts/NewGameScene/LocalGameScript.cs

@@ -92,7 +92,7 @@ public class LocalGameScript : MonoBehaviour
         dialog.Show();
     }
 
-    public void DisableStartButton() {
+    public void DestroyStartButton() {
         Destroy(startButton.gameObject);
     }
 

Assets/Scripts/NewGameScene/NewOnlineGameScript.cs

@@ -17,18 +17,21 @@ public class NewOnlineGameScript : MonoBehaviour
     [SerializeField] GameObject categoryPanel;
 
     private InvitePanelScript ips;
+    private selectCategoriesPanelController selectedCategoriesController;
     // Start is called before the first frame update
     void Start()
     {
         StartButton.onClick.AddListener(StartNewOnlineGame);
         StartButton.interactable = false;
         ips = invitePanel.GetComponent<InvitePanelScript>();
+        selectedCategoriesController = categoryPanel.GetComponent<selectCategoriesPanelController>();
     }
 
     // Update is called once per frame
     void Update()
     {
-        if (ips.AreThereInvites()) {
+        if (ips.AreThereInvites() &&
+            selectedCategoriesController.GetSelectedCategories().Sum(c => c.questionCount) > 0) { // Fungerar ej, stoppar inte vid 0
             StartButton.interactable = true;
         } 
         // TODO, make sure there are enough questions selected in categories
@@ -36,7 +39,7 @@ public class NewOnlineGameScript : MonoBehaviour
 
     void StartNewOnlineGame() {
         List<InviteSearchResult> inviteUsers = ips.GetSelectedUsersForInvite();
-        List<CategoryPanel.Category> selectedCategories = categoryPanel.GetComponent<selectCategoriesPanelController>().GetSelectedCategories();
+        List<CategoryPanel.Category> selectedCategories = selectedCategoriesController.GetSelectedCategories();
 
         List<int> selectedCategoryIds = selectedCategories.Select(c => c.id).ToList();
 

Assets/Scripts/NewGameScene/OnlineGameScript.cs

@@ -81,7 +81,6 @@ public class OnlineGameScript : MonoBehaviour {
     private void Start() {
         gameInfoButton = this.GetComponent<Button>();
         gameInfoButton.onClick.AddListener(ShowInfoPanel);
-        PlayerInfos = new List<KeyValuePair<string, string>>();
     }
 
     private void ShowInfoPanel() {

Assets/Scripts/NewGameScene/invitePanelController.cs

@@ -10,7 +10,7 @@ public class invitePanelController : MonoBehaviour {
     // Start is called before the first frame update
     void Start() {
         inviteButton.onClick.AddListener(OpenInvitePlayersDialog);
-        invitedPlayersText.text = 1 + " " + LocalizationManager.Instance.GetText("INVITED_PLAYERS_TEXT");
+        invitedPlayersText.text = LocalizationManager.Instance.GetText("INVITED_PLAYERS_TEXT_START");
     }
 
     // Update is called once per frame

Assets/SelectCategoryScript.cs

@@ -15,6 +15,7 @@ public class SelectCategoryScript : MonoBehaviour
     [SerializeField] GameObject SelectCategoryPanel;
 
     [SerializeField] GameObject ContentPanel;
+    [SerializeField] Text TotalsText;
     // Start is called before the first frame update
 
     private List<CategoryPanel.Category> categories;
@@ -25,12 +26,15 @@ public class SelectCategoryScript : MonoBehaviour
 
         GetCategories();
 
+        updateTotalsText();
+
         int pos = 0;
         foreach (CategoryPanel.Category cat in categories)
         {
             GameObject go = Instantiate(CategoryToSelectPrefab, Vector3.zero, Quaternion.identity);
             CategorySelection c = go.GetComponent<CategorySelection>();
             c.SetSelected(true);
+            c.QuestionCount = cat.questionCount;
             c.SetCategoryText(cat.name, cat.questionCount);
             c.transform.SetSiblingIndex(pos++);
             c.transform.localScale = new Vector3(1, 1, 1);
@@ -38,6 +42,16 @@ public class SelectCategoryScript : MonoBehaviour
         }
     }
 
+    private void Update() {
+        updateTotalsText();
+    }
+
+    private void updateTotalsText() {
+        string totalsText = String.Format(LocalizationManager.Instance.GetText(TotalsText.GetComponent<TextLocalization>().key), 
+            GetSelectedCategoriesQuestionCount().ToString());
+        TotalsText.text = totalsText;
+    }
+
     private void GetCategories()
     {
         if (categories == null || categories.Count == 0) {
@@ -47,14 +61,14 @@ public class SelectCategoryScript : MonoBehaviour
     }
 
     internal void CloseDialogAction() {
-        SelectCategoryPanel.GetComponent<selectCategoriesPanelController>().UpdateCategoryText();
+        SelectCategoryPanel.GetComponent<selectCategoriesPanelController>().UpdateCategoryText(GetSelectedCategoriesQuestionCount());
         gameObject.SetActive(false);
-
     }
 
     internal int GetSelectedCategoriesQuestionCount()
     {
-        return 0;
+        IEnumerable<CategorySelection> selectedCategories = ContentPanel.GetComponentsInChildren<CategorySelection>().Where(c => c.isSelected());
+        return selectedCategories.Sum(c => c.QuestionCount);
     }
 
     internal string GetCategoriesSelectedCount()
@@ -82,7 +96,12 @@ public class SelectCategoryScript : MonoBehaviour
         GetCategories();
         List<string> categoriesName = categories.Select(c1 => c1.name).ToList();
         List<string> selectedCategoyNames = GetSelectedCategoriesAsList().Select(c2 => c2.getCategoryName()).ToList();
-        List<string> names = categoriesName.Intersect(selectedCategoyNames).ToList();
+        List<string> names = new List<string>();
+        if (selectedCategoyNames.Count == 0) {
+            names = categoriesName;
+        } else {
+            names = categoriesName.Intersect(selectedCategoyNames).ToList();
+        }
 
         return categories.Where(c => names.Contains(c.name)).ToList();
     }

Assets/Translations/ENGLISH.xml

@@ -68,6 +68,7 @@
   <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>
+  <text key="INVITED_PLAYERS_TEXT_START">Invite players</text>
   <text key="NEED_MORE_INPUT">More input needed</text>
   <text key="REGISTER_ERROR_USERNAME_EMPTY">Username is obligatory and needs to be atleast 3 characters long</text>
   <text key="REGISTER_ERROR_PASSWORD_EMPTY">Password is obligatory and needs to be atleast 6 characters long</text>
@@ -98,7 +99,8 @@
   <text key="NOT_YOUR_TURN">It's not your turn</text>
   <text key="FCM_NEW_GAME_MESSAGE">You have been invited to a new game with {0}</text>
   <text key="FCM_NEW_GAME_TITLE">Want to play a game?</text>
-  <text key="SELECT_CATEGORIES_TEXT">{0} categories chosen</text>
+  <text key="SELECT_CATEGORIES_TEXT">{0} categories chosen {1} questions</text>
+  <text key="SELECT_CATEGORIES_TEXT_ALL">{0} categories chosen</text>
   <text key="SELECT_CATEGORIES_BUTTON">Select categories</text>
   <text key="SELECT_CATEGORIES_DIALOG_TITLE">Select categories to play with</text>
   <text key="SELECT_CATEGORY_DIALOG_TEXT">Categoryname</text>
@@ -106,6 +108,8 @@
   <text key="ANSWERLINE_INFO_LOCKED_QUESTIONS_TEXT">{0} have {1} locked answers</text>
   <text key="ANSWERLINE_INFO_UNLOCKED_QUESTIONS_TEXT">{0} have {1} unlocked answers, those will be lost if you answer incorrectly.</text>
   <text key="ANSWERLINE_OTHER_PLAYER">Show {0} answers</text>
+  <text key="SELECT_CATEGORIES_TOTALS">{0} total questions selected</text>
 
-  
+  <text key="GAME_OVER_MESSAGE">{0} won the game after {1} rounds</text>
+  <text key="GAME_OVER_TITLE">Game over!</text>
 </Language>

Assets/Translations/SWEDISH.xml

@@ -69,6 +69,7 @@
   <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>
+  <text key="INVITED_PLAYERS_TEXT_START">Bjud in spelare</text>
   <text key="NEED_MORE_INPUT">Skriv in fler tecken</text>
   <text key="REGISTER_ERROR_USERNAME_EMPTY">Användarnamn är obligatoriskt, minst 3 tecken långt</text>
   <text key="REGISTER_ERROR_PASSWORD_EMPTY">Lösenord är obligatoriskt, minst 6 tecken långt</text>
@@ -100,14 +101,16 @@
   <text key="FCM_NEW_GAME_MESSAGE">Du är inbjuden till ett nytt spel mot {0}</text>
   <text key="FCM_NEW_GAME_TITLE">Vill du spela?</text>
   <text key="SELECT_CATEGORIES_BUTTON">Välj kategorier</text>
-  <text key="SELECT_CATEGORIES_TEXT">{0} kategorier valda</text>
+  <text key="SELECT_CATEGORIES_TEXT">{0} kategorier valda {1} frågor</text>
+  <text key="SELECT_CATEGORIES_TEXT_ALL">{0} kategorier valda</text>
   <text key="SELECT_CATEGORIES_DIALOG_TITLE">Välj kategorier att spela med</text>
   <text key="SELECT_CATEGORY_DIALOG_TEXT">Kategorinamn</text>
   <text key="SELECT_CATEGORY_DIALOG_SELECTED_TEXT">Vald</text>
   <text key="ANSWERLINE_INFO_LOCKED_QUESTIONS_TEXT">{0} har {1} låsta frågor</text>
   <text key="ANSWERLINE_INFO_UNLOCKED_QUESTIONS_TEXT">Du har {0} olåsta frågor, dessa kommer att förloras om du svarar fel.</text>
-
   <text key="ANSWERLINE_OTHER_PLAYER">Visa {0} svar</text>
-
+  <text key="SELECT_CATEGORIES_TOTALS">Totalt {0} frågor valda</text>
   
+  <text key="GAME_OVER_MESSAGE">{0} vann spelet efter {1} rundor</text>
+  <text key="GAME_OVER_TITLE">Spelet avslutat</text>
 </Language>

Assets/selectCategoriesPanelController.cs

@@ -11,14 +11,18 @@ public class selectCategoriesPanelController : MonoBehaviour
     [SerializeField] GameObject SelectCategoriesDialog;
     [SerializeField] Text SelectCategoriesText;
 
+    private int selectedQuestionCount;
+
     private SelectCategoryScript selectCategoryScript;
 
+    public int SelectedQuestionCount { get => selectedQuestionCount; set => selectedQuestionCount = value; }
+
     // Start is called before the first frame update
     void Start()
     {
         OpenDialogButton.onClick.AddListener(ShowDialog);
         selectCategoryScript = SelectCategoriesDialog.GetComponent<SelectCategoryScript>();
-        SelectCategoriesText.text = string.Format(LocalizationManager.Instance.GetText("SELECT_CATEGORIES_TEXT"), 
+        SelectCategoriesText.text = string.Format(LocalizationManager.Instance.GetText("SELECT_CATEGORIES_TEXT_ALL"), 
             LocalizationManager.Instance.GetText("ALL"));
     }
 
@@ -26,13 +30,16 @@ public class selectCategoriesPanelController : MonoBehaviour
     void Update()
     {
         if (SelectCategoriesText.text.Contains("{")) {
-            SelectCategoriesText.text = string.Format(LocalizationManager.Instance.GetText("SELECT_CATEGORIES_TEXT"), 
+            SelectCategoriesText.text = string.Format(LocalizationManager.Instance.GetText("SELECT_CATEGORIES_TEXT_ALL"), 
                 LocalizationManager.Instance.GetText("ALL"));
         }
     }
 
-    public void UpdateCategoryText() {
-        SelectCategoriesText.text = string.Format(LocalizationManager.Instance.GetText("SELECT_CATEGORIES_TEXT"), selectCategoryScript.GetCategoriesSelectedCount());
+    public void UpdateCategoryText(int questionCount) {
+        SelectCategoriesText.text = string.Format(LocalizationManager.Instance.GetText("SELECT_CATEGORIES_TEXT"), 
+            selectCategoryScript.GetCategoriesSelectedCount(), 
+            questionCount);
+            SelectedQuestionCount = questionCount;
     }
 
     internal void ShowDialog() {
@@ -41,7 +48,6 @@ public class selectCategoriesPanelController : MonoBehaviour
 
     public List<CategoryPanel.Category> GetSelectedCategories() {
         List<CategoryPanel.Category> selectedCategories = selectCategoryScript.GetSelectedCategories();
-
         return selectedCategories;
     }
 }

ProjectSettings/TagManager.asset

@@ -10,6 +10,7 @@ TagManager:
   - AnswerLine
   - ConfirmAnswerDialogTag
   - Root
+  - GamesPanelContent
   layers:
   - Default
   - TransparentFX

dbFiles/FCMMessageing.php

@@ -78,4 +78,6 @@
 		];
 		// Send the Push Notification - use $response to inspect success or errors
 		$response = $httpClient->post("https://fcm.googleapis.com/v1/projects/{$project}/messages:send", ['json' => $message]);
+
+		file_put_contents("FCMMessageDebugResponse.log", print_r($response,true), FILE_APPEND);
 	}