diff --git a/Assets/Animations/Player.controller b/Assets/Animations/Player.controller new file mode 100644 index 0000000..d9a525a --- /dev/null +++ b/Assets/Animations/Player.controller @@ -0,0 +1,12 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Player + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: [] diff --git a/Assets/Animations/Player.controller.meta b/Assets/Animations/Player.controller.meta new file mode 100644 index 0000000..6f9bffc --- /dev/null +++ b/Assets/Animations/Player.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 341ceed0639d4ec438cbde3691ec0d95 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/PlayerIdle.anim b/Assets/Animations/PlayerIdle.anim new file mode 100644 index 0000000..58faa4c --- /dev/null +++ b/Assets/Animations/PlayerIdle.anim @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PlayerIdle + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/PlayerIdle.anim.meta b/Assets/Animations/PlayerIdle.anim.meta new file mode 100644 index 0000000..4155162 --- /dev/null +++ b/Assets/Animations/PlayerIdle.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ed062502ba1d01840ba9065ded267c33 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/PlayerWalkDown.anim b/Assets/Animations/PlayerWalkDown.anim new file mode 100644 index 0000000..21a06ca --- /dev/null +++ b/Assets/Animations/PlayerWalkDown.anim @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PlayerWalk + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/PlayerWalkDown.anim.meta b/Assets/Animations/PlayerWalkDown.anim.meta new file mode 100644 index 0000000..d19cfd1 --- /dev/null +++ b/Assets/Animations/PlayerWalkDown.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1548e68554bd4564d84c43ec8aefd2cc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/PlayerScript.cs b/Assets/Scripts/PlayerScript.cs index 3d373fa..93c4539 100644 --- a/Assets/Scripts/PlayerScript.cs +++ b/Assets/Scripts/PlayerScript.cs @@ -18,11 +18,14 @@ public class PlayerScript : MonoBehaviour private float myTime = 0.0f; private GameObject reloaded; private Rigidbody2D rb; + private Vector2 movement; + private Animator animator; private AudioSource audioSource; void Awake() { + animator = GetComponent(); audioSource = GetComponent(); rb = GetComponent(); reloaded = GameObject.Find("Reloaded"); @@ -30,6 +33,13 @@ public class PlayerScript : MonoBehaviour void Update() { + + movement.x = Input.GetAxis("Horizontal"); + movement.y = Input.GetAxis("Vertical"); + + animator.SetFloat("Horizontal", movement.x); + animator.SetFloat("Vertical", movement.y); + animator.SetFloat("Speed", movement.sqrMagnitude); reloaded.SetActive(false); myTime += Time.deltaTime; @@ -42,7 +52,7 @@ public class PlayerScript : MonoBehaviour if(Input.GetButton("Fire1") && myTime > nextFire) { GunFire(); - nextFire = Random.Range(0.0f, 2.0f); + nextFire = Random.Range(0.25f, 2.0f); myTime = 0.0f; } @@ -56,8 +66,7 @@ public class PlayerScript : MonoBehaviour void FixedUpdate() { - rb.velocity = - new Vector2(Input.GetAxis("Horizontal") * speed, Input.GetAxis("Vertical") * speed); + rb.MovePosition(rb.position + movement * speed * Time.fixedDeltaTime); } diff --git a/Assets/Sprites/Player.png b/Assets/Sprites/Player.png index af90652..5872b53 100644 Binary files a/Assets/Sprites/Player.png and b/Assets/Sprites/Player.png differ diff --git a/Assets/Sprites/Player.xcf b/Assets/Sprites/Player.xcf index 684678e..63da1de 100644 Binary files a/Assets/Sprites/Player.xcf and b/Assets/Sprites/Player.xcf differ diff --git a/Assets/Sprites/PlayerWalkDown1.png b/Assets/Sprites/PlayerWalkDown1.png new file mode 100644 index 0000000..4a18c09 Binary files /dev/null and b/Assets/Sprites/PlayerWalkDown1.png differ diff --git a/Assets/Sprites/PlayerWalkDown1.png.meta b/Assets/Sprites/PlayerWalkDown1.png.meta new file mode 100644 index 0000000..47a2000 --- /dev/null +++ b/Assets/Sprites/PlayerWalkDown1.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: c66457739db429342bb3dfe3605edf10 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/PlayerWalkDown1.xcf b/Assets/Sprites/PlayerWalkDown1.xcf new file mode 100644 index 0000000..c884c73 Binary files /dev/null and b/Assets/Sprites/PlayerWalkDown1.xcf differ diff --git a/Assets/Sprites/PlayerWalkDown1.xcf.meta b/Assets/Sprites/PlayerWalkDown1.xcf.meta new file mode 100644 index 0000000..a3a5cca --- /dev/null +++ b/Assets/Sprites/PlayerWalkDown1.xcf.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8976074f8297fac4ab5b771ca25f616c +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/PlayerWalkDown2.png b/Assets/Sprites/PlayerWalkDown2.png new file mode 100644 index 0000000..ab79d3a Binary files /dev/null and b/Assets/Sprites/PlayerWalkDown2.png differ diff --git a/Assets/Sprites/PlayerWalkDown2.png.meta b/Assets/Sprites/PlayerWalkDown2.png.meta new file mode 100644 index 0000000..2b2b531 --- /dev/null +++ b/Assets/Sprites/PlayerWalkDown2.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 6d9183640d8ef5b45bd48e81bfade33c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/PlayerWalkDown2.xcf b/Assets/Sprites/PlayerWalkDown2.xcf new file mode 100644 index 0000000..c846344 Binary files /dev/null and b/Assets/Sprites/PlayerWalkDown2.xcf differ diff --git a/Assets/Sprites/PlayerWalkDown2.xcf.meta b/Assets/Sprites/PlayerWalkDown2.xcf.meta new file mode 100644 index 0000000..f9c8786 --- /dev/null +++ b/Assets/Sprites/PlayerWalkDown2.xcf.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: fb397de517416fa4aa3b8d13928fc666 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: