diff --git a/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.bin b/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.bin index ebc5fc1..a87d2b5 100644 Binary files a/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.bin and b/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.bin differ diff --git a/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.lock b/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.lock index 464cbe7..03e564d 100644 Binary files a/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.lock and b/Happy_Bird/.gradle/7.1.1/executionHistory/executionHistory.lock differ diff --git a/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.bin b/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.bin index e368a4e..2ff437c 100644 Binary files a/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.bin and b/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.bin differ diff --git a/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.lock b/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.lock index becbcd9..6f77008 100644 Binary files a/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.lock and b/Happy_Bird/.gradle/7.1.1/fileHashes/fileHashes.lock differ diff --git a/Happy_Bird/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/Happy_Bird/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 019071e..2dc509d 100644 Binary files a/Happy_Bird/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/Happy_Bird/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/Happy_Bird/build/classes/java/main/com/example/happy_bird/HappyBirdMain.class b/Happy_Bird/build/classes/java/main/com/example/happy_bird/HappyBirdMain.class index 74f90e5..a04cbbe 100644 Binary files a/Happy_Bird/build/classes/java/main/com/example/happy_bird/HappyBirdMain.class and b/Happy_Bird/build/classes/java/main/com/example/happy_bird/HappyBirdMain.class differ diff --git a/Happy_Bird/build/libs/Happy_Bird-1.0-SNAPSHOT.jar b/Happy_Bird/build/libs/Happy_Bird-1.0-SNAPSHOT.jar index b0e9a30..ab484b4 100644 Binary files a/Happy_Bird/build/libs/Happy_Bird-1.0-SNAPSHOT.jar and b/Happy_Bird/build/libs/Happy_Bird-1.0-SNAPSHOT.jar differ diff --git a/Happy_Bird/build/tmp/compileJava/previous-compilation-data.bin b/Happy_Bird/build/tmp/compileJava/previous-compilation-data.bin index 2afab2f..bffec8e 100644 Binary files a/Happy_Bird/build/tmp/compileJava/previous-compilation-data.bin and b/Happy_Bird/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/Happy_Bird/src/main/java/com/example/happy_bird/FormatingClass.java b/Happy_Bird/src/main/java/com/example/happy_bird/FormatingClass.java index 7c9392e..3d7e469 100644 --- a/Happy_Bird/src/main/java/com/example/happy_bird/FormatingClass.java +++ b/Happy_Bird/src/main/java/com/example/happy_bird/FormatingClass.java @@ -176,7 +176,7 @@ public class FormatingClass { "-fx-alignment: center;"); currentScoreEndscreenLabel.setPrefSize(300,50); - currentScoreEndscreenLabel.setLayoutX(75); + currentScoreEndscreenLabel.setLayoutX(50); currentScoreEndscreenLabel.setLayoutY(100); currentScoreEndscreenLabel.setStyle("-fx-background-color: #DED894; " + "-fx-text-fill: #000000; " + diff --git a/Happy_Bird/src/main/java/com/example/happy_bird/HappyBirdMain.java b/Happy_Bird/src/main/java/com/example/happy_bird/HappyBirdMain.java index eb7e5b3..dae39ff 100644 --- a/Happy_Bird/src/main/java/com/example/happy_bird/HappyBirdMain.java +++ b/Happy_Bird/src/main/java/com/example/happy_bird/HappyBirdMain.java @@ -1042,7 +1042,12 @@ public class HappyBirdMain extends Application { for (Rectangle pipe : pipesArrayList) { pane.getChildren().remove(pipe); } + pipesArrayList.clear(); collectedPoints = 0; + currentScoreLabel.setText("SCORE: " + collectedPoints); + endScreenOpened = false; + openEndScreen = false; + endScreen.getChildren().clear(); startGameButtonClick(); } @@ -1057,6 +1062,7 @@ public class HappyBirdMain extends Application { button.setVisible(false); } /* Back-Button einblenden */ + backEndscreenButton.setLayoutY(425); backEndscreenButton.setVisible(true); /* Überschrift ändern */ @@ -1067,7 +1073,7 @@ public class HappyBirdMain extends Application { /* Highscore-Label (Hintergrund) formatieren und einfügen */ highscoreMenuLabel.setLayoutX(75); - highscoreMenuLabel.setLayoutY(150); + highscoreMenuLabel.setLayoutY(100); highscoreMenuLabel.setPrefSize(250, 300); endScreen.getChildren().add(highscoreMenuLabel); highscoreMenuLabel.setVisible(true);