Feature/tutorial minigame (#61)

Gamify-IT · Nov 7, 2024 · 636ea06 · 636ea06
2 parents 6becdb9 + 1780651
commit 636ea06
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 28 deletions.
diff --git a/Assets/Scripts/Global Scripts/GameManager.cs b/Assets/Scripts/Global Scripts/GameManager.cs
@@ -309,6 +309,11 @@ public void FetchAllQuestions()
 #else
         configurationAsUUID = GetConfiguration();
 #endif
+        if (configurationAsUUID == ChickenshockProperties.editorConfiguration)
+        {
+            LoadDefaultQuestions();
+            return;
+        }
 
         try
         {   

diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt
@@ -14,16 +14,16 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_PixelRect:
     serializedVersion: 2
-    x: 0
-    y: 43
+    x: 2
+    y: 51
     width: 2560
     height: 1349
   m_ShowMode: 4
   m_Title: Game
   m_RootView: {fileID: 2}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
-  m_Maximized: 1
+  m_Maximized: 0
 --- !u!114 &2
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -163,7 +163,7 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1869
+    width: 1870
     height: 1299
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 16192, y: 16192}
@@ -188,8 +188,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 1869
-    height: 912
+    width: 1870
+    height: 913
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
@@ -212,7 +212,7 @@ MonoBehaviour:
     x: 0
     y: 0
     width: 381
-    height: 912
+    height: 913
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 14}
@@ -237,8 +237,8 @@ MonoBehaviour:
     serializedVersion: 2
     x: 381
     y: 0
-    width: 1488
-    height: 912
+    width: 1489
+    height: 913
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 15}
@@ -263,9 +263,9 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 912
-    width: 1869
-    height: 387
+    y: 913
+    width: 1870
+    height: 386
   m_MinSize: {x: 101, y: 121}
   m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 17}
@@ -289,9 +289,9 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1869
+    x: 1870
     y: 0
-    width: 691
+    width: 690
     height: 1299
   m_MinSize: {x: 275, y: 50}
   m_MaxSize: {x: 4000, y: 4000}
@@ -414,10 +414,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 0
-    y: 73
+    x: 2
+    y: 81
     width: 380
-    height: 891
+    height: 892
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -471,10 +471,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 381
-    y: 73
-    width: 1486
-    height: 891
+    x: 383
+    y: 81
+    width: 1487
+    height: 892
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -916,10 +916,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 0
-    y: 985
-    width: 1868
-    height: 366
+    x: 2
+    y: 994
+    width: 1869
+    height: 365
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
@@ -944,9 +944,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1869
-    y: 73
-    width: 690
+    x: 1872
+    y: 81
+    width: 689
     height: 1278
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:
-Original file line number
+Diff line change
@@ Expand Up / @@ -309,6 +309,11 @@ public void FetchAllQuestions() @@
     #else
             configurationAsUUID = GetConfiguration();
     #endif
+            if (configurationAsUUID == ChickenshockProperties.editorConfiguration)
+            {
+                LoadDefaultQuestions();
+                return;
+            }
             try
             {
@@ Expand Down @@