Commit bba50dbe authored by Jan Meissner's avatar Jan Meissner
Browse files

Merge remote-tracking branch 'origin/master'

parents 0d7d9521 1e7e7f36
This diff is collapsed.
......@@ -644,6 +644,31 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1102423284515974736
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_Name: LevelEnd
m_Speed: 0.5
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: bfe014ce167717e46b454d300077e140, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1102502364957185512
AnimatorState:
serializedVersion: 5
......@@ -788,6 +813,9 @@ AnimatorStateMachine:
- serializedVersion: 1
m_State: {fileID: 1102602661880099160}
m_Position: {x: 612, y: 84, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102423284515974736}
m_Position: {x: 264, y: -60, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
......
......@@ -148,7 +148,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
trackingPoint: {fileID: 1885835505066708}
col: {fileID: 0}
col: {fileID: 61539110044657252}
tilemap: {fileID: 0}
orientation: 0
facing: 1
......
......@@ -7,8 +7,7 @@ public class ChallengerController : MonoBehaviour, IResetable {
private readonly Queue<Location> queue = new Queue<Location>();
[SerializeField] private Collider2D col;
[SerializeField] private SpriteRenderer render;
[SerializeField] private GameObject child;
private int objectsInQueueBuffer;
......@@ -24,8 +23,7 @@ public class ChallengerController : MonoBehaviour, IResetable {
objectsInQueueBuffer = Mathf.CeilToInt(waitTime / Time.fixedDeltaTime);
col.enabled = false;
render.enabled = false;
ResetToLevelBegin();
}
private void FixedUpdate() {
......@@ -34,8 +32,8 @@ public class ChallengerController : MonoBehaviour, IResetable {
rotation = player.transform.rotation
});
col.enabled = IsActive;
render.enabled = IsActive;
child.SetActive(IsActive);
if (IsActive) {
Location l = queue.Dequeue();
transform.position = l.position;
......@@ -46,7 +44,6 @@ public class ChallengerController : MonoBehaviour, IResetable {
public void ResetToLevelBegin() {
queue.Clear();
col.enabled = false;
render.enabled = false;
child.SetActive(false);
}
}
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