zoriya/Goulag-Prototype
1
0
Fork 0
mirror of https://github.com/zoriya/Goulag-Prototype.git synced 2025-12-06 06:36:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Assets/Script/PlayerController.cs

Browse Source
This commit is contained in:
Anonymous Raccoon
2018-10-06 22:50:40 +02:00
parent 99169b6160
commit 7017f241d7
1 changed files with 21 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

131
Assets/Script/PlayerController.cs
View File

@@ -1,6 +1,5 @@
using UnityEngine;
public class PlayerController : MonoBehaviour
{
Rigidbody2D rb2;
@@ -18,98 +17,54 @@ public class PlayerController : MonoBehaviour
private bool IsGrounded = true;
RaycastHit2D hit;
SpriteRenderer rend;
bool flip_flop = false;
private Vector2 _lastpos = Vector2.zero;
public string Horizontal = "Horizontal";
public string Vertical = "Vertical";
<<<<<<< HEAD
void Start() {
=======
// Use this for initialization
void Start ()
{
<<<<<<< HEAD
>>>>>>> 26f285ae27df3e2756e31ec432f0687368a8cfcb
=======
>>>>>>> 26f285ae27df3e2756e31ec432f0687368a8cfcb
rb2 = gameObject.GetComponent<Rigidbody2D>();
layerMask = ~layerMask;
rend = gameObject.GetComponent<SpriteRenderer>();
_lastpos = transform.position;
}
<<<<<<< HEAD
void Update() {
=======
// Update is called once per frame
void Update ()
{
<<<<<<< HEAD
>>>>>>> 26f285ae27df3e2756e31ec432f0687368a8cfcb
DectectInput();
}
<<<<<<< HEAD
#region
void OnCollisionStay2D(Collision2D other)
{
if (other.transform != null && hit.transform != null)
=======
=======
DectectInput();
}
>>>>>>> 26f285ae27df3e2756e31ec432f0687368a8cfcb
void OnCollisionStay2D(Collision2D other)
{
if (other.transform != null && hit.transform !=null)
>>>>>>> 26f285ae27df3e2756e31ec432f0687368a8cfcb
{
if (other.transform.name == hit.transform.name)
{
IsGrounded = true;
<<<<<<< HEAD
<<<<<<< HEAD
}
}
}
=======
}
}
}
>>>>>>> 26f285ae27df3e2756e31ec432f0687368a8cfcb
=======
}
}
}
>>>>>>> 26f285ae27df3e2756e31ec432f0687368a8cfcb
void DectectInput()
{
float horizontal = Input.GetAxisRaw(Horizontal) * sensiX;
float horizontal = Input.GetAxisRaw("Horizontal")*sensiX;
float rawtical = Input.GetAxisRaw("Vertical")*sensiY;
float rawtical = Input.GetAxisRaw(Vertical) * sensiY;
switch (Mathf.RoundToInt(Input.GetAxisRaw(Vertical)))
switch (Mathf.RoundToInt(Input.GetAxisRaw("Vertical")))
{
case 1:
vertical = 1 * sensiY;
break;
case -1:
break;
case 0:
vertical = 0;
break;
default:
@@ -117,32 +72,18 @@ public class PlayerController : MonoBehaviour
break;
}
hit = Physics2D.Raycast(transform.position, Vector2.down, DownDetector, layerMask);
<<<<<<< HEAD
//if( transform.position.y < _lastpos.y)
//{
// rb2.gravityScale = echo_act_3;
//}
//else
//{
// rb2.gravityScale = 1;
//}
//_lastpos = transform.position;
if (hit.collider == null)
<<<<<<< HEAD
{
IsGrounded = false;
}
if (IsGrounded == false)
{
=======
if(hit.collider == null)
{
IsGrounded = false;
}
if (IsGrounded == false)
{
>>>>>>> 26f285ae27df3e2756e31ec432f0687368a8cfcb
=======
hit = Physics2D.Raycast(transform.position, Vector2.down, DownDetector, layerMask);
if(hit.collider == null)
@@ -153,10 +94,9 @@ public class PlayerController : MonoBehaviour
if (IsGrounded == false)
{
>>>>>>> 26f285ae27df3e2756e31ec432f0687368a8cfcb
vertical = 0;
}
Move(horizontal, vertical);
@@ -181,50 +121,21 @@ public class PlayerController : MonoBehaviour
if (horizontal > 0)
{
rend.flipX = true;
<<<<<<< HEAD
<<<<<<< HEAD
} else if (horizontal < 0)
=======
}
else if (horizontal < 0)
>>>>>>> 26f285ae27df3e2756e31ec432f0687368a8cfcb
=======
}
else if (horizontal < 0)
>>>>>>> 26f285ae27df3e2756e31ec432f0687368a8cfcb
{
rend.flipX = false;
}
if (vertical > 0)
if(vertical > 0)
{
rend.flipY = true;
rend.flipY = true;
}
else
{
rend.flipY = false;
}
<<<<<<< HEAD
<<<<<<< HEAD
rb2.AddForce(new Vector2(horizontal, vertical) * Time.deltaTime, ForceMode2D.Impulse);
}
#endregion
public void Die()
{
Debug.Log("Belle journée pour mourir");
}
=======
rb2.AddForce(new Vector2(horizontal, vertical)*Time.deltaTime, ForceMode2D.Impulse);
}
>>>>>>> 26f285ae27df3e2756e31ec432f0687368a8cfcb
=======
rb2.AddForce(new Vector2(horizontal, vertical)*Time.deltaTime, ForceMode2D.Impulse);
}
>>>>>>> 26f285ae27df3e2756e31ec432f0687368a8cfcb
}