diff --git a/Assets/Scenes/GuidedThrowingScene.unity b/Assets/Scenes/GuidedThrowingScene.unity
index 58020752e6dce1f00d6c100fe11c6d17cb402619..aa1d636c461de72243f837c0af018aed768db6b4 100644
--- a/Assets/Scenes/GuidedThrowingScene.unity
+++ b/Assets/Scenes/GuidedThrowingScene.unity
@@ -939,7 +939,7 @@ BoxCollider:
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
- m_Size: {x: 1, y: 1, z: 1}
+ m_Size: {x: 1, y: 1.41, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!23 &204496690
MeshRenderer:
@@ -996,7 +996,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 204496688}
m_LocalRotation: {x: 0.00039833234, y: -0.00017801579, z: -0.016056404, w: 0.9998711}
- m_LocalPosition: {x: 0.13844302, y: 0.44658753, z: 0.004799998}
+ m_LocalPosition: {x: -0.189, y: 0.477, z: 0.004799998}
m_LocalScale: {x: 0.29969102, y: 0.2501289, z: 0.120000035}
m_Children: []
m_Father: {fileID: 1738561792}
@@ -1196,7 +1196,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 269028650}
m_LocalRotation: {x: 0.53729963, y: 0, z: 0, w: 0.8433915}
- m_LocalPosition: {x: 0, y: 0, z: -0.066}
+ m_LocalPosition: {x: 0, y: 0, z: -0.227}
m_LocalScale: {x: 0.015, y: 0.015, z: 1}
m_Children: []
m_Father: {fileID: 1565815663}
@@ -1204,7 +1204,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 65, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 0.187, y: 0.912}
+ m_AnchoredPosition: {x: 0.187, y: 0.87}
m_SizeDelta: {x: 2.86, y: 4.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &269028652
@@ -1359,7 +1359,7 @@ BoxCollider:
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
- m_Size: {x: 1, y: 1, z: 1}
+ m_Size: {x: 1, y: 1.41, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!23 &315571144
MeshRenderer:
@@ -1416,7 +1416,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 315571142}
m_LocalRotation: {x: 0.00039833234, y: -0.00017801579, z: -0.016056404, w: 0.9998711}
- m_LocalPosition: {x: 0.13844302, y: 0.44658753, z: 0.144}
+ m_LocalPosition: {x: -0.189, y: 0.477, z: 0.144}
m_LocalScale: {x: 0.29969102, y: 0.2501289, z: 0.120000035}
m_Children: []
m_Father: {fileID: 1738561792}
@@ -1605,7 +1605,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!65 &376034852
BoxCollider:
m_ObjectHideFlags: 0
@@ -2423,7 +2423,7 @@ BoxCollider:
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
- m_Size: {x: 1, y: 1, z: 1}
+ m_Size: {x: 1, y: 1.41, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!23 &546986579
MeshRenderer:
@@ -2480,7 +2480,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 546986577}
m_LocalRotation: {x: 0.00039833234, y: -0.00017801579, z: -0.016056404, w: 0.9998711}
- m_LocalPosition: {x: 0.13844302, y: 0.44658753, z: 0.4216}
+ m_LocalPosition: {x: -0.189, y: 0.477, z: 0.4216}
m_LocalScale: {x: 0.29969102, y: 0.2501289, z: 0.120000035}
m_Children: []
m_Father: {fileID: 1738561792}
@@ -2896,6 +2896,169 @@ PrefabInstance:
objectReference: {fileID: 2100000, guid: 35f06a454fbeac847901ea2fcf780c8c, type: 2}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 06be398b1a54e6f4e9d7e081bd79e6d3, type: 3}
+--- !u!43 &723322208
+Mesh:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name:
+ serializedVersion: 10
+ m_SubMeshes:
+ - serializedVersion: 2
+ firstByte: 0
+ indexCount: 24
+ topology: 0
+ baseVertex: 0
+ firstVertex: 0
+ vertexCount: 8
+ localAABB:
+ m_Center: {x: 0, y: 0.01, z: 0}
+ m_Extent: {x: 1.65, y: 0, z: 1.275}
+ m_Shapes:
+ vertices: []
+ shapes: []
+ channels: []
+ fullWeights: []
+ m_BindPose: []
+ m_BoneNameHashes:
+ m_RootBoneNameHash: 0
+ m_BonesAABB: []
+ m_VariableBoneCountWeights:
+ m_Data:
+ m_MeshCompression: 0
+ m_IsReadable: 1
+ m_KeepVertices: 1
+ m_KeepIndices: 1
+ m_IndexFormat: 0
+ m_IndexBuffer: 000004000100010004000500010005000200020005000600020006000300030006000700030007000000000007000400
+ m_VertexData:
+ serializedVersion: 3
+ m_VertexCount: 8
+ m_Channels:
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 3
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 12
+ format: 0
+ dimension: 4
+ - stream: 0
+ offset: 28
+ format: 0
+ dimension: 2
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ - stream: 0
+ offset: 0
+ format: 0
+ dimension: 0
+ m_DataSize: 288
+ _typelessdata: 0000c03f0ad7233c000090bf000000000000803f0000803f0000803f00000000000000000000c0bf0ad7233c000090bf000000000000803f0000803f0000803f0000803f000000000000c0bf0ad7233c0000903f000000000000803f0000803f0000803f00000000000000000000c03f0ad7233c0000903f000000000000803f0000803f0000803f0000803f000000003333d33f0ad7233c3333a3bf000000000000803f0000803f00000000000000000000803f3333d3bf0ad7233c3333a3bf000000000000803f0000803f000000000000803f0000803f3333d3bf0ad7233c3333a33f000000000000803f0000803f00000000000000000000803f3333d33f0ad7233c3333a33f000000000000803f0000803f000000000000803f0000803f
+ m_CompressedMesh:
+ m_Vertices:
+ m_NumItems: 0
+ m_Range: 0
+ m_Start: 0
+ m_Data:
+ m_BitSize: 0
+ m_UV:
+ m_NumItems: 0
+ m_Range: 0
+ m_Start: 0
+ m_Data:
+ m_BitSize: 0
+ m_Normals:
+ m_NumItems: 0
+ m_Range: 0
+ m_Start: 0
+ m_Data:
+ m_BitSize: 0
+ m_Tangents:
+ m_NumItems: 0
+ m_Range: 0
+ m_Start: 0
+ m_Data:
+ m_BitSize: 0
+ m_Weights:
+ m_NumItems: 0
+ m_Data:
+ m_BitSize: 0
+ m_NormalSigns:
+ m_NumItems: 0
+ m_Data:
+ m_BitSize: 0
+ m_TangentSigns:
+ m_NumItems: 0
+ m_Data:
+ m_BitSize: 0
+ m_FloatColors:
+ m_NumItems: 0
+ m_Range: 0
+ m_Start: 0
+ m_Data:
+ m_BitSize: 0
+ m_BoneIndices:
+ m_NumItems: 0
+ m_Data:
+ m_BitSize: 0
+ m_Triangles:
+ m_NumItems: 0
+ m_Data:
+ m_BitSize: 0
+ m_UVInfo: 0
+ m_LocalAABB:
+ m_Center: {x: 0, y: 0.01, z: 0}
+ m_Extent: {x: 1.65, y: 0, z: 1.275}
+ m_MeshUsageFlags: 0
+ m_BakedConvexCollisionMesh:
+ m_BakedTriangleCollisionMesh:
+ m_MeshMetrics[0]: 1
+ m_MeshMetrics[1]: 1
+ m_MeshOptimizationFlags: 1
+ m_StreamData:
+ offset: 0
+ size: 0
+ path:
--- !u!1 &758489909
GameObject:
m_ObjectHideFlags: 0
@@ -2928,7 +3091,7 @@ BoxCollider:
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
- m_Size: {x: 1, y: 1, z: 1}
+ m_Size: {x: 1, y: 1.79, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!23 &758489911
MeshRenderer:
@@ -2985,7 +3148,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 758489909}
m_LocalRotation: {x: 0.0003983209, y: -0.00017802126, z: -0.016056417, w: 0.999871}
- m_LocalPosition: {x: -0.381, y: 0.456, z: -0.367}
+ m_LocalPosition: {x: 0.337, y: 0.487, z: 0.007}
m_LocalScale: {x: 0.19979396, y: 0.25012887, z: 0.16000004}
m_Children: []
m_Father: {fileID: 1738561792}
@@ -3038,7 +3201,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
SubjectID: 8
- ExpName: November_TEST
+ ExpName: November_Montag
group: 1
hand: 1
FAMQuestionNrDuringTrial: 2
@@ -3110,6 +3273,7 @@ MonoBehaviour:
- {fileID: 2133499086}
deleteButton: {fileID: 376034851}
nextButton: {fileID: 758489909}
+ nextButtonText: {fileID: 1609551669}
selectedMat: {fileID: 2100000, guid: 66fd54a6a91bcfa46ad36fe266a18b52, type: 2}
defaultMat: {fileID: 2100000, guid: e496c156aaf82804a90d72331f1fe2cf, type: 2}
questionText: {fileID: 1927940424}
@@ -3181,7 +3345,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &822309589
RectTransform:
m_ObjectHideFlags: 0
@@ -3839,7 +4003,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 920822581}
m_LocalRotation: {x: 0.53729963, y: 0, z: 0, w: 0.8433915}
- m_LocalPosition: {x: 0, y: 0, z: -0.066}
+ m_LocalPosition: {x: 0, y: 0, z: -0.227}
m_LocalScale: {x: 0.015, y: 0.015, z: 1}
m_Children: []
m_Father: {fileID: 1565815663}
@@ -3847,7 +4011,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 65, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 0.015, y: 0.912}
+ m_AnchoredPosition: {x: 0.015, y: 0.87}
m_SizeDelta: {x: 2.86, y: 4.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &920822583
@@ -4231,7 +4395,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- - {fileID: 2132267503}
+ - {fileID: 1718457529}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@@ -4259,7 +4423,7 @@ MeshFilter:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 954810121}
- m_Mesh: {fileID: 1485653375}
+ m_Mesh: {fileID: 723322208}
--- !u!1 &954809397
GameObject:
m_ObjectHideFlags: 0
@@ -4579,7 +4743,7 @@ BoxCollider:
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
- m_Size: {x: 1, y: 1, z: 1}
+ m_Size: {x: 1, y: 1.41, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!23 &1005606128
MeshRenderer:
@@ -4636,7 +4800,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1005606126}
m_LocalRotation: {x: 0.00039833234, y: -0.00017801579, z: -0.016056404, w: 0.9998711}
- m_LocalPosition: {x: 0.13844302, y: 0.44658753, z: 0.284}
+ m_LocalPosition: {x: -0.189, y: 0.477, z: 0.284}
m_LocalScale: {x: 0.29969102, y: 0.2501289, z: 0.120000035}
m_Children: []
m_Father: {fileID: 1738561792}
@@ -4953,7 +5117,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1117540884}
m_LocalRotation: {x: 0.53729963, y: 0, z: 0, w: 0.8433915}
- m_LocalPosition: {x: 0, y: 0, z: -0.066}
+ m_LocalPosition: {x: 0, y: 0, z: -0.227}
m_LocalScale: {x: 0.015, y: 0.015, z: 1}
m_Children: []
m_Father: {fileID: 1565815663}
@@ -4961,7 +5125,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 65, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 0.357, y: 0.912}
+ m_AnchoredPosition: {x: 0.357, y: 0.87}
m_SizeDelta: {x: 2.86, y: 4.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1117540886
@@ -5566,7 +5730,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1215890984}
m_LocalRotation: {x: 0.53729963, y: 0, z: 0, w: 0.8433915}
- m_LocalPosition: {x: 0, y: 0, z: -0.066}
+ m_LocalPosition: {x: 0, y: 0, z: -0.227}
m_LocalScale: {x: 0.015, y: 0.015, z: 1}
m_Children: []
m_Father: {fileID: 1565815663}
@@ -5574,7 +5738,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 65, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 0.542, y: 0.912}
+ m_AnchoredPosition: {x: 0.542, y: 0.87}
m_SizeDelta: {x: 2.86, y: 4.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1215890986
@@ -5989,7 +6153,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1351641712}
m_LocalRotation: {x: 0.53729963, y: 0, z: 0, w: 0.8433915}
- m_LocalPosition: {x: 0, y: 0, z: -0.066}
+ m_LocalPosition: {x: 0, y: 0, z: -0.227}
m_LocalScale: {x: 0.015, y: 0.015, z: 1}
m_Children: []
m_Father: {fileID: 1565815663}
@@ -5997,7 +6161,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 65, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 0.882, y: 0.912}
+ m_AnchoredPosition: {x: 0.882, y: 0.87}
m_SizeDelta: {x: 2.86, y: 4.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1351641714
@@ -6165,7 +6329,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1392348134}
m_LocalRotation: {x: 0.53729963, y: -0, z: -0, w: 0.8433915}
- m_LocalPosition: {x: 0, y: 0, z: -0.191}
+ m_LocalPosition: {x: 0, y: 0, z: -0.133}
m_LocalScale: {x: 0.015, y: 0.014999999, z: 1}
m_Children: []
m_Father: {fileID: 1565815663}
@@ -6173,7 +6337,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 65, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: -0.071, y: 0.853}
+ m_AnchoredPosition: {x: -0.131, y: 0.9156}
m_SizeDelta: {x: 13.3, y: 4.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1392348136
@@ -6197,14 +6361,14 @@ MonoBehaviour:
m_text: trifft nicht zu
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
- m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+ m_sharedMaterial: {fileID: 2100000, guid: 79459efec17a4d00a321bdcc27bbc385, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
- rgba: 4280558628
- m_fontColor: {r: 0.14150941, g: 0.14150941, b: 0.14150941, a: 1}
+ rgba: 4278190080
+ m_fontColor: {r: 0, g: 0, b: 0, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
@@ -6222,13 +6386,13 @@ MonoBehaviour:
m_outlineColor:
serializedVersion: 2
rgba: 4278190080
- m_fontSize: 2.2
- m_fontSizeBase: 2.2
+ m_fontSize: 3.48
+ m_fontSizeBase: 3.48
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
- m_fontStyle: 1
+ m_fontStyle: 5
m_textAlignment: 257
m_characterSpacing: 0
m_wordSpacing: 0
@@ -6260,7 +6424,7 @@ MonoBehaviour:
m_firstVisibleCharacter: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
- m_margin: {x: 0.21846358, y: 0, z: 0, w: 0}
+ m_margin: {x: 0.21846358, y: 0, z: -15.891628, w: 0}
m_textInfo:
textComponent: {fileID: 1392348136}
characterCount: 15
@@ -6320,7 +6484,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1407195038}
m_LocalRotation: {x: 0.53729963, y: -0, z: -0, w: 0.8433915}
- m_LocalPosition: {x: 0, y: 0, z: -0.191}
+ m_LocalPosition: {x: 0, y: 0, z: -0.133}
m_LocalScale: {x: 0.015, y: 0.014999999, z: 1}
m_Children: []
m_Father: {fileID: 1565815663}
@@ -6328,7 +6492,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 65, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 0.894, y: 0.853}
+ m_AnchoredPosition: {x: 0.894, y: 0.9156}
m_SizeDelta: {x: 13.3, y: 4.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1407195040
@@ -6352,14 +6516,14 @@ MonoBehaviour:
m_text: trifft zu
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
- m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+ m_sharedMaterial: {fileID: 2100000, guid: 79459efec17a4d00a321bdcc27bbc385, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
- rgba: 4280558628
- m_fontColor: {r: 0.14150941, g: 0.14150941, b: 0.14150941, a: 1}
+ rgba: 4278190080
+ m_fontColor: {r: 0, g: 0, b: 0, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
@@ -6377,13 +6541,13 @@ MonoBehaviour:
m_outlineColor:
serializedVersion: 2
rgba: 4278190080
- m_fontSize: 2.2
- m_fontSizeBase: 2.2
+ m_fontSize: 3.48
+ m_fontSizeBase: 3.48
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
- m_fontStyle: 1
+ m_fontStyle: 5
m_textAlignment: 257
m_characterSpacing: 0
m_wordSpacing: 0
@@ -6995,169 +7159,6 @@ MonoBehaviour:
stageTime: 0
gameFinished: 0
gameStarted: 0
---- !u!43 &1485653375
-Mesh:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_Name:
- serializedVersion: 10
- m_SubMeshes:
- - serializedVersion: 2
- firstByte: 0
- indexCount: 24
- topology: 0
- baseVertex: 0
- firstVertex: 0
- vertexCount: 8
- localAABB:
- m_Center: {x: 0, y: 0.01, z: 0}
- m_Extent: {x: 1.65, y: 0, z: 1.275}
- m_Shapes:
- vertices: []
- shapes: []
- channels: []
- fullWeights: []
- m_BindPose: []
- m_BoneNameHashes:
- m_RootBoneNameHash: 0
- m_BonesAABB: []
- m_VariableBoneCountWeights:
- m_Data:
- m_MeshCompression: 0
- m_IsReadable: 1
- m_KeepVertices: 1
- m_KeepIndices: 1
- m_IndexFormat: 0
- m_IndexBuffer: 000004000100010004000500010005000200020005000600020006000300030006000700030007000000000007000400
- m_VertexData:
- serializedVersion: 3
- m_VertexCount: 8
- m_Channels:
- - stream: 0
- offset: 0
- format: 0
- dimension: 3
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 12
- format: 0
- dimension: 4
- - stream: 0
- offset: 28
- format: 0
- dimension: 2
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- m_DataSize: 288
- _typelessdata: 0000c03f0ad7233c000090bf000000000000803f0000803f0000803f00000000000000000000c0bf0ad7233c000090bf000000000000803f0000803f0000803f0000803f000000000000c0bf0ad7233c0000903f000000000000803f0000803f0000803f00000000000000000000c03f0ad7233c0000903f000000000000803f0000803f0000803f0000803f000000003333d33f0ad7233c3333a3bf000000000000803f0000803f00000000000000000000803f3333d3bf0ad7233c3333a3bf000000000000803f0000803f000000000000803f0000803f3333d3bf0ad7233c3333a33f000000000000803f0000803f00000000000000000000803f3333d33f0ad7233c3333a33f000000000000803f0000803f000000000000803f0000803f
- m_CompressedMesh:
- m_Vertices:
- m_NumItems: 0
- m_Range: 0
- m_Start: 0
- m_Data:
- m_BitSize: 0
- m_UV:
- m_NumItems: 0
- m_Range: 0
- m_Start: 0
- m_Data:
- m_BitSize: 0
- m_Normals:
- m_NumItems: 0
- m_Range: 0
- m_Start: 0
- m_Data:
- m_BitSize: 0
- m_Tangents:
- m_NumItems: 0
- m_Range: 0
- m_Start: 0
- m_Data:
- m_BitSize: 0
- m_Weights:
- m_NumItems: 0
- m_Data:
- m_BitSize: 0
- m_NormalSigns:
- m_NumItems: 0
- m_Data:
- m_BitSize: 0
- m_TangentSigns:
- m_NumItems: 0
- m_Data:
- m_BitSize: 0
- m_FloatColors:
- m_NumItems: 0
- m_Range: 0
- m_Start: 0
- m_Data:
- m_BitSize: 0
- m_BoneIndices:
- m_NumItems: 0
- m_Data:
- m_BitSize: 0
- m_Triangles:
- m_NumItems: 0
- m_Data:
- m_BitSize: 0
- m_UVInfo: 0
- m_LocalAABB:
- m_Center: {x: 0, y: 0.01, z: 0}
- m_Extent: {x: 1.65, y: 0, z: 1.275}
- m_MeshUsageFlags: 0
- m_BakedConvexCollisionMesh:
- m_BakedTriangleCollisionMesh:
- m_MeshMetrics[0]: 1
- m_MeshMetrics[1]: 1
- m_MeshOptimizationFlags: 1
- m_StreamData:
- offset: 0
- size: 0
- path:
--- !u!1 &1505181485
GameObject:
m_ObjectHideFlags: 0
@@ -7637,7 +7638,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1609551669}
m_LocalRotation: {x: 0.53729963, y: 0, z: 0, w: 0.8433915}
- m_LocalPosition: {x: 0, y: 0, z: -0.306}
+ m_LocalPosition: {x: 0, y: 0, z: 0.007}
m_LocalScale: {x: 0.015, y: 0.015, z: 1}
m_Children: []
m_Father: {fileID: 1565815663}
@@ -7645,7 +7646,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 65, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 0.834, y: 0.8}
+ m_AnchoredPosition: {x: 0.366, y: 0.98}
m_SizeDelta: {x: 13.3, y: 4.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1609551671
@@ -8055,6 +8056,40 @@ SphereCollider:
type: 3}
m_PrefabInstance: {fileID: 2611299300477793533}
m_PrefabAsset: {fileID: 0}
+--- !u!21 &1718457529
+Material:
+ serializedVersion: 6
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Sprites/Default
+ m_Shader: {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
+ m_ShaderKeywords:
+ m_LightmapFlags: 4
+ m_EnableInstancingVariants: 0
+ m_DoubleSidedGI: 0
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
+ disabledShaderPasses: []
+ m_SavedProperties:
+ serializedVersion: 3
+ m_TexEnvs:
+ - _AlphaTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ m_Floats:
+ - PixelSnap: 0
+ - _EnableExternalAlpha: 0
+ m_Colors:
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _Flip: {r: 1, g: 1, b: 1, a: 1}
+ - _RendererColor: {r: 1, g: 1, b: 1, a: 1}
--- !u!1 &1725504905
GameObject:
m_ObjectHideFlags: 0
@@ -13231,7 +13266,7 @@ BoxCollider:
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
- m_Size: {x: 1, y: 1, z: 1}
+ m_Size: {x: 1, y: 1.41, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!23 &1875114268
MeshRenderer:
@@ -13288,7 +13323,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1875114266}
m_LocalRotation: {x: 0.00039833234, y: -0.00017801579, z: -0.016056404, w: 0.9998711}
- m_LocalPosition: {x: 0.13928825, y: 0.44749382, z: -0.28480002}
+ m_LocalPosition: {x: -0.188, y: 0.478, z: -0.28480002}
m_LocalScale: {x: 0.29969102, y: 0.2501289, z: 0.120000035}
m_Children: []
m_Father: {fileID: 1738561792}
@@ -13349,7 +13384,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1890225094}
m_LocalRotation: {x: 0.53729963, y: 0, z: 0, w: 0.8433915}
- m_LocalPosition: {x: 0, y: 0, z: -0.066}
+ m_LocalPosition: {x: 0, y: 0, z: -0.227}
m_LocalScale: {x: 0.015, y: 0.015, z: 1}
m_Children: []
m_Father: {fileID: 1565815663}
@@ -13357,7 +13392,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 65, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 0.718, y: 0.912}
+ m_AnchoredPosition: {x: 0.718, y: 0.87}
m_SizeDelta: {x: 2.86, y: 4.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1890225096
@@ -13735,7 +13770,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1980315637}
m_LocalRotation: {x: 0.53729963, y: 0, z: 0, w: 0.8433915}
- m_LocalPosition: {x: 0, y: 0, z: -0.066}
+ m_LocalPosition: {x: 0, y: 0, z: -0.227}
m_LocalScale: {x: 0.015, y: 0.015, z: 1}
m_Children: []
m_Father: {fileID: 1565815663}
@@ -13743,7 +13778,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 65, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: -0.156, y: 0.912}
+ m_AnchoredPosition: {x: -0.156, y: 0.87}
m_SizeDelta: {x: 2.86, y: 4.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1980315639
@@ -14168,7 +14203,7 @@ BoxCollider:
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
- m_Size: {x: 1, y: 1, z: 1}
+ m_Size: {x: 1, y: 1.41, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!23 &2109987835
MeshRenderer:
@@ -14225,7 +14260,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2109987833}
m_LocalRotation: {x: 0.00039833234, y: -0.00017801579, z: -0.016056404, w: 0.9998711}
- m_LocalPosition: {x: 0.13928825, y: 0.44749382, z: -0.14160001}
+ m_LocalPosition: {x: -0.188, y: 0.478, z: -0.14160001}
m_LocalScale: {x: 0.29969102, y: 0.2501289, z: 0.120000035}
m_Children: []
m_Father: {fileID: 1738561792}
@@ -14260,40 +14295,6 @@ Rigidbody:
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
---- !u!21 &2132267503
-Material:
- serializedVersion: 6
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_Name: Sprites/Default
- m_Shader: {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
- m_ShaderKeywords:
- m_LightmapFlags: 4
- m_EnableInstancingVariants: 0
- m_DoubleSidedGI: 0
- m_CustomRenderQueue: -1
- stringTagMap: {}
- disabledShaderPasses: []
- m_SavedProperties:
- serializedVersion: 3
- m_TexEnvs:
- - _AlphaTex:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- - _MainTex:
- m_Texture: {fileID: 0}
- m_Scale: {x: 1, y: 1}
- m_Offset: {x: 0, y: 0}
- m_Floats:
- - PixelSnap: 0
- - _EnableExternalAlpha: 0
- m_Colors:
- - _Color: {r: 1, g: 1, b: 1, a: 1}
- - _Flip: {r: 1, g: 1, b: 1, a: 1}
- - _RendererColor: {r: 1, g: 1, b: 1, a: 1}
--- !u!1 &2133499086
GameObject:
m_ObjectHideFlags: 0
@@ -14326,7 +14327,7 @@ BoxCollider:
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
- m_Size: {x: 1, y: 1, z: 1}
+ m_Size: {x: 1, y: 1.41, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!23 &2133499088
MeshRenderer:
@@ -14383,7 +14384,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2133499086}
m_LocalRotation: {x: 0.00039833234, y: -0.00017801579, z: -0.016056404, w: 0.9998711}
- m_LocalPosition: {x: 0.13928825, y: 0.44749382, z: -0.42}
+ m_LocalPosition: {x: -0.188, y: 0.478, z: -0.42}
m_LocalScale: {x: 0.29969102, y: 0.2501289, z: 0.120000035}
m_Children: []
m_Father: {fileID: 1738561792}
diff --git a/Assets/Scripts/ActionHandler.cs b/Assets/Scripts/ActionHandler.cs
index b9291f1abf8d6c9bb048d4c4ca98a5288a61be64..a48d98afea7ed03eb9fc31f3edb26694cc096414 100644
--- a/Assets/Scripts/ActionHandler.cs
+++ b/Assets/Scripts/ActionHandler.cs
@@ -28,7 +28,8 @@ public class ActionHandler : MonoBehaviour
public string SysTimeTriggerpress; //Timestamp when trigger was pressed
public string SysTimeTriggerRelease; //Timestamp when trigger was released
- public string SysTimeTargetAct; //Time when Target was activated
+ public string SysTimeTargetAct;
+ [Record("isTriggerpressed")] //Time when Target was activated
public bool isTriggerpressed; //Bool wether trigger is currently pressed
public bool targetActButtonPress; //Bool wheter touch pad for target act. is pressed
diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs
index c5aa695ce7ed14173de9e98ece2907be3591867d..f962cfb9732b8b5a49ab803695e5b2ea2d852859 100644
--- a/Assets/Scripts/GameManager.cs
+++ b/Assets/Scripts/GameManager.cs
@@ -87,6 +87,7 @@ public class GameManager : MonoBehaviour
private System.Random rndm;
+ private ScaleButton[] allScaleButtons;
// used to start the timer only when player throws first ball
public static bool startTimer;
@@ -132,7 +133,7 @@ public class GameManager : MonoBehaviour
// Start is called before the first frame update
void Start()
{
-
+ allScaleButtons = FindObjectsOfType<ScaleButton>();
}
public void ContinueStudy()
@@ -214,49 +215,82 @@ public class GameManager : MonoBehaviour
}
}
+ private KeyCode[] keyCodes = {
+ KeyCode.Alpha1,
+ KeyCode.Alpha2,
+ KeyCode.Alpha3,
+ KeyCode.Alpha4,
+ KeyCode.Alpha5,
+ KeyCode.Alpha6,
+ KeyCode.Alpha7
+ };
+
// Update is called once per frame
void Update()
{
- if(Input.GetKeyDown(KeyCode.Space)){
+ if(_currentState == GameState.BeforeStart && Input.GetKeyDown(KeyCode.Space)){
ContinueStudy();
}
- if (Input.GetKeyDown("p"))
- {
- ViveSR.anipal.Eye.SRanipal_Eye_v2.LaunchEyeCalibration();
- }
+ //if (Input.GetKeyDown("p"))
+ //{
+ // ViveSR.anipal.Eye.SRanipal_Eye_v2.LaunchEyeCalibration();
+ //}
- if (Input.GetKeyDown("s")) //Press Key S to start game / spawn Ball
- {
- // QuestionnaireManager.instance.questionsToAsk.Push(QuestionnaireUIHandler.instance.FAM[FAMQuestionNrDuringTrial]);
- QuestionnaireManager.instance.startFullQuestionnaire();
- StartQuestionnaire();
- }
+ //if (Input.GetKeyDown("s")) //Press Key S to start game / spawn Ball
+ //{
+ // // QuestionnaireManager.instance.questionsToAsk.Push(QuestionnaireUIHandler.instance.FAM[FAMQuestionNrDuringTrial]);
+ // QuestionnaireManager.instance.startFullQuestionnaire();
+ // StartQuestionnaire();
+ //}
+
+ //if (Input.GetKeyDown("e")) //Press E to force Game to quit
+ //{
+ // EndGame();
+ //}
- if (Input.GetKeyDown("e")) //Press E to force Game to quit
- {
- EndGame();
- }
if (Input.GetKeyDown("r")) //Press R to reset the Ball
{
BallHandler.instance.ForceBallReset(Ball);
}
- if (Input.GetKeyDown(KeyCode.Alpha1))
+ if(_currentState == GameState.StudyPart_1_Question ||
+ _currentState == GameState.StudyPart_2_Question ||
+ _currentState == GameState.FirstQuestionaire ||
+ _currentState == GameState.SecondQuestionaire)
{
- var btn = FindObjectsOfType<ScaleButton>();
- if(btn.Length > 0)
- QuestionnaireUIHandler.instance.ButtonSelected(btn[UnityEngine.Random.Range(0, btn.Length)]);
-
- }
+ for (int i = 0; i < keyCodes.Length; i++)
+ {
+ if (Input.GetKeyDown(keyCodes[i]))
+ {
+ for (int j = 0; j < allScaleButtons.Length; j++)
+ {
+ if (allScaleButtons[j].ButtonValue == i + 1)
+ {
+ QuestionnaireUIHandler.instance.ButtonSelected(allScaleButtons[j]);
+ }
+ }
+ }
+ }
- if (Input.GetKeyDown(KeyCode.Alpha2))
- {
- QuestionnaireUIHandler.instance.ConfirmButtonSelected();
+ //if (Input.GetKeyDown(KeyCode.Alpha1))
+ //{
+ // var btn = FindObjectsOfType<ScaleButton>();
+ // if(btn.Length > 0)
+ // QuestionnaireUIHandler.instance.ButtonSelected(btn[UnityEngine.Random.Range(0, btn.Length)]);
+
+ //}
+
+ if (Input.GetKeyDown(KeyCode.Alpha0))
+ {
+ QuestionnaireUIHandler.instance.ConfirmButtonSelected();
+ }
}
+
+
// if (ThrowCounter > (ThrowsInExperimentCondition-1) && ActGame == true) //Automatically end Game after desired number of throws have been reached
diff --git a/Assets/Scripts/UIScripts/QuestionnaireUIHandler.cs b/Assets/Scripts/UIScripts/QuestionnaireUIHandler.cs
index 09d11f86dee3f0962568058a6f670680ed2cdaed..60bafb4b861b2e427ca094c0a3e4774b84493949 100644
--- a/Assets/Scripts/UIScripts/QuestionnaireUIHandler.cs
+++ b/Assets/Scripts/UIScripts/QuestionnaireUIHandler.cs
@@ -21,6 +21,7 @@ public class QuestionnaireUIHandler : MonoBehaviour
public GameObject[] AnswerScale = new GameObject[7];
public GameObject deleteButton;
public GameObject nextButton;
+ public GameObject nextButtonText;
public Material selectedMat;
public Material defaultMat;
@@ -65,6 +66,7 @@ public class QuestionnaireUIHandler : MonoBehaviour
currentAnswer = null;
questionText.gameObject.GetComponent<Text>();
+ nextButton.GetComponent<MeshRenderer>().material = selectedMat;
SetQuestioninUI(currentQuestion);
@@ -133,19 +135,23 @@ public class QuestionnaireUIHandler : MonoBehaviour
public void ButtonSelected(ScaleButton button)
{
+ nextButton.SetActive(true);
+ nextButtonText.SetActive(true);
currentAnswer = button;
OnlyColorButton(currentAnswer);
}
public void DeleteButtonSelected()
{
+ nextButton.SetActive(false);
+ nextButtonText.SetActive(false);
if (currentAnswer != null)
{
currentAnswer.GetComponent<MeshRenderer>().material = defaultMat;
currentAnswer = null;
}
- deleteButton.GetComponent<MeshRenderer>().material = defaultMat;
- nextButton.GetComponent<MeshRenderer>().material = defaultMat;
+ //deleteButton.GetComponent<MeshRenderer>().material = defaultMat;
+ nextButton.GetComponent<MeshRenderer>().material = selectedMat;
}