atualizacao

rafacasa · May 20, 2016 · 6762287 · 6762287
1 parent 3a00874
commit 6762287
Show file tree

Hide file tree

Showing 26 changed files with 27 additions and 44 deletions.
diff --git a/about.html b/about.html
@@ -9,7 +9,7 @@
     <meta name="description" content="">
     <meta name="author" content="">
 
-    <title>Simple Sidebar - Start Bootstrap Template</title>
+    <title>Jogo Da Memória</title>
 
     <!-- Bootstrap Core CSS -->
     <link href="css/bootstrap.min.css" rel="stylesheet">
@@ -66,6 +66,8 @@
 							<li>Gustavo</li>
 							<li>Erick</li>
 						</ul>
+
+                        <a href="http://github.com/rafacasa/JogoMemoria" class="btn btn-default">Código Fonte</a>
                     </div>
                 </div>
             </div>

diff --git a/estudo.html b/estudo.html
@@ -9,7 +9,7 @@
     <meta name="description" content="">
     <meta name="author" content="">
 
-    <title>Simple Sidebar - Start Bootstrap Template</title>
+    <title>Jogo Da Memória</title>
 
     <!-- Bootstrap Core CSS -->
     <link href="css/bootstrap.min.css" rel="stylesheet">
@@ -59,7 +59,13 @@
             <div class="container-fluid">
                 <div class="row">
                     <div class="col-lg-12">
-
+						<p>Este jogo da memória apresenta figuras importantes da história do Brasil</p>
+                        <a href="http://guiadoestudante.abril.com.br/aventuras-historia/dez-nomes-fundamentais-historia-brasil-799502.shtml" class="btn btn-default">Lista das personalidades com uma pequena descrição</a><br><br><br>
+                        <a href="http://www.sohistoria.com.br/ef2/histbrasil/" class="btn btn-default">Links para estudo da História do Brasil</a><br>
+                        <a href="http://brasilescola.uol.com.br/historiab/" class="btn btn-default">Links para estudo da História do Brasil</a><br>
+                        <a href="http://www.suapesquisa.com/historiadobrasil/" class="btn btn-default">Links para estudo da História do Brasil</a><br>
+                        <a href="http://mundoeducacao.bol.uol.com.br/historiadobrasil/" class="btn btn-default">Links para estudo da História do Brasil</a><br>
+                        <a href="http://www.historiadobrasil.net/" class="btn btn-default">Links para estudo da História do Brasil</a>
                     </div>
                 </div>
             </div>

diff --git a/final.html b/final.html
@@ -9,7 +9,7 @@
     <meta name="description" content="">
     <meta name="author" content="">
 
-    <title>Simple Sidebar - Start Bootstrap Template</title>
+    <title>Jogo Da Memória</title>
 
     <!-- Bootstrap Core CSS -->
     <link href="css/bootstrap.min.css" rel="stylesheet">

diff --git a/img/q01.jpg b/img/q01.jpg
diff --git a/img/q02.jpg b/img/q02.jpg
diff --git a/img/q03.jpg b/img/q03.jpg
diff --git a/img/q04.jpg b/img/q04.jpg
diff --git a/img/q05.jpg b/img/q05.jpg
diff --git a/img/q06.jpeg b/img/q06.jpeg
diff --git a/img/q07.jpg b/img/q07.jpg
diff --git a/img/q08.jpg b/img/q08.jpg
diff --git a/img/q09.JPG b/img/q09.JPG
diff --git a/img/q10.jpg b/img/q10.jpg
diff --git a/img/r01.jpg b/img/r01.jpg
diff --git a/img/r02.jpg b/img/r02.jpg
diff --git a/img/r03.jpg b/img/r03.jpg
diff --git a/img/r04.jpg b/img/r04.jpg
diff --git a/img/r05.jpg b/img/r05.jpg
diff --git a/img/r06.jpg b/img/r06.jpg
diff --git a/img/r07.jpg b/img/r07.jpg
diff --git a/img/r08.jpg b/img/r08.jpg
diff --git a/img/r09.jpg b/img/r09.jpg
diff --git a/img/r10.jpg b/img/r10.jpg
diff --git a/index.html b/index.html
@@ -9,7 +9,7 @@
     <meta name="description" content="">
     <meta name="author" content="">
 
-    <title>Simple Sidebar - Start Bootstrap Template</title>
+    <title>Jogo Da Memória</title>
 
     <!-- Bootstrap Core CSS -->
     <link href="css/bootstrap.min.css" rel="stylesheet">

diff --git a/js/memoria.js b/js/memoria.js
@@ -44,19 +44,11 @@
 						 "img/q03.jpg", "img/r03.jpg",
 						 "img/q04.jpg", "img/r04.jpg", 
 						 "img/q05.jpg", "img/r05.jpg",
