Test av post-receive hook

Assets/AnswerLineInfoScript.cs

@@ -26,6 +26,7 @@ public class AnswerLineInfoScript : MonoBehaviour
         prevPlayerButton.onClick.AddListener(ShowPrevPlayerAnswerLine);
         currentPlayerShown = GameManagerScript.GetCurrentPlayer();
         signedInName = Database.Instance.GetSignedInUser().Value;
+        lockedQuestionsText.resizeTextMaxSize = unlockedQuestionsText.resizeTextMaxSize;
     }
 
     private void Update() {

Assets/Scenes/narKampen.unity

@@ -343,7 +343,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 0.16259286}
   m_AnchoredPosition: {x: -0.0002746582, y: 0}
-  m_SizeDelta: {x: -0.00048828125, y: 2}
+  m_SizeDelta: {x: -0.00048828125, y: 0}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!114 &41448115
 MonoBehaviour:
@@ -643,7 +643,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 30}
+  m_SizeDelta: {x: 0, y: 50}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!114 &210243975
 MonoBehaviour:
@@ -1043,7 +1043,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 200, y: 30}
+  m_SizeDelta: {x: 200, y: 50}
   m_Pivot: {x: 0, y: 0}
 --- !u!114 &343030763
 MonoBehaviour:
@@ -2154,10 +2154,10 @@ RectTransform:
   m_Father: {fileID: 41448113}
   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: 160, y: 30}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0.000030517578, y: 0}
+  m_SizeDelta: {x: -264, y: -28}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1050970646
 MonoBehaviour:
@@ -2436,7 +2436,7 @@ MonoBehaviour:
     m_Right: 0
     m_Top: 0
     m_Bottom: 0
-  m_ChildAlignment: 4
+  m_ChildAlignment: 0
   m_Spacing: 5
   m_ChildForceExpandWidth: 0
   m_ChildForceExpandHeight: 0
@@ -2499,7 +2499,7 @@ RectTransform:
   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_SizeDelta: {x: -10, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1140858113
 MonoBehaviour:
@@ -3145,7 +3145,7 @@ RectTransform:
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 740, y: 30}
+  m_SizeDelta: {x: 740, y: 50}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!114 &1312570246
 MonoBehaviour:
@@ -3172,7 +3172,7 @@ MonoBehaviour:
     m_FontStyle: 0
     m_BestFit: 1
     m_MinSize: 10
-    m_MaxSize: 20
+    m_MaxSize: 40
     m_Alignment: 3
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -3416,7 +3416,7 @@ RectTransform:
   m_AnchorMin: {x: 1, y: 0}
   m_AnchorMax: {x: 1, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 200, y: 30}
+  m_SizeDelta: {x: 200, y: 50}
   m_Pivot: {x: 1, y: 0}
 --- !u!114 &1572950264
 MonoBehaviour:
@@ -3644,8 +3644,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: 14.999999}
-  m_SizeDelta: {x: 0, y: -30}
+  m_AnchoredPosition: {x: 0, y: 25}
+  m_SizeDelta: {x: 0, y: -50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1776196331
 MonoBehaviour:
@@ -3848,7 +3848,7 @@ RectTransform:
   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_SizeDelta: {x: -10, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1810996869
 MonoBehaviour:
@@ -3927,7 +3927,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 740, y: 30}
+  m_SizeDelta: {x: 740, y: 50}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &1835093814
 MonoBehaviour:
@@ -3954,7 +3954,7 @@ MonoBehaviour:
     m_FontStyle: 0
     m_BestFit: 1
     m_MinSize: 10
-    m_MaxSize: 20
+    m_MaxSize: 40
     m_Alignment: 5
     m_AlignByGeometry: 0
     m_RichText: 1
@@ -4493,10 +4493,10 @@ RectTransform:
   m_Father: {fileID: 1119394965}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 0.16259286}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 38.701004}
-  m_SizeDelta: {x: 0, y: -77.402435}
+  m_AnchoredPosition: {x: 0, y: 0.115997314}
+  m_SizeDelta: {x: 0, y: -0.23153687}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2082192735
 MonoBehaviour:
