Commit cf47262f authored by Christopher Benes's avatar Christopher Benes
Browse files

Merge branch 'master' into feature/Level

parents c1097a51 56b73fa7
......@@ -19,7 +19,7 @@ public class GameManager : SingletonBehaviour<GameManager> {
public bool IsChallengerModeEnabled { get; set; }
private void Awake() {
IsChallengerModeEnabled = true;
IsChallengerModeEnabled = false;
IsInLevel = false;
HighestLevel = 1;
......
......@@ -36,8 +36,13 @@ public class LevelSelectController : MonoBehaviour {
button.SetActive(false);
// Deactivates NextPageButton because there isnt' a next page
GameObject nextPage = button.transform.parent.Find("ButtonNextPage").gameObject;
nextPage.SetActive(false);
if (button.transform.parent.Find("ButtonNextPage") != null)
{
GameObject nextPage = button.transform.parent.Find("ButtonNextPage").gameObject;
nextPage.SetActive(false);
}
// Next page can't be opened so buttons on it don't have to be changed
if (i % 6 == 0)
......
......@@ -38,6 +38,7 @@ public class TimedToggle : MonoBehaviour, IResetable {
public void ResetToLevelBegin() {
state = isActive;
time = 0;
onStateChange.Invoke(isActive);
}
}
......@@ -50,7 +50,7 @@ TextureImporter:
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
spriteTessellationDetail: 0
textureType: 8
textureShape: 1
singleChannelComponent: 0
......@@ -104,7 +104,7 @@ TextureImporter:
- {x: 71, y: 121}
- {x: 110, y: 128}
bones: []
spriteID:
spriteID: f80149b14f1be55458997e569d2c62f8
vertices: []
indices:
edges: []
......
......@@ -83,7 +83,15 @@ TextureImporter:
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
outline:
- - {x: 74, y: 126}
- {x: 2, y: 98}
- {x: -43, y: 67}
- {x: -92, y: 9}
- {x: -120, y: -59}
- {x: -128, y: -128}
- {x: 128, y: -128}
- {x: 128, y: 128}
physicsShape:
- - {x: -85, y: 21}
- {x: -120, y: -52}
......
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