From bf587eaa882118c8546f5334d83dc9e91c6ed6fc Mon Sep 17 00:00:00 2001 From: Stedd Date: Mon, 25 Jul 2022 14:07:01 +0200 Subject: [PATCH] Weapon Fire --- Assets/Scenes/Sandbox.unity | 624 +++++++++++++++++++++++++++++-- Assets/Weapons/Crossbow.prefab | 13 + Assets/Weapons/Handgun.prefab | 13 + Assets/Weapons/MachineGun.prefab | 13 + Assets/Weapons/Revolver.prefab | 21 -- Assets/Weapons/Weapon.cs | 26 ++ Assets/Weapons/Weapon.cs.meta | 11 + 7 files changed, 677 insertions(+), 44 deletions(-) create mode 100644 Assets/Weapons/Weapon.cs create mode 100644 Assets/Weapons/Weapon.cs.meta diff --git a/Assets/Scenes/Sandbox.unity b/Assets/Scenes/Sandbox.unity index 9a50486..9aa6172 100644 --- a/Assets/Scenes/Sandbox.unity +++ b/Assets/Scenes/Sandbox.unity @@ -455,6 +455,82 @@ Transform: m_CorrespondingSourceObject: {fileID: 400000, guid: 2b127815fd0f2074eae3a0c6a4786d0b, type: 3} m_PrefabInstance: {fileID: 1215845398} m_PrefabAsset: {fileID: 0} +--- !u!1 &520203987 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 520203988} + - component: {fileID: 520203990} + - component: {fileID: 520203989} + m_Layer: 5 + m_Name: Crosshair + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &520203988 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 520203987} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.9, y: 0.9, z: 0.9} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 1731253956} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &520203989 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 520203987} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.5254902} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 712fb459a16f2d043af3d53a071a0d6d, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &520203990 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 520203987} + m_CullTransparentMesh: 1 --- !u!1001 &529879792 PrefabInstance: m_ObjectHideFlags: 0 @@ -901,6 +977,108 @@ Transform: m_CorrespondingSourceObject: {fileID: 400000, guid: d85d3a32fb6157d488e31edf82b7b1c4, type: 3} m_PrefabInstance: {fileID: 64514478} m_PrefabAsset: {fileID: 0} +--- !u!1 &774924458 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 774924462} + - component: {fileID: 774924461} + - component: {fileID: 774924460} + - component: {fileID: 774924459} + m_Layer: 5 + m_Name: UI + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &774924459 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 774924458} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &774924460 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 774924458} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &774924461 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 774924458} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 1874573760} + m_PlaneDistance: 0 + m_PixelPerfect: 1 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 25 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &774924462 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 774924458} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1722452409} + - {fileID: 1731253956} + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} --- !u!1 &794371210 GameObject: m_ObjectHideFlags: 0 @@ -1068,6 +1246,74 @@ Transform: m_CorrespondingSourceObject: {fileID: 400000, guid: 584a8ef4749c89745b7ae07f3ba7617f, type: 3} m_PrefabInstance: {fileID: 945433442} m_PrefabAsset: {fileID: 0} +--- !u!1 &1105115519 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1105115522} + - component: {fileID: 1105115521} + - component: {fileID: 1105115520} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!114 &1105115520 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1105115519} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Name: + m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &1105115521 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1105115519} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &1105115522 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1105115519} + 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 &1162621910 PrefabInstance: m_ObjectHideFlags: 0 @@ -1536,6 +1782,242 @@ Transform: m_CorrespondingSourceObject: {fileID: 400000, guid: 5862bbfe91a75054ca72c13b555b6ac5, type: 3} m_PrefabInstance: {fileID: 1652319954} m_PrefabAsset: {fileID: 0} +--- !u!1 &1722452408 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1722452409} + - component: {fileID: 1722452411} + - component: {fileID: 1722452410} + m_Layer: 5 + m_Name: AmmoText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1722452409 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1722452408} + 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: 774924462} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 20, y: 20} + m_SizeDelta: {x: 250, y: 40} + m_Pivot: {x: 0, y: 0} +--- !u!114 &1722452410 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1722452408} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 'Ammo: 999' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1722452411 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1722452408} + m_CullTransparentMesh: 1 +--- !u!1 &1731253955 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1731253956} + - component: {fileID: 1731253959} + - component: {fileID: 1731253958} + - component: {fileID: 1731253957} + m_Layer: 5 + m_Name: CrosshairCanvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1731253956 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1731253955} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 520203988} + m_Father: {fileID: 774924462} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1731253957 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1731253955} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1731253958 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1731253955} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &1731253959 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1731253955} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 --- !u!1001 &1754370120 PrefabInstance: m_ObjectHideFlags: 0 @@ -1738,6 +2220,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 8762286023885395322, guid: 9c489a8547f4d9e4387da15a4ff82c81, type: 3} m_PrefabInstance: {fileID: 6782772648210504087} m_PrefabAsset: {fileID: 0} +--- !u!20 &1874573760 stripped +Camera: + m_CorrespondingSourceObject: {fileID: 9005220659476430821, guid: 2d3a85ecde41a8246a79669975912b74, type: 3} + m_PrefabInstance: {fileID: 4313866246714185760} + m_PrefabAsset: {fileID: 0} --- !u!4 &2051410674 stripped Transform: m_CorrespondingSourceObject: {fileID: 400000, guid: 2b127815fd0f2074eae3a0c6a4786d0b, type: 3} @@ -1861,7 +2348,11 @@ PrefabInstance: objectReference: {fileID: 727849754} - target: {fileID: 2032617874441210469, guid: 3a896632310e02b468121bf09411f87e, type: 3} propertyPath: chaseRange - value: 150 + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 2032617874441210469, guid: 3a896632310e02b468121bf09411f87e, type: 3} + propertyPath: attackRange + value: 1.5 objectReference: {fileID: 0} - target: {fileID: 8248657945561792745, guid: 3a896632310e02b468121bf09411f87e, type: 3} propertyPath: m_StaticEditorFlags @@ -1882,15 +2373,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9005220659476430818, guid: 2d3a85ecde41a8246a79669975912b74, type: 3} propertyPath: m_LocalPosition.x - value: 16.36046 + value: -2.7095394 objectReference: {fileID: 0} - target: {fileID: 9005220659476430818, guid: 2d3a85ecde41a8246a79669975912b74, type: 3} propertyPath: m_LocalPosition.y - value: -6.761592 + value: -11.351592 objectReference: {fileID: 0} - target: {fileID: 9005220659476430818, guid: 2d3a85ecde41a8246a79669975912b74, type: 3} propertyPath: m_LocalPosition.z - value: 22.514454 + value: 1.5244541 objectReference: {fileID: 0} - target: {fileID: 9005220659476430818, guid: 2d3a85ecde41a8246a79669975912b74, type: 3} propertyPath: m_LocalRotation.w @@ -1951,15 +2442,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8762286023885395322, guid: 9c489a8547f4d9e4387da15a4ff82c81, type: 3} propertyPath: m_LocalPosition.x - value: 16.36046 + value: -2.7095394 objectReference: {fileID: 0} - target: {fileID: 8762286023885395322, guid: 9c489a8547f4d9e4387da15a4ff82c81, type: 3} propertyPath: m_LocalPosition.y - value: -6.761592 + value: -11.351592 objectReference: {fileID: 0} - target: {fileID: 8762286023885395322, guid: 9c489a8547f4d9e4387da15a4ff82c81, type: 3} propertyPath: m_LocalPosition.z - value: 22.514454 + value: 1.5244541 objectReference: {fileID: 0} - target: {fileID: 8762286023885395322, guid: 9c489a8547f4d9e4387da15a4ff82c81, type: 3} propertyPath: m_LocalRotation.w @@ -2006,22 +2497,106 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 3273242134651530650, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} - propertyPath: m_IsActive - value: 0 + - target: {fileID: 160269183453626702, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} + propertyPath: m_Name + value: Weapon objectReference: {fileID: 0} - - target: {fileID: 3360281265970703093, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} - propertyPath: m_IsActive - value: 0 + - target: {fileID: 335461055095249328, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} + propertyPath: fireAction.m_Id + value: 2bf4429a-ac42-4cc4-9a14-0dadc769fd99 objectReference: {fileID: 0} - - target: {fileID: 5393215578589016655, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 6b911390c5825014e8377183a7837d3f, type: 2} - - target: {fileID: 6326861089322885425, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} - propertyPath: m_IsActive + - target: {fileID: 335461055095249328, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} + propertyPath: fireAction.m_Name + value: Fire + objectReference: {fileID: 0} + - target: {fileID: 335461055095249328, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} + propertyPath: reloadAction.m_Id + value: e5dd7aae-807b-46fc-8c1a-a6e621305625 + objectReference: {fileID: 0} + - target: {fileID: 335461055095249328, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} + propertyPath: reloadAction.m_Name + value: Reload + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: fireAction.m_Id + value: 1ed57d50-dc55-4571-aecd-b32a46cca345 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: fireAction.m_Name + value: Fire + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: reloadAction.m_Id + value: b2fa540f-5a3f-4fb7-b40b-672ea6bc4308 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: reloadAction.m_Name + value: Reload + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: fireAction.m_SingletonActionBindings.Array.size value: 1 objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: reloadAction.m_SingletonActionBindings.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: fireAction.m_SingletonActionBindings.Array.data[0].m_Id + value: 9820ce96-b93a-4117-a273-5fff0a8424d5 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: fireAction.m_SingletonActionBindings.Array.data[0].m_Path + value: /leftButton + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: reloadAction.m_SingletonActionBindings.Array.data[0].m_Id + value: 58f8c3e7-8210-4dc2-8eae-d4494d6fdbcc + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: fireAction.m_SingletonActionBindings.Array.data[0].m_Action + value: Fire + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: reloadAction.m_SingletonActionBindings.Array.data[0].m_Path + value: /#(R) + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: reloadAction.m_SingletonActionBindings.Array.data[0].m_Action + value: Reload + objectReference: {fileID: 0} + - target: {fileID: 2132953286740742962, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} + propertyPath: fireAction.m_Id + value: 95062357-7b41-46da-81a2-d1977a9c523b + objectReference: {fileID: 0} + - target: {fileID: 2132953286740742962, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} + propertyPath: fireAction.m_Name + value: Fire + objectReference: {fileID: 0} + - target: {fileID: 2132953286740742962, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} + propertyPath: reloadAction.m_Id + value: b6e2ceaf-6126-4eb9-8b2e-91b3dc0253b4 + objectReference: {fileID: 0} + - target: {fileID: 2132953286740742962, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} + propertyPath: reloadAction.m_Name + value: Reload + objectReference: {fileID: 0} + - target: {fileID: 7060812621224890882, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} + propertyPath: fireAction.m_Id + value: 974fe4ce-65be-4370-b772-71ca6290711e + objectReference: {fileID: 0} + - target: {fileID: 7060812621224890882, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} + propertyPath: fireAction.m_Name + value: Fire + objectReference: {fileID: 0} + - target: {fileID: 7060812621224890882, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} + propertyPath: reloadAction.m_Id + value: 9a13135e-9c14-4a7a-a277-378fc4a31eae + objectReference: {fileID: 0} + - target: {fileID: 7060812621224890882, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} + propertyPath: reloadAction.m_Name + value: Reload + objectReference: {fileID: 0} - target: {fileID: 8616685848737228372, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} propertyPath: m_Name value: Player @@ -2032,15 +2607,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8997996947095583982, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} propertyPath: m_LocalPosition.x - value: -1.39 + value: -20.46 objectReference: {fileID: 0} - target: {fileID: 8997996947095583982, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} propertyPath: m_LocalPosition.y - value: 4.59 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8997996947095583982, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} propertyPath: m_LocalPosition.z - value: 28.53 + value: 7.54 objectReference: {fileID: 0} - target: {fileID: 8997996947095583982, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} propertyPath: m_LocalRotation.w @@ -2070,5 +2645,8 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - m_RemovedComponents: [] + m_RemovedComponents: + - {fileID: 7060812621224890882, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} + - {fileID: 335461055095249328, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} + - {fileID: 2132953286740742962, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} m_SourcePrefab: {fileID: 100100000, guid: c5efc39a8aaf6e64ea40e9ad573e9b47, type: 3} diff --git a/Assets/Weapons/Crossbow.prefab b/Assets/Weapons/Crossbow.prefab index 404031e..a4c5431 100644 --- a/Assets/Weapons/Crossbow.prefab +++ b/Assets/Weapons/Crossbow.prefab @@ -40,6 +40,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4838220252604734} + - component: {fileID: 971410133006304364} m_Layer: 0 m_Name: Crossbow m_TagString: Untagged @@ -64,6 +65,18 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &971410133006304364 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1519058888169846} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 01ef216392c8f33409f2efcd91f4e510, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1768035638187606 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Weapons/Handgun.prefab b/Assets/Weapons/Handgun.prefab index ad866f6..f31810a 100644 --- a/Assets/Weapons/Handgun.prefab +++ b/Assets/Weapons/Handgun.prefab @@ -92,6 +92,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4531602420244830} + - component: {fileID: 3010920642945371858} m_Layer: 0 m_Name: Handgun m_TagString: Untagged @@ -115,3 +116,15 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3010920642945371858 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1082139071658744} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 01ef216392c8f33409f2efcd91f4e510, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Weapons/MachineGun.prefab b/Assets/Weapons/MachineGun.prefab index 00eafc0..be45e77 100644 --- a/Assets/Weapons/MachineGun.prefab +++ b/Assets/Weapons/MachineGun.prefab @@ -9,6 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 453068} + - component: {fileID: 5719313868755367213} - component: {fileID: 3316574} - component: {fileID: 2346984} m_Layer: 0 @@ -33,6 +34,18 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5719313868755367213 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 118234} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 01ef216392c8f33409f2efcd91f4e510, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!33 &3316574 MeshFilter: m_ObjectHideFlags: 0 diff --git a/Assets/Weapons/Revolver.prefab b/Assets/Weapons/Revolver.prefab index 6fb0683..8dbf0bf 100644 --- a/Assets/Weapons/Revolver.prefab +++ b/Assets/Weapons/Revolver.prefab @@ -9,7 +9,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 417070} - - component: {fileID: 9560878} m_Layer: 0 m_Name: Revolver m_TagString: Untagged @@ -35,26 +34,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!95 &9560878 -Animator: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 117070} - 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 &160878 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Weapons/Weapon.cs b/Assets/Weapons/Weapon.cs new file mode 100644 index 0000000..b538e93 --- /dev/null +++ b/Assets/Weapons/Weapon.cs @@ -0,0 +1,26 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.InputSystem; + +public class Weapon : MonoBehaviour +{ + + private void Awake() + { + + //fireAction.performed += OnFire; + //reloadAction.performed += OnReload; + } + + private void OnFire() + { + print("Boom!"); + } + + private void OnReload() + { + print("Reload!"); + } +} diff --git a/Assets/Weapons/Weapon.cs.meta b/Assets/Weapons/Weapon.cs.meta new file mode 100644 index 0000000..d629152 --- /dev/null +++ b/Assets/Weapons/Weapon.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 01ef216392c8f33409f2efcd91f4e510 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: