From 97abe3ae114d766114e4ed3fd2680cd2e1b4a4c4 Mon Sep 17 00:00:00 2001 From: FrancisGallant Date: Mon, 16 Nov 2015 18:24:36 -0500 Subject: [PATCH] shoot de missile et tuer les ennemis --- Assets/MissileTravel.cs | 37 +++++++++++++++ Assets/MissileTravel.cs.meta | 12 +++++ Assets/Prefabs/Missile.prefab | Bin 0 -> 7748 bytes Assets/Prefabs/Missile.prefab.meta | 8 ++++ Assets/Scenes/FrancisScene.unity | Bin 18624 -> 19828 bytes Assets/Scripts/DirectionChangeTrigger.cs | 2 +- Assets/Scripts/Jump.cs | 2 +- Assets/Scripts/Patrolling.cs | 8 ++-- Assets/ShootingScript.cs | 22 +++++++++ Assets/ShootingScript.cs.meta | 12 +++++ Assets/Sprites/missile (1).gif | Bin 0 -> 931 bytes Assets/Sprites/missile (1).gif.meta | 56 +++++++++++++++++++++++ 12 files changed, 153 insertions(+), 6 deletions(-) create mode 100644 Assets/MissileTravel.cs create mode 100644 Assets/MissileTravel.cs.meta create mode 100644 Assets/Prefabs/Missile.prefab create mode 100644 Assets/Prefabs/Missile.prefab.meta create mode 100644 Assets/ShootingScript.cs create mode 100644 Assets/ShootingScript.cs.meta create mode 100644 Assets/Sprites/missile (1).gif create mode 100644 Assets/Sprites/missile (1).gif.meta 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 0000000000000000000000000000000000000000..cc5c902ce8f1de4ff0671f3e599a0715f8baf138 GIT binary patch literal 7748 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 NyfT5ctPZna{sVjgo0().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 0000000000000000000000000000000000000000..a05d928ab2e4155fbbbf49cc6eb3b1d74f4dfc54 GIT binary patch literal 931 zcmZ?wbhEHbbYl={g*zMoN{ih)`(L+b9#8NcHBf-td-qAtff`H|X-isYBV(iD6Zg~FGT+~=ndRi>q z(!IIHFaOZtyn;_W9*dcaEM=Q>TUppxJ33t0e53oqZ5i0>vl?Q(Tl>4aIy)!0F7OlJ zb#Mp@Sv0GyWNmMM{}OTgV8`UuZ8K&rjIow?aGJHti{EFlp1JG{Q+6vh6Z3s%E(=|} za$Usm(v9o4?%e0AexSjL&0ojJ@z?%_kOhiG>!cS8cIxo;wXPQy=H)o!yH={&R_fk| ziphs%E=}e+z^Gus&cg`wS5~VJ#9x`wZn72JRSaoCy)pc4Su7x*^|>zc6A+mioH2W~ z%iO~COA?}&i8=&jB&}(kX&JS|U%|n#WcD7fS(~@c+L9!HQ_7QZ;2RQy?y)c z{YQM09;;*Z+HoSh_KW+^>ZSq@ofkz~9TPV6bks32Iv78RFhBa}qlb(H_r0{I?ra>3 zn9|B>w@UGT*fHm1B-iT`%ntc{KNd5xS<1F#w|TR%c6K^9WoL!j*3{XjH#SA{xA*sS zcXds0S?DXkW6w3UK6CaOXO^N3eNmB>$+b+GiEG