@@ -5683,22 +5683,22 @@ PrefabInstance:
     - target: {fileID: 7679625125739625585, guid: 3394fe203de584e40a860468e3563888,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 8.8
       objectReference: {fileID: 0}
     - target: {fileID: 7679625125739625585, guid: 3394fe203de584e40a860468e3563888,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: 1.8
       objectReference: {fileID: 0}
     - target: {fileID: 7679625125739625585, guid: 3394fe203de584e40a860468e3563888,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 506.5
+      value: 750
       objectReference: {fileID: 0}
     - target: {fileID: 7679625125739625585, guid: 3394fe203de584e40a860468e3563888,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 191.8
+      value: 500
       objectReference: {fileID: 0}
     - target: {fileID: 7679625125739625585, guid: 3394fe203de584e40a860468e3563888,
         type: 3}
@@ -5795,6 +5795,26 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 7679625126394289811, guid: 3394fe203de584e40a860468e3563888,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 100
+      objectReference: {fileID: 0}
+    - target: {fileID: 7679625126521092508, guid: 3394fe203de584e40a860468e3563888,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7679625126672602843, guid: 3394fe203de584e40a860468e3563888,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 25
+      objectReference: {fileID: 0}
+    - target: {fileID: 7679625126672602843, guid: 3394fe203de584e40a860468e3563888,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: -150
+      objectReference: {fileID: 0}
     m_RemovedComponents:
     - {fileID: 7679625125739625588, guid: 3394fe203de584e40a860468e3563888, type: 3}
     - {fileID: 7679625125739625590, guid: 3394fe203de584e40a860468e3563888, type: 3}

Assets/Scripts/GameManagerScript.cs

@@ -263,7 +263,7 @@ public class GameManagerScript : MonoBehaviour {
         dialog.SetMessage(String.Format(message, currentPlayer));
         dialog.SetOnAccept(LocalizationManager.Instance.GetText("OK"), () => {
             scrollViewScript.RemoveEverythingFromAnswerline();
-            List<NewQuestionData> questions = Database.Instance.GetPlayerQuestions(GameId, currentPlayer, GetGameMode());
+            List<NewQuestionData> questions = Database.Instance.GetPlayerQuestions(GameId, Database.Instance.GetSignedInUser().Value, GetGameMode());
             scrollViewScript.SetQuestionsInAnswerLine(questions);
 
             statsScript.SetQuestionsLost(Database.Instance.GetQuestionsLost(GameId, currentPlayer, GetGameMode()));

Assets/Scripts/MainGame/StatsScript.cs

@@ -52,6 +52,7 @@ public class StatsScript : MonoBehaviour {
         playerTitle.SetStatName(LocalizationManager.Instance.GetText("PLAYERS"));
         playerTitle.SetStatValue("");
         playerTitle.MakeBold();
+        playerTitle.GetComponent<RectTransform>().sizeDelta = new Vector2(playerTitle.GetComponent<RectTransform>().rect.width,50f);
         playerTitle.SetLocalizationKey("PLAYERS");
 
         statLines.Add(round);

dbFiles/FCMMessageing.php

@@ -19,13 +19,13 @@
 		die("Connection Failed. ". mysqli_connect_error());
 	}
 	mysqli_set_charset($conn,'utf8');
-	
 	$messageType = $conn->real_escape_string(isset($_POST['type'])?$_POST['type']:"");
 	
 	$title = $conn->real_escape_string($_POST['title']);
 	$messageToSend = $conn->real_escape_string($_POST['message']);
 	$gameId = $conn->real_escape_string($_POST['gameId']);
 	
+	file_put_contents("FCMMessageDebug.log", "Called $messageType at " . Date(), FILE_APPEND);
 	if ($messageType === "FCMNextPlayer") {
 		$playerName = $conn->real_escape_string($_POST['playerName']);
 		$token = getToken($conn, $gameId, $playerName);