quirinecker/snakes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed merge conflict

Browse Source
This commit is contained in:
quirinecker
2024-02-12 12:35:52 +01:00
parent 9742140664
commit 60ad418a78
1 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/App.vue
View File

@@ -169,17 +169,10 @@ function createInterval() {
} }
<<<<<<< HEAD
if (currentCoin.value.x === snake.value.cell.x && currentCoin.value.y === snake.value.cell.y) { if (currentCoin.value.x === snake.value.cell.x && currentCoin.value.y === snake.value.cell.y) {
snake.value.length++ snake.value.length++
currentCoin.value = spawnCoin() currentCoin.value = spawnCoin()
score.value++ score.value++
=======
if (currentCoin.value.x === snake.value.cell.x && currentCoin.value.y === snake.value.cell.y) {
snake.value.length++
currentCoin.value = spawnCoin()
score.value++
>>>>>>> 61ad940 (scoreboard is implemented in the frontend)
if (currentInterval) { if (currentInterval) {
clearInterval(currentInterval) clearInterval(currentInterval)
@@ -308,9 +301,6 @@ window.addEventListener('keydown', keydown)
width: 10px; width: 10px;
overflow: hidden; overflow: hidden;
} }
<<<<<<< HEAD
</style>
=======
main { main {
display: flex; display: flex;
@@ -340,10 +330,6 @@ main {
justify-content: space-between; justify-content: space-between;
width: 100%; width: 100%;
} }
<<<<<<< HEAD
</style>
>>>>>>> bf4a773 (added basic scoreboard for now)
=======
.scoreboard-username { .scoreboard-username {
font-weight: 600; font-weight: 600;
@@ -354,9 +340,5 @@ input {
padding: 5px; padding: 5px;
width: 100%; width: 100%;
} }
<<<<<<< HEAD
</style> </style>
>>>>>>> 61ad940 (scoreboard is implemented in the frontend)
=======
</style>
>>>>>>> 20fbb60 (fixed snake length)