diff --git a/POINT-VR-Chapter-1/Assets/POINT/Scenes/Conference Demos/ConfDemo_part1_one-mass-y.unity b/POINT-VR-Chapter-1/Assets/POINT/Scenes/Conference Demos/ConfDemo_part1_one-mass-y.unity index 4b9f8bd4..6a874d14 100644 --- a/POINT-VR-Chapter-1/Assets/POINT/Scenes/Conference Demos/ConfDemo_part1_one-mass-y.unity +++ b/POINT-VR-Chapter-1/Assets/POINT/Scenes/Conference Demos/ConfDemo_part1_one-mass-y.unity @@ -475,7 +475,7 @@ PrefabInstance: - target: {fileID: 1128561483501416258, guid: b67bcc037869c8245a2348ffee62f596, type: 3} propertyPath: onCast.m_PersistentCalls.m_Calls.Array.size - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1128561483501416258, guid: b67bcc037869c8245a2348ffee62f596, type: 3} @@ -663,7 +663,7 @@ PrefabInstance: - target: {fileID: 1128561483501416258, guid: b67bcc037869c8245a2348ffee62f596, type: 3} propertyPath: onCast.m_PersistentCalls.m_Calls.Array.size - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1128561483501416258, guid: b67bcc037869c8245a2348ffee62f596, type: 3} @@ -683,7 +683,7 @@ PrefabInstance: - target: {fileID: 1128561483501416258, guid: b67bcc037869c8245a2348ffee62f596, type: 3} propertyPath: onCast.m_PersistentCalls.m_Calls.Array.data[1].m_CallState - value: 2 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1128561483501416258, guid: b67bcc037869c8245a2348ffee62f596, type: 3} @@ -693,7 +693,7 @@ PrefabInstance: - target: {fileID: 1128561483501416258, guid: b67bcc037869c8245a2348ffee62f596, type: 3} propertyPath: onCast.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName - value: CheckArrowTask + value: objectReference: {fileID: 0} - target: {fileID: 1128561483501416258, guid: b67bcc037869c8245a2348ffee62f596, type: 3} @@ -1928,7 +1928,7 @@ PrefabInstance: - target: {fileID: 1128561483501416258, guid: b67bcc037869c8245a2348ffee62f596, type: 3} propertyPath: onCast.m_PersistentCalls.m_Calls.Array.size - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1128561483501416258, guid: b67bcc037869c8245a2348ffee62f596, type: 3} @@ -2174,7 +2174,7 @@ PrefabInstance: - target: {fileID: 1128561483501416258, guid: b67bcc037869c8245a2348ffee62f596, type: 3} propertyPath: onCast.m_PersistentCalls.m_Calls.Array.size - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1128561483501416258, guid: b67bcc037869c8245a2348ffee62f596, type: 3} @@ -2314,7 +2314,7 @@ PrefabInstance: - target: {fileID: 1128561483501416258, guid: b67bcc037869c8245a2348ffee62f596, type: 3} propertyPath: onCast.m_PersistentCalls.m_Calls.Array.size - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1128561483501416258, guid: b67bcc037869c8245a2348ffee62f596, type: 3} @@ -2719,7 +2719,7 @@ PrefabInstance: - target: {fileID: 1128561483501416258, guid: b67bcc037869c8245a2348ffee62f596, type: 3} propertyPath: onCast.m_PersistentCalls.m_Calls.Array.size - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1128561483501416258, guid: b67bcc037869c8245a2348ffee62f596, type: 3} diff --git a/POINT-VR-Chapter-1/Assets/POINT/Scenes/Conference Demos/ConfDemo_part1_one_mass_y_manager.cs b/POINT-VR-Chapter-1/Assets/POINT/Scenes/Conference Demos/ConfDemo_part1_one_mass_y_manager.cs index 0e1026f6..9ead8bec 100644 --- a/POINT-VR-Chapter-1/Assets/POINT/Scenes/Conference Demos/ConfDemo_part1_one_mass_y_manager.cs +++ b/POINT-VR-Chapter-1/Assets/POINT/Scenes/Conference Demos/ConfDemo_part1_one_mass_y_manager.cs @@ -116,6 +116,9 @@ private IEnumerator StartScene() yield return new WaitForSeconds(2); player.GetComponent().PlayClipWithSubtitles("Chapter1Scene2\\3_direction_of_curvature_arrow_5"); yield return new WaitForSeconds(6.1f); + // wait for player to reach correct arrow orientation + yield return new WaitUntil(() => CheckArrowTask()); + StartCoroutine(StartScenePart2()); } private void ArrowTask() @@ -123,14 +126,16 @@ private void ArrowTask() setOfDirectionalArrows.SetActive(true); // spawn six directional arrows } - public void CheckArrowTask() + public bool CheckArrowTask() { foreach (DirectionalArrow directionalArrow in directionalArrows) { - if (!directionalArrow.IsCorrect) return; + if (!directionalArrow.IsCorrect) { + return false; + } } - StartCoroutine(StartScenePart2()); + return true; } private IEnumerator StartScenePart2() diff --git a/POINT-VR-Chapter-1/Builds/ArrowAudioTest.apk b/POINT-VR-Chapter-1/Builds/ArrowAudioTest.apk new file mode 100644 index 00000000..5c57847a Binary files /dev/null and b/POINT-VR-Chapter-1/Builds/ArrowAudioTest.apk differ