tschirkylisa
/
XR_Farbenblindheit_neu
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Nochmals getestet ob Äpfel greifbar sind, funktioniert immer noch nicht.

master
Lisa Tschirky 2022-11-09 14:36:17 +01:00
parent fc05b7091f
commit f529879ccb
3 changed files with 104 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Assets/Flow_Machines/Apfelaufgabe/Apfel_Gravity.asset
View File

@ -14,5 +14,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
_data:
_json: '{"graph":{"variables":{"Kind":"Flow","collection":{"$content":[],"$version":"A"},"$version":"A"},"controlInputDefinitions":[],"controlOutputDefinitions":[],"valueInputDefinitions":[],"valueOutputDefinitions":[],"title":"Apfel
Schwerkraft aktivieren","summary":null,"pan":{"x":195.062,"y":-153.6044},"zoom":1.0,"elements":[{"coroutine":false,"defaultValues":{},"position":{"x":-204.0,"y":-144.0},"guid":"4a4eabfe-0120-4a13-bbe5-7c72219d27d8","$version":"A","$type":"Bolt.Start"},{"coroutine":false,"defaultValues":{},"position":{"x":-291.0,"y":14.0},"guid":"ebea498f-2349-4514-88f0-f2d07cae6d4a","$version":"A","$type":"Bolt.Update"},{"coroutine":false,"defaultValues":{"target":null},"position":{"x":-327.0,"y":-419.0},"guid":"7e6eab59-37b9-460f-9732-f823117c972c","$version":"A","$type":"Bolt.OnCollisionEnter","$id":"13"},{"chainable":false,"member":{"name":"useGravity","parameterTypes":null,"targetType":"UnityEngine.Rigidbody","targetTypeName":"UnityEngine.Rigidbody","$version":"A"},"defaultValues":{"target":null,"input":{"$content":true,"$type":"System.Boolean"}},"position":{"x":378.0,"y":-524.0},"guid":"2655dbed-ffe6-424d-a426-156fbf76f998","$version":"A","$type":"Bolt.SetMember","$id":"15"},{"defaultValues":{},"position":{"x":142.0,"y":-479.0},"guid":"6f35efd1-96e2-4c1c-b80a-75cfb9a583fd","$version":"A","$type":"Bolt.Branch","$id":"18"},{"type":"UnityEngine.Collider","instance":true,"static":true,"defaultValues":{"target":null},"position":{"x":21.0,"y":-237.0},"guid":"6c3759b6-68b5-4b21-9bc2-ff05850ac38d","$version":"A","$type":"Bolt.Expose","$id":"20"},{"chainable":false,"member":{"name":"Equals","parameterTypes":["System.String"],"targetType":"System.String","targetTypeName":"System.String","$version":"A"},"defaultValues":{"target":{"$content":"","$type":"System.String"},"%value":{"$content":"Apfel_gruen","$type":"System.String"}},"position":{"x":274.0,"y":-10.0},"guid":"9a46e84f-42a5-4b94-adca-bc14e8260450","$version":"A","$type":"Bolt.InvokeMember","$id":"22"},{"sourceUnit":{"$ref":"18"},"sourceKey":"ifTrue","destinationUnit":{"$ref":"15"},"destinationKey":"assign","guid":"b61c21ea-a022-4f9a-aa48-4aaa084c09bb","$type":"Bolt.ControlConnection"},{"sourceUnit":{"$ref":"13"},"sourceKey":"trigger","destinationUnit":{"$ref":"18"},"destinationKey":"enter","guid":"bf98b322-3d2b-440f-a8ba-2c07b3792385","$type":"Bolt.ControlConnection"},{"sourceUnit":{"$ref":"13"},"sourceKey":"collider","destinationUnit":{"$ref":"20"},"destinationKey":"target","guid":"88b8cf49-b968-43e5-b6e9-50e384a4eeab","$type":"Bolt.ValueConnection"},{"sourceUnit":{"$ref":"20"},"sourceKey":"name","destinationUnit":{"$ref":"22"},"destinationKey":"target","guid":"db5c45e9-addf-4119-881b-969c45888710","$type":"Bolt.ValueConnection"},{"sourceUnit":{"$ref":"22"},"sourceKey":"result","destinationUnit":{"$ref":"18"},"destinationKey":"condition","guid":"e773f27c-3754-44f2-8b72-745bc48a7a9b","$type":"Bolt.ValueConnection"}],"$version":"A"}}'
Schwerkraft aktivieren","summary":null,"pan":{"x":191.363,"y":-157.3034},"zoom":1.0,"elements":[{"coroutine":false,"defaultValues":{},"position":{"x":-204.0,"y":-144.0},"guid":"4a4eabfe-0120-4a13-bbe5-7c72219d27d8","$version":"A","$type":"Bolt.Start"},{"coroutine":false,"defaultValues":{},"position":{"x":-291.0,"y":14.0},"guid":"ebea498f-2349-4514-88f0-f2d07cae6d4a","$version":"A","$type":"Bolt.Update"},{"coroutine":false,"defaultValues":{"target":null},"position":{"x":-327.0,"y":-419.0},"guid":"7e6eab59-37b9-460f-9732-f823117c972c","$version":"A","$type":"Bolt.OnCollisionEnter","$id":"13"},{"chainable":false,"member":{"name":"useGravity","parameterTypes":null,"targetType":"UnityEngine.Rigidbody","targetTypeName":"UnityEngine.Rigidbody","$version":"A"},"defaultValues":{"target":null,"input":{"$content":true,"$type":"System.Boolean"}},"position":{"x":378.0,"y":-524.0},"guid":"2655dbed-ffe6-424d-a426-156fbf76f998","$version":"A","$type":"Bolt.SetMember","$id":"15"},{"defaultValues":{},"position":{"x":142.0,"y":-479.0},"guid":"6f35efd1-96e2-4c1c-b80a-75cfb9a583fd","$version":"A","$type":"Bolt.Branch","$id":"18"},{"type":"UnityEngine.Collider","instance":true,"static":true,"defaultValues":{"target":null},"position":{"x":21.0,"y":-237.0},"guid":"6c3759b6-68b5-4b21-9bc2-ff05850ac38d","$version":"A","$type":"Bolt.Expose","$id":"20"},{"chainable":false,"member":{"name":"Equals","parameterTypes":["System.String"],"targetType":"System.String","targetTypeName":"System.String","$version":"A"},"defaultValues":{"target":{"$content":"","$type":"System.String"},"%value":{"$content":"RightHand
Controller","$type":"System.String"}},"position":{"x":317.0,"y":-14.0},"guid":"9a46e84f-42a5-4b94-adca-bc14e8260450","$version":"A","$type":"Bolt.InvokeMember","$id":"22"},{"sourceUnit":{"$ref":"18"},"sourceKey":"ifTrue","destinationUnit":{"$ref":"15"},"destinationKey":"assign","guid":"b61c21ea-a022-4f9a-aa48-4aaa084c09bb","$type":"Bolt.ControlConnection"},{"sourceUnit":{"$ref":"13"},"sourceKey":"trigger","destinationUnit":{"$ref":"18"},"destinationKey":"enter","guid":"bf98b322-3d2b-440f-a8ba-2c07b3792385","$type":"Bolt.ControlConnection"},{"sourceUnit":{"$ref":"13"},"sourceKey":"collider","destinationUnit":{"$ref":"20"},"destinationKey":"target","guid":"88b8cf49-b968-43e5-b6e9-50e384a4eeab","$type":"Bolt.ValueConnection"},{"sourceUnit":{"$ref":"20"},"sourceKey":"name","destinationUnit":{"$ref":"22"},"destinationKey":"target","guid":"db5c45e9-addf-4119-881b-969c45888710","$type":"Bolt.ValueConnection"},{"sourceUnit":{"$ref":"22"},"sourceKey":"result","destinationUnit":{"$ref":"18"},"destinationKey":"condition","guid":"e773f27c-3754-44f2-8b72-745bc48a7a9b","$type":"Bolt.ValueConnection"}],"$version":"A"}}'
_objectReferences: []

