From 190072aef005939d398fc97679b2104fb8ce1b97 Mon Sep 17 00:00:00 2001 From: marcgauch <34353267+marcgauch@users.noreply.github.com> Date: Sun, 7 Jan 2024 11:14:29 +0100 Subject: [PATCH] Test with shooting --- .../_Prefabs/45ACP Bullet_Head.prefab | 4 + Assets/Scenes/SampleScene.unity | 155 +++++++++++++++++- Assets/Suicide.cs | 17 ++ Assets/Suicide.cs.meta | 11 ++ Assets/iamagun.cs | 2 +- ProjectSettings/ProjectSettings.asset | 2 + ProjectSettings/TagManager.asset | 1 + 7 files changed, 190 insertions(+), 2 deletions(-) create mode 100644 Assets/Suicide.cs create mode 100644 Assets/Suicide.cs.meta 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 5992ba4..6a793f7 100644 --- a/Assets/Nokobot/Modern Guns - Handgun/_Prefabs/45ACP Bullet_Head.prefab +++ b/Assets/Nokobot/Modern Guns - Handgun/_Prefabs/45ACP Bullet_Head.prefab @@ -95,6 +95,10 @@ PrefabInstance: propertyPath: m_Name value: 45ACP Bullet_Head objectReference: {fileID: 0} + - target: {fileID: 3625037896966406280, guid: 9e0ef2cf9cfc11c46bbe7f28b272f6fb, type: 3} + propertyPath: m_TagString + value: Bullet + objectReference: {fileID: 0} - target: {fileID: 8403992145370945202, guid: 9e0ef2cf9cfc11c46bbe7f28b272f6fb, type: 3} propertyPath: m_CollisionDetection value: 2 diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 09eccf1..51a2cfe 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.1149527, g: 0.15126267, b: 0.1489988, a: 1} + m_IndirectSpecularColor: {r: 0.387776, g: 0.3228798, b: 0.08558196, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -2022,6 +2022,158 @@ MonoBehaviour: edgeRenderingEnabled_: 0 edgeColor_: {r: 1, g: 1, b: 1, a: 1} colorMapType: 0 +--- !u!1 &1369645932 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1369645933} + - component: {fileID: 1369645936} + - component: {fileID: 1369645935} + - component: {fileID: 1369645934} + - component: {fileID: 1369645937} + m_Layer: 0 + m_Name: Head + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1369645933 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1369645932} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.3, y: 0.2, z: 0.3} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1426203499} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!136 &1369645934 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1369645932} + 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: 2 + m_Radius: 0.5 + m_Height: 2 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1369645935 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1369645932} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1369645936 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1369645932} + m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &1369645937 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1369645932} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b9763abf2ebe9a0058a5ca57fd60d20f, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1426203498 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1426203499} + m_Layer: 0 + m_Name: Player + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1426203499 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1426203498} + 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: + - {fileID: 1369645933} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1503720117 PrefabInstance: m_ObjectHideFlags: 0 @@ -3136,3 +3288,4 @@ SceneRoots: - {fileID: 2055102416} - {fileID: 782628378} - {fileID: 2039657597} + - {fileID: 1426203499} diff --git a/Assets/Suicide.cs b/Assets/Suicide.cs new file mode 100644 index 0000000..5d84689 --- /dev/null +++ b/Assets/Suicide.cs @@ -0,0 +1,17 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Suicide : MonoBehaviour +{ + // This method is called when a collision occurs + private void OnCollisionEnter(Collision collision) + { + // Check if the collision is with the specific object you want + if (collision.gameObject.CompareTag("Bullet")) + { + // Your collision handling code goes here + transform.Translate(Vector3.up * 2); + } + } +} diff --git a/Assets/Suicide.cs.meta b/Assets/Suicide.cs.meta new file mode 100644 index 0000000..08da62e --- /dev/null +++ b/Assets/Suicide.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b9763abf2ebe9a0058a5ca57fd60d20f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/iamagun.cs b/Assets/iamagun.cs index 58b64e8..8b4421c 100644 --- a/Assets/iamagun.cs +++ b/Assets/iamagun.cs @@ -25,7 +25,7 @@ public class iamagun : MonoBehaviour // Flag to check if the kick animation is active private bool isKicking = false; - private bool isInHand = false; + private bool isInHand = true; // Start is called before the first frame update void Start() diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 75fdc46..eefee64 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -139,6 +139,8 @@ PlayerSettings: bundleVersion: 0.1 preloadedAssets: - {fileID: 11400000, guid: 29d72bf9f28086693968cedbdc8f08cd, type: 2} + - {fileID: 11400000, guid: 541751c4fa90967d68ef779a22ee43f3, type: 2} + - {fileID: -3127938587913570544, guid: 8eb28e39ec717d0799039f01965f0533, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 854f12d..54e9c9f 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -5,6 +5,7 @@ TagManager: serializedVersion: 2 tags: - capsule + - Bullet layers: - Default - TransparentFX