moved some stuff around
This commit is contained in:
parent
750a314687
commit
40690aed39
@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 62d3a01001b36e5458fdd69d42454965
|
|
||||||
folderAsset: yes
|
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 5d31c8fb2741a8b4bb15554eee798a44
|
|
||||||
folderAsset: yes
|
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
@ -1,22 +0,0 @@
|
|||||||
using System.Collections;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using UnityEngine;
|
|
||||||
|
|
||||||
public class DotWrapper : MonoBehaviour
|
|
||||||
{
|
|
||||||
private ExperimentController experimentController;
|
|
||||||
void Awake()
|
|
||||||
{
|
|
||||||
experimentController = GameObject.Find("GameManager").GetComponent<ExperimentController>();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void NextDot()
|
|
||||||
{
|
|
||||||
experimentController.NextDot();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void BackToStart()
|
|
||||||
{
|
|
||||||
experimentController.BackToStart();
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,11 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 9213a906c4bf7e743a6a93cd31e56ae8
|
|
||||||
MonoImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
serializedVersion: 2
|
|
||||||
defaultReferences: []
|
|
||||||
executionOrder: 0
|
|
||||||
icon: {instanceID: 0}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
@ -2050,6 +2050,8 @@ MonoBehaviour:
|
|||||||
enableAdaptiveResolution: 0
|
enableAdaptiveResolution: 0
|
||||||
minRenderScale: 0.7
|
minRenderScale: 0.7
|
||||||
maxRenderScale: 1
|
maxRenderScale: 1
|
||||||
|
_headPoseRelativeOffsetRotation: {x: 0, y: 0, z: 0}
|
||||||
|
_headPoseRelativeOffsetTranslation: {x: 0, y: 0, z: 0}
|
||||||
expandMixedRealityCapturePropertySheet: 0
|
expandMixedRealityCapturePropertySheet: 0
|
||||||
enableMixedReality: 0
|
enableMixedReality: 0
|
||||||
compositionMethod: 0
|
compositionMethod: 0
|
||||||
@ -3278,6 +3280,6 @@ SpriteRenderer:
|
|||||||
m_Size: {x: 19.2, y: 10.8}
|
m_Size: {x: 19.2, y: 10.8}
|
||||||
m_AdaptiveModeThreshold: 0.5
|
m_AdaptiveModeThreshold: 0.5
|
||||||
m_SpriteTileMode: 0
|
m_SpriteTileMode: 0
|
||||||
m_WasSpriteAssigned: 1
|
m_WasSpriteAssigned: 0
|
||||||
m_MaskInteraction: 0
|
m_MaskInteraction: 0
|
||||||
m_SpriteSortPoint: 0
|
m_SpriteSortPoint: 0
|
@ -53,7 +53,6 @@ public class ExperimentController : MonoBehaviour {
|
|||||||
public void BackToStart()
|
public void BackToStart()
|
||||||
{
|
{
|
||||||
Hide(nextDot);
|
Hide(nextDot);
|
||||||
//nextDot = GameObject.Find(participant.trials[trialIndex][trialDotIndex]);
|
|
||||||
Show(startDot);
|
Show(startDot);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user