From 75acb2e3e8f03deeb804a048ffde39e5fd864720 Mon Sep 17 00:00:00 2001
From: libai <libai@yazhai.co>
Date: Tue, 13 Aug 2024 18:26:15 +0800
Subject: [PATCH] ft活动上线
---
activeFt/garden/oldView.html | 14 --------------
ftIcon/liveData/css/index.css | 78 ++++++++++++++++++++++++++++++++++++------------------------------------------
ftIcon/liveData/css/index.less | 83 +++++++++++++++++++++++++++++++++++++----------------------------------------------
ftIcon/liveData/images/act-room-bg2.png | Bin 6164 -> 0 bytes
ftIcon/liveData/images/act-room-p.png | Bin 817 -> 0 bytes
ftIcon/liveData/index.html | 64 ++++++++++++++++++++++++++++++++++++----------------------------
6 files changed, 109 insertions(+), 130 deletions(-)
diff --git a/activeFt/garden/oldView.html b/activeFt/garden/oldView.html
index 37f5976..0408df5 100644
--- a/activeFt/garden/oldView.html
+++ b/activeFt/garden/oldView.html
@@ -73,20 +73,6 @@ $(function(){
}
})
- // var obj = {
- // "cid": 31,
- // "reqCode": new Date().getTime(),
- // "data": {
- // "popupType":2,
- // // "width":314,
- // "url":'http://test.ybact.yazhaiyabo.com/games/fireGarden2/index.html',
- // "heightR":160,
- // "clickBlank":1,
- // "bottom":'0',
- // }
- // }
- // var obj2 = JSON.stringify(obj);
- // appCollaboration(obj2);
})
if(sessionStorage.lang!=2){
diff --git a/ftIcon/liveData/css/index.css b/ftIcon/liveData/css/index.css
index 242e453..796107a 100644
--- a/ftIcon/liveData/css/index.css
+++ b/ftIcon/liveData/css/index.css
@@ -125,62 +125,56 @@ i {
text-indent: 6vw;
margin-top: 4vw;
}
-.bg-en .act-room-bg1 {
- background: url(../images/en/act-room.png) no-repeat;
- background-size: 100% 100%;
-}
-.bg-en .act-room-bg2 {
- background: url(../images/en/act-room-bg2.png) no-repeat;
- background-size: 100% 100%;
-}
-.act-room-bg1 {
+.act-room-bg2 {
width: 10rem;
- height: 12.05rem;
- background: url(../images/act-room.png) no-repeat;
+ height: 8.482rem;
+ background: url(../images/act-room-bg2.png) no-repeat;
background-size: 100% 100%;
position: relative;
}
.act-room-p1 {
- color: #AC2867;
- font-size: 0.35rem;
+ text-align: center;
width: 10rem;
+ height: 1rem;
+ position: absolute;
+ top: 1rem;
+ font-size: 0.7rem;
+ color: #278B1C;
}
.act-room-p2 {
- color: #AC2867;
- width: 10rem;
- height: 3.8rem;
+ height: 1.5rem;
+ width: 4.155rem;
+ background: url(../images/act-room-p.png) no-repeat;
+ background-size: 100% 100%;
+ position: absolute;
+ top: 2.3rem;
+ left: 2.922rem;
+ font-size: 0.8rem;
+ color: #278B1C;
+ line-height: 1.5rem;
text-align: center;
- line-height: 3.8rem;
- font-size: 1rem;
font-weight: 700;
- position: absolute;
- top: 4.3rem;
}
.act-room-p3 {
- position: absolute;
- top: 8.6rem;
- color: #AC2867;
- text-align: left;
- font-size: 0.85rem;
+ text-align: center;
width: 10rem;
- text-indent: 2.5rem;
-}
-.act-room-p4 {
+ height: 1rem;
position: absolute;
- top: 10rem;
- color: #AC2867;
- text-align: left;
- font-size: 0.85rem;
- width: 10rem;
- text-indent: 2.5rem;
+ top: 4rem;
+ font-size: 0.7rem;
+ color: #278B1C;
}
-.act-room-bg2 {
- width: 10rem;
- height: 7.251rem;
- background: url(../images/act-room-bg2.png) no-repeat;
+.act-room-p4 {
+ height: 1.5rem;
+ width: 4.155rem;
+ background: url(../images/act-room-p.png) no-repeat;
background-size: 100% 100%;
- transform: scale(0.85);
-}
-.act-room-bg2 > div {
- display: none;
+ position: absolute;
+ top: 5.3rem;
+ left: 2.922rem;
+ font-size: 0.8rem;
+ color: #278B1C;
+ line-height: 1.5rem;
+ text-align: center;
+ font-weight: 700;
}
diff --git a/ftIcon/liveData/css/index.less b/ftIcon/liveData/css/index.less
index 900afc0..26414e5 100644
--- a/ftIcon/liveData/css/index.less
+++ b/ftIcon/liveData/css/index.less
@@ -142,65 +142,56 @@ i{
margin-top: 4vw;
}
//活動
-.bg-en{
- .act-room-bg1{
- background: url(../images/en/act-room.png)no-repeat;
- background-size: 100% 100%;
- }
- .act-room-bg2{
- background: url(../images/en/act-room-bg2.png)no-repeat;
- background-size: 100% 100%;
- }
-}
-.act-room-bg1{
+.act-room-bg2{
width: 10rem;
- height: 12.05rem;
- background: url(../images/act-room.png)no-repeat;
+ height: 8.482rem;
+ background: url(../images/act-room-bg2.png)no-repeat;
background-size: 100% 100%;
position: relative;
}
.act-room-p1{
- color: #AC2867;
- font-size: 0.35rem;
+ text-align: center;
width: 10rem;
+ height: 1rem;
+ position: absolute;
+ top: 1rem;
+ font-size: 0.7rem;
+ color: #278B1C;
}
.act-room-p2{
- color: #AC2867;
- width: 10rem;
- height: 3.8rem;
- // background: pink;
+ height: 1.5rem;
+ width: 4.155rem;
+ background: url(../images/act-room-p.png)no-repeat;
+ background-size: 100% 100%;
+ position: absolute;
+ top: 2.3rem;
+ left: 2.922rem;
+ font-size: 0.8rem;
+ color: #278B1C;
+ line-height: 1.5rem;
text-align: center;
- line-height: 3.8rem;
- font-size: 1rem;
font-weight: 700;
- position: absolute;
- top: 4.3rem;
-}
+}
.act-room-p3{
- position: absolute;
- top: 8.6rem;
- color: #AC2867;
- text-align: left;
- font-size: 0.85rem;
+ text-align: center;
width: 10rem;
- text-indent: 2.5rem;
-}
-.act-room-p4{
+ height: 1rem;
position: absolute;
- top:10rem;
- color: #AC2867;
- text-align: left;
- font-size: 0.85rem;
- width: 10rem;
- text-indent: 2.5rem;
+ top: 4rem;
+ font-size: 0.7rem;
+ color: #278B1C;
}
-.act-room-bg2{
- width: 10rem;
- height: 7.251rem;
- background: url(../images/act-room-bg2.png)no-repeat;
+.act-room-p4{
+ height: 1.5rem;
+ width: 4.155rem;
+ background: url(../images/act-room-p.png)no-repeat;
background-size: 100% 100%;
- transform: scale(0.85);
- >div{
- display: none;
- }
+ position: absolute;
+ top: 5.3rem;
+ left: 2.922rem;
+ font-size: 0.8rem;
+ color: #278B1C;
+ line-height: 1.5rem;
+ text-align: center;
+ font-weight: 700;
}
\ No newline at end of file
diff --git a/ftIcon/liveData/images/act-room-bg2.png b/ftIcon/liveData/images/act-room-bg2.png
index 7465a69..dcd7d24 100644
Binary files a/ftIcon/liveData/images/act-room-bg2.png and b/ftIcon/liveData/images/act-room-bg2.png differ
diff --git a/ftIcon/liveData/images/act-room-p.png b/ftIcon/liveData/images/act-room-p.png
index 89a0df8..927e8c4 100644
Binary files a/ftIcon/liveData/images/act-room-p.png and b/ftIcon/liveData/images/act-room-p.png differ
diff --git a/ftIcon/liveData/index.html b/ftIcon/liveData/index.html
index c700e7a..ac1c2ae 100644
--- a/ftIcon/liveData/index.html
+++ b/ftIcon/liveData/index.html
@@ -31,11 +31,11 @@
</style>
</head>
<body c style="background:rgba(0,0,0,0)">
- <div class="act-room-bg1">
- <!-- <div class="act-room-p1">主播積分 : </div> -->
- <div class="act-room-p2">8000</div>
- <div class="act-room-p3">進度 : 18%</div>
- <div class="act-room-p4">排名 : 5</div>
+ <div class="act-room-bg2">
+ <div class="act-room-p1">距離上一名 :</div>
+ <div class="act-room-p2">--</div>
+ <div class="act-room-p3">當前排名:</div>
+ <div class="act-room-p4">--</div>
</div>
<div class="room-bg1">
<div class="room-bg-top">人氣</div>
@@ -80,35 +80,43 @@ $(function(){
$("body").addClass("bg-en")
}
//活動
- $(".act-room-bg1").on("click",function(){
- var obj = {
- "cid": 12,
- "reqCode": new Date().getTime(),
- "data": {
- "msg": '跳转集合功能',
- "jumptype": 3,
- "url": $url + "/activeFt/goddess/index.html" + location.search,
+ $(".act-room-bg2").on("click",function(){
+ // var obj = {
+ // "cid": 12,
+ // "reqCode": new Date().getTime(),
+ // "data": {
+ // "msg": '跳转集合功能',
+ // "jumptype": 3,
+ // "url": $url + "/activeFt/garden/index.html" + location.search+'&jump=1',
+ // }
+ // }
+ // var obj2 = JSON.stringify(obj);
+ // appCollaboration(obj2);
+ $.ajax({
+ url:$ip+'/actSecretGarden/openPopup.html',
+ data:{
+ width:'0',
+ popupUrl:'http://test.ybact.yazhaiyabo.com/games/fireGarden2/index.html',
+ height:'0.5',
+ heightR:'121',
+ },
+ success:function(){
+
}
- }
- var obj2 = JSON.stringify(obj);
- appCollaboration(obj2);
+ })
})
function ActView(){
$.ajax({
- url:$ip+'/actGoddessStory/getRoomPartData.html',
+ url:$ip+'/actSecretGarden/getRoomPartData.html',
success:function(data){
- console.log('获取主播信息',data)
- // if(data.result.userData.signReceive==1)$(".act-room-bg1").removeClass("act-room-bg2")
- $(".act-room-bg1").show()
- $(".act-room-p2").text(data.result.roomData.score)
- if(sessionStorage.lang==2){
- $(".act-room-p3").text("進度 : "+Math.floor(data.result.roomData.score/10000*100)+'%')
- $(".act-room-p4").text("排名 : "+data.result.roomData.rank+"")
- }else{
- $(".act-room-p3").text("PROG : "+Math.floor(data.result.roomData.score/10000*100)+'%')
- $(".act-room-p4").text("rank : "+data.result.roomData.rank+"")
- }
+ console.log('圖標數據',data)
+ if(data.result.roomData.rank==1)$(".act-room-p1").text("距離被超越 :")
+ $(".act-room-p2").text(data.result.roomData.diffPreScore)
+ if(data.result.roomData.rank==-1) $(".act-room-p4").text("未上榜")
+ else $(".act-room-p4").text(data.result.roomData.rank)
+
+
}
})
}
--
libgit2 0.25.0