compatibilite

master
readhame 5 years ago
parent 4ed8daef23
commit a7c6cc3752

@ -107,7 +107,9 @@
<workItem from="1593512353865" duration="16143000" />
<workItem from="1593594963138" duration="15031000" />
<workItem from="1593683259701" duration="5974000" />
<workItem from="1593698220416" duration="6683000" />
<workItem from="1593698220416" duration="8218000" />
<workItem from="1593708007166" duration="214000" />
<workItem from="1593763430814" duration="7369000" />
</task>
<servers />
</component>
@ -151,10 +153,10 @@
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state width="623" height="498" key="SwitcherDM/0.0.1920.1040@0.0.1920.1040" timestamp="1593600080207" />
<state x="1136" y="344" key="com.intellij.ide.util.TipDialog" timestamp="1593683265579">
<state x="1136" y="344" key="com.intellij.ide.util.TipDialog" timestamp="1593763443297">
<screen x="0" y="0" width="1920" height="1040" />
</state>
<state x="1136" y="344" key="com.intellij.ide.util.TipDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1593683265579" />
<state x="1136" y="344" key="com.intellij.ide.util.TipDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1593763443297" />
<state x="701" y="162" key="refactoring.ChangeSignatureDialog" timestamp="1593090265720">
<screen x="0" y="0" width="1920" height="1040" />
</state>

@ -173,7 +173,30 @@ class Deck {
}
}
}elseif ($changes === 'dealHS0') {
$colors = array('green', 'red', 'purple');
$shapes = array('oval', 'diamond', 'wave');
$fill = 'open';
$border = 'simple';
$numbers = array(1, 2, 3);
$index0 = 1;
foreach ($colors as $color) {
foreach ($shapes as $shape) {
//foreach ($fills as $fill) {
//foreach ($borders as $border) {
foreach ($numbers as $number) {
$cardAttributes = new CardAttributes($color, $shape, $fill, $border, $number, $index0);
$card = new Card($cardAttributes, $this);
$index0++;
}
//}
//}
}
}
}
}
public function removeSet($cards) {

@ -48,10 +48,16 @@ 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(20));
echo json_encode($game->start(40));
} 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(20));
}
else if (isset($_GET['action']) && $_GET['action'] == 'submit'){
$deck = $_SESSION['deck'];
echo json_encode($deck->threeMore());
@ -74,4 +80,12 @@ else if (isset($_GET['action']) && $_GET['action'] == 'submit4'){
}else if (isset($_GET['action']) && $_GET['action'] == 'submit0'){
$deck = $_SESSION['deck0'];
echo json_encode($deck->threeMore());
}
else if (isset($_GET['action']) && $_GET['action'] == 'submitHS'){
$deck = $_SESSION['deckHS'];
echo json_encode($deck->fourMore());
}
else if (isset($_GET['action']) && $_GET['action'] == 'submitHS0'){
$deck = $_SESSION['deckHS0'];
echo json_encode($deck->fourMore());
}

@ -78,6 +78,15 @@ h1 {
transform: rotate(90deg);
}
.game-boardHS {
margin-top: -5%;
margin-left: 40%;
height: 800px;
width: 800px;
transform: rotate(90deg);
}
.shape {
display: inline-block;
width: 30px;

@ -50,13 +50,15 @@
</div>
<div id="selectModeHyperSet" class="select-mode-div divs" style="display: none;">
<h2 class="mode-title disable-select text" id="selectGameHS">Modes de jeu </h2>
<div class=" back-btn small-btn">
<img class="small-btn" id="previousBtnHS" onclick="goSelect()" src="vues/images/previous.png">
<img class="small-btn" id="previousBtnHS" onclick="goSelect1()" src="vues/images/previous.png">
</div>
<div class="game-button-mode">
<button class="game-button text" id="playSimpleH" onclick="showGameHS0();">(à venir)</button>
<button class="game-button text" id="playSimpleH" onclick="showGameHS0();">Hyper SET! 3*3</button>
<button class="game-button text" id="playSimpleHSet" onclick="showGameHS();">Hyper SET! 3*4</button>
<button class="game-button text" id="playSimpleHSetLast" onclick="showGameHS1();">(à venir)</button>
<button class="game-button text" id="playHSetFour" onclick="showGameHS2();">(à venir)</button>
@ -66,17 +68,7 @@
</div>
<div id='gameHS' class="wrapper" style="display: none;">
<h1>HyperSet 3x4 </h1>
<div class=" back-btn small-btn">
<img class="small-btn" onclick="goSelectModeHyperSet()" src="vues/images/previous.png">
</div>
<p>Nombre de carte = 3; Nombre de critères = 4</p>
<p>HyperSets found: <span data-display="scoreHS" class="score">0</span></p>
<p>Number of HyperSets: <span data-display="nbSetsHS" class="nbSets"></span></p>
<div id= class="game-boardHS" data-display="game-boardHS"></div>
</div>
<div id='game0' class="wrapper" style="display: none;">
@ -152,6 +144,56 @@
</div>
<div id='gameHS' class="wrapper" style="display: none;">
<h1>HyperSet 3x4 </h1>
<div class=" back-btn small-btn">
<img class="small-btn" onclick="goSelectModeHyperSet()" src="vues/images/previous.png">
</div>
<p>Nombre de carte = 4; Nombre de critères = 4</p>
<p>HyperSets found: <span data-display="scoreHS" class="score">0</span></p>
<p>Number of HyperSets: <span data-display="nbSetsHS" class="nbSets"></span></p>
<div class="game-boardHS" data-display="game-boardHS"></div>
</div>
<div id='gameHS0' class="wrapper" style="display: none;">
<h1>HyperSet 3x3 </h1>
<div class=" back-btn small-btn">
<img class="small-btn" onclick="goSelectModeHyperSet0()" src="vues/images/previous.png">
</div>
<p>Nombre de carte = 4; Nombre de critères = 3</p>
<p>HyperSets found: <span data-display="scoreHS0" class="score">0</span></p>
<p>Number of HyperSets: <span data-display="nbSetsHS0" class="nbSets"></span></p>
<div class="game-board" data-display="game-boardHS0"></div>
</div>
<div class="settings-btn">
<img class="small-btn" id="settingsBtn" onclick="showSettings();" src="vues/images/settings.png">
</div>

@ -80,6 +80,15 @@ function showGameHS(){
document.getElementById('gameHS').style.display='block';
document.getElementById('selectModeHyperSet').style.display='none';
}
function showGameHS0(){
document.getElementById('gameHS0').style.display='block';
document.getElementById('selectModeHyperSet').style.display='none';
}
function goSelectModeHyperSet0(){
document.getElementById('gameHS0').style.display='none';
document.getElementById('selectModeHyperSet').style.display='block';
}
function showGame0(){
@ -172,6 +181,14 @@ function goSelect(){
document.getElementById('selectModeSet').style.display='none';
}
function goSelect1(){
document.getElementById('selectMode').style.display='block';
document.getElementById('selectModeHyperSet').style.display='none';
}
function goSelectMode(){
document.getElementById('selectModeSet').style.display='block';
document.getElementById('game').style.display='none';

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save