Szenen zusammengefügt; Intro fast fertig programmiert, kleiner Bug noch vorhanden (teleportation sollte nicht möglich sein am Anfang). Apfel kann nun aufgenommen werden. Trigger in Apfelbaumszene funktioniert.

master
Lisa Tschirky 2022-11-11 18:04:32 +01:00
parent ad3cdea3ac
commit d818cff8f8
38 changed files with 1928 additions and 728 deletions

View File

@ -14,6 +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":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"}}'
Schwerkraft aktivieren","summary":null,"pan":{"x":187.1636,"y":-161.5028},"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":"Main
Camera","$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: []

BIN
Assets/New Terrain 2.asset Normal file

Binary file not shown.

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 3838c733243e840ab89f436d6261d40a
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 15600000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -12,10 +12,6 @@ GameObject:
- component: {fileID: 2945482274000106399}
- component: {fileID: 1082134724080338773}
- component: {fileID: 1381373545}
- component: {fileID: 1381373546}
- component: {fileID: 1381373547}
- component: {fileID: 430301607}
- component: {fileID: 430301608}
m_Layer: 0
m_Name: Apfel_rot
m_TagString: Roter Apfel
@ -103,167 +99,3 @@ Rigidbody:
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 2
--- !u!65 &1381373546
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1442418227794880128}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 0.08, y: 0.08, z: 0.08}
m_Center: {x: -0.7707734, y: 0.8528452, z: -2.894043}
--- !u!114 &1381373547
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1442418227794880128}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0ad34abafad169848a38072baa96cdb2, type: 3}
m_Name:
m_EditorClassIdentifier:
m_InteractionManager: {fileID: 0}
m_Colliders: []
m_InteractionLayerMask:
serializedVersion: 2
m_Bits: 4294967295
m_InteractionLayers:
m_Bits: 1
m_DistanceCalculationMode: 1
m_SelectMode: 0
m_CustomReticle: {fileID: 0}
m_FirstHoverEntered:
m_PersistentCalls:
m_Calls: []
m_LastHoverExited:
m_PersistentCalls:
m_Calls: []
m_HoverEntered:
m_PersistentCalls:
m_Calls: []
m_HoverExited:
m_PersistentCalls:
m_Calls: []
m_FirstSelectEntered:
m_PersistentCalls:
m_Calls: []
m_LastSelectExited:
m_PersistentCalls:
m_Calls: []
m_SelectEntered:
m_PersistentCalls:
m_Calls: []
m_SelectExited:
m_PersistentCalls:
m_Calls: []
m_Activated:
m_PersistentCalls:
m_Calls: []
m_Deactivated:
m_PersistentCalls:
m_Calls: []
m_OnFirstHoverEntered:
m_PersistentCalls:
m_Calls: []
m_OnLastHoverExited:
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_OnSelectCanceled:
m_PersistentCalls:
m_Calls: []
m_OnActivate:
m_PersistentCalls:
m_Calls: []
m_OnDeactivate:
m_PersistentCalls:
m_Calls: []
m_AttachTransform: {fileID: 0}
m_UseDynamicAttach: 0
m_MatchAttachPosition: 1
m_MatchAttachRotation: 1
m_SnapToColliderVolume: 1
m_AttachEaseInTime: 0.15
m_MovementType: 2
m_VelocityDamping: 1
m_VelocityScale: 1
m_AngularVelocityDamping: 1
m_AngularVelocityScale: 1
m_TrackPosition: 1
m_SmoothPosition: 0
m_SmoothPositionAmount: 5
m_TightenPosition: 0.5
m_TrackRotation: 1
m_SmoothRotation: 0
m_SmoothRotationAmount: 5
m_TightenRotation: 0.5
m_ThrowOnDetach: 1
m_ThrowSmoothingDuration: 0.25
m_ThrowSmoothingCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_ThrowVelocityScale: 1.5
m_ThrowAngularVelocityScale: 1
m_ForceGravityOnDetach: 0
m_RetainTransformParent: 1
m_AttachPointCompatibilityMode: 0
--- !u!114 &430301607
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1442418227794880128}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -57143145, guid: a040fb66244a7f54289914d98ea4ef7d, type: 3}
m_Name:
m_EditorClassIdentifier:
_data:
_json: '{"nest":{"source":"Macro","macro":0,"embed":null}}'
_objectReferences:
- {fileID: 11400000, guid: 8bbd0fce247bc43d98117db90377a825, type: 2}
--- !u!114 &430301608
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1442418227794880128}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -1465209106, guid: c8d0ad23af520fe46aabe2b1fecf6462, type: 3}
m_Name:
m_EditorClassIdentifier:
_data:
_json: '{"declarations":{"Kind":"Object","collection":{"$content":[],"$version":"A"},"$version":"A"}}'
_objectReferences: []

