diff --git a/Assets/Code/Scripts/Interaction/PlayerBoxController.cs b/Assets/Code/Scripts/Interaction/PlayerBoxController.cs new file mode 100644 index 0000000..9f36763 --- /dev/null +++ b/Assets/Code/Scripts/Interaction/PlayerBoxController.cs @@ -0,0 +1,72 @@ +using UnityEngine; + +public class BoxPickup : MonoBehaviour +{ + public Transform PlayerTransform; + public Transform CameraTransform; + public Transform HandTransform; + public float ThrowForce = 10f; + public float PickupDistance = 5f; + + private bool isHeld; + private Rigidbody m_rigidbody; + private PlayerInputController input; + + void Start() + { + m_rigidbody = GetComponent(); + input = PlayerTransform.GetComponent(); + } + + void Update() + { + if (input.InteractPressed) + { + if (!isHeld) + TryPickup(); + else + Drop(); + } + + if (input.ThrowPressed) + Throw(); + } + + private void TryPickup() + { + Collider[] hits = Physics.OverlapSphere(PlayerTransform.position, PickupDistance); + + foreach (Collider hit in hits) + { + if (hit.transform == transform) { + Pickup(); + return; + } + } + } + + private void Pickup() + { + isHeld = true; + m_rigidbody.isKinematic = true; + transform.SetParent(HandTransform); + transform.localPosition = Vector3.zero; + transform.localRotation = Quaternion.identity; + } + + private void Drop() + { + isHeld = false; + transform.SetParent(null); + m_rigidbody.isKinematic = false; + } + + private void Throw() + { + if (!isHeld) + return; + + Drop(); + m_rigidbody.AddForce(PlayerTransform.forward * ThrowForce, ForceMode.Impulse); + } +} \ No newline at end of file diff --git a/Assets/Code/Scripts/Interaction/PlayerBoxController.cs.meta b/Assets/Code/Scripts/Interaction/PlayerBoxController.cs.meta new file mode 100644 index 0000000..04b5750 --- /dev/null +++ b/Assets/Code/Scripts/Interaction/PlayerBoxController.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: a36af2e55a3732eb2abc110ae2365702 \ No newline at end of file diff --git a/Assets/Code/Scripts/Player/PlayerHeadControll.cs b/Assets/Code/Scripts/Player/PlayerHeadControll.cs index a6b70ea..c00f5d3 100644 --- a/Assets/Code/Scripts/Player/PlayerHeadControll.cs +++ b/Assets/Code/Scripts/Player/PlayerHeadControll.cs @@ -2,18 +2,25 @@ using UnityEngine; public class PlayerHeadController : MonoBehaviour { + [Header("Head")] public Transform Head; public Transform CameraTransform; - public Transform BodyTransform; - - public float ThrowForce; public float PickupDistance; public bool isHoldingHead; - private Rigidbody m_headRigidbody; + [Header("Grabbable")] + public Transform HandTransform; // in the future hand maybe grab items but for now its an empty object + public float ItemThrowForce = 10f; + public float ItemPickupDistance = 5f; + private bool isHoldingItem; + private Rigidbody m_itemRigidbody; + private Collider m_itemCollider; + private Transform m_currentItem; + + private Rigidbody m_headRigidbody; private Vector3 m_headInitialLocalPos; private Quaternion m_headInitialLocalRot; @@ -31,7 +38,6 @@ public class PlayerHeadController : MonoBehaviour Cursor.lockState = CursorLockMode.Locked; Vector3 offset = new Vector3(0f, -0.5f, 0.5f); - m_headInitialLocalPos = BodyTransform.localPosition + offset; m_headInitialLocalRot = BodyTransform.localRotation; m_headRigidbody = Head.GetComponent(); @@ -42,14 +48,20 @@ public class PlayerHeadController : MonoBehaviour void Update() { if (input.HeadInteractionPressed) - { InteractHead(); - } - if (input.ThrowPressed) - { + if (input.ThrowPressed && isHoldingHead) ThrowHead(); + + if (input.InteractPressed) + { + if (!isHoldingItem) + TryPickupItem(); + else + DropItem(); } + if (input.ThrowPressed && isHoldingItem) + ThrowItem(); } private void InteractHead() @@ -60,61 +72,84 @@ public class PlayerHeadController : MonoBehaviour DropHead(); } + private void TryPickupHead() + { + if (isHoldingHead || isHoldingItem) + return; + if (Vector3.Distance(transform.position, Head.position) <= PickupDistance) + PickupHead(); + } + + private void PickupHead() + { + isHoldingHead = true; + + if (m_headRigidbody != null) + Destroy(m_headRigidbody); + + Head.SetParent(transform); + Head.localPosition = m_headInitialLocalPos; + Head.localRotation = m_headInitialLocalRot; + } private void DropHead() { - Debug.Log("DropHead"); animator.SetTrigger("Throw"); - isHoldingHead = false; Head.SetParent(null); m_headRigidbody = Head.gameObject.AddComponent(); m_headRigidbody.mass = 1f; - m_headRigidbody.constraints = RigidbodyConstraints.FreezeRotationX | RigidbodyConstraints.FreezeRotationZ | RigidbodyConstraints.FreezeRotationY; } - private void ThrowHead() { - Debug.Log("ThrowHead"); - if (!isHoldingHead) - return; - DropHead(); - m_headRigidbody.AddForce(CameraTransform.forward * ThrowForce, ForceMode.Impulse); } - - private void TryPickupHead() + private void TryPickupItem() { - if (isHoldingHead) + if (isHoldingHead || isHoldingItem) return; + int grabbableLayer = LayerMask.GetMask("Grabbable"); + Collider[] hits = Physics.OverlapSphere(transform.position, ItemPickupDistance, grabbableLayer); - float distance = Vector3.Distance(transform.position, Head.position); - - if (distance <= PickupDistance) + foreach (Collider hit in hits) { - PickupHead(); + m_currentItem = hit.transform; + m_itemRigidbody = hit.GetComponent(); + m_itemCollider = hit.GetComponent(); + PickupItem(); + return; } } - private void PickupHead() + private void PickupItem() { - Debug.Log("PickupHead"); - isHoldingHead = true; + isHoldingItem = true; + m_itemRigidbody.isKinematic = true; + m_itemCollider.enabled = false; - if (m_headRigidbody != null) - { - Destroy(m_headRigidbody); - } - - Head.SetParent(transform); - - Head.localPosition = m_headInitialLocalPos; - Head.localRotation = m_headInitialLocalRot; + m_currentItem.SetParent(HandTransform); + m_currentItem.localPosition = Vector3.zero; + m_currentItem.localRotation = Quaternion.identity; } -} \ No newline at end of file + + private void DropItem() + { + isHoldingItem = false; + m_currentItem.SetParent(null); + m_itemRigidbody.isKinematic = false; + m_itemCollider.enabled = true; + m_currentItem = null; + } + + private void ThrowItem() + { + DropItem(); + m_itemRigidbody.AddForce(BodyTransform.forward * ItemThrowForce, ForceMode.Impulse); + } +} \ No newline at end of file diff --git a/Assets/Code/Scripts/Player/PlayerInputHandler.cs b/Assets/Code/Scripts/Player/PlayerInputHandler.cs index 5ca9d8d..324cdba 100644 --- a/Assets/Code/Scripts/Player/PlayerInputHandler.cs +++ b/Assets/Code/Scripts/Player/PlayerInputHandler.cs @@ -11,7 +11,9 @@ public class PlayerInputController : MonoBehaviour private InputAction m_jumpAction; private InputAction m_throwAction; private InputAction m_shiftAction; + private InputAction m_interactAction; private InputAction m_headInteractAction; + public Vector2 MoveAmount { get; private set; } public Vector2 LookAmount { get; private set; } @@ -19,7 +21,9 @@ public class PlayerInputController : MonoBehaviour public bool JumpPressed { get; private set; } public bool ShiftPressed { get; private set; } public bool ThrowPressed { get; private set; } + public bool InteractPressed { get; private set; } public bool HeadInteractionPressed { get; private set; } + private void Awake() { @@ -30,7 +34,9 @@ public class PlayerInputController : MonoBehaviour m_jumpAction = map.FindAction("Jump"); m_shiftAction = map.FindAction("Shift"); m_throwAction = map.FindAction("Throw"); + m_interactAction = map.FindAction("Interact"); m_headInteractAction = map.FindAction("HeadInteract"); + } private void OnEnable() @@ -52,6 +58,7 @@ public class PlayerInputController : MonoBehaviour ShiftPressed = false; JumpPressed = false; ThrowPressed = false; + InteractPressed = false; HeadInteractionPressed = false; return; } @@ -62,6 +69,7 @@ public class PlayerInputController : MonoBehaviour ShiftPressed = m_shiftAction.IsPressed(); JumpPressed = m_jumpAction.WasPressedThisFrame(); ThrowPressed = m_throwAction.WasPressedThisFrame(); + InteractPressed = m_interactAction.WasPressedThisFrame(); HeadInteractionPressed = m_headInteractAction.WasPressedThisFrame(); } diff --git a/Assets/Level/Prefabs/Interactives/ThrowableCube.prefab b/Assets/Level/Prefabs/Interactives/ThrowableCube.prefab new file mode 100644 index 0000000..3a19848 --- /dev/null +++ b/Assets/Level/Prefabs/Interactives/ThrowableCube.prefab @@ -0,0 +1,182 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8295937476714018201 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1945301683602458784} + - component: {fileID: 7204621315108719217} + - component: {fileID: 8544167331072815505} + - component: {fileID: 1366644702000549104} + - component: {fileID: 9065033722839287093} + - component: {fileID: 5078647870528450919} + - component: {fileID: 53541677567227536} + m_Layer: 0 + m_Name: ThrowableCube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1945301683602458784 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8295937476714018201} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -39.38, y: 6.56, z: -9.27} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &7204621315108719217 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8295937476714018201} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &8544167331072815505 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8295937476714018201} + 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_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 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_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_MaskInteraction: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &1366644702000549104 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8295937476714018201} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!54 &9065033722839287093 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8295937476714018201} + serializedVersion: 5 + m_Mass: 1 + m_LinearDamping: 0 + m_AngularDamping: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!65 &5078647870528450919 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8295937476714018201} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &53541677567227536 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8295937476714018201} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a36af2e55a3732eb2abc110ae2365702, type: 3} + m_Name: + m_EditorClassIdentifier: '::' + PlayerTransform: {fileID: 0} + CameraTransform: {fileID: 0} + HandTransform: {fileID: 0} + ThrowForce: 10 + PickupDistance: 2 diff --git a/Assets/Level/Prefabs/Interactives/ThrowableCube.prefab.meta b/Assets/Level/Prefabs/Interactives/ThrowableCube.prefab.meta new file mode 100644 index 0000000..147df0f --- /dev/null +++ b/Assets/Level/Prefabs/Interactives/ThrowableCube.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c786dcd5f720bb47dbf843bd97137452 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Level/Prefabs/Player/Player.prefab b/Assets/Level/Prefabs/Player/Player.prefab index efa00d6..a91ad09 100644 --- a/Assets/Level/Prefabs/Player/Player.prefab +++ b/Assets/Level/Prefabs/Player/Player.prefab @@ -1,5 +1,36 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &4437376557356260369 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3832855070939641903} + m_Layer: 0 + m_Name: HandlePoint + m_TagString: Untagged + m_Icon: {fileID: -5442936267250999957, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3832855070939641903 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4437376557356260369} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.69, z: 0.527} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7821156882341915560} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8021212901078439068 GameObject: m_ObjectHideFlags: 0 @@ -612,7 +643,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 82a2914d8f86c62488456950c8330e38, type: 3} propertyPath: m_LocalPosition.x - value: -30.76 + value: -30.54 objectReference: {fileID: 0} - target: {fileID: -4216859302048453862, guid: 82a2914d8f86c62488456950c8330e38, type: 3} propertyPath: m_LocalPosition.y @@ -856,6 +887,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: -4216859302048453862, guid: 82a2914d8f86c62488456950c8330e38, type: 3} insertIndex: -1 addedObject: {fileID: 6975610370707183838} + - targetCorrespondingSourceObject: {fileID: -4216859302048453862, guid: 82a2914d8f86c62488456950c8330e38, type: 3} + insertIndex: -1 + addedObject: {fileID: 3832855070939641903} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: -927199367670048503, guid: 82a2914d8f86c62488456950c8330e38, type: 3} insertIndex: -1 diff --git a/Assets/Level/Scenes/DevRoom.unity b/Assets/Level/Scenes/DevRoom.unity index e4be140..b715065 100644 --- a/Assets/Level/Scenes/DevRoom.unity +++ b/Assets/Level/Scenes/DevRoom.unity @@ -475,24 +475,6 @@ Mesh: - serializedVersion: 1 m_IndexStart: 0 m_IndexCount: 0 ---- !u!1 &36927860 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1446289441119343760, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3} - m_PrefabInstance: {fileID: 99539971} - m_PrefabAsset: {fileID: 0} ---- !u!114 &36927862 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 36927860} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1d8f349ed7dc088a4a6e2690ee87094a, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::PlayerMovement - InputActions: {fileID: 0} --- !u!114 &43211589 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 6921400718617286756, guid: 2f9e8e4a19f939f43a84c1c7d0a0e185, type: 3} @@ -865,73 +847,6 @@ Mesh: - serializedVersion: 1 m_IndexStart: 0 m_IndexCount: 0 ---- !u!1001 &99539971 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 4446703388580953019, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3} - propertyPath: m_TagString - value: Player - objectReference: {fileID: 0} - - target: {fileID: 6544026473454475707, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3} - propertyPath: m_Name - value: Player - objectReference: {fileID: 0} - - target: {fileID: 7821156882341915560, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7821156882341915560, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3} - propertyPath: m_LocalPosition.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7821156882341915560, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7821156882341915560, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 7821156882341915560, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7821156882341915560, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3} - propertyPath: m_LocalRotation.y - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 7821156882341915560, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7821156882341915560, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7821156882341915560, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 90 - objectReference: {fileID: 0} - - target: {fileID: 7821156882341915560, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 4446703388580953019, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3} - insertIndex: -1 - addedObject: {fileID: 762199654} - - targetCorrespondingSourceObject: {fileID: 1446289441119343760, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3} - insertIndex: -1 - addedObject: {fileID: 36927862} - m_SourcePrefab: {fileID: 100100000, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3} --- !u!43 &143500479 Mesh: m_ObjectHideFlags: 0 @@ -1637,6 +1552,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b93699191d7b58146b2c38540cbed40f, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::PressurePlateTestBlock +--- !u!4 &432096317 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3832855070939641903, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3} + m_PrefabInstance: {fileID: 1004343558} + m_PrefabAsset: {fileID: 0} --- !u!1 &433548408 GameObject: m_ObjectHideFlags: 0 @@ -1719,6 +1639,7 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + headController: {fileID: 0} --- !u!135 &433548411 SphereCollider: m_ObjectHideFlags: 0 @@ -36062,6 +35983,67 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c85dce46687f06f439686130ef0a647a, type: 3} +--- !u!1001 &525042218 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalPosition.x + value: 6.591309 + objectReference: {fileID: 0} + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalPosition.y + value: 2.5500002 + objectReference: {fileID: 0} + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalPosition.z + value: -12.203602 + objectReference: {fileID: 0} + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8295937476714018201, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_Name + value: ThrowableCube (2) + objectReference: {fileID: 0} + - target: {fileID: 8295937476714018201, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} --- !u!1 &575823971 GameObject: m_ObjectHideFlags: 0 @@ -36832,6 +36814,67 @@ Transform: m_Children: [] m_Father: {fileID: 1994839082} m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} +--- !u!1001 &616194330 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalPosition.x + value: 7.143099 + objectReference: {fileID: 0} + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalPosition.y + value: 0.5499998 + objectReference: {fileID: 0} + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalPosition.z + value: -11.581879 + objectReference: {fileID: 0} + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8295937476714018201, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_Name + value: ThrowableCube + objectReference: {fileID: 0} + - target: {fileID: 8295937476714018201, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} --- !u!43 &696562523 Mesh: m_ObjectHideFlags: 0 @@ -37010,38 +37053,6 @@ Mesh: - serializedVersion: 1 m_IndexStart: 0 m_IndexCount: 0 ---- !u!1 &762199651 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4446703388580953019, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3} - m_PrefabInstance: {fileID: 99539971} - m_PrefabAsset: {fileID: 0} ---- !u!54 &762199654 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 762199651} - serializedVersion: 5 - m_Mass: 1 - m_LinearDamping: 0 - m_AngularDamping: 0.05 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 0 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 --- !u!1 &818197916 GameObject: m_ObjectHideFlags: 0 @@ -37576,6 +37587,75 @@ Mesh: - serializedVersion: 1 m_IndexStart: 0 m_IndexCount: 0 +--- !u!1001 &1004343558 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4313489822343726709, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3} + propertyPath: HandTransform + value: + objectReference: {fileID: 432096317} + - target: {fileID: 6544026473454475707, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3} + propertyPath: m_Name + value: Player + objectReference: {fileID: 0} + - target: {fileID: 7821156882341915560, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3} + propertyPath: m_LocalScale.x + value: 3.5192 + objectReference: {fileID: 0} + - target: {fileID: 7821156882341915560, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3} + propertyPath: m_LocalScale.z + value: 3.66552 + objectReference: {fileID: 0} + - target: {fileID: 7821156882341915560, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3} + propertyPath: m_LocalPosition.x + value: 0.86821 + objectReference: {fileID: 0} + - target: {fileID: 7821156882341915560, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3} + propertyPath: m_LocalPosition.y + value: 0.05000043 + objectReference: {fileID: 0} + - target: {fileID: 7821156882341915560, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3} + propertyPath: m_LocalPosition.z + value: 2.1638 + objectReference: {fileID: 0} + - target: {fileID: 7821156882341915560, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3} + propertyPath: m_LocalRotation.w + value: 0.8544166 + objectReference: {fileID: 0} + - target: {fileID: 7821156882341915560, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7821156882341915560, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3} + propertyPath: m_LocalRotation.y + value: 0.5195886 + objectReference: {fileID: 0} + - target: {fileID: 7821156882341915560, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7821156882341915560, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7821156882341915560, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 62.609 + objectReference: {fileID: 0} + - target: {fileID: 7821156882341915560, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3} --- !u!1 &1021798997 GameObject: m_ObjectHideFlags: 0 @@ -38659,6 +38739,7 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + headController: {fileID: 0} --- !u!135 &1271779616 SphereCollider: m_ObjectHideFlags: 0 @@ -72855,6 +72936,7 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + headController: {fileID: 0} --- !u!135 &1434828804 SphereCollider: m_ObjectHideFlags: 0 @@ -108193,6 +108275,67 @@ Transform: m_Children: [] m_Father: {fileID: 1021798998} m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} +--- !u!1001 &1679253409 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalPosition.x + value: 6.8145223 + objectReference: {fileID: 0} + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalPosition.y + value: 1.5500001 + objectReference: {fileID: 0} + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalPosition.z + value: -11.941306 + objectReference: {fileID: 0} + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8295937476714018201, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_Name + value: ThrowableCube (1) + objectReference: {fileID: 0} + - target: {fileID: 8295937476714018201, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} --- !u!43 &1713424934 Mesh: m_ObjectHideFlags: 0 @@ -109723,6 +109866,7 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + headController: {fileID: 0} --- !u!135 &2017727401 SphereCollider: m_ObjectHideFlags: 0 @@ -144409,9 +144553,12 @@ SceneRoots: m_Roots: - {fileID: 1913408286} - {fileID: 1225232293} - - {fileID: 99539971} - {fileID: 638812852754935428} - {fileID: 2009765958} - {fileID: 2145812611} - {fileID: 153565765} - {fileID: 581107447} + - {fileID: 616194330} + - {fileID: 1679253409} + - {fileID: 525042218} + - {fileID: 1004343558} diff --git a/Assets/Level/Scenes/Level/01/Level01.unity b/Assets/Level/Scenes/Level/01/Level01.unity index bfef463..4ee2df5 100644 --- a/Assets/Level/Scenes/Level/01/Level01.unity +++ b/Assets/Level/Scenes/Level/01/Level01.unity @@ -297,6 +297,11 @@ Mesh: - serializedVersion: 1 m_IndexStart: 0 m_IndexCount: 0 +--- !u!4 &53730944 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8258725777112540271, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3} + m_PrefabInstance: {fileID: 2031184782} + m_PrefabAsset: {fileID: 0} --- !u!43 &70226124 Mesh: m_ObjectHideFlags: 0 @@ -2260,6 +2265,11 @@ Mesh: - serializedVersion: 1 m_IndexStart: 0 m_IndexCount: 0 +--- !u!4 &680337326 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2136882609069874969, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} + m_PrefabInstance: {fileID: 8573843940365930253} + m_PrefabAsset: {fileID: 0} --- !u!43 &772284432 Mesh: m_ObjectHideFlags: 0 @@ -3989,28 +3999,6 @@ Mesh: - serializedVersion: 1 m_IndexStart: 0 m_IndexCount: 0 ---- !u!114 &1188830024 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 5520295773975872824, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} - m_PrefabInstance: {fileID: 8573843940365930253} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b93699191d7b58146b2c38540cbed40f, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::TestBlock ---- !u!114 &1210153113 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3486554404924815739, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} - m_PrefabInstance: {fileID: 8573843940365930253} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b93699191d7b58146b2c38540cbed40f, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::TestBlock --- !u!43 &1213200404 Mesh: m_ObjectHideFlags: 0 @@ -4189,184 +4177,6 @@ Mesh: - serializedVersion: 1 m_IndexStart: 0 m_IndexCount: 0 ---- !u!43 &1214963263 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh-69818 - serializedVersion: 12 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 36 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 24 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 1, y: 1, z: 1} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00100011001200110013001200140015001600150017001600 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 24 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 24 - format: 0 - dimension: 4 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 40 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 1152 - _typelessdata: 000080bf000080bf0000803f00000000000000000000803f000080bf0000000000000000000080bf00000040000080bf0000803f000080bf0000803f00000000000000000000803f000080bf0000000000000000000080bf00000000000080bf000080bf0000803f0000803f00000000000000000000803f000080bf0000000000000000000080bf000000400000803f0000803f0000803f0000803f00000000000000000000803f000080bf0000000000000000000080bf000000000000803f0000803f000080bf0000803f0000803f000000000000000000000000000000000000803f000080bf00000040000080bf0000803f000080bf000080bf0000803f000000000000000000000000000000000000803f000080bf00000000000080bf0000803f0000803f0000803f0000803f000000000000000000000000000000000000803f000080bf000000400000803f0000803f0000803f000080bf0000803f000000000000000000000000000000000000803f000080bf000000000000803f0000803f000080bf000080bf0000000000000000000080bf0000803f0000000000000000000080bf00000040000080bf000080bf000080bf000080bf0000000000000000000080bf0000803f0000000000000000000080bf00000000000080bf0000803f0000803f000080bf0000000000000000000080bf0000803f0000000000000000000080bf000000400000803f000080bf0000803f000080bf0000000000000000000080bf0000803f0000000000000000000080bf000000000000803f000080bf000080bf000080bf000080bf00000000000000000000000000000000000080bf000080bf00000040000080bf000080bf000080bf0000803f000080bf00000000000000000000000000000000000080bf000080bf00000000000080bf000080bf0000803f000080bf000080bf00000000000000000000000000000000000080bf000080bf000000400000803f000080bf0000803f0000803f000080bf00000000000000000000000000000000000080bf000080bf000000000000803f000080bf0000803f0000803f000000000000803f000000000000803f0000000000000000000080bf000000000000803f0000803f0000803f0000803f000000000000803f000000000000803f0000000000000000000080bf000000400000803f000080bf0000803f000080bf000000000000803f000000000000803f0000000000000000000080bf00000000000080bf0000803f0000803f000080bf000000000000803f000000000000803f0000000000000000000080bf00000040000080bf000080bf000080bf000080bf00000000000080bf00000000000080bf0000000000000000000080bf00000040000080bf0000803f000080bf000080bf00000000000080bf00000000000080bf0000000000000000000080bf00000000000080bf000080bf000080bf0000803f00000000000080bf00000000000080bf0000000000000000000080bf000000400000803f0000803f000080bf0000803f00000000000080bf00000000000080bf0000000000000000000080bf000000000000803f - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 1, y: 1, z: 1} - m_MeshUsageFlags: 0 - m_CookingOptions: 30 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - 'm_MeshMetrics[0]': 1 - 'm_MeshMetrics[1]': 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: - m_MeshLodInfo: - serializedVersion: 2 - m_LodSelectionCurve: - serializedVersion: 1 - m_LodSlope: 0 - m_LodBias: 0 - m_NumLevels: 1 - m_SubMeshes: - - serializedVersion: 2 - m_Levels: - - serializedVersion: 1 - m_IndexStart: 0 - m_IndexCount: 0 --- !u!43 &1326244656 Mesh: m_ObjectHideFlags: 0 @@ -4753,10 +4563,10 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1766277917} - - {fileID: 1418461580} - {fileID: 169717431} - {fileID: 1880619741} - {fileID: 1952560245} + - {fileID: 680337326} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!43 &1416124334 @@ -4937,11 +4747,6 @@ Mesh: - serializedVersion: 1 m_IndexStart: 0 m_IndexCount: 0 ---- !u!4 &1418461580 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2136882609069874969, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} - m_PrefabInstance: {fileID: 8573843940365930253} - m_PrefabAsset: {fileID: 0} --- !u!43 &1437270600 Mesh: m_ObjectHideFlags: 0 @@ -6456,6 +6261,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2da51dfecccc45b469912e3bb3f1953b, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::PlayerHeadController +--- !u!4 &1707402985 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7821156882341915560, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3} + m_PrefabInstance: {fileID: 2031184782} + m_PrefabAsset: {fileID: 0} --- !u!43 &1732395164 Mesh: m_ObjectHideFlags: 0 @@ -6634,17 +6444,6 @@ Mesh: - serializedVersion: 1 m_IndexStart: 0 m_IndexCount: 0 ---- !u!114 &1742811892 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7825319968844064377, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} - m_PrefabInstance: {fileID: 8573843940365930253} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b93699191d7b58146b2c38540cbed40f, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::TestBlock --- !u!43 &1757616635 Mesh: m_ObjectHideFlags: 0 @@ -7239,184 +7038,80 @@ MonoBehaviour: textColor: {r: 1, g: 1, b: 1, a: 1} speakerColor: {r: 1, g: 0.85, b: 0.35, a: 1} backgroundColor: {r: 0, g: 0, b: 0, a: 0.62} ---- !u!43 &1885265420 -Mesh: +--- !u!1001 &1902652822 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh-44126 - serializedVersion: 12 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 36 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 24 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 1, y: 1, z: 1} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00100011001200110013001200140015001600150017001600 - m_VertexData: + serializedVersion: 2 + m_Modification: serializedVersion: 3 - m_VertexCount: 24 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 24 - format: 0 - dimension: 4 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 40 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 1152 - _typelessdata: 000080bf000080bf0000803f00000000000000000000803f000080bf0000000000000000000080bf00000040000080bf0000803f000080bf0000803f00000000000000000000803f000080bf0000000000000000000080bf00000000000080bf000080bf0000803f0000803f00000000000000000000803f000080bf0000000000000000000080bf000000400000803f0000803f0000803f0000803f00000000000000000000803f000080bf0000000000000000000080bf000000000000803f0000803f000080bf0000803f0000803f000000000000000000000000000000000000803f000080bf00000040000080bf0000803f000080bf000080bf0000803f000000000000000000000000000000000000803f000080bf00000000000080bf0000803f0000803f0000803f0000803f000000000000000000000000000000000000803f000080bf000000400000803f0000803f0000803f000080bf0000803f000000000000000000000000000000000000803f000080bf000000000000803f0000803f000080bf000080bf0000000000000000000080bf0000803f0000000000000000000080bf00000040000080bf000080bf000080bf000080bf0000000000000000000080bf0000803f0000000000000000000080bf00000000000080bf0000803f0000803f000080bf0000000000000000000080bf0000803f0000000000000000000080bf000000400000803f000080bf0000803f000080bf0000000000000000000080bf0000803f0000000000000000000080bf000000000000803f000080bf000080bf000080bf000080bf00000000000000000000000000000000000080bf000080bf00000040000080bf000080bf000080bf0000803f000080bf00000000000000000000000000000000000080bf000080bf00000000000080bf000080bf0000803f000080bf000080bf00000000000000000000000000000000000080bf000080bf000000400000803f000080bf0000803f0000803f000080bf00000000000000000000000000000000000080bf000080bf000000000000803f000080bf0000803f0000803f000000000000803f000000000000803f0000000000000000000080bf000000000000803f0000803f0000803f0000803f000000000000803f000000000000803f0000000000000000000080bf000000400000803f000080bf0000803f000080bf000000000000803f000000000000803f0000000000000000000080bf00000000000080bf0000803f0000803f000080bf000000000000803f000000000000803f0000000000000000000080bf00000040000080bf000080bf000080bf000080bf00000000000080bf00000000000080bf0000000000000000000080bf00000040000080bf0000803f000080bf000080bf00000000000080bf00000000000080bf0000000000000000000080bf00000000000080bf000080bf000080bf0000803f00000000000080bf00000000000080bf0000000000000000000080bf000000400000803f0000803f000080bf0000803f00000000000080bf00000000000080bf0000000000000000000080bf000000000000803f - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 1, y: 1, z: 1} - m_MeshUsageFlags: 0 - m_CookingOptions: 30 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - 'm_MeshMetrics[0]': 1 - 'm_MeshMetrics[1]': 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: - m_MeshLodInfo: - serializedVersion: 2 - m_LodSelectionCurve: - serializedVersion: 1 - m_LodSlope: 0 - m_LodBias: 0 - m_NumLevels: 1 - m_SubMeshes: - - serializedVersion: 2 - m_Levels: - - serializedVersion: 1 - m_IndexStart: 0 - m_IndexCount: 0 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 53541677567227536, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: HandTransform + value: + objectReference: {fileID: 2137556223} + - target: {fileID: 53541677567227536, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: CameraTransform + value: + objectReference: {fileID: 53730944} + - target: {fileID: 53541677567227536, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: PlayerTransform + value: + objectReference: {fileID: 1707402985} + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalPosition.x + value: -35.48739 + objectReference: {fileID: 0} + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalPosition.y + value: 0.49999958 + objectReference: {fileID: 0} + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalPosition.z + value: 2.5272882 + objectReference: {fileID: 0} + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8295937476714018201, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_Name + value: ThrowableCube (1) + objectReference: {fileID: 0} + - target: {fileID: 8295937476714018201, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 53541677567227536, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} --- !u!43 &1929503721 Mesh: m_ObjectHideFlags: 0 @@ -8182,184 +7877,6 @@ Mesh: - serializedVersion: 1 m_IndexStart: 0 m_IndexCount: 0 ---- !u!43 &1978094751 -Mesh: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh-148134 - serializedVersion: 12 - m_SubMeshes: - - serializedVersion: 2 - firstByte: 0 - indexCount: 36 - topology: 0 - baseVertex: 0 - firstVertex: 0 - vertexCount: 24 - localAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 2, y: 0.05, z: 2.5} - m_Shapes: - vertices: [] - shapes: [] - channels: [] - fullWeights: [] - m_BindPose: [] - m_BoneNameHashes: - m_RootBoneNameHash: 0 - m_BonesAABB: [] - m_VariableBoneCountWeights: - m_Data: - m_MeshCompression: 0 - m_IsReadable: 1 - m_KeepVertices: 1 - m_KeepIndices: 1 - m_IndexFormat: 0 - m_IndexBuffer: 000001000200010003000200040005000600050007000600080009000a0009000b000a000c000d000e000d000f000e00100011001200110013001200140015001600150017001600 - m_VertexData: - serializedVersion: 3 - m_VertexCount: 24 - m_Channels: - - stream: 0 - offset: 0 - format: 0 - dimension: 3 - - stream: 0 - offset: 12 - format: 0 - dimension: 3 - - stream: 0 - offset: 24 - format: 0 - dimension: 4 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 40 - format: 0 - dimension: 2 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - - stream: 0 - offset: 0 - format: 0 - dimension: 0 - m_DataSize: 1152 - _typelessdata: 000000c0cdcc4cbd0000204000000000000000000000803f000080bf0000000000000000000080bf000080406666663f00000040cdcc4cbd0000204000000000000000000000803f000080bf0000000000000000000080bf000000006666663f000000c0cdcc4c3d0000204000000000000000000000803f000080bf0000000000000000000080bf000080400000803f00000040cdcc4c3d0000204000000000000000000000803f000080bf0000000000000000000080bf000000000000803f00000040cdcc4cbd000020400000803f000000000000000000000000000000000000803f000080bf0000a0406666663f00000040cdcc4cbd000020c00000803f000000000000000000000000000000000000803f000080bf000000006666663f00000040cdcc4c3d000020400000803f000000000000000000000000000000000000803f000080bf0000a0400000803f00000040cdcc4c3d000020c00000803f000000000000000000000000000000000000803f000080bf000000000000803f00000040cdcc4cbd000020c00000000000000000000080bf0000803f0000000000000000000080bf000080406666663f000000c0cdcc4cbd000020c00000000000000000000080bf0000803f0000000000000000000080bf000000006666663f00000040cdcc4c3d000020c00000000000000000000080bf0000803f0000000000000000000080bf000080400000803f000000c0cdcc4c3d000020c00000000000000000000080bf0000803f0000000000000000000080bf000000000000803f000000c0cdcc4cbd000020c0000080bf00000000000000000000000000000000000080bf000080bf0000a0406666663f000000c0cdcc4cbd00002040000080bf00000000000000000000000000000000000080bf000080bf000000006666663f000000c0cdcc4c3d000020c0000080bf00000000000000000000000000000000000080bf000080bf0000a0400000803f000000c0cdcc4c3d00002040000080bf00000000000000000000000000000000000080bf000080bf000000000000803f000000c0cdcc4c3d00002040000000000000803f000000000000803f0000000000000000000080bf000000000000803f00000040cdcc4c3d00002040000000000000803f000000000000803f0000000000000000000080bf000080400000803f000000c0cdcc4c3d000020c0000000000000803f000000000000803f0000000000000000000080bf00000000000080c000000040cdcc4c3d000020c0000000000000803f000000000000803f0000000000000000000080bf00008040000080c0000000c0cdcc4cbd000020c000000000000080bf00000000000080bf0000000000000000000080bf00008040000080c000000040cdcc4cbd000020c000000000000080bf00000000000080bf0000000000000000000080bf00000000000080c0000000c0cdcc4cbd0000204000000000000080bf00000000000080bf0000000000000000000080bf000080400000803f00000040cdcc4cbd0000204000000000000080bf00000000000080bf0000000000000000000080bf000000000000803f - m_CompressedMesh: - m_Vertices: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_UV: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Normals: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Tangents: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_Weights: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_NormalSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_TangentSigns: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_FloatColors: - m_NumItems: 0 - m_Range: 0 - m_Start: 0 - m_Data: - m_BitSize: 0 - m_BoneIndices: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_Triangles: - m_NumItems: 0 - m_Data: - m_BitSize: 0 - m_UVInfo: 0 - m_LocalAABB: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 2, y: 0.05, z: 2.5} - m_MeshUsageFlags: 0 - m_CookingOptions: 30 - m_BakedConvexCollisionMesh: - m_BakedTriangleCollisionMesh: - 'm_MeshMetrics[0]': 1 - 'm_MeshMetrics[1]': 1 - m_MeshOptimizationFlags: 1 - m_StreamData: - serializedVersion: 2 - offset: 0 - size: 0 - path: - m_MeshLodInfo: - serializedVersion: 2 - m_LodSelectionCurve: - serializedVersion: 1 - m_LodSlope: 0 - m_LodBias: 0 - m_NumLevels: 1 - m_SubMeshes: - - serializedVersion: 2 - m_Levels: - - serializedVersion: 1 - m_IndexStart: 0 - m_IndexCount: 0 --- !u!1001 &2031184782 PrefabInstance: m_ObjectHideFlags: 0 @@ -8368,17 +7885,17 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 4313489822343726709, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3} + propertyPath: HandTransform + value: + objectReference: {fileID: 2137556223} - target: {fileID: 6544026473454475707, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3} propertyPath: m_Name value: Player objectReference: {fileID: 0} - - target: {fileID: 6975610370707183838, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - target: {fileID: 7821156882341915560, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3} propertyPath: m_LocalPosition.x - value: -29.76 + value: -30.54 objectReference: {fileID: 0} - target: {fileID: 7821156882341915560, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3} propertyPath: m_LocalPosition.y @@ -8599,6 +8116,11 @@ Mesh: - serializedVersion: 1 m_IndexStart: 0 m_IndexCount: 0 +--- !u!4 &2137556223 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3832855070939641903, guid: d7417f9daec269d43bdfd5a35f2da89a, type: 3} + m_PrefabInstance: {fileID: 2031184782} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2029273738738782450 PrefabInstance: m_ObjectHideFlags: 0 @@ -8613,7 +8135,7 @@ PrefabInstance: objectReference: {fileID: 1757616635} - target: {fileID: 420836440556041419, guid: 65ffd35ec8f314f94a17f8e59a783b35, type: 3} propertyPath: m_VersionIndex - value: 672 + value: 678 objectReference: {fileID: 0} - target: {fileID: 815219843203958505, guid: 65ffd35ec8f314f94a17f8e59a783b35, type: 3} propertyPath: m_Mesh @@ -8621,7 +8143,7 @@ PrefabInstance: objectReference: {fileID: 531626567} - target: {fileID: 815219843203958505, guid: 65ffd35ec8f314f94a17f8e59a783b35, type: 3} propertyPath: m_VersionIndex - value: 275 + value: 281 objectReference: {fileID: 0} - target: {fileID: 817010095520758344, guid: 65ffd35ec8f314f94a17f8e59a783b35, type: 3} propertyPath: m_Name @@ -8677,7 +8199,7 @@ PrefabInstance: objectReference: {fileID: 148813669} - target: {fileID: 3664698943566926942, guid: 65ffd35ec8f314f94a17f8e59a783b35, type: 3} propertyPath: m_VersionIndex - value: 1178 + value: 1184 objectReference: {fileID: 0} - target: {fileID: 3748335747012051495, guid: 65ffd35ec8f314f94a17f8e59a783b35, type: 3} propertyPath: m_Mesh @@ -8685,7 +8207,7 @@ PrefabInstance: objectReference: {fileID: 1506015706} - target: {fileID: 3748335747012051495, guid: 65ffd35ec8f314f94a17f8e59a783b35, type: 3} propertyPath: m_VersionIndex - value: 278 + value: 284 objectReference: {fileID: 0} - target: {fileID: 4339930196109788816, guid: 65ffd35ec8f314f94a17f8e59a783b35, type: 3} propertyPath: m_Mesh @@ -8693,7 +8215,7 @@ PrefabInstance: objectReference: {fileID: 772284432} - target: {fileID: 4339930196109788816, guid: 65ffd35ec8f314f94a17f8e59a783b35, type: 3} propertyPath: m_VersionIndex - value: 804 + value: 810 objectReference: {fileID: 0} - target: {fileID: 4776246959515392975, guid: 65ffd35ec8f314f94a17f8e59a783b35, type: 3} propertyPath: m_Mesh @@ -8705,7 +8227,7 @@ PrefabInstance: objectReference: {fileID: 1185762225} - target: {fileID: 4950085695495965452, guid: 65ffd35ec8f314f94a17f8e59a783b35, type: 3} propertyPath: m_VersionIndex - value: 293 + value: 299 objectReference: {fileID: 0} - target: {fileID: 5326060117486773561, guid: 65ffd35ec8f314f94a17f8e59a783b35, type: 3} propertyPath: m_Mesh @@ -8713,7 +8235,7 @@ PrefabInstance: objectReference: {fileID: 39065251} - target: {fileID: 5326060117486773561, guid: 65ffd35ec8f314f94a17f8e59a783b35, type: 3} propertyPath: m_VersionIndex - value: 401 + value: 407 objectReference: {fileID: 0} - target: {fileID: 5534785327716116973, guid: 65ffd35ec8f314f94a17f8e59a783b35, type: 3} propertyPath: m_Mesh @@ -8758,7 +8280,7 @@ PrefabInstance: objectReference: {fileID: 444837365} - target: {fileID: 534786720910392110, guid: 93cf9d955f7e24b6aa0837b955d009e3, type: 3} propertyPath: m_VersionIndex - value: 130 + value: 133 objectReference: {fileID: 0} - target: {fileID: 1027921120340150593, guid: 93cf9d955f7e24b6aa0837b955d009e3, type: 3} propertyPath: m_Mesh @@ -8774,7 +8296,7 @@ PrefabInstance: objectReference: {fileID: 161184579} - target: {fileID: 1046120939735845856, guid: 93cf9d955f7e24b6aa0837b955d009e3, type: 3} propertyPath: m_VersionIndex - value: 128 + value: 134 objectReference: {fileID: 0} - target: {fileID: 1602315804641352268, guid: 93cf9d955f7e24b6aa0837b955d009e3, type: 3} propertyPath: m_UnmodifiedMeshVersion @@ -8790,7 +8312,7 @@ PrefabInstance: objectReference: {fileID: 70226124} - target: {fileID: 1695683560949494557, guid: 93cf9d955f7e24b6aa0837b955d009e3, type: 3} propertyPath: m_VersionIndex - value: 95 + value: 101 objectReference: {fileID: 0} - target: {fileID: 1760469284765948848, guid: 93cf9d955f7e24b6aa0837b955d009e3, type: 3} propertyPath: m_Mesh @@ -8806,7 +8328,7 @@ PrefabInstance: objectReference: {fileID: 374290369} - target: {fileID: 1904212708664921491, guid: 93cf9d955f7e24b6aa0837b955d009e3, type: 3} propertyPath: m_VersionIndex - value: 61 + value: 67 objectReference: {fileID: 0} - target: {fileID: 2334873992210969632, guid: 93cf9d955f7e24b6aa0837b955d009e3, type: 3} propertyPath: m_Mesh @@ -8814,7 +8336,7 @@ PrefabInstance: objectReference: {fileID: 1973251512} - target: {fileID: 2334873992210969632, guid: 93cf9d955f7e24b6aa0837b955d009e3, type: 3} propertyPath: m_VersionIndex - value: 273 + value: 279 objectReference: {fileID: 0} - target: {fileID: 2377823937303883219, guid: 93cf9d955f7e24b6aa0837b955d009e3, type: 3} propertyPath: m_Mesh @@ -8830,7 +8352,7 @@ PrefabInstance: objectReference: {fileID: 1583415127} - target: {fileID: 2972752270321622658, guid: 93cf9d955f7e24b6aa0837b955d009e3, type: 3} propertyPath: m_VersionIndex - value: 190 + value: 196 objectReference: {fileID: 0} - target: {fileID: 3194882023188327448, guid: 93cf9d955f7e24b6aa0837b955d009e3, type: 3} propertyPath: m_LocalPosition.z @@ -8851,14 +8373,14 @@ PrefabInstance: - target: {fileID: 3339860198716087021, guid: 93cf9d955f7e24b6aa0837b955d009e3, type: 3} propertyPath: m_Mesh value: - objectReference: {fileID: 1978094751} + objectReference: {fileID: 1688488867} - target: {fileID: 3398101244050345041, guid: 93cf9d955f7e24b6aa0837b955d009e3, type: 3} propertyPath: m_Mesh value: objectReference: {fileID: 1570771039} - target: {fileID: 3398101244050345041, guid: 93cf9d955f7e24b6aa0837b955d009e3, type: 3} propertyPath: m_VersionIndex - value: 372 + value: 378 objectReference: {fileID: 0} - target: {fileID: 3398101244050345041, guid: 93cf9d955f7e24b6aa0837b955d009e3, type: 3} propertyPath: m_Positions.Array.data[0].x @@ -8999,14 +8521,14 @@ PrefabInstance: - target: {fileID: 4149997779626740605, guid: 93cf9d955f7e24b6aa0837b955d009e3, type: 3} propertyPath: m_Mesh value: - objectReference: {fileID: 1214963263} + objectReference: {fileID: 970689920} - target: {fileID: 4231222007685097172, guid: 93cf9d955f7e24b6aa0837b955d009e3, type: 3} propertyPath: m_Mesh value: objectReference: {fileID: 1326244656} - target: {fileID: 4231222007685097172, guid: 93cf9d955f7e24b6aa0837b955d009e3, type: 3} propertyPath: m_VersionIndex - value: 50 + value: 56 objectReference: {fileID: 0} - target: {fileID: 5136543853143617251, guid: 93cf9d955f7e24b6aa0837b955d009e3, type: 3} propertyPath: m_Mesh @@ -9014,7 +8536,7 @@ PrefabInstance: objectReference: {fileID: 640794023} - target: {fileID: 5136543853143617251, guid: 93cf9d955f7e24b6aa0837b955d009e3, type: 3} propertyPath: m_VersionIndex - value: 205 + value: 211 objectReference: {fileID: 0} - target: {fileID: 5141832854578058343, guid: 93cf9d955f7e24b6aa0837b955d009e3, type: 3} propertyPath: m_Mesh @@ -9022,7 +8544,7 @@ PrefabInstance: objectReference: {fileID: 1971966870} - target: {fileID: 5141832854578058343, guid: 93cf9d955f7e24b6aa0837b955d009e3, type: 3} propertyPath: m_VersionIndex - value: 256 + value: 262 objectReference: {fileID: 0} - target: {fileID: 5160012599143454406, guid: 93cf9d955f7e24b6aa0837b955d009e3, type: 3} propertyPath: m_Mesh @@ -9058,7 +8580,7 @@ PrefabInstance: objectReference: {fileID: 1027111978} - target: {fileID: 7009117929864918232, guid: 93cf9d955f7e24b6aa0837b955d009e3, type: 3} propertyPath: m_VersionIndex - value: 50 + value: 56 objectReference: {fileID: 0} - target: {fileID: 7652422126792452983, guid: 93cf9d955f7e24b6aa0837b955d009e3, type: 3} propertyPath: m_Mesh @@ -9066,7 +8588,7 @@ PrefabInstance: objectReference: {fileID: 970689920} - target: {fileID: 7652422126792452983, guid: 93cf9d955f7e24b6aa0837b955d009e3, type: 3} propertyPath: m_VersionIndex - value: 69 + value: 75 objectReference: {fileID: 0} - target: {fileID: 7957735868958269140, guid: 93cf9d955f7e24b6aa0837b955d009e3, type: 3} propertyPath: m_LocalPosition.x @@ -9078,7 +8600,7 @@ PrefabInstance: objectReference: {fileID: 1948425025} - target: {fileID: 8058797812529456826, guid: 93cf9d955f7e24b6aa0837b955d009e3, type: 3} propertyPath: m_VersionIndex - value: 281 + value: 287 objectReference: {fileID: 0} - target: {fileID: 8134717242100476768, guid: 93cf9d955f7e24b6aa0837b955d009e3, type: 3} propertyPath: m_Size.x @@ -9134,13 +8656,87 @@ PrefabInstance: objectReference: {fileID: 1688488867} - target: {fileID: 9064098715805490582, guid: 93cf9d955f7e24b6aa0837b955d009e3, type: 3} propertyPath: m_VersionIndex - value: 69 + value: 75 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 93cf9d955f7e24b6aa0837b955d009e3, type: 3} +--- !u!1001 &5783770961855197083 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 53541677567227536, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: HandTransform + value: + objectReference: {fileID: 2137556223} + - target: {fileID: 53541677567227536, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: CameraTransform + value: + objectReference: {fileID: 53730944} + - target: {fileID: 53541677567227536, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: PlayerTransform + value: + objectReference: {fileID: 1707402985} + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalPosition.x + value: -39.38 + objectReference: {fileID: 0} + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalPosition.y + value: 6.56 + objectReference: {fileID: 0} + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalPosition.z + value: -9.27 + objectReference: {fileID: 0} + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1945301683602458784, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8295937476714018201, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_Name + value: ThrowableCube + objectReference: {fileID: 0} + - target: {fileID: 8295937476714018201, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 53541677567227536, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c786dcd5f720bb47dbf843bd97137452, type: 3} --- !u!1001 &8573843940365930253 PrefabInstance: m_ObjectHideFlags: 0 @@ -9167,7 +8763,7 @@ PrefabInstance: objectReference: {fileID: 1353741991} - target: {fileID: 923504022845179925, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: m_VersionIndex - value: 284 + value: 290 objectReference: {fileID: 0} - target: {fileID: 976507040584454022, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: m_Name @@ -9191,7 +8787,7 @@ PrefabInstance: objectReference: {fileID: 1770768836} - target: {fileID: 1960038915097444136, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: m_VersionIndex - value: 287 + value: 293 objectReference: {fileID: 0} - target: {fileID: 1965033879945251838, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: m_Mesh @@ -9203,7 +8799,7 @@ PrefabInstance: objectReference: {fileID: 1732395164} - target: {fileID: 2011522638027899406, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: m_VersionIndex - value: 262 + value: 268 objectReference: {fileID: 0} - target: {fileID: 2128526072099518606, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: m_Name @@ -9255,7 +8851,7 @@ PrefabInstance: objectReference: {fileID: 911491189} - target: {fileID: 2522964107250580831, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: m_VersionIndex - value: 247 + value: 253 objectReference: {fileID: 0} - target: {fileID: 2646955393591737178, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: m_Mesh @@ -9263,7 +8859,7 @@ PrefabInstance: objectReference: {fileID: 883770463} - target: {fileID: 2646955393591737178, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: m_VersionIndex - value: 247 + value: 253 objectReference: {fileID: 0} - target: {fileID: 2728972355706821427, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: m_Mesh @@ -9275,7 +8871,7 @@ PrefabInstance: objectReference: {fileID: 1856659371} - target: {fileID: 3175788971472411904, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: m_VersionIndex - value: 757 + value: 763 objectReference: {fileID: 0} - target: {fileID: 3346769048739937798, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: m_Mesh @@ -9283,7 +8879,7 @@ PrefabInstance: objectReference: {fileID: 1929503721} - target: {fileID: 3346769048739937798, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: m_VersionIndex - value: 205 + value: 211 objectReference: {fileID: 0} - target: {fileID: 3604232543011540574, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: m_Mesh @@ -9291,7 +8887,7 @@ PrefabInstance: objectReference: {fileID: 1645469617} - target: {fileID: 3604232543011540574, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: m_VersionIndex - value: 174 + value: 180 objectReference: {fileID: 0} - target: {fileID: 3695168069859021069, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: m_Mesh @@ -9299,7 +8895,7 @@ PrefabInstance: objectReference: {fileID: 1512088580} - target: {fileID: 3695168069859021069, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: m_VersionIndex - value: 89 + value: 92 objectReference: {fileID: 0} - target: {fileID: 3981966940209973761, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: m_Mesh @@ -9307,7 +8903,7 @@ PrefabInstance: objectReference: {fileID: 1108632625} - target: {fileID: 3981966940209973761, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: m_VersionIndex - value: 89 + value: 92 objectReference: {fileID: 0} - target: {fileID: 4084728917182298169, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: m_Mesh @@ -9320,7 +8916,7 @@ PrefabInstance: - target: {fileID: 4277183438631128052, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: OnInteract.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: 1188830024} + objectReference: {fileID: 0} - target: {fileID: 4277183438631128052, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: OnInteract.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: SetOn @@ -9336,7 +8932,7 @@ PrefabInstance: - target: {fileID: 4566242862022938872, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: OnInteract.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: 1210153113} + objectReference: {fileID: 0} - target: {fileID: 4566242862022938872, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: OnInteract.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: SetOn @@ -9347,7 +8943,7 @@ PrefabInstance: objectReference: {fileID: 140443922} - target: {fileID: 4567205329509607290, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: m_VersionIndex - value: 137 + value: 143 objectReference: {fileID: 0} - target: {fileID: 4951116980603677797, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: headController @@ -9363,7 +8959,7 @@ PrefabInstance: objectReference: {fileID: 1624737670} - target: {fileID: 5236759280192007568, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: m_VersionIndex - value: 89 + value: 92 objectReference: {fileID: 0} - target: {fileID: 5273391338186526030, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: m_Mesh @@ -9371,7 +8967,7 @@ PrefabInstance: objectReference: {fileID: 1437270600} - target: {fileID: 5273391338186526030, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: m_VersionIndex - value: 159 + value: 165 objectReference: {fileID: 0} - target: {fileID: 5433508216096892166, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: m_Name @@ -9387,7 +8983,7 @@ PrefabInstance: objectReference: {fileID: 1416124334} - target: {fileID: 5899096988372567690, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: m_VersionIndex - value: 176 + value: 182 objectReference: {fileID: 0} - target: {fileID: 5921081699439141390, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: m_Mesh @@ -9397,6 +8993,10 @@ PrefabInstance: propertyPath: m_Mesh value: objectReference: {fileID: 1732395164} + - target: {fileID: 6013655646903888208, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} + propertyPath: resetOnWrongPress + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6013655646903888208, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: 'puzzleBlocks.Array.data[0]' value: @@ -9405,6 +9005,10 @@ PrefabInstance: propertyPath: 'puzzleBlocks.Array.data[2]' value: objectReference: {fileID: 0} + - target: {fileID: 6013655646903888208, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} + propertyPath: 'puzzleBlocks.Array.data[3]' + value: + objectReference: {fileID: 0} - target: {fileID: 6296181247577080123, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: m_Mesh value: @@ -9415,7 +9019,7 @@ PrefabInstance: objectReference: {fileID: 1213200404} - target: {fileID: 6373618140653526605, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: m_VersionIndex - value: 159 + value: 165 objectReference: {fileID: 0} - target: {fileID: 6395214940477684979, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: m_Mesh @@ -9423,7 +9027,7 @@ PrefabInstance: objectReference: {fileID: 1039927703} - target: {fileID: 6395214940477684979, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: m_VersionIndex - value: 757 + value: 763 objectReference: {fileID: 0} - target: {fileID: 6723344156240511798, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: subtitlePlayer @@ -9432,14 +9036,14 @@ PrefabInstance: - target: {fileID: 6777884629376605479, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: m_Mesh value: - objectReference: {fileID: 1885265420} + objectReference: {fileID: 1011015696} - target: {fileID: 6943875762252853618, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: m_Mesh value: objectReference: {fileID: 1011015696} - target: {fileID: 6943875762252853618, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: m_VersionIndex - value: 105 + value: 111 objectReference: {fileID: 0} - target: {fileID: 6966603525073516387, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: m_Mesh @@ -9472,15 +9076,15 @@ PrefabInstance: - target: {fileID: 7141803392553917397, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: OnInteract.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: - objectReference: {fileID: 1210153113} + objectReference: {fileID: 0} - target: {fileID: 7141803392553917397, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: OnInteract.m_PersistentCalls.m_Calls.Array.data[1].m_Target value: - objectReference: {fileID: 1188830024} + objectReference: {fileID: 0} - target: {fileID: 7141803392553917397, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: OnInteract.m_PersistentCalls.m_Calls.Array.data[2].m_Target value: - objectReference: {fileID: 1742811892} + objectReference: {fileID: 0} - target: {fileID: 7141803392553917397, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: OnInteract.m_PersistentCalls.m_Calls.Array.data[1].m_CallState value: 2 @@ -9539,7 +9143,7 @@ PrefabInstance: objectReference: {fileID: 138805862} - target: {fileID: 7838476166334105109, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: m_VersionIndex - value: 214 + value: 220 objectReference: {fileID: 0} - target: {fileID: 7900231310439294588, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: m_Mesh @@ -9551,7 +9155,7 @@ PrefabInstance: objectReference: {fileID: 263204544} - target: {fileID: 7999969775398771232, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: m_VersionIndex - value: 89 + value: 92 objectReference: {fileID: 0} - target: {fileID: 8194090769227408671, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: m_Mesh @@ -9559,7 +9163,7 @@ PrefabInstance: objectReference: {fileID: 546808886} - target: {fileID: 8194090769227408671, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: m_VersionIndex - value: 253 + value: 259 objectReference: {fileID: 0} - target: {fileID: 8536964938927782492, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: m_Mesh @@ -9571,7 +9175,7 @@ PrefabInstance: objectReference: {fileID: 2135751699} - target: {fileID: 9124426112039914158, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3} propertyPath: m_VersionIndex - value: 124 + value: 127 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: @@ -9588,3 +9192,5 @@ SceneRoots: - {fileID: 1539339757} - {fileID: 2031184782} - {fileID: 1368253247} + - {fileID: 5783770961855197083} + - {fileID: 1902652822} diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index e46a9b9..83a677c 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -13,7 +13,7 @@ TagManager: - Ground - Water - UI - - + - Grabbable - - -