master
readhame 5 years ago
parent ce38eb9d35
commit a873427885

@ -107,6 +107,7 @@
<workItem from="1593512353865" duration="16143000" /> <workItem from="1593512353865" duration="16143000" />
<workItem from="1593594963138" duration="15031000" /> <workItem from="1593594963138" duration="15031000" />
<workItem from="1593683259701" duration="5974000" /> <workItem from="1593683259701" duration="5974000" />
<workItem from="1593698220416" duration="2057000" />
</task> </task>
<servers /> <servers />
</component> </component>
@ -158,10 +159,10 @@
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="701" y="162" key="refactoring.ChangeSignatureDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1593090265720" /> <state x="701" y="162" key="refactoring.ChangeSignatureDialog/0.0.1920.1040@0.0.1920.1040" timestamp="1593090265720" />
<state x="616" y="240" key="run.anything.popup" timestamp="1593610975327"> <state x="616" y="240" key="run.anything.popup" timestamp="1593700659090">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>
<state x="616" y="240" key="run.anything.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1593610975327" /> <state x="616" y="240" key="run.anything.popup/0.0.1920.1040@0.0.1920.1040" timestamp="1593700659090" />
<state x="202" y="435" key="vcs.readOnlyHandler.ReadOnlyStatusDialog" timestamp="1592990595770"> <state x="202" y="435" key="vcs.readOnlyHandler.ReadOnlyStatusDialog" timestamp="1592990595770">
<screen x="0" y="0" width="1920" height="1040" /> <screen x="0" y="0" width="1920" height="1040" />
</state> </state>

