diff --git a/POINT-VR-Chapter-1/Assets/POINT/Scenes/Conference Demos/ConfDemo_part3_ranking-masses.unity b/POINT-VR-Chapter-1/Assets/POINT/Scenes/Conference Demos/ConfDemo_part3_ranking-masses.unity index 1eca548a..5b01fc59 100644 --- a/POINT-VR-Chapter-1/Assets/POINT/Scenes/Conference Demos/ConfDemo_part3_ranking-masses.unity +++ b/POINT-VR-Chapter-1/Assets/POINT/Scenes/Conference Demos/ConfDemo_part3_ranking-masses.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.00695631, g: 0.006819715, b: 0.0073051304, a: 1} + m_IndirectSpecularColor: {r: 0.0068936315, g: 0.0067525106, b: 0.0071824407, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -4512,6 +4512,12 @@ MonoBehaviour: Task2UIContainer: {fileID: 1170312373} openMenuReference: {fileID: 1753721387454739837, guid: a54d6349e0e4d404fa09e1c0531de6d0, type: 3} + sortedMassSpheres: + - {fileID: 520505893} + - {fileID: 438627078} + - {fileID: 1447806103} + - {fileID: 2118528859} + - {fileID: 665559182} objective1: m_TableReference: m_TableCollectionName: GUID:ea97502b36f6cd149b6a571be6e2583f diff --git a/POINT-VR-Chapter-1/Assets/POINT/Scenes/Conference Demos/ConfDemo_part3_ranking_masses.cs b/POINT-VR-Chapter-1/Assets/POINT/Scenes/Conference Demos/ConfDemo_part3_ranking_masses.cs index b0eca58e..5ac1f395 100644 --- a/POINT-VR-Chapter-1/Assets/POINT/Scenes/Conference Demos/ConfDemo_part3_ranking_masses.cs +++ b/POINT-VR-Chapter-1/Assets/POINT/Scenes/Conference Demos/ConfDemo_part3_ranking_masses.cs @@ -3,6 +3,7 @@ using TMPro; using UnityEngine.Localization; using UnityEngine.InputSystem; +using System.Collections.Generic; public class ConfDemo_part3_ranking_masses : MonoBehaviour { @@ -14,6 +15,8 @@ public class ConfDemo_part3_ranking_masses : MonoBehaviour [SerializeField] private GameObject TaskUIContainer; [SerializeField] private GameObject Task2UIContainer; [SerializeField] private InputActionReference openMenuReference; + [SerializeField] private List sortedMassSpheres = new List(5); + [Header("Instructions Text")] [SerializeField] private LocalizedString objective1; @@ -91,6 +94,10 @@ public void PlayRadiiTask() { // Called in the OnCast() in the Task1 UI -> Next Task Button, once they click to continue to Task 2 UIManagerScript.UpdateCurrentObjective(objective2); // Rank different radii, same mass + foreach (GameObject sphere in sortedMassSpheres) + { + sphere.SetActive(false); + } StartCoroutine(RadiiTaskAudio()); }