228
Assets/Scenes/Apfelbaum.unity
View File

@ -134,6 +134,7 @@ GameObject:
- component: {fileID: 89862679}
- component: {fileID: 89862682}
- component: {fileID: 89862680}
- component: {fileID: 89862681}
m_Layer: 0
m_Name: RightHand Controller
m_TagString: Untagged
@ -169,6 +170,85 @@ SphereCollider:
serializedVersion: 2
m_Radius: 0.25
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &89862681
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 89862678}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4253f32900bcc4d499d675566142ded0, type: 3}
m_Name:
m_EditorClassIdentifier:
m_InteractionManager: {fileID: 104226241}
m_InteractionLayerMask:
serializedVersion: 2
m_Bits: 4294967295
m_InteractionLayers:
m_Bits: 4294967295
m_AttachTransform: {fileID: 0}
m_KeepSelectedTargetValid: 1
m_StartingSelectedInteractable: {fileID: 0}
m_StartingTargetFilter: {fileID: 0}
m_HoverEntered:
m_PersistentCalls:
m_Calls: []
m_HoverExited:
m_PersistentCalls:
m_Calls: []
m_SelectEntered:
m_PersistentCalls:
m_Calls: []
m_SelectExited:
m_PersistentCalls:
m_Calls: []
m_OnHoverEntered:
m_PersistentCalls:
m_Calls: []
m_OnHoverExited:
m_PersistentCalls:
m_Calls: []
m_OnSelectEntered:
m_PersistentCalls:
m_Calls: []
m_OnSelectExited:
m_PersistentCalls:
m_Calls: []
m_SelectActionTrigger: 0
m_HideControllerOnSelect: 0
m_AllowHoveredActivate: 0
m_PlayAudioClipOnSelectEntered: 0
m_AudioClipForOnSelectEntered: {fileID: 0}
m_PlayAudioClipOnSelectExited: 0
m_AudioClipForOnSelectExited: {fileID: 0}
m_PlayAudioClipOnSelectCanceled: 0
m_AudioClipForOnSelectCanceled: {fileID: 0}
m_PlayAudioClipOnHoverEntered: 0
m_AudioClipForOnHoverEntered: {fileID: 0}
m_PlayAudioClipOnHoverExited: 0
m_AudioClipForOnHoverExited: {fileID: 0}
m_PlayAudioClipOnHoverCanceled: 0
m_AudioClipForOnHoverCanceled: {fileID: 0}
m_PlayHapticsOnSelectEntered: 0
m_HapticSelectEnterIntensity: 0
m_HapticSelectEnterDuration: 0
m_PlayHapticsOnSelectExited: 0
m_HapticSelectExitIntensity: 0
m_HapticSelectExitDuration: 0
m_PlayHapticsOnSelectCanceled: 0
m_HapticSelectCancelIntensity: 0
m_HapticSelectCancelDuration: 0
m_PlayHapticsOnHoverEntered: 0
m_HapticHoverEnterIntensity: 0
m_HapticHoverEnterDuration: 0
m_PlayHapticsOnHoverExited: 0
m_HapticHoverExitIntensity: 0
m_HapticHoverExitDuration: 0
m_PlayHapticsOnHoverCanceled: 0
m_HapticHoverCancelIntensity: 0
m_HapticHoverCancelDuration: 0
--- !u!114 &89862682
MonoBehaviour:
m_ObjectHideFlags: 0
@ -341,67 +421,6 @@ Animator:
m_CorrespondingSourceObject: {fileID: 292557021290420228, guid: 85e697e7f3d9943dfba6d82f0eecf0b5, type: 3}
m_PrefabInstance: {fileID: 292557021509819105}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &304556172
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1381373545, guid: aea0e435bfbfe4b769e56d6456aae5cb, type: 3}
propertyPath: m_UseGravity
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1442418227794880128, guid: aea0e435bfbfe4b769e56d6456aae5cb, type: 3}
propertyPath: m_Name
value: Apfel_rot (1)
objectReference: {fileID: 0}
- target: {fileID: 2256214425884392506, guid: aea0e435bfbfe4b769e56d6456aae5cb, type: 3}
propertyPath: m_RootOrder
value: 17
objectReference: {fileID: 0}
- target: {fileID: 2256214425884392506, guid: aea0e435bfbfe4b769e56d6456aae5cb, type: 3}
propertyPath: m_LocalPosition.x
value: -0.674
objectReference: {fileID: 0}
- target: {fileID: 2256214425884392506, guid: aea0e435bfbfe4b769e56d6456aae5cb, type: 3}
propertyPath: m_LocalPosition.y
value: 0.48
objectReference: {fileID: 0}
- target: {fileID: 2256214425884392506, guid: aea0e435bfbfe4b769e56d6456aae5cb, type: 3}
propertyPath: m_LocalPosition.z
value: -3.022
objectReference: {fileID: 0}
- target: {fileID: 2256214425884392506, guid: aea0e435bfbfe4b769e56d6456aae5cb, type: 3}
propertyPath: m_LocalRotation.w
value: -3.7493994e-33
objectReference: {fileID: 0}
- target: {fileID: 2256214425884392506, guid: aea0e435bfbfe4b769e56d6456aae5cb, type: 3}
propertyPath: m_LocalRotation.x
value: -6.123234e-17
objectReference: {fileID: 0}
- target: {fileID: 2256214425884392506, guid: aea0e435bfbfe4b769e56d6456aae5cb, type: 3}
propertyPath: m_LocalRotation.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2256214425884392506, guid: aea0e435bfbfe4b769e56d6456aae5cb, type: 3}
propertyPath: m_LocalRotation.z
value: 6.123234e-17
objectReference: {fileID: 0}
- target: {fileID: 2256214425884392506, guid: aea0e435bfbfe4b769e56d6456aae5cb, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2256214425884392506, guid: aea0e435bfbfe4b769e56d6456aae5cb, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2256214425884392506, guid: aea0e435bfbfe4b769e56d6456aae5cb, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: aea0e435bfbfe4b769e56d6456aae5cb, type: 3}
--- !u!1 &688630549
GameObject:
m_ObjectHideFlags: 0
@ -564,11 +583,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7738627022066080824, guid: 28f8cfd23101340a7aab25506355b83b, type: 3}
propertyPath: m_LocalPosition.x
value: -0
value: -1.5
objectReference: {fileID: 0}
- target: {fileID: 7738627022066080824, guid: 28f8cfd23101340a7aab25506355b83b, type: 3}
propertyPath: m_LocalPosition.y
value: 1.269
value: 1.45
objectReference: {fileID: 0}
- target: {fileID: 7738627022066080824, guid: 28f8cfd23101340a7aab25506355b83b, type: 3}
propertyPath: m_LocalPosition.z
@ -611,6 +630,18 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 430301607, guid: aea0e435bfbfe4b769e56d6456aae5cb, type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1381373545, guid: aea0e435bfbfe4b769e56d6456aae5cb, type: 3}
propertyPath: m_Mass
value: 200
objectReference: {fileID: 0}
- target: {fileID: 1381373545, guid: aea0e435bfbfe4b769e56d6456aae5cb, type: 3}
propertyPath: m_UseGravity
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1442418227794880128, guid: aea0e435bfbfe4b769e56d6456aae5cb, type: 3}
propertyPath: m_Name
value: Apfel_rot
@ -621,15 +652,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2256214425884392506, guid: aea0e435bfbfe4b769e56d6456aae5cb, type: 3}
propertyPath: m_LocalPosition.x
value: -0.78
value: -0.56
objectReference: {fileID: 0}
- target: {fileID: 2256214425884392506, guid: aea0e435bfbfe4b769e56d6456aae5cb, type: 3}
propertyPath: m_LocalPosition.y
value: 0.389
value: -0.02
objectReference: {fileID: 0}
- target: {fileID: 2256214425884392506, guid: aea0e435bfbfe4b769e56d6456aae5cb, type: 3}
propertyPath: m_LocalPosition.z
value: -3.07
value: -2.64
objectReference: {fileID: 0}
- target: {fileID: 2256214425884392506, guid: aea0e435bfbfe4b769e56d6456aae5cb, type: 3}
propertyPath: m_LocalRotation.w
@ -871,7 +902,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1197040854}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 1.1176, z: 0}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1223873006}
@ -1443,7 +1474,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1703809606}
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
m_LocalPosition: {x: 0, y: 0, z: 9.03}
m_LocalPosition: {x: 0, y: 1.6, z: 7.62}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1197040855}
@ -1481,67 +1512,6 @@ MonoBehaviour:
_data:
_json: '{"declarations":{"Kind":"Object","collection":{"$content":[],"$version":"A"},"$version":"A"}}'
_objectReferences: []
--- !u!1001 &1734788817
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1381373545, guid: aea0e435bfbfe4b769e56d6456aae5cb, type: 3}
propertyPath: m_UseGravity
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1442418227794880128, guid: aea0e435bfbfe4b769e56d6456aae5cb, type: 3}
propertyPath: m_Name
value: Apfel_rot (2)
objectReference: {fileID: 0}
- target: {fileID: 2256214425884392506, guid: aea0e435bfbfe4b769e56d6456aae5cb, type: 3}
propertyPath: m_RootOrder
value: 18
objectReference: {fileID: 0}
- target: {fileID: 2256214425884392506, guid: aea0e435bfbfe4b769e56d6456aae5cb, type: 3}
propertyPath: m_LocalPosition.x
value: -0.712
objectReference: {fileID: 0}
- target: {fileID: 2256214425884392506, guid: aea0e435bfbfe4b769e56d6456aae5cb, type: 3}
propertyPath: m_LocalPosition.y
value: 0.59
objectReference: {fileID: 0}
- target: {fileID: 2256214425884392506, guid: aea0e435bfbfe4b769e56d6456aae5cb, type: 3}
propertyPath: m_LocalPosition.z
value: -3.111
objectReference: {fileID: 0}
- target: {fileID: 2256214425884392506, guid: aea0e435bfbfe4b769e56d6456aae5cb, type: 3}
propertyPath: m_LocalRotation.w
value: -3.7493994e-33
objectReference: {fileID: 0}
- target: {fileID: 2256214425884392506, guid: aea0e435bfbfe4b769e56d6456aae5cb, type: 3}
propertyPath: m_LocalRotation.x
value: -6.123234e-17
objectReference: {fileID: 0}
- target: {fileID: 2256214425884392506, guid: aea0e435bfbfe4b769e56d6456aae5cb, type: 3}
propertyPath: m_LocalRotation.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2256214425884392506, guid: aea0e435bfbfe4b769e56d6456aae5cb, type: 3}
propertyPath: m_LocalRotation.z
value: 6.123234e-17
objectReference: {fileID: 0}
- target: {fileID: 2256214425884392506, guid: aea0e435bfbfe4b769e56d6456aae5cb, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2256214425884392506, guid: aea0e435bfbfe4b769e56d6456aae5cb, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2256214425884392506, guid: aea0e435bfbfe4b769e56d6456aae5cb, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: aea0e435bfbfe4b769e56d6456aae5cb, type: 3}
--- !u!1 &2101426763 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 558506032398762142, guid: 9874457212d854803a6c521fe0cd3119, type: 3}

3
ProjectSettings/ProjectSettings.asset
View File

@ -157,6 +157,9 @@ PlayerSettings:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1