Commit 719792bc authored by Christopher Benes's avatar Christopher Benes

Merge branch 'master' of gitlab.fsi.hochschule-trier.de:GameDevWeek/ws-18_19/unity/suck-it

parents 996ace14 b15dcd95
Pipeline #3065 waiting for manual action with stages
in 8 minutes and 31 seconds
...@@ -39,9 +39,7 @@ public class Life : MonoBehaviour { ...@@ -39,9 +39,7 @@ public class Life : MonoBehaviour {
if (gameObject.CompareTag("Player")) if (gameObject.CompareTag("Player"))
{ {
SceneManager.LoadScene("MainLevel"); SceneManager.LoadScene("MainLevel");
//gameObject.SetActive(false);
Heal(3); Heal(3);
Debug.Log("Death");
return; return;
} }
......
...@@ -158,7 +158,6 @@ public class MovementController : MonoBehaviour ...@@ -158,7 +158,6 @@ public class MovementController : MonoBehaviour
m_Grounded = false; m_Grounded = false;
m_TempJumpCount--; m_TempJumpCount--;
if (r_State.GetCurrentElement() == InfusedElement.Air) r_State.ChangeCharges(-1); if (r_State.GetCurrentElement() == InfusedElement.Air) r_State.ChangeCharges(-1);
print("AirJump: Charges left = " + m_TempJumpCount);
m_Rigidbody2D.velocity = Vector2.up * m_JumpForce; m_Rigidbody2D.velocity = Vector2.up * m_JumpForce;
OnJumpEvent.Invoke(); OnJumpEvent.Invoke();
StartCoroutine(Wait(m_SecondsWaitToJump)); StartCoroutine(Wait(m_SecondsWaitToJump));
......
...@@ -74,7 +74,6 @@ public class PlayerAnimation : MonoBehaviour ...@@ -74,7 +74,6 @@ public class PlayerAnimation : MonoBehaviour
switch (r_State.GetCurrentElement()) switch (r_State.GetCurrentElement())
{ {
case InfusedElement.None: case InfusedElement.None:
print("RESET");
if(m_ScalingActive)ScaleReset(); if(m_ScalingActive)ScaleReset();
if (m_RotationActive) if (m_RotationActive)
...@@ -85,7 +84,6 @@ public class PlayerAnimation : MonoBehaviour ...@@ -85,7 +84,6 @@ public class PlayerAnimation : MonoBehaviour
break; break;
case InfusedElement.Air: case InfusedElement.Air:
print("AIR");
m_CurrentAirCharges = r_State.GetCharges(); m_CurrentAirCharges = r_State.GetCharges();
if (m_ScalingActive) if (m_ScalingActive)
{ {
......
...@@ -143,7 +143,6 @@ namespace _Game.Scripts.Player ...@@ -143,7 +143,6 @@ namespace _Game.Scripts.Player
{ {
if (other.gameObject.layer != LayerMask.NameToLayer("Elements")) return; if (other.gameObject.layer != LayerMask.NameToLayer("Elements")) return;
print("Entered Collider of " + other.name);
_currentObject = other.gameObject; _currentObject = other.gameObject;
_targetScript = _currentObject.GetComponent<InteractionObject>(); _targetScript = _currentObject.GetComponent<InteractionObject>();
} }
...@@ -153,7 +152,6 @@ namespace _Game.Scripts.Player ...@@ -153,7 +152,6 @@ namespace _Game.Scripts.Player
if (other.gameObject.layer != LayerMask.NameToLayer("Elements")) return; if (other.gameObject.layer != LayerMask.NameToLayer("Elements")) return;
if (other.gameObject != _currentObject) return; if (other.gameObject != _currentObject) return;
print("Exited Collider of " + other.name);
_currentObject = null; _currentObject = null;
_targetScript = null; _targetScript = null;
} }
......
...@@ -13,7 +13,7 @@ public class SavePoint : MonoBehaviour ...@@ -13,7 +13,7 @@ public class SavePoint : MonoBehaviour
public Button button; public Button button;
private Animator anim; private Animator anim;
private void Start() private void Awake()
{ {
isUsed = false; isUsed = false;
button.interactable = false; button.interactable = false;
......
...@@ -30,7 +30,6 @@ public class SaveSystem ...@@ -30,7 +30,6 @@ public class SaveSystem
FileStream stream = new FileStream(path, FileMode.Open); FileStream stream = new FileStream(path, FileMode.Open);
SavePointData data = formatter.Deserialize(stream) as SavePointData; SavePointData data = formatter.Deserialize(stream) as SavePointData;
Debug.Log(data.savePointIsActiv);
if (data.savePointIsActiv != null) if (data.savePointIsActiv != null)
{ {
SavePointList.spl.SetIsActivList(data.savePointIsActiv); SavePointList.spl.SetIsActivList(data.savePointIsActiv);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment