diff --git a/footseenIcon/action/css/index.css b/footseenIcon/action/css/index.css index 321097a..27568cf 100644 --- a/footseenIcon/action/css/index.css +++ b/footseenIcon/action/css/index.css @@ -1,46 +1,49 @@ .bg-en .act-room-bg1 { - background: url(../images/en/act-room-bg.png?v=2024080101) no-repeat; + background: url(../images/en/act-room-bg.png) no-repeat; background-size: 100% 100%; } .bg-en .act-room-bg2 { - background: url(../images/act-room-bg2.png?v=2024080101) no-repeat; + background: url(../images/en/act-room-bg2.png) no-repeat; background-size: 100% 100%; + height: 6rem; + width: 10rem; } .act-room-bg1 { width: 10rem; - height: 6.0511rem; - background: url(../images/act-room-bg.png?v=2024080101) no-repeat; + height: 6.085rem; + background: url(../images/act-room-bg.png) no-repeat; background-size: 100% 100%; position: relative; } .act-room-bg2 { position: relative; - width: 8rem; - height: 5.44rem; - background: url(../images/en/act-room-bg2.png?v=2024080101) no-repeat; + width: 9rem; + height: 6rem; + background: url(../images/act-room-bg2.png) no-repeat; background-size: 100% 100%; + transform: scale(0.85); } .act-room-bg2 p { - display: none; font-size: 0 !important; } .act-room-p1 { - font-size: 0.65rem; + color: #B53C76; + font-size: 0.75rem; position: absolute; - color: #fff; - top: 3rem; + top: 2.7rem; left: 1rem; } -.act-room-p1 span { - color: #1FFFF2; -} .act-room-p2 { - font-size: 0.65rem; + color: #B53C76; + font-size: 0.75rem; position: absolute; - color: #fff; - top: 4.2rem; + top: 4rem; left: 1rem; } -.act-room-p2 span { - color: #1FFFF2; +.act-room-p3 { + color: #B53C76; + font-size: 0.75rem; + position: absolute; + top: 4rem; + left: 5.8rem; } diff --git a/footseenIcon/action/css/index.less b/footseenIcon/action/css/index.less index 847b0a5..dcd7c80 100644 --- a/footseenIcon/action/css/index.less +++ b/footseenIcon/action/css/index.less @@ -1,50 +1,51 @@ .bg-en{ .act-room-bg1{ - background: url(../images/en/act-room-bg.png?v=2024080101)no-repeat; + background: url(../images/en/act-room-bg.png)no-repeat; background-size: 100% 100%; } .act-room-bg2{ - background: url(../images/act-room-bg2.png?v=2024080101)no-repeat; + background: url(../images/en/act-room-bg2.png)no-repeat; background-size: 100% 100%; + height: 6rem; + width: 10rem; } } .act-room-bg1{ width: 10rem; - height: 6.0511rem; - background: url(../images/act-room-bg.png?v=2024080101)no-repeat; + height: 6.085rem; + background: url(../images/act-room-bg.png)no-repeat; background-size: 100% 100%; position: relative; } .act-room-bg2{ position: relative; - width: 8rem; - height: 5.44rem; - background: url(../images/en/act-room-bg2.png?v=2024080101)no-repeat; + width: 9rem; + height: 6rem; + background: url(../images/act-room-bg2.png)no-repeat; background-size: 100% 100%; + transform: scale(0.85); p{ - display: none; font-size: 0 !important; } } .act-room-p1{ - font-size: 0.65rem; + color: #B53C76; + font-size: 0.75rem; position: absolute; - color: #fff; - top: 3rem; + top: 2.7rem; left: 1rem; - - span{ - color: #1FFFF2; - } } .act-room-p2{ - font-size: 0.65rem; + color: #B53C76; + font-size: 0.75rem; position: absolute; - color: #fff; - top: 4.2rem; + top: 4rem; left: 1rem; - span{ - color: #1FFFF2; - } - +} +.act-room-p3{ + color: #B53C76; + font-size: 0.75rem; + position: absolute; + top: 4rem; + left: 5.8rem; } \ No newline at end of file diff --git a/footseenIcon/action/images/act-room-bg.png b/footseenIcon/action/images/act-room-bg.png index 5f9435b..7a7bd73 100644 Binary files a/footseenIcon/action/images/act-room-bg.png and b/footseenIcon/action/images/act-room-bg.png differ diff --git a/footseenIcon/action/images/act-room-bg2.png b/footseenIcon/action/images/act-room-bg2.png index 824305d..7465a69 100644 Binary files a/footseenIcon/action/images/act-room-bg2.png and b/footseenIcon/action/images/act-room-bg2.png differ diff --git a/footseenIcon/action/images/en/act-room-bg.png b/footseenIcon/action/images/en/act-room-bg.png index 16dffa4..d01fcbc 100644 Binary files a/footseenIcon/action/images/en/act-room-bg.png and b/footseenIcon/action/images/en/act-room-bg.png differ diff --git a/footseenIcon/action/images/en/act-room-bg2.png b/footseenIcon/action/images/en/act-room-bg2.png index 978196a..9cfb5f9 100644 Binary files a/footseenIcon/action/images/en/act-room-bg2.png and b/footseenIcon/action/images/en/act-room-bg2.png differ diff --git a/footseenIcon/action/index.html b/footseenIcon/action/index.html index 234087c..424cefa 100644 --- a/footseenIcon/action/index.html +++ b/footseenIcon/action/index.html @@ -13,7 +13,7 @@ <link rel="stylesheet" href="css/base.css"> <link rel="stylesheet" href="css/layer.css"> <link rel="stylesheet" href="css/daily.css"> - <link rel="stylesheet" href="css/index.css?v=2024071701"> + <link rel="stylesheet" href="css/index.css?v=2024080101"> <link rel="stylesheet" href="css/liMarquee.css"> <style> .layui-layer-shade { @@ -30,10 +30,10 @@ </head> <script src="lib/lottie-player.js"></script> <body style="background: rgba(0, 0, 0, 0)"> - <div style="display: none;" class="act-room-bg1 act-room-bg2"> - <div class="act-title"></div> - <p class="act-room-p1"></p> - <p class="act-room-p2"></p> + <div class="act-room-bg1 act-room-bg2"> + <p class="act-room-p1">主播積分 : 8000</p> + <p class="act-room-p2">進度 : 18%</p> + <p class="act-room-p3">排名 : 5</p> </div> </body> <script src="lib/jquery-3.1.1.min.js"></script> @@ -43,13 +43,10 @@ <script type="text/javascript" src="https://app.ixiulive.com/static/js/socket.io.js"></script> <script> $(function(){ - var jumpType=1 var wsTimer=null - if(sessionStorage.lang!=2){ $("body").addClass("bg-en") } - var obj = { "cid": 43, "reqCode": new Date().getTime(), @@ -57,7 +54,7 @@ $(function(){ "type":1, // "width":314, "width":120, - "height":73, + "height":87.6, 'unit':2, "position":1 } @@ -67,24 +64,23 @@ $(function(){ function view(){ $.ajax({ - url:$ip+'/actSummerDew/getRoomPartData.html', + url:$ip+'/actGoddessStory/getRoomPartData.html', success:function(data){ console.log('获取主播信息',data) - if(data.result.userData.signReceive!=0&&data.result.roomData.rank!=-1)$(".act-room-bg1").removeClass("act-room-bg2").fadeIn(200) - else{ - $(".act-room-bg1").addClass("act-room-bg2").fadeIn(200) - jumpType=2 - } + if(data.result.userData.signReceive==1)$(".act-room-bg1").removeClass("act-room-bg2") + $(".act-room-bg1").show() if(sessionStorage.lang==2){ - if(data.result.roomData.rank==1)$(".act-room-p1").html('距離被超越 :<span>'+data.result.roomData.diffPreScore+'</span>') - else $(".act-room-p1").html('距離上一名 : <span>'+data.result.roomData.diffPreScore+'</span>') - $(".act-room-p2").html('當前排名 : <span>'+data.result.roomData.rank+'</span>') + $(".act-room-p1").text('主播積分 : '+data.result.roomData.score) + $(".act-room-p2").text("進度 : "+Math.floor(data.result.roomData.score/10000*100)+'%') + if(data.result.roomData.rank==-1)$(".act-room-p3").text("排名 : --") + else $(".act-room-p3").text("排名 : "+data.result.roomData.rank+"") }else{ - if(data.result.roomData.rank==1)$(".act-room-p1").html('Leading : <span>'+data.result.roomData.diffPreScore+'</span>') - else $(".act-room-p1").html('the one ahead : <span>'+data.result.roomData.diffPreScore+'</span>') - $(".act-room-p2").html('rank : <span>'+data.result.roomData.rank+'</span>') + $(".act-room-p1").text('score : '+data.result.roomData.score) + $(".act-room-p2").text("PROG : "+Math.floor(data.result.roomData.score/10000*100)+'%') + if(data.result.roomData.rank==-1)$(".act-room-p3").text("rank : --") + else $(".act-room-p3").text("rank : "+data.result.roomData.rank+"") } - + } }) } @@ -99,7 +95,7 @@ $(function(){ "data": { "popupType":2, // "width":314, - "url":''+$url+'/activeFt/summer/index.html?jumpType='+jumpType, + "url":''+$url+'/activeFt/goddess/index.html', "heightR":160, "clickBlank":1, "bottom":'0', diff --git a/footseenIcon/action/lib/default.js b/footseenIcon/action/lib/default.js index ea8d881..40791fa 100644 --- a/footseenIcon/action/lib/default.js +++ b/footseenIcon/action/lib/default.js @@ -43,7 +43,7 @@ if (uid.indexOf("http://localhost:63342") > -1) { sessionStorage.roomId=23864554 } if (uid.indexOf("file:///") > -1) { - sessionStorage.lang=1 + sessionStorage.lang=2 sessionStorage.uid = 210102; sessionStorage.token = 'debug' sessionStorage.roomId=210102;