Commit f8407767 authored by 华国豪's avatar 华国豪 🙄

1

parent 0139e752
...@@ -821,7 +821,7 @@ ...@@ -821,7 +821,7 @@
right: .5%; right: .5%;
z-index: 1000; z-index: 1000;
width: 160px; width: 160px;
height: 80px; height: 85px;
border-radius: 8px; border-radius: 8px;
background: url(../../../static/image/shuqian/g_footer_bg2.png) no-repeat; background: url(../../../static/image/shuqian/g_footer_bg2.png) no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
...@@ -830,6 +830,9 @@ ...@@ -830,6 +830,9 @@
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
.dalaoshu .hd-game-btn-container.hd-game-btn-container2{
width: 120px;
}
.dalaoshu .hd-game-btn-container .hd-game-btn { .dalaoshu .hd-game-btn-container .hd-game-btn {
min-width: 70px; min-width: 70px;
max-width: 100px; max-width: 100px;
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
position: relative; position: relative;
opacity: 0.1; opacity: 0.1;
transition: opacity linear 4s; transition: opacity linear 4s;
padding-right: 20rem; padding-right: 16rem;
box-sizing: border-box; box-sizing: border-box;
} }
.pageNav .left_nav:hover{ .pageNav .left_nav:hover{
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
width: 8rem; width: 8rem;
height: 5.16rem; height: 5.16rem;
border-radius: 5px; border-radius: 5px;
margin-left: 5px; margin-right: 1rem;
background: rgba(35,35,45,.7); background: rgba(35,35,45,.7);
text-align: center; text-align: center;
cursor: pointer; cursor: pointer;
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
} }
.control_btn{ .control_btn{
position: absolute; position: absolute;
right: 12rem; right: 16rem;
} }
.music_box{ .music_box{
position: absolute; position: absolute;
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
color: #e9d5ab !important; color: #e9d5ab !important;
border: none; border: none;
width: 100px; width: 100px;
padding-right: 0 !important; padding: 0 !important;
text-align: center; text-align: center;
} }
.music-select .el-input__suffix{ .music-select .el-input__suffix{
...@@ -108,4 +108,5 @@ ...@@ -108,4 +108,5 @@
.music_box .iconfont{ .music_box .iconfont{
font-size: 2.8rem; font-size: 2.8rem;
cursor: pointer; cursor: pointer;
margin-right: .8rem;
} }
\ No newline at end of file
...@@ -164,7 +164,7 @@ ...@@ -164,7 +164,7 @@
right: 0.5%; right: 0.5%;
z-index: 1000; z-index: 1000;
width: 160px; width: 160px;
height: 80px; height: 85px;
border-radius: 8px; border-radius: 8px;
background: url(../../../static/image/shuqian/g_footer_bg2.png) no-repeat; background: url(../../../static/image/shuqian/g_footer_bg2.png) no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
...@@ -173,6 +173,9 @@ ...@@ -173,6 +173,9 @@
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
.shuchaopiao .hd-game-btn-container.hd-game-btn-container2{
width: 120px;
}
.shuchaopiao .hd-game-btn-container .hd-game-btn { .shuchaopiao .hd-game-btn-container .hd-game-btn {
min-width: 70px; min-width: 70px;
max-width: 100px; max-width: 100px;
...@@ -912,7 +915,7 @@ ...@@ -912,7 +915,7 @@
<img class="winnerRipple move" src="../../../static/image/shuqian/winner-quan1.png" alt /> <img class="winnerRipple move" src="../../../static/image/shuqian/winner-quan1.png" alt />
</div> </div>
<!-- 按钮 --> <!-- 按钮 -->
<div class="hd-game-btn-container"> <div class="hd-game-btn-container hd-game-btn-container2">
<div class="hd-game-btn" @click="getReady()"> <div class="hd-game-btn" @click="getReady()">
<i class="iconfont icon-go"></i> <i class="iconfont icon-go"></i>
<span>准备</span> <span>准备</span>
...@@ -1181,6 +1184,7 @@ export default { ...@@ -1181,6 +1184,7 @@ export default {
} }
let imgPath1 = num.split("")[0]; let imgPath1 = num.split("")[0];
let imgPath2 = num.split("")[1]; let imgPath2 = num.split("")[1];
console.log(imgPath2)
let countHtml = `<img class="img-num imgNumberImg" src='../../../static/image/shuqian/${imgPath1}.png'/> let countHtml = `<img class="img-num imgNumberImg" src='../../../static/image/shuqian/${imgPath1}.png'/>
<img class="img-num imgNumberImg2" src='../../../static/image/shuqian/${imgPath2}.png'/>`; <img class="img-num imgNumberImg2" src='../../../static/image/shuqian/${imgPath2}.png'/>`;
this.$refs.countBox.innerHTML = countHtml; this.$refs.countBox.innerHTML = countHtml;
......
...@@ -64,18 +64,18 @@ ...@@ -64,18 +64,18 @@
</div> </div>
</div> </div>
<!-- 按钮 --> <!-- 按钮 -->
<div class="hd-game-btn-container" v-show="noReady"> <div class="hd-game-btn-container hd-game-btn-container2" v-show="noReady">
<div class="hd-game-btn" @click="getReady()"> <div class="hd-game-btn" @click="getReady()">
<i class="iconfont icon-go"></i> <i class="iconfont icon-go"></i>
<span>准备</span> <span>准备</span>
</div> </div>
</div> </div>
<div class="hd-game-btn-container" v-show="!showCount && !noReady"> <div class="hd-game-btn-container" v-show="!showCount && !noReady && !showThrityCount">
<div class="hd-game-btn" @click="StartGame()"> <div class="hd-game-btn" @click="StartGame()">
<i class="iconfont icon-go"></i> <i class="iconfont icon-go"></i>
<span>开始</span> <span>开始</span>
</div> </div>
<div class="hd-game-btn" v-if="gameOverState" @click="RestGame"> <div class="hd-game-btn" v-if="gameOverState || (!showCount && !noReady)" @click="RestGame">
<i class="iconfont icon-lajitong"></i> <i class="iconfont icon-lajitong"></i>
<span>重置</span> <span>重置</span>
</div> </div>
...@@ -206,13 +206,23 @@ export default { ...@@ -206,13 +206,23 @@ export default {
photo: data.p photo: data.p
}) })
}) })
// 监听游戏结束 展示排行榜
this.$PROXY.on("notifyMouseGamerResult", data => {
console.log(data)
})
}, },
methods: { methods: {
// 游戏结束获取排行版
GetGameResult: function () {
let $this = this
this.$PROXY.invoke("GetGameResult", $this.Code).done(msg => {
console.log('初始化游戏。。。')
});
},
// 游戏结束后处理的东西 // 游戏结束后处理的东西
gameOver: function () { gameOver: function () {
this.gameOverState = true this.gameOverState = true
this.dataIndex = 0 this.dataIndex = 0
this.showThrityCount = false
this.totalTime2 = -1 this.totalTime2 = -1
this.showPeople = false this.showPeople = false
}, },
...@@ -223,7 +233,8 @@ export default { ...@@ -223,7 +233,8 @@ export default {
console.log('初始化游戏。。。') console.log('初始化游戏。。。')
}); });
this.noReady = true this.noReady = true
this.gameOver() this.showPeople = false
this.dataIndex = 0
}, },
// 获取当前加入的人 // 获取当前加入的人
GetRoomAllUser: function () { GetRoomAllUser: function () {
...@@ -282,10 +293,10 @@ export default { ...@@ -282,10 +293,10 @@ export default {
}, },
// 321倒计时 // 321倒计时
countDown () { countDown () {
let clock = window.setInterval(() => { let clock2 = window.setInterval(() => {
this.totalTime-- this.totalTime--
if (this.totalTime === 0) { if (this.totalTime === 0) {
window.clearInterval(clock) window.clearInterval(clock2)
this.showCount = false this.showCount = false
this.totalTime = 3 this.totalTime = 3
this.showThrityCount = true this.showThrityCount = true
...@@ -318,7 +329,7 @@ export default { ...@@ -318,7 +329,7 @@ export default {
countDown30 () { countDown30 () {
let $this = this let $this = this
$this.MsgBus.$emit('daojishiMp3', 2) $this.MsgBus.$emit('daojishiMp3', 2)
let clock = window.setInterval(() => { let clock2 = window.setInterval(() => {
this.totalTime2-- this.totalTime2--
let num = this.totalTime2.toString() let num = this.totalTime2.toString()
if (this.totalTime2 < 10) { if (this.totalTime2 < 10) {
...@@ -330,8 +341,8 @@ export default { ...@@ -330,8 +341,8 @@ export default {
let countHtml = `<img class="img-num imgNumberImg" src='../../../static/image/shuqian/${imgPath1}.png'/> let countHtml = `<img class="img-num imgNumberImg" src='../../../static/image/shuqian/${imgPath1}.png'/>
<img class="img-num imgNumberImg2" src='../../../static/image/shuqian/${imgPath2}.png'/>` <img class="img-num imgNumberImg2" src='../../../static/image/shuqian/${imgPath2}.png'/>`
this.$refs.countBox.innerHTML = countHtml this.$refs.countBox.innerHTML = countHtml
if (this.totalTime2 === -1) { if (this.totalTime2 < 0) {
window.clearInterval(clock) window.clearInterval(clock2)
this.dataIndex = 0 this.dataIndex = 0
this.showThrityCount = false this.showThrityCount = false
this.totalTime2 = 30 this.totalTime2 = 30
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment