From a201fdc3453cff1c0734c4f2dee142d107f33911 Mon Sep 17 00:00:00 2001 From: Xavier314 Date: Sat, 7 Nov 2015 20:35:49 -0500 Subject: [PATCH] new file: Assets/Animations/Jump0.anim new file: Assets/Animations/Jump0.anim.meta renamed: Assets/Sprites/Shooting.anim -> Assets/Animations/Shooting.anim renamed: Assets/Sprites/Shooting.anim.meta -> Assets/Animations/Shooting.anim.meta modified: Assets/Animations/megaman.controller modified: Assets/Scenes/XavierScene.unity modified: Assets/Scripts/Animations.cs modified: Assets/Scripts/Control.cs modified: Assets/Scripts/Gravity.cs modified: Assets/Scripts/Jump.cs new file: Assets/Scripts/MainCamera.cs new file: Assets/Scripts/MainCamera.cs.meta modified: Assets/Sprites/mm.png.meta modified: ProjectSettings/TagManager.asset --- Assets/Animations/Jump0.anim | Bin 0 -> 9152 bytes Assets/Animations/Jump0.anim.meta | 8 ++ Assets/{Sprites => Animations}/Shooting.anim | Bin .../Shooting.anim.meta | 0 Assets/Animations/megaman.controller | Bin 10288 -> 10288 bytes Assets/Scenes/XavierScene.unity | Bin 19188 -> 20340 bytes Assets/Scripts/Animations.cs | 7 +- Assets/Scripts/Control.cs | 30 +++---- Assets/Scripts/Gravity.cs | 1 + Assets/Scripts/Jump.cs | 58 ++++++++---- Assets/Scripts/MainCamera.cs | 29 ++++++ Assets/Scripts/MainCamera.cs.meta | 12 +++ Assets/Sprites/mm.png.meta | 83 +++++++----------- ProjectSettings/TagManager.asset | Bin 4340 -> 4348 bytes 14 files changed, 142 insertions(+), 86 deletions(-) create mode 100644 Assets/Animations/Jump0.anim create mode 100644 Assets/Animations/Jump0.anim.meta rename Assets/{Sprites => Animations}/Shooting.anim (100%) rename Assets/{Sprites => Animations}/Shooting.anim.meta (100%) create mode 100644 Assets/Scripts/MainCamera.cs create mode 100644 Assets/Scripts/MainCamera.cs.meta diff --git a/Assets/Animations/Jump0.anim b/Assets/Animations/Jump0.anim new file mode 100644 index 0000000000000000000000000000000000000000..7c479fe34c7aa5483a9e54e6893942237aac24c2 GIT binary patch literal 9152 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 literal 0 HcmV?d00001 diff --git a/Assets/Animations/Jump0.anim.meta b/Assets/Animations/Jump0.anim.meta new file mode 100644 index 0000000..12e486b --- /dev/null +++ b/Assets/Animations/Jump0.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a078ad8c97314a34d9ecd3e37dae2156 +timeCreated: 1446945210 +licenseType: Free +NativeFormatImporter: + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Shooting.anim b/Assets/Animations/Shooting.anim similarity index 100% rename from Assets/Sprites/Shooting.anim rename to Assets/Animations/Shooting.anim diff --git a/Assets/Sprites/Shooting.anim.meta b/Assets/Animations/Shooting.anim.meta similarity index 100% rename from Assets/Sprites/Shooting.anim.meta rename to Assets/Animations/Shooting.anim.meta diff --git a/Assets/Animations/megaman.controller b/Assets/Animations/megaman.controller index 4769ef162266f4e512186ed0a88235598f7b5ef2..effaa31fa9abf404e159275853e71383a16fb6b3 100644 GIT binary patch delta 119 zcmdlGupwXrkK*JD3LKL~6jdf0DDiA|QQW}FeD=(l$=}tc`%QCZV7TGL00oO8Cb2=7 jVlK$yw~CR)Q-FFPVAY0+Q1u{lQk*9rRFIndP2CCrY6BbC delta 102 zcmdlGupwXrk0SGfTV0d+6*VV!DDrG}QQW}F%)rnv`McV5GX@~|-~=K;U{S;*HVA8) bGqU)tVr20G=g9%eVoX5lpn}xoZ|YV6m@yfz diff --git a/Assets/Scenes/XavierScene.unity b/Assets/Scenes/XavierScene.unity index 974c0287c7013a1634ca90c17cefed20073b9558..863334739456f3e445f620a7810f68ce0ddba8ea 100644 GIT binary patch delta 1352 zcmZWoe@t6-5Wn{*-2=+NiJ_|_l-MPjFqC#vW=s2Cfzpm&o%=~b7P_@IC@W2eZYUd7 zvkgn!(3{EHWy^+(GxHC?M&qV4%pb%!*t%>cF4-7L49@V6kw2E8)cd~osst~&-22|= zdv~9Aci;KAx7Zs0j9Cit31 z&jCc84lD9hktjMzsFo_hj6E_ClFE1mT(~8Zw2C&?mhb8^{0DV zS6*Lp((vpY6d!YV1CwRv+i$Eskv(qg*RqVxf2%q0lah71rJ0lW1e2L7Mc(>qU-3gh z%Lp9c01lERLz+%ApI*ftlG9IT##W2WTXJwX90q;lLpq9bts9OJtYkJfdRZ zEP!$V{J{Dce>Mv*TMd0F#RY8?(x#SqTfNR|zf1liS(P#|6+21Ta(V-qxNHC~#jv)~ zKFD%^vXij|FJUaFN)Mm2 ze+9tJ|1!(Xe6uTmC%K?q0N6^FEn!5i4RBb+J|}E>^&=`Kvxcgo$)E%c}g)fQl970o0P8J&_2|WJn4lZ^%8| znTOY_4g61e_&b@X4z>1%RlV;uPdOI0Hw{ac8Dl}t$}GSpyCHedzJqUMWf?annWd6P zK3kCyztaKD%yJXU^%|+WLy~g#~ zpI0!oNsoS4If@RAf=qkZHJvcGxyt_Gsc)?mXXLc_qqrp}vj_vpGO3cw6`gDY0H#H3 zb9UHq)$ delta 1032 zcmY+Cdq~q!6vxl~wdLB3X05WRwQ9(WkTojIv^|>5O=ly;A_@%FB2t^n9)Cpn$eIki6d0#P>S&s3@3Aqf<@SIk-4S-xGB!xL;?}^zOOiwTxcc6>n2wp6q$%? zs<~__ey5||lLDA1%^+B$MCI=3o5+P>VnZ}fE>R`2fvErm#Q5j&@yRr*MW&Adu#(Sz z2%n$^I3ltG#CRS5M|{B1C!$d!!cYuuHmTD!^k5AX?iVa_rek7C4>32z>4tw>;*Zvy zhIdHrpY~q~N(49|rVJAMcQk4t4W+MAxPeZN^UZ3mNsj3>xfEDv&PjgyV$RW!D#>#0 zS({bkemNx~xq0(^|Kqm#S(g(6IcNPll)-NER*p$=YgT@+GiwQxdo6s^eh=(2 0.0) { - thingsToMove.Translate(new Vector2(mouvement * speed, 0)); - transform.eulerAngles = new Vector2(0, 0); + thingsToMove.Translate(new Vector2(mouvement * speed, 0)); // bouger le player + eulerAngle = 0; } // if @@ -40,11 +36,11 @@ public class Control : MonoBehaviour { if (mouvement < 0.0) { - thingsToMove.Translate(new Vector2(-(mouvement * speed), 0)); - transform.eulerAngles = new Vector2(0, 180); + thingsToMove.Translate(new Vector2(-(mouvement * speed), 0)); // bouger le player + eulerAngle = 180; } // if - + transform.eulerAngles = new Vector3(0, eulerAngle, 0); // gauche = sprite effet miroir, droite = sprite normal } } diff --git a/Assets/Scripts/Gravity.cs b/Assets/Scripts/Gravity.cs index 3d73f18..c96c1db 100644 --- a/Assets/Scripts/Gravity.cs +++ b/Assets/Scripts/Gravity.cs @@ -4,6 +4,7 @@ using System.Collections; public class Gravity : MonoBehaviour { public Character player; + void Start() { player = new Character(1, 10, 10, false); diff --git a/Assets/Scripts/Jump.cs b/Assets/Scripts/Jump.cs index 617a8f5..0b6b140 100644 --- a/Assets/Scripts/Jump.cs +++ b/Assets/Scripts/Jump.cs @@ -3,34 +3,58 @@ using System.Collections; public class Jump : MonoBehaviour { - public int timeJump; + public Rigidbody2D player; // le player + + public float playerSpeedY; // la vitesse de saut + + private bool isOnGround; // somme nous sur le sol? - public Transform player; - private bool isJumping; // Use this for initialization void Start () { - isJumping = false; - timeJump = 0; + isOnGround = false; } // Update is called once per frame void Update () { - if (Input.GetButton("Fire1") && isJumping == false) + if (Input.GetButton("Fire1") && isOnGround == true) { - timeJump = 10; - isJumping = true; + player.velocity = new Vector2(player.velocity.x, playerSpeedY); } - if (timeJump > 0) { - player.Translate(0, 0.4f, 0); - timeJump--; - } - else - { - isJumping = false; - } - } + + + void OnTriggerStay2D(Collider2D other) + { + if (other.gameObject.tag == "Floor") + { + isOnGround = true; + } + + } + + + void OnTriggerEnter2D(Collider2D other) + { + if (other.gameObject.tag == "Floor") + { + isOnGround = true; + } + } + + + void OnTriggerExit2D(Collider2D other) + { + if (other.gameObject.tag == "Floor") + { + + isOnGround = false; + } + + } + + + } diff --git a/Assets/Scripts/MainCamera.cs b/Assets/Scripts/MainCamera.cs new file mode 100644 index 0000000..072bf89 --- /dev/null +++ b/Assets/Scripts/MainCamera.cs @@ -0,0 +1,29 @@ +using UnityEngine; +using System.Collections; + +public class MainCamera : MonoBehaviour { + + // le player + public Rigidbody2D player; + + private float positionPlayerX; // position du player en X + private float positionPlayerY; // // position du player en Y + + + // Use this for initialization + void Start () { + + } + + // Update is called once per frame + void Update () { + + // definir la position du player + positionPlayerX = player.GetComponent().position.x; + positionPlayerY = player.GetComponent().position.y; + + // ajuster la camera selon la position du player + transform.position = new Vector3(positionPlayerX, positionPlayerY + 3.5F, -10); + + } +} diff --git a/Assets/Scripts/MainCamera.cs.meta b/Assets/Scripts/MainCamera.cs.meta new file mode 100644 index 0000000..784dd5e --- /dev/null +++ b/Assets/Scripts/MainCamera.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: c729e4edf3bf65d4fa14333e02f090e0 +timeCreated: 1446932586 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/mm.png.meta b/Assets/Sprites/mm.png.meta index d08f2e5..c7b9908 100644 --- a/Assets/Sprites/mm.png.meta +++ b/Assets/Sprites/mm.png.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: 14370da66867eeb479e470bd4bb068f7 -timeCreated: 1446690230 +timeCreated: 1446945412 licenseType: Free TextureImporter: fileIDToRecycleName: @@ -22,6 +22,7 @@ TextureImporter: 21300030: Jumping3 21300032: Jumping4 21300034: Shooting + 21300036: Jump3 serializedVersion: 2 mipmaps: mipMapMode: 0 @@ -148,56 +149,6 @@ TextureImporter: alignment: 0 pivot: {x: .5, y: .5} border: {x: 0, y: 0, z: 0, w: 0} - - name: Jumping0 - rect: - serializedVersion: 2 - x: 261 - y: 13 - width: 16 - height: 24 - alignment: 0 - pivot: {x: .5, y: .5} - border: {x: 0, y: 0, z: 0, w: 0} - - name: Jumping1 - rect: - serializedVersion: 2 - x: 313 - y: 13 - width: 12 - height: 24 - alignment: 0 - pivot: {x: .5, y: .5} - border: {x: 0, y: 0, z: 0, w: 0} - - name: Jumping2 - rect: - serializedVersion: 2 - x: 361 - y: 13 - width: 17 - height: 24 - alignment: 0 - pivot: {x: .5, y: .5} - border: {x: 0, y: 0, z: 0, w: 0} - - name: Jumping3 - rect: - serializedVersion: 2 - x: 408 - y: 13 - width: 21 - height: 24 - alignment: 0 - pivot: {x: .5, y: .5} - border: {x: 0, y: 0, z: 0, w: 0} - - name: Jumping4 - rect: - serializedVersion: 2 - x: 458 - y: 13 - width: 21 - height: 24 - alignment: 0 - pivot: {x: .5, y: .5} - border: {x: 0, y: 0, z: 0, w: 0} - name: Shooting rect: serializedVersion: 2 @@ -208,6 +159,36 @@ TextureImporter: alignment: 0 pivot: {x: .5, y: .5} border: {x: 0, y: 0, z: 0, w: 0} + - name: Jump0 + rect: + serializedVersion: 2 + x: 357 + y: 107 + width: 25 + height: 30 + alignment: 0 + pivot: {x: .5, y: .5} + border: {x: 0, y: 0, z: 0, w: 0} + - name: Jump1 + rect: + serializedVersion: 2 + x: 412 + y: 123 + width: 16 + height: 17 + alignment: 0 + pivot: {x: .5, y: .5} + border: {x: 0, y: 0, z: 0, w: 0} + - name: Jump3 + rect: + serializedVersion: 2 + x: 461 + y: 112 + width: 16 + height: 22 + alignment: 0 + pivot: {x: .5, y: .5} + border: {x: 0, y: 0, z: 0, w: 0} spritePackingTag: userData: assetBundleName: diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 071b29be008372a4be6261a4d5d64d187377f276..10ae0c190bf3e64d966a05268299e6a2a3ad6f00 100644 GIT binary patch delta 60 zcmeyO_(xHafr0541B1XH1_lOxAPuA#7)