diff --git a/HyperSet/.idea/workspace.xml b/HyperSet/.idea/workspace.xml index 90356f9..dbf8ada 100644 --- a/HyperSet/.idea/workspace.xml +++ b/HyperSet/.idea/workspace.xml @@ -126,6 +126,7 @@ + @@ -169,10 +170,10 @@ - + - + diff --git a/HyperSet/set.php b/HyperSet/set.php index 338de67..796497f 100644 --- a/HyperSet/set.php +++ b/HyperSet/set.php @@ -13,13 +13,13 @@ if (isset($_GET['action']) && $_GET['action'] == 'deal') { $_SESSION['deck'] = new Deck($_GET['action']); $_SESSION['game'] = new Game($_SESSION['deck']); $game = $_SESSION['game']; - echo json_encode($game->start(20)); + echo json_encode($game->start(21)); } else if (isset($_GET['action']) && $_GET['action'] == 'deal1') { $_SESSION['deck1'] = new Deck($_GET['action']); $_SESSION['game1'] = new Game($_SESSION['deck1']); $game = $_SESSION['game1']; - echo json_encode($game->start(45)); + echo json_encode($game->start(46)); } else if (isset($_GET['action']) && $_GET['action'] == 'deal2') { $_SESSION['deck2'] = new Deck($_GET['action']); @@ -43,7 +43,7 @@ if (isset($_GET['action']) && $_GET['action'] == 'deal') { $_SESSION['deck0'] = new Deck($_GET['action']); $_SESSION['game0'] = new Game($_SESSION['deck0']); $game = $_SESSION['game0']; - echo json_encode($game->start(12)); + echo json_encode($game->start(10)); } else if (isset($_GET['action']) && $_GET['action'] == 'dealHS') { $_SESSION['deckHS'] = new Deck($_GET['action']); $_SESSION['gameHS'] = new Game($_SESSION['deckHS']); diff --git a/HyperSet/vues/css/style.css b/HyperSet/vues/css/style.css index 5dbb290..5962e51 100644 --- a/HyperSet/vues/css/style.css +++ b/HyperSet/vues/css/style.css @@ -63,7 +63,7 @@ h1 { } .game-board { margin-top: -5%; - margin-left: 19%; + margin-left: 29%; height: 700px; width: 600px; transform: rotate(90deg); @@ -80,7 +80,7 @@ h1 { margin-top: -4%; height: 800px; width: 700px; - margin-left: 30%; + margin-left: 40%; transform: rotate(90deg); } diff --git a/HyperSet/vues/homePage.html b/HyperSet/vues/homePage.html index 6aa55db..abe10c7 100644 --- a/HyperSet/vues/homePage.html +++ b/HyperSet/vues/homePage.html @@ -126,7 +126,7 @@