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

Resolve WES-XX-ScriptableList-Index-Fix

See merge request wesign/unity-application!62
This commit was merged in pull request #62.
This commit is contained in:
Dries Van Schuylenbergh
2023-03-25 17:16:42 +00:00
8 changed files with 43 additions and 2 deletions

View File

@@ -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

View File

@@ -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");