This commit is contained in:
DonRenando 2015-03-16 18:22:02 +01:00
parent 1ccdae5f95
commit dff658cd8e
4 changed files with 32 additions and 31 deletions

View File

@ -33,6 +33,7 @@ class GameController extends Controller {
$oes = $configjeu->oeuvres; $oes = $configjeu->oeuvres;
} else { } else {
$oes = Oeuvre::orderByRaw("RAND()")->take(5)->get(); $oes = Oeuvre::orderByRaw("RAND()")->take(5)->get();
$niveau = 1;
} }
$params = json_decode($configjeu->parametres); $params = json_decode($configjeu->parametres);

View File

@ -98,24 +98,24 @@
/* game__level-1 styles */ /* game__level-1 styles */
.mg__level-1 .mg__tile { .mg__level-1 .mg__tile {
width: 25%; width: 20%;
height: 50%; height: 40%;
} }
.mg__level-1 .mg__tile-1 { .mg__level-1 .mg__tile-1 {
top: 0%; top: 20%;
left: 0%; left: 15%;
} }
.mg__level-1 .mg__tile-2 { .mg__level-1 .mg__tile-2 {
top: 0%; top: 20%;
left: 25%; left: 35%;
} }
.mg__level-1 .mg__tile-3 { .mg__level-1 .mg__tile-3 {
top: 0%; top: 20%;
left: 50%; left: 55%;
} }
.mg__level-1 .mg__tile-4 { .mg__level-1 .mg__tile-4 {
top: 0%; top: 20%;
left: 75%; left: 75%;
} }
.mg__level-1 .mg__tile-5 { .mg__level-1 .mg__tile-5 {

View File

@ -315,7 +315,7 @@
Memory.prototype._gameCounterPlusOne = function() { Memory.prototype._gameCounterPlusOne = function() {
this.numMoves = this.numMoves + 1; this.numMoves = this.numMoves + 1;
this.moveCounterUpdate = document.getElementById("mg__meta--moves").innerHTML = this.numMoves; //this.moveCounterUpdate = document.getElementById("mg__meta--moves").innerHTML = this.numMoves;
}; };
/** /**

View File

@ -130,19 +130,19 @@
<div class="form-group"> <div class="form-group">
<label for="m1" class="col-sm-4 control-label">Nb. de tableaux 1 étoile</label> <label for="m1" class="col-sm-4 control-label">Nb. de tableaux 1 étoile</label>
<div class="col-sm-6"> <div class="col-sm-6">
<input type="number" min="1" max="10" class="form-control" value="{{$paramjeu->m1}}" name="m1" id="m1" placeholder="2"> <input type="number" min="1" max="2" class="form-control" value="{{$paramjeu->m1}}" name="m1" id="m1" placeholder="2">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="m2" class="col-sm-4 control-label">Nb. de tableaux 2 étoiles</label> <label for="m2" class="col-sm-4 control-label">Nb. de tableaux 2 étoiles</label>
<div class="col-sm-6"> <div class="col-sm-6">
<input type="number" min="1" max="10" class="form-control" value="{{$paramjeu->m2}}" name="m2" id="m2" placeholder="3"> <input type="number" min="1" max="4" class="form-control" value="{{$paramjeu->m2}}" name="m2" id="m2" placeholder="3">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="m3" class="col-sm-4 control-label">Nb. de tableaux 3 étoiles</label> <label for="m3" class="col-sm-4 control-label">Nb. de tableaux 3 étoiles</label>
<div class="col-sm-6"> <div class="col-sm-6">
<input type="number" min="1" max="10" class="form-control" value="{{$paramjeu->m3}}" name="m3" id="m3" placeholder="4"> <input type="number" min="1" max="8" class="form-control" value="{{$paramjeu->m3}}" name="m3" id="m3" placeholder="4">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">