diff --git a/MrBigsock/Assets/Code/DestroyObject.cs b/MrBigsock/Assets/Code/DestroyObject.cs new file mode 100644 index 0000000000000000000000000000000000000000..48c7ad24cef9cd940a070cd0242ddf9327c53770 --- /dev/null +++ b/MrBigsock/Assets/Code/DestroyObject.cs @@ -0,0 +1,23 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class DestroyObject : MonoBehaviour +{ + + private void OnCollisionEnter2D(Collision2D collision) + { + Destroy(this.gameObject); + } + + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + } +} diff --git a/MrBigsock/Assets/Code/DestroyObject.cs.meta b/MrBigsock/Assets/Code/DestroyObject.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..91be20e3fe7468a43d4299cff0409ce185a6a58a --- /dev/null +++ b/MrBigsock/Assets/Code/DestroyObject.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 08cde138491863f44997ffed19e030dd +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MrBigsock/Assets/Code/PlayerController.cs b/MrBigsock/Assets/Code/PlayerController.cs index 2ca3d8e8420b0f05a601c3599111270dfeb0e461..421defa9ae8aed08fda4264a20f324b0f36a11f2 100644 --- a/MrBigsock/Assets/Code/PlayerController.cs +++ b/MrBigsock/Assets/Code/PlayerController.cs @@ -9,6 +9,8 @@ public class PlayerController : MonoBehaviour public float moveSpeed = 1f; public float collisionOffset = 0.05f; public ContactFilter2D movementFilter; + + public GameObject attack; Vector2 movementInput; SpriteRenderer spriteRenderer; @@ -53,6 +55,22 @@ public class PlayerController : MonoBehaviour spriteRenderer.flipX = false; } } + + + } + + private void Update() + { + if (Input.GetKeyDown(KeyCode.Space)) + { + if (movementInput.x < 0 ) + { + Instantiate(attack, new Vector3(transform.position.x - 1.0f, transform.position.y, transform.position.z), attack.transform.rotation); + } else if (movementInput.x >= 0) + { + Instantiate(attack, new Vector3(transform.position.x + 1.0f, transform.position.y, transform.position.z), attack.transform.rotation); + } + } } private bool TryMove(Vector2 direction) { diff --git a/MrBigsock/Assets/Code/attack.meta b/MrBigsock/Assets/Code/attack.meta new file mode 100644 index 0000000000000000000000000000000000000000..201cba4a416e302591c80a4f16c494b40b641064 --- /dev/null +++ b/MrBigsock/Assets/Code/attack.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 650dff24553d76d4face28080d5f8b02 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MrBigsock/Assets/Code/attack/AttackMovement.cs b/MrBigsock/Assets/Code/attack/AttackMovement.cs new file mode 100644 index 0000000000000000000000000000000000000000..e9a92a99e1133d96d64d3b4fe77504ea922e1736 --- /dev/null +++ b/MrBigsock/Assets/Code/attack/AttackMovement.cs @@ -0,0 +1,55 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.InputSystem; +using static UnityEngine.GraphicsBuffer; + +public class AttackMovement : MonoBehaviour +{ + public float speed = 10.0f; + bool moved = false; + float horizontalInput; + float verticalInput; + + + // Start is called before the first frame update + void Start() + { + } + + // Update is called once per frame + void Update() + { + if (!moved) + { + horizontalInput = Input.GetAxis("Horizontal"); + verticalInput = Input.GetAxis("Vertical"); + moved = true; + } + if (horizontalInput != 0 && verticalInput != 0) + { + transform.Translate(new Vector3(1 * horizontalInput, 1 * verticalInput, 0) * speed * Time.deltaTime); + } + else if (horizontalInput < 0) + { + transform.Translate(-Vector3.right * speed * Time.deltaTime); + } + else if (horizontalInput > 0) + { + transform.Translate(Vector3.right * speed * Time.deltaTime); + } + else if (verticalInput > 0) + { + transform.Translate(Vector3.up * speed * Time.deltaTime); + } + else if (verticalInput < 0) + { + transform.Translate(-Vector3.up * speed * Time.deltaTime); + } + + else + { + transform.Translate(Vector3.right * speed * Time.deltaTime); + } + } +} \ No newline at end of file diff --git a/MrBigsock/Assets/Code/attack/AttackMovement.cs.meta b/MrBigsock/Assets/Code/attack/AttackMovement.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..b39d2ae668ac52b4296d2da7906846fa3edcfe9a --- /dev/null +++ b/MrBigsock/Assets/Code/attack/AttackMovement.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3ae233c400f83844da0350aabdf5097d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MrBigsock/Assets/Prefabs/attack.prefab b/MrBigsock/Assets/Prefabs/attack.prefab new file mode 100644 index 0000000000000000000000000000000000000000..1a9aeeaa5a1cc64ebc0fe33fed5a968a62d4dc27 --- /dev/null +++ b/MrBigsock/Assets/Prefabs/attack.prefab @@ -0,0 +1,162 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7173793660907891926 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7173793660907891920} + - component: {fileID: 7173793660907891921} + - component: {fileID: 7173793660907891922} + - component: {fileID: 7173793660907891949} + - component: {fileID: 7173793660907891948} + - component: {fileID: 5355219341519538053} + m_Layer: 0 + m_Name: attack + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7173793660907891920 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7173793660907891926} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 2.0584211, y: -1.6348, z: 0} + m_LocalScale: {x: 0.27652767, y: 0.27652767, z: 0.27652767} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &7173793660907891921 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7173793660907891926} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 2 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!61 &7173793660907891922 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7173793660907891926} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!50 &7173793660907891949 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7173793660907891926} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!114 &7173793660907891948 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7173793660907891926} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 08cde138491863f44997ffed19e030dd, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &5355219341519538053 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7173793660907891926} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3ae233c400f83844da0350aabdf5097d, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 10 diff --git a/MrBigsock/Assets/Prefabs/attack.prefab.meta b/MrBigsock/Assets/Prefabs/attack.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..5b1d7938984b800a8e28026588e215812dda29cc --- /dev/null +++ b/MrBigsock/Assets/Prefabs/attack.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 905a56c36fcb8c64faad43986481914d +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: