v1.2.1: fixed an error with new game over buttons and re-final commit
This commit is contained in:
+1
-1
@@ -14,7 +14,7 @@ allprojects {
|
|||||||
appName = 'Shattered Pixel Dungeon'
|
appName = 'Shattered Pixel Dungeon'
|
||||||
appPackageName = 'com.shatteredpixel.shatteredpixeldungeon'
|
appPackageName = 'com.shatteredpixel.shatteredpixeldungeon'
|
||||||
|
|
||||||
appVersionCode = 612
|
appVersionCode = 614
|
||||||
appVersionName = '1.2.1'
|
appVersionName = '1.2.1'
|
||||||
|
|
||||||
appJavaCompatibility = JavaVersion.VERSION_1_8
|
appJavaCompatibility = JavaVersion.VERSION_1_8
|
||||||
|
|||||||
@@ -1190,7 +1190,7 @@ public class GameScene extends PixelScene {
|
|||||||
|
|
||||||
public static void gameOver() {
|
public static void gameOver() {
|
||||||
Banner gameOver = new Banner( BannerSprites.get( BannerSprites.Type.GAME_OVER ) );
|
Banner gameOver = new Banner( BannerSprites.get( BannerSprites.Type.GAME_OVER ) );
|
||||||
gameOver.show( 0x000000, 1f );
|
gameOver.show( 0x000000, 2f );
|
||||||
scene.showBanner( gameOver );
|
scene.showBanner( gameOver );
|
||||||
|
|
||||||
StyledButton restart = new StyledButton(Chrome.Type.GREY_BUTTON_TR, Messages.get(StartScene.class, "new"), 9){
|
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
|
@Override
|
||||||
public void update() {
|
public void update() {
|
||||||
bg.alpha(gameOver.am);
|
alpha(gameOver.am);
|
||||||
icon.alpha(gameOver.am);
|
super.update();
|
||||||
text.alpha(gameOver.am);
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
restart.camera = uiCamera;
|
|
||||||
restart.icon(Icons.get(Icons.ENTER));
|
restart.icon(Icons.get(Icons.ENTER));
|
||||||
|
restart.alpha(0);
|
||||||
|
restart.camera = uiCamera;
|
||||||
float offset = Camera.main.centerOffset.y;
|
float offset = Camera.main.centerOffset.y;
|
||||||
restart.setSize(Math.max(80, restart.reqWidth()), 20);
|
restart.setSize(Math.max(80, restart.reqWidth()), 20);
|
||||||
restart.setPos(
|
restart.setPos(
|
||||||
@@ -1227,13 +1227,13 @@ public class GameScene extends PixelScene {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void update() {
|
public void update() {
|
||||||
bg.alpha(gameOver.am);
|
alpha(gameOver.am);
|
||||||
icon.alpha(gameOver.am);
|
super.update();
|
||||||
text.alpha(gameOver.am);
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
menu.camera = uiCamera;
|
|
||||||
menu.icon(Icons.get(Icons.PREFS));
|
menu.icon(Icons.get(Icons.PREFS));
|
||||||
|
menu.alpha(0);
|
||||||
|
menu.camera = uiCamera;
|
||||||
menu.setSize(Math.max(80, menu.reqWidth()), 20);
|
menu.setSize(Math.max(80, menu.reqWidth()), 20);
|
||||||
menu.setPos(
|
menu.setPos(
|
||||||
align(uiCamera, (menu.camera.width - menu.width()) / 2),
|
align(uiCamera, (menu.camera.width - menu.width()) / 2),
|
||||||
|
|||||||
Reference in New Issue
Block a user