- fixed merge conflict

2021-06-08 16:02:37 +02:00 · 2021-06-08 16:02:37 +02:00 · d867586a71
commit d867586a71
parent d5504c631e
1 changed files with 8 additions and 0 deletions
--- a/public/js/game.js
+++ b/public/js/game.js
@ -95,6 +95,14 @@ function start_game() {
    });
    app.stage.addChild(cards_3);

+    socket.on('dice', function (data) {
+        console.log(data);
+    });
+
+    socket.on('card', function (data) {
+        console.log(data);
+    });
+
    resize();
 }