From c9bacc27ff52e4ba4fe37b5375a0ee65c4eb7b86 Mon Sep 17 00:00:00 2001
From: libai <libai@yazhai.co>
Date: Sat, 29 Jun 2024 14:28:45 +0800
Subject: [PATCH] ft活动上线

---
 activeFt/queen/images/en/layer-gift1.png       | Bin 79458 -> 0 bytes
 activeFt/queen/index.html                      |  8 ++++++--
 activeFt/queen/oldView.html                    |  7 ++++++-
 footseenIcon/action/index.html                 | 13 ++++++++++---
 footseenIcon/liveData2/css/index.css           | 67 +++++++++++++++++++++++++++----------------------------------------
 footseenIcon/liveData2/css/index.less          | 78 ++++++++++++++++++++++++++++++++++--------------------------------------------
 footseenIcon/liveData2/images/act-room-bg.png  | Bin 0 -> 23059 bytes
 footseenIcon/liveData2/images/act-room-bg1.png | Bin 21654 -> 0 bytes
 footseenIcon/liveData2/index.html              | 58 +++++++++++++++++++++++-----------------------------------
 footseenIcon/liveData2/lib/default.js          |  2 +-
 ftIcon/liveData/css/index.css                  | 62 ++++++++++++++++++++++++++++++++------------------------------
 ftIcon/liveData/css/index.less                 | 77 ++++++++++++++++++++++++++++++++++++++++-------------------------------------
 ftIcon/liveData/images/act-room-bg.png         | Bin 0 -> 28572 bytes
 ftIcon/liveData/images/act-room-bg1.png        | Bin 5948 -> 0 bytes
 ftIcon/liveData/index.html                     | 68 ++++++++++++++++++++++++++++----------------------------------------
 15 files changed, 207 insertions(+), 233 deletions(-)
 create mode 100644 footseenIcon/liveData2/images/act-room-bg.png
 delete mode 100644 footseenIcon/liveData2/images/act-room-bg1.png
 create mode 100644 ftIcon/liveData/images/act-room-bg.png
 delete mode 100644 ftIcon/liveData/images/act-room-bg1.png

diff --git a/activeFt/queen/images/en/layer-gift1.png b/activeFt/queen/images/en/layer-gift1.png
index f16d2bb..cbe40da 100644
Binary files a/activeFt/queen/images/en/layer-gift1.png and b/activeFt/queen/images/en/layer-gift1.png differ
diff --git a/activeFt/queen/index.html b/activeFt/queen/index.html
index 5441e90..0b3d91f 100644
--- a/activeFt/queen/index.html
+++ b/activeFt/queen/index.html
@@ -84,7 +84,7 @@
         <div class="ok"></div>
     </div>
     <div class="bg">
-        <a href="rule.html"><img class="rule-btn" src="images/rule-btn.png" alt=""></a>
+        <img class="rule-btn" src="images/rule-btn.png" alt="">
         <img class="ref" src="images/ref.png" alt="">
         <div class="banner"></div>
         <div class="top-btn1">
@@ -183,6 +183,9 @@ $(function(){
             show1()
         }
     })
