Merge branch 'WES-XX-ScriptableList-Index-Fix' into 'development'

Resolve WES-XX-ScriptableList-Index-Fix

See merge request wesign/unity-application!62

Assets/Courses/Scenes/TemplateCourse.unity

@@ -501,6 +501,8 @@ MonoBehaviour:
   userList: {fileID: 11400000, guid: 072bec636a40f7e4e93b0ac624a3bda2, type: 2}
   courselist: {fileID: 11400000, guid: a7ab583094b7897468bbca9243717608, type: 2}
   ResultPanel: {fileID: 1383144366}
+  ResultsTitle: {fileID: 822960079}
+  ResultsDecription: {fileID: 100123246}
   CoursesButton: {fileID: 839294691}
   timeSpent: {fileID: 77614869}
   feedback: {fileID: 1714882683}
@@ -1303,6 +1305,7 @@ MonoBehaviour:
   modelInfoFile: {fileID: 4900000, guid: fb8b51022bdcd654a9f29c054832a1b5, type: 3}
   configAsset: {fileID: 4900000, guid: 6288c43cdca97374782dac1ea87aa029, type: 3}
   screen: {fileID: 378145456}
+  screen2: {fileID: 0}
 --- !u!4 &883853269
 Transform:
   m_ObjectHideFlags: 0

Assets/Courses/Scripts/TemplateCourse.cs

@@ -87,6 +87,16 @@ public class TemplateCourse : MonoBehaviour
     /// </summary>
     public GameObject ResultPanel;
 
+    /// <summary>
+    /// Reference to the title on the results panel
+    /// </summary>
+    public TMP_Text ResultsTitle;
+
+    /// <summary>
+    /// Reference to the description on the results panel
+    /// </summary>
+    public TMP_Text ResultsDecription;
+
     /// <summary>
     /// Button to go back to courses list
     /// </summary>
@@ -260,6 +270,12 @@ public class TemplateCourse : MonoBehaviour
         // Show the "finished" screen
         ResultPanel.SetActive(true);
 
+        // Set the correct title
+        ResultsTitle.text = course.title + " voltooid!";
+
+        // Set the correct description
+        ResultsDecription.text = "Goed gedaan! Je kan nu spelletjes spelen met " + course.title + " om verder te oefenen!";
+
         // Set the total time spent UI
         TimeSpan time = DateTime.Now - startMoment;
         timeSpent.text = time.ToString(@"hh\:mm\:ss");

Assets/Hangman/Scenes/Hangman.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
+  m_IndirectSpecularColor: {r: 0.44657826, g: 0.49641263, b: 0.57481676, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -3545,6 +3545,7 @@ MonoBehaviour:
   wordsText: {fileID: 1704021883}
   scoreText: {fileID: 90551462}
   minigame: {fileID: 11400000, guid: 165c1d9867275924d9720d409e935f95, type: 2}
+  minigamelist: {fileID: 11400000, guid: 51453f9b41bc72f468ba3e67ab622f8f, type: 2}
   userList: {fileID: 11400000, guid: 072bec636a40f7e4e93b0ac624a3bda2, type: 2}
   Scoreboard: {fileID: 1007532375}
   EntriesGrid: {fileID: 1391137944}

Assets/Hangman/Scripts/HangmanGameController.cs

@@ -159,6 +159,12 @@ public class HangmanGameController : MonoBehaviour
     /// </summary>
     public Minigame minigame;
 
+    /// <summary>
+    /// We keep the minigamelist as well so that the minigame-index doesn't get reset
+    /// DO NOT REMOVE
+    /// </summary>
+    public MinigameList minigamelist;
+
     /// <summary>
     /// Reference to the user list to access the current user
     /// </summary>

Assets/JustSign/Scenes/Game.unity

@@ -5178,6 +5178,7 @@ MonoBehaviour:
   feedBack: {fileID: 128049076}
   scoreDisplay: {fileID: 1627575593}
   minigame: {fileID: 11400000, guid: e726e0b93ea88465db7ee27605deb83f, type: 2}
+  minigamelist: {fileID: 11400000, guid: 51453f9b41bc72f468ba3e67ab622f8f, type: 2}
   songList: {fileID: 11400000, guid: 4f0ce70309bb901feb28199a82a7d195, type: 2}
   hitZone: {fileID: 2012531007}
   symbolPrefab: {fileID: 4639383499500021565, guid: f3117b0203a1342a48a95904347b03c8, type: 3}

Assets/JustSign/Scripts/JustSignController.cs

@@ -41,6 +41,12 @@ public class JustSignController : MonoBehaviour
     public Minigame minigame;
 
     /// <summary>
+    /// We keep the minigamelist as well so that the minigame-index doesn't get reset
+    /// DO NOT REMOVE
+    /// </summary>
+    public MinigameList minigamelist;
+
+    /// </summary>
     /// Reference to the list of available songs
     /// </summary>
     public SongList songList;
@@ -50,6 +56,7 @@ public class JustSignController : MonoBehaviour
     /// </summary>
     private Song currentSong;
 
+
     /// <summary>
     /// The zone that the player should be hitting with his or her inputs
     /// </summary>
@@ -174,7 +181,7 @@ public class JustSignController : MonoBehaviour
     /// Start is called before the first frame update
     /// </summary>
     void Start()
-    {   
+    {
         scoreDisplay.text = "Score: " + score.ToString();
         currentTheme = minigame.themeList.themes[minigame.themeList.currentThemeIndex];
         words.AddRange(currentTheme.learnables);

Assets/SpellingBee/Scenes/Game.unity

@@ -4555,6 +4555,7 @@ MonoBehaviour:
   themeList: {fileID: 11400000, guid: a247e2ce790f0f746a3bc521e6ab7d58, type: 2}
   userList: {fileID: 11400000, guid: 072bec636a40f7e4e93b0ac624a3bda2, type: 2}
   minigame: {fileID: 11400000, guid: 8a087d241d652634eb4f6352267ea7dc, type: 2}
+  minigamelist: {fileID: 11400000, guid: 51453f9b41bc72f468ba3e67ab622f8f, type: 2}
   letterPrefab: {fileID: 4639383499500021565, guid: c3e66e8957864914cb022af914df6a28, type: 3}
   letterContainer: {fileID: 1346005056}
   wordImage: {fileID: 1338727891}

Assets/SpellingBee/Scripts/GameController.cs

@@ -90,6 +90,12 @@ public partial class GameController : MonoBehaviour
     /// </summary>
     public Minigame minigame;
 
+    /// <summary>
+    /// We keep the minigamelist as well so that the minigame-index doesn't get reset
+    /// DO NOT REMOVE
+    /// </summary>
+    public MinigameList minigamelist;
+
     /// <summary>
     /// Letter prefab
     /// </summary>