NewPlayer & CameraOrbit

Assets/OwnPrefabs/OwnPlayer.prefab

@@ -299,7 +299,7 @@ MonoBehaviour:
     serializedVersion: 2
     m_Bits: 4096
   Speed: 1
-  BodyMat: {fileID: 2100000, guid: f7d04c4f8a93aed4ab6cc7eaeffb140f, type: 2}
+  BodyMat: {fileID: 2100000, guid: 0e8eb011c9bd36f4da2d21e00e3f60ed, type: 2}
   MovePress:
     actionPath: /actions/default/in/TouchpadKlick
     needsReinit: 0
@@ -694,6 +694,7 @@ GameObject:
   - component: {fileID: 8605498518428368659}
   - component: {fileID: 8605498518437804357}
   - component: {fileID: 8605498518438794183}
+  - component: {fileID: 7578914786531158980}
   m_Layer: 0
   m_Name: VRCamera
   m_TagString: MainCamera
@@ -778,6 +779,23 @@ Behaviour:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8605498518428052951}
   m_Enabled: 1
+--- !u!114 &7578914786531158980
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8605498518428052951}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: aefec31fa884f654db5c1122e3490363, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  HitEffectOn: {fileID: 1250507045210962, guid: 3fe0df07025a3e747855b1bb671fc04e,
+    type: 3}
+  HitEffectOff: {fileID: 1570927096764274, guid: 643639841fb531e4ba8097fed4eb9ac7,
+    type: 3}
+  SmileyMat: {fileID: 2100000, guid: c7ae84d9e544aeb49a1b48fe0947ca42, type: 2}
 --- !u!1 &8605498518428055093
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scenes/RealPyramid.unity

@@ -138,6 +138,10 @@ PrefabInstance:
       propertyPath: m_TagString
       value: MicroSub
       objectReference: {fileID: 0}
+    - target: {fileID: 1000013002967384, guid: c9c10e442362b304fa498afd8bec3b1c, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4000010454786744, guid: c9c10e442362b304fa498afd8bec3b1c, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
@@ -384,7 +388,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 360228636}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 1feeeabba3aa341429ffd88bb0da441f, type: 3}
   m_Name: 
@@ -396,6 +400,18 @@ Transform:
     type: 3}
   m_PrefabInstance: {fileID: 1132610764}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &360228642
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 360228636}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b363dceece76b104691bc063bb130993, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &424936547
 GameObject:
   m_ObjectHideFlags: 0
@@ -897,7 +913,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 114218, guid: d2104aa152d99894d8df3c31a9ee634b, type: 3}
       propertyPath: m_IsActive
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 460750, guid: d2104aa152d99894d8df3c31a9ee634b, type: 3}
       propertyPath: m_LocalPosition.x
@@ -2410,7 +2426,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!114 &1599441556
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2654,7 +2670,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 4294967295
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!65 &1782523804
 BoxCollider:
   m_ObjectHideFlags: 0
@@ -2745,6 +2761,85 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1786442769 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 114218, guid: d2104aa152d99894d8df3c31a9ee634b,
+    type: 3}
+  m_PrefabInstance: {fileID: 867269886}
+  m_PrefabAsset: {fileID: 0}
+--- !u!64 &1786442773
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1786442769}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 4
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 4300000, guid: f5baf401218f50f45a7f0fc2a17b6215, type: 3}
+--- !u!1 &1817622597
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1817622600}
+  - component: {fileID: 1817622599}
+  - component: {fileID: 1817622598}
+  m_Layer: 0
+  m_Name: PlayerSetUp (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1817622598
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1817622597}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7dc1b9cdb4e4ae54dbbeb0f669a903ed, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &1817622599
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1817622597}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 29df7de80a226f24bb421c3ebc6e9f42, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  PlayerPrefab: {fileID: 8605498518428034161, guid: a2cd78c001248f943887c4f72b75598d,
+    type: 3}
+  Speed: 1
+--- !u!4 &1817622600
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1817622597}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 82, y: -40, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 9
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1826502998
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scenes/RealPyramidCameraOrbit.unity.meta

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

Assets/Scripts/PlayerController.cs

@@ -27,9 +27,10 @@ public class PlayerController : MonoBehaviour
         Body.tag = "PlayerBody";
         MeshRenderer mr = Body.GetComponent<MeshRenderer>();
         mr.material = BodyMat;
-        Body.AddComponent<SmileyTrigger>();
+        //Nur für Maze:
-        Body.AddComponent<Fluorescein>();
+        //Body.AddComponent<SmileyTrigger>();
-        Body.AddComponent<TurnAround>();
+        //Body.AddComponent<Fluorescein>();
+        //Body.AddComponent<TurnAround>();
 
         gameObject.AddComponent<FallDownTrigger>();
     }

Assets/Scripts/SmileySpawner.cs

@@ -18,7 +18,10 @@ public class SmileySpawner : MonoBehaviour
         smiley = GameObject.CreatePrimitive(PrimitiveType.Sphere);
         smiley.name = "Smiley";
         mr = smiley.GetComponent<MeshRenderer>();
-        smiley.transform.position = transform.position + new Vector3(0, -0.2f, -0.2f);
+        //Transform MicroSub
+        //smiley.transform.position = transform.position + new Vector3(0, -0.2f, -0.2f);
+        //Transform for normal PlayerController
+        smiley.transform.position = transform.position;
         smiley.transform.Rotate(new Vector3(0, -90, 0));
         smiley.transform.parent = transform;
         mr.material = SmileyMat;

Assets/SteamVR/InteractionSystem/Core/Prefabs/PlayerMicroSub.prefab

@@ -222,7 +222,6 @@ GameObject:
   - component: {fileID: 447954}
   - component: {fileID: 11465950}
   - component: {fileID: 5283756303567459092}
-  - component: {fileID: 8080046777925167700}
   m_Layer: 0
   m_Name: PlayerMicroSub
   m_TagString: Player
@@ -291,23 +290,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f85de824ae1f3a5418def5c5dd671cb5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!114 &8080046777925167700
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 107946}
-  m_Enabled: 0
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: aefec31fa884f654db5c1122e3490363, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  HitEffectOn: {fileID: 1250507045210962, guid: 3fe0df07025a3e747855b1bb671fc04e,
-    type: 3}
-  HitEffectOff: {fileID: 1570927096764274, guid: 643639841fb531e4ba8097fed4eb9ac7,
-    type: 3}
-  SmileyMat: {fileID: 2100000, guid: c7ae84d9e544aeb49a1b48fe0947ca42, type: 2}
 --- !u!1 &109154
 GameObject:
   m_ObjectHideFlags: 0