diff --git a/Assets/Assets/00_Shared/00_Scenes/01_AbstractRoom_1.unity b/Assets/Assets/00_Shared/00_Scenes/01_AbstractRoom_1.unity index f3f4d66..d593ab7 100644 --- a/Assets/Assets/00_Shared/00_Scenes/01_AbstractRoom_1.unity +++ b/Assets/Assets/00_Shared/00_Scenes/01_AbstractRoom_1.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0.0009560729, g: 0.0012800363, b: 0.0014299924, a: 1} + m_IndirectSpecularColor: {r: 0.0022607574, g: 0.0027621316, b: 0.0028740228, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -1191,6 +1191,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 3291859662841054907, guid: a1cb2072fcdc04f0da82314262224cbe, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3320138991335275738, guid: a1cb2072fcdc04f0da82314262224cbe, type: 3} propertyPath: m_Name value: XR Origin @@ -1239,9 +1243,5 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3320138991845016300, guid: a1cb2072fcdc04f0da82314262224cbe, type: 3} - propertyPath: m_RenderPostProcessing - value: 1 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a1cb2072fcdc04f0da82314262224cbe, type: 3} diff --git a/Assets/Assets/00_Shared/00_Scenes/02_ControlRoom.unity b/Assets/Assets/00_Shared/00_Scenes/02_ControlRoom.unity index c7c0224..5372a22 100644 --- a/Assets/Assets/00_Shared/00_Scenes/02_ControlRoom.unity +++ b/Assets/Assets/00_Shared/00_Scenes/02_ControlRoom.unity @@ -4193,142 +4193,6 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e68cbbbb4e726416ba51cf711490777b, type: 3} m_PrefabInstance: {fileID: 523805929} m_PrefabAsset: {fileID: 0} ---- !u!1 &537426060 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 537426061} - - component: {fileID: 537426063} - - component: {fileID: 537426062} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: nextSceneText - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &537426061 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 537426060} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0.00399832} - m_LocalScale: {x: 0.111878216, y: 0.39495876, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 753760249} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.58194727, y: 11.137856} - m_SizeDelta: {x: 100, y: -40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &537426062 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 537426060} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "Dr\xFCcke mit dem Daumen auf deinen Controller, um dich ins Vakuum zu - begeben und Rosetta auf ihrer weiteren Reise zu begleiten.\n" - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: fc41d5815b9a5bb48be4c84a746c4ff6, type: 2} - m_sharedMaterial: {fileID: 7032093815205813286, guid: fc41d5815b9a5bb48be4c84a746c4ff6, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 34.17 - m_fontSizeBase: 34.17 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: -276.78357, y: -20.839252, z: -290.57913, w: -79.12047} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &537426063 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 537426060} - m_CullTransparentMesh: 1 --- !u!1001 &541137544 PrefabInstance: m_ObjectHideFlags: 0 @@ -5564,316 +5428,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1cf613ed5df28445c95d7fe3d43f31ba, type: 3} ---- !u!1 &753760248 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 753760249} - - component: {fileID: 753760251} - - component: {fileID: 753760250} - - component: {fileID: 753760253} - - component: {fileID: 753760252} - - component: {fileID: 753760254} - - component: {fileID: 753760255} - m_Layer: 5 - m_Name: goToNextScene - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &753760249 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 753760248} - m_LocalRotation: {x: -0.00000005960463, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.0040000356} - m_LocalScale: {x: 4.4691453, y: 1.2659547, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 537426061} - m_Father: {fileID: 1281243383} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 25.600084} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &753760250 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 753760248} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 17dc1f392170f48e0a4670f077948847, type: 2} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &753760251 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 753760248} - m_CullTransparentMesh: 1 ---- !u!114 &753760252 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 753760248} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: efe58df89b5b74a97a123b5ed2b70422, type: 3} - m_Name: - m_EditorClassIdentifier: - _data: - _json: '{"nest":{"source":"Macro","macro":0,"embed":null}}' - _objectReferences: - - {fileID: 11400000, guid: 9cf16d06628274912819d319377d7c56, type: 2} ---- !u!114 &753760253 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 753760248} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e741851cba3ad425c91ecf922cc6b379, type: 3} - m_Name: - m_EditorClassIdentifier: - _data: - _json: '{"declarations":{"Kind":"Object","collection":{"$content":[{"name":"SceneToLoad - (index)","value":{"$content":2,"$type":"System.Int32"},"typeHandle":{"Identification":"System.Int32, - mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089","$version":"A"},"$version":"A"}],"$version":"A"},"$version":"A"}}' - _objectReferences: [] ---- !u!114 &753760254 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 753760248} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Actions: {fileID: -944628639613478452, guid: c348712bda248c246b8c49b3db54643f, type: 3} - m_NotificationBehavior: 2 - m_UIInputModule: {fileID: 0} - m_DeviceLostEvent: - m_PersistentCalls: - m_Calls: [] - m_DeviceRegainedEvent: - m_PersistentCalls: - m_Calls: [] - m_ControlsChangedEvent: - m_PersistentCalls: - m_Calls: [] - m_ActionEvents: - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 1a9029f8-7a46-46b9-9eff-e9ae8365f611 - m_ActionName: XRI Head/Position - - m_PersistentCalls: - m_Calls: [] - m_ActionId: aed87fe6-2b01-4dd2-a8fa-195578fd8158 - m_ActionName: XRI Head/Rotation - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 83a7af0b-87e3-42c3-a909-95fbf8091e4f - m_ActionName: XRI LeftHand/Position - - m_PersistentCalls: - m_Calls: [] - m_ActionId: cb6b7130-2bac-4ef7-abe4-6991ae7d419d - m_ActionName: XRI LeftHand/Rotation - - m_PersistentCalls: - m_Calls: [] - m_ActionId: d20fc51c-7916-43a7-8b03-706049966aea - m_ActionName: XRI LeftHand/Tracking State - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 664a62b0-e178-421d-b3f8-014eec01591d - m_ActionName: XRI LeftHand/Haptic Device - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 33754c03-48ec-46ef-9bc6-22ed6bfdd8e8 - m_ActionName: XRI LeftHand Interaction/Select - - m_PersistentCalls: - m_Calls: [] - m_ActionId: e6005f29-e4c1-4f3b-8bf7-3a28bab5ca9c - m_ActionName: XRI LeftHand Interaction/Select Value - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 0c0991c5-d329-4afc-8892-1076b440477c - m_ActionName: XRI LeftHand Interaction/Activate - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 0c3d0ec9-85a1-45b3-839b-1ca43f859ecd - m_ActionName: XRI LeftHand Interaction/Activate Value - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 7e1eced7-c774-4fe5-be8f-d8711f646d9e - m_ActionName: XRI LeftHand Interaction/UI Press - - m_PersistentCalls: - m_Calls: [] - m_ActionId: f241c1aa-1050-4338-b2bf-a4a47776693d - m_ActionName: XRI LeftHand Interaction/UI Press Value - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 21b75b25-12ad-410f-b4f8-a7745b7aca27 - m_ActionName: XRI LeftHand Interaction/Rotate Anchor - - m_PersistentCalls: - m_Calls: [] - m_ActionId: bfa204c7-3c92-4193-bad1-39eb71920042 - m_ActionName: XRI LeftHand Interaction/Translate Anchor - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 723629f0-8d0c-48a4-9326-e1d075de54f7 - m_ActionName: XRI LeftHand Interaction/pressedX - - m_PersistentCalls: - m_Calls: [] - m_ActionId: cbeaf823-3b69-4004-8ec8-13ea2ca3fc31 - m_ActionName: XRI LeftHand Locomotion/Teleport Select - - m_PersistentCalls: - m_Calls: [] - m_ActionId: a21db72c-4843-4839-b4d0-3ce8d287cb86 - m_ActionName: XRI LeftHand Locomotion/Teleport Mode Activate - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 89ce8348-6001-41a3-85b9-f8f2e2dcad7c - m_ActionName: XRI LeftHand Locomotion/Teleport Mode Cancel - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 9164e093-ebd4-4923-af32-1b52f31c2d66 - m_ActionName: XRI LeftHand Locomotion/Turn - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 9693e25f-8a4f-4aed-842f-3961243c69a1 - m_ActionName: XRI LeftHand Locomotion/Move - - m_PersistentCalls: - m_Calls: [] - m_ActionId: c4990d70-7b8a-4ce1-b03c-da86716b8352 - m_ActionName: XRI RightHand/Position - - m_PersistentCalls: - m_Calls: [] - m_ActionId: ee6bf5bf-bb0a-4a50-8327-cb654b19e298 - m_ActionName: XRI RightHand/Rotation - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 167ea203-5bfb-4d74-bde9-8026b7483102 - m_ActionName: XRI RightHand/Tracking State - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 57b2a1b4-3290-46d6-ac07-4854ee8f91b1 - m_ActionName: XRI RightHand/Haptic Device - - m_PersistentCalls: - m_Calls: [] - m_ActionId: ac96c10b-c955-4a46-8e67-bf16bc069b53 - m_ActionName: XRI RightHand Interaction/Select - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 39bbf1ac-21a3-413d-90f6-6dbf6efeaabe - m_ActionName: XRI RightHand Interaction/Select Value - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 41976d89-60de-4deb-bff9-16b4af96b290 - m_ActionName: XRI RightHand Interaction/Activate - - m_PersistentCalls: - m_Calls: [] - m_ActionId: c3ca6ed7-3d25-44a2-b1d8-5be4eb699370 - m_ActionName: XRI RightHand Interaction/Activate Value - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 65174b45-c2ee-4f90-93bb-fb4084eaaab3 - m_ActionName: XRI RightHand Interaction/UI Press - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 962ac033-ec42-4981-88a4-551ad9be6ecb - m_ActionName: XRI RightHand Interaction/UI Press Value - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 9b5d8312-f609-4895-b70f-81a722b2ae11 - m_ActionName: XRI RightHand Interaction/Rotate Anchor - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 6f7cf253-7062-443b-b10f-2be48a33f027 - m_ActionName: XRI RightHand Interaction/Translate Anchor - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 02e43582-8973-4940-af06-dff6158e3df2 - m_ActionName: XRI RightHand Locomotion/Teleport Select - - m_PersistentCalls: - m_Calls: [] - m_ActionId: a6c7231d-c55d-4dd4-9e87-877bb5522ef5 - m_ActionName: XRI RightHand Locomotion/Teleport Mode Activate - - m_PersistentCalls: - m_Calls: [] - m_ActionId: d587b60c-39a0-4365-8075-477ce484ba0f - m_ActionName: XRI RightHand Locomotion/Teleport Mode Cancel - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 9fb2eb2b-2fb6-4328-8167-10a1bf11b424 - m_ActionName: XRI RightHand Locomotion/Turn - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 00a4dc9f-1ee6-4349-b0e9-72d5dccaadd6 - m_ActionName: XRI RightHand Locomotion/Move - - m_PersistentCalls: - m_Calls: [] - m_ActionId: 85e8f2f5-28ec-40dd-88d2-294ce283561b - m_ActionName: XRI LeftHand Interaction/pressedA - m_NeverAutoSwitchControlSchemes: 0 - m_DefaultControlScheme: - m_DefaultActionMap: XRI LeftHand Interaction - m_SplitScreenIndex: -1 - m_Camera: {fileID: 0} ---- !u!114 &753760255 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 753760248} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c052c5144c39c4940a9cc242429ea3ff, type: 3} - m_Name: - m_EditorClassIdentifier: - intensity: 0.594 - duration: 1 --- !u!1001 &773765104 PrefabInstance: m_ObjectHideFlags: 0 @@ -11501,29 +11055,9 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 3291859662665710357, guid: a1cb2072fcdc04f0da82314262224cbe, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3291859662705855657, guid: a1cb2072fcdc04f0da82314262224cbe, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3291859663060597698, guid: a1cb2072fcdc04f0da82314262224cbe, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3291859663062515102, guid: a1cb2072fcdc04f0da82314262224cbe, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3291859664330471961, guid: a1cb2072fcdc04f0da82314262224cbe, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3291859664432046002, guid: a1cb2072fcdc04f0da82314262224cbe, type: 3} - propertyPath: m_IsActive - value: 0 + - target: {fileID: 1906115766700228308, guid: a1cb2072fcdc04f0da82314262224cbe, type: 3} + propertyPath: m_RootOrder + value: 3 objectReference: {fileID: 0} - target: {fileID: 3320138991219729949, guid: a1cb2072fcdc04f0da82314262224cbe, type: 3} propertyPath: m_LocalPosition.y @@ -11581,17 +11115,12 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3320138991845016300, guid: a1cb2072fcdc04f0da82314262224cbe, type: 3} - propertyPath: m_RenderPostProcessing + - target: {fileID: 4383011502351197127, guid: a1cb2072fcdc04f0da82314262224cbe, type: 3} + propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a1cb2072fcdc04f0da82314262224cbe, type: 3} ---- !u!224 &1281243383 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3291859662841054911, guid: a1cb2072fcdc04f0da82314262224cbe, type: 3} - m_PrefabInstance: {fileID: 1281243382} - m_PrefabAsset: {fileID: 0} --- !u!1 &1290729411 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Assets/00_Shared/02_Materials/hands.mat b/Assets/Assets/00_Shared/02_Materials/hands.mat new file mode 100644 index 0000000..a7c71e6 --- /dev/null +++ b/Assets/Assets/00_Shared/02_Materials/hands.mat @@ -0,0 +1,126 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: hands + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + 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} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] +--- !u!114 &8074960971624207038 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 5 diff --git a/Assets/Assets/00_Shared/02_Materials/hands.mat.meta b/Assets/Assets/00_Shared/02_Materials/hands.mat.meta new file mode 100644 index 0000000..0041cb6 --- /dev/null +++ b/Assets/Assets/00_Shared/02_Materials/hands.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9f1c457fe8a944b44af8e028a567529d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Assets/00_Shared/05_Scripts/HandAnim.cs b/Assets/Assets/00_Shared/05_Scripts/HandAnim.cs new file mode 100644 index 0000000..f4c3a01 --- /dev/null +++ b/Assets/Assets/00_Shared/05_Scripts/HandAnim.cs @@ -0,0 +1,101 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.XR; +using UnityEngine.XR.Interaction.Toolkit; +using TMPro; // Add the TextMesh Pro namespace to access the various functions. +using System.Linq; + +public class HandAnim : MonoBehaviour +{ + public XRController controller = null; + public Animator m_animator = null; + + public const string ANIM_LAYER_NAME_POINT = "Point Layer"; + public const string ANIM_LAYER_NAME_THUMB = "Thumb Layer"; + public const string ANIM_PARAM_NAME_FLEX = "Flex"; + public const string ANIM_PARAM_NAME_POSE = "Pose"; + + private int m_animLayerIndexThumb = -1; + private int m_animLayerIndexPoint = -1; + private int m_animParamIndexFlex = -1; + private int m_animParamIndexPose = -1; + private Collider[] m_colliders = null; + + public float anim_frames = 4f; + private float grip_state = 0f; + private float trigger_state = 0f; + private float triggerCap_state = 0f; + private float thumbCap_state = 0f; + + private void Awake(){ + // animator = + // controller.GetComponent(); + } + // Start is called before the first frame update + void Start() + { + m_colliders = this.GetComponentsInChildren().Where(childCollider => !childCollider.isTrigger).ToArray(); + for (int i = 0; i < m_colliders.Length; ++i) + { + Collider collider = m_colliders[i]; + // collider.transform.localScale = new Vector3(COLLIDER_SCALE_MIN, COLLIDER_SCALE_MIN, COLLIDER_SCALE_MIN); + collider.enabled = true; + } + m_animLayerIndexPoint = m_animator.GetLayerIndex(ANIM_LAYER_NAME_POINT); + m_animLayerIndexThumb = m_animator.GetLayerIndex(ANIM_LAYER_NAME_THUMB); + m_animParamIndexFlex = Animator.StringToHash(ANIM_PARAM_NAME_FLEX); + m_animParamIndexPose = Animator.StringToHash(ANIM_PARAM_NAME_POSE); + + // var inputDevices = new List(); + // UnityEngine.XR.InputDevices.GetDevices(inputDevices); + // + // foreach (var device in inputDevices) + // { + // Debug.Log(string.Format("Device found with name '{0}' and role '{1}'", device.name, device.role.ToString())); + // solutionText.SetText(string.Format("Device found with name '{0}' and role '{1}'", device.name, device.role.ToString())); + // + // } + } + + // Update is called once per frame + void Update() + { + if (controller.inputDevice.TryGetFeatureValue(CommonUsages.grip, out float gripTarget)){ + // solutionText.SetText(gripValue.ToString()); + float grip_state_delta = gripTarget - grip_state; + if (grip_state_delta > 0f){ grip_state = Mathf.Clamp(grip_state + 1/anim_frames, 0f, gripTarget); + }else if (grip_state_delta < 0f){grip_state = Mathf.Clamp(grip_state - 1/anim_frames, gripTarget, 1f); + }else{ grip_state = gripTarget;} + + m_animator.SetFloat(m_animParamIndexFlex, grip_state); + } + if (controller.inputDevice.TryGetFeatureValue(CommonUsages.trigger, out float triggerTarget)){ + + float trigger_state_delta = triggerTarget - trigger_state; + if (trigger_state_delta > 0f){ trigger_state = Mathf.Clamp(trigger_state + 1/anim_frames, 0f, triggerTarget); + }else if (trigger_state_delta < 0f){trigger_state = Mathf.Clamp(trigger_state - 1/anim_frames, triggerTarget, 1f); + }else{ trigger_state = triggerTarget;} + + m_animator.SetFloat("Pinch", trigger_state); + } + if (controller.inputDevice.TryGetFeatureValue(CommonUsages.indexTouch, out float triggerCapTarget)){ + float triggerCap_state_delta = triggerCapTarget - triggerCap_state; + if (triggerCap_state_delta > 0f){ triggerCap_state = Mathf.Clamp(triggerCap_state + 1/anim_frames, 0f, triggerCapTarget); + }else if (triggerCap_state_delta < 0f){triggerCap_state = Mathf.Clamp(triggerCap_state - 1/anim_frames, triggerCapTarget, 1f); + }else{ triggerCap_state = triggerCapTarget;} + m_animator.SetLayerWeight(m_animLayerIndexPoint, 1f-triggerCap_state); + } + if (controller.inputDevice.TryGetFeatureValue(CommonUsages.thumbTouch, out float thumbCapTarget)){ + float thumbCap_state_delta = thumbCapTarget - thumbCap_state; + if (thumbCap_state_delta > 0f){ thumbCap_state = Mathf.Clamp(thumbCap_state + 1/anim_frames, 0f, thumbCapTarget); + }else if (thumbCap_state_delta < 0f){thumbCap_state = Mathf.Clamp(thumbCap_state - 1/anim_frames, thumbCapTarget, 1f); + }else{ thumbCap_state = thumbCapTarget;} + m_animator.SetLayerWeight(m_animLayerIndexThumb, 1f-thumbCap_state); + } + + + + + } +} diff --git a/Assets/Assets/00_Shared/05_Scripts/HandAnim.cs.meta b/Assets/Assets/00_Shared/05_Scripts/HandAnim.cs.meta new file mode 100644 index 0000000..77807ae --- /dev/null +++ b/Assets/Assets/00_Shared/05_Scripts/HandAnim.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1913b18cc8093441297d89a27e0d72b3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Assets/00_Shared/98_XRAssets/XR Origin.prefab b/Assets/Assets/00_Shared/98_XRAssets/XR Origin.prefab index 6fd44aa..16bb5ac 100644 --- a/Assets/Assets/00_Shared/98_XRAssets/XR Origin.prefab +++ b/Assets/Assets/00_Shared/98_XRAssets/XR Origin.prefab @@ -1,5 +1,451 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &785237925676009378 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 100032127166990209} + - component: {fileID: 3054882995619980639} + - component: {fileID: 3649028422957169566} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: nextSceneText + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &100032127166990209 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 785237925676009378} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.00399832} + m_LocalScale: {x: 0.111878216, y: 0.39495876, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5952132376634864076} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0.58194727, y: 11.137856} + m_SizeDelta: {x: 100, y: -40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3054882995619980639 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 785237925676009378} + m_CullTransparentMesh: 1 +--- !u!114 &3649028422957169566 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 785237925676009378} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "Dr\xFCcke mit dem Daumen auf deinen Controller, um dich ins Vakuum zu + begeben und Rosetta auf ihrer weiteren Reise zu begleiten.\n" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: fc41d5815b9a5bb48be4c84a746c4ff6, type: 2} + m_sharedMaterial: {fileID: 7032093815205813286, guid: fc41d5815b9a5bb48be4c84a746c4ff6, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 34.17 + m_fontSizeBase: 34.17 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: -276.78357, y: -20.839252, z: -290.57913, w: -79.12047} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &1730886119750404691 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5952132376634864076} + - component: {fileID: 8027067100626019154} + - component: {fileID: 3627211308199892128} + - component: {fileID: 5754317918237497458} + - component: {fileID: 3524659252709815683} + - component: {fileID: 7840095269591580024} + - component: {fileID: 1001091589071755437} + m_Layer: 5 + m_Name: transparentLayout + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5952132376634864076 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1730886119750404691} + m_LocalRotation: {x: -0.00000005960463, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.0040000356} + m_LocalScale: {x: 4.4691453, y: 1.2659547, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 100032127166990209} + m_Father: {fileID: 3291859662841054911} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 25.600084} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8027067100626019154 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1730886119750404691} + m_CullTransparentMesh: 1 +--- !u!114 &3627211308199892128 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1730886119750404691} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 17dc1f392170f48e0a4670f077948847, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &5754317918237497458 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1730886119750404691} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e741851cba3ad425c91ecf922cc6b379, type: 3} + m_Name: + m_EditorClassIdentifier: + _data: + _json: '{"declarations":{"Kind":"Object","collection":{"$content":[{"name":"SceneToLoad + (index)","value":{"$content":2,"$type":"System.Int32"},"typeHandle":{"Identification":"System.Int32, + mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089","$version":"A"},"$version":"A"}],"$version":"A"},"$version":"A"}}' + _objectReferences: [] +--- !u!114 &3524659252709815683 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1730886119750404691} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: efe58df89b5b74a97a123b5ed2b70422, type: 3} + m_Name: + m_EditorClassIdentifier: + _data: + _json: '{"nest":{"source":"Macro","macro":0,"embed":null}}' + _objectReferences: + - {fileID: 11400000, guid: 9cf16d06628274912819d319377d7c56, type: 2} +--- !u!114 &7840095269591580024 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1730886119750404691} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Actions: {fileID: -944628639613478452, guid: c348712bda248c246b8c49b3db54643f, type: 3} + m_NotificationBehavior: 2 + m_UIInputModule: {fileID: 0} + m_DeviceLostEvent: + m_PersistentCalls: + m_Calls: [] + m_DeviceRegainedEvent: + m_PersistentCalls: + m_Calls: [] + m_ControlsChangedEvent: + m_PersistentCalls: + m_Calls: [] + m_ActionEvents: + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 1a9029f8-7a46-46b9-9eff-e9ae8365f611 + m_ActionName: XRI Head/Position + - m_PersistentCalls: + m_Calls: [] + m_ActionId: aed87fe6-2b01-4dd2-a8fa-195578fd8158 + m_ActionName: XRI Head/Rotation + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 83a7af0b-87e3-42c3-a909-95fbf8091e4f + m_ActionName: XRI LeftHand/Position + - m_PersistentCalls: + m_Calls: [] + m_ActionId: cb6b7130-2bac-4ef7-abe4-6991ae7d419d + m_ActionName: XRI LeftHand/Rotation + - m_PersistentCalls: + m_Calls: [] + m_ActionId: d20fc51c-7916-43a7-8b03-706049966aea + m_ActionName: XRI LeftHand/Tracking State + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 664a62b0-e178-421d-b3f8-014eec01591d + m_ActionName: XRI LeftHand/Haptic Device + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 33754c03-48ec-46ef-9bc6-22ed6bfdd8e8 + m_ActionName: XRI LeftHand Interaction/Select + - m_PersistentCalls: + m_Calls: [] + m_ActionId: e6005f29-e4c1-4f3b-8bf7-3a28bab5ca9c + m_ActionName: XRI LeftHand Interaction/Select Value + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 0c0991c5-d329-4afc-8892-1076b440477c + m_ActionName: XRI LeftHand Interaction/Activate + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 0c3d0ec9-85a1-45b3-839b-1ca43f859ecd + m_ActionName: XRI LeftHand Interaction/Activate Value + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 7e1eced7-c774-4fe5-be8f-d8711f646d9e + m_ActionName: XRI LeftHand Interaction/UI Press + - m_PersistentCalls: + m_Calls: [] + m_ActionId: f241c1aa-1050-4338-b2bf-a4a47776693d + m_ActionName: XRI LeftHand Interaction/UI Press Value + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 21b75b25-12ad-410f-b4f8-a7745b7aca27 + m_ActionName: XRI LeftHand Interaction/Rotate Anchor + - m_PersistentCalls: + m_Calls: [] + m_ActionId: bfa204c7-3c92-4193-bad1-39eb71920042 + m_ActionName: XRI LeftHand Interaction/Translate Anchor + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 723629f0-8d0c-48a4-9326-e1d075de54f7 + m_ActionName: XRI LeftHand Interaction/pressedX + - m_PersistentCalls: + m_Calls: [] + m_ActionId: cbeaf823-3b69-4004-8ec8-13ea2ca3fc31 + m_ActionName: XRI LeftHand Locomotion/Teleport Select + - m_PersistentCalls: + m_Calls: [] + m_ActionId: a21db72c-4843-4839-b4d0-3ce8d287cb86 + m_ActionName: XRI LeftHand Locomotion/Teleport Mode Activate + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 89ce8348-6001-41a3-85b9-f8f2e2dcad7c + m_ActionName: XRI LeftHand Locomotion/Teleport Mode Cancel + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 9164e093-ebd4-4923-af32-1b52f31c2d66 + m_ActionName: XRI LeftHand Locomotion/Turn + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 9693e25f-8a4f-4aed-842f-3961243c69a1 + m_ActionName: XRI LeftHand Locomotion/Move + - m_PersistentCalls: + m_Calls: [] + m_ActionId: c4990d70-7b8a-4ce1-b03c-da86716b8352 + m_ActionName: XRI RightHand/Position + - m_PersistentCalls: + m_Calls: [] + m_ActionId: ee6bf5bf-bb0a-4a50-8327-cb654b19e298 + m_ActionName: XRI RightHand/Rotation + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 167ea203-5bfb-4d74-bde9-8026b7483102 + m_ActionName: XRI RightHand/Tracking State + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 57b2a1b4-3290-46d6-ac07-4854ee8f91b1 + m_ActionName: XRI RightHand/Haptic Device + - m_PersistentCalls: + m_Calls: [] + m_ActionId: ac96c10b-c955-4a46-8e67-bf16bc069b53 + m_ActionName: XRI RightHand Interaction/Select + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 39bbf1ac-21a3-413d-90f6-6dbf6efeaabe + m_ActionName: XRI RightHand Interaction/Select Value + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 41976d89-60de-4deb-bff9-16b4af96b290 + m_ActionName: XRI RightHand Interaction/Activate + - m_PersistentCalls: + m_Calls: [] + m_ActionId: c3ca6ed7-3d25-44a2-b1d8-5be4eb699370 + m_ActionName: XRI RightHand Interaction/Activate Value + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 65174b45-c2ee-4f90-93bb-fb4084eaaab3 + m_ActionName: XRI RightHand Interaction/UI Press + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 962ac033-ec42-4981-88a4-551ad9be6ecb + m_ActionName: XRI RightHand Interaction/UI Press Value + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 9b5d8312-f609-4895-b70f-81a722b2ae11 + m_ActionName: XRI RightHand Interaction/Rotate Anchor + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 6f7cf253-7062-443b-b10f-2be48a33f027 + m_ActionName: XRI RightHand Interaction/Translate Anchor + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 02e43582-8973-4940-af06-dff6158e3df2 + m_ActionName: XRI RightHand Locomotion/Teleport Select + - m_PersistentCalls: + m_Calls: [] + m_ActionId: a6c7231d-c55d-4dd4-9e87-877bb5522ef5 + m_ActionName: XRI RightHand Locomotion/Teleport Mode Activate + - m_PersistentCalls: + m_Calls: [] + m_ActionId: d587b60c-39a0-4365-8075-477ce484ba0f + m_ActionName: XRI RightHand Locomotion/Teleport Mode Cancel + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 9fb2eb2b-2fb6-4328-8167-10a1bf11b424 + m_ActionName: XRI RightHand Locomotion/Turn + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 00a4dc9f-1ee6-4349-b0e9-72d5dccaadd6 + m_ActionName: XRI RightHand Locomotion/Move + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 85e8f2f5-28ec-40dd-88d2-294ce283561b + m_ActionName: XRI LeftHand Interaction/pressedA + m_NeverAutoSwitchControlSchemes: 0 + m_DefaultControlScheme: + m_DefaultActionMap: XRI LeftHand Interaction + m_SplitScreenIndex: -1 + m_Camera: {fileID: 0} +--- !u!114 &1001091589071755437 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1730886119750404691} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c052c5144c39c4940a9cc242429ea3ff, type: 3} + m_Name: + m_EditorClassIdentifier: + intensity: 0.594 + duration: 1 --- !u!1 &3291859662417894500 GameObject: m_ObjectHideFlags: 0 @@ -155,7 +601,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3291859662665710356 RectTransform: m_ObjectHideFlags: 0 @@ -447,7 +893,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3291859662705855656 RectTransform: m_ObjectHideFlags: 0 @@ -622,6 +1068,7 @@ RectTransform: - {fileID: 3291859663062515101} - {fileID: 3291859664432046001} - {fileID: 3291859664330471960} + - {fileID: 5952132376634864076} m_Father: {fileID: 3320138991219729949} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 48.896, y: 270, z: 0} @@ -1000,7 +1447,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3291859663060597697 RectTransform: m_ObjectHideFlags: 0 @@ -1157,7 +1604,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3291859663062515101 RectTransform: m_ObjectHideFlags: 0 @@ -1584,7 +2031,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3291859664330471960 RectTransform: m_ObjectHideFlags: 0 @@ -1741,7 +2188,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3291859664432046001 RectTransform: m_ObjectHideFlags: 0 @@ -1944,6 +2391,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3291859662841054911} + - {fileID: 1906115766700228308} m_Father: {fileID: 3320138990753326776} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2227,7 +2675,7 @@ LineRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3320138991219729948} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 @@ -2285,14 +2733,14 @@ LineRenderer: colorGradient: serializedVersion: 2 key0: {r: 0, g: 0, b: 1, a: 1} - key1: {r: 0, g: 0, b: 1, a: 1} + key1: {r: 1, g: 0, b: 0, a: 1} key2: {r: 0, g: 0, b: 0, a: 0} key3: {r: 0, g: 0, b: 0, a: 0} key4: {r: 0, g: 0, b: 0, a: 0} key5: {r: 0, g: 0, b: 0, a: 0} key6: {r: 0, g: 0, b: 0, a: 0} key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 + ctime0: 30455 ctime1: 65535 ctime2: 0 ctime3: 0 @@ -2350,7 +2798,8 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 4383011502351197127} m_Father: {fileID: 3320138990753326776} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3085,3 +3534,213 @@ MonoBehaviour: m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 m_Version: 2 +--- !u!1001 &1906115766700632596 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3320138991219729949} + m_Modifications: + - target: {fileID: 143668, guid: e6ba3498ffa1e534b91a07264266e6b8, type: 3} + propertyPath: m_Name + value: CustomHandLeft + objectReference: {fileID: 0} + - target: {fileID: 143668, guid: e6ba3498ffa1e534b91a07264266e6b8, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 414912, guid: e6ba3498ffa1e534b91a07264266e6b8, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 414912, guid: e6ba3498ffa1e534b91a07264266e6b8, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 414912, guid: e6ba3498ffa1e534b91a07264266e6b8, type: 3} + propertyPath: m_LocalPosition.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 414912, guid: e6ba3498ffa1e534b91a07264266e6b8, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 414912, guid: e6ba3498ffa1e534b91a07264266e6b8, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071067 + objectReference: {fileID: 0} + - target: {fileID: 414912, guid: e6ba3498ffa1e534b91a07264266e6b8, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 414912, guid: e6ba3498ffa1e534b91a07264266e6b8, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 414912, guid: e6ba3498ffa1e534b91a07264266e6b8, type: 3} + propertyPath: m_LocalRotation.z + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 414912, guid: e6ba3498ffa1e534b91a07264266e6b8, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 414912, guid: e6ba3498ffa1e534b91a07264266e6b8, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 414912, guid: e6ba3498ffa1e534b91a07264266e6b8, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 11427812, guid: e6ba3498ffa1e534b91a07264266e6b8, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11427812, guid: e6ba3498ffa1e534b91a07264266e6b8, type: 3} + propertyPath: m_controller + value: 33 + objectReference: {fileID: 0} + - target: {fileID: 11438496, guid: e6ba3498ffa1e534b91a07264266e6b8, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 137977633181334670, guid: e6ba3498ffa1e534b91a07264266e6b8, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 9f1c457fe8a944b44af8e028a567529d, type: 2} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e6ba3498ffa1e534b91a07264266e6b8, type: 3} +--- !u!4 &1906115766700228308 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 414912, guid: e6ba3498ffa1e534b91a07264266e6b8, type: 3} + m_PrefabInstance: {fileID: 1906115766700632596} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1906115766700497696 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 143668, guid: e6ba3498ffa1e534b91a07264266e6b8, type: 3} + m_PrefabInstance: {fileID: 1906115766700632596} + m_PrefabAsset: {fileID: 0} +--- !u!114 &5409643057679353677 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1906115766700497696} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1913b18cc8093441297d89a27e0d72b3, type: 3} + m_Name: + m_EditorClassIdentifier: + controller: {fileID: 0} + m_animator: {fileID: 1955253087504220744} + anim_frames: 4 +--- !u!95 &1955253087504220744 stripped +Animator: + m_CorrespondingSourceObject: {fileID: 95022414942611548, guid: e6ba3498ffa1e534b91a07264266e6b8, type: 3} + m_PrefabInstance: {fileID: 1906115766700632596} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &4383011502351601811 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3320138991285415498} + m_Modifications: + - target: {fileID: 195418, guid: ba1fa4a8c66106b4988c88fe4b8e8502, type: 3} + propertyPath: m_Name + value: CustomHandRight + objectReference: {fileID: 0} + - target: {fileID: 195418, guid: ba1fa4a8c66106b4988c88fe4b8e8502, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 422740, guid: ba1fa4a8c66106b4988c88fe4b8e8502, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 422740, guid: ba1fa4a8c66106b4988c88fe4b8e8502, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 422740, guid: ba1fa4a8c66106b4988c88fe4b8e8502, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 422740, guid: ba1fa4a8c66106b4988c88fe4b8e8502, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 422740, guid: ba1fa4a8c66106b4988c88fe4b8e8502, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071067 + objectReference: {fileID: 0} + - target: {fileID: 422740, guid: ba1fa4a8c66106b4988c88fe4b8e8502, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 422740, guid: ba1fa4a8c66106b4988c88fe4b8e8502, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 422740, guid: ba1fa4a8c66106b4988c88fe4b8e8502, type: 3} + propertyPath: m_LocalRotation.z + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 422740, guid: ba1fa4a8c66106b4988c88fe4b8e8502, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 422740, guid: ba1fa4a8c66106b4988c88fe4b8e8502, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 422740, guid: ba1fa4a8c66106b4988c88fe4b8e8502, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 11434164, guid: ba1fa4a8c66106b4988c88fe4b8e8502, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11434164, guid: ba1fa4a8c66106b4988c88fe4b8e8502, type: 3} + propertyPath: m_controller + value: 66 + objectReference: {fileID: 0} + - target: {fileID: 137383442524578654, guid: ba1fa4a8c66106b4988c88fe4b8e8502, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 9f1c457fe8a944b44af8e028a567529d, type: 2} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ba1fa4a8c66106b4988c88fe4b8e8502, type: 3} +--- !u!4 &4383011502351197127 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 422740, guid: ba1fa4a8c66106b4988c88fe4b8e8502, type: 3} + m_PrefabInstance: {fileID: 4383011502351601811} + m_PrefabAsset: {fileID: 0} +--- !u!1 &4383011502351494089 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 195418, guid: ba1fa4a8c66106b4988c88fe4b8e8502, type: 3} + m_PrefabInstance: {fileID: 4383011502351601811} + m_PrefabAsset: {fileID: 0} +--- !u!114 &5805249590737313786 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4383011502351494089} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1913b18cc8093441297d89a27e0d72b3, type: 3} + m_Name: + m_EditorClassIdentifier: + controller: {fileID: 0} + m_animator: {fileID: 4432119354193993419} + anim_frames: 4 +--- !u!95 &4432119354193993419 stripped +Animator: + m_CorrespondingSourceObject: {fileID: 95024934887329368, guid: ba1fa4a8c66106b4988c88fe4b8e8502, type: 3} + m_PrefabInstance: {fileID: 4383011502351601811} + m_PrefabAsset: {fileID: 0} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 3cbb34a..c94f605 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -231,6 +231,10 @@ PlayerSettings: - {fileID: 0} - {fileID: 0} - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1