Skip to content

Commit c11672f

Browse files
debug
1 parent 819bcdf commit c11672f

6 files changed

Lines changed: 40 additions & 10 deletions

File tree

end.html

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,19 @@
1515
background-image: url('./img/images.jpg');
1616
background-size: cover;
1717
background-repeat: no-repeat;
18+
display: flex;
19+
justify-content: center;
20+
align-items: center;
1821
}
1922
a {
2023
text-decoration: none;
2124
color: rgb(70, 143, 143);
2225
font-size: 20px;
2326
font-family: Jura;
27+
align-self: flex-start;
28+
justify-self: left;
29+
position: absolute;
30+
pointer-events: auto;
2431
}
2532
button {
2633
background-color: rgb(70, 143, 143);
@@ -31,6 +38,11 @@
3138
font-family: Jura, sans-serif;
3239
transition: 200ms;
3340
outline: none;
41+
align-self: flex-start;
42+
justify-self: left;
43+
position: absolute;
44+
margin-top: 30px;
45+
pointer-events: auto;
3446
}
3547
button:hover {
3648
transform: scale(1.03);
@@ -39,12 +51,13 @@
3951
video {
4052
width: 100%;
4153
height: 700px;
54+
pointer-events: none;
4255
}
4356
</style>
4457
<body>
45-
<video src="./video/конец.mp4"></video>
4658
<button id="see" type="button">Смотреть</button> <br>
4759
<a href="index.html">Вернуться</a>
60+
<video src="./video/конец.mp4"></video>
4861
<script>
4962
setInterval(()=>{
5063
if(
@@ -63,7 +76,7 @@
6376

6477
setTimeout(()=>{
6578
document.location.href = "index.html"
66-
},42000)
79+
},44000)
6780

6881

6982
</script>

script2.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,14 +190,14 @@ document.querySelector('#toMainMenu').addEventListener('click', ()=>{
190190
document.location.href = "index.html"
191191
})
192192
document.querySelector('#reload_').addEventListener('click', ()=>{
193-
document.querySelector("#modal").close()
193+
document.querySelector("#winModal").close()
194194
setTimeout(()=>{
195195
document.location.reload()
196196
},500)
197197
})
198198

199199
document.querySelector('#toMainMenu_').addEventListener('click', ()=>{
200-
document.querySelector("#modal").close()
200+
document.querySelector("#winModal").close()
201201
document.location.href = "index.html"
202202
})
203203
document.querySelector('#pause').addEventListener('click', ()=>{

script3.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -257,14 +257,14 @@ document.querySelector('#toMainMenu').addEventListener('click', ()=>{
257257
document.location.href = "index.html"
258258
})
259259
document.querySelector('#reload_').addEventListener('click', ()=>{
260-
document.querySelector("#modal").close()
260+
document.querySelector("#winModal").close()
261261
setTimeout(()=>{
262262
document.location.reload()
263263
},500)
264264
})
265265

266266
document.querySelector('#toMainMenu_').addEventListener('click', ()=>{
267-
document.querySelector("#modal").close()
267+
document.querySelector("#winModal").close()
268268
document.location.href = "index.html"
269269
})
270270
document.querySelector('#pause').addEventListener('click', ()=>{

script4.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ let crow = new GameObject(corova, randCords, Y,60,36);
9393
let __pult__ = new GameObject(pult, pl.x, pl.y, 32,22);
9494
let c = new GameObject(car, pl.x,160, 40,60);
9595
async function Game() {
96-
document.querySelector('#time').innerHTML = `${ziroMin}${minets}:${ziroSec}${seconds} / 01:20 | ${crushed} / 25`
96+
document.querySelector('#time').innerHTML = `${ziroMin}${minets}:${ziroSec}${seconds} / 01:30 | ${crushed} / 25`
9797
await ctx.clearRect(0,0,cnv.width,cnv.height);
9898
await ctx.drawImage(backround,0,0,cnv.width,cnv.height);
9999
await ctx.drawImage(pl.src, plThreeCords[place], pl.y, pl.width, pl.height);
@@ -188,6 +188,7 @@ function Crush() {
188188
},2800)
189189
}
190190
document.addEventListener('click', ()=>{
191+
isScream = true
191192
isTick = true;
192193
isTick == true ? tick.play() : 0;
193194
isTick == true ? fermer.play() : 0;
@@ -222,7 +223,7 @@ function corowDespawn () {
222223
randCords = threeCords[place_Crow];
223224
crow.x = randCords
224225
isCrush = true
225-
},1500)
226+
},1200)
226227
}
227228

228229
const findDead = window.setInterval(()=>{
@@ -269,7 +270,7 @@ function Dead() {
269270
mu.volume = 0;
270271
setTimeout(()=>{
271272
scream.volume = 0;
272-
},1200)
273+
},1700)
273274

274275
crush.volume = 0;
275276
brim.volume = 0;
@@ -280,7 +281,7 @@ function Dead() {
280281
}
281282

282283
const findWin = setInterval(()=>{
283-
if(seconds >= 20 && minets == 1) {
284+
if(seconds >= 30 && minets >= 1) {
284285
if(crushed >= 25) {
285286
Win();
286287
} else {

style4.css

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,4 +181,20 @@ a {
181181
button {
182182
width: 100px;
183183
}
184+
}
185+
@media screen and (max-width: 208px) {
186+
canvas {
187+
width: 100px;
188+
height: 100px;
189+
margin-bottom: 0px;
190+
}
191+
#time {
192+
position: absolute;
193+
margin-bottom: 20px;
194+
font-size: 10px;
195+
}
196+
button {
197+
width: 50px;
198+
font-size: 7px;
199+
}
184200
}

video/конец.mp4

601 KB
Binary file not shown.

0 commit comments

Comments
 (0)