Skip to content

N
NEWYEARPARTY
Commit 51025a3d authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

解决冲突与

parents f3b879d5 13bed0de
Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 38 deletions
src/assets/css/GameRanking.css
View file @ 51025a3d
.Ranking{
.Ranking {
width: 100%;
height: 100%;
background: url(/static/image/gamerank/bg.png);
......@@ -9,76 +9,82 @@
top: 0;
z-index: 10009;
}
.Ranking .logo{
.Ranking .logo {
position: relative;
left: 4rem;
top: 2rem;
}
.Ranking p.tit{
.Ranking p.tit {
text-align: center;
font-size: 4rem;
color: white;
position: relative;
top: -30px;
top: -28px;
}
.Ranking .rank-box{
.Ranking .rank-box {
width: 80%;
margin: 0 auto;
display: flex;
padding-top: 4rem;
}
.Ranking .rank-box .item {
width: 9rem;
}
.Ranking .rank-box .item .head{
.Ranking .rank-box .item .head {
position: relative;
width: 5rem;
height: 5rem;
border-radius: 50%;
background:linear-gradient(0deg,rgba(247,213,23,1),rgba(255,171,2,1));
background: linear-gradient(0deg, rgba(247, 213, 23, 1), rgba(255, 171, 2, 1));
padding: .4rem;
margin: 0 auto;
}
.Ranking .rank-box .item .head .maozi{
.Ranking .rank-box .item .head .maozi {
position: absolute;
left: -23px;
top: -21px;
box-sizing: border-box;
}
.Ranking .rank-box .item .head .maozi1,.Ranking .rank-box .item .head .maozi2{
left: -18px;
top: -16px;
}
.Ranking .rank-box .item .head .user-img{
width: 5rem;
height: 5rem;
.Ranking .rank-box .item .head .user-img {
width: 7rem;
height: 7rem;
border-radius: 50%;
}
.Ranking .rank-box .item .body{
/* background: url(/static/image/gamerank/tiao.png);
.Ranking .rank-box .item .body {
background: url(/static/image/gamerank/tiao.png);
background-repeat: no-repeat;
background-size: 100% 100%; */
background-size: 100% 100%;
width: 60px;
margin: 2rem auto;
height: 292px;
position: relative;
}
.Ranking .rank-box .item .body .color{
}
.Ranking .rank-box .item .body .color {
position: absolute;
left: 5%;
bottom: 0;
width: 89%;
background: url(/static/image/gamerank/tiao2.png);
background-repeat: no-repeat;
background-size: 100% 100%;
background: linear-gradient(90deg, rgba(186, 76, 11, 1), rgba(233, 154, 53, 1), rgba(253, 244, 139, 1), rgba(209, 151, 25, 1));
border-radius: 0px 0px 30px 30px;
}
.Ranking .rank-box .item .name{
.Ranking .rank-box .item .name {
text-align: center;
font-family: 'PingFangR';
font-size: 2.4rem;
color: white;
font-weight: 600;
}
.Ranking .rank-box .item .name p:nth-child(1) {
padding: .4rem;
}
\ No newline at end of file
src/components/playGame/Money.vue
View file @ 51025a3d
......@@ -915,19 +915,19 @@
<img class="winnerRipple move" src="../../../static/image/shuqian/winner-quan1.png" alt />
</div>
<!-- 按钮 -->
<div class="hd-game-btn-container hd-game-btn-container2">
<div class="hd-game-btn-container hd-game-btn-container2" v-if="status!=-1">
<div class="hd-game-btn" @click="getReady()" v-show="status==0">
<i class="iconfont icon-go"></i>
<span>准备</span>
</div>
<div class="hd-game-btn" v-show="status==-1" @click="rest">
<!-- <div class="hd-game-btn" v-show="status==-1" @click="rest">
<i class="iconfont icon-lajitong"></i>
<span>重置</span>
</div>
</div> -->
</div>
</div>
</template>
<tempclate v-else>
<template v-else>
<div class="shuMoney" ref="shuMoney">
<!-- 顶部灯笼 -->
<div class="shuMoney-disk">
......@@ -995,19 +995,25 @@
</div>
</div>
<!-- 按钮 -->
<div class="hd-game-btn-container" v-show="isShowBtn">
<div class="hd-game-btn-container hd-game-btn-container2" v-if="isShowBtn && status!=-1">
<div class="hd-game-btn" @click="StartGame()">
<i class="iconfont icon-go"></i>
<span>开始</span>
</div>
<div class="hd-game-btn" v-show="status==-1" @click="rest">
<!-- <div class="hd-game-btn" v-show="status==-1" @click="rest">
<i class="iconfont icon-lajitong"></i>
<span>重置</span>
</div>
</div> -->
</div>
</div>
</tempclate>
</template>
<rank-list :rankingList="rankingList" v-show="status === -1"></rank-list>
<div class="hd-game-btn-container hd-game-btn-container2" style="z-index: 109999;" v-if="status==-1">
<div class="hd-game-btn" @click="rest">
<i class="iconfont icon-lajitong"></i>
<span>重置</span>
</div>
</div>
</div>
</template>
......@@ -1050,9 +1056,10 @@ export default {
for (let i = 0; i < 10; i++) {
this.emitList.push('temp_'+i);
}
let that=this;
// 监听游戏结束 展示排行榜
this.$PROXY.on("notifyMouseGamerResult", data => {
$this.getRankList(data)
this.$PROXY.on("notifyGamerResult", data => {
that.getRankList(data)
})
},
methods: {
......@@ -1074,8 +1081,11 @@ export default {
this.$PROXY.invoke("GetMenuStatus", this.code).done(m => {
if (m.status == 1) {
that.readyGo()
}else if(m.status==-1){
that.$PROXY.invoke('GetGameResult','Money').done(d=>{
that.getRankList(d)
});
}
console.log(m);
that.status=m.status
});
} catch (error) {
......@@ -1089,20 +1099,25 @@ export default {
this.$PROXY.invoke("ReadyGame", this.code).done(m => {});
},
rest(){
this.$PROXY.invoke("RestGame", this.code).done(m=>{});
this.$PROXY.invoke("RestGame", this.code).done(m=>{
location.reload();
});
},
bindCallBack() {
let that = this;
this.$PROXY.on("getChangeMenu", data => {
console.log(data);
if (data.code == that.code) {
that.status=data.status
if (data.status == 1) {
that.readyGo()
}else if(data.status==2){
that.startGo()
}else if(data.status==-1){
that.status=-1
that.getRankList(data.rank)
//that.getRankList(data.rank)
// that.$PROXY.invoke('GetGameResult','Money').done(d=>{
// });
}
}
});
......
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