barraux.a
/
MSJSAboulinBarraux
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

ttesg

master
alexandre.aboulin 3 years ago
parent
61f88ed3fa
commit
dc988e2bfa
3 changed files with 20 additions and 23 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      app.js
  2. 5
      index.html
  3. 18
      master.css

20
app.js
View File

@ -19,18 +19,6 @@ function nbAlea(){
// Anime les rouleaux // Anime les rouleaux
function rotate(rouleau, angle){ function rotate(rouleau, angle){
<<<<<<< HEAD
let i = 0;
let interval = setInterval(() => {
if (i >= angle){
clearInterval(interval);
}
else {
i += 9;
rouleau.style.transform = 'rotate3d(1,0,0,'+i+'deg)';
}
}, 5);
=======
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let i = 0; let i = 0;
let interval = setInterval(() => { let interval = setInterval(() => {
@ -45,7 +33,6 @@ function rotate(rouleau, angle){
} }
}, 5); }, 5);
}) })
>>>>>>> ed8a1808293ee88f1efde28836b84c43b34781eb
} }
@ -69,18 +56,11 @@ function tirette(){
async function tirage(){ async function tirage(){
let numbers = [nbAlea(), nbAlea(), nbAlea()] let numbers = [nbAlea(), nbAlea(), nbAlea()]
<<<<<<< HEAD
console.log(numbers);
rotate(document.getElementsByClassName("cube")[0], Math.floor(Math.random()*(15-1)+1)*360 - numbers[0]*36);
rotate(document.getElementsByClassName("cube")[1], Math.floor(Math.random()*(15-1)+1)*360 - numbers[1]*36);
rotate(document.getElementsByClassName("cube")[2], Math.floor(Math.random()*(15-1)+1)*360 - numbers[2]*36);
=======
await Promise.all([ await Promise.all([
rotate(document.getElementsByClassName("cube")[0], (Math.floor(Math.random()*15)*360) - (numbers[0]*36)), rotate(document.getElementsByClassName("cube")[0], (Math.floor(Math.random()*15)*360) - (numbers[0]*36)),
rotate(document.getElementsByClassName("cube")[1], (Math.floor(Math.random()*15)*360) - (numbers[1]*36)), rotate(document.getElementsByClassName("cube")[1], (Math.floor(Math.random()*15)*360) - (numbers[1]*36)),
rotate(document.getElementsByClassName("cube")[2], (Math.floor(Math.random()*15)*360) - (numbers[2]*36)) rotate(document.getElementsByClassName("cube")[2], (Math.floor(Math.random()*15)*360) - (numbers[2]*36))
]) ])
>>>>>>> ed8a1808293ee88f1efde28836b84c43b34781eb
return numbers return numbers
} }

5
index.html
View File

@ -8,7 +8,6 @@
<body> <body>
<img src="tirette.png" alt="tirette" id="tirette" onclick="jeu()"> <img src="tirette.png" alt="tirette" id="tirette" onclick="jeu()">
<img src="machine.png" id="tirage"> <img src="machine.png" id="tirage">
<div id="rouleau_1" class="rouleau"> <div id="rouleau_1" class="rouleau">
<div class="cube"> <div class="cube">
<div class="cube__face cube__face--0">0</div> <div class="cube__face cube__face--0">0</div>
@ -60,8 +59,8 @@
<p>Banque : <span id="banque_score">1000</span></p> <p>Banque : <span id="banque_score">1000</span></p>
<p>Vous : <span id="joueur_score"></span></p> <p>Vous : <span id="joueur_score"></span></p>
<div class="regles"> <div class="overlay">
<div class="regles-container"> <div class="overlay-container">
Règles Règles
</div> </div>
</div> </div>

18
master.css
View File

@ -70,3 +70,21 @@ body{
box-shadow: 0px 0px 37px black; box-shadow: 0px 0px 37px black;
} }
.overlay{
background-color: black;
opacity: 0.5;
height: 100%;
width: 100%;
position: absolute;
top: 0;
left: 0;
display: flex;
align-items: center;
justify-content: center;
}
.overlay-container{
background-color: white;
width: 40vw;
height: 20vh;
}
Write Preview
Loading…
Cancel
Save