From 3ef2459ad0dc33fdaf48d9799730640ff500e553 Mon Sep 17 00:00:00 2001 From: Yvonne Schmidt Date: Tue, 12 Nov 2024 21:32:46 +0100 Subject: [PATCH 01/43] =?UTF-8?q?Hintergrundfarbe=20der=20Men=C3=BCs=20zu?= =?UTF-8?q?=20Wei=C3=9F=20ge=C3=A4ndert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/Interface/Lemur/pp-styles.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Projekte/jme-common/src/main/resources/Interface/Lemur/pp-styles.groovy b/Projekte/jme-common/src/main/resources/Interface/Lemur/pp-styles.groovy index c8c8de4..6a46799 100644 --- a/Projekte/jme-common/src/main/resources/Interface/Lemur/pp-styles.groovy +++ b/Projekte/jme-common/src/main/resources/Interface/Lemur/pp-styles.groovy @@ -10,7 +10,7 @@ import com.simsilica.lemur.Insets3f import com.simsilica.lemur.component.QuadBackgroundComponent import com.simsilica.lemur.component.TbtQuadBackgroundComponent -def bgColor = color(0.25, 0.5, 0.5, 1) +def bgColor = color(1, 1, 1, 1) def buttonEnabledColor = color(0.8, 0.9, 1, 1) def buttonDisabledColor = color(0.8, 0.9, 1, 0.2) def buttonBgColor = color(0, 0.75, 0.75, 1) From 17533112a1f7a2c815c320ce83bffe5c79b3bf3d Mon Sep 17 00:00:00 2001 From: Yvonne Schmidt Date: Tue, 12 Nov 2024 23:30:44 +0100 Subject: [PATCH 02/43] =?UTF-8?q?Startmen=C3=BC=20implementiert=20und=20Sp?= =?UTF-8?q?ielmen=C3=BC=20Stummel=20erstellt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/pp/dialog/DialogManager.java | 4 +- .../Interface/Lemur/pp-styles.groovy | 27 +++- .../java/pp/monopoly/client/MonopolyApp.java | 2 +- .../java/pp/monopoly/client/StartMenu.java | 117 ++++++++++++++++++ .../java/pp/monopoly/client/gui/GameMenu.java | 55 ++++++++ .../main/resources/Pictures/logo-monopoly.png | Bin 0 -> 45160 bytes .../main/resources/Pictures/logo-unibw.png | Bin 0 -> 45063 bytes .../main/resources/Pictures/unibw-Bib.jpeg | Bin 0 -> 148009 bytes .../src/main/resources/monopoly.properties | 2 + 9 files changed, 203 insertions(+), 4 deletions(-) create mode 100644 Projekte/monopoly/client/src/main/java/pp/monopoly/client/StartMenu.java create mode 100644 Projekte/monopoly/client/src/main/java/pp/monopoly/client/gui/GameMenu.java create mode 100644 Projekte/monopoly/client/src/main/resources/Pictures/logo-monopoly.png create mode 100644 Projekte/monopoly/client/src/main/resources/Pictures/logo-unibw.png create mode 100644 Projekte/monopoly/client/src/main/resources/Pictures/unibw-Bib.jpeg diff --git a/Projekte/jme-common/src/main/java/pp/dialog/DialogManager.java b/Projekte/jme-common/src/main/java/pp/dialog/DialogManager.java index ca0069e..f84b6e7 100644 --- a/Projekte/jme-common/src/main/java/pp/dialog/DialogManager.java +++ b/Projekte/jme-common/src/main/java/pp/dialog/DialogManager.java @@ -111,7 +111,7 @@ public class DialogManager { * * @param dialog the dialog to open */ - void open(Dialog dialog) { + public void open(Dialog dialog) { dialogStack.push(dialog); dialog.update(); app.getGuiNode().attachChild(dialog); @@ -133,7 +133,7 @@ public class DialogManager { * @param dialog the dialog to close * @throws IllegalArgumentException if the specified dialog is not the top dialog */ - void close(Dialog dialog) { + public void close(Dialog dialog) { if (!isTop(dialog)) throw new IllegalArgumentException(dialog + " is not the top dialog"); dialogStack.pop(); diff --git a/Projekte/jme-common/src/main/resources/Interface/Lemur/pp-styles.groovy b/Projekte/jme-common/src/main/resources/Interface/Lemur/pp-styles.groovy index 6a46799..55ef6cb 100644 --- a/Projekte/jme-common/src/main/resources/Interface/Lemur/pp-styles.groovy +++ b/Projekte/jme-common/src/main/resources/Interface/Lemur/pp-styles.groovy @@ -13,12 +13,19 @@ import com.simsilica.lemur.component.TbtQuadBackgroundComponent def bgColor = color(1, 1, 1, 1) def buttonEnabledColor = color(0.8, 0.9, 1, 1) def buttonDisabledColor = color(0.8, 0.9, 1, 0.2) -def buttonBgColor = color(0, 0.75, 0.75, 1) +//def buttonBgColor = color(0, 0.75, 0.75, 1) def sliderColor = color(0.6, 0.8, 0.8, 1) def sliderBgColor = color(0.5, 0.75, 0.75, 1) def gradientColor = color(0.5, 0.75, 0.85, 0.5) def tabbuttonEnabledColor = color(0.4, 0.45, 0.5, 1) +def playButtonBorderColor = color(1, 0.6, 0, 1) // Orange border for "Spielen" button +def playButtonTextColor = color(0, 0, 0, 1) // Black text color for "Spielen" button +def buttonBgColor = color(1, 1, 1, 1) // White background for "Spiel beenden" and "Einstellungen" buttons +def buttonTextColor = color(0, 0, 0, 1) // Black text color for "Spiel beenden" and "Einstellungen" buttons +def borderColor = color(0, 0, 0, 1) // Black border for "Spiel beenden" and "Einstellungen" + + def gradient = TbtQuadBackgroundComponent.create( texture(name: "/com/simsilica/lemur/icons/bordered-gradient.png", generateMips: false), @@ -55,6 +62,24 @@ selector("slider", "pp") { background.setColor(bgColor) } +selector("play-button", "pp") { + color = playButtonTextColor // Black text color + background = new QuadBackgroundComponent(playButtonBorderColor) // Orange border background + insets = new Insets3f(15, 25, 15, 25) // Padding for larger button size + background.setMargin(5, 5) // Thin border effect around the background color + fontSize = 36 // Larger font size for prominence +} + +selector("menu-button", "pp") { + color = buttonTextColor // Black text color + background = new QuadBackgroundComponent(buttonBgColor) // White background + insets = new Insets3f(10, 20, 10, 20) // Padding + background.setMargin(1, 1) // Thin black border + background.setColor(borderColor) // Set black border color + + fontSize = 24 // Standard font size +} + def pressedCommand = new Command