View File

@ -11,9 +11,7 @@ GameObject:
- component: {fileID: 3464863299468952696}
- component: {fileID: 3464863299468952697}
- component: {fileID: 3464863299468952698}
- component: {fileID: 3464863299468952699}
- component: {fileID: 3464863299468952703}
- component: {fileID: 3464863299468952676}
m_Layer: 0
m_Name: Trigger_Boden
m_TagString: Untagged
@ -28,7 +26,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3464863299468952677}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.5798264, y: -0.1, z: 3.1}
m_LocalScale: {x: 12, y: 0.5, z: 0.1}
m_Children: []
@ -84,19 +82,6 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!65 &3464863299468952699
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3464863299468952677}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 10.876321, z: 85.844154}
m_Center: {x: 0, y: 4.9381604, z: -42.42211}
--- !u!114 &3464863299468952703
MonoBehaviour:
m_ObjectHideFlags: 0
@ -112,23 +97,3 @@ MonoBehaviour:
_data:
_json: '{"declarations":{"Kind":"Object","collection":{"$content":[],"$version":"A"},"$version":"A"}}'
_objectReferences: []
--- !u!114 &3464863299468952676
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3464863299468952677}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -57143145, guid: a040fb66244a7f54289914d98ea4ef7d, type: 3}
m_Name:
m_EditorClassIdentifier:
_data:
_json: '{"nest":{"source":"Embed","macro":null,"embed":{"variables":{"Kind":"Flow","collection":{"$content":[],"$version":"A"},"$version":"A"},"controlInputDefinitions":[],"controlOutputDefinitions":[],"valueInputDefinitions":[],"valueOutputDefinitions":[],"title":"Apfelaufgabe
Erz\u00e4hler Trigger Area","summary":"Der Spieler betritt Area, Einleitung
wird abgespielt, nach 15 Sekunden folgt die zweite Aussage des Erz\u00e4hlers","pan":{"x":163.0,"y":-78.0},"zoom":1.0,"elements":[{"coroutine":false,"defaultValues":{"target":null},"position":{"x":-276.0,"y":-327.0},"guid":"558a825c-0d91-4dcd-9a86-826207cad298","$version":"A","$type":"Bolt.OnTriggerEnter","$id":"10"},{"defaultValues":{"seconds":{"$content":15.0,"$type":"System.Single"},"unscaledTime":{"$content":false,"$type":"System.Boolean"}},"position":{"x":727.0,"y":-77.0},"guid":"5ac58b44-fe19-4e88-ba47-2e64b58c9552","$version":"A","$type":"Bolt.WaitForSecondsUnit","$id":"12"},{"argumentCount":0,"defaultValues":{"name":{"$content":"Zweiter
Text","$type":"System.String"},"target":null},"position":{"x":895.0,"y":-383.0},"guid":"b1ee5583-2b6a-41e9-952f-8c5d1e9fb717","$version":"A","$type":"Bolt.TriggerCustomEvent","$id":"14"},{"argumentCount":0,"coroutine":true,"defaultValues":{"target":null,"name":{"$content":"Zweiter
Text","$type":"System.String"}},"position":{"x":510.0,"y":-68.0},"guid":"5cf733ad-f208-4807-ae54-2068614f3c20","$version":"A","$type":"Bolt.CustomEvent","$id":"16"},{"chainable":false,"member":{"name":"SetActive","parameterTypes":["System.Boolean"],"targetType":"UnityEngine.GameObject","targetTypeName":"UnityEngine.GameObject","$version":"A"},"defaultValues":{"target":null,"%value":{"$content":true,"$type":"System.Boolean"}},"position":{"x":1217.0,"y":-80.0},"guid":"c374a80d-b1b8-4684-a9d1-782b9107de00","$version":"A","$type":"Bolt.InvokeMember","$id":"18"},{"chainable":false,"member":{"name":"SetActive","parameterTypes":["System.Boolean"],"targetType":"UnityEngine.GameObject","targetTypeName":"UnityEngine.GameObject","$version":"A"},"defaultValues":{"target":null,"%value":{"$content":true,"$type":"System.Boolean"}},"position":{"x":916.0,"y":-78.0},"guid":"c0d7185b-f119-43fe-b450-a8788bec12af","$version":"A","$type":"Bolt.InvokeMember","$id":"21"},{"chainable":false,"member":{"name":"Equals","parameterTypes":["System.String"],"targetType":"System.String","targetTypeName":"System.String","$version":"A"},"defaultValues":{"target":{"$content":"","$type":"System.String"},"%value":{"$content":"Main
Camera","$type":"System.String"}},"position":{"x":163.0,"y":56.0},"guid":"24657b26-eead-452e-bfb7-35f7ed4062f8","$version":"A","$type":"Bolt.InvokeMember","$id":"24"},{"type":"UnityEngine.Collider","instance":true,"static":true,"defaultValues":{"target":null},"position":{"x":-141.0,"y":-143.0},"guid":"d541a2ae-8b43-4f4f-82da-71eee073a214","$version":"A","$type":"Bolt.Expose","$id":"27"},{"defaultValues":{},"position":{"x":322.0,"y":-343.0},"guid":"a2a5c924-98ba-420f-82b6-c7fdbf935e3a","$version":"A","$type":"Bolt.Branch","$id":"29"},{"chainable":false,"member":{"name":"SetActive","parameterTypes":["System.Boolean"],"targetType":"UnityEngine.GameObject","targetTypeName":"UnityEngine.GameObject","$version":"A"},"defaultValues":{"target":null,"%value":{"$content":true,"$type":"System.Boolean"}},"position":{"x":568.0,"y":-348.0},"guid":"e02378d0-d015-4ca8-bcd7-7ada7a057f5b","$version":"A","$type":"Bolt.InvokeMember","$id":"31"},{"sourceUnit":{"$ref":"16"},"sourceKey":"trigger","destinationUnit":{"$ref":"12"},"destinationKey":"enter","guid":"5ead7c89-1842-4c7c-94e0-6450e7334350","$type":"Bolt.ControlConnection"},{"sourceUnit":{"$ref":"12"},"sourceKey":"exit","destinationUnit":{"$ref":"21"},"destinationKey":"enter","guid":"8ea00943-a382-435c-ac92-c416de8ac366","$type":"Bolt.ControlConnection"},{"sourceUnit":{"$ref":"31"},"sourceKey":"exit","destinationUnit":{"$ref":"14"},"destinationKey":"enter","guid":"e2f6ac8b-6ee8-4c44-9262-d460547550b4","$type":"Bolt.ControlConnection"},{"sourceUnit":{"$ref":"21"},"sourceKey":"exit","destinationUnit":{"$ref":"18"},"destinationKey":"enter","guid":"90639cb4-83b2-4215-9c82-4927367cb31d","$type":"Bolt.ControlConnection"},{"sourceUnit":{"$ref":"29"},"sourceKey":"ifTrue","destinationUnit":{"$ref":"31"},"destinationKey":"enter","guid":"7284d82e-d810-4e74-ba14-6d1de942e4f9","$type":"Bolt.ControlConnection"},{"sourceUnit":{"$ref":"10"},"sourceKey":"trigger","destinationUnit":{"$ref":"29"},"destinationKey":"enter","guid":"1ba5549f-246d-45f3-ab7b-1c0c51b22b82","$type":"Bolt.ControlConnection"},{"sourceUnit":{"$ref":"10"},"sourceKey":"collider","destinationUnit":{"$ref":"27"},"destinationKey":"target","guid":"406ca5a8-87cf-43c9-aeef-ecf020686866","$type":"Bolt.ValueConnection"},{"sourceUnit":{"$ref":"27"},"sourceKey":"name","destinationUnit":{"$ref":"24"},"destinationKey":"target","guid":"cade8db0-31c1-4fdf-857a-0f77145a98f3","$type":"Bolt.ValueConnection"},{"sourceUnit":{"$ref":"24"},"sourceKey":"result","destinationUnit":{"$ref":"29"},"destinationKey":"condition","guid":"c78ed99a-f4a3-4be3-9265-1a4a868a4bed","$type":"Bolt.ValueConnection"}],"$version":"A"}}}'
_objectReferences: []

