belaeloc/linea_app_projet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve conflit

Browse Source
This commit is contained in:
Constant
2026-03-27 21:29:49 +01:00
parent 0ed7cc976e 1fc5404a15
commit 3681f15dea
4 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
projet_linea/UserScoreBDD.db
View File

Binary file not shown.

BIN
projet_linea/bin/Jeu.class
View File

Binary file not shown.

BIN
projet_linea/bin/images/icone.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 815 KiB

2
projet_linea/src/Jeu.java
View File

@@ -424,7 +424,7 @@ public class Jeu implements KeyListener, ActionListener{
this.ecran.partiePerdue = true; // 2. Signaler à l'écran this.ecran.partiePerdue = true; // 2. Signaler à l'écran
this.ecran.repaint(); // 3. Forcer l'affichage du texte this.ecran.repaint(); // 3. Forcer l'affichage du texte
GestionBDD.ajouterScore((int)this.score, utilisateurId);// enregistrement du score dans la base de donne // GestionBDD.ajouterScore((int)this.score);// enregistrement du score dans la base de donne
} }
} }
if (chronoBonus>0) { if (chronoBonus>0) {