diff --git a/android/assets/win.png b/android/assets/win.png new file mode 100644 index 0000000..40d2bee Binary files /dev/null and b/android/assets/win.png differ diff --git a/core/src/controller/Controller.java b/core/src/controller/Controller.java index 318994d..3191bb1 100644 --- a/core/src/controller/Controller.java +++ b/core/src/controller/Controller.java @@ -129,10 +129,10 @@ public class Controller extends ApplicationAdapter implements InputProcessor{ } } else if(ws != null){ - if(x < Gdx.graphics.getWidth() * 0.25){ + if(x < Gdx.graphics.getWidth() * 0.33){ ls = new Levelscreen(levelAmount); } - else if(x < Gdx.graphics.getWidth() * 0.75){ + else if(x < Gdx.graphics.getWidth() * 0.66){ gs = new Gamescreen(level); } else{ diff --git a/core/src/view/Winscreen.java b/core/src/view/Winscreen.java index 2ef28eb..5ee8b29 100644 --- a/core/src/view/Winscreen.java +++ b/core/src/view/Winscreen.java @@ -25,25 +25,40 @@ public class Winscreen{ Sprite level; Sprite next; + Sprite win; + boolean movement; + public Winscreen(){ t = new Timer(); - + /* + movement = true; + win = new Sprite(new Texture(Gdx.files.internal("win.png"))); + win.setX(Gdx.graphics.getWidth() / 2 - win.getWidth() / 2); + win.setY(Gdx.graphics.getHeight() * 0.7f - win.getHeight() / 2); + */ int w = Gdx.graphics.getWidth(); int h = Gdx.graphics.getHeight(); next = new Sprite(new Texture("skipicon.png")); - next.setPosition(w * 0.75f - next.getWidth()/2, h/2 - next.getHeight()/4); + next.setPosition(w * 0.75f - next.getWidth()/2, h*0.35f - next.getHeight()/2); level = new Sprite(new Texture("levelicon.png")); - level.setPosition(w * 0.25f - level.getWidth()/2, h/2 - level.getHeight()/4); + level.setPosition(w * 0.25f - level.getWidth()/2, h*0.35f - level.getHeight()/2); reset = new Sprite(new Texture("reseticon.png")); - reset.setPosition(w/2 - reset.getWidth()/2, h/2 - reset.getHeight()/2); + reset.setPosition(w/2 - reset.getWidth()/2, h*0.35f - reset.getHeight()/2); t.scheduleTask(new Timer.Task() { @Override public void run() { - + /*if(win.getY() < Gdx.graphics.getHeight()*0.8) + movement = true; + else if(win.getY() > Gdx.graphics.getHeight() * 0.7) + movement = false; + if(movement) + win.setY(win.getY() + 3); + else + win.setY(win.getY() - 3);*/ } },0 , 0.035f); @@ -54,6 +69,7 @@ public class Winscreen{ next.draw(batch); level.draw(batch); reset.draw(batch); + //win.draw(batch); } public void dispose() { t.clear();