View File

@ -41,7 +41,7 @@ AudioSource:
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: b119bcf3b54e8465c8c958f7b21cfa11, type: 3}
m_audioClip: {fileID: 8300000, guid: 6e5d3055373834813a2afedf23526f75, type: 3}
m_PlayOnAwake: 1
m_Volume: 1
m_Pitch: 1

View File

@ -41,7 +41,7 @@ AudioSource:
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: b93baab9636304ff5924fd29135d4cc9, type: 3}
m_audioClip: {fileID: 8300000, guid: 7fcca5a3b91414e90843750ad0800a63, type: 3}
m_PlayOnAwake: 1
m_Volume: 1
m_Pitch: 1

View File

@ -41,7 +41,7 @@ AudioSource:
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: f383f63d0cbf14203bb528d2d9554359, type: 3}
m_audioClip: {fileID: 8300000, guid: 134efea201f91430aa85aa122bc278b9, type: 3}
m_PlayOnAwake: 1
m_Volume: 1
m_Pitch: 1

View File

@ -583,7 +583,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7738627022066080824, guid: 28f8cfd23101340a7aab25506355b83b, type: 3}
propertyPath: m_LocalPosition.x
value: -1.5
value: 0.027
objectReference: {fileID: 0}
- target: {fileID: 7738627022066080824, guid: 28f8cfd23101340a7aab25506355b83b, type: 3}
propertyPath: m_LocalPosition.y
@ -591,7 +591,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7738627022066080824, guid: 28f8cfd23101340a7aab25506355b83b, type: 3}
propertyPath: m_LocalPosition.z
value: -0.045
value: -0.108
objectReference: {fileID: 0}
- target: {fileID: 7738627022066080824, guid: 28f8cfd23101340a7aab25506355b83b, type: 3}
propertyPath: m_LocalRotation.w
@ -652,15 +652,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2256214425884392506, guid: aea0e435bfbfe4b769e56d6456aae5cb, type: 3}
propertyPath: m_LocalPosition.x
value: -0.56
value: -2.67
objectReference: {fileID: 0}
- target: {fileID: 2256214425884392506, guid: aea0e435bfbfe4b769e56d6456aae5cb, type: 3}
propertyPath: m_LocalPosition.y
value: -0.02
value: 1.164
objectReference: {fileID: 0}
- target: {fileID: 2256214425884392506, guid: aea0e435bfbfe4b769e56d6456aae5cb, type: 3}
propertyPath: m_LocalPosition.z
value: -2.64
value: -3.113
objectReference: {fileID: 0}
- target: {fileID: 2256214425884392506, guid: aea0e435bfbfe4b769e56d6456aae5cb, type: 3}
propertyPath: m_LocalRotation.w

