diff --git a/Assets/MissileTravel.cs b/Assets/MissileTravel.cs new file mode 100644 index 0000000..06f7c27 --- /dev/null +++ b/Assets/MissileTravel.cs @@ -0,0 +1,37 @@ +using UnityEngine; +using System.Collections; + +public class MissileTravel : MonoBehaviour { + public float missileSpeed; + private Transform missilePos; + private bool inContact = false; + + // ajouter du damage + + // Use this for initialization + void Start () { + this.missilePos = this.transform; + } + + // Update is called once per frame + void Update () { + if (!inContact) + { + this.missilePos.Translate(new Vector3(missileSpeed, 0, 0) * Time.deltaTime); + } + } + + void OnCollisionEnter2D(Collision2D other) { + print("missile touche"); + if (other.gameObject.tag == "Ennemy") { + // do shits to player + print("touchee"); + Destroy(this.gameObject); + Destroy(other.gameObject); + } + if (other.gameObject.tag == "Floor") { + Destroy(this.gameObject); + } + } + +} diff --git a/Assets/MissileTravel.cs.meta b/Assets/MissileTravel.cs.meta new file mode 100644 index 0000000..e686e2d --- /dev/null +++ b/Assets/MissileTravel.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: fb20d6c6a0d8d8743a840286880b4b00 +timeCreated: 1447713283 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Missile.prefab b/Assets/Prefabs/Missile.prefab new file mode 100644 index 0000000..cc5c902 Binary files /dev/null and b/Assets/Prefabs/Missile.prefab differ diff --git a/Assets/Prefabs/Missile.prefab.meta b/Assets/Prefabs/Missile.prefab.meta new file mode 100644 index 0000000..a76a6d5 --- /dev/null +++ b/Assets/Prefabs/Missile.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d7295f14b4e29684f865cdde9266feb0 +timeCreated: 1447715205 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/FrancisScene.unity b/Assets/Scenes/FrancisScene.unity index b255eec..1243901 100644 Binary files a/Assets/Scenes/FrancisScene.unity and b/Assets/Scenes/FrancisScene.unity differ diff --git a/Assets/Scripts/DirectionChangeTrigger.cs b/Assets/Scripts/DirectionChangeTrigger.cs index ce080ee..45f46ef 100644 --- a/Assets/Scripts/DirectionChangeTrigger.cs +++ b/Assets/Scripts/DirectionChangeTrigger.cs @@ -16,7 +16,7 @@ public class DirectionChangeTrigger : MonoBehaviour { void OnTriggerEnter2D(Collider2D other) { if( other.gameObject.tag == "Ennemy" ){ other.gameObject.GetComponent().setDirection(- other.gameObject.GetComponent().getDirection()); - print("TriggerEnter"); + //print("TriggerEnter"); } } } diff --git a/Assets/Scripts/Jump.cs b/Assets/Scripts/Jump.cs index 0b6b140..e89e3d6 100644 --- a/Assets/Scripts/Jump.cs +++ b/Assets/Scripts/Jump.cs @@ -18,7 +18,7 @@ public class Jump : MonoBehaviour { // Update is called once per frame void Update () { - if (Input.GetButton("Fire1") && isOnGround == true) + if (Input.GetKeyUp(KeyCode.Space) && isOnGround == true) { player.velocity = new Vector2(player.velocity.x, playerSpeedY); } diff --git a/Assets/Scripts/Patrolling.cs b/Assets/Scripts/Patrolling.cs index 8a593c3..62a69b6 100644 --- a/Assets/Scripts/Patrolling.cs +++ b/Assets/Scripts/Patrolling.cs @@ -4,7 +4,7 @@ using System.Collections; public class Patrolling : MonoBehaviour { - private float direction = 0.5f; + public float speed; // Use this for initialization void Start () { @@ -13,18 +13,18 @@ public class Patrolling : MonoBehaviour { // Update is called once per frame void Update () { - this.transform.Translate(direction, 0, 0); + this.transform.Translate(new Vector3(speed, 0, 0) * Time.deltaTime); } void FixedUpdate() { } public void setDirection(float value) { - direction = value; + speed = value; } public float getDirection() { - return direction; + return speed; } } diff --git a/Assets/ShootingScript.cs b/Assets/ShootingScript.cs new file mode 100644 index 0000000..d1f7036 --- /dev/null +++ b/Assets/ShootingScript.cs @@ -0,0 +1,22 @@ +using UnityEngine; +using System.Collections; + +public class ShootingScript : MonoBehaviour { + + public float attackSpeed; + private float nextShootTime = 0.0f; + public GameObject Missile; + // Use this for initialization + void Start () { + } + + // Update is called once per frame + void Update () { + if(Input.GetButton("Fire1") && Time.time > nextShootTime){ + print("pewpew"); + nextShootTime = Time.time + attackSpeed; + //avancer le missile au depart quand il va apparaitre (quand je vais avoir anim de combat) + GameObject clone = Instantiate( Missile,transform.position,transform.rotation) as GameObject; + } + } +} diff --git a/Assets/ShootingScript.cs.meta b/Assets/ShootingScript.cs.meta new file mode 100644 index 0000000..b85276b --- /dev/null +++ b/Assets/ShootingScript.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 86aea67c20f4c264393299ede07339a3 +timeCreated: 1447714560 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/missile (1).gif b/Assets/Sprites/missile (1).gif new file mode 100644 index 0000000..a05d928 Binary files /dev/null and b/Assets/Sprites/missile (1).gif differ diff --git a/Assets/Sprites/missile (1).gif.meta b/Assets/Sprites/missile (1).gif.meta new file mode 100644 index 0000000..e3b60f7 --- /dev/null +++ b/Assets/Sprites/missile (1).gif.meta @@ -0,0 +1,56 @@ +fileFormatVersion: 2 +guid: 51a9c79b88f593f4aa24a058515df7f1 +timeCreated: 1447713192 +licenseType: Free +TextureImporter: + fileIDToRecycleName: {} + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + cubemapConvolution: 0 + cubemapConvolutionSteps: 8 + cubemapConvolutionExponent: 1.5 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 2048 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: 1 + nPOTScale: 0 + lightmap: 0 + rGBM: 0 + compressionQuality: 50 + allowsAlphaSplitting: 0 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spritePixelsToUnits: 100 + alphaIsTransparency: 1 + textureType: 8 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: + assetBundleName: + assetBundleVariant: