diff --git a/Assets/3D Items - Wand Pack/Materials/WandPack01.mat b/Assets/3D Items - Wand Pack/Materials/WandPack01.mat index ff02b44f..eed22618 100644 --- a/Assets/3D Items - Wand Pack/Materials/WandPack01.mat +++ b/Assets/3D Items - Wand Pack/Materials/WandPack01.mat @@ -45,7 +45,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: e69c70d80df2ecd4abd2fc7987f311d1, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Oculus/Interaction/Samples/Materials/HandStopParticle.mat b/Assets/Oculus/Interaction/Samples/Materials/HandStopParticle.mat index ffe91951..3144a168 100644 --- a/Assets/Oculus/Interaction/Samples/Materials/HandStopParticle.mat +++ b/Assets/Oculus/Interaction/Samples/Materials/HandStopParticle.mat @@ -22,13 +22,13 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: HandStopParticle m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3} - m_ShaderKeywords: _EMISSION + m_ShaderKeywords: _ALPHATEST_ON _EMISSION m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2450 stringTagMap: - RenderType: Opaque + RenderType: TransparentCutout disabledShaderPasses: - ALWAYS m_SavedProperties: diff --git a/Assets/Project Files/Prefabs/JoonasP/FlyingWand.prefab b/Assets/Project Files/Prefabs/JoonasP/FlyingWand.prefab new file mode 100644 index 00000000..6764e567 --- /dev/null +++ b/Assets/Project Files/Prefabs/JoonasP/FlyingWand.prefab @@ -0,0 +1,387 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3757395766904384524 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3757395766904384523} + m_Layer: 0 + m_Name: AttachTransform + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3757395766904384523 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3757395766904384524} + m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3757395767074085960} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} +--- !u!1 &3757395767074346460 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3757395767074085960} + - component: {fileID: 3757395767077500696} + - component: {fileID: 3757395767076336374} + - component: {fileID: 3757395767037568668} + - component: {fileID: 3757395767037568669} + - component: {fileID: 3757395767037568671} + - component: {fileID: 3757395767037568670} + m_Layer: 10 + m_Name: FlyingWand + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3757395767074085960 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3757395767074346460} + m_LocalRotation: {x: -0, y: -0.7071068, z: -0.7071068, w: 0} + m_LocalPosition: {x: -4.834, y: 1.066, z: -10.143} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3757395766904384523} + - {fileID: 3137265763332852347} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: -90, y: 0, z: -180} +--- !u!33 &3757395767077500696 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3757395767074346460} + m_Mesh: {fileID: 4300134, guid: 7374575f12d49ba459e91009f7a9ec62, type: 3} +--- !u!23 &3757395767076336374 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3757395767074346460} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: b27fa8aa11d99d440bab56b1de24981f, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!54 &3757395767037568668 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3757395767074346460} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!136 &3757395767037568669 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3757395767074346460} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: 0.03857441 + m_Height: 0.44495377 + m_Direction: 1 + m_Center: {x: -0.0026081756, y: 0.15938577, z: -0.0010241088} +--- !u!114 &3757395767037568671 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3757395767074346460} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ee8103568a01d804d89cb1fc1dff91eb, type: 3} + m_Name: + m_EditorClassIdentifier: + particles: {fileID: 8844865646353305354} + flySpeed: 10 + testForce: 1000 +--- !u!114 &3757395767037568670 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3757395767074346460} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0ad34abafad169848a38072baa96cdb2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_InteractionManager: {fileID: 0} + m_Colliders: [] + m_InteractionLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_InteractionLayers: + m_Bits: 1 + m_SelectMode: 0 + m_CustomReticle: {fileID: 0} + m_FirstHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_LastHoverExited: + m_PersistentCalls: + m_Calls: [] + m_HoverEntered: + m_PersistentCalls: + m_Calls: [] + m_HoverExited: + m_PersistentCalls: + m_Calls: [] + m_FirstSelectEntered: + m_PersistentCalls: + m_Calls: [] + m_LastSelectExited: + m_PersistentCalls: + m_Calls: [] + m_SelectEntered: + m_PersistentCalls: + m_Calls: [] + m_SelectExited: + m_PersistentCalls: + m_Calls: [] + m_Activated: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 3757395767037568671} + m_TargetAssemblyTypeName: FlyWand, Assembly-CSharp + m_MethodName: EnableFly + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_Deactivated: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 3757395767037568671} + m_TargetAssemblyTypeName: FlyWand, Assembly-CSharp + m_MethodName: DisableFly + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_OnFirstHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_OnLastHoverExited: + m_PersistentCalls: + m_Calls: [] + m_OnHoverEntered: + m_PersistentCalls: + m_Calls: [] + m_OnHoverExited: + m_PersistentCalls: + m_Calls: [] + m_OnSelectEntered: + m_PersistentCalls: + m_Calls: [] + m_OnSelectExited: + m_PersistentCalls: + m_Calls: [] + m_OnSelectCanceled: + m_PersistentCalls: + m_Calls: [] + m_OnActivate: + m_PersistentCalls: + m_Calls: [] + m_OnDeactivate: + m_PersistentCalls: + m_Calls: [] + m_AttachTransform: {fileID: 3757395766904384523} + m_AttachEaseInTime: 0.15 + m_MovementType: 2 + m_VelocityDamping: 1 + m_VelocityScale: 1 + m_AngularVelocityDamping: 1 + m_AngularVelocityScale: 1 + m_TrackPosition: 1 + m_SmoothPosition: 0 + m_SmoothPositionAmount: 5 + m_TightenPosition: 0.5 + m_TrackRotation: 1 + m_SmoothRotation: 0 + m_SmoothRotationAmount: 5 + m_TightenRotation: 0.5 + m_ThrowOnDetach: 1 + m_ThrowSmoothingDuration: 0.25 + m_ThrowSmoothingCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_ThrowVelocityScale: 1.5 + m_ThrowAngularVelocityScale: 1 + m_ForceGravityOnDetach: 0 + m_RetainTransformParent: 1 + m_AttachPointCompatibilityMode: 0 +--- !u!1001 &6456652935746308080 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3757395767074085960} + m_Modifications: + - target: {fileID: 8220033815462497675, guid: 16595acc1c95e1843870f6d5ed6b3ad8, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8220033815462497675, guid: 16595acc1c95e1843870f6d5ed6b3ad8, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8220033815462497675, guid: 16595acc1c95e1843870f6d5ed6b3ad8, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.331 + objectReference: {fileID: 0} + - target: {fileID: 8220033815462497675, guid: 16595acc1c95e1843870f6d5ed6b3ad8, + type: 3} + propertyPath: m_LocalPosition.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8220033815462497675, guid: 16595acc1c95e1843870f6d5ed6b3ad8, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8220033815462497675, guid: 16595acc1c95e1843870f6d5ed6b3ad8, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 8220033815462497675, guid: 16595acc1c95e1843870f6d5ed6b3ad8, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8220033815462497675, guid: 16595acc1c95e1843870f6d5ed6b3ad8, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8220033815462497675, guid: 16595acc1c95e1843870f6d5ed6b3ad8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 8220033815462497675, guid: 16595acc1c95e1843870f6d5ed6b3ad8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 8220033815462497675, guid: 16595acc1c95e1843870f6d5ed6b3ad8, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8788993151639831550, guid: 16595acc1c95e1843870f6d5ed6b3ad8, + type: 3} + propertyPath: m_Name + value: FlyWandParticles + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 16595acc1c95e1843870f6d5ed6b3ad8, type: 3} +--- !u!4 &3137265763332852347 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8220033815462497675, guid: 16595acc1c95e1843870f6d5ed6b3ad8, + type: 3} + m_PrefabInstance: {fileID: 6456652935746308080} + m_PrefabAsset: {fileID: 0} +--- !u!198 &8844865646353305354 stripped +ParticleSystem: + m_CorrespondingSourceObject: {fileID: 2532683062447540474, guid: 16595acc1c95e1843870f6d5ed6b3ad8, + type: 3} + m_PrefabInstance: {fileID: 6456652935746308080} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Project Files/Prefabs/JoonasP/FlyingWand.prefab.meta b/Assets/Project Files/Prefabs/JoonasP/FlyingWand.prefab.meta new file mode 100644 index 00000000..59fab3fd --- /dev/null +++ b/Assets/Project Files/Prefabs/JoonasP/FlyingWand.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: fdff2f4af2d28524d8668e43fa263730 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Project Files/Scripts/JoonasP/LeverController.cs b/Assets/Project Files/Scripts/JoonasP/LeverController.cs new file mode 100644 index 00000000..4f7455d1 --- /dev/null +++ b/Assets/Project Files/Scripts/JoonasP/LeverController.cs @@ -0,0 +1,72 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.Events; + +public class LeverController : MonoBehaviour +{ + private Transform pivot; //The lever will use a pivot point + private Transform grabHand; // ONLY ONE HAND WORKS RIGHT NOW. NEED A SOLUTION! + private bool leverGrabbed; + + private bool eventCalled; + + private Vector3 handDelta; + private Vector3 lastPosition; + + [SerializeField] + private UnityEvent onUp; + [SerializeField] + private UnityEvent onDown; + + public float minAngle = 20f; + public float maxAngle = 75f; + + void Awake() + { + pivot = transform.parent; + leverGrabbed = false; + pivot.eulerAngles = new Vector3(pivot.eulerAngles.x, pivot.eulerAngles.y, minAngle); + } + + void Update() + { + if (leverGrabbed) + { + handDelta = lastPosition - grabHand.position; //The vector of hand movement between frames + pivot.RotateAround(pivot.position, pivot.forward, 200 * (handDelta.y)); + + if(pivot.eulerAngles.z < minAngle) + { + pivot.eulerAngles = new Vector3(pivot.rotation.x, pivot.rotation.y, minAngle); + if (!eventCalled) + { + onUp.Invoke(); + eventCalled = true; + } + } + else if(pivot.eulerAngles.z > maxAngle) + { + pivot.eulerAngles = new Vector3(pivot.rotation.x, pivot.rotation.y, maxAngle); + if (!eventCalled) + { + onDown.Invoke(); + eventCalled = true; + } + } + + lastPosition = grabHand.position; + } + } + + public void GrabLever(Transform hand) + { + leverGrabbed = !leverGrabbed; + grabHand = hand; + handDelta = Vector3.zero; + lastPosition = grabHand.position; + eventCalled = false; + } + + +} diff --git a/Assets/Project Files/Scripts/JoonasP/LeverController.cs.meta b/Assets/Project Files/Scripts/JoonasP/LeverController.cs.meta new file mode 100644 index 00000000..b75071b1 --- /dev/null +++ b/Assets/Project Files/Scripts/JoonasP/LeverController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 090ddea5aafb4e945868d2613c3bfbaa +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Project Files/Scripts/JoonasP/LeverEventTest.cs b/Assets/Project Files/Scripts/JoonasP/LeverEventTest.cs new file mode 100644 index 00000000..51e8bb9f --- /dev/null +++ b/Assets/Project Files/Scripts/JoonasP/LeverEventTest.cs @@ -0,0 +1,22 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class LeverEventTest : MonoBehaviour +{ + + private void Awake() + { + gameObject.GetComponent().material.color = Color.red; + } + + public void On() + { + gameObject.GetComponent().material.color = Color.green; + } + + public void Off() + { + gameObject.GetComponent().material.color = Color.red; + } +} diff --git a/Assets/Project Files/Scripts/JoonasP/LeverEventTest.cs.meta b/Assets/Project Files/Scripts/JoonasP/LeverEventTest.cs.meta new file mode 100644 index 00000000..686767dd --- /dev/null +++ b/Assets/Project Files/Scripts/JoonasP/LeverEventTest.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0a90699fc7b10474aaac51ec87819dc6 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/JoonasP/SampleScene.unity b/Assets/Scenes/JoonasP/SampleScene.unity index 29e52461..9b079263 100644 --- a/Assets/Scenes/JoonasP/SampleScene.unity +++ b/Assets/Scenes/JoonasP/SampleScene.unity @@ -585,12 +585,12 @@ GameObject: - component: {fileID: 629412355} - component: {fileID: 629412357} m_Layer: 0 - m_Name: GameObject + m_Name: PostProcessing m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &629412355 MonoBehaviour: m_ObjectHideFlags: 0 @@ -909,6 +909,103 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1f4d373a613d0466fbd8849470265852, type: 3} +--- !u!1 &838537739 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 838537743} + - component: {fileID: 838537742} + - component: {fileID: 838537741} + - component: {fileID: 838537740} + m_Layer: 0 + m_Name: Cube (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!65 &838537740 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 838537739} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &838537741 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 838537739} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &838537742 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 838537739} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &838537743 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 838537739} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -2.16, y: 0.97, z: -12.21} + m_LocalScale: {x: 0.2, y: 2, z: 3} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 12 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &913183357 GameObject: m_ObjectHideFlags: 0 @@ -974,7 +1071,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &953161746 PrefabInstance: @@ -1126,7 +1223,6 @@ GameObject: - component: {fileID: 1342371953} - component: {fileID: 1342371952} - component: {fileID: 1342371951} - - component: {fileID: 1342371956} - component: {fileID: 1342371955} m_Layer: 0 m_Name: TestHolster @@ -1264,18 +1360,116 @@ MonoBehaviour: m_SocketActive: 1 m_InteractableHoverScale: 1 m_RecycleDelayTime: 1 ---- !u!114 &1342371956 +--- !u!1 &1354843858 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1354843863} + - component: {fileID: 1354843862} + - component: {fileID: 1354843861} + - component: {fileID: 1354843860} + - component: {fileID: 1354843859} + m_Layer: 0 + m_Name: TestCube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1354843859 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1342371949} + m_GameObject: {fileID: 1354843858} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6c2dedcaf08188c4b9c5204f37045ea6, type: 3} + m_Script: {fileID: 11500000, guid: 0a90699fc7b10474aaac51ec87819dc6, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!65 &1354843860 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1354843858} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1354843861 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1354843858} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1354843862 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1354843858} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &1354843863 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1354843858} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -2.452, y: 1.905, z: -13.633} + m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 14 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1366746230 GameObject: m_ObjectHideFlags: 0 @@ -1288,7 +1482,6 @@ GameObject: - component: {fileID: 1366746236} - component: {fileID: 1366746235} - component: {fileID: 1366746234} - - component: {fileID: 1366746233} - component: {fileID: 1366746232} m_Layer: 0 m_Name: TestHolster (1) @@ -1363,18 +1556,6 @@ MonoBehaviour: m_SocketActive: 1 m_InteractableHoverScale: 1 m_RecycleDelayTime: 1 ---- !u!114 &1366746233 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1366746230} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6c2dedcaf08188c4b9c5204f37045ea6, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!135 &1366746234 SphereCollider: m_ObjectHideFlags: 0 @@ -1438,37 +1619,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1366746230} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &1434445379 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1434445380} - m_Layer: 0 - m_Name: AttachTransform - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1434445380 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1434445379} - m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1833905366} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!1 &1479875001 GameObject: m_ObjectHideFlags: 0 @@ -1514,7 +1664,7 @@ GameObject: - component: {fileID: 1578543178} - component: {fileID: 1578543180} - component: {fileID: 1578543179} - m_Layer: 0 + m_Layer: 9 m_Name: XR Origin m_TagString: Player m_Icon: {fileID: 0} @@ -1613,7 +1763,7 @@ MonoBehaviour: m_System: {fileID: 0} m_TurnSpeed: 60 m_LeftHandTurnAction: - m_UseReference: 1 + m_UseReference: 0 m_Action: m_Name: Left Hand Turn m_Type: 0 @@ -1720,94 +1870,28 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1654440615 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 171316, guid: 14a1089dfc8b2f949937da50bf38bc90, type: 3} - propertyPath: m_Name - value: wand01_blue (2) - objectReference: {fileID: 0} - - target: {fileID: 431264, guid: 14a1089dfc8b2f949937da50bf38bc90, type: 3} - propertyPath: m_RootOrder - value: 8 - objectReference: {fileID: 0} - - target: {fileID: 431264, guid: 14a1089dfc8b2f949937da50bf38bc90, type: 3} - propertyPath: m_LocalPosition.x - value: -4.834 - objectReference: {fileID: 0} - - target: {fileID: 431264, guid: 14a1089dfc8b2f949937da50bf38bc90, type: 3} - propertyPath: m_LocalPosition.y - value: 1.066 - objectReference: {fileID: 0} - - target: {fileID: 431264, guid: 14a1089dfc8b2f949937da50bf38bc90, type: 3} - propertyPath: m_LocalPosition.z - value: -10.143 - objectReference: {fileID: 0} - - target: {fileID: 431264, guid: 14a1089dfc8b2f949937da50bf38bc90, type: 3} - propertyPath: m_LocalRotation.w - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 431264, guid: 14a1089dfc8b2f949937da50bf38bc90, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 431264, guid: 14a1089dfc8b2f949937da50bf38bc90, type: 3} - propertyPath: m_LocalRotation.y - value: -0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 431264, guid: 14a1089dfc8b2f949937da50bf38bc90, type: 3} - propertyPath: m_LocalRotation.z - value: -0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 431264, guid: 14a1089dfc8b2f949937da50bf38bc90, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -90 - objectReference: {fileID: 0} - - target: {fileID: 431264, guid: 14a1089dfc8b2f949937da50bf38bc90, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 431264, guid: 14a1089dfc8b2f949937da50bf38bc90, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -180 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 14a1089dfc8b2f949937da50bf38bc90, type: 3} ---- !u!1 &1833905359 stripped +--- !u!1 &1852437981 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 171316, guid: 14a1089dfc8b2f949937da50bf38bc90, + m_CorrespondingSourceObject: {fileID: 152040, guid: 12c69a31240dca742abe09b6c9abc1f0, type: 3} - m_PrefabInstance: {fileID: 1654440615} + m_PrefabInstance: {fileID: 2089790320} m_PrefabAsset: {fileID: 0} ---- !u!114 &1833905360 +--- !u!4 &1852437982 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 417476, guid: 12c69a31240dca742abe09b6c9abc1f0, + type: 3} + m_PrefabInstance: {fileID: 2089790320} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1852437983 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1833905359} + m_GameObject: {fileID: 1852437981} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ee8103568a01d804d89cb1fc1dff91eb, type: 3} - m_Name: - m_EditorClassIdentifier: - particles: {fileID: 1987431015} - flySpeed: 10 - testForce: 1000 ---- !u!114 &1833905361 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1833905359} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0ad34abafad169848a38072baa96cdb2, type: 3} + m_Script: {fileID: 11500000, guid: 8a35f6cfbfba9b548aaa00d52cfe8a50, type: 3} m_Name: m_EditorClassIdentifier: m_InteractionManager: {fileID: 1989791150} @@ -1839,40 +1923,40 @@ MonoBehaviour: m_Calls: [] m_SelectEntered: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 1852437984} + m_TargetAssemblyTypeName: LeverController, Assembly-CSharp + m_MethodName: GrabLever + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 2088577709} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Transform, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 m_SelectExited: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 1852437984} + m_TargetAssemblyTypeName: LeverController, Assembly-CSharp + m_MethodName: GrabLever + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 2088577709} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Transform, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 m_Activated: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1833905360} - m_TargetAssemblyTypeName: FlyWand, Assembly-CSharp - m_MethodName: EnableFly - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 + m_Calls: [] m_Deactivated: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1833905360} - m_TargetAssemblyTypeName: FlyWand, Assembly-CSharp - m_MethodName: DisableFly - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 + m_Calls: [] m_OnFirstHoverEntered: m_PersistentCalls: m_Calls: [] @@ -1900,79 +1984,80 @@ MonoBehaviour: m_OnDeactivate: m_PersistentCalls: m_Calls: [] - m_AttachTransform: {fileID: 1434445380} - m_AttachEaseInTime: 0.15 - m_MovementType: 2 - m_VelocityDamping: 1 - m_VelocityScale: 1 - m_AngularVelocityDamping: 1 - m_AngularVelocityScale: 1 - m_TrackPosition: 1 - m_SmoothPosition: 0 - m_SmoothPositionAmount: 5 - m_TightenPosition: 0.5 - m_TrackRotation: 1 - m_SmoothRotation: 0 - m_SmoothRotationAmount: 5 - m_TightenRotation: 0.5 - m_ThrowOnDetach: 1 - m_ThrowSmoothingDuration: 0.25 - m_ThrowSmoothingCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - m_ThrowVelocityScale: 1.5 - m_ThrowAngularVelocityScale: 1 - m_ForceGravityOnDetach: 0 - m_RetainTransformParent: 1 - m_AttachPointCompatibilityMode: 0 ---- !u!136 &1833905362 +--- !u!114 &1852437984 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1852437981} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 090ddea5aafb4e945868d2613c3bfbaa, type: 3} + m_Name: + m_EditorClassIdentifier: + onUp: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1354843859} + m_TargetAssemblyTypeName: LeverEventTest, Assembly-CSharp + m_MethodName: Off + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + onDown: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1354843859} + m_TargetAssemblyTypeName: LeverEventTest, Assembly-CSharp + m_MethodName: On + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + minAngle: 35 + maxAngle: 75 +--- !u!136 &1852437985 CapsuleCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1833905359} + m_GameObject: {fileID: 1852437981} m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - m_Radius: 0.03857441 - m_Height: 0.44495377 + m_Radius: 0.039352436 + m_Height: 0.40530682 m_Direction: 1 - m_Center: {x: -0.0026081756, y: 0.15938577, z: -0.0010241088} ---- !u!54 &1833905363 + m_Center: {x: -0.002700729, y: 0.13125366, z: 0.0036743917} +--- !u!54 &1852437986 Rigidbody: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1833905359} + m_GameObject: {fileID: 1852437981} serializedVersion: 2 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 m_UseGravity: 1 - m_IsKinematic: 0 + m_IsKinematic: 1 m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 ---- !u!4 &1833905366 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 431264, guid: 14a1089dfc8b2f949937da50bf38bc90, - type: 3} - m_PrefabInstance: {fileID: 1654440615} - m_PrefabAsset: {fileID: 0} --- !u!1 &1986139475 GameObject: m_ObjectHideFlags: 0 @@ -2165,12 +2250,6 @@ MonoBehaviour: m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 m_Version: 2 ---- !u!198 &1987431015 stripped -ParticleSystem: - m_CorrespondingSourceObject: {fileID: 2532683062447540474, guid: 16595acc1c95e1843870f6d5ed6b3ad8, - type: 3} - m_PrefabInstance: {fileID: 7907846130229038527} - m_PrefabAsset: {fileID: 0} --- !u!1 &1989791149 GameObject: m_ObjectHideFlags: 0 @@ -2437,9 +2516,13 @@ PrefabInstance: propertyPath: m_Name value: wand01_blue (3) objectReference: {fileID: 0} + - target: {fileID: 171316, guid: 14a1089dfc8b2f949937da50bf38bc90, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} - target: {fileID: 431264, guid: 14a1089dfc8b2f949937da50bf38bc90, type: 3} propertyPath: m_RootOrder - value: 9 + value: 10 objectReference: {fileID: 0} - target: {fileID: 431264, guid: 14a1089dfc8b2f949937da50bf38bc90, type: 3} propertyPath: m_LocalPosition.x @@ -2787,72 +2870,230 @@ SphereCollider: serializedVersion: 2 m_Radius: 0.05 m_Center: {x: 0, y: 0, z: 0} ---- !u!1001 &7907846130229038527 +--- !u!1001 &2089790320 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 1833905366} + m_TransformParent: {fileID: 2109100480} m_Modifications: - - target: {fileID: 8220033815462497675, guid: 16595acc1c95e1843870f6d5ed6b3ad8, - type: 3} - propertyPath: m_RootOrder - value: 1 + - target: {fileID: 152040, guid: 12c69a31240dca742abe09b6c9abc1f0, type: 3} + propertyPath: m_Name + value: wand04_purple objectReference: {fileID: 0} - - target: {fileID: 8220033815462497675, guid: 16595acc1c95e1843870f6d5ed6b3ad8, - type: 3} + - target: {fileID: 417476, guid: 12c69a31240dca742abe09b6c9abc1f0, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 417476, guid: 12c69a31240dca742abe09b6c9abc1f0, type: 3} + propertyPath: m_LocalScale.x + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 417476, guid: 12c69a31240dca742abe09b6c9abc1f0, type: 3} + propertyPath: m_LocalScale.y + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 417476, guid: 12c69a31240dca742abe09b6c9abc1f0, type: 3} + propertyPath: m_LocalScale.z + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 417476, guid: 12c69a31240dca742abe09b6c9abc1f0, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8220033815462497675, guid: 16595acc1c95e1843870f6d5ed6b3ad8, + - target: {fileID: 417476, guid: 12c69a31240dca742abe09b6c9abc1f0, type: 3} + propertyPath: m_LocalPosition.y + value: 0.45 + objectReference: {fileID: 0} + - target: {fileID: 417476, guid: 12c69a31240dca742abe09b6c9abc1f0, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 417476, guid: 12c69a31240dca742abe09b6c9abc1f0, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 417476, guid: 12c69a31240dca742abe09b6c9abc1f0, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 417476, guid: 12c69a31240dca742abe09b6c9abc1f0, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 417476, guid: 12c69a31240dca742abe09b6c9abc1f0, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 417476, guid: 12c69a31240dca742abe09b6c9abc1f0, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 417476, guid: 12c69a31240dca742abe09b6c9abc1f0, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 417476, guid: 12c69a31240dca742abe09b6c9abc1f0, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 12c69a31240dca742abe09b6c9abc1f0, type: 3} +--- !u!1 &2109100477 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2109100480} + - component: {fileID: 2109100479} + - component: {fileID: 2109100478} + m_Layer: 0 + m_Name: Sphere (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!23 &2109100478 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2109100477} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &2109100479 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2109100477} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &2109100480 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2109100477} + m_LocalRotation: {x: 0, y: 0, z: 0.38268343, w: 0.92387956} + m_LocalPosition: {x: -2.324, y: 1.301, z: -13.649} + m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 1852437982} + m_Father: {fileID: 0} + m_RootOrder: 13 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 45} +--- !u!1001 &3757395765507099215 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3757395767037568670, guid: fdff2f4af2d28524d8668e43fa263730, + type: 3} + propertyPath: m_InteractionManager + value: + objectReference: {fileID: 1989791150} + - target: {fileID: 3757395767074085960, guid: fdff2f4af2d28524d8668e43fa263730, + type: 3} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 3757395767074085960, guid: fdff2f4af2d28524d8668e43fa263730, + type: 3} + propertyPath: m_LocalPosition.x + value: -4.834 + objectReference: {fileID: 0} + - target: {fileID: 3757395767074085960, guid: fdff2f4af2d28524d8668e43fa263730, type: 3} propertyPath: m_LocalPosition.y - value: 0.331 + value: 1.066 objectReference: {fileID: 0} - - target: {fileID: 8220033815462497675, guid: 16595acc1c95e1843870f6d5ed6b3ad8, + - target: {fileID: 3757395767074085960, guid: fdff2f4af2d28524d8668e43fa263730, type: 3} propertyPath: m_LocalPosition.z - value: -0 + value: -10.143 objectReference: {fileID: 0} - - target: {fileID: 8220033815462497675, guid: 16595acc1c95e1843870f6d5ed6b3ad8, + - target: {fileID: 3757395767074085960, guid: fdff2f4af2d28524d8668e43fa263730, type: 3} propertyPath: m_LocalRotation.w - value: 0.5 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 8220033815462497675, guid: 16595acc1c95e1843870f6d5ed6b3ad8, + - target: {fileID: 3757395767074085960, guid: fdff2f4af2d28524d8668e43fa263730, type: 3} propertyPath: m_LocalRotation.x - value: -0.5 + value: -0 objectReference: {fileID: 0} - - target: {fileID: 8220033815462497675, guid: 16595acc1c95e1843870f6d5ed6b3ad8, + - target: {fileID: 3757395767074085960, guid: fdff2f4af2d28524d8668e43fa263730, type: 3} propertyPath: m_LocalRotation.y - value: 0.5 + value: -0.7071068 objectReference: {fileID: 0} - - target: {fileID: 8220033815462497675, guid: 16595acc1c95e1843870f6d5ed6b3ad8, + - target: {fileID: 3757395767074085960, guid: fdff2f4af2d28524d8668e43fa263730, type: 3} propertyPath: m_LocalRotation.z - value: 0.5 + value: -0.7071068 objectReference: {fileID: 0} - - target: {fileID: 8220033815462497675, guid: 16595acc1c95e1843870f6d5ed6b3ad8, + - target: {fileID: 3757395767074085960, guid: fdff2f4af2d28524d8668e43fa263730, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: -90 objectReference: {fileID: 0} - - target: {fileID: 8220033815462497675, guid: 16595acc1c95e1843870f6d5ed6b3ad8, + - target: {fileID: 3757395767074085960, guid: fdff2f4af2d28524d8668e43fa263730, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 90 - objectReference: {fileID: 0} - - target: {fileID: 8220033815462497675, guid: 16595acc1c95e1843870f6d5ed6b3ad8, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8788993151639831550, guid: 16595acc1c95e1843870f6d5ed6b3ad8, + - target: {fileID: 3757395767074085960, guid: fdff2f4af2d28524d8668e43fa263730, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -180 + objectReference: {fileID: 0} + - target: {fileID: 3757395767074346460, guid: fdff2f4af2d28524d8668e43fa263730, type: 3} propertyPath: m_Name - value: FlyWandParticles + value: wand01_blue (2) objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 16595acc1c95e1843870f6d5ed6b3ad8, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: fdff2f4af2d28524d8668e43fa263730, type: 3} diff --git a/Assets/Scenes/JoonasP/SampleScene/GameObject Profile.asset b/Assets/Scenes/JoonasP/SampleScene/GameObject Profile.asset index 2a0925f4..a9eceee0 100644 --- a/Assets/Scenes/JoonasP/SampleScene/GameObject Profile.asset +++ b/Assets/Scenes/JoonasP/SampleScene/GameObject Profile.asset @@ -21,7 +21,7 @@ MonoBehaviour: m_Value: {x: 0.5, y: 0.5} intensity: m_OverrideState: 1 - m_Value: 1 + m_Value: 0 smoothness: m_OverrideState: 1 m_Value: 1 diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 58202f68..1b785913 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -5,9 +5,12 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: - - enabled: 1 + - enabled: 0 path: Assets/Scenes/DO_NOT_TOUCH.unity guid: 9fc0d4010bbf28b4594072e72b8655ab + - enabled: 1 + path: Assets/Scenes/JoonasP/SampleScene.unity + guid: 84eaff0e1a543c244920ec3c1b11b50f m_configObjects: Unity.XR.Oculus.Settings: {fileID: 11400000, guid: bfa1182bd221b4ca89619141f66f1260, type: 2} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index caacea66..8ccdd8a0 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -147,17 +147,13 @@ PlayerSettings: - {fileID: 0} - {fileID: 0} - {fileID: 0} - - {fileID: -990268426630310298, guid: a9a6963505ddf7f4d886008c6dc86122, type: 2} - - {fileID: -8196854396901781169, guid: 1a4c68ca72a83449f938d669337cb305, type: 2} - - {fileID: 11400000, guid: bfa1182bd221b4ca89619141f66f1260, type: 2} - {fileID: 0} - {fileID: 0} - {fileID: 0} - {fileID: 0} - {fileID: 0} - - {fileID: 11400000, guid: bfa1182bd221b4ca89619141f66f1260, type: 2} - - {fileID: -8196854396901781169, guid: 1a4c68ca72a83449f938d669337cb305, type: 2} - - {fileID: -990268426630310298, guid: a9a6963505ddf7f4d886008c6dc86122, type: 2} + - {fileID: 0} + - {fileID: 0} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 @@ -728,7 +724,7 @@ PlayerSettings: PS4: PHOTON_UNITY_NETWORKING;PUN_2_0_OR_NEWER;PUN_2_OR_NEWER;PUN_2_19_OR_NEWER;UNITY_POST_PROCESSING_STACK_V2 PS5: PHOTON_UNITY_NETWORKING;PUN_2_0_OR_NEWER;PUN_2_OR_NEWER;PUN_2_19_OR_NEWER;UNITY_POST_PROCESSING_STACK_V2 Stadia: PHOTON_UNITY_NETWORKING;PUN_2_0_OR_NEWER;PUN_2_OR_NEWER;PUN_2_19_OR_NEWER;UNITY_POST_PROCESSING_STACK_V2 - Standalone: RH_SerializedDictionary;PHOTON_UNITY_NETWORKING;PUN_2_0_OR_NEWER;PUN_2_OR_NEWER;PUN_2_19_OR_NEWER;UNITY_POST_PROCESSING_STACK_V2 + Standalone: RH_SerializedDictionary;PHOTON_UNITY_NETWORKING;PUN_2_0_OR_NEWER;PUN_2_OR_NEWER;PUN_2_19_OR_NEWER;UNITY_POST_PROCESSING_STACK_V2;GRIFFIN_URP;POSEIDON;POSEIDON_URP;JUPITER;GRIFFIN;TEXTURE_GRAPH;GRIFFIN_2021;TG_SEARCHER WebGL: PHOTON_UNITY_NETWORKING;PUN_2_0_OR_NEWER;PUN_2_OR_NEWER;PUN_2_19_OR_NEWER;UNITY_POST_PROCESSING_STACK_V2 Windows Store Apps: PHOTON_UNITY_NETWORKING;PUN_2_0_OR_NEWER;PUN_2_OR_NEWER;PUN_2_19_OR_NEWER;UNITY_POST_PROCESSING_STACK_V2 XboxOne: PHOTON_UNITY_NETWORKING;PUN_2_0_OR_NEWER;PUN_2_OR_NEWER;PUN_2_19_OR_NEWER;UNITY_POST_PROCESSING_STACK_V2