diff --git a/luckydiamond/src/assets/css/ComponentsStyles/Help.css b/luckydiamond/src/assets/css/ComponentsStyles/Help.css index e98aba4..0100505 100644 --- a/luckydiamond/src/assets/css/ComponentsStyles/Help.css +++ b/luckydiamond/src/assets/css/ComponentsStyles/Help.css @@ -86,7 +86,13 @@ margin-top: 3.5px; display: flex; justify-content: space-around; align-content: center; - margin-top: 40px; + margin-top: 3vh; +} + +@media (max-height: 879px) { + .Social1where { + margin-top: 0; + } } .questions_box { margin-bottom: 24px; diff --git a/luckydiamond/src/assets/css/PagesStyles/games-pages/jackpot.css b/luckydiamond/src/assets/css/PagesStyles/games-pages/jackpot.css index eab476d..a3bce2b 100644 --- a/luckydiamond/src/assets/css/PagesStyles/games-pages/jackpot.css +++ b/luckydiamond/src/assets/css/PagesStyles/games-pages/jackpot.css @@ -106,8 +106,8 @@ } .padding-elements-jackpot { - padding-left: 5%; - padding-right: 5%; + padding-left: 1vh; + padding-right: 1vh; } .jackpot-start__btns { diff --git a/luckydiamond/src/assets/css/PagesStyles/games-pages/saper.css b/luckydiamond/src/assets/css/PagesStyles/games-pages/saper.css index aae53d8..3f2c7eb 100644 --- a/luckydiamond/src/assets/css/PagesStyles/games-pages/saper.css +++ b/luckydiamond/src/assets/css/PagesStyles/games-pages/saper.css @@ -136,9 +136,22 @@ display: flex; } +#diamonds-input-saper { + width: 37vh; + height: 4vh; +} + +@media (max-width: 1630px) { + #diamonds-input-saper { + width: 30vh !important; + } +} + #diamonds-input { - width: 347px; - height: 38px; + /* width: 347px; + height: 38px; */ + width: 37vh; + height: 4vh; } .diamonds h3 { @@ -469,9 +482,11 @@ .saper-game__content { width: auto; } + .error-block { top: 425px; } + .saper-start { width: 30%; height: 500px; @@ -519,12 +534,15 @@ .btns-style__steps button { padding: 6px 9px; } + .emeralds-bg { top: -23%; } + .crystals-bg { top: -21%; } + .card-info img { width: 100%; } @@ -550,9 +568,11 @@ .bg-two { left: 300px; } + .error-block { top: 410px; } + .saper-game__content { width: auto; } @@ -624,12 +644,15 @@ .btns-style__steps button { padding: 6px 4px; } + .emeralds-bg { top: -24%; } + .crystals-bg { top: -22%; } + .card-info img { width: 100%; } diff --git a/luckydiamond/src/assets/css/PagesStyles/home.css b/luckydiamond/src/assets/css/PagesStyles/home.css index 6e82df0..a7339d5 100644 --- a/luckydiamond/src/assets/css/PagesStyles/home.css +++ b/luckydiamond/src/assets/css/PagesStyles/home.css @@ -218,7 +218,19 @@ .line__btn--elm { color: #000; - font-size: 38px; + font-size: 38px ; +} + +.line__btn--elm--saper { + color: #000; + font-size: 4vh !important; +} + +@media (max-width: 1565px) { + .line__btn--elm--saper { + font-size: 2vh !important; + display: none; + } } .linecontent-2 { @@ -289,6 +301,12 @@ /* Media */ +@media (max-width: 1586px) { + #diamonds-input-saper { + width: 30vh !important; + } +} + @media screen and (min-device-width: 1400px) and (max-device-width: 1600px) { .header__auth--discord { width: 14%; @@ -320,7 +338,9 @@ } .line__content .line__btn--main .line__btn { left: 0; - top: -.4em; + top: 2vh; + /* top: -.4em; */ + /* top: top: 2vh;; */ } .line__img { margin: 1% -8% 0 30%; diff --git a/luckydiamond/src/assets/css/global.css b/luckydiamond/src/assets/css/global.css index 5d08b65..40e5e42 100644 --- a/luckydiamond/src/assets/css/global.css +++ b/luckydiamond/src/assets/css/global.css @@ -159,8 +159,8 @@ button { background: #16171B; filter: drop-shadow(0px 0.25rem 0.25rem rgba(0, 0, 0, 0.25)); border-radius: 15px; - /* border-radius: 1.25rem; */ - height: 100%; + /* height: 100%; */ + height: 86vh; position: relative; z-index: 3; @@ -278,7 +278,8 @@ button { .help { grid-area: help; display: flex; - height:99%; + /* height:99%; */ + height:86vh; border-radius: 3.125rem; background: #17181C; box-shadow: 0.25rem 0.25rem 0.25rem 0px rgba(0, 0, 0, 0.25); diff --git a/luckydiamond/src/pages/HomePage.vue b/luckydiamond/src/pages/HomePage.vue index 3da8a33..41ce281 100644 --- a/luckydiamond/src/pages/HomePage.vue +++ b/luckydiamond/src/pages/HomePage.vue @@ -42,7 +42,7 @@ href="#" @click="$router.push({ name: 'saper' })" class="line__btn" - >play >play > diff --git a/luckydiamond/src/pages/games-pages/JackpotPage.vue b/luckydiamond/src/pages/games-pages/JackpotPage.vue index f98f594..fb183c1 100644 --- a/luckydiamond/src/pages/games-pages/JackpotPage.vue +++ b/luckydiamond/src/pages/games-pages/JackpotPage.vue @@ -310,8 +310,8 @@ export default { autoplay: 0, player: { name: "", - gems: 1000, - avatarUrl: "https://avatar.spworlds.ru/face/55/test", + gems: 100, + avatarUrl: "https://avatar.spworlds.ru/face/55/Hepatir", chance: "100%", // name: "FUpir", // gems: 500, @@ -497,18 +497,18 @@ export default { // const numberOfCards = player.WinningPercentage / 10; // Предполагаем, что 10% это 1 карточка for (let i = 0; i < numberOfCards; i++) { if (i == 0) { - if (this.firstStartOfPage) { - this.slides.push({ - img: `https://avatar.spworlds.ru/face/55/${this.player.name}.png`, // Предполагаем структуру URL из имени пользователя - nickname: this.player.name, - }); - this.firstStartOfPage = false; - } else { - this.slides.push({ - img: `https://avatar.spworlds.ru/face/55/${player.UserName}.png`, // Предполагаем структуру URL из имени пользователя - nickname: player.UserName, - }); - } + // if (this.firstStartOfPage) { + // this.slides.push({ + // img: `https://avatar.spworlds.ru/face/55/${this.player.name}.png`, // Предполагаем структуру URL из имени пользователя + // nickname: this.player.name, + // }); + // this.firstStartOfPage = false; + // } else { + this.slides.push({ + img: `https://avatar.spworlds.ru/face/55/${player.UserName}.png`, // Предполагаем структуру URL из имени пользователя + nickname: player.UserName, + }); + // } } this.slides.push({ img: `https://avatar.spworlds.ru/face/55/${player.UserName}.png`, // Предполагаем структуру URL из имени пользователя @@ -585,7 +585,9 @@ export default { if (this.remainingSeconds > 8) { progressText.textContent = `${this.remainingSeconds}`; } else { - progressText.textContent = `${this.remainingSeconds} СЕК`; + if (this.remainingSeconds != 0) { + progressText.textContent = `${this.remainingSeconds} СЕК`; + } } progressText.style.opacity = "1"; }, 500); // Задержка должна соответствовать продолжительности анимации @@ -675,6 +677,10 @@ export default { if (dataObject.CurrentGame.GameState == "WaitingForPlayers") { console.log("Waiting for players"); console.log("Put there earlies cards"); + + // if (dataObject.CurrentGame.GameState != "Running") { + + // } this.lastUserWinner = dataObject.LastGame.WinnerUserName; this.lastUserWinerGameId = dataObject.LastGame.Id; if (this.lastUserWinerGameId == this.idCurrentGame) { @@ -701,12 +707,6 @@ export default { this.startGameTimer(dataObject.CurrentGame.StartGameUtc); } - this.updatePlayerInfo( - dataObject.LastGame.WinnerUserName, - dataObject.LastGame.WinStake, - dataObject.LastGame.WinnerPercentage - ); - if (dataObject.CurrentGame.GameState == "Running") { this.autoplay = 20; if (this.idCurrentGame == "") { @@ -718,6 +718,13 @@ export default { ); } } + if (this.idCurrentGame == "") { + this.updatePlayerInfo( + dataObject.LastGame.WinnerUserName, + dataObject.LastGame.WinStake, + dataObject.LastGame.WinnerPercentage + ); + } } else { // Если данные не определены или пусты, выводим соответствующее сообщение в консоль console.log("Received undefined or null data"); diff --git a/luckydiamond/src/pages/games-pages/SapergamePage.vue b/luckydiamond/src/pages/games-pages/SapergamePage.vue index 2a2b993..09f52d3 100644 --- a/luckydiamond/src/pages/games-pages/SapergamePage.vue +++ b/luckydiamond/src/pages/games-pages/SapergamePage.vue @@ -29,7 +29,7 @@