From 1549ac217d56df6bca31ba02a7bda1ee166874fd Mon Sep 17 00:00:00 2001 From: marcgauch <34353267+marcgauch@users.noreply.github.com> Date: Thu, 7 Dec 2023 22:42:58 +0100 Subject: [PATCH] bit of kicking --- .../_Prefabs/45ACP Bullet_Head.prefab | 98 +-- Assets/Scenes/SampleScene.unity | 582 ++++++++++++++++++ Assets/iamagun.cs | 36 +- 3 files changed, 665 insertions(+), 51 deletions(-) diff --git a/Assets/Nokobot/Modern Guns - Handgun/_Prefabs/45ACP Bullet_Head.prefab b/Assets/Nokobot/Modern Guns - Handgun/_Prefabs/45ACP Bullet_Head.prefab index 53c77a6..5992ba4 100644 --- a/Assets/Nokobot/Modern Guns - Handgun/_Prefabs/45ACP Bullet_Head.prefab +++ b/Assets/Nokobot/Modern Guns - Handgun/_Prefabs/45ACP Bullet_Head.prefab @@ -25,12 +25,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2023207857688684297} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1895300901454820957} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &8165564615350608013 MeshFilter: @@ -51,10 +52,12 @@ MeshRenderer: 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: @@ -79,78 +82,77 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1001 &7799836738284049863 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 3625037896966406280, guid: 9e0ef2cf9cfc11c46bbe7f28b272f6fb, - type: 3} + - target: {fileID: 3625037896966406280, guid: 9e0ef2cf9cfc11c46bbe7f28b272f6fb, type: 3} propertyPath: m_Name - value: UCP45 Bullet Head + value: 45ACP Bullet_Head objectReference: {fileID: 0} - - target: {fileID: 8535412081993147290, guid: 9e0ef2cf9cfc11c46bbe7f28b272f6fb, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 + - target: {fileID: 8403992145370945202, guid: 9e0ef2cf9cfc11c46bbe7f28b272f6fb, type: 3} + propertyPath: m_CollisionDetection + value: 2 objectReference: {fileID: 0} - - target: {fileID: 8535412081993147290, guid: 9e0ef2cf9cfc11c46bbe7f28b272f6fb, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8535412081993147290, guid: 9e0ef2cf9cfc11c46bbe7f28b272f6fb, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8535412081993147290, guid: 9e0ef2cf9cfc11c46bbe7f28b272f6fb, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8535412081993147290, guid: 9e0ef2cf9cfc11c46bbe7f28b272f6fb, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8535412081993147290, guid: 9e0ef2cf9cfc11c46bbe7f28b272f6fb, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8535412081993147290, guid: 9e0ef2cf9cfc11c46bbe7f28b272f6fb, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8535412081993147290, guid: 9e0ef2cf9cfc11c46bbe7f28b272f6fb, - type: 3} + - target: {fileID: 8535412081993147290, guid: 9e0ef2cf9cfc11c46bbe7f28b272f6fb, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 8535412081993147290, guid: 9e0ef2cf9cfc11c46bbe7f28b272f6fb, - type: 3} + - target: {fileID: 8535412081993147290, guid: 9e0ef2cf9cfc11c46bbe7f28b272f6fb, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8535412081993147290, guid: 9e0ef2cf9cfc11c46bbe7f28b272f6fb, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8535412081993147290, guid: 9e0ef2cf9cfc11c46bbe7f28b272f6fb, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8535412081993147290, guid: 9e0ef2cf9cfc11c46bbe7f28b272f6fb, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8535412081993147290, guid: 9e0ef2cf9cfc11c46bbe7f28b272f6fb, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8535412081993147290, guid: 9e0ef2cf9cfc11c46bbe7f28b272f6fb, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8535412081993147290, guid: 9e0ef2cf9cfc11c46bbe7f28b272f6fb, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8535412081993147290, guid: 9e0ef2cf9cfc11c46bbe7f28b272f6fb, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8535412081993147290, guid: 9e0ef2cf9cfc11c46bbe7f28b272f6fb, - type: 3} + - target: {fileID: 8535412081993147290, guid: 9e0ef2cf9cfc11c46bbe7f28b272f6fb, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8535412081993147290, guid: 9e0ef2cf9cfc11c46bbe7f28b272f6fb, - type: 3} + - target: {fileID: 8535412081993147290, guid: 9e0ef2cf9cfc11c46bbe7f28b272f6fb, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 8535412081993147290, guid: 9e0ef2cf9cfc11c46bbe7f28b272f6fb, type: 3} + insertIndex: -1 + addedObject: {fileID: 6291989069644143154} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9e0ef2cf9cfc11c46bbe7f28b272f6fb, type: 3} --- !u!4 &1895300901454820957 stripped Transform: - m_CorrespondingSourceObject: {fileID: 8535412081993147290, guid: 9e0ef2cf9cfc11c46bbe7f28b272f6fb, - type: 3} + m_CorrespondingSourceObject: {fileID: 8535412081993147290, guid: 9e0ef2cf9cfc11c46bbe7f28b272f6fb, type: 3} m_PrefabInstance: {fileID: 7799836738284049863} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 8de4412..90b7714 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -481,6 +481,120 @@ Transform: m_CorrespondingSourceObject: {fileID: 488160, guid: d9809c5e8418bb047bf2c8ba1d1a2cec, type: 3} m_PrefabInstance: {fileID: 128595451} m_PrefabAsset: {fileID: 0} +--- !u!1001 &147182789 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3078792058705529905, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_Name + value: Cube (7) + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalPosition.x + value: -0.681 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalPosition.y + value: 1.0506 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalPosition.z + value: 1.15 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} +--- !u!1001 &162856677 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3078792058705529905, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_Name + value: Cube (6) + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalPosition.x + value: -0.7321 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalPosition.y + value: 0.9424 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalPosition.z + value: 1.15 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} --- !u!1 &223974226 GameObject: m_ObjectHideFlags: 0 @@ -789,6 +903,120 @@ MeshCollider: m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: -2845505134294023193, guid: 6a6a33a3b30432a559a1d862779484b7, type: 3} +--- !u!1001 &335587134 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3078792058705529905, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_Name + value: Cube + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalPosition.x + value: -0.8 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalPosition.y + value: 0.8320001 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalPosition.z + value: 1.15 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} +--- !u!1001 &357166656 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3078792058705529905, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_Name + value: Cube (5) + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalPosition.x + value: -0.622 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalPosition.y + value: 0.9424 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalPosition.z + value: 1.15 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} --- !u!4 &360976235 stripped Transform: m_CorrespondingSourceObject: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} @@ -1022,6 +1250,63 @@ Transform: m_CorrespondingSourceObject: {fileID: 9048238750646488156, guid: ea16c3c8c1688234fa81a4f39339bf1b, type: 3} m_PrefabInstance: {fileID: 1723140601} m_PrefabAsset: {fileID: 0} +--- !u!1001 &508387011 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3078792058705529905, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_Name + value: Cube (3) + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalPosition.x + value: -0.456 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalPosition.y + value: 0.8320001 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalPosition.z + value: 1.15 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} --- !u!1 &552350706 GameObject: m_ObjectHideFlags: 0 @@ -1244,6 +1529,177 @@ Transform: m_CorrespondingSourceObject: {fileID: 4453513310108136, guid: 835e735ca71bf78459fb2cababd74112, type: 3} m_PrefabInstance: {fileID: 1939419979} m_PrefabAsset: {fileID: 0} +--- !u!1001 &791046371 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3078792058705529905, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_Name + value: Cube (9) + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalPosition.x + value: -0.6286 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalPosition.y + value: 1.1544 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalPosition.z + value: 1.15 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} +--- !u!1001 &815847481 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3078792058705529905, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_Name + value: Cube (2) + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalPosition.x + value: -0.568 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalPosition.y + value: 0.8320001 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalPosition.z + value: 1.15 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} +--- !u!1001 &940103419 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3078792058705529905, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_Name + value: Cube (4) + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalPosition.x + value: -0.512 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalPosition.y + value: 0.9424 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalPosition.z + value: 1.15 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} --- !u!1001 &1039411707 PrefabInstance: m_ObjectHideFlags: 0 @@ -2065,6 +2521,63 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c813208e672e3074bbe118e1a9ee94fd, type: 3} +--- !u!1001 &1516168788 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3078792058705529905, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_Name + value: Cube (8) + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalPosition.x + value: -0.5728 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalPosition.y + value: 1.0506 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalPosition.z + value: 1.15 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} --- !u!54 &1577749886 stripped Rigidbody: m_CorrespondingSourceObject: {fileID: 3778607142242988057, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} @@ -2224,6 +2737,63 @@ Transform: m_CorrespondingSourceObject: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} m_PrefabInstance: {fileID: 1400762667} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1782647683 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3078792058705529905, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_Name + value: Cube (1) + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalPosition.x + value: -0.679 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalPosition.y + value: 0.8320001 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalPosition.z + value: 1.15 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7601405052768654441, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2e0c303eba3dd9ff98017eff31e6159f, type: 3} --- !u!1001 &1939419979 PrefabInstance: m_ObjectHideFlags: 0 @@ -2492,6 +3062,8 @@ MonoBehaviour: simpleShoot: {fileID: 2106522550} shootButton: 2097152 offset: {fileID: 4049662313537657896, guid: 8a7053ae412b1e82cbcc329ce7967f8e, type: 3} + kickRotationAmount: 10 + kickDuration: 0.1 --- !u!82 &2106522557 AudioSource: m_ObjectHideFlags: 0 @@ -2598,3 +3170,13 @@ SceneRoots: - {fileID: 1368183232} - {fileID: 1729297213} - {fileID: 2106522548} + - {fileID: 335587134} + - {fileID: 1782647683} + - {fileID: 815847481} + - {fileID: 508387011} + - {fileID: 940103419} + - {fileID: 357166656} + - {fileID: 162856677} + - {fileID: 147182789} + - {fileID: 1516168788} + - {fileID: 791046371} diff --git a/Assets/iamagun.cs b/Assets/iamagun.cs index a9ff8ef..4a7463a 100644 --- a/Assets/iamagun.cs +++ b/Assets/iamagun.cs @@ -1,5 +1,4 @@ using System.Collections; -using System.Collections.Generic; using UnityEngine; public class iamagun : MonoBehaviour @@ -8,6 +7,10 @@ public class iamagun : MonoBehaviour public OVRInput.Button shootButton; public Transform offset; + public float kickRotationAmount = 10f; // Amount of X-axis rotation during kick + + public float kickDuration = 0.1f; // Duration of the kick animation + private AudioSource audio; private Vector3 offsetPosition; @@ -18,6 +21,9 @@ public class iamagun : MonoBehaviour private float vibrationDuration = 0.5f; // Duration of the vibration private float vibrationIntensity = 1.0f; // Intensity of the vibration + // Flag to check if the kick animation is active + private bool isKicking = false; + // Start is called before the first frame update void Start() { @@ -31,7 +37,7 @@ public class iamagun : MonoBehaviour // Update is called once per frame void Update() { - if (OVRInput.IsControllerConnected(OVRInput.Controller.RTouch)) + if (!isKicking && OVRInput.IsControllerConnected(OVRInput.Controller.RTouch)) { // Get the local position and rotation of the controller Vector3 controllerLocalPosition = OVRInput.GetLocalControllerPosition(OVRInput.Controller.RTouch); @@ -53,6 +59,9 @@ public class iamagun : MonoBehaviour // Trigger delayed and intense vibration feedback StartCoroutine(TriggerVibration()); + + // Kick the gun forward + StartCoroutine(KickGun()); } } @@ -70,4 +79,25 @@ public class iamagun : MonoBehaviour // Stop the vibration OVRInput.SetControllerVibration(0, 0, OVRInput.Controller.RTouch); } -} + + IEnumerator KickGun() + { + // Set the kick animation flag to true + isKicking = true; + + // Remember the initial rotation of the gun + Quaternion initialRotation = transform.rotation; + + // Rotate the gun on the X-axis + transform.Rotate(Vector3.right, -kickRotationAmount); + + // Wait for the kick duration + yield return new WaitForSeconds(kickDuration); + + // Reset the rotation of the gun + transform.rotation = initialRotation; + + // Set the kick animation flag to false + isKicking = false; + } +} \ No newline at end of file