Demo day booth
This commit is contained in:
committed by
Jelle De Geest
parent
5b4a3ec4e7
commit
fcd8acad1e
@@ -1,5 +1,6 @@
|
||||
using TMPro;
|
||||
using UnityEngine;
|
||||
using UnityEngine.Playables;
|
||||
using UnityEngine.UI;
|
||||
|
||||
/// <summary>
|
||||
@@ -53,6 +54,11 @@ public class CourseActivityScreen : MonoBehaviour
|
||||
/// </summary>
|
||||
public GameObject completedObject;
|
||||
|
||||
/// <summary>
|
||||
/// Reference to the scene playable director
|
||||
/// </summary>
|
||||
public PlayableDirector directorEnterFromCourseMenu;
|
||||
|
||||
/// <summary>
|
||||
/// Sets the infopage for a given course
|
||||
/// </summary>
|
||||
@@ -99,6 +105,10 @@ public class CourseActivityScreen : MonoBehaviour
|
||||
restartButton.SetActive(false);
|
||||
playButton.transform.Find("Button Text").GetComponent<TMP_Text>().text = "Begin";
|
||||
}
|
||||
|
||||
var sys = SystemController.GetInstance();
|
||||
if (sys.previousScene == SystemController.GetSceneIndex("Common/Scenes/CoursesMenuScreen"))
|
||||
directorEnterFromCourseMenu.Play();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
@@ -69,7 +69,7 @@ public class CourseItem : MonoBehaviour
|
||||
progress = Mathf.Clamp01(progress);
|
||||
completed.SetActive(1.0f <= progress);
|
||||
slider.SetActive(0.0f <= progress && progress < 1.0f);
|
||||
slider.GetComponent<Slider>().value = progress;
|
||||
slider.GetComponent<SlicedSlider>().fillAmount = progress;
|
||||
|
||||
// Add click functionality
|
||||
button.onClick.AddListener(() =>
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using UnityEngine.Playables;
|
||||
|
||||
/// <summary>
|
||||
/// CourseMenuScreen scene manager
|
||||
@@ -32,6 +33,16 @@ public class CourseMenuScreen : MonoBehaviour
|
||||
/// </summary>
|
||||
public CourseList courseList;
|
||||
|
||||
/// <summary>
|
||||
/// Reference to the scene playable director
|
||||
/// </summary>
|
||||
public PlayableDirector directorEnterFromDefault;
|
||||
|
||||
/// <summary>
|
||||
/// Reference to the scene playable director
|
||||
/// </summary>
|
||||
public PlayableDirector directorEnterFromMainMenu;
|
||||
|
||||
/// <summary>
|
||||
/// Start is called before the first frame update
|
||||
/// </summary>
|
||||
@@ -66,6 +77,13 @@ public class CourseMenuScreen : MonoBehaviour
|
||||
item.course = courseList.GetCourseByIndex(course.Item1);
|
||||
item.progress = course.Item2;
|
||||
}
|
||||
|
||||
var sys = SystemController.GetInstance();
|
||||
if (sys.previousScene == SystemController.GetSceneIndex("Common/Scenes/MainMenuScreen"))
|
||||
directorEnterFromMainMenu.Play();
|
||||
else
|
||||
directorEnterFromDefault.Play();
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using UnityEngine;
|
||||
using UnityEngine.Playables;
|
||||
|
||||
/// <summary>
|
||||
/// ListCourseScreen scene manager
|
||||
@@ -20,6 +21,11 @@ public class ListCoursesScreen : MonoBehaviour
|
||||
/// </summary>
|
||||
public CourseList courseList;
|
||||
|
||||
/// <summary>
|
||||
/// Reference to the scene playable director
|
||||
/// </summary>
|
||||
public PlayableDirector directorEnterFromCourseMenu;
|
||||
|
||||
/// <summary>
|
||||
/// Start is called before the first frame update
|
||||
/// </summary>
|
||||
@@ -40,6 +46,10 @@ public class ListCoursesScreen : MonoBehaviour
|
||||
var progress = user.GetCourseProgress(course.index);
|
||||
item.progress = progress != null ? progress.progress : 0.0f;
|
||||
}
|
||||
|
||||
var sys = SystemController.GetInstance();
|
||||
if (sys.previousScene == SystemController.GetSceneIndex("Common/Scenes/CoursesMenuScreen"))
|
||||
directorEnterFromCourseMenu.Play();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using UnityEngine;
|
||||
using UnityEngine.Playables;
|
||||
|
||||
/// <summary>
|
||||
/// ListMinigameScreen scene manager
|
||||
@@ -20,6 +21,11 @@ public class ListMinigamesScreen : MonoBehaviour
|
||||
/// </summary>
|
||||
public MinigameList minigameList;
|
||||
|
||||
/// <summary>
|
||||
/// Reference to the scene playable director
|
||||
/// </summary>
|
||||
public PlayableDirector directorEnterFromMainMenu;
|
||||
|
||||
/// <summary>
|
||||
/// Start is called before the first frame update
|
||||
/// </summary>
|
||||
@@ -34,6 +40,10 @@ public class ListMinigamesScreen : MonoBehaviour
|
||||
MinigameItem item = instance.GetComponent<MinigameItem>();
|
||||
item.minigame = minigame;
|
||||
}
|
||||
|
||||
var sys = SystemController.GetInstance();
|
||||
if (sys.previousScene == SystemController.GetSceneIndex("Common/Scenes/MainMenuScreen"))
|
||||
directorEnterFromMainMenu.Play();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
||||
@@ -1,11 +1,32 @@
|
||||
using System.IO;
|
||||
using UnityEngine;
|
||||
using UnityEngine.Playables;
|
||||
|
||||
/// <summary>
|
||||
/// StartScreen scene manager
|
||||
/// </summary>
|
||||
public class MainMenuScreen : MonoBehaviour
|
||||
{
|
||||
/// <summary>
|
||||
/// Reference to the enter animation scene playable director
|
||||
/// </summary>
|
||||
public PlayableDirector directorEnterFromBoot;
|
||||
|
||||
/// <summary>
|
||||
/// Reference to the enter animation scene playable director
|
||||
/// </summary>
|
||||
public PlayableDirector directorEnterFromCourseMenu;
|
||||
|
||||
/// <summary>
|
||||
/// Reference to the enter animation scene playable director
|
||||
/// </summary>
|
||||
public PlayableDirector directorEnterFromListMinigames;
|
||||
|
||||
/// <summary>
|
||||
/// Reference to the enter animation scene playable director
|
||||
/// </summary>
|
||||
public PlayableDirector directorEnterFromSettings;
|
||||
|
||||
/// <summary>
|
||||
/// Check on load whether a user is already present,
|
||||
/// if not load the UserCreationScreen scene so the user can create a new account
|
||||
@@ -14,10 +35,27 @@ public class MainMenuScreen : MonoBehaviour
|
||||
{
|
||||
if (!File.Exists(PersistentDataController.PATH) || UserList.GetUsers().Count <= 0)
|
||||
{
|
||||
UserCreationScreen.canGoBack = false;
|
||||
SystemController.GetInstance().LoadNextScene("Accounts/Scenes/UserCreationScreen");
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Start is called before the first frame update
|
||||
/// </summary>
|
||||
void Start()
|
||||
{
|
||||
var sys = SystemController.GetInstance();
|
||||
if (sys.previousScene == SystemController.GetSceneIndex("Common/Scenes/Boot"))
|
||||
directorEnterFromBoot.Play();
|
||||
else if (sys.previousScene == SystemController.GetSceneIndex("Common/Scenes/CoursesMenuScreen"))
|
||||
directorEnterFromCourseMenu.Play();
|
||||
else if (sys.previousScene == SystemController.GetSceneIndex("Common/Scenes/ListMinigamesScreen"))
|
||||
directorEnterFromListMinigames.Play();
|
||||
else if (sys.previousScene == SystemController.GetSceneIndex("Common/Scenes/SettingsScreen"))
|
||||
directorEnterFromSettings.Play();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Quit the application
|
||||
/// </summary>
|
||||
|
||||
18
Assets/Common/Scripts/SettingsScreen.cs
Normal file
18
Assets/Common/Scripts/SettingsScreen.cs
Normal file
@@ -0,0 +1,18 @@
|
||||
using UnityEngine;
|
||||
using UnityEngine.Playables;
|
||||
|
||||
public class SettingsScreen : MonoBehaviour
|
||||
{
|
||||
/// <summary>
|
||||
/// Reference to the scene playable director
|
||||
/// </summary>
|
||||
public PlayableDirector directorEnterFromMainMenu;
|
||||
|
||||
/// <summary>
|
||||
/// Start is called before the first frame update
|
||||
/// </summary>
|
||||
void Start()
|
||||
{
|
||||
directorEnterFromMainMenu.Play();
|
||||
}
|
||||
}
|
||||
11
Assets/Common/Scripts/SettingsScreen.cs.meta
Normal file
11
Assets/Common/Scripts/SettingsScreen.cs.meta
Normal file
@@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: c206227bcf352fd4784750b5b2b19a31
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Reference in New Issue
Block a user