From b6e9fe6b29006bafc905e60ea125d086baba39da Mon Sep 17 00:00:00 2001 From: GammelJAN Date: Fri, 15 May 2020 07:37:58 +0200 Subject: [PATCH] asdf --- core/assets/sprites/skinContainer.png | Bin 1000 -> 1040 bytes .../dungeoncrawler/view/MainMenuScreen.java | 10 +++++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/assets/sprites/skinContainer.png b/core/assets/sprites/skinContainer.png index 976a55bb5a73e3bc255dddec5251a1ddaff92c2e..db61eaafe0f9decf7f0946abdb59be9492273603 100644 GIT binary patch delta 932 zcmaFCK7nI`I9Ch@8v_Hw?0`EzCn_q`M|-^=#Ef8fn$S8h>coG@oJ|BqIF-CS^|B#&s-3Cd6XyS_;p*Gn!VkhbiNnY_f42%F7ZIH zqyG7fWwVb+A2FW2>{#V|i!)w}d}{n`mR)A;l;5dm`RCZqjLp;2+rIi_&9m^)5wVVV zl@NAG^pWPHjx{T$ygzHDQ+)5ynvkqDrT+g8CB(&g7SDYq@F>EG$&+J3fU~6NjE+mI zCM7Aj{x%fL^ByXi~$sQT*6;6#AzYqR@P`=%*KC$SKC)Y8C|J|vzJj{);3nI6# zd7pebYaYYC^aozKzgP1ne4G5GD!N;SvG(?XqovW4zcrkeO?cobTzYX@jmh3trVn*) z_op!b%5R)!x_tXJJ3sjbp3&6g`t7LY4Scsb#`7|wiWBs|4n|ws8Rpi)5S5Q;?~>i2eWQFh_qddH|7&;Z1`|b ze@grL?3BrS169tJ1U@qJy>w)4u*Mu_rpCRyYVJt#mY0|B-8$`B)B|mv!xMtMzWuH( z+xz{@=Q)o*&bYVxWkKQYyL#s4=J)SUUh;ijX{_=2%`XcAw_dvvRe$9B=l;Flb8eSK zHGf!M^}c@j;x9+HRlnb}cI&=h#x=*b<=))(_N?};)epQhckbJF&Z190OtI#g&H0(n zEl+RyW4Gh^TeH68Wtpc;e3u=+DJLg)DatzbyxpCGt=D`mPx<}3`tswP_QQ%xrIZOKk0T~XygN;C{iTR+S1(af8Z*neBuwbbN(Hwk0Wez|JtPGE8k`%W;=wSd` z_`kkj@AohFHtTeQ0wz8=d+pPgFE#u7`z>Yo>eY@!R=u~B>yMnKx_0Z8sQdhSp4)Oy z+nmo_yHrG7?>YPSb+4Z{SKljmy(>+EP58;12lM9h_g_(2ej+M++41j{Ft=Ql|L(*uL2 LtDnm{r-UW|DG<5^ delta 892 zcmbQh@q&GVIF|ONoR|!Qg z#Z59jf?{M?uQxTzcZafzr^m|1usVKVK63J+=S5eqKk-2sf{zat+TXideP=IoOV!Mk zX~$U>WKEmc<9gJmEc8u{D?{xIH-Tm$xLmh#KTzgMz3{rk@R#o;Gs@_gt# zQeW(2uJefZ(M(_O=X?BRl3YC%?bPMWUo;)*kC`4@_c*2?;=xQs<+*dz`2@RL&8FR+ zA<8?oVwT046;e;RC8vv?i=K0}XsYS^lkpN~GPO0=U6yg=@$OJ&6f|0;v5<#bFv>K@ zM=V^ z-`FOt-tb>?$EB!$Ua~X(s_eaX>5#j_f3t$ZyO*BWJ}6?BsJf);T%=;}t2m$i-uV}^ zHyt>jdtvjlZ`bY|f5|*y*}7@@4b9F8YaDLAmV5s$>;2pN#%KT4F(_>;YQNHb@eVNb z*^<27T^Je|oF?yMRA=WD(2@J<=Qa5aqelIHPZ!6Kid%25pY3{VAmI8i`=p|hfWW=q zt)D(r_U3Fd?^?4elBe+h(%p|G%h#V{XLH`9#izQ{dahqynvpT1{leE)tpX-I%~j>$ zny!~kPTrl#XLkMjUcUCj_sczt%FljY6U24-;IgEiF2j9CzW;JB56{kxY(B8R==)QR z+Rbn6>aFvWd*uJ|*eu?86;es+8d@Sq&KvKa1 zMmiKISTsCovC^3M`gjJD^bCku4&5zEDAT;?WmkLpFjNF zzK72$!>*V52&``2ZGT^G<)mpR&h)%|xZfr!!n;6`wfEDrMW(lk`e q(QDaI!~f;5fq~$kuE!r&*uVDcf0?~!QXnv%89ZJ6T-G@yGywow@s5`O diff --git a/core/src/com/dungeoncrawler/view/MainMenuScreen.java b/core/src/com/dungeoncrawler/view/MainMenuScreen.java index c5ad846..bb7b923 100644 --- a/core/src/com/dungeoncrawler/view/MainMenuScreen.java +++ b/core/src/com/dungeoncrawler/view/MainMenuScreen.java @@ -106,10 +106,10 @@ public class MainMenuScreen{ buttonLeft = new Sprite(new Texture("sprites/left.png")); buttonRight = new Sprite(new Texture("sprites/right.png")); - skinContainer.setPosition(800, 400); - buttonLeft.setPosition(skinContainer.getX() + 8, skinContainer.getY()+8); - buttonRight.setPosition(skinContainer.getX() + 110, skinContainer.getY()+8); - playerSprite.setPosition(skinContainer.getX() + 51, skinContainer.getY() + 8); + skinContainer.setPosition(backgroundSprite.getX() + 100, backgroundSprite.getX() + 150); + buttonLeft.setPosition(skinContainer.getX() + 7, skinContainer.getY()+25); + buttonRight.setPosition(skinContainer.getX() + 106, skinContainer.getY()+25); + playerSprite.setPosition(skinContainer.getX() + 50, skinContainer.getY() + 15); preview = new Timer(); preview.scheduleTask(new Timer.Task() { @@ -177,7 +177,7 @@ public class MainMenuScreen{ return -1; } if(Intersector.overlaps(r, buttonRight.getBoundingRectangle())){ - if(shownPlayer < 2){ + if(shownPlayer < playerRegion.length - 1){ shownPlayer++; return 6; }