+    $(".rule-btn").on("click",function(){
+        window.location.href="rule.html"+location.search
+    })
     $(".record-btn").on("click",function(){
         layer.open({
             type: 1,
@@ -315,7 +318,8 @@ $(function(){
                         html+='<li>';
                         html+='<div class="layer-fans-box1">'+fansData[i].index+'</div>';
                         html+='<div class="layer-fans-box2"><a href="yazhai://_' + fansData[i].uid + '_zone"><img src="https://big.bgp.ourpow.com/comm'+fansData[i].face+'?x-oss-process=image/resize,w_90"></a>'+fansData[i].name+'</div>';
-                        html+='<div class="layer-fans-box3">貢獻值:'+fansData[i].score+'</div>';
+                        if(sessionStorage.lang==2)html+='<div class="layer-fans-box3">貢獻值:'+fansData[i].score+'</div>';
+                        else html+='<div class="layer-fans-box3">score:'+fansData[i].score+'</div>';
                         html+='</li>';
                     }
                     $(".layer-fans-ul").html(html)
diff --git a/activeFt/queen/oldView.html b/activeFt/queen/oldView.html
index ed59405..74d52aa 100644
--- a/activeFt/queen/oldView.html
+++ b/activeFt/queen/oldView.html
@@ -58,7 +58,12 @@ $(function(){
         var obj2 = JSON.stringify(obj);
         appCollaboration(obj2);
     })
-    var titleArr=['','夜の新秀','夜の佳人','夜の花魁','夜の傳說','極樂夜王','夜の女皇']
+    if(sessionStorage.lang!=2){
+        $(".act-room-p1").text("score:")
+        $(".act-room-p3").text("goal:")
+    }
+    if(sessionStorage.lang==2)var titleArr=['','夜の新秀','夜の佳人','夜の花魁','夜の傳說','極樂夜王','夜の女皇']
+    else var titleArr=['','Rookie','Fair lady','Flower','Legend','King','Queen']
     function view(){
         $.ajax({
             url:$ip+'/actQueenOfTheNight/getRoomPartData.html',
diff --git a/footseenIcon/action/index.html b/footseenIcon/action/index.html
index 568d26c..e9ff9c1 100644
--- a/footseenIcon/action/index.html
+++ b/footseenIcon/action/index.html
@@ -63,15 +63,22 @@ $(function(){
 	 }
 	var obj2 = JSON.stringify(obj);
 	appCollaboration(obj2);
-    var titleArr=['','夜の新秀','夜の佳人','夜の花魁','夜の傳說','極樂夜王','夜の女皇']
+    if(sessionStorage.lang==2)var titleArr=['','夜の新秀','夜の佳人','夜の花魁','夜の傳說','極樂夜王','夜の女皇']
+    else var titleArr=['','Rookie','Fair lady','Flower','Legend','King','Queen']
     function view(){
         $.ajax({
             url:$ip+'/actQueenOfTheNight/getRoomPartData.html',
             success:function(data){
                 console.log('获取主播闯关信息',data)
                 $(".act-title").text(titleArr[data.result.level])
-                $(".act-room-p1").text('主播積分 : '+data.result.score)
-                $(".act-room-p2").text('目標積分 : '+data.result.levelScore)
+                if(sessionStorage.lang==2){
+                    $(".act-room-p1").text('主播積分 : '+data.result.score)
+                    $(".act-room-p2").text('目標積分 : '+data.result.levelScore)
+                }else{
+                    $(".act-room-p1").text('score : '+data.result.score)
+                    $(".act-room-p2").text('goal : '+data.result.levelScore)
+                }
+              
             }
         })
     }
diff --git a/footseenIcon/liveData2/css/index.css b/footseenIcon/liveData2/css/index.css
index b9f9562..6cc14b1 100644
--- a/footseenIcon/liveData2/css/index.css
+++ b/footseenIcon/liveData2/css/index.css
@@ -133,49 +133,36 @@
   top: -0.95vw;
 }
 .act-room-bg1 {
-  position: relative;
-  width: 33.33vw;
-  height: 19.96vw;
-  background: url(../images/act-room-bg1.png?v=2024061701) no-repeat;
+  transform: scale(0.33);
+  position: absolute;
+  right: -3.33rem;
+  top: -1.85rem;
+  width: 10rem;
+  height: 5.537rem;
+  background: url(../images/act-room-bg.png) no-repeat;
   background-size: 100% 100%;
-  overflow: hidden;
-  float: left;
 }
-.act-room-bg1 .room-title {
-  font-size: 2.66vw;
-  height: 6.66vw;
-  line-height: 6.327vw;
+.act-room-p1 {
+  font-size: 0.75rem;
+  color: #f0edfa;
+  padding-top: 1.9rem;
+  text-indent: 1rem;
+}
+.act-room-p2 {
+  font-size: 0.75rem;
+  color: #f0edfa;
+  padding-top: 0.2rem;
+  text-indent: 1rem;
+}
+.act-title {
+  width: 5.07rem;
+  line-height: 1.4rem;
   color: #fff;
+  font-size: 0.8rem;
   text-align: center;
-}
-.act-room-bg1 .room-bg-p1 {
-  color: #fff;
-  font-size: 2.66vw;
-  text-indent: 2.997vw;
-  padding-top: 0.66vw;
-}
-.act-room-bg1 .room-bg-p1 span {
-  color: #F83AFF;
-}
-.act-room-bg1 .room-bg-p2 {
-  position: absolute;
-  top: 12.987vw;
-  color: #fff;
-  font-size: 2.66vw;
-  text-indent: 2.997vw;
-}
-.act-room-bg1 .room-bg-p2 span {
-  color: #F83AFF;
-}
-.act-room-bg1 .room-bg-p3 {
-  color: #fff;
-  font-size: 2.66vw;
-  text-indent: 2.997vw;
-  /* padding-top: 0.4rem; */
+  font-weight: 700;
+  height: 1.5rem;
   position: absolute;
-  top: 12.987vw;
-  left: 17.8vw;
-}
-.act-room-bg1 .room-bg-p3 span {
-  color: #F83AFF;
+  left: 2.45rem;
+  text-shadow: 0.05rem 0.05rem 0.05rem #170060, -0.05rem 0.05rem 0.05rem #170060, 0.05rem -0.05rem 0.05rem #170060, -0.05rem -0.05rem 0.05rem #170060;
 }
diff --git a/footseenIcon/liveData2/css/index.less b/footseenIcon/liveData2/css/index.less
index f6b06da..135ce1a 100644
--- a/footseenIcon/liveData2/css/index.less
+++ b/footseenIcon/liveData2/css/index.less
@@ -151,49 +151,39 @@
 
 //活动
 .act-room-bg1{
-  position: relative;
-  width: 33.33vw;
-  height: 19.96vw;
-  background: url(../images/act-room-bg1.png?v=2024061701)no-repeat;
+  transform: scale(0.33);
+  position: absolute;
+  right: -3.33rem;
+  top: -1.85rem;
+  width: 10rem;
+  height: 5.537rem;
+  background: url(../images/act-room-bg.png)no-repeat;
   background-size: 100% 100%;
-  overflow: hidden;
-  float: left;
-  .room-title{
-    font-size: 2.66vw;
-    height: 6.66vw;
-    line-height: 6.327vw;
-    color: #fff;
-    text-align: center;
-  }
-  .room-bg-p1{
-    color: #fff;
-    font-size: 2.66vw;
-    text-indent: 2.997vw;
-    padding-top: 0.66vw;
-    span{
-      color: #F83AFF;
-    }
-  }
-  .room-bg-p2{
-    position: absolute;
-    top: 12.987vw;
-    color: #fff;
-    font-size: 2.66vw;
-    text-indent: 2.997vw;
-    span{
-      color: #F83AFF;
-    }
-  }
-  .room-bg-p3{
-    color: #fff;
-    font-size: 2.66vw;
-    text-indent: 2.997vw;
-    /* padding-top: 0.4rem; */
-    position: absolute;
-    top: 12.987vw;
-    left: 17.8vw;
-    span{
-      color: #F83AFF;
-    }
-  }
+}
+.act-room-p1{
+  font-size: 0.75rem;
+  color: #f0edfa;
+  padding-top: 1.9rem;
+  text-indent: 1rem;
+}
+.act-room-p2{
+  font-size: 0.75rem;
+  color: #f0edfa;
+  padding-top: 0.2rem;
+  text-indent: 1rem;
+}
+.act-title{
+  width: 5.07rem;
+  line-height: 1.4rem;
+  color: #fff;
+  font-size: 0.8rem;
+  text-align: center;
+  font-weight: 700;
+  // background: pink;
+  height: 1.5rem;
+  position: absolute;
+  left: 2.45rem;
+  text-shadow: 0.05rem 0.05rem 0.05rem #170060,-0.05rem 0.05rem 0.05rem #170060,0.05rem -0.05rem 0.05rem #170060,-0.05rem -0.05rem 0.05rem #170060;
+
+  
 }
diff --git a/footseenIcon/liveData2/images/act-room-bg.png b/footseenIcon/liveData2/images/act-room-bg.png
new file mode 100644
index 0000000..4c99363
Binary files /dev/null and b/footseenIcon/liveData2/images/act-room-bg.png differ
diff --git a/footseenIcon/liveData2/images/act-room-bg1.png b/footseenIcon/liveData2/images/act-room-bg1.png
deleted file mode 100644
index ef69f58..0000000
Binary files a/footseenIcon/liveData2/images/act-room-bg1.png and /dev/null differ
diff --git a/footseenIcon/liveData2/index.html b/footseenIcon/liveData2/index.html
index 82f1558..5e11796 100644
--- a/footseenIcon/liveData2/index.html
+++ b/footseenIcon/liveData2/index.html
@@ -29,12 +29,7 @@
     </style>
 </head>
 <body style="background:rgba(0,0,0,0)">
-    <div style="display: none;" class="act-room-bg1 ">
-        <div class="room-title">新秀出道</div>
-        <p class="room-bg-p1"><i class="en-t1">主播積分</i>:<span>8000</span></p>
-        <p class="room-bg-p2"><i class="en-t2">進度</i>:<span>50%</span></p>
-        <p class="room-bg-p3"><i class="en-t3">排行</i>:<span>8</span></p>
-    </div>
+
     <div class="room-bg1">
         <div class="room-bg-top">人氣</div>
         <!-- <div class="room-targe">目標:</div> -->
@@ -69,6 +64,11 @@
             </div>
         </div>
     </div>
+    <div class="act-room-bg1">
+        <div class="act-title"></div>
+        <p class="act-room-p1">主播積分 :</p>
+        <p class="act-room-p2">目標積分 :</p>
+    </div>
 </body>
 <script src="lib/jquery-3.1.1.min.js"></script>
 <script src="layer-v3.1.0/layer/layer.js"></script>
@@ -79,41 +79,29 @@ $(function(){
     var wsTimer=null
     var socketOk=null
         //活動
-    var titleArr=['','新秀出道','嶄露頭角','光芒萬丈']
-    if(sessionStorage.lang!=2){
-        var titleArr=['','First level','Second level','Third level']
-        $(".en-t1").html('score')
-        $(".en-t2").html("PROG")
-        $(".en-t3").html("rank")
-        
-    }
-    // setTimeout(function() {
-    //     RoomView()
-    //     wsTimer=setInterval(function(){
-    //         RoomView()
-    //     },60000)
-    // }, 2000);
-    function RoomView(){
+    if(sessionStorage.lang==2)var titleArr=['','夜の新秀','夜の佳人','夜の花魁','夜の傳說','極樂夜王','夜の女皇']
+    else var titleArr=['','Rookie','Fair lady','Flower','Legend','King','Queen']
+    function actView(){
         $.ajax({
-            url:$ip+'/actRaisingBeautifulGril/getRoomPartData.html',
+            url:$ip+'/actQueenOfTheNight/getRoomPartData.html',
             success:function(data){
-                console.log(data)
-                if(data.result.rank>0){
-                    console.log(data)
-                    $(".act-room-bg1").show()
-                    $(".room-title").text(titleArr[data.result.targetData.stage])
-                    $(".room-bg-p1 span").text(data.result.score)
-                    var barWidth=Math.floor(data.result.score/data.result.targetData.stageScore*100)
-                    $(".room-bg-p2 span").text(barWidth+'%')
-                    $(".room-bg-p3 span").text(data.result.rank)
+                console.log('获取主播闯关信息',data)
+                $(".act-title").text(titleArr[data.result.level])
+                if(sessionStorage.lang==2){
+                    $(".act-room-p1").text('主播積分 : '+data.result.score)
+                    $(".act-room-p2").text('目標積分 : '+data.result.levelScore)
                 }else{
-                    $(".act-room-bg1").hide()
-                    clearInterval(wsTimer)
+                    $(".act-room-p1").text('score : '+data.result.score)
+                    $(".act-room-p2").text('goal : '+data.result.levelScore)
                 }
+              
             }
         })
     }
-    getData()
+    actView()
+    setInterval(function(){
+        actView()
+    },60000)
     function getData() {
    
     	var opts = {
@@ -167,7 +155,7 @@ $(function(){
              "type":1,
             //  "width":314,
             "width":360,
-             "height":72,
+             "height":66,
              'unit':2,
              "position":1
 	 	}
diff --git a/footseenIcon/liveData2/lib/default.js b/footseenIcon/liveData2/lib/default.js
index d5fd4dd..43d6e31 100644
--- a/footseenIcon/liveData2/lib/default.js
+++ b/footseenIcon/liveData2/lib/default.js
@@ -46,7 +46,7 @@ if (bbb.indexOf("http://localhost:63342") > -1) {
 if (bbb.indexOf("file:///") > -1) {
     sessionStorage.lang=1
     sessionStorage.uid =  210102;
-    sessionStorage.token = '5c3c1add2cd0451b9ab33be30115f824'
+    sessionStorage.token = 'debug'
     sessionStorage.roomId=210102;
     sessionStorage.version=8890
     sessionStorage.cid='web'
diff --git a/ftIcon/liveData/css/index.css b/ftIcon/liveData/css/index.css
index 7e14884..9e46286 100644
--- a/ftIcon/liveData/css/index.css
+++ b/ftIcon/liveData/css/index.css
@@ -126,43 +126,45 @@ i {
   margin-top: 4vw;
 }
 .act-room-bg1 {
+  position: relative;
   width: 10rem;
-  height: 8.885rem;
-  background: url(../images/act-room-bg1.png?v=2024061701) no-repeat;
+  height: 8.064rem;
+  background: url(../images/act-room-bg.png) no-repeat;
   background-size: 100% 100%;
-  position: relative;
 }
-.act-room-bg1 .room-title {
-  font-size: 0.8rem;
-  height: 2rem;
-  line-height: 1.9rem;
+.act-title {
+  width: 5.07rem;
+  line-height: 1.4rem;
   color: #fff;
+  font-size: 0.8rem;
   text-align: center;
+  font-weight: 700;
+  height: 1.5rem;
+  position: absolute;
+  left: 2.45rem;
+  text-shadow: 0.05rem 0.05rem 0.05rem #170060, -0.05rem 0.05rem 0.05rem #170060, 0.05rem -0.05rem 0.05rem #170060, -0.05rem -0.05rem 0.05rem #170060;
 }
-.act-room-bg1 .room-bg-p1 {
-  color: #fff;
-  font-size: 0.85rem;
-  text-indent: 0.9rem;
-  padding-top: 0.4rem;
-}
-.act-room-bg1 .room-bg-p1 span {
-  color: #F83AFF;
-}
-.act-room-bg1 .room-bg-p2 {
-  color: #fff;
-  font-size: 0.85rem;
-  text-indent: 0.9rem;
-  padding-top: 0.4rem;
+.act-room-p1 {
+  font-size: 0.6rem;
+  color: #f0edfa;
+  text-align: center;
+  padding-top: 1.85rem;
 }
-.act-room-bg1 .room-bg-p2 span {
-  color: #F83AFF;
+.act-room-p2 {
+  font-size: 0.7rem;
+  color: #f0edfa;
+  text-align: center;
+  padding-top: 0.35rem;
 }
-.act-room-bg1 .room-bg-p3 {
-  color: #fff;
-  font-size: 0.85rem;
-  text-indent: 0.9rem;
-  padding-top: 0.4rem;
+.act-room-p3 {
+  font-size: 0.6rem;
+  color: #f0edfa;
+  text-align: center;
+  padding-top: 0.6rem;
 }
-.act-room-bg1 .room-bg-p3 span {
-  color: #F83AFF;
+.act-room-p4 {
+  font-size: 0.7rem;
+  color: #f0edfa;
+  text-align: center;
+  padding-top: 0.35rem;
 }
diff --git a/ftIcon/liveData/css/index.less b/ftIcon/liveData/css/index.less
index f3d2a05..fcd8724 100644
--- a/ftIcon/liveData/css/index.less
+++ b/ftIcon/liveData/css/index.less
@@ -141,43 +141,46 @@ i{
 }
 //活動
 .act-room-bg1{
+  position: relative;
   width: 10rem;
-  height: 8.885rem;
-  background: url(../images/act-room-bg1.png?v=2024061701)no-repeat;
+  height: 8.064rem;
+  background: url(../images/act-room-bg.png)no-repeat;
   background-size: 100% 100%;
-  position: relative;
-  .room-title{
-    font-size: 0.8rem;
-    height: 2rem;
-    line-height: 1.9rem;
-    color: #fff;
-    text-align: center;
-  }
-  .room-bg-p1{
-    color: #fff;
-    font-size: 0.85rem;
-    text-indent: 0.9rem;
-    padding-top: 0.4rem;
-    span{
-      color: #F83AFF;
-    }
-  }
-  .room-bg-p2{
-    color: #fff;
-    font-size: 0.85rem;
-    text-indent: 0.9rem;
-    padding-top: 0.4rem;
-    span{
-      color: #F83AFF;
-    }
-  }
-  .room-bg-p3{
-    color: #fff;
-    font-size: 0.85rem;
-    text-indent: 0.9rem;
-    padding-top: 0.4rem;
-    span{
-      color: #F83AFF;
-    }
-  }
+}
+.act-title{
+  width: 5.07rem;
+  line-height: 1.4rem;
+  color: #fff;
+  font-size: 0.8rem;
+  text-align: center;
+  font-weight: 700;
+  // background: pink;
+  height: 1.5rem;
+  position: absolute;
+  left: 2.45rem;
+  text-shadow: 0.05rem 0.05rem 0.05rem #170060,-0.05rem 0.05rem 0.05rem #170060,0.05rem -0.05rem 0.05rem #170060,-0.05rem -0.05rem 0.05rem #170060;
+}
+.act-room-p1{
+  font-size: 0.6rem;
+  color: #f0edfa;
+  text-align: center;
+  padding-top: 1.85rem;
+}
+.act-room-p2{
+  font-size: 0.7rem;
+  color: #f0edfa;
+  text-align: center;
+  padding-top: 0.35rem;
+}
+.act-room-p3{
+  font-size: 0.6rem;
+  color: #f0edfa;
+  text-align: center;
+  padding-top: 0.6rem;
+}
+.act-room-p4{
+  font-size: 0.7rem;
+  color: #f0edfa;
+  text-align: center;
+  padding-top: 0.35rem;
 }
\ No newline at end of file
diff --git a/ftIcon/liveData/images/act-room-bg.png b/ftIcon/liveData/images/act-room-bg.png
new file mode 100644
index 0000000..28e116b
Binary files /dev/null and b/ftIcon/liveData/images/act-room-bg.png differ
diff --git a/ftIcon/liveData/images/act-room-bg1.png b/ftIcon/liveData/images/act-room-bg1.png
deleted file mode 100644
index eb90700..0000000
Binary files a/ftIcon/liveData/images/act-room-bg1.png and /dev/null differ
diff --git a/ftIcon/liveData/index.html b/ftIcon/liveData/index.html
index 6894450..a8b193e 100644
--- a/ftIcon/liveData/index.html
+++ b/ftIcon/liveData/index.html
@@ -31,11 +31,12 @@
     </style>
 </head>
 <body style="background:rgba(0,0,0,0)">
-    <div style="display: none;" class="act-room-bg1 ">
-        <div class="room-title">新秀出道</div>
-        <p class="room-bg-p1"><i class="en-t1">主播積分</i>:<span>8000</span></p>
-        <p class="room-bg-p2"><i class="en-t2">進度</i>:<span>50%</span></p>
-        <p class="room-bg-p3"><i class="en-t3">排行</i>:<span>8</span></p>
+    <div class="act-room-bg1">
+        <div class="act-title"></div>
+        <p class="act-room-p1">主播積分:</p>
+        <p class="act-room-p2">--</p>
+        <p class="act-room-p3">目標積分:</p>
+        <p class="act-room-p4">--</p>
     </div>
 <div class="room-bg1">
     <div class="room-bg-top">人氣</div>
@@ -77,40 +78,6 @@ $(function(){
     var wsTimer=null
     var socketOk=null
     //活動
-    var titleArr=['','新秀出道','嶄露頭角','光芒萬丈']
-    if(sessionStorage.lang!=2){
-        var titleArr=['','First level','Second level','Third level']
-        $(".en-t1").html('score')
-        $(".en-t2").html("PROG")
-        $(".en-t3").html("rank")
-    }
-    setTimeout(function() {
-        RoomView()
-        wsTimer=setInterval(function(){
-            RoomView()
-        },60000)
-    }, 2000);
-    function RoomView(){
-        $.ajax({
-            url:$ip+'/actRaisingBeautifulGril/getRoomPartData.html',
-            success:function(data){
-                console.log(data)
-                if(data.result.rank>0){
-                    console.log(data)
-                    $(".act-room-bg1").show()
-                    $(".room-title").text(titleArr[data.result.targetData.stage])
-                    $(".room-bg-p1 span").text(data.result.score)
-                    var barWidth=Math.floor(data.result.score/data.result.targetData.stageScore*100)
-                    $(".room-bg-p2 span").text(barWidth+'%')
-                    $(".room-bg-p3 span").text(data.result.rank)
-                }else{
-                    $(".act-room-bg1").hide()
-                    clearInterval(wsTimer)
-                }
-            }
-        })
-    }
-    // getData()
     $(".act-room-bg1").on("click",function(){
         var obj = {
             "cid": 12,
@@ -118,12 +85,33 @@ $(function(){
             "data": {
                 "msg": '跳转集合功能',
                 "jumptype": 3,
-                "url": $url + "/activeFt/develop/index.html" + location.search,
+                "url": $url + "/activeFt/queen/index.html" + location.search,
             }
         }
         var obj2 = JSON.stringify(obj);
         appCollaboration(obj2);
     })
+    if(sessionStorage.lang!=2){
+        $(".act-room-p1").text("score:")
+        $(".act-room-p3").text("goal:")
+    }
+    if(sessionStorage.lang==2)var titleArr=['','夜の新秀','夜の佳人','夜の花魁','夜の傳說','極樂夜王','夜の女皇']
+    else var titleArr=['','Rookie','Fair lady','Flower','Legend','King','Queen']
+    function ActView(){
+        $.ajax({
+            url:$ip+'/actQueenOfTheNight/getRoomPartData.html',
+            success:function(data){
+                console.log('获取主播闯关信息',data)
+                $(".act-title").text(titleArr[data.result.level])
+                $(".act-room-p2").text(data.result.score)
+                $(".act-room-p4").text(data.result.levelScore)
+            }
+        })
+    }
+    ActView()
+    setInterval(function(){
+        ActView()
+    },60000)
     function getData() {
     	var opts = {
             reconnectionDelay: 5000,
--
libgit2 0.25.0