final marlon scene before merge with christoph

Assets/Assets/01_Marlon/05_Scripts/final_button.asset

@@ -14,5 +14,5 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _data:
     _json: '{"graph":{"variables":{"Kind":"Flow","collection":{"$content":[],"$version":"A"},"$version":"A"},"controlInputDefinitions":[],"controlOutputDefinitions":[],"valueInputDefinitions":[],"valueOutputDefinitions":[],"title":"launch
-      button collider","summary":null,"pan":{"x":530.2589,"y":299.0529},"zoom":0.9,"elements":[{"type":"System.Boolean","value":{"$content":true,"$type":"System.Boolean"},"defaultValues":{},"position":{"x":600.0,"y":391.0},"guid":"d7eaf8e3-ba2f-4b58-ad11-06fafa36a047","$version":"A","$type":"Unity.VisualScripting.Literal","$id":"9"},{"kind":"Scene","defaultValues":{"name":{"$content":"finalButtonPushed","$type":"System.String"}},"position":{"x":761.0,"y":262.0},"guid":"147f813b-f92c-4562-aaca-a3cc6fd89435","$version":"A","$type":"Unity.VisualScripting.SetVariable","$id":"11"},{"defaultValues":{},"position":{"x":608.0,"y":251.0},"guid":"4ba7748a-a39b-4a46-9f41-cfddc36087ed","$version":"A","$type":"Unity.VisualScripting.If","$id":"13"},{"numeric":false,"defaultValues":{},"position":{"x":427.0,"y":311.0},"guid":"b7ea8af8-2349-406d-97d7-b79ec442f998","$version":"A","$type":"Unity.VisualScripting.Equal","$id":"15"},{"type":"System.Single","value":{"$content":4.0,"$type":"System.Single"},"defaultValues":{},"position":{"x":276.0,"y":511.0},"guid":"d38110a3-18fe-4058-9c19-617e032bb2f5","$version":"A","$type":"Unity.VisualScripting.Literal","$id":"17"},{"specifyFallback":false,"kind":"Scene","defaultValues":{"name":{"$content":"finalButtons","$type":"System.String"}},"position":{"x":164.0,"y":355.0},"guid":"9a22fc44-03e5-4e4e-8f45-c05ad73f1fc5","$version":"A","$type":"Unity.VisualScripting.GetVariable","$id":"19"},{"coroutine":false,"defaultValues":{},"position":{"x":240.0,"y":139.0},"guid":"83da6fcd-3239-4b5a-8df1-e94a8f27afe6","$version":"A","$type":"Unity.VisualScripting.Update","$id":"21"},{"sourceUnit":{"$ref":"13"},"sourceKey":"ifTrue","destinationUnit":{"$ref":"11"},"destinationKey":"assign","guid":"395b34c8-61b5-48eb-98a5-8e280945b440","$type":"Unity.VisualScripting.ControlConnection"},{"sourceUnit":{"$ref":"21"},"sourceKey":"trigger","destinationUnit":{"$ref":"13"},"destinationKey":"enter","guid":"b6b3143d-63bf-4e2d-84e8-c070bc7d0682","$type":"Unity.VisualScripting.ControlConnection"},{"sourceUnit":{"$ref":"9"},"sourceKey":"output","destinationUnit":{"$ref":"11"},"destinationKey":"input","guid":"308e131f-18f9-4f95-8232-79a108f60d9a","$type":"Unity.VisualScripting.ValueConnection"},{"sourceUnit":{"$ref":"15"},"sourceKey":"equal","destinationUnit":{"$ref":"13"},"destinationKey":"condition","guid":"115390aa-52a6-40c3-8b15-34ee1de56881","$type":"Unity.VisualScripting.ValueConnection"},{"sourceUnit":{"$ref":"17"},"sourceKey":"output","destinationUnit":{"$ref":"15"},"destinationKey":"b","guid":"17d486fc-4252-4fc9-a57d-42f6ed914944","$type":"Unity.VisualScripting.ValueConnection"},{"sourceUnit":{"$ref":"19"},"sourceKey":"value","destinationUnit":{"$ref":"15"},"destinationKey":"a","guid":"0f45f593-a2a0-43c8-9777-7bbb8684d8d6","$type":"Unity.VisualScripting.ValueConnection"}],"$version":"A"}}'
+      button collider","summary":null,"pan":{"x":493.9024,"y":451.0866},"zoom":0.9999999,"elements":[{"type":"System.Boolean","value":{"$content":true,"$type":"System.Boolean"},"defaultValues":{},"position":{"x":600.0,"y":391.0},"guid":"d7eaf8e3-ba2f-4b58-ad11-06fafa36a047","$version":"A","$type":"Unity.VisualScripting.Literal","$id":"9"},{"kind":"Scene","defaultValues":{"name":{"$content":"finalButtonPushed","$type":"System.String"}},"position":{"x":838.0,"y":259.0},"guid":"147f813b-f92c-4562-aaca-a3cc6fd89435","$version":"A","$type":"Unity.VisualScripting.SetVariable","$id":"11"},{"defaultValues":{},"position":{"x":608.0,"y":251.0},"guid":"4ba7748a-a39b-4a46-9f41-cfddc36087ed","$version":"A","$type":"Unity.VisualScripting.If","$id":"13"},{"type":"System.Single","value":{"$content":4.0,"$type":"System.Single"},"defaultValues":{},"position":{"x":143.0,"y":557.0},"guid":"d38110a3-18fe-4058-9c19-617e032bb2f5","$version":"A","$type":"Unity.VisualScripting.Literal","$id":"15"},{"specifyFallback":false,"kind":"Scene","defaultValues":{"name":{"$content":"finalButtons","$type":"System.String"}},"position":{"x":92.0,"y":348.0},"guid":"9a22fc44-03e5-4e4e-8f45-c05ad73f1fc5","$version":"A","$type":"Unity.VisualScripting.GetVariable","$id":"17"},{"coroutine":false,"defaultValues":{},"position":{"x":240.0,"y":139.0},"guid":"83da6fcd-3239-4b5a-8df1-e94a8f27afe6","$version":"A","$type":"Unity.VisualScripting.Update","$id":"19"},{"numeric":true,"defaultValues":{"b":{"$content":0.0,"$type":"System.Single"}},"position":{"x":368.0,"y":360.0},"guid":"a16d34ea-d292-4670-81d4-6533c5b1194a","$version":"A","$type":"Unity.VisualScripting.Comparison","$id":"21"},{"sourceUnit":{"$ref":"13"},"sourceKey":"ifTrue","destinationUnit":{"$ref":"11"},"destinationKey":"assign","guid":"395b34c8-61b5-48eb-98a5-8e280945b440","$type":"Unity.VisualScripting.ControlConnection"},{"sourceUnit":{"$ref":"19"},"sourceKey":"trigger","destinationUnit":{"$ref":"13"},"destinationKey":"enter","guid":"b6b3143d-63bf-4e2d-84e8-c070bc7d0682","$type":"Unity.VisualScripting.ControlConnection"},{"sourceUnit":{"$ref":"9"},"sourceKey":"output","destinationUnit":{"$ref":"11"},"destinationKey":"input","guid":"308e131f-18f9-4f95-8232-79a108f60d9a","$type":"Unity.VisualScripting.ValueConnection"},{"sourceUnit":{"$ref":"17"},"sourceKey":"value","destinationUnit":{"$ref":"21"},"destinationKey":"a","guid":"4f6b4e9a-f5db-47fe-b771-d292469c95f1","$type":"Unity.VisualScripting.ValueConnection"},{"sourceUnit":{"$ref":"15"},"sourceKey":"output","destinationUnit":{"$ref":"21"},"destinationKey":"b","guid":"769dbbf6-d5d2-426b-97ff-329ebf9f5d0f","$type":"Unity.VisualScripting.ValueConnection"},{"sourceUnit":{"$ref":"21"},"sourceKey":"aGreaterThanOrEqualToB","destinationUnit":{"$ref":"13"},"destinationKey":"condition","guid":"2edd7613-2ece-4b1c-a5d4-08dead5cb97e","$type":"Unity.VisualScripting.ValueConnection"}],"$version":"A"}}'
     _objectReferences: []

