diff --git a/luckydiamond/src/assets/js/chat/ChatLogic.js b/luckydiamond/src/assets/js/chat/ChatLogic.js index 9dea039..b55badc 100644 --- a/luckydiamond/src/assets/js/chat/ChatLogic.js +++ b/luckydiamond/src/assets/js/chat/ChatLogic.js @@ -28,11 +28,14 @@ export function ConnectToChat() { eventBus.emit('dataChat', event.data); console.log('CHAT') } - else { + + if (data.MessageType == "CrashGameState") { eventBus.emit('crash', event.data) } - // console.log('Message from Server:', event.data); + if (Array.isArray(data.CurrentGame.PlayerList)) { + eventBus.emit('jackpotGameTik', event.data) + } }; webSocket.onclose = function () { diff --git a/luckydiamond/src/assets/js/jackpot/JackpotLogic.js b/luckydiamond/src/assets/js/jackpot/JackpotLogic.js index ef1fa78..3213b34 100644 --- a/luckydiamond/src/assets/js/jackpot/JackpotLogic.js +++ b/luckydiamond/src/assets/js/jackpot/JackpotLogic.js @@ -1,59 +1,59 @@ -import { BackendWebSocketJackpotUrl } from '@/properties/Сonfig.js'; +// import { BackendWebSocketJackpotUrl } from '@/properties/Сonfig.js'; import { BackendApiUrl } from '@/properties/Сonfig.js'; -import { eventBus } from "@/main"; +// import { eventBus } from "@/main"; // import { // GetCookie // } from "@/assets/js/storage/CookieStorage.js"; -let webSocket; +// let webSocket; -export function ConnectToJackpotSocket() { - try { +// export function ConnectToJackpotSocket() { +// try { - if (webSocket && webSocket.readyState === WebSocket.OPEN) { - console.log('WebSocket connection already established.'); - return; - } +// if (webSocket && webSocket.readyState === WebSocket.OPEN) { +// console.log('WebSocket connection already established.'); +// return; +// } - webSocket = new WebSocket(BackendWebSocketJackpotUrl); +// webSocket = new WebSocket(BackendWebSocketJackpotUrl); - webSocket.onopen = function () { - console.log('Connection established'); - }; +// webSocket.onopen = function () { +// console.log('Connection established'); +// }; - webSocket.onmessage = function (event) { +// webSocket.onmessage = function (event) { - // const dataObject = JSON.parse(event.data); +// // const dataObject = JSON.parse(event.data); - eventBus.emit('jackpotGameTik', event.data); +// eventBus.emit('jackpotGameTik', event.data); - // console.log(dataObject) - // if (dataObject && Object.prototype.hasOwnProperty.call(dataObject, 'SpUserName') && Object.prototype.hasOwnProperty.call(dataObject, 'Message')) { - // eventBus.emit('dataChat', event.data); - // console.log('CHAT') - // } - // else { - // eventBus.emit('crash', event.data) - // } +// // console.log(dataObject) +// // if (dataObject && Object.prototype.hasOwnProperty.call(dataObject, 'SpUserName') && Object.prototype.hasOwnProperty.call(dataObject, 'Message')) { +// // eventBus.emit('dataChat', event.data); +// // console.log('CHAT') +// // } +// // else { +// // eventBus.emit('crash', event.data) +// // } - }; +// }; - webSocket.onclose = function () { +// webSocket.onclose = function () { - webSocket = new WebSocket(BackendWebSocketJackpotUrl); +// webSocket = new WebSocket(BackendWebSocketJackpotUrl); - console.log('Connection closed and reconnected'); - }; +// console.log('Connection closed and reconnected'); +// }; - webSocket.onerror = function (event) { - webSocket = new WebSocket(BackendWebSocketJackpotUrl); - console.error('WebSocket Error:', event); - }; - } catch (error) { - console.error('Error in ConnectToChat:', error); - } -} +// webSocket.onerror = function (event) { +// webSocket = new WebSocket(BackendWebSocketJackpotUrl); +// console.error('WebSocket Error:', event); +// }; +// } catch (error) { +// console.error('Error in ConnectToChat:', error); +// } +// } export async function JoinJackpotGame(userData, amount) { const data = { diff --git a/luckydiamond/src/pages/games-pages/JackpotPage.vue b/luckydiamond/src/pages/games-pages/JackpotPage.vue index ce76fc3..2e43079 100644 --- a/luckydiamond/src/pages/games-pages/JackpotPage.vue +++ b/luckydiamond/src/pages/games-pages/JackpotPage.vue @@ -263,7 +263,7 @@ import "@/assets/css/PagesStyles/games-pages/jackpot.css"; import "@/assets/css/global.css"; import JackpotNumbers from "@/mocks/JackpotNumbers"; import { - ConnectToJackpotSocket, + // ConnectToJackpotSocket, JoinJackpotGame, } from "@/assets/js/jackpot/JackpotLogic.js"; import { useVuelidate } from "@vuelidate/core"; @@ -659,7 +659,7 @@ export default { }, }, mounted() { - ConnectToJackpotSocket(); + // ConnectToJackpotSocket(); eventBus.on("jackpotGameTik", (data) => { try {