File diff suppressed because one or more lines are too long

Binary file not shown.

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: cdeef265447434cbc810d4e4dbb32f99
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 817d1101fe8d142ecb516bf00aba6a8c
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 31ef49c2fb24940d8896debe3d726b37
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 7fcca5a3b91414e90843750ad0800a63
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 6e5d3055373834813a2afedf23526f75
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 134efea201f91430aa85aa122bc278b9
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: e93ab5ccc023e4e2d8845f261a2baf7f
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: f76931ebd75cd4d2fb09e2a055ea6486
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 1799615049e2848d89f6f521c1f7deca
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: f7b3198ef6f984aec9650fda5c9ba95e
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: d5aedbb9aaf8f45a2973399d190785b6
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 2e44b691cdc0b44f380a3ce4d3dad67b
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,22 @@
fileFormatVersion: 2
guid: 462a6ef68db1f4d0093d9e32b9381756
AudioImporter:
externalObjects: {}
serializedVersion: 6
defaultSettings:
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
preloadAudioData: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

View File

@ -5,9 +5,12 @@ EditorBuildSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Scenes:
- enabled: 1
- enabled: 0
path: Assets/Scenes/Apfelbaum.unity
guid: 1e09fafb7d7214d558f9ff85a25cb836
- enabled: 1
path: Assets/Scenes/Farbenblindgame.unity
guid: f6e443228baed46b9a2a8aae1f973fa9
m_configObjects:
Unity.XR.Oculus.Settings: {fileID: 11400000, guid: b0348a132b65b465280104c26684a09c, type: 2}
com.unity.xr.management.loader_settings: {fileID: 11400000, guid: 0a39f84d3c7364b49b341cf4f676332d, type: 2}

View File

@ -160,6 +160,31 @@ PlayerSettings:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1