Commit 5cebc658 authored by cdmbillzhao's avatar cdmbillzhao
Browse files

change task to move left and right and add the real test scene

parent 0bacc828
# Default ignored files
/shelf/
/workspace.xml
# Rider ignored files
/contentModel.xml
/modules.xml
/projectSettingsUpdater.xml
/.idea.XRExperiment.iml
# Editor-based HTTP Client requests
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding" addBOMForNewFiles="with BOM under Windows, with no BOM otherwise" />
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="UserContentModel">
<attachedFolders />
<explicitIncludes />
<explicitExcludes />
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
\ No newline at end of file
......@@ -4089,7 +4089,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &241566325
RectTransform:
m_ObjectHideFlags: 0
......@@ -26809,7 +26809,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &1456262916
Transform:
m_ObjectHideFlags: 0
......@@ -35132,7 +35132,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &1810040792
RectTransform:
m_ObjectHideFlags: 0
......@@ -42710,7 +42710,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: 'Move the blue platonic to the red position
m_text: 'Move the blue platonic solid to the red position
 
 
'
This diff is collapsed.
fileFormatVersion: 2
guid: fca12497e03f4a340b4ba8f746f7e703
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -37,7 +37,7 @@ public class TaskCompletionCheck : MonoBehaviour
if (other.gameObject.CompareTag("Target"))
{
//Debug.Log("task done" + Vector3.Distance(other.gameObject.transform.position, transform.position));
if (Vector3.Distance(other.gameObject.transform.position, transform.position) < 0.1)
if (Vector3.Distance(other.gameObject.transform.position, transform.position) < 0.2)
{
//Debug.Log("task done" + Vector3.Distance(other.gameObject.transform.position, transform.position));
TaskManager.Instance.OnTaskExit();
......
......@@ -156,6 +156,12 @@ public class TaskManager : MonoBehaviour
currentTaskName = "seqrate";
SetRecord();
DBManager.Instance.UpdatePlayerData(myPlayerRecord);
taskInfoIndex.text = "Thank you!";
taskInfo.text = "Please take off the headset";
taskInfoCompletionTime.text = "";
taskBtn.transform.gameObject.SetActive(false);
taskPanel.SetActive(true);
}
void SpawnTarget() {
......@@ -164,9 +170,14 @@ public class TaskManager : MonoBehaviour
{
myTarget = Instantiate(taskTarget, new Vector3(0f, 0f, 0.7f), Quaternion.identity);
}
else if (currentTask.GetComponent<TaskCompletionCheck>().taskType == 3)
{
myTarget = Instantiate(taskTarget, new Vector3(0f, 0f, 5.7f), Quaternion.identity);
}
else {
myTarget = Instantiate(taskTarget, new Vector3(0f, 0f, 10.7f), Quaternion.identity);
myTarget = Instantiate(taskTarget, new Vector3(0f, 0f, 5.7f), Quaternion.identity);
}
//taskTarget.SetActive(true);
......
......@@ -5,9 +5,12 @@ EditorBuildSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Scenes:
- enabled: 1
- enabled: 0
path: Assets/Scenes/Pilot Test1.unity
guid: 4ab036d1c615cb6499c0abeaf75022fb
- enabled: 1
path: Assets/Scenes/Real test1.unity
guid: fca12497e03f4a340b4ba8f746f7e703
m_configObjects:
Unity.XR.Oculus.Settings: {fileID: 11400000, guid: 3468cb7de9fe4a44486aebee184a9372, type: 2}
com.unity.xr.management.loader_settings: {fileID: 11400000, guid: aad6204a854363f4a984c43d55c0c1c8, type: 2}
......@@ -134,8 +134,10 @@ PlayerSettings:
16:10: 1
16:9: 1
Others: 1
bundleVersion: 0.1
preloadedAssets: []
bundleVersion: 0.2
preloadedAssets:
- {fileID: 8121370155712963217, guid: aad6204a854363f4a984c43d55c0c1c8, type: 2}
- {fileID: 11400000, guid: 3468cb7de9fe4a44486aebee184a9372, type: 2}
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment