diff --git a/luckydiamond/src/assets/js/chat/ChatLogic.js b/luckydiamond/src/assets/js/chat/ChatLogic.js index d5f88da..baa1da5 100644 --- a/luckydiamond/src/assets/js/chat/ChatLogic.js +++ b/luckydiamond/src/assets/js/chat/ChatLogic.js @@ -23,13 +23,18 @@ export function ConnectToChat() { try { const dataObject = JSON.parse(event.data); - console.log(dataObject) if (dataObject && Object.prototype.hasOwnProperty.call(dataObject, 'SpUserName') && Object.prototype.hasOwnProperty.call(dataObject, 'Message')) { eventBus.emit('dataChat', event.data); return; } + if (dataObject.MessageType == 'DoubleGameState') { + eventBus.emit('doubleGame', event.data) + console.log('data') + return; + } + if (dataObject.MessageType == "CrashGameState") { eventBus.emit('crash', event.data); return; @@ -41,12 +46,6 @@ export function ConnectToChat() { return; } - if (dataObject.MessageType == 'DoubleGameState') { - eventBus.emit('doubleGame', event.data) - console.log('data') - return; - } - } catch (error) { void(error); } diff --git a/luckydiamond/src/pages/games-pages/DoublePage.vue b/luckydiamond/src/pages/games-pages/DoublePage.vue index 87dbd14..96bff9f 100644 --- a/luckydiamond/src/pages/games-pages/DoublePage.vue +++ b/luckydiamond/src/pages/games-pages/DoublePage.vue @@ -65,44 +65,58 @@ export default { const slides = reactive([ { img: require("@/assets/icons-games/double-game/RectangleBlackDouble.png"), - target: "BlackDouble", + target: "Black", }, { img: require("@/assets/icons-games/double-game/RectangleBlackDouble.png"), - target: "BlackDouble", + target: "Red", }, { img: require("@/assets/icons-games/double-game/RectangleGreenDouble.png"), - target: "GreenDouble", + target: "Green", }, { img: require("@/assets/icons-games/double-game/RectangleRedDouble.png"), - target: "RedDouble", + target: "Red", }, { img: require("@/assets/icons-games/double-game/RectangleBlackDouble.png"), - target: "BlackDouble", + target: "Black", }, { img: require("@/assets/icons-games/double-game/RectangleBlackDouble.png"), - target: "BlackDouble", + target: "Red", }, ]) - let autoPlay = ref(500) + let autoPlay = ref(0) + let targetColor = ref('') onMounted(() => { eventBus.on('doubleGame', (dataDouble) => { - console.log(dataDouble) + console.log('data mounted') + const dataDoubleParse = JSON.parse(dataDouble) + console.log(dataDoubleParse) + + if (dataDoubleParse.Status === 'InGame') { + autoPlay.value = 500 + targetColor.value = dataDoubleParse.WInColor + console.log('213') + } + // else if (dataDoubleParse.Status === 'GameEnd') { + // targetColor.value = dataDoubleParse.WInColor + // } }) - console.log('mount') }) function handleStepCarousel(data) { try { - let { currentSlideIndex } = data + if (targetColor.value !== '') { + let { currentSlideIndex } = data + console.log(slides[currentSlideIndex].target == targetColor.value) - if (slides[currentSlideIndex + 1].target == 'RedDouble') { - stopAutoPlay() + if (slides[currentSlideIndex + 1].target == targetColor.value) { + stopAutoPlay() + } } } catch (error) { @@ -114,7 +128,7 @@ export default { autoPlay.value = 0 } - return { slides, autoPlay, handleStepCarousel, stopAutoPlay } + return { slides, autoPlay, handleStepCarousel, stopAutoPlay, targetColor } }, }