Assets/Assets/01_Marlon/Abstract_Room_Marlon/XR Origin (Abstract_Room).prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ec072d8a06c5d4be9b331a4677439989
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Assets/01_Marlon/Abstract_Room_Marlon/hands.mat

@@ -112,7 +112,7 @@ Material:
     m_Colors:
     - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
     - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0.4433962, g: 0.4433962, b: 0.4433962, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []
 --- !u!114 &8074960971624207038

Assets/Assets/01_Marlon/Control_Room_Marlon/XR Origin (Control_Room).prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: ed1db6743c7844a4bb991ea05b249fa2
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ProjectSettings/EditorBuildSettings.asset

@@ -8,13 +8,13 @@ EditorBuildSettings:
   - enabled: 0
     path: 
     guid: 00000000000000000000000000000000
-  - enabled: 0
+  - enabled: 1
     path: Assets/Assets/00_Shared/00_Scenes/01_AbstractRoom_1.unity
     guid: 6231fc187659a457a8702396b5a4929d
   - enabled: 1
     path: Assets/Assets/00_Shared/00_Scenes/02_ControlRoom.unity
     guid: 1ce274141f4a8413f84aac2d72153b9d
-  - enabled: 0
+  - enabled: 1
     path: Assets/Assets/00_Shared/00_Scenes/03_AbstractRoom_2.unity
     guid: 614a21c6e512d46c9abeff072624cfa1
   - enabled: 0

ProjectSettings/ProjectSettings.asset

@@ -240,6 +240,23 @@ 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: 102911504429780127, guid: e006f1e7563d8404b9ee5d6fcdabceb4, type: 2}
+  - {fileID: 11400000, guid: 53647b0a2a9724adc8c66ce13d1a7ed4, type: 2}
+  - {fileID: 0}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1

ProjectSettings/TagManager.asset

@@ -8,11 +8,12 @@ TagManager:
   - controlPanel
   - leftHand
   - rightHand
+  - coordinator
   layers:
   - Default
   - TransparentFX
   - Ignore Raycast
-  - 
+  - no post
   - Water
   - UI
   -