@ -25,7 +25,7 @@ if (isset($_GET['action']) && $_GET['action'] == 'deal') {
$_SESSION['deck2'] = new Deck($_GET['action']); $_SESSION['deck2'] = new Deck($_GET['action']);
$_SESSION['game2'] = new Game($_SESSION['deck2']); $_SESSION['game2'] = new Game($_SESSION['deck2']);
$game = $_SESSION['game2']; $game = $_SESSION['game2'];
echo json_encode($game->start(20)); echo json_encode($game->start(36));
} else if (isset($_GET['action']) && $_GET['action'] == 'deal3') { } else if (isset($_GET['action']) && $_GET['action'] == 'deal3') {
$_SESSION['deck3'] = new Deck($_GET['action']); $_SESSION['deck3'] = new Deck($_GET['action']);

@ -47,12 +47,21 @@ h1 {
background: lightgrey; background: lightgrey;
} }
.game-board { .game-board44 {
margin-top: 18%; margin-top: -16%;
height: auto; height: auto;
width: auto; width: auto;
transform: rotate(90deg); transform: rotate(90deg);
}
.game-board {
margin-top: 1%;
margin-left: 13%;
height: 700px;
width: 800px;
transform: rotate(90deg);
} }
.game-board0 { .game-board0 {
margin-top: 30%; margin-top: 30%;
@ -98,8 +107,8 @@ h1 {
.diamond.lightblue.stripped { .diamond.lightblue.stripped {
transform: rotate(-67deg) skewX(-45deg) scaleY( 0.40); transform: rotate(-67deg) skewX(-45deg) scaleY( 0.40);
width: 38px; width: 38px;
background: repeating-linear-gradient(25deg, lightblue, lightblue 8px, white 8px, white 15px); background: repeating-linear-gradient(25deg, #6495ED, #6495ED 8px, white 8px, white 15px);
border: 2px solid lightblue; border: 2px solid #6495ED;
} }
.diamond.yellow.stripped { .diamond.yellow.stripped {
transform: rotate(-67deg) skewX(-45deg) scaleY( 0.40); transform: rotate(-67deg) skewX(-45deg) scaleY( 0.40);
@ -136,7 +145,7 @@ h1 {
.diamond.lightblue.stripped.rond{ .diamond.lightblue.stripped.rond{
transform: rotate(-67deg) skewX(-45deg) scaleY( 0.40); transform: rotate(-67deg) skewX(-45deg) scaleY( 0.40);
width: 38px; width: 38px;
background: repeating-linear-gradient(25deg, lightblue, lightblue 6px, white 7px, white 14px); background: repeating-linear-gradient(25deg, #6495ED, #6495ED 6px, white 7px, white 14px);
border: 7px dotted black; border: 7px dotted black;
} }
@ -184,7 +193,7 @@ h1 {
.diamond.lightblue.stripped.point{ .diamond.lightblue.stripped.point{
transform: rotate(-67deg) skewX(-45deg) scaleY( 0.40); transform: rotate(-67deg) skewX(-45deg) scaleY( 0.40);
width: 38px; width: 38px;
background: repeating-linear-gradient(25deg, lightblue, lightblue 6px, white 7px, white 14px); background: repeating-linear-gradient(25deg, #6495ED, #6495ED 6px, white 7px, white 14px);
border: 4px dashed black; border: 4px dashed black;
} }
@ -231,7 +240,7 @@ h1 {
} }
.diamond.solid.lightblue.point{ .diamond.solid.lightblue.point{
border-style: dashed; border-style: dashed;
border-color: lightblue; border-color: #6495ED;
} }
.diamond.solid.purple.point{ .diamond.solid.purple.point{
border-style: dashed; border-style: dashed;
@ -273,13 +282,13 @@ h1 {
} }
.diamond.lightblue.quadrillage{ .diamond.lightblue.quadrillage{
background-color: lightblue; background-color: #6495ED;
background-image: background-image:
linear-gradient(-35deg, white 25%, transparent 25%, transparent 75%, white 75%), linear-gradient(-35deg, white 25%, transparent 25%, transparent 75%, white 75%),
linear-gradient(-35deg, white 25%, transparent 25%, transparent 75%, white 75%); linear-gradient(-35deg, white 25%, transparent 25%, transparent 75%, white 75%);
background-size: 20px 19px; background-size: 20px 19px;
background-position: 0 0, 10px 10px; background-position: 0 0, 10px 10px;
border: 2px solid lightblue; border: 2px solid #6495ED;
} }
.diamond.purple.quadrillage{ .diamond.purple.quadrillage{
background-color: purple; background-color: purple;
@ -394,12 +403,12 @@ radial-gradient(#fafafa 10%, transparent 10%);
border: 2px solid saddlebrown; border: 2px solid saddlebrown;
} }
.lightblue.pointille{ .lightblue.pointille{
background-image: radial-gradient(lightblue 40%, #F5F5F5 40%), background-image: radial-gradient(#6495ED 40%, #F5F5F5 40%),
radial-gradient(lightblue 20%, #F5F5F5 20%), radial-gradient(#6495ED 20%, #F5F5F5 20%),
radial-gradient(#fafafa 10%, transparent 10%); radial-gradient(#fafafa 10%, transparent 10%);
background-position: 0 0, 1px 1px; background-position: 0 0, 1px 1px;
background-size: 15px 15px; background-size: 15px 15px;
border: 2px solid lightblue; border: 2px solid #6495ED;
} }
@ -449,13 +458,13 @@ radial-gradient(#fafafa 10%, transparent 10%);
} }
.lightblue.quadrillage{ .lightblue.quadrillage{
background-color: lightblue; background-color: #6495ED;
background-image: background-image:
linear-gradient(45deg, white 25%, transparent 25%, transparent 75%, white 75%), linear-gradient(45deg, white 25%, transparent 25%, transparent 75%, white 75%),
linear-gradient(45deg, white 25%, transparent 25%, transparent 75%, white 75%); linear-gradient(45deg, white 25%, transparent 25%, transparent 75%, white 75%);
background-size: 15px 15px; background-size: 15px 15px;
background-position: 0 0, 8px 8px; background-position: 0 0, 8px 8px;
border: 2px solid lightblue; border: 2px solid #6495ED;
} }
.purple.quadrillage{ .purple.quadrillage{
background-color: purple; background-color: purple;
@ -482,7 +491,7 @@ radial-gradient(#fafafa 10%, transparent 10%);
} }
.lightblue.rond.open { .lightblue.rond.open {
border-style: dotted; border-style: dotted;
border-color: lightblue; border-color: #6495ED;
border-width: 7px; border-width: 7px;
} }
@ -523,7 +532,7 @@ radial-gradient(#fafafa 10%, transparent 10%);
} }
.lightblue.point.open{ .lightblue.point.open{
border-style: dashed; border-style: dashed;
border-color: lightblue; border-color: #6495ED;
} }
.purple.point.open{ .purple.point.open{
border-style: dashed; border-style: dashed;
@ -550,7 +559,7 @@ radial-gradient(#fafafa 10%, transparent 10%);
.lightblue.solid { .lightblue.solid {
background: lightblue; background: #6495ED;
} }
.red.solid { .red.solid {
@ -644,7 +653,7 @@ radial-gradient(#fafafa 10%, transparent 10%);
} }
.lightblue.open { .lightblue.open {
border: 2px solid lightblue; border: 2px solid #6495ED;
} }
.yellow.open { .yellow.open {
@ -666,8 +675,8 @@ radial-gradient(#fafafa 10%, transparent 10%);
} }
.lightblue.stripped{ .lightblue.stripped{
background: repeating-linear-gradient(-45deg, lightblue, lightblue 5px, white 5px, white 10px); background: repeating-linear-gradient(-45deg, #6495ED, #6495ED 5px, white 5px, white 10px);
border: 2px solid lightblue; border: 2px solid #6495ED;
} }
@ -706,7 +715,7 @@ radial-gradient(#fafafa 10%, transparent 10%);
} }
.lightblue.stripped.rond{ .lightblue.stripped.rond{
background: repeating-linear-gradient(-45deg, lightblue, lightblue 5px, white 5px, white 10px); background: repeating-linear-gradient(-45deg, #6495ED, #6495ED 5px, white 5px, white 10px);
border: 7px dotted black; border: 7px dotted black;
} }
@ -744,7 +753,7 @@ radial-gradient(#fafafa 10%, transparent 10%);
} }
.lightblue.stripped.point{ .lightblue.stripped.point{
background: repeating-linear-gradient(-45deg, lightblue, lightblue 5px, white 5px, white 10px); background: repeating-linear-gradient(-45deg, #6495ED, #6495ED 5px, white 5px, white 10px);
border: 2px dashed black; border: 2px dashed black;
} }

@ -56,16 +56,28 @@
<img class="small-btn" id="previousBtnHS" onclick="goSelect()" src="vues/images/previous.png"> <img class="small-btn" id="previousBtnHS" onclick="goSelect()" src="vues/images/previous.png">
</div> </div>
<div class="game-button-mode"> <div class="game-button-mode">
<button class="game-button text" id="playSimpleH" onclick="showGameSimple();">Hyper SET! 3*3</button> <button class="game-button text" id="playSimpleH" onclick="showGameHS0();">(à venir)</button>
<button class="game-button text" id="playSimpleHSet" onclick="showGame();">Hyper SET! 3*4</button> <button class="game-button text" id="playSimpleHSet" onclick="showGameHS();">Hyper SET! 3*4</button>
<button class="game-button text" id="playSimpleHSetLast" onclick="showGame1();">Hyper SET! 3*5</button> <button class="game-button text" id="playSimpleHSetLast" onclick="showGameHS1();">(à venir)</button>
<button class="game-button text" id="playHSetFour" onclick="showGame2();">Hyper SET! 4*4</button> <button class="game-button text" id="playHSetFour" onclick="showGameHS2();">(à venir)</button>
<button class="game-button text" id="playSimpleHSetFive" onclick="showGame3();">Hyper SET! 4*5</button> <button class="game-button text" id="playSimpleHSetFive" onclick="showGameHS3();">(à venir)</button>
<button class="game-button text" id="playHSetFive" onclick="showGame4();">Hyper SET! 5*5</button> <button class="game-button text" id="playHSetFive" onclick="showGameHS4();">(à venir)</button>
</div> </div>
</div> </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;"> <div id='game0' class="wrapper" style="display: none;">
<h1>Set 3x3 </h1> <h1>Set 3x3 </h1>
@ -114,7 +126,7 @@
<p>Sets found: <span data-display="score2" class="score">0</span></p> <p>Sets found: <span data-display="score2" class="score">0</span></p>
<p>Number of Sets: <span data-display="nbSets2" class="nbSets"></span></p> <p>Number of Sets: <span data-display="nbSets2" class="nbSets"></span></p>
<div class="game-board" data-display="game-board2"></div> <div class="game-board44" data-display="game-board2"></div>
</div> </div>
<div id='game3' class="wrapper" style="display: none;"> <div id='game3' class="wrapper" style="display: none;">
<h1>Set 4x5</h1> <h1>Set 4x5</h1>

@ -76,6 +76,10 @@ function goHome(){
document.getElementById('home').style.display='block'; document.getElementById('home').style.display='block';
document.getElementById('selectMode').style.display='none'; document.getElementById('selectMode').style.display='none';
} }
function showGameHS(){
document.getElementById('gameHS').style.display='block';
document.getElementById('selectModeHyperSet').style.display='none';
}
function showGame0(){ function showGame0(){
@ -113,6 +117,11 @@ function showModeGame(){
document.getElementById('selectMode').style.display='none'; document.getElementById('selectMode').style.display='none';
} }
function showModeGame1(){
document.getElementById('selectModeHyperSet').style.display='block';
document.getElementById('selectMode').style.display='none';
}
function showModeGames(){ function showModeGames(){
document.getElementById('selectMode').style.display='block'; document.getElementById('selectMode').style.display='block';
document.getElementById('home').style.display='none'; document.getElementById('home').style.display='none';
@ -187,3 +196,9 @@ function goSelectMode0(){
document.getElementById('selectModeSet').style.display='block'; document.getElementById('selectModeSet').style.display='block';
document.getElementById('game0').style.display='none'; document.getElementById('game0').style.display='none';
} }
function goSelectModeHyperSet(){
document.getElementById('selectModeHyperSet').style.display='block';
document.getElementById('gameHS').style.display='none';
}

@ -51,7 +51,13 @@ var Game = {
$nbSets0: $('[data-display="nbSets0"]'), $nbSets0: $('[data-display="nbSets0"]'),
$board0: $('[data-display="game-board0"]'), $board0: $('[data-display="game-board0"]'),
cardsH: [],
selectedH : [],
scoreH: 0,
setH: 0,
$scoreH: $('[data-display="scoreH"]'),
$nbSetsH: $('[data-display="nbSetsH"]'),
$boardH: $('[data-display="game-boardH"]'),
deal: function() { deal: function() {
var self = this; var self = this;

Loading…
Cancel
Save