From df4f042cfd5921420eeffa25c804a7d5149db059 Mon Sep 17 00:00:00 2001 From: readhame Date: Tue, 21 Jul 2020 12:47:29 +0200 Subject: [PATCH] nb cartes --- HyperSet/.idea/workspace.xml | 5 +++-- HyperSet/set.php | 4 ++-- HyperSet/vues/css/style.css | 2 +- HyperSet/vues/js/set.js | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/HyperSet/.idea/workspace.xml b/HyperSet/.idea/workspace.xml index 63dd3e1..70c81b2 100644 --- a/HyperSet/.idea/workspace.xml +++ b/HyperSet/.idea/workspace.xml @@ -131,6 +131,7 @@ + @@ -174,10 +175,10 @@ - + - + diff --git a/HyperSet/set.php b/HyperSet/set.php index f9d7abe..1bf4dd6 100644 --- a/HyperSet/set.php +++ b/HyperSet/set.php @@ -48,13 +48,13 @@ if (isset($_GET['action']) && $_GET['action'] == 'deal') { $_SESSION['deckHS'] = new Deck($_GET['action']); $_SESSION['gameHS'] = new Game($_SESSION['deckHS']); $game = $_SESSION['gameHS']; - echo json_encode($game->start(12)); + echo json_encode($game->start(10)); } else if (isset($_GET['action']) && $_GET['action'] == 'dealHS0') { $_SESSION['deckHS0'] = new Deck($_GET['action']); $_SESSION['gameHS0'] = new Game($_SESSION['deckHS0']); $game = $_SESSION['gameHS0']; - echo json_encode($game->start(8)); + echo json_encode($game->start(7)); }else if (isset($_GET['action']) && $_GET['action'] == 'dealHS1') { $_SESSION['deckHS1'] = new Deck($_GET['action']); $_SESSION['gameHS1'] = new Game($_SESSION['deckHS1']); diff --git a/HyperSet/vues/css/style.css b/HyperSet/vues/css/style.css index 986dffa..fac83a3 100644 --- a/HyperSet/vues/css/style.css +++ b/HyperSet/vues/css/style.css @@ -100,7 +100,7 @@ h1 { } .game-boardHS { - margin-left: -1%; + margin-left: 2%; height: 800px; width: 800px; transform: rotate(90deg); diff --git a/HyperSet/vues/js/set.js b/HyperSet/vues/js/set.js index cd4d6d2..1badcb7 100644 --- a/HyperSet/vues/js/set.js +++ b/HyperSet/vues/js/set.js @@ -517,7 +517,7 @@ var Game = { self.$boardHS.append(cardNode); // display 4 cards per row - if ((index+1) % 3 === 0) { + if ((index+1) % 2 === 0) { self.$boardHS.append($('
')); }