diff --git a/Assets/Materials/leaf.mat b/Assets/Materials/leaf.mat index ab1d39e..7e8c3b7 100644 --- a/Assets/Materials/leaf.mat +++ b/Assets/Materials/leaf.mat @@ -20,8 +20,7 @@ Material: m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 stringTagMap: {} - disabledShaderPasses: - - MOTIONVECTORS + disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: serializedVersion: 3 diff --git a/Assets/Prefabs/ThrownGun.prefab b/Assets/Prefabs/ThrownGun.prefab new file mode 100644 index 0000000..050fde7 --- /dev/null +++ b/Assets/Prefabs/ThrownGun.prefab @@ -0,0 +1,130 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6611039685471789196 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2838261725573212642} + - component: {fileID: 5688607449888095492} + - component: {fileID: 3900353858553251828} + - component: {fileID: 2064409223717511053} + - component: {fileID: 7066644236778025839} + m_Layer: 0 + m_Name: ThrownGun + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2838261725573212642 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6611039685471789196} + serializedVersion: 2 + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.4, y: 0.5, z: 0.4} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!33 &5688607449888095492 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6611039685471789196} + m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &3900353858553251828 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6611039685471789196} + 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_AdditionalVertexStreams: {fileID: 0} +--- !u!136 &2064409223717511053 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6611039685471789196} + 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!114 &7066644236778025839 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6611039685471789196} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe870c030a2b648d89c63559e7522299, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::GunThrown + player: {fileID: 0} + TargetPosition: {x: 0, y: 0, z: 0} diff --git a/Assets/Prefabs/ThrownGun.prefab.meta b/Assets/Prefabs/ThrownGun.prefab.meta new file mode 100644 index 0000000..8f1b36d --- /dev/null +++ b/Assets/Prefabs/ThrownGun.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6e8f87617470340fcbceb59061a6c3ee +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Scene1-1.unity b/Assets/Scenes/Scene1-1.unity index 150cac7..736c2ab 100644 --- a/Assets/Scenes/Scene1-1.unity +++ b/Assets/Scenes/Scene1-1.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:66577cdb46058310a6c524a114424bd2257415fd553ff12b6be8f521c2901667 -size 11678290 +oid sha256:f083f74b46c6c95acb88e15423d76e0904372b5d0415cd27fdff74728b163c88 +size 11678351 diff --git a/Assets/Scripts/GunThrown.cs b/Assets/Scripts/GunThrown.cs new file mode 100644 index 0000000..0119484 --- /dev/null +++ b/Assets/Scripts/GunThrown.cs @@ -0,0 +1,27 @@ +using UnityEngine; + +public class GunThrown : MonoBehaviour +{ + public GameObject player; + public Vector3 TargetPosition; + // Start is called once before the first execution of Update after the MonoBehaviour is created + void Start() + { + player = GameObject.Find("Player"); + TargetPosition = player.transform.position; + } + + // Update is called once per frame + void Update() + { + transform.position = Vector3.MoveTowards(transform.position, TargetPosition, 10 * Time.deltaTime); + } + + private void OnCollisionEnter(Collision collision) + { + if (collision.gameObject.tag == "Player") + { + Destroy(this.gameObject); + } + } +} diff --git a/Assets/Scripts/GunThrown.cs.meta b/Assets/Scripts/GunThrown.cs.meta new file mode 100644 index 0000000..b29cce9 --- /dev/null +++ b/Assets/Scripts/GunThrown.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: fe870c030a2b648d89c63559e7522299 \ No newline at end of file diff --git a/Assets/Scripts/ThrowerEnemy.cs b/Assets/Scripts/ThrowerEnemy.cs index 603b422..9703f38 100644 --- a/Assets/Scripts/ThrowerEnemy.cs +++ b/Assets/Scripts/ThrowerEnemy.cs @@ -11,7 +11,7 @@ public class ThrowerEnemy : MonoBehaviour public bool isInside; public float playerDistance; - public GameObject GunBayonette; + public GameObject GunThrow; private NavMeshAgent agent; public Transform target; @@ -42,7 +42,7 @@ public class ThrowerEnemy : MonoBehaviour playerDistance = Vector3.Distance(transform.position, target.position); if (playerDistance < 25) { - Instantiate(GunBayonette); + Instantiate(GunThrow, transform); } } private void LateUpdate()