diff --git a/android/res/drawable-hdpi/ic_launcher.png b/android/res/drawable-hdpi/ic_launcher.png index 91f696b..a5a0a07 100644 Binary files a/android/res/drawable-hdpi/ic_launcher.png and b/android/res/drawable-hdpi/ic_launcher.png differ diff --git a/android/res/drawable-mdpi/ic_launcher.png b/android/res/drawable-mdpi/ic_launcher.png index c1ab239..545ecde 100644 Binary files a/android/res/drawable-mdpi/ic_launcher.png and b/android/res/drawable-mdpi/ic_launcher.png differ diff --git a/android/res/drawable-xhdpi/ic_launcher.png b/android/res/drawable-xhdpi/ic_launcher.png index 2011cc0..817b47c 100644 Binary files a/android/res/drawable-xhdpi/ic_launcher.png and b/android/res/drawable-xhdpi/ic_launcher.png differ diff --git a/android/res/drawable-xxhdpi/ic_launcher.png b/android/res/drawable-xxhdpi/ic_launcher.png index 25fcef0..f5fd6cf 100644 Binary files a/android/res/drawable-xxhdpi/ic_launcher.png and b/android/res/drawable-xxhdpi/ic_launcher.png differ diff --git a/android/res/drawable-xxxhdpi/ic_launcher.png b/android/res/drawable-xxxhdpi/ic_launcher.png index d109946..9ba22a9 100644 Binary files a/android/res/drawable-xxxhdpi/ic_launcher.png and b/android/res/drawable-xxxhdpi/ic_launcher.png differ diff --git a/core/src/controller/Controller.java b/core/src/controller/Controller.java index 29e7afb..3bc2262 100644 --- a/core/src/controller/Controller.java +++ b/core/src/controller/Controller.java @@ -46,7 +46,7 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ boolean isColliding; Level[] level; int currentLevel; - int beatenLevel = 9; + int beatenLevel = 0; OrthographicCamera camera; diff --git a/core/src/view/Winscreen.java b/core/src/view/Winscreen.java index 8d5aea9..53cefa4 100644 --- a/core/src/view/Winscreen.java +++ b/core/src/view/Winscreen.java @@ -28,7 +28,6 @@ public class Winscreen{ Sprite level; Sprite next; - Sprite winSprite; boolean movement; float GAME_WORLD_WIDTH; @@ -50,23 +49,24 @@ public class Winscreen{ this.lvl = lvl; if(win){ - FreeTypeFontGenerator generator = new FreeTypeFontGenerator(Gdx.files.internal("font.ttf")); FreeTypeFontGenerator.FreeTypeFontParameter parameter = new FreeTypeFontGenerator.FreeTypeFontParameter(); parameter.size = 21; font = generator.generateFont(parameter); // font size 12 pixels generator.dispose(); // don't forget to dispose to avoid memory leaks! - font.setColor(Color.BLACK); + font.setColor(Color.BLACK); movementWin = true; - winSprite = new Sprite(new Texture(Gdx.files.internal("win.png"))); - winSprite.setX(GAME_WORLD_WIDTH / 2 - winSprite.getWidth() / 2); - winSprite.setY(GAME_WORLD_HEIGHT * 0.7f - winSprite.getHeight() / 2); + winX = GAME_WORLD_WIDTH /2 - getTextWidth("Level win") / 2; + winY = GAME_WORLD_HEIGHT * 0.85f; } + float w = GAME_WORLD_WIDTH; float h = GAME_WORLD_HEIGHT; + + next = new Sprite(new Texture("skipicon.png")); next.setPosition(w * 0.75f - next.getWidth()/2, h*0.35f - next.getHeight()/2); @@ -79,9 +79,9 @@ public class Winscreen{ t.scheduleTask(new Timer.Task() { @Override public void run() { - if(winY < GAME_WORLD_HEIGHT * 0.7) + if(winY < GAME_WORLD_HEIGHT * 0.8) movementWin = true; - else if(winY > GAME_WORLD_HEIGHT * 0.8) + else if(winY > GAME_WORLD_HEIGHT * 0.9) movementWin = false; if(movementWin) winY = winY + 3; @@ -98,9 +98,9 @@ public class Winscreen{ level.draw(batch); reset.draw(batch); if(win){ - font.getData().setScale(2); - winX = GAME_WORLD_WIDTH / 2 - getTextWidth("click to start ...") / 2; - font.draw(batch, "click to start ...", winX, winY); + font.getData().setScale(8); + winX = GAME_WORLD_WIDTH /2 - getTextWidth("Level win") / 2; + font.draw(batch, "Level win", winX, winY); }