From 863a220ff2951816b3508f0851660d788ae23317 Mon Sep 17 00:00:00 2001 From: GammelJan Date: Thu, 4 Jun 2020 00:39:28 +0200 Subject: [PATCH] giasejgioserjhioseajrohi --- android/assets/win.png | Bin 0 -> 1903 bytes core/src/controller/Controller.java | 4 ++-- core/src/view/Winscreen.java | 26 +++++++++++++++++++++----- 3 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 android/assets/win.png diff --git a/android/assets/win.png b/android/assets/win.png new file mode 100644 index 0000000000000000000000000000000000000000..40d2bee77b30467f5c7cdde50d6d35fccc18b684 GIT binary patch literal 1903 zcmXX`2|SePAAjb22jivOnW>RBc5`)_h8TuLty!_V<%%51x?UQwj`l@z=1AL?#=4_F zW@`(>+8X*J|B7kb7BSN}QxtNxL-wWr=lwj#=llN7=lOo03>U70vf>s+0D!WSqn#@N zI3c#bOCe+P_>Tt@Fd#LU!*Oxqa2QBb#HrxWKmZK$6Y~!_K48<@ecbA|8^fBLHg&la z8Kq}34{K!kmfqFyh&F4Q=bZjCuR_RF6p$cm%^KLGyO||aOqN0E1?2^0S(lgZSBSTF zq>P+v`F%+k4^bBOxIM{>zk#azE09Wi<2nR=(4d zO=%hJe!7ps9v{AN*wUVM^qY(CQ)?e7zB2CqzUhC3OQWXL@%piSy}__vj{T0j^Aw$L zLrbViM?LntepPYWdVFXbZ^bF9YxD)s@3j2FMepFb8S7<9o%>ZjQjom6WUjrz`b$(~ zBChUVT)G`*&IN0Gk;?j&pIBydPH}aW_Bp6DOg7wH*%dDugUx0tj$9aZJXdI23R;Sv znvbFPJWGO}zpZP^eFiZ&-o_FDrHM}G|JG|Ml}Mxm_k#*oR{_T`>azRJdqvp2ko}H0 z*nze6ujG%a0t`_=9No_VV4}Z1aIuxvXE6}sIXT-yqhx|6;~*@3u^EGOc=pG6oQSZn zz;GVmLnZwtb8H7k!N z(D`@*iu(KIS)c$9gLhQslHBFzRfUsueu!DE1!Ip)-L*%BAp>j?&g=_W!ov%3Q%5Lo zWv=(L>g#OWG=0`q^(kh==^C*X=gmh$3g1>PmuWWYjZ;Kh);i7NeTxc z%qufV>XS<1Rvd~x`^+VGIs)+%_4`r~HiS8F)6i%Vg=w#jju5(In8XhYQx=#hn=6W* zQswQ(BGRl-|Jn=oB?IP}lIA_;r6IaJ1TbX33GoC~#Fj8g5gw2wXt87YJyrxd4N#cg zR1_ruT$M%H9L?RDAv?DW1ZdP&xzdIoP(_TJ$om{X8j(LuOw4R4Aj|gZ8 zFp4>@hJd!I+Txgy2?eI0&rUGJFcn*UurRG7)pRkUgR^Q9e;jy{U+>AIP7O?Ul)bTD zWF;z3$N(=S#%d(k#y|#$o&n+yxzavf-tEq_(|KCR@2{3`OIHe6kCov(14wepzl?(B z7)16omk|-)tc0&|Ki}!QvK#MxJw_8L5W13~*ZI?H!6IWd6_{Qf`BSG2l;({4J7P4J zBFt`Y%+{zjr3f>;GLjHo^8+u5{4#|_<+i#h?J!Lu>T%_vM&MeiF#DQcQlVc9aWFv8 z!4_WJ(ilPDJ|)UYL*M;*D*x_@JjI>Wo-Nv(W0wtSD4etSA6`N-q>9K8TtXBg4IONt zrzb1SX!VF^j;`RWEL1xaY-0t+vAJP_8-9JU zjT?5=w6;no#1jfC2aBN zA;1&575F4QnDk{VM+)>Qa*I+#Al2g(ies zWrGQsYVs#8>N5x5Q$ZqL;M&To8xsw&*QG+FO}xW+>ih9%WsOO1IEtpU78Ryo>DI(V zuuf%RUXEb++ul7s*smXw#^t&c;U$ud7RG)a#KHlb!GJvaad5`Hxr+L)48c;r_+a19W~H{Hd+x2vtN;Wn3AX oS^q!Ydr4PO&tJYqz)G&qp$~U+ii2kP*s}|q?74OVTi@h=0b2niPXGV_ literal 0 HcmV?d00001 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();