-						 "img/q06.jpg", "img/r06.jpg",
+						 "img/q06.jpeg", "img/r06.jpg",
 						 "img/q07.jpg", "img/r07.jpg",
 						 "img/q08.jpg", "img/r08.jpg",
 						 "img/q09.jpg", "img/r09.jpg",
-						 "img/q10.jpg", "img/r10.jpg",
-						 "img/q11.jpg", "img/r11.jpg",
-						 "img/q12.jpg", "img/r12.jpg",
-						 "img/q13.jpg", "img/r13.jpg",
-						 "img/q14.jpg", "img/r14.jpg",
-						 "img/q15.jpg", "img/r15.jpg",
-						 "img/q16.jpg", "img/r16.jpg",
-						 "img/q17.jpg", "img/r17.jpg",
-						 "img/q18.jpg", "img/r18.jpg"];
+						 "img/q10.jpg", "img/r10.jpg",];
 			return shuffle(array);
 		}
 
@@ -66,7 +58,7 @@
 		}
 
 		function checkFimDeJogo() {
-			if(acertosP1 + acertosP2 === 18) {
+			if(acertosP1 + acertosP2 === 10) {
 				if(acertosP1 > acertosP2) {
 					redirecionar(nomePlayer1);
 				} else if (acertosP2 > acertosP1) {
@@ -147,7 +139,7 @@
 		function mostrarTodas() {
 			var i;
 			var nome;
-			for(i = 0; i < 36; i++){
+			for(i = 0; i < 20; i++){
 				nome = "img" + i;
 				document.getElementById(nome).src = arrayImagens[i];
 			}		
@@ -177,6 +169,6 @@
 			setTimeout(function() {
 				fecharTodas();
 				desbloquearBotoes();
-			}, 2000);
+			}, 3000);
 		}
 		//http://tutsmais.com.br/blog/javascript-2/metodos-funcoes-javascript-number-array-string-regexp/#sumario
diff --git a/main.html b/main.html
@@ -9,7 +9,7 @@
     <meta name="description" content="">
     <meta name="author" content="">
 
-    <title>Simple Sidebar - Start Bootstrap Template</title>
+    <title>Jogo Da Memória</title>
 
     <!-- Bootstrap Core CSS -->
     <link href="css/bootstrap.min.css" rel="stylesheet">
@@ -74,47 +74,30 @@
                                 <td><button id="but2" type="button" onClick="clique(2)" class="oculto"><img id="img2" src="img/oculto.jpg" class="imagem" width=100px height=100px></button></td>
                                 <td><button id="but3" type="button" onClick="clique(3)" class="oculto"><img id="img3" src="img/oculto.jpg" class="imagem" width=100px height=100px></button></td>
                                 <td><button id="but4" type="button" onClick="clique(4)" class="oculto"><img id="img4" src="img/oculto.jpg" class="imagem" width=100px height=100px></button></td>
-                                <td><button id="but5" type="button" onClick="clique(5)" class="oculto"><img id="img5" src="img/oculto.jpg" class="imagem" width=100px height=100px></button></td>
+
                             </tr>
                             <tr>
+                                <td><button id="but5" type="button" onClick="clique(5)" class="oculto"><img id="img5" src="img/oculto.jpg" class="imagem" width=100px height=100px></button></td>
                                 <td><button id="but6" type="button" onClick="clique(6)" class="oculto"><img id="img6" src="img/oculto.jpg" class="imagem" width=100px height=100px></button></td>
                                 <td><button id="but7" type="button" onClick="clique(7)" class="oculto"><img id="img7" src="img/oculto.jpg" class="imagem" width=100px height=100px></button></td>
                                 <td><button id="but8" type="button" onClick="clique(8)" class="oculto"><img id="img8" src="img/oculto.jpg" class="imagem" width=100px height=100px></button></td>
                                 <td><button id="but9" type="button" onClick="clique(9)" class="oculto"><img id="img9" src="img/oculto.jpg" class="imagem" width=100px height=100px></button></td>
-                                <td><button id="but10" type="button" onClick="clique(10)" class="oculto"><img id="img10" src="img/oculto.jpg" class="imagem" width=100px height=100px></button></td>
-                                <td><button id="but11" type="button" onClick="clique(11)" class="oculto"><img id="img11" src="img/oculto.jpg" class="imagem" width=100px height=100px></button></td>
+
                             </tr>
                             <tr>
+                                <td><button id="but10" type="button" onClick="clique(10)" class="oculto"><img id="img10" src="img/oculto.jpg" class="imagem" width=100px height=100px></button></td>
+                                <td><button id="but11" type="button" onClick="clique(11)" class="oculto"><img id="img11" src="img/oculto.jpg" class="imagem" width=100px height=100px></button></td>
                                 <td><button id="but12" type="button" onClick="clique(12)" class="oculto"><img id="img12" src="img/oculto.jpg" class="imagem" width=100px height=100px></button></td>
                                 <td><button id="but13" type="button" onClick="clique(13)" class="oculto"><img id="img13" src="img/oculto.jpg" class="imagem" width=100px height=100px></button></td>
                                 <td><button id="but14" type="button" onClick="clique(14)" class="oculto"><img id="img14" src="img/oculto.jpg" class="imagem" width=100px height=100px></button></td>
+
+                            </tr>
+                            <tr>
                                 <td><button id="but15" type="button" onClick="clique(15)" class="oculto"><img id="img15" src="img/oculto.jpg" class="imagem" width=100px height=100px></button></td>
                                 <td><button id="but16" type="button" onClick="clique(16)" class="oculto"><img id="img16" src="img/oculto.jpg" class="imagem" width=100px height=100px></button></td>
                                 <td><button id="but17" type="button" onClick="clique(17)" class="oculto"><img id="img17" src="img/oculto.jpg" class="imagem" width=100px height=100px></button></td>
-                            </tr>
-                            <tr>
                                 <td><button id="but18" type="button" onClick="clique(18)" class="oculto"><img id="img18" src="img/oculto.jpg" class="imagem" width=100px height=100px></button></td>
                                 <td><button id="but19" type="button" onClick="clique(19)" class="oculto"><img id="img19" src="img/oculto.jpg" class="imagem" width=100px height=100px></button></td>
-                                <td><button id="but20" type="button" onClick="clique(20)" class="oculto"><img id="img20" src="img/oculto.jpg" class="imagem" width=100px height=100px></button></td>
-                                <td><button id="but21" type="button" onClick="clique(21)" class="oculto"><img id="img21" src="img/oculto.jpg" class="imagem" width=100px height=100px></button></td>
-                                <td><button id="but22" type="button" onClick="clique(22)" class="oculto"><img id="img22" src="img/oculto.jpg" class="imagem" width=100px height=100px></button></td>
-                                <td><button id="but23" type="button" onClick="clique(23)" class="oculto"><img id="img23" src="img/oculto.jpg" class="imagem" width=100px height=100px></button></td>
-                            </tr>
-                            <tr>
-                                <td><button id="but24" type="button" onClick="clique(24)" class="oculto"><img id="img24" src="img/oculto.jpg" class="imagem" width=100px height=100px></button></td>
-                                <td><button id="but25" type="button" onClick="clique(25)" class="oculto"><img id="img25" src="img/oculto.jpg" class="imagem" width=100px height=100px></button></td>
-                                <td><button id="but26" type="button" onClick="clique(26)" class="oculto"><img id="img26" src="img/oculto.jpg" class="imagem" width=100px height=100px></button></td>
-                                <td><button id="but27" type="button" onClick="clique(27)" class="oculto"><img id="img27" src="img/oculto.jpg" class="imagem" width=100px height=100px></button></td>
-                                <td><button id="but28" type="button" onClick="clique(28)" class="oculto"><img id="img28" src="img/oculto.jpg" class="imagem" width=100px height=100px></button></td>
-                                <td><button id="but29" type="button" onClick="clique(29)" class="oculto"><img id="img29" src="img/oculto.jpg" class="imagem" width=100px height=100px></button></td>
-                            </tr>
-                            <tr>
-                                <td><button id="but30" type="button" onClick="clique(30)" class="oculto"><img id="img30" src="img/oculto.jpg" class="imagem" width=100px height=100px></button></td>
-                                <td><button id="but31" type="button" onClick="clique(31)" class="oculto"><img id="img31" src="img/oculto.jpg" class="imagem" width=100px height=100px></button></td>
-                                <td><button id="but32" type="button" onClick="clique(32)" class="oculto"><img id="img32" src="img/oculto.jpg" class="imagem" width=100px height=100px></button></td>
-                                <td><button id="but33" type="button" onClick="clique(33)" class="oculto"><img id="img33" src="img/oculto.jpg" class="imagem" width=100px height=100px></button></td>
-                                <td><button id="but34" type="button" onClick="clique(34)" class="oculto"><img id="img34" src="img/oculto.jpg" class="imagem" width=100px height=100px></button></td>
-                                <td><button id="but35" type="button" onClick="clique(35)" class="oculto"><img id="img35" src="img/oculto.jpg" class="imagem" width=100px height=100px></button></td>
                             </tr>
                         </table>
                     </div>