Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using TMPro;
using UnityEngine.Localization;
using UnityEngine.InputSystem;
using System.Collections.Generic;

public class ConfDemo_part3_ranking_masses : MonoBehaviour
{
Expand All @@ -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<GameObject> sortedMassSpheres = new List<GameObject>(5);


[Header("Instructions Text")]
[SerializeField] private LocalizedString objective1;
Expand Down Expand Up @@ -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());
}

Expand Down