diff --git a/Assets/Scenes/MainGame.unity b/Assets/Scenes/MainGame.unity index c461638..0fdb16e 100644 --- a/Assets/Scenes/MainGame.unity +++ b/Assets/Scenes/MainGame.unity @@ -198,6 +198,76 @@ Transform: type: 3} m_PrefabInstance: {fileID: 79429} m_PrefabAsset: {fileID: 0} +--- !u!1001 &40919614 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1000012106565122, guid: 1b474618c4fc5f54e8a8b803c8352c7d, type: 3} + propertyPath: m_Name + value: TeleportDestination + objectReference: {fileID: 0} + - target: {fileID: 1000012106565122, guid: 1b474618c4fc5f54e8a8b803c8352c7d, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4000013012824352, guid: 1b474618c4fc5f54e8a8b803c8352c7d, type: 3} + propertyPath: m_LocalScale.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 4000014291504098, guid: 1b474618c4fc5f54e8a8b803c8352c7d, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4000014291504098, guid: 1b474618c4fc5f54e8a8b803c8352c7d, type: 3} + propertyPath: m_LocalPosition.x + value: 13.373359 + objectReference: {fileID: 0} + - target: {fileID: 4000014291504098, guid: 1b474618c4fc5f54e8a8b803c8352c7d, type: 3} + propertyPath: m_LocalPosition.y + value: 0.099999905 + objectReference: {fileID: 0} + - target: {fileID: 4000014291504098, guid: 1b474618c4fc5f54e8a8b803c8352c7d, type: 3} + propertyPath: m_LocalPosition.z + value: 1.366123 + objectReference: {fileID: 0} + - target: {fileID: 4000014291504098, guid: 1b474618c4fc5f54e8a8b803c8352c7d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4000014291504098, guid: 1b474618c4fc5f54e8a8b803c8352c7d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4000014291504098, guid: 1b474618c4fc5f54e8a8b803c8352c7d, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4000014291504098, guid: 1b474618c4fc5f54e8a8b803c8352c7d, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4000014291504098, guid: 1b474618c4fc5f54e8a8b803c8352c7d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4000014291504098, guid: 1b474618c4fc5f54e8a8b803c8352c7d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4000014291504098, guid: 1b474618c4fc5f54e8a8b803c8352c7d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 23000010924140402, guid: 1b474618c4fc5f54e8a8b803c8352c7d, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1b474618c4fc5f54e8a8b803c8352c7d, type: 3} --- !u!1001 &61285731 PrefabInstance: m_ObjectHideFlags: 0 @@ -292,6 +362,12 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 2.0196953, y: 0.2, z: 2.0206933} m_Center: {x: 0.0039343834, y: 0, z: 0.012269765} +--- !u!4 &147222545 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 1c178a87d052ee642a2205f8139d9c21, + type: 3} + m_PrefabInstance: {fileID: 213292692} + m_PrefabAsset: {fileID: 0} --- !u!1001 &159030111 PrefabInstance: m_ObjectHideFlags: 0 @@ -579,12 +655,12 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1082707688} m_Modifications: - target: {fileID: -8679921383154817045, guid: 1c178a87d052ee642a2205f8139d9c21, type: 3} propertyPath: m_RootOrder - value: 4 + value: 3 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 1c178a87d052ee642a2205f8139d9c21, type: 3} @@ -609,7 +685,7 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: 1c178a87d052ee642a2205f8139d9c21, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 1c178a87d052ee642a2205f8139d9c21, type: 3} @@ -619,7 +695,7 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: 1c178a87d052ee642a2205f8139d9c21, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 1c178a87d052ee642a2205f8139d9c21, type: 3} @@ -643,6 +719,179 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1c178a87d052ee642a2205f8139d9c21, type: 3} +--- !u!1 &223974226 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 223974227} + - component: {fileID: 223974235} + - component: {fileID: 223974234} + - component: {fileID: 223974233} + - component: {fileID: 223974232} + - component: {fileID: 223974231} + - component: {fileID: 223974230} + - component: {fileID: 223974229} + - component: {fileID: 223974228} + m_Layer: 0 + m_Name: LocomotionController + m_TagString: TeleportationScriptsList + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &223974227 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 223974226} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 484054183} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &223974228 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 223974226} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 39fbe3faa8f659944b47b2bb36927a5d, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &223974229 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 223974226} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2bb0f5a590bee8641b2298ad4ad21c1c, type: 3} + m_Name: + m_EditorClassIdentifier: + OrientationMode: 0 + Thumbstick: 2 + RotateStickThreshold: 0.8 +--- !u!114 &223974230 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 223974226} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f2207d0346672d340874d20d6a45eb69, type: 3} + m_Name: + m_EditorClassIdentifier: + Range: 40 + MinimumElevation: -100 + Gravity: -9.8 + AimVelocity: 1 + AimStep: 1 +--- !u!114 &223974231 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 223974226} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: aa8ac578d8d4eff4eae43b9c3eb1529c, type: 3} + m_Name: + m_EditorClassIdentifier: + LaserPrefab: {fileID: 120000014163304990, guid: 95b2b00d2fc56fa4c806f2cda99f5f89, + type: 3} +--- !u!114 &223974232 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 223974226} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7d8fa3b51be1cb745a66b9f32a13f550, type: 3} + m_Name: + m_EditorClassIdentifier: + AimCollisionLayerMask: + serializedVersion: 2 + m_Bits: 1 +--- !u!114 &223974233 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 223974226} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c4133858333ed264ebae0d70265b7b6b, type: 3} + m_Name: + m_EditorClassIdentifier: + AimButton: 67108864 + TeleportButton: 67108864 + FastTeleport: 0 + LeftHand: {fileID: 0} + RightHand: {fileID: 1964509110} + InputMode: 1 + AimingController: 2 + CapacitiveAimAndTeleportButton: 4 + ThumbstickTeleportThreshold: 0.5 +--- !u!114 &223974234 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 223974226} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dfcbed738e5f16548bc6b4284038f7d2, type: 3} + m_Name: + m_EditorClassIdentifier: + EnableMovementDuringReady: 1 + EnableMovementDuringAim: 0 + EnableMovementDuringPreTeleport: 0 + EnableMovementDuringPostTeleport: 1 + EnableRotationDuringReady: 1 + EnableRotationDuringAim: 0 + EnableRotationDuringPreTeleport: 0 + EnableRotationDuringPostTeleport: 1 + TeleportDestinationPrefab: {fileID: 1114040581} + TeleportDestinationLayer: 0 + AimCollisionType: 0 + UseCharacterCollisionData: 0 + AimCollisionRadius: 0 + AimCollisionHeight: 0 +--- !u!114 &223974235 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 223974226} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 085d9ec7bb5e55f48b879d93931f553e, type: 3} + m_Name: + m_EditorClassIdentifier: + CameraRig: {fileID: 1523888544} + CharacterController: {fileID: 484054182} + PlayerController: {fileID: 484054181} --- !u!1001 &227631023 PrefabInstance: m_ObjectHideFlags: 0 @@ -1099,12 +1348,12 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1082707688} m_Modifications: - target: {fileID: -8679921383154817045, guid: 86594c8235f09dc48b820e30fe7afcaf, type: 3} propertyPath: m_RootOrder - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 86594c8235f09dc48b820e30fe7afcaf, type: 3} @@ -1129,17 +1378,17 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: 86594c8235f09dc48b820e30fe7afcaf, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 86594c8235f09dc48b820e30fe7afcaf, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 86594c8235f09dc48b820e30fe7afcaf, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 86594c8235f09dc48b820e30fe7afcaf, type: 3} @@ -1262,12 +1511,12 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1082707688} m_Modifications: - target: {fileID: -8679921383154817045, guid: 1c178a87d052ee642a2205f8139d9c21, type: 3} propertyPath: m_RootOrder - value: 5 + value: 4 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 1c178a87d052ee642a2205f8139d9c21, type: 3} @@ -1292,7 +1541,7 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: 1c178a87d052ee642a2205f8139d9c21, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 1c178a87d052ee642a2205f8139d9c21, type: 3} @@ -1513,12 +1762,12 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1082707688} m_Modifications: - target: {fileID: -8679921383154817045, guid: c277fb14a3cffbf498aaedfce222c56d, type: 3} propertyPath: m_RootOrder - value: 6 + value: 5 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: c277fb14a3cffbf498aaedfce222c56d, type: 3} @@ -1543,7 +1792,7 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: c277fb14a3cffbf498aaedfce222c56d, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: c277fb14a3cffbf498aaedfce222c56d, type: 3} @@ -1657,12 +1906,12 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1082707688} m_Modifications: - target: {fileID: -8679921383154817045, guid: bb03ebc0c542b4d4695036c9a9536009, type: 3} propertyPath: m_RootOrder - value: 7 + value: 6 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: bb03ebc0c542b4d4695036c9a9536009, type: 3} @@ -1687,7 +1936,7 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: bb03ebc0c542b4d4695036c9a9536009, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: bb03ebc0c542b4d4695036c9a9536009, type: 3} @@ -1984,6 +2233,30 @@ Transform: type: 3} m_PrefabInstance: {fileID: 451101626} m_PrefabAsset: {fileID: 0} +--- !u!114 &484054181 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 11400010, guid: ce816f2e6abb0504092c23ed9b970dfd, + type: 3} + m_PrefabInstance: {fileID: 1782389916} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0950df82e7936c84983497630bde5b54, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!143 &484054182 stripped +CharacterController: + m_CorrespondingSourceObject: {fileID: 14300000, guid: ce816f2e6abb0504092c23ed9b970dfd, + type: 3} + m_PrefabInstance: {fileID: 1782389916} + m_PrefabAsset: {fileID: 0} +--- !u!4 &484054183 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400006, guid: ce816f2e6abb0504092c23ed9b970dfd, + type: 3} + m_PrefabInstance: {fileID: 1782389916} + m_PrefabAsset: {fileID: 0} --- !u!1001 &493206236 PrefabInstance: m_ObjectHideFlags: 0 @@ -2536,17 +2809,23 @@ Transform: m_Father: {fileID: 620812430} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &559704521 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e855b3e0d6cb69d40b19e24bd2a1b3a0, + type: 3} + m_PrefabInstance: {fileID: 571032571} + m_PrefabAsset: {fileID: 0} --- !u!1001 &571032571 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1082707688} m_Modifications: - target: {fileID: -8679921383154817045, guid: e855b3e0d6cb69d40b19e24bd2a1b3a0, type: 3} propertyPath: m_RootOrder - value: 3 + value: 2 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e855b3e0d6cb69d40b19e24bd2a1b3a0, type: 3} @@ -2571,17 +2850,17 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: e855b3e0d6cb69d40b19e24bd2a1b3a0, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e855b3e0d6cb69d40b19e24bd2a1b3a0, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e855b3e0d6cb69d40b19e24bd2a1b3a0, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: e855b3e0d6cb69d40b19e24bd2a1b3a0, type: 3} @@ -3022,7 +3301,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 620812429} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: @@ -3031,8 +3310,8 @@ Transform: - {fileID: 909075396} - {fileID: 1302143260} - {fileID: 723319891} - m_Father: {fileID: 0} - m_RootOrder: 10 + m_Father: {fileID: 1082707688} + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &634430484 BoxCollider: @@ -3232,7 +3511,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1001 &710185312 PrefabInstance: @@ -3765,6 +4044,12 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 2.0196953, y: 0.2, z: 2.0206933} m_Center: {x: 0.0039343834, y: 0, z: 0.012269765} +--- !u!4 &783109460 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 481164, guid: ce816f2e6abb0504092c23ed9b970dfd, + type: 3} + m_PrefabInstance: {fileID: 1782389916} + m_PrefabAsset: {fileID: 0} --- !u!1001 &791065502 PrefabInstance: m_ObjectHideFlags: 0 @@ -4047,6 +4332,18 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 2.0196953, y: 0.2, z: 2.0206933} m_Center: {x: 0.0039343834, y: 0, z: 0.012269765} +--- !u!4 &834380158 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: c277fb14a3cffbf498aaedfce222c56d, + type: 3} + m_PrefabInstance: {fileID: 401855015} + m_PrefabAsset: {fileID: 0} +--- !u!4 &846988001 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 86594c8235f09dc48b820e30fe7afcaf, + type: 3} + m_PrefabInstance: {fileID: 296603246} + m_PrefabAsset: {fileID: 0} --- !u!1001 &867679824 PrefabInstance: m_ObjectHideFlags: 0 @@ -4356,6 +4653,73 @@ Transform: m_Father: {fileID: 620812430} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &913034450 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 939175540} + m_Modifications: + - target: {fileID: 112276, guid: d9809c5e8418bb047bf2c8ba1d1a2cec, type: 3} + propertyPath: m_Name + value: OVRControllerPrefab + objectReference: {fileID: 0} + - target: {fileID: 488160, guid: d9809c5e8418bb047bf2c8ba1d1a2cec, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 488160, guid: d9809c5e8418bb047bf2c8ba1d1a2cec, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 488160, guid: d9809c5e8418bb047bf2c8ba1d1a2cec, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 488160, guid: d9809c5e8418bb047bf2c8ba1d1a2cec, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 488160, guid: d9809c5e8418bb047bf2c8ba1d1a2cec, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 488160, guid: d9809c5e8418bb047bf2c8ba1d1a2cec, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 488160, guid: d9809c5e8418bb047bf2c8ba1d1a2cec, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 488160, guid: d9809c5e8418bb047bf2c8ba1d1a2cec, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 488160, guid: d9809c5e8418bb047bf2c8ba1d1a2cec, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 488160, guid: d9809c5e8418bb047bf2c8ba1d1a2cec, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 488160, guid: d9809c5e8418bb047bf2c8ba1d1a2cec, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11479374, guid: d9809c5e8418bb047bf2c8ba1d1a2cec, type: 3} + propertyPath: m_controller + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d9809c5e8418bb047bf2c8ba1d1a2cec, type: 3} +--- !u!4 &939175540 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 477154, guid: ce816f2e6abb0504092c23ed9b970dfd, + type: 3} + m_PrefabInstance: {fileID: 1782389916} + m_PrefabAsset: {fileID: 0} --- !u!1001 &962442943 PrefabInstance: m_ObjectHideFlags: 0 @@ -4366,7 +4730,7 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: 56fd8a0aa3b18fa43994e325b7d32a93, type: 3} propertyPath: m_RootOrder - value: 2 + value: 0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 56fd8a0aa3b18fa43994e325b7d32a93, type: 3} @@ -4447,7 +4811,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!81 &963194226 AudioListener: m_ObjectHideFlags: 0 @@ -4950,7 +5314,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1082707688} m_Modifications: - target: {fileID: -8679921383154817045, guid: 6c5c0866003f6414ab44c554617da4e0, type: 3} @@ -5014,6 +5378,45 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6c5c0866003f6414ab44c554617da4e0, type: 3} +--- !u!1 &1082707687 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1082707688} + m_Layer: 0 + m_Name: Environnement + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1082707688 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1082707687} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1197281260} + - {fileID: 1449708448} + - {fileID: 559704521} + - {fileID: 147222545} + - {fileID: 1128750998} + - {fileID: 834380158} + - {fileID: 2036834384} + - {fileID: 846988001} + - {fileID: 620812430} + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1106579962 PrefabInstance: m_ObjectHideFlags: 0 @@ -5108,6 +5511,24 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 2.0196953, y: 0.2, z: 2.0206933} m_Center: {x: 0.0039343834, y: 0, z: 0.012269765} +--- !u!114 &1114040581 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 114000013141257940, guid: 1b474618c4fc5f54e8a8b803c8352c7d, + type: 3} + m_PrefabInstance: {fileID: 40919614} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 03a7614f10832d041bccff167d2a460f, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &1128750998 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 1c178a87d052ee642a2205f8139d9c21, + type: 3} + m_PrefabInstance: {fileID: 340993836} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1131727228 PrefabInstance: m_ObjectHideFlags: 0 @@ -5188,7 +5609,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1082707688} m_Modifications: - target: {fileID: -8679921383154817045, guid: 38ce8aefc757b73458b452def63fc1a3, type: 3} @@ -5218,7 +5639,7 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: 38ce8aefc757b73458b452def63fc1a3, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 38ce8aefc757b73458b452def63fc1a3, type: 3} @@ -5520,6 +5941,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1186200390} m_PrefabAsset: {fileID: 0} +--- !u!4 &1197281260 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 38ce8aefc757b73458b452def63fc1a3, + type: 3} + m_PrefabInstance: {fileID: 1138934332} + m_PrefabAsset: {fileID: 0} --- !u!1 &1209096398 GameObject: m_ObjectHideFlags: 0 @@ -5563,7 +5990,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1216353526 PrefabInstance: @@ -6290,6 +6717,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1441477973} m_PrefabAsset: {fileID: 0} +--- !u!4 &1449708448 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 6c5c0866003f6414ab44c554617da4e0, + type: 3} + m_PrefabInstance: {fileID: 1073120225} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1451906948 PrefabInstance: m_ObjectHideFlags: 0 @@ -6882,6 +7315,18 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1516527860} m_PrefabAsset: {fileID: 0} +--- !u!114 &1523888544 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 11400020, guid: ce816f2e6abb0504092c23ed9b970dfd, + type: 3} + m_PrefabInstance: {fileID: 1782389916} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: df9f338034892c44ebb62d97894772f1, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!65 &1529319415 BoxCollider: m_ObjectHideFlags: 0 @@ -8046,6 +8491,87 @@ Transform: m_Father: {fileID: 1577174065} m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1782389916 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1941989044} + m_Modifications: + - target: {fileID: 100004, guid: ce816f2e6abb0504092c23ed9b970dfd, type: 3} + propertyPath: m_TagString + value: Player + objectReference: {fileID: 0} + - target: {fileID: 100006, guid: ce816f2e6abb0504092c23ed9b970dfd, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 100008, guid: ce816f2e6abb0504092c23ed9b970dfd, type: 3} + propertyPath: m_Name + value: OVRPlayerController + objectReference: {fileID: 0} + - target: {fileID: 100008, guid: ce816f2e6abb0504092c23ed9b970dfd, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 100008, guid: ce816f2e6abb0504092c23ed9b970dfd, type: 3} + propertyPath: m_TagString + value: Player + objectReference: {fileID: 0} + - target: {fileID: 400006, guid: ce816f2e6abb0504092c23ed9b970dfd, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 400006, guid: ce816f2e6abb0504092c23ed9b970dfd, type: 3} + propertyPath: m_LocalPosition.x + value: 0.057 + objectReference: {fileID: 0} + - target: {fileID: 400006, guid: ce816f2e6abb0504092c23ed9b970dfd, type: 3} + propertyPath: m_LocalPosition.y + value: 1.967 + objectReference: {fileID: 0} + - target: {fileID: 400006, guid: ce816f2e6abb0504092c23ed9b970dfd, type: 3} + propertyPath: m_LocalPosition.z + value: -0.64 + objectReference: {fileID: 0} + - target: {fileID: 400006, guid: ce816f2e6abb0504092c23ed9b970dfd, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400006, guid: ce816f2e6abb0504092c23ed9b970dfd, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400006, guid: ce816f2e6abb0504092c23ed9b970dfd, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400006, guid: ce816f2e6abb0504092c23ed9b970dfd, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400006, guid: ce816f2e6abb0504092c23ed9b970dfd, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400006, guid: ce816f2e6abb0504092c23ed9b970dfd, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400006, guid: ce816f2e6abb0504092c23ed9b970dfd, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11400002, guid: ce816f2e6abb0504092c23ed9b970dfd, type: 3} + propertyPath: _trackingOriginType + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11400010, guid: ce816f2e6abb0504092c23ed9b970dfd, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ce816f2e6abb0504092c23ed9b970dfd, type: 3} --- !u!1001 &1786710855 PrefabInstance: m_ObjectHideFlags: 0 @@ -9005,7 +9531,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1941989041} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: d6c86531c866cd5409820556c3fc2c4e, type: 3} m_Name: @@ -9018,7 +9544,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1941989041} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 21b58e0dd1248034c871465fc721b43c, type: 3} m_Name: @@ -9057,7 +9583,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1941989041} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e5d6c19446783f148a1933e20dd05b52, type: 3} m_Name: @@ -9079,6 +9605,12 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 2.0196953, y: 0.2, z: 2.0206933} m_Center: {x: 0.0039343834, y: 0, z: 0.012269765} +--- !u!4 &1964509110 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4471613377008970, guid: ce816f2e6abb0504092c23ed9b970dfd, + type: 3} + m_PrefabInstance: {fileID: 1782389916} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1987297547 PrefabInstance: m_ObjectHideFlags: 0 @@ -9436,6 +9968,12 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2026480485} m_PrefabAsset: {fileID: 0} +--- !u!4 &2036834384 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: bb03ebc0c542b4d4695036c9a9536009, + type: 3} + m_PrefabInstance: {fileID: 416057660} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2036993671 PrefabInstance: m_ObjectHideFlags: 0 @@ -10137,6 +10675,67 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 2.0196953, y: 0.2, z: 2.0206933} m_Center: {x: 0.0039343834, y: 0, z: 0.012269765} +--- !u!1001 &2113590075 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 783109460} + m_Modifications: + - target: {fileID: 112276, guid: d9809c5e8418bb047bf2c8ba1d1a2cec, type: 3} + propertyPath: m_Name + value: OVRControllerPrefab + objectReference: {fileID: 0} + - target: {fileID: 488160, guid: d9809c5e8418bb047bf2c8ba1d1a2cec, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 488160, guid: d9809c5e8418bb047bf2c8ba1d1a2cec, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 488160, guid: d9809c5e8418bb047bf2c8ba1d1a2cec, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 488160, guid: d9809c5e8418bb047bf2c8ba1d1a2cec, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 488160, guid: d9809c5e8418bb047bf2c8ba1d1a2cec, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 488160, guid: d9809c5e8418bb047bf2c8ba1d1a2cec, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 488160, guid: d9809c5e8418bb047bf2c8ba1d1a2cec, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 488160, guid: d9809c5e8418bb047bf2c8ba1d1a2cec, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 488160, guid: d9809c5e8418bb047bf2c8ba1d1a2cec, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 488160, guid: d9809c5e8418bb047bf2c8ba1d1a2cec, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 488160, guid: d9809c5e8418bb047bf2c8ba1d1a2cec, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11479374, guid: d9809c5e8418bb047bf2c8ba1d1a2cec, type: 3} + propertyPath: m_controller + value: 2 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d9809c5e8418bb047bf2c8ba1d1a2cec, type: 3} --- !u!1001 &2143986983 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/BugList.txt b/BugList.txt index 2944f50..670ec38 100644 --- a/BugList.txt +++ b/BugList.txt @@ -1 +1,8 @@ -Bug WASDmovement avec controllers : quand tourne + avance au max, Character est propulser \ No newline at end of file +Bug Unity Général : + - Incapable que lorsque j'appuie sur "Play", le jeu soit render dans mon casque. Je suis obligé de build and run à chaque fois. Problème : Incapable de modifier de mouvement en VR +Bug WASDmovement avec VR controllers : + - quand tourne + avance au max, Character est propulser +Bug Teleport : + - Teleport la camera sans notre ami le peinguin :(. + - Marche juste si on bouge (Script WASD) avant + \ No newline at end of file diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index c5d0489..0fa1719 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -128,9 +128,7 @@ PlayerSettings: 16:9: 1 Others: 1 bundleVersion: 0.1 - preloadedAssets: - - {fileID: 11400000, guid: a50d20b1626d3d240a662a5ce6b2cc65, type: 2} - - {fileID: -8206605843043474360, guid: ee43f997c03df204896142e4045b3dda, type: 2} + preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 1c92a78..c6b48a8 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -3,7 +3,8 @@ --- !u!78 &1 TagManager: serializedVersion: 2 - tags: [] + tags: + - TeleportationScriptsList layers: - Default - TransparentFX