From a15841daa6085a0ca9146ebd5f3882fe451e95eb Mon Sep 17 00:00:00 2001 From: Stedd Date: Sat, 5 Nov 2022 14:17:40 +0100 Subject: [PATCH] Added Ammo Pickups --- Assets/AmmoBelt.cs | 79 --- Assets/AmmoPickup.cs | 28 + Assets/AmmoPickup.cs.meta | 11 + .../Prefabs/PlayerCapsule.prefab | 6 +- .../Perfabs/WM_SF_Wp01_f.prefab | 85 +++ .../Perfabs/WM_SF_Wp01_f.prefab.meta | 7 + Assets/Pickups.meta | 8 + Assets/Pickups/AmmoPickup.prefab | 146 ++++ Assets/Pickups/AmmoPickup.prefab.meta | 7 + Assets/Pickups/AmmoPickup_Crossbow.prefab | 155 +++++ .../Pickups/AmmoPickup_Crossbow.prefab.meta | 7 + Assets/Pickups/AmmoPickup_Handgun.prefab | 133 ++++ Assets/Pickups/AmmoPickup_Handgun.prefab.meta | 7 + Assets/Pickups/AmmoPickup_MachineGun.prefab | 155 +++++ .../Pickups/AmmoPickup_MachineGun.prefab.meta | 7 + Assets/Pickups/AmmoPickup_Revolver.prefab | 380 +++++++++++ .../Pickups/AmmoPickup_Revolver.prefab.meta | 7 + Assets/Pickups/Mat_AmmoPickup 1.mat | 80 +++ Assets/Pickups/Mat_AmmoPickup 1.mat.meta | 8 + Assets/Pickups/Mat_AmmoPickup 2.mat | 80 +++ Assets/Pickups/Mat_AmmoPickup 2.mat.meta | 8 + Assets/Pickups/Mat_AmmoPickup 3.mat | 80 +++ Assets/Pickups/Mat_AmmoPickup 3.mat.meta | 8 + Assets/Pickups/Mat_AmmoPickup.mat | 80 +++ Assets/Pickups/Mat_AmmoPickup.mat.meta | 8 + Assets/Scenes/Sandbox.unity | 625 ++++++++++++++++++ Assets/Weapons/Ammo.cs | 12 +- Assets/Weapons/AmmoBelt.cs | 97 +++ Assets/{ => Weapons}/AmmoBelt.cs.meta | 0 Assets/Weapons/Handgun.prefab | 150 ++--- Assets/Weapons/MachineGun.prefab | 5 +- 31 files changed, 2293 insertions(+), 176 deletions(-) delete mode 100644 Assets/AmmoBelt.cs create mode 100644 Assets/AmmoPickup.cs create mode 100644 Assets/AmmoPickup.cs.meta create mode 100644 Assets/ImportedAssets/Weapons/WM_SciFi_Weapon1_Lite/Perfabs/WM_SF_Wp01_f.prefab create mode 100644 Assets/ImportedAssets/Weapons/WM_SciFi_Weapon1_Lite/Perfabs/WM_SF_Wp01_f.prefab.meta create mode 100644 Assets/Pickups.meta create mode 100644 Assets/Pickups/AmmoPickup.prefab create mode 100644 Assets/Pickups/AmmoPickup.prefab.meta create mode 100644 Assets/Pickups/AmmoPickup_Crossbow.prefab create mode 100644 Assets/Pickups/AmmoPickup_Crossbow.prefab.meta create mode 100644 Assets/Pickups/AmmoPickup_Handgun.prefab create mode 100644 Assets/Pickups/AmmoPickup_Handgun.prefab.meta create mode 100644 Assets/Pickups/AmmoPickup_MachineGun.prefab create mode 100644 Assets/Pickups/AmmoPickup_MachineGun.prefab.meta create mode 100644 Assets/Pickups/AmmoPickup_Revolver.prefab create mode 100644 Assets/Pickups/AmmoPickup_Revolver.prefab.meta create mode 100644 Assets/Pickups/Mat_AmmoPickup 1.mat create mode 100644 Assets/Pickups/Mat_AmmoPickup 1.mat.meta create mode 100644 Assets/Pickups/Mat_AmmoPickup 2.mat create mode 100644 Assets/Pickups/Mat_AmmoPickup 2.mat.meta create mode 100644 Assets/Pickups/Mat_AmmoPickup 3.mat create mode 100644 Assets/Pickups/Mat_AmmoPickup 3.mat.meta create mode 100644 Assets/Pickups/Mat_AmmoPickup.mat create mode 100644 Assets/Pickups/Mat_AmmoPickup.mat.meta create mode 100644 Assets/Weapons/AmmoBelt.cs rename Assets/{ => Weapons}/AmmoBelt.cs.meta (100%) diff --git a/Assets/AmmoBelt.cs b/Assets/AmmoBelt.cs deleted file mode 100644 index 445e86f..0000000 --- a/Assets/AmmoBelt.cs +++ /dev/null @@ -1,79 +0,0 @@ -using System; -using System.ComponentModel; -using System.Linq; -using UnityEngine; - -public enum AmmoType -{ - [Description("1A")] - CrossbowBolt, - [Description("5.56mm")] - Five_FiveSix, - [Description("9mm")] - Nine, - [Description("11.5mm")] - Eleven_Five, -} - -public class AmmoBelt : MonoBehaviour -{ - [Serializable] private class AmmoSlot - { - [field: SerializeField] public AmmoType AmmoType { get; set; } - [field: SerializeField] public int MaxBeltAmmoAmount { get; set; } - [field: SerializeField] public int CurrentBeltAmmoAmount { get; set; } - } - - [SerializeField] private AmmoSlot[] _ammoSlots; - - private void Awake() - { - InitializeAmmoBelt(); - } - - private void InitializeAmmoBelt() - { - foreach (AmmoSlot ammoSlot in _ammoSlots) - { - ammoSlot.CurrentBeltAmmoAmount = ammoSlot.MaxBeltAmmoAmount; - } - } - - public int GetBeltCurrentAmmoAmount(AmmoType ammoType) - { - return (from ammoSlot in _ammoSlots - where ammoType == ammoSlot.AmmoType - select ammoSlot.CurrentBeltAmmoAmount) - .FirstOrDefault(); - } - - public int GetBeltMaxAmmoAmount(AmmoType ammoType) - { - return (from ammoSlot in _ammoSlots - where ammoType == ammoSlot.AmmoType - select ammoSlot.MaxBeltAmmoAmount) - .FirstOrDefault(); - } - - public void SetBeltCurrentAmmoAmount(AmmoType ammoType, int value) - { - foreach (AmmoSlot ammoSlot in _ammoSlots) - { - if (ammoType == ammoSlot.AmmoType) - { - ammoSlot.CurrentBeltAmmoAmount = value; - } - } - } - - public void ModifyBeltCurrentAmmoAmount(AmmoType ammoType, int value) - { - foreach (AmmoSlot ammoSlot in _ammoSlots) - { - if (ammoType == ammoSlot.AmmoType) - { - ammoSlot.CurrentBeltAmmoAmount += value; - } - } - } -} \ No newline at end of file diff --git a/Assets/AmmoPickup.cs b/Assets/AmmoPickup.cs new file mode 100644 index 0000000..f76ed3e --- /dev/null +++ b/Assets/AmmoPickup.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class AmmoPickup : MonoBehaviour +{ + [Header("Config")] + [SerializeField] private AmmoType _ammoType; + [SerializeField] private int _pickupAmount; + + private void OnTriggerEnter(Collider other) + { + var ammoBelt = other.GetComponentInChildren(); + var amountBefore = ammoBelt.GetBeltCurrentAmmoAmount(_ammoType); + if (ammoBelt != null) + { + ammoBelt.ModifyBeltCurrentAmmoAmount(_ammoType, _pickupAmount); + } + + var amountAfter = ammoBelt.GetBeltCurrentAmmoAmount(_ammoType); + + if (amountBefore != amountAfter) + { + Destroy(gameObject.transform.parent.gameObject); + } + } +} \ No newline at end of file diff --git a/Assets/AmmoPickup.cs.meta b/Assets/AmmoPickup.cs.meta new file mode 100644 index 0000000..8241e98 --- /dev/null +++ b/Assets/AmmoPickup.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 42478c5502530ba44be8ed785121415f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ImportedAssets/StarterAssets/FirstPersonController/Prefabs/PlayerCapsule.prefab b/Assets/ImportedAssets/StarterAssets/FirstPersonController/Prefabs/PlayerCapsule.prefab index 7242ad8..f5b21b0 100644 --- a/Assets/ImportedAssets/StarterAssets/FirstPersonController/Prefabs/PlayerCapsule.prefab +++ b/Assets/ImportedAssets/StarterAssets/FirstPersonController/Prefabs/PlayerCapsule.prefab @@ -67,15 +67,17 @@ MonoBehaviour: - k__BackingField: 0 k__BackingField: 10 k__BackingField: 0 - - k__BackingField: 2 + - k__BackingField: 1 k__BackingField: 30 k__BackingField: 0 - - k__BackingField: 1 + - k__BackingField: 2 k__BackingField: 200 k__BackingField: 0 - k__BackingField: 3 k__BackingField: 15 k__BackingField: 0 + _S_currentBeltAmmoAmount: {fileID: 11400000, guid: f19d1fc1d5102a545800f4f8273640b1, type: 2} + _currentWeaponAmmoType: 0 --- !u!1 &4135013735270702863 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ImportedAssets/Weapons/WM_SciFi_Weapon1_Lite/Perfabs/WM_SF_Wp01_f.prefab b/Assets/ImportedAssets/Weapons/WM_SciFi_Weapon1_Lite/Perfabs/WM_SF_Wp01_f.prefab new file mode 100644 index 0000000..a283170 --- /dev/null +++ b/Assets/ImportedAssets/Weapons/WM_SciFi_Weapon1_Lite/Perfabs/WM_SF_Wp01_f.prefab @@ -0,0 +1,85 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &6907685453529874403 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6904157571198781521} + - component: {fileID: 6893242666864783383} + - component: {fileID: 6884566443890071949} + m_Layer: 0 + m_Name: WM_SF_Wp01_f + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6904157571198781521 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6907685453529874403} + m_LocalRotation: {x: 0.000000021855694, 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: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &6893242666864783383 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6907685453529874403} + m_Mesh: {fileID: 4300000, guid: 589c90d4952cd7f4f99d50582f9da48d, type: 3} +--- !u!23 &6884566443890071949 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6907685453529874403} + 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: 4294967295 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 5efee9a7dd68cec4bb5cecdd349c9bc5, 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: 0 + 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} diff --git a/Assets/ImportedAssets/Weapons/WM_SciFi_Weapon1_Lite/Perfabs/WM_SF_Wp01_f.prefab.meta b/Assets/ImportedAssets/Weapons/WM_SciFi_Weapon1_Lite/Perfabs/WM_SF_Wp01_f.prefab.meta new file mode 100644 index 0000000..a8104a0 --- /dev/null +++ b/Assets/ImportedAssets/Weapons/WM_SciFi_Weapon1_Lite/Perfabs/WM_SF_Wp01_f.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2d5e4fde9c5fe2040bdc24082a917fcd +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Pickups.meta b/Assets/Pickups.meta new file mode 100644 index 0000000..aa80ecd --- /dev/null +++ b/Assets/Pickups.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 00b416c7388d78b4d859b2777d7b7592 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Pickups/AmmoPickup.prefab b/Assets/Pickups/AmmoPickup.prefab new file mode 100644 index 0000000..ba4334a --- /dev/null +++ b/Assets/Pickups/AmmoPickup.prefab @@ -0,0 +1,146 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &880261228158885066 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7092197993426249541} + m_Layer: 0 + m_Name: AmmoPickup + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7092197993426249541 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 880261228158885066} + 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: 1 + m_Children: + - {fileID: 1081754974144968915} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &8281078095792329184 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1081754974144968915} + - component: {fileID: 8644054742696260018} + - component: {fileID: 1420545987383542537} + - component: {fileID: 5546563811525709610} + - component: {fileID: 6100965370569967076} + m_Layer: 0 + m_Name: PickupModelAndCollider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1081754974144968915 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8281078095792329184} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.25, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 7092197993426249541} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &8644054742696260018 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8281078095792329184} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1420545987383542537 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8281078095792329184} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d975cc77c62558f48b23c6c9529e45b1, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &5546563811525709610 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8281078095792329184} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &6100965370569967076 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8281078095792329184} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 42478c5502530ba44be8ed785121415f, type: 3} + m_Name: + m_EditorClassIdentifier: + _ammoType: 2 + _pickupAmount: 20 diff --git a/Assets/Pickups/AmmoPickup.prefab.meta b/Assets/Pickups/AmmoPickup.prefab.meta new file mode 100644 index 0000000..4fe2fd0 --- /dev/null +++ b/Assets/Pickups/AmmoPickup.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 05f861aa9e8e63d48b6c6943e40dcd75 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Pickups/AmmoPickup_Crossbow.prefab b/Assets/Pickups/AmmoPickup_Crossbow.prefab new file mode 100644 index 0000000..c4e3982 --- /dev/null +++ b/Assets/Pickups/AmmoPickup_Crossbow.prefab @@ -0,0 +1,155 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4160312784980155743 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4154920235606093791} + - component: {fileID: 4164910251699695391} + - component: {fileID: 4174266675424279689} + m_Layer: 0 + m_Name: Crossbow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4154920235606093791 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4160312784980155743} + m_LocalRotation: {x: -0, y: 0.7071068, z: -0, w: -0.7071068} + m_LocalPosition: {x: 0, y: 0.587, z: -0.006} + m_LocalScale: {x: 0.14, y: 0.14, z: 0.14} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 7931289562854344026} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 270, z: 0} +--- !u!33 &4164910251699695391 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4160312784980155743} + m_Mesh: {fileID: 4300000, guid: eaffb87fd63eadd469111e80479fbb50, type: 3} +--- !u!23 &4174266675424279689 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4160312784980155743} + 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: 4294967295 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 2235ee366b5fbb54b814441d18b1fbd9, 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: 0 + 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!1001 &899899321881371167 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 880261228158885066, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_Name + value: AmmoPickup_Crossbow + objectReference: {fileID: 0} + - target: {fileID: 6100965370569967076, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: _ammoType + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6100965370569967076, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: _pickupAmount + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7092197993426249541, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7092197993426249541, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7092197993426249541, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7092197993426249541, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7092197993426249541, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7092197993426249541, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7092197993426249541, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7092197993426249541, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7092197993426249541, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7092197993426249541, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7092197993426249541, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} +--- !u!4 &7931289562854344026 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7092197993426249541, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + m_PrefabInstance: {fileID: 899899321881371167} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Pickups/AmmoPickup_Crossbow.prefab.meta b/Assets/Pickups/AmmoPickup_Crossbow.prefab.meta new file mode 100644 index 0000000..e8eae67 --- /dev/null +++ b/Assets/Pickups/AmmoPickup_Crossbow.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0796d5820c9c0854481b6e912a45991a +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Pickups/AmmoPickup_Handgun.prefab b/Assets/Pickups/AmmoPickup_Handgun.prefab new file mode 100644 index 0000000..2c19f03 --- /dev/null +++ b/Assets/Pickups/AmmoPickup_Handgun.prefab @@ -0,0 +1,133 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &899899321881371167 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 880261228158885066, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_Name + value: AmmoPickup_Handgun + objectReference: {fileID: 0} + - target: {fileID: 1420545987383542537, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 2265c9b31bd44824e8248342c2efd9d2, type: 2} + - target: {fileID: 6100965370569967076, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: _ammoType + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6100965370569967076, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: _pickupAmount + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 7092197993426249541, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7092197993426249541, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7092197993426249541, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7092197993426249541, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7092197993426249541, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7092197993426249541, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7092197993426249541, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7092197993426249541, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7092197993426249541, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7092197993426249541, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7092197993426249541, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} +--- !u!4 &7931289562854344026 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7092197993426249541, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + m_PrefabInstance: {fileID: 899899321881371167} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &8469630391599315417 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 7931289562854344026} + m_Modifications: + - target: {fileID: 6904157571198781521, guid: 2d5e4fde9c5fe2040bdc24082a917fcd, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6904157571198781521, guid: 2d5e4fde9c5fe2040bdc24082a917fcd, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6904157571198781521, guid: 2d5e4fde9c5fe2040bdc24082a917fcd, type: 3} + propertyPath: m_LocalPosition.y + value: 0.633 + objectReference: {fileID: 0} + - target: {fileID: 6904157571198781521, guid: 2d5e4fde9c5fe2040bdc24082a917fcd, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6904157571198781521, guid: 2d5e4fde9c5fe2040bdc24082a917fcd, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6904157571198781521, guid: 2d5e4fde9c5fe2040bdc24082a917fcd, type: 3} + propertyPath: m_LocalRotation.x + value: 0.000000021855694 + objectReference: {fileID: 0} + - target: {fileID: 6904157571198781521, guid: 2d5e4fde9c5fe2040bdc24082a917fcd, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6904157571198781521, guid: 2d5e4fde9c5fe2040bdc24082a917fcd, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6904157571198781521, guid: 2d5e4fde9c5fe2040bdc24082a917fcd, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6904157571198781521, guid: 2d5e4fde9c5fe2040bdc24082a917fcd, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6904157571198781521, guid: 2d5e4fde9c5fe2040bdc24082a917fcd, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6907685453529874403, guid: 2d5e4fde9c5fe2040bdc24082a917fcd, type: 3} + propertyPath: m_Name + value: WM_SF_Wp01_f + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2d5e4fde9c5fe2040bdc24082a917fcd, type: 3} diff --git a/Assets/Pickups/AmmoPickup_Handgun.prefab.meta b/Assets/Pickups/AmmoPickup_Handgun.prefab.meta new file mode 100644 index 0000000..f51a364 --- /dev/null +++ b/Assets/Pickups/AmmoPickup_Handgun.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f7f936c30abb2d246a8bc7f0a608986c +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Pickups/AmmoPickup_MachineGun.prefab b/Assets/Pickups/AmmoPickup_MachineGun.prefab new file mode 100644 index 0000000..c0467a9 --- /dev/null +++ b/Assets/Pickups/AmmoPickup_MachineGun.prefab @@ -0,0 +1,155 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2090752784314870856 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2090752784314580774} + - component: {fileID: 2090752784311764954} + - component: {fileID: 2090752784312718520} + m_Layer: 0 + m_Name: SciFiGunLightWhite + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2090752784314580774 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2090752784314870856} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.627, z: -0.166} + m_LocalScale: {x: 0.57, y: 0.57, z: 0.57} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 7931289562854344026} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &2090752784311764954 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2090752784314870856} + m_Mesh: {fileID: 4300002, guid: 584761fab006d6d42b4d0d8c56a51241, type: 3} +--- !u!23 &2090752784312718520 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2090752784314870856} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: f59d38d7fdabd3048a6eec44cfa5365f, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1001 &899899321881371167 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 880261228158885066, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_Name + value: AmmoPickup_MachineGun + objectReference: {fileID: 0} + - target: {fileID: 1420545987383542537, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: d4ca6bc78ecf42b409d6c4143ddf370f, type: 2} + - target: {fileID: 6100965370569967076, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: _ammoType + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7092197993426249541, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7092197993426249541, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7092197993426249541, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7092197993426249541, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7092197993426249541, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7092197993426249541, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7092197993426249541, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7092197993426249541, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7092197993426249541, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7092197993426249541, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7092197993426249541, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} +--- !u!4 &7931289562854344026 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7092197993426249541, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + m_PrefabInstance: {fileID: 899899321881371167} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Pickups/AmmoPickup_MachineGun.prefab.meta b/Assets/Pickups/AmmoPickup_MachineGun.prefab.meta new file mode 100644 index 0000000..58fe9d1 --- /dev/null +++ b/Assets/Pickups/AmmoPickup_MachineGun.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ff213ded724ae4c45b7308957c9db1d6 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Pickups/AmmoPickup_Revolver.prefab b/Assets/Pickups/AmmoPickup_Revolver.prefab new file mode 100644 index 0000000..7da535a --- /dev/null +++ b/Assets/Pickups/AmmoPickup_Revolver.prefab @@ -0,0 +1,380 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4710405264089245632 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4710405264089347040} + - component: {fileID: 4710405264098694400} + m_Layer: 0 + m_Name: SciFiGun_Diffuse + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4710405264089347040 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4710405264089245632} + m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0.579, z: 0} + m_LocalScale: {x: 1.48, y: 1.48, z: 1.48} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 4710405264089347042} + - {fileID: 4710405264089347068} + - {fileID: 4710405264089347070} + m_Father: {fileID: 7931289562854344026} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} +--- !u!95 &4710405264098694400 +Animator: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4710405264089245632} + m_Enabled: 1 + m_Avatar: {fileID: 9000000, guid: dbeb07ce6436fdc4988bcc03b8afc948, type: 3} + m_Controller: {fileID: 0} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 1 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &4710405264089245634 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4710405264089347042} + - component: {fileID: 4710405264087987136} + - component: {fileID: 4710405264087052288} + m_Layer: 0 + m_Name: Hull + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4710405264089347042 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4710405264089245634} + m_LocalRotation: {x: 0, y: -0, z: 0, w: 1} + m_LocalPosition: {x: 0.043305617, y: 0.036049794, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4710405264089347040} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &4710405264087987136 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4710405264089245634} + m_Mesh: {fileID: 4300000, guid: dbeb07ce6436fdc4988bcc03b8afc948, type: 3} +--- !u!23 &4710405264087052288 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4710405264089245634} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 58d3215dbddde9b4ea1d242fbb11ce9c, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &4710405264089245660 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4710405264089347068} + - component: {fileID: 4710405264087987138} + - component: {fileID: 4710405264087052290} + m_Layer: 0 + m_Name: Munition + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4710405264089347068 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4710405264089245660} + m_LocalRotation: {x: 0, y: -0, z: 0, w: 1} + m_LocalPosition: {x: 0.03703869, y: 0.034926426, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4710405264089347040} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &4710405264087987138 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4710405264089245660} + m_Mesh: {fileID: 4300004, guid: dbeb07ce6436fdc4988bcc03b8afc948, type: 3} +--- !u!23 &4710405264087052290 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4710405264089245660} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 58d3215dbddde9b4ea1d242fbb11ce9c, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &4710405264089245662 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4710405264089347070} + - component: {fileID: 4710405264087987164} + - component: {fileID: 4710405264087052316} + m_Layer: 0 + m_Name: Trigger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4710405264089347070 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4710405264089245662} + m_LocalRotation: {x: 0, y: -0, z: 0, w: 1} + m_LocalPosition: {x: 0.027678821, y: 0.012362667, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4710405264089347040} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &4710405264087987164 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4710405264089245662} + m_Mesh: {fileID: 4300002, guid: dbeb07ce6436fdc4988bcc03b8afc948, type: 3} +--- !u!23 &4710405264087052316 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4710405264089245662} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 58d3215dbddde9b4ea1d242fbb11ce9c, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1001 &899899321881371167 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 880261228158885066, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_Name + value: AmmoPickup_Revolver + objectReference: {fileID: 0} + - target: {fileID: 1420545987383542537, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 7157d63a087479448abc2ce69b763ddd, type: 2} + - target: {fileID: 6100965370569967076, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: _ammoType + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6100965370569967076, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: _pickupAmount + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 7092197993426249541, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7092197993426249541, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7092197993426249541, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7092197993426249541, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7092197993426249541, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7092197993426249541, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7092197993426249541, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7092197993426249541, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7092197993426249541, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7092197993426249541, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7092197993426249541, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} +--- !u!4 &7931289562854344026 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7092197993426249541, guid: 05f861aa9e8e63d48b6c6943e40dcd75, type: 3} + m_PrefabInstance: {fileID: 899899321881371167} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Pickups/AmmoPickup_Revolver.prefab.meta b/Assets/Pickups/AmmoPickup_Revolver.prefab.meta new file mode 100644 index 0000000..c668002 --- /dev/null +++ b/Assets/Pickups/AmmoPickup_Revolver.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 42f56bf1c70035f41830c28fa15d973a +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Pickups/Mat_AmmoPickup 1.mat b/Assets/Pickups/Mat_AmmoPickup 1.mat new file mode 100644 index 0000000..629e0b0 --- /dev/null +++ b/Assets/Pickups/Mat_AmmoPickup 1.mat @@ -0,0 +1,80 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Mat_AmmoPickup 1 + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.37153816, g: 0.32156864, b: 0.7176471, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Pickups/Mat_AmmoPickup 1.mat.meta b/Assets/Pickups/Mat_AmmoPickup 1.mat.meta new file mode 100644 index 0000000..f78c762 --- /dev/null +++ b/Assets/Pickups/Mat_AmmoPickup 1.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2265c9b31bd44824e8248342c2efd9d2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Pickups/Mat_AmmoPickup 2.mat b/Assets/Pickups/Mat_AmmoPickup 2.mat new file mode 100644 index 0000000..91514de --- /dev/null +++ b/Assets/Pickups/Mat_AmmoPickup 2.mat @@ -0,0 +1,80 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Mat_AmmoPickup 2 + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.7176471, g: 0.71727806, b: 0.32156864, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Pickups/Mat_AmmoPickup 2.mat.meta b/Assets/Pickups/Mat_AmmoPickup 2.mat.meta new file mode 100644 index 0000000..758431a --- /dev/null +++ b/Assets/Pickups/Mat_AmmoPickup 2.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d4ca6bc78ecf42b409d6c4143ddf370f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Pickups/Mat_AmmoPickup 3.mat b/Assets/Pickups/Mat_AmmoPickup 3.mat new file mode 100644 index 0000000..eed01ba --- /dev/null +++ b/Assets/Pickups/Mat_AmmoPickup 3.mat @@ -0,0 +1,80 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Mat_AmmoPickup 3 + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.32156864, g: 0.7176471, b: 0.35649318, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Pickups/Mat_AmmoPickup 3.mat.meta b/Assets/Pickups/Mat_AmmoPickup 3.mat.meta new file mode 100644 index 0000000..def606c --- /dev/null +++ b/Assets/Pickups/Mat_AmmoPickup 3.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7157d63a087479448abc2ce69b763ddd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Pickups/Mat_AmmoPickup.mat b/Assets/Pickups/Mat_AmmoPickup.mat new file mode 100644 index 0000000..f6dee15 --- /dev/null +++ b/Assets/Pickups/Mat_AmmoPickup.mat @@ -0,0 +1,80 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Mat_AmmoPickup + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 0.7169812, g: 0.32128873, b: 0.32128873, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Pickups/Mat_AmmoPickup.mat.meta b/Assets/Pickups/Mat_AmmoPickup.mat.meta new file mode 100644 index 0000000..eab69d7 --- /dev/null +++ b/Assets/Pickups/Mat_AmmoPickup.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d975cc77c62558f48b23c6c9529e45b1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Sandbox.unity b/Assets/Scenes/Sandbox.unity index 642359c..46e1cb7 100644 --- a/Assets/Scenes/Sandbox.unity +++ b/Assets/Scenes/Sandbox.unity @@ -322,6 +322,63 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 76ff537c8e1a84345868e6aeee938ab3, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d85d3a32fb6157d488e31edf82b7b1c4, type: 3} +--- !u!1001 &74425796 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 20905315288432341, guid: 42f56bf1c70035f41830c28fa15d973a, type: 3} + propertyPath: m_Name + value: AmmoPickup_Revolver + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: 42f56bf1c70035f41830c28fa15d973a, type: 3} + propertyPath: m_RootOrder + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: 42f56bf1c70035f41830c28fa15d973a, type: 3} + propertyPath: m_LocalPosition.x + value: -26.19 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: 42f56bf1c70035f41830c28fa15d973a, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: 42f56bf1c70035f41830c28fa15d973a, type: 3} + propertyPath: m_LocalPosition.z + value: -5.29 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: 42f56bf1c70035f41830c28fa15d973a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: 42f56bf1c70035f41830c28fa15d973a, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: 42f56bf1c70035f41830c28fa15d973a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: 42f56bf1c70035f41830c28fa15d973a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: 42f56bf1c70035f41830c28fa15d973a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: 42f56bf1c70035f41830c28fa15d973a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: 42f56bf1c70035f41830c28fa15d973a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 42f56bf1c70035f41830c28fa15d973a, type: 3} --- !u!1 &89176745 GameObject: m_ObjectHideFlags: 0 @@ -719,6 +776,63 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3a896632310e02b468121bf09411f87e, type: 3} +--- !u!1001 &329467291 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 20905315288432341, guid: ff213ded724ae4c45b7308957c9db1d6, type: 3} + propertyPath: m_Name + value: AmmoPickup_MachineGun + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: ff213ded724ae4c45b7308957c9db1d6, type: 3} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: ff213ded724ae4c45b7308957c9db1d6, type: 3} + propertyPath: m_LocalPosition.x + value: -26.15 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: ff213ded724ae4c45b7308957c9db1d6, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: ff213ded724ae4c45b7308957c9db1d6, type: 3} + propertyPath: m_LocalPosition.z + value: -7.31 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: ff213ded724ae4c45b7308957c9db1d6, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: ff213ded724ae4c45b7308957c9db1d6, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: ff213ded724ae4c45b7308957c9db1d6, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: ff213ded724ae4c45b7308957c9db1d6, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: ff213ded724ae4c45b7308957c9db1d6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: ff213ded724ae4c45b7308957c9db1d6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: ff213ded724ae4c45b7308957c9db1d6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ff213ded724ae4c45b7308957c9db1d6, type: 3} --- !u!1001 &338363539 PrefabInstance: m_ObjectHideFlags: 0 @@ -1085,6 +1199,37 @@ Transform: m_CorrespondingSourceObject: {fileID: 9005220659476430818, guid: 2d3a85ecde41a8246a79669975912b74, type: 3} m_PrefabInstance: {fileID: 4313866246714185760} m_PrefabAsset: {fileID: 0} +--- !u!1 &626459048 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 626459049} + m_Layer: 0 + m_Name: Pickups + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &626459049 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 626459048} + 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: 0} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &630789666 PrefabInstance: m_ObjectHideFlags: 0 @@ -1189,6 +1334,63 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &660119714 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 20905315288432341, guid: ff213ded724ae4c45b7308957c9db1d6, type: 3} + propertyPath: m_Name + value: AmmoPickup_MachineGun (1) + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: ff213ded724ae4c45b7308957c9db1d6, type: 3} + propertyPath: m_RootOrder + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: ff213ded724ae4c45b7308957c9db1d6, type: 3} + propertyPath: m_LocalPosition.x + value: -1.66 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: ff213ded724ae4c45b7308957c9db1d6, type: 3} + propertyPath: m_LocalPosition.y + value: 2.016 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: ff213ded724ae4c45b7308957c9db1d6, type: 3} + propertyPath: m_LocalPosition.z + value: 16.22 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: ff213ded724ae4c45b7308957c9db1d6, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: ff213ded724ae4c45b7308957c9db1d6, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: ff213ded724ae4c45b7308957c9db1d6, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: ff213ded724ae4c45b7308957c9db1d6, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: ff213ded724ae4c45b7308957c9db1d6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: ff213ded724ae4c45b7308957c9db1d6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: ff213ded724ae4c45b7308957c9db1d6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ff213ded724ae4c45b7308957c9db1d6, type: 3} --- !u!1 &705507993 GameObject: m_ObjectHideFlags: 0 @@ -1283,6 +1485,63 @@ Transform: m_Father: {fileID: 794371211} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1001 &714490974 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 20905315288432341, guid: f7f936c30abb2d246a8bc7f0a608986c, type: 3} + propertyPath: m_Name + value: AmmoPickup_Handgun + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: f7f936c30abb2d246a8bc7f0a608986c, type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: f7f936c30abb2d246a8bc7f0a608986c, type: 3} + propertyPath: m_LocalPosition.x + value: -26.18 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: f7f936c30abb2d246a8bc7f0a608986c, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: f7f936c30abb2d246a8bc7f0a608986c, type: 3} + propertyPath: m_LocalPosition.z + value: -9.88 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: f7f936c30abb2d246a8bc7f0a608986c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: f7f936c30abb2d246a8bc7f0a608986c, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: f7f936c30abb2d246a8bc7f0a608986c, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: f7f936c30abb2d246a8bc7f0a608986c, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: f7f936c30abb2d246a8bc7f0a608986c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: f7f936c30abb2d246a8bc7f0a608986c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: f7f936c30abb2d246a8bc7f0a608986c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f7f936c30abb2d246a8bc7f0a608986c, type: 3} --- !u!1001 &727104431 PrefabInstance: m_ObjectHideFlags: 0 @@ -1754,6 +2013,63 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2b127815fd0f2074eae3a0c6a4786d0b, type: 3} +--- !u!1001 &878389372 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 20905315288432341, guid: ff213ded724ae4c45b7308957c9db1d6, type: 3} + propertyPath: m_Name + value: AmmoPickup_MachineGun (2) + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: ff213ded724ae4c45b7308957c9db1d6, type: 3} + propertyPath: m_RootOrder + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: ff213ded724ae4c45b7308957c9db1d6, type: 3} + propertyPath: m_LocalPosition.x + value: 23.51 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: ff213ded724ae4c45b7308957c9db1d6, type: 3} + propertyPath: m_LocalPosition.y + value: 0.884 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: ff213ded724ae4c45b7308957c9db1d6, type: 3} + propertyPath: m_LocalPosition.z + value: -7.62 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: ff213ded724ae4c45b7308957c9db1d6, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: ff213ded724ae4c45b7308957c9db1d6, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: ff213ded724ae4c45b7308957c9db1d6, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: ff213ded724ae4c45b7308957c9db1d6, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: ff213ded724ae4c45b7308957c9db1d6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: ff213ded724ae4c45b7308957c9db1d6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: ff213ded724ae4c45b7308957c9db1d6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ff213ded724ae4c45b7308957c9db1d6, type: 3} --- !u!1 &880482538 GameObject: m_ObjectHideFlags: 0 @@ -2193,6 +2509,63 @@ Transform: m_CorrespondingSourceObject: {fileID: 400000, guid: 584a8ef4749c89745b7ae07f3ba7617f, type: 3} m_PrefabInstance: {fileID: 945433442} m_PrefabAsset: {fileID: 0} +--- !u!1001 &990936528 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 20905315288432341, guid: 0796d5820c9c0854481b6e912a45991a, type: 3} + propertyPath: m_Name + value: AmmoPickup_Crossbow + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: 0796d5820c9c0854481b6e912a45991a, type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: 0796d5820c9c0854481b6e912a45991a, type: 3} + propertyPath: m_LocalPosition.x + value: -26.16 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: 0796d5820c9c0854481b6e912a45991a, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: 0796d5820c9c0854481b6e912a45991a, type: 3} + propertyPath: m_LocalPosition.z + value: -12.17 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: 0796d5820c9c0854481b6e912a45991a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: 0796d5820c9c0854481b6e912a45991a, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: 0796d5820c9c0854481b6e912a45991a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: 0796d5820c9c0854481b6e912a45991a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: 0796d5820c9c0854481b6e912a45991a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: 0796d5820c9c0854481b6e912a45991a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: 0796d5820c9c0854481b6e912a45991a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0796d5820c9c0854481b6e912a45991a, type: 3} --- !u!1001 &994016966 PrefabInstance: m_ObjectHideFlags: 0 @@ -2631,6 +3004,63 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2b127815fd0f2074eae3a0c6a4786d0b, type: 3} +--- !u!1001 &1217521881 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 20905315288432341, guid: f7f936c30abb2d246a8bc7f0a608986c, type: 3} + propertyPath: m_Name + value: AmmoPickup_Handgun (2) + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: f7f936c30abb2d246a8bc7f0a608986c, type: 3} + propertyPath: m_RootOrder + value: 16 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: f7f936c30abb2d246a8bc7f0a608986c, type: 3} + propertyPath: m_LocalPosition.x + value: 11.08 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: f7f936c30abb2d246a8bc7f0a608986c, type: 3} + propertyPath: m_LocalPosition.y + value: 4.056 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: f7f936c30abb2d246a8bc7f0a608986c, type: 3} + propertyPath: m_LocalPosition.z + value: 22.12 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: f7f936c30abb2d246a8bc7f0a608986c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: f7f936c30abb2d246a8bc7f0a608986c, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: f7f936c30abb2d246a8bc7f0a608986c, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: f7f936c30abb2d246a8bc7f0a608986c, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: f7f936c30abb2d246a8bc7f0a608986c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: f7f936c30abb2d246a8bc7f0a608986c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: f7f936c30abb2d246a8bc7f0a608986c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f7f936c30abb2d246a8bc7f0a608986c, type: 3} --- !u!1 &1227864345 GameObject: m_ObjectHideFlags: 0 @@ -2766,6 +3196,63 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1227864345} m_CullTransparentMesh: 1 +--- !u!1001 &1244488957 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 20905315288432341, guid: 42f56bf1c70035f41830c28fa15d973a, type: 3} + propertyPath: m_Name + value: AmmoPickup_Revolver (1) + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: 42f56bf1c70035f41830c28fa15d973a, type: 3} + propertyPath: m_RootOrder + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: 42f56bf1c70035f41830c28fa15d973a, type: 3} + propertyPath: m_LocalPosition.x + value: -6.03 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: 42f56bf1c70035f41830c28fa15d973a, type: 3} + propertyPath: m_LocalPosition.y + value: 1.87 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: 42f56bf1c70035f41830c28fa15d973a, type: 3} + propertyPath: m_LocalPosition.z + value: 16.37 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: 42f56bf1c70035f41830c28fa15d973a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: 42f56bf1c70035f41830c28fa15d973a, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: 42f56bf1c70035f41830c28fa15d973a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: 42f56bf1c70035f41830c28fa15d973a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: 42f56bf1c70035f41830c28fa15d973a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: 42f56bf1c70035f41830c28fa15d973a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: 42f56bf1c70035f41830c28fa15d973a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 42f56bf1c70035f41830c28fa15d973a, type: 3} --- !u!1 &1286262075 GameObject: m_ObjectHideFlags: 0 @@ -3337,6 +3824,63 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3a896632310e02b468121bf09411f87e, type: 3} +--- !u!1001 &1623739202 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 20905315288432341, guid: f7f936c30abb2d246a8bc7f0a608986c, type: 3} + propertyPath: m_Name + value: AmmoPickup_Handgun (1) + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: f7f936c30abb2d246a8bc7f0a608986c, type: 3} + propertyPath: m_RootOrder + value: 13 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: f7f936c30abb2d246a8bc7f0a608986c, type: 3} + propertyPath: m_LocalPosition.x + value: 2.98 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: f7f936c30abb2d246a8bc7f0a608986c, type: 3} + propertyPath: m_LocalPosition.y + value: 2.003 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: f7f936c30abb2d246a8bc7f0a608986c, type: 3} + propertyPath: m_LocalPosition.z + value: 20.26 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: f7f936c30abb2d246a8bc7f0a608986c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: f7f936c30abb2d246a8bc7f0a608986c, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: f7f936c30abb2d246a8bc7f0a608986c, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: f7f936c30abb2d246a8bc7f0a608986c, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: f7f936c30abb2d246a8bc7f0a608986c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: f7f936c30abb2d246a8bc7f0a608986c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: f7f936c30abb2d246a8bc7f0a608986c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: f7f936c30abb2d246a8bc7f0a608986c, type: 3} --- !u!4 &1639442523 stripped Transform: m_CorrespondingSourceObject: {fileID: 400000, guid: 2b127815fd0f2074eae3a0c6a4786d0b, type: 3} @@ -3638,6 +4182,63 @@ Transform: m_CorrespondingSourceObject: {fileID: 400000, guid: 5d2e4237b4429b34fae4c9eb3cd9efd5, type: 3} m_PrefabInstance: {fileID: 1754370120} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1793843454 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 20905315288432341, guid: 0796d5820c9c0854481b6e912a45991a, type: 3} + propertyPath: m_Name + value: AmmoPickup_Crossbow (1) + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: 0796d5820c9c0854481b6e912a45991a, type: 3} + propertyPath: m_RootOrder + value: 14 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: 0796d5820c9c0854481b6e912a45991a, type: 3} + propertyPath: m_LocalPosition.x + value: 7.19 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: 0796d5820c9c0854481b6e912a45991a, type: 3} + propertyPath: m_LocalPosition.y + value: 2.007 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: 0796d5820c9c0854481b6e912a45991a, type: 3} + propertyPath: m_LocalPosition.z + value: 16.45 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: 0796d5820c9c0854481b6e912a45991a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: 0796d5820c9c0854481b6e912a45991a, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: 0796d5820c9c0854481b6e912a45991a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: 0796d5820c9c0854481b6e912a45991a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: 0796d5820c9c0854481b6e912a45991a, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: 0796d5820c9c0854481b6e912a45991a, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7931289562854344026, guid: 0796d5820c9c0854481b6e912a45991a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0796d5820c9c0854481b6e912a45991a, type: 3} --- !u!1001 &1793928668 PrefabInstance: m_ObjectHideFlags: 0 @@ -4407,6 +5008,18 @@ PrefabInstance: propertyPath: _BulletImpact value: objectReference: {fileID: 252487699782519274, guid: 82851982cb47c134a8403ffcb052b9d2, type: 3} + - target: {fileID: 5393215578589016640, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5393215578589016642, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5420857361349278248, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5428686084875064986, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} propertyPath: m_Name value: MuzzleFlash @@ -4447,10 +5060,18 @@ PrefabInstance: propertyPath: _camera value: objectReference: {fileID: 1850161070} + - target: {fileID: 8294200720936265358, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8294200720936265358, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} propertyPath: _gameOverCanvas value: objectReference: {fileID: 1400272406} + - target: {fileID: 8616685848737228371, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8616685848737228372, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} propertyPath: m_Name value: Player @@ -4479,6 +5100,10 @@ PrefabInstance: propertyPath: m_NotificationBehavior value: 1 objectReference: {fileID: 0} + - target: {fileID: 8616685848737228382, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8729095170121787993, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} propertyPath: _maxHealth value: 50000 diff --git a/Assets/Weapons/Ammo.cs b/Assets/Weapons/Ammo.cs index 92ed839..c0bc04b 100644 --- a/Assets/Weapons/Ammo.cs +++ b/Assets/Weapons/Ammo.cs @@ -11,7 +11,6 @@ public class Ammo : MonoBehaviour [Header("Connections")] [SerializeField] private AmmoBelt _ammoBelt; - [SerializeField] private FloatVariable _S_currentBeltAmmoAmount; [SerializeField] private FloatVariable _S_currentMagAmmoAmount; private void Awake() @@ -23,7 +22,9 @@ public class Ammo : MonoBehaviour private void OnEnable() { - AmmoUpdate(); + _ammoBelt.CurrentWeaponAmmoType = _ammoType; + UpdateMagazineAmmoUI(); + _ammoBelt.UpdateBeltAmmoUI(_ammoType); } #region Public Properties @@ -65,7 +66,7 @@ public class Ammo : MonoBehaviour _ammoBelt.SetBeltCurrentAmmoAmount(_ammoType, 0); } - AmmoUpdate(); + UpdateMagazineAmmoUI(); } public void ModifyMagAmmo(int modifyValue) @@ -81,7 +82,7 @@ public class Ammo : MonoBehaviour _currentMagAmmoAmount = 0; } - AmmoUpdate(); + UpdateMagazineAmmoUI(); } #endregion @@ -100,9 +101,8 @@ public class Ammo : MonoBehaviour #endregion - private void AmmoUpdate() + private void UpdateMagazineAmmoUI() { - _S_currentBeltAmmoAmount.Value = _ammoBelt.GetBeltCurrentAmmoAmount(_ammoType); _S_currentMagAmmoAmount.Value = _currentMagAmmoAmount; } } \ No newline at end of file diff --git a/Assets/Weapons/AmmoBelt.cs b/Assets/Weapons/AmmoBelt.cs new file mode 100644 index 0000000..573c712 --- /dev/null +++ b/Assets/Weapons/AmmoBelt.cs @@ -0,0 +1,97 @@ +using System; +using System.ComponentModel; +using System.Linq; +using UnityEngine; + +public enum AmmoType +{ + [Description("1A")] + CrossbowAmmo, + [Description("5.56mm")] + HandgunAmmo, + [Description("9mm")] + MachinegunAmmo, + [Description("11.5mm")] + RevolverAmmo, +} + +public class AmmoBelt : MonoBehaviour +{ + [Serializable] private class AmmoSlot + { + [field: SerializeField] public AmmoType AmmoType { get; } + [field: SerializeField] public int MaxBeltAmmoAmount { get; set; } + [field: SerializeField] public int CurrentBeltAmmoAmount { get; set; } + } + + [Header("State")] + [SerializeField] private AmmoSlot[] _ammoSlots; + [SerializeField] private FloatVariable _S_currentBeltAmmoAmount; + + [Header("State")] + [SerializeField] private AmmoType _currentWeaponAmmoType; + + public AmmoType CurrentWeaponAmmoType + { + get => _currentWeaponAmmoType; + set => _currentWeaponAmmoType = value; + } + + private void Awake() + { + InitializeAmmoBelt(); + } + + private void InitializeAmmoBelt() + { + foreach (AmmoSlot ammoSlot in _ammoSlots) + { + ammoSlot.CurrentBeltAmmoAmount = ammoSlot.MaxBeltAmmoAmount; + } + } + + public int GetBeltCurrentAmmoAmount(AmmoType ammoType) + { + return GetAmmoSlot(ammoType).CurrentBeltAmmoAmount; + } + + public int GetBeltMaxAmmoAmount(AmmoType ammoType) + { + return GetAmmoSlot(ammoType).MaxBeltAmmoAmount; + } + + public void SetBeltCurrentAmmoAmount(AmmoType ammoType, int value) + { + var ammoSlot = GetAmmoSlot(ammoType); + + ammoSlot.CurrentBeltAmmoAmount = value; + ammoSlot.CurrentBeltAmmoAmount = + Mathf.Clamp(ammoSlot.CurrentBeltAmmoAmount, 0, ammoSlot.MaxBeltAmmoAmount); + + UpdateBeltAmmoUI(ammoSlot.AmmoType); + } + + public void ModifyBeltCurrentAmmoAmount(AmmoType ammoType, int value) + { + var ammoSlot = GetAmmoSlot(ammoType); + + ammoSlot.CurrentBeltAmmoAmount += value; + ammoSlot.CurrentBeltAmmoAmount = + Mathf.Clamp(ammoSlot.CurrentBeltAmmoAmount, 0, ammoSlot.MaxBeltAmmoAmount); + + UpdateBeltAmmoUI(ammoSlot.AmmoType); + } + + private AmmoSlot GetAmmoSlot(AmmoType ammoType) + { + return _ammoSlots.FirstOrDefault(ammoSlot => ammoType == ammoSlot.AmmoType); + } + + public void UpdateBeltAmmoUI(AmmoType ammoType) + { + if (_currentWeaponAmmoType == ammoType) + { + _S_currentBeltAmmoAmount.Value = GetBeltCurrentAmmoAmount(ammoType); + } + } +} \ No newline at end of file diff --git a/Assets/AmmoBelt.cs.meta b/Assets/Weapons/AmmoBelt.cs.meta similarity index 100% rename from Assets/AmmoBelt.cs.meta rename to Assets/Weapons/AmmoBelt.cs.meta diff --git a/Assets/Weapons/Handgun.prefab b/Assets/Weapons/Handgun.prefab index 803e92b..2e4d50d 100644 --- a/Assets/Weapons/Handgun.prefab +++ b/Assets/Weapons/Handgun.prefab @@ -1,88 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1036853281140478 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4176951441283404} - - component: {fileID: 33530704575652106} - - component: {fileID: 23728444791720080} - m_Layer: 0 - m_Name: WM_SF_Wp01_f - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4176951441283404 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1036853281140478} - m_LocalRotation: {x: 0.000000021855694, 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: 4531602420244830} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &33530704575652106 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1036853281140478} - m_Mesh: {fileID: 4300000, guid: 589c90d4952cd7f4f99d50582f9da48d, type: 3} ---- !u!23 &23728444791720080 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1036853281140478} - 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: 4294967295 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 5efee9a7dd68cec4bb5cecdd349c9bc5, 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: 0 - 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!1 &1082139071658744 GameObject: m_ObjectHideFlags: 0 @@ -130,7 +47,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _ammoType: 2 - _index: 0 _range: 100 _weaponDamage: 25 _timeBetweenShots: 0.5 @@ -139,6 +55,7 @@ MonoBehaviour: _muzzleFlash: {fileID: 0} _bulletImpact: {fileID: 252487699782519274, guid: 82851982cb47c134a8403ffcb052b9d2, type: 3} _ammo: {fileID: 4085014607242062707} + _index: 0 _canShoot: 0 --- !u!114 &4085014607242062707 MonoBehaviour: @@ -152,9 +69,70 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 97c35481a551c3a4d9d5f0e3fe13a03d, type: 3} m_Name: m_EditorClassIdentifier: - _ammoType: 2 + _ammoType: 1 _maxMagAmmoAmount: 4 _currentMagAmmoAmount: 0 _ammoBelt: {fileID: 0} - _S_currentBeltAmmoAmount: {fileID: 11400000, guid: f19d1fc1d5102a545800f4f8273640b1, type: 2} _S_currentMagAmmoAmount: {fileID: 11400000, guid: 9a77ec14c64717643bed1c6e7a3885ae, type: 2} +--- !u!1001 &6908143946330165533 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 4531602420244830} + m_Modifications: + - target: {fileID: 6904157571198781521, guid: 2d5e4fde9c5fe2040bdc24082a917fcd, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6904157571198781521, guid: 2d5e4fde9c5fe2040bdc24082a917fcd, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6904157571198781521, guid: 2d5e4fde9c5fe2040bdc24082a917fcd, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6904157571198781521, guid: 2d5e4fde9c5fe2040bdc24082a917fcd, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6904157571198781521, guid: 2d5e4fde9c5fe2040bdc24082a917fcd, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6904157571198781521, guid: 2d5e4fde9c5fe2040bdc24082a917fcd, type: 3} + propertyPath: m_LocalRotation.x + value: 0.000000021855694 + objectReference: {fileID: 0} + - target: {fileID: 6904157571198781521, guid: 2d5e4fde9c5fe2040bdc24082a917fcd, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6904157571198781521, guid: 2d5e4fde9c5fe2040bdc24082a917fcd, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6904157571198781521, guid: 2d5e4fde9c5fe2040bdc24082a917fcd, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6904157571198781521, guid: 2d5e4fde9c5fe2040bdc24082a917fcd, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6904157571198781521, guid: 2d5e4fde9c5fe2040bdc24082a917fcd, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6907685453529874403, guid: 2d5e4fde9c5fe2040bdc24082a917fcd, type: 3} + propertyPath: m_Name + value: WM_SF_Wp01_f + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2d5e4fde9c5fe2040bdc24082a917fcd, type: 3} +--- !u!4 &4176951441283404 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6904157571198781521, guid: 2d5e4fde9c5fe2040bdc24082a917fcd, type: 3} + m_PrefabInstance: {fileID: 6908143946330165533} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Weapons/MachineGun.prefab b/Assets/Weapons/MachineGun.prefab index a628059..ed0175d 100644 --- a/Assets/Weapons/MachineGun.prefab +++ b/Assets/Weapons/MachineGun.prefab @@ -49,7 +49,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _ammoType: 1 - _index: 0 _range: 100 _weaponDamage: 4 _timeBetweenShots: 0.1 @@ -58,6 +57,7 @@ MonoBehaviour: _muzzleFlash: {fileID: 0} _bulletImpact: {fileID: 252487699782519274, guid: 82851982cb47c134a8403ffcb052b9d2, type: 3} _ammo: {fileID: 5655468185604888337} + _index: 0 _canShoot: 0 --- !u!114 &5655468185604888337 MonoBehaviour: @@ -71,11 +71,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 97c35481a551c3a4d9d5f0e3fe13a03d, type: 3} m_Name: m_EditorClassIdentifier: - _ammoType: 1 + _ammoType: 2 _maxMagAmmoAmount: 45 _currentMagAmmoAmount: 0 _ammoBelt: {fileID: 0} - _S_currentBeltAmmoAmount: {fileID: 11400000, guid: f19d1fc1d5102a545800f4f8273640b1, type: 2} _S_currentMagAmmoAmount: {fileID: 11400000, guid: 9a77ec14c64717643bed1c6e7a3885ae, type: 2} --- !u!114 &1366121443174139284 MonoBehaviour: