diff --git a/build.gradle b/build.gradle index 882042fd6..d58b5cd22 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ allprojects { appName = 'Shattered Pixel Dungeon' appPackageName = 'com.shatteredpixel.shatteredpixeldungeon' - appVersionCode = 612 + appVersionCode = 614 appVersionName = '1.2.1' appJavaCompatibility = JavaVersion.VERSION_1_8 diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java index a6a36fa95..3899c5fe8 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java @@ -1190,7 +1190,7 @@ public class GameScene extends PixelScene { public static void gameOver() { Banner gameOver = new Banner( BannerSprites.get( BannerSprites.Type.GAME_OVER ) ); - gameOver.show( 0x000000, 1f ); + gameOver.show( 0x000000, 2f ); scene.showBanner( gameOver ); StyledButton restart = new StyledButton(Chrome.Type.GREY_BUTTON_TR, Messages.get(StartScene.class, "new"), 9){ @@ -1204,13 +1204,13 @@ public class GameScene extends PixelScene { @Override public void update() { - bg.alpha(gameOver.am); - icon.alpha(gameOver.am); - text.alpha(gameOver.am); + alpha(gameOver.am); + super.update(); } }; - restart.camera = uiCamera; restart.icon(Icons.get(Icons.ENTER)); + restart.alpha(0); + restart.camera = uiCamera; float offset = Camera.main.centerOffset.y; restart.setSize(Math.max(80, restart.reqWidth()), 20); restart.setPos( @@ -1227,13 +1227,13 @@ public class GameScene extends PixelScene { @Override public void update() { - bg.alpha(gameOver.am); - icon.alpha(gameOver.am); - text.alpha(gameOver.am); + alpha(gameOver.am); + super.update(); } }; - menu.camera = uiCamera; menu.icon(Icons.get(Icons.PREFS)); + menu.alpha(0); + menu.camera = uiCamera; menu.setSize(Math.max(80, menu.reqWidth()), 20); menu.setPos( align(uiCamera, (menu.camera.width - menu.width()) / 2),