peet/Gruppe-01-fin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Development #34

Merged
j23f0779 merged 19 commits from development into dev/model 2024-12-05 17:58:51 +01:00
Conversation 4 Commits 19 Files Changed 34 +389 -110
20 changed files with 389 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 00d86c5c10 - Show all commits

10
Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java
View File

@@ -48,16 +48,16 @@ public class MdgaApp extends SimpleApplication {
private final float imageScale = prefs.getInt("scale", 1); private final float imageScale = prefs.getInt("scale", 1);
/** The main menu view. */ /** The main menu view. */
private MdgaView mainView; private MainView mainView;
/** The lobby view. */ /** The lobby view. */
private MdgaView lobbyView; private LobbyView lobbyView;
/** The game view. */ /** The game view. */
private MdgaView gameView; private GameView gameView;
/** The ceremony view. */ /** The ceremony view. */
private MdgaView ceremonyView; private CeremonyView ceremonyView;
/** The client game logic. */ /** The client game logic. */
private final ClientGameLogic clientGameLogic; private final ClientGameLogic clientGameLogic;
@@ -305,6 +305,8 @@ public void afterGameCleanup() {
main.getJoinDialog().disconnect(); main.getJoinDialog().disconnect();
main.getHostDialog().shutdownServer(); main.getHostDialog().shutdownServer();
ceremonyView.afterGameCleanup();
} }
} }

8
Projekte/mdga/client/src/main/java/pp/mdga/client/view/CeremonyView.java
View File

@@ -206,11 +206,19 @@ public void addCeremonyParticipant(Color color, int pos, String name) {
ceremonyButtons.add(button); ceremonyButtons.add(button);
if(state.equals(SubState.AWARD_CEREMONY)) { if(state.equals(SubState.AWARD_CEREMONY)) {
button.hide();
button.show(); button.show();
} }
} }
public void addStatisticsRow(String name, int v1, int v2, int v3, int v4, int v5, int v6) { public void addStatisticsRow(String name, int v1, int v2, int v3, int v4, int v5, int v6) {
ceremonyDialog.addStatisticsRow(name, v1, v2, v3, v4, v5, v6); ceremonyDialog.addStatisticsRow(name, v1, v2, v3, v4, v5, v6);
ceremonyDialog.hide();
ceremonyDialog.show();
}
public void afterGameCleanup() {
ceremonyDialog.prepare();
} }
} }