ft活动上线

4a56f001 · libai · fb7c395c · 4a56f001 · 4a56f001 · 4a56f001
Commit 4a56f001 authored Sep 27, 2024 by libai
Showing with 312 additions and 522 deletions
activeFt/lucky777/css/index.css
activeFt/lucky777/css/index.less
activeFt/lucky777/images/en/banner.png
activeFt/lucky777/images/pop-btn.png
activeFt/lucky777/images/pop.png
activeFt/lucky777/index.html
activeFt/lucky777/oldView.html
activeFt/lucky777/pop.html
ftIcon/action2/css/index.css
ftIcon/action2/css/index.less
ftIcon/action2/images/act-room-bg.png
ftIcon/action2/images/act-room-bg2.png
ftIcon/action2/images/en/act-room-bg2.png
ftIcon/action2/index.html
ftIcon/liveData/css/index.css
ftIcon/liveData/css/index.less
ftIcon/liveData/images/act-room-bg.png
ftIcon/liveData/images/act-room-bg2.png
ftIcon/liveData/images/en/act-room-bg.png
ftIcon/liveData/images/en/act-room-bg2.png
--- a/activeFt/lucky777/css/index.css
+++ b/activeFt/lucky777/css/index.css
+.bg-en .banner {
+  background: url(../images/en/banner.png) no-repeat;
+  background-size: 100% 100%;
+}
 .bg-en .top-btn1 {
  background: url(../images/en/top-btn1.png) no-repeat;
  background-size: 100% 100%;
@@ -115,6 +119,27 @@
  left: -3.5rem !important;
  top: 0.43rem !important;
 }
+.bg-en .act-room-bg2 {
+  background: url(../images/en/act-room-bg2.png) no-repeat;
+  background-size: 100% 100%;
+}
+.pop {
+  position: relative;
+  width: 9.1rem;
+  height: 7.21rem;
+  background: url(../images/pop.png) no-repeat;
+  background-size: 100% 100%;
+  margin: 0 auto;
+}
+.pop-btn {
+  position: absolute;
+  width: 4.44rem;
+  height: 1.506rem;
+  background: url(../images/pop-btn.png) no-repeat;
+  background-size: 100% 100%;
+  top: 4.6rem;
+  left: 2.25rem;
+}
 .callKF {
  width: 10rem;
  position: absolute;

--- a/activeFt/lucky777/css/index.less
+++ b/activeFt/lucky777/css/index.less
 .bg-en{
  .banner{
-    // background: url(../images/en/banner.png) no-repeat;
+    background: url(../images/en/banner.png) no-repeat;
-    // background-size: 100% 100%;
+    background-size: 100% 100%;
  }
  .top-btn1{
    background: url(../images/en/top-btn1.png) no-repeat;
@@ -120,6 +120,27 @@
    left: -3.5rem !important;
    top: 0.43rem !important;
  }
+  .act-room-bg2{
+    background: url(../images/en/act-room-bg2.png)no-repeat;
+    background-size: 100% 100%;
+  }
+}
+.pop{
+  position: relative;
+  width: 9.1rem;
+  height: 7.21rem;
+  background: url(../images/pop.png)no-repeat;
+  background-size: 100% 100%;
+  margin: 0 auto;
+}
+.pop-btn{
+  position: absolute;
+  width: 4.44rem;
+  height: 1.506rem;
+  background: url(../images/pop-btn.png) no-repeat;
+  background-size: 100% 100%;
+  top: 4.6rem;
+  left: 2.25rem;
 }
 .callKF{
  width: 10rem;

--- a/activeFt/lucky777/images/en/banner.png
+++ b/activeFt/lucky777/images/en/banner.png
--- a/activeFt/lucky777/images/pop-btn.png
+++ b/activeFt/lucky777/images/pop-btn.png
--- a/activeFt/lucky777/images/pop.png
+++ b/activeFt/lucky777/images/pop.png
--- a/activeFt/lucky777/index.html
+++ b/activeFt/lucky777/index.html
@@ -140,6 +140,7 @@ $(function(){
    if(sessionStorage.lang!=2){
        $("body").addClass("bg-en")
        $(".top-like").attr("src","images/en/like.png")
+        $(".top-p2").text("Not yet")
    }
    list()
    top()

--- a/activeFt/lucky777/oldView.html
+++ b/activeFt/lucky777/oldView.html
@@ -42,7 +42,7 @@
 <script>
 $(function(){
    if(sessionStorage.lang!=2){
-        // $("body").addClass("bg-en")
+        $("body").addClass("bg-en")
        // $(".act-room-p1").text("score:")
        // $(".act-room-p3").text("goal:")
        $(".en-txt1").text("score")
@@ -90,7 +90,26 @@ $(function(){
    setInterval(function(){
        view()
    },60000)
+    setTimeout(function(){
+        if(sessionStorage.lang==2)return;
+        if(localStorage.lucky777==undefined||localStorage.lucky777<new Date().getTime()){
+            // localStorage.lucky777=(Number(new Date().getTime())+86400000)
+            $.ajax({
+                url:$ip+'/actSecretGarden/openPopup.html',
+                data:{
+                    width:'0',
+                    popupUrl:$url + "/activeFt/lucky777/pop.html",
+                    height:'0.5',
+                    heightR:'75',
+                    x:'0',
+                    y:'0.5',
+                },
+                success:function(){
+                }
+            })
+        }
+    },30000)
    function getData(roomid) {
 	var opts = {
        reconnectionDelay: 5000,

--- a/activeFt/lucky777/pop.html
+++ b/activeFt/lucky777/pop.html
@@ -35,8 +35,8 @@
 <script src="lib/lottie-player.js"></script>
 <body style="background:rgba(0,0,0,0.5);">
-    <div style="margin-top: 0;" class="one-gift-box2">
+    <div style="margin-top: 0;" class="pop">
-        <div class="one-gift-send btn-Pulse"></div>
+        <div class="pop-btn"></div>
    </div>
 </body>
 <script src="lib/jquery-3.1.1.min.js"></script>
@@ -53,54 +53,25 @@ $(function(){
        buy(2)
    })
-    function buy(type){
+    $(".pop-btn").on("click",function(){
        $.ajax({
-            url:$ip+'/actStarSearchTour/userBuyGoods.html',
+            url:$ip+'/actSecretGarden/openPopup.html',
            data:{
-                goodsType:type
+                width:'0',
+                popupUrl: "http://test.ybact.yazhaiyabo.com/active2020/superDew/index.html"+location.search+""+"&roomid=999996",
+                height:'0.5',
+                heightR:'102',
+                x:'0',
+                y:'0.5',
            },
-            success:function(data){
+            success:function(){
-                console.log("购买月卡/壁咚",data)
-                if(data.code==-100){
+            }
-                    if(sessionStorage.lang==2)layer.msg("寶石不足,即將跳轉儲值")
-                    else layer.msg("Insufficient GEMs")
-                    setTimeout(function(){
-                        var obj = {
-                            "cid": 12,
-                            "reqCode": new Date().getTime(),
-                            "data": {
-                                "msg": '去儲值',
-                                "jumptype": 16,  //16: 去储值  18: 跳转到座驾  3：跳转集合功能   28:跳转直播间  29：空间  26:设置  40:半屏宝石储值  41：礼物列表  42：背包列表 // 43: 跳转新人主播引导
-                                "hideTitle": 0 // 1隐藏头部，0 不隐藏， 默认为0
-                            }
-                        }
-                        var obj2 = JSON.stringify(obj);
-                        appCollaboration(obj2);
-                    },800)
-                    return;
-                }
-                if(data.code!=1){
-                    layer.msg(data.msg)
-                    return;
-                }
-                var obj = {
-                        "cid": 14,
-                        "reqCode": new Date().getTime(),
-                    }
-                    var obj2 = JSON.stringify(obj);
-                    appCollaboration(obj2);
-                }
        })
-    }
-    $(".pop-btn").on("click",function(){
        var obj = {
-            "cid": 12,
+            "cid": 14,
            "reqCode": new Date().getTime(),
-            "data": {
-                "msg": '跳转集合功能',
-                "jumptype": 3,
-                "url": $url + "/activeFt/newMan/index.html" + location.search+'&jump=1',
-            }
        }
        var obj2 = JSON.stringify(obj);
        appCollaboration(obj2);

--- a/ftIcon/action2/css/index.css
+++ b/ftIcon/action2/css/index.css
 .bg-en .act-room-bg2 {
  background: url(../images/en/act-room-bg2.png) no-repeat;
  background-size: 100% 100%;
-  width: 8.5rem;
-}
-.act-room-bg {
-  width: 10rem;
-  height: 5.646rem;
-  background: url(../images/act-room-bg.png) no-repeat;
-  background-size: 100% 100%;
 }
 .act-room-bg2 {
-  width: 8rem;
+  width: 10rem;
-  height: 4.393rem;
+  height: 5.577rem;
-  float: right;
  background: url(../images/act-room-bg2.png) no-repeat;
  background-size: 100% 100%;
 }
-.act-room-bg2 > div,
 .act-room-bg2 > p {
-  font-size: 0;
+  display: none;
 }
-.act-room-p1 {
+.act-room-bg {
-  width: 5rem;
+  width: 10rem;
-  text-align: center;
+  height: 5.577rem;
-  color: #467EEE;
+  background: url(../images/act-room-bg.png) no-repeat;
-  font-size: 0.8rem;
+  background-size: 100% 100%;
-  position: absolute;
-  top: 1.85rem;
-  left: 0.5rem;
 }
-.act-room-p2 {
+.act-room-bg .act-p1 {
-  width: 5rem;
+  text-indent: 1.2rem;
-  text-align: left;
-  color: #FF5000;
  font-size: 0.8rem;
-  position: absolute;
+  color: #fff;
-  top: 1.9rem;
+  padding-top: 1rem;
-  left: 4.9rem;
-  font-weight: 700;
 }
-.act-room-p3 {
+.act-room-bg .act-p1 span {
-  width: 5rem;
+  color: #FFF337;
-  text-align: center;
-  color: #467EEE;
-  font-size: 0.8rem;
-  position: absolute;
-  top: 3.3rem;
-  left: 0.5rem;
 }
-.act-room-p4 {
+.act-room-bg .act-p2 {
-  width: 5rem;
+  text-indent: 1.2rem;
-  text-align: left;
-  color: #FF5000;
  font-size: 0.8rem;
-  position: absolute;
+  color: #fff;
-  top: 3.3rem;
+  padding-top: 0.3rem;
-  left: 4.9rem;
-  font-weight: 700;
 }
-.act-title {
+.act-room-bg .act-p2 span {
-  position: absolute;
+  color: #FFF337;
-  top: 0.2rem;
-  width: 10rem;
-  text-align: center;
-  font-size: 0.8rem;
-  font-weight: 700;
-  color: #FFFFFF;
-  text-shadow: -0.06rem 0.06rem 0.06rem #1B55EC, -0.06rem 0.06rem 0.06rem #1B55EC, -0.06rem 0.06rem 0.06rem #1B55EC;
 }
--- a/ftIcon/action2/css/index.less
+++ b/ftIcon/action2/css/index.less
@@ -2,70 +2,39 @@
  .act-room-bg2{
    background: url(../images/en/act-room-bg2.png)no-repeat;
    background-size: 100% 100%;
-    width: 8.5rem;
  }
 }
-.act-room-bg{
-  width: 10rem;
-  height: 5.646rem;
-  background: url(../images/act-room-bg.png)no-repeat;
-  background-size: 100% 100%;
-}
 .act-room-bg2{
-  width: 8rem;
+  width: 10rem;
-  height: 4.393rem;
+  height: 5.577rem;
-  float: right;
  background: url(../images/act-room-bg2.png)no-repeat;
  background-size: 100% 100%;
-  >div,>p{
+  >p{
-    font-size: 0;
+    display: none;
  }
 }
-.act-room-p1{
+.act-room-bg{
-  width: 5rem;
-  text-align: center;
-  color: #467EEE;
-  font-size: 0.8rem;
-  position: absolute;
-  top: 1.85rem;
-  left: 0.5rem;
-}
-.act-room-p2{
-  width: 5rem;
-  text-align: left;
-  color: #FF5000;
-  font-size: 0.8rem;
-  position: absolute;
-  top: 1.9rem;
-  left: 4.9rem;
-  font-weight: 700;
-}
-.act-room-p3{
-  width: 5rem;
-  text-align: center;
-  color: #467EEE;
-  font-size: 0.8rem;
-  position: absolute;
-  top: 3.3rem;
-  left: 0.5rem;
-}
-.act-room-p4{
-  width: 5rem;
-  text-align: left;
-  color: #FF5000;
-  font-size: 0.8rem;
-  position: absolute;
-  top: 3.3rem;
-  left: 4.9rem;
-  font-weight: 700;
-}
-.act-title{
-  position: absolute;
-  top: 0.2rem;
  width: 10rem;
-  text-align: center;
+  height: 5.577rem;
-  font-size: 0.8rem;
+  background: url(../images/act-room-bg.png)no-repeat;
-  font-weight: 700;
+  background-size: 100% 100%;
-  color: #FFFFFF;
+  .act-p1{
-  text-shadow: -0.06rem 0.06rem 0.06rem #1B55EC,-0.06rem 0.06rem 0.06rem #1B55EC,-0.06rem 0.06rem 0.06rem #1B55EC;
+    text-indent: 1.2rem;
-}
+    font-size: 0.8rem;
\ No newline at end of file
+    color: #fff;
+    padding-top: 1rem;
+    span{
+      color: #FFF337;
+    }
+  }
+  .act-p2{
+    text-indent: 1.2rem;
+    font-size: 0.8rem;
+    color: #fff;
+    padding-top: 0.3rem;
+    span{
+      color: #FFF337;
+    }
+  }
+}
--- a/ftIcon/action2/images/act-room-bg.png
+++ b/ftIcon/action2/images/act-room-bg.png
--- a/ftIcon/action2/images/act-room-bg2.png
+++ b/ftIcon/action2/images/act-room-bg2.png
--- a/ftIcon/action2/images/en/act-room-bg2.png
+++ b/ftIcon/action2/images/en/act-room-bg2.png
--- a/ftIcon/action2/index.html
+++ b/ftIcon/action2/index.html
@@ -31,11 +31,8 @@
 <script src="lib/lottie-player.js"></script>
 <body  style="background: rgba(0, 0, 0, 0)">
    <div style="display: none;" class="act-room-bg act-room-bg2">
-        <div class="act-title"></div>
+        <p class="act-p1"><i class="en-txt1">主播積分</i>: <span>8000</span></p>
-        <p class="act-room-p1">主播積分:</p>
+        <p class="act-p2"><i class="en-txt2">進度</i>: <span class="act-span2" style="margin-right: 0.5rem;">18%</span> <i class="en-txt3">排名</i>: <span class="act-span3">5</span></p>
-        <p class="act-room-p2"></p>
-        <p class="act-room-p3">目標積分:</p>
-        <p class="act-room-p4"></p>
    </div>
 </body>
 <script src="lib/jquery-3.1.1.min.js"></script>
@@ -48,9 +45,26 @@ $(function(){
    var wsTimer=null
    if(sessionStorage.lang!=2){
        $("body").addClass("bg-en")
-        $(".act-room-p1").text("score:")
+        // $(".act-room-p1").text("score:")
-        $(".act-room-p3").text("goal:")
+        // $(".act-room-p3").text("goal:")
+        $(".en-txt1").text("score")
+        $(".en-txt2").text("PROG")
+        $(".en-txt3").text("rank")
    }
+    var jump=1
+    $(".act-room-bg").on("click",function(){
+        var obj = {
+            "cid": 12,
+            "reqCode": new Date().getTime(),
+            "data": {
+                "msg": '跳转集合功能',
+                "jumptype": 3,
+                "url": $url + "/activeFt/lucky777/index.html" + location.search+'&jump='+jump+'',
+            }
+        }
+        var obj2 = JSON.stringify(obj);
+        appCollaboration(obj2);
+    })
    var obj = {
 	 	"cid": 43,
 	 	"reqCode": new Date().getTime(),
@@ -58,104 +72,29 @@ $(function(){
             "type":1,
            //  "width":314,
            "width":120,
-             "height":69,
+             "height":68,
             'unit':2,
             "position":1
 	 	}
 	 }
 	var obj2 = JSON.stringify(obj);
 	appCollaboration(obj2);
-    if(sessionStorage.lang==2)var titleName=['','新秀出道','閃亮新星','星光熠熠','璀璨佳人','風華絕代','傾國傾城']
-    else var titleName=['','Lv.1','Lv.2','Lv.3','Lv.4','Lv.5','Lv.6']
    function view(){
        $.ajax({
-            url:$ip+'/actStarSearchTour/getRoomPartData.html',
+            url:$ip+'/actLucky777/getRoomPartData.html',
            success:function(data){
                console.log('圖標數據',data)
-                if(data.result.userData.isPaid==0||data.result.userData.isNewUserGiftVoucher==1){
+                if(data.result.userData.signReceive==0){
-                   //進入新人流程
+                    $(".act-room-bg").fadeIn(200)
-                    if(data.result.userData.newUserAwardTaskNum<5){
+                    return;
-                        $(".act-room-bg").fadeIn(200)
-                        if(data.result.userData.isNewUserGiftSend==0){
-                            goPop=2
-                         $(".act-room-bg").unbind("click").on("click",function(){
-                                 $.ajax({
-                                     url:$ip+'/actSecretGarden/openPopup.html',
-                                     data:{
-                                         width:'0',
-                                         popupUrl:$url + "/activeFt/newMan/pop.html" + location.search+'',
-                                         height:'0.5',
-                                         heightR:'70',
-                                         x:'0',
-                                         y:'0.5',
-                                     },
-                                     success:function(){
-                                     }
-                                 })
-                             })
-                         }
-                         else{
-                             $(".act-room-bg").unbind("click").on("click",function(){
-                                 var obj = {
-                                     "cid": 12,
-                                     "reqCode": new Date().getTime(),
-                                     "data": {
-                                         "msg": '跳转集合功能',
-                                         "jumptype": 3,
-                                         "url": $url + "/activeFt/newMan/index.html" + location.search+'&jump=1',
-                                     }
-                                 }
-                                 var obj2 = JSON.stringify(obj);
-                                 appCollaboration(obj2);
-                             })
-                         } 
-                    }
-                    //已經完成了五個任務
-                    else{
-                        $(".act-room-bg").fadeIn(200).removeClass("act-room-bg2")
-                        $(".act-room-bg").unbind("click").on("click",function(){
-                            var obj = {
-                                "cid": 12,
-                                "reqCode": new Date().getTime(),
-                                "data": {
-                                    "msg": '跳转集合功能',
-                                    "jumptype": 3,
-                                    "url": $url + "/activeFt/newMan/index.html" + location.search+'&',
-                                }
-                            }
-                            var obj2 = JSON.stringify(obj);
-                            appCollaboration(obj2);
-                        })
-                        if(data.result.userData.isBuyMonthlyCard==0){
-                            goPop=1
-                        }
-                    }
-                }else{
-                    $(".act-room-bg").fadeIn(200).removeClass("act-room-bg2")
-                    $(".act-room-bg").unbind("click").on("click",function(){
-                        var obj = {
-                            "cid": 12,
-                            "reqCode": new Date().getTime(),
-                            "data": {
-                                "msg": '跳转集合功能',
-                                "jumptype": 3,
-                                "url": $url + "/activeFt/newMan/index.html" + location.search+'&',
-                            }
-                        }
-                        var obj2 = JSON.stringify(obj);
-                        appCollaboration(obj2);
-                    })
-                    if(data.result.userData.isBuyMonthlyCard==0){
-                        goPop=1
-                    }
                }
-                $(".act-title").text(titleName[data.result.roomData.level])
+                jump=2
-                $(".act-room-p2").text(data.result.roomData.score)
+                $(".act-room-bg").removeClass("act-room-bg2").fadeIn(200)
-                $(".act-room-p4").text(data.result.roomData.levelScore)
+                $(".act-p1 span").text(data.result.roomData.score)
+                $(".act-span2").text(Math.floor(data.result.roomData.score/15000*100))
+                if(data.result.roomData.rank==-1)$(".act-span3").text('--')
+                else $(".act-span3").text(data.result.roomData.rank)
            }
        })
    }
@@ -163,42 +102,26 @@ $(function(){
    setInterval(function(){
        view()
    },60000)
-    setTimeout(function() {
+    setTimeout(function(){
-        if(goPop==2){
+        if(sessionStorage.lang==2)return;
-            setTimeout(function() {                       
+        if(localStorage.lucky777==undefined||localStorage.lucky777<new Date().getTime()){
-                $.ajax({
+            // localStorage.lucky777=(Number(new Date().getTime())+86400000)
-                    url:$ip+'/actStarSearchTour/triggerOpenPopup.html',
+            $.ajax({
-                    data:{
+                url:$ip+'/actSecretGarden/openPopup.html',
-                    },
+                data:{
-                    success:function(){
+                    width:'0',
+                    popupUrl:$url + "/activeFt/lucky777/pop.html",
-                    }
+                    height:'0.5',
-                })
+                    heightR:'75',
-            }, 300000);
+                    x:'0',
-        }
+                    y:'0.5',
-        if(goPop==1){
+                },
-            if(localStorage.newManLayer==undefined||localStorage.newManLayer<new Date().getTime()){
+                success:function(){
-            localStorage.newManLayer=(Number(new Date().getTime())+86400000)
-                setTimeout(function() {                       
-                    $.ajax({
-                        url:$ip+'/actSecretGarden/openPopup.html',
-                        data:{
-                            width:'0',
-                            popupUrl:$url + "/activeFt/newMan/pop2.html" + location.search+'',
-                            height:'0.5',
-                            heightR:'110',
-                            x:'0',
-                            y:'0.5',
-                        },
-                        success:function(){
-                        }
-                    })
-                }, 60000);
-            }
+                }
+            })
        }
-    }, 3000);
+    },30000)
    function getData(roomid) {
 	var opts = {
        reconnectionDelay: 5000,

--- a/ftIcon/liveData/css/index.css
+++ b/ftIcon/liveData/css/index.css
@@ -127,63 +127,45 @@ i {
 }
 .act-room-bg {
  width: 10rem;
-  height: 10.079rem;
+  height: 8.563rem;
  background: url(../images/act-room-bg.png) no-repeat;
  background-size: 100% 100%;
  position: relative;
 }
 .act-room-bg2 {
-  width: 8rem;
+  width: 10rem;
-  height: 4.393rem;
+  height: 5.577rem;
-  float: right;
  background: url(../images/act-room-bg2.png) no-repeat;
  background-size: 100% 100%;
 }
-.act-room-bg2 > div,
 .act-room-bg2 > p {
-  font-size: 0;
+  display: none;
 }
-.act-room-p1 {
+.act-p1 {
-  width: 10rem;
+  color: #fff;
  text-align: center;
-  color: #467EEE;
+  width: 10rem;
  font-size: 0.8rem;
  position: absolute;
-  top: 2.4rem;
+  top: 1.2rem;
 }
-.act-room-p2 {
+.act-p1 span {
  width: 10rem;
-  text-align: center;
-  color: #FF5000;
-  font-size: 0.8rem;
  position: absolute;
-  top: 3.95rem;
+  color: #FFF337;
+  top: 2.3rem;
+  left: 0;
+  font-size: 1rem;
  font-weight: 700;
 }
-.act-room-p3 {
+.act-p2 {
-  width: 10rem;
+  color: #fff;
  text-align: center;
-  color: #467EEE;
-  font-size: 0.8rem;
-  position: absolute;
-  top: 5.6rem;
-}
-.act-room-p4 {
  width: 10rem;
-  text-align: center;
-  color: #FF5000;
  font-size: 0.8rem;
  position: absolute;
-  top: 7.25rem;
+  top: 6rem;
-  font-weight: 700;
 }
-.act-title {
+.act-p2 span {
-  position: absolute;
+  color: #FFF337;
-  top: 0.2rem;
-  width: 10rem;
-  text-align: center;
-  font-size: 0.8rem;
-  font-weight: 700;
-  color: #FFFFFF;
-  text-shadow: -0.06rem 0.06rem 0.06rem #1B55EC, -0.06rem 0.06rem 0.06rem #1B55EC, -0.06rem 0.06rem 0.06rem #1B55EC;
 }
--- a/ftIcon/liveData/css/index.less
+++ b/ftIcon/liveData/css/index.less
@@ -144,62 +144,45 @@ i{
 //活動
 .act-room-bg{
  width: 10rem;
-  height: 10.079rem;
+  height: 8.563rem;
  background: url(../images/act-room-bg.png)no-repeat;
  background-size: 100% 100%;
  position: relative;
 }
 .act-room-bg2{
-  width: 8rem;
+  width: 10rem;
-  height: 4.393rem;
+  height: 5.577rem;
-  float: right;
  background: url(../images/act-room-bg2.png)no-repeat;
  background-size: 100% 100%;
-  >div,>p{
+  >p{
-    font-size: 0;
+    display: none;
  }
 }
-.act-room-p1{
+.act-p1{
-  width: 10rem;
+  color: #fff;
  text-align: center;
-  color: #467EEE;
-  font-size: 0.8rem;
-  position: absolute;
-  top: 2.4rem;
-}
-.act-room-p2{
  width: 10rem;
-  text-align: center;
-  color: #FF5000;
  font-size: 0.8rem;
  position: absolute;
-  top: 3.95rem;
+  top: 1.2rem;
-  font-weight: 700;
+  span{
+    width: 10rem;
+    position: absolute;
+    color: #FFF337;
+    top: 2.3rem;
+    left: 0;
+    font-size: 1rem;
+    font-weight: 700;
+  }
 }
-.act-room-p3{
+.act-p2{
-  width: 10rem;
+  color: #fff;
  text-align: center;
-  color: #467EEE;
-  font-size: 0.8rem;
-  position: absolute;
-  top: 5.6rem;
-}
-.act-room-p4{
  width: 10rem;
-  text-align: center;
-  color: #FF5000;
  font-size: 0.8rem;
  position: absolute;
-  top: 7.25rem;
+  top: 6rem;
-  font-weight: 700;
+  span{
-}
+    color: #FFF337;
-.act-title{
+  }
-  position: absolute;
-  top: 0.2rem;
-  width: 10rem;
-  text-align: center;
-  font-size: 0.8rem;
-  font-weight: 700;
-  color: #FFFFFF;
-  text-shadow: -0.06rem 0.06rem 0.06rem #1B55EC,-0.06rem 0.06rem 0.06rem #1B55EC,-0.06rem 0.06rem 0.06rem #1B55EC;
 }
\ No newline at end of file
--- a/ftIcon/liveData/images/act-room-bg.png
+++ b/ftIcon/liveData/images/act-room-bg.png
--- a/ftIcon/liveData/images/act-room-bg2.png
+++ b/ftIcon/liveData/images/act-room-bg2.png
--- a/ftIcon/liveData/images/en/act-room-bg.png
+++ b/ftIcon/liveData/images/en/act-room-bg.png
--- a/ftIcon/liveData/images/en/act-room-bg2.png
+++ b/ftIcon/liveData/images/en/act-room-bg2.png
--- a/ftIcon/liveData/index.html
+++ b/ftIcon/liveData/index.html
@@ -31,13 +31,9 @@
    </style>
 </head>
 <body c style="background:rgba(0,0,0,0)">
-    <div class="act-room-bg">
+    <div style="display: none;" class="act-room-bg act-room-bg2">
-        <div class="act-title"></div>
+        <p class="act-p1"><i class="en-txt1">主播積分</i>: <span>8000</span></p>
-        <p class="act-room-p1">主播積分:</p>
+        <p class="act-p2"><i class="en-txt2">進度</i>: <span class="act-span2" style="margin-right: 0.5rem;">18%</span> <i class="en-txt3">排名</i>: <span class="act-span3">5</span></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>
@@ -80,10 +76,13 @@ $(function(){
    var socketOk=null
    if(sessionStorage.lang!=2){
        $("body").addClass("bg-en")
-        $(".act-room-p1").text("score:")
+        $(".en-txt1").text("score")
-        $(".act-room-p3").text("goal:")
+        $(".en-txt2").text("PROG")
+        $(".en-txt3").text("rank")
    }
    //活動
+    var jump=1
    $(".act-room-bg").on("click",function(){
        var obj = {
            "cid": 12,
@@ -91,23 +90,24 @@ $(function(){
            "data": {
                "msg": '跳转集合功能',
                "jumptype": 3,
-                "url": $url + "/activeFt/newMan/index.html" + location.search+'&jump=1',
+                "url": $url + "/activeFt/lucky777/index.html" + location.search+'&jump='+jump+'',
            }
        }
        var obj2 = JSON.stringify(obj);
        appCollaboration(obj2);
    })
-    if(sessionStorage.lang==2)var titleName=['','新秀出道','閃亮新星','星光熠熠','璀璨佳人','風華絕代','傾國傾城']
-    else var titleName=['','Lv.1','Lv.2','Lv.3','Lv.4','Lv.5','Lv.6']
    function ActView(){
        $.ajax({
-            url:$ip+'/actStarSearchTour/getRoomPartData.html',
+            url:$ip+'/actLucky777/getRoomPartData.html',
            success:function(data){
                console.log('圖標數據',data)
-                $(".act-title").text(titleName[data.result.roomData.level])
+                jump=2
-                $(".act-room-p2").text(data.result.roomData.score)
+                $(".act-room-bg").removeClass("act-room-bg2").fadeIn(200)
-                $(".act-room-p4").text(data.result.roomData.levelScore)
+                $(".act-p1 span").text(data.result.roomData.score)
+                $(".act-span2").text(Math.floor(data.result.roomData.score/15000*100))
+                if(data.result.roomData.rank==-1)$(".act-span3").text('--')
+                else $(".act-span3").text(data.result.roomData.rank)
            }
        })

--- a/ftIcon/liveData2/css/index.css
+++ b/ftIcon/liveData2/css/index.css
@@ -141,71 +141,30 @@
  top: -0.95vw;
 }
 .act-room-bg {
-  position: absolute;
-  right: -33.5vw;
-  top: -18.5vw;
-  transform: scale(0.33);
  width: 10rem;
-  height: 5.646rem;
+  height: 5.577rem;
  background: url(../images/act-room-bg.png) no-repeat;
  background-size: 100% 100%;
-}
+  transform: scale(0.33);
-.act-room-bg2 {
-  width: 8rem;
-  height: 4.393rem;
-  float: right;
-  background: url(../images/act-room-bg2.png) no-repeat;
-  background-size: 100% 100%;
-}
-.act-room-bg2 > div,
-.act-room-bg2 > p {
-  font-size: 0;
-}
-.act-room-p1 {
-  width: 5rem;
-  text-align: center;
-  color: #467EEE;
-  font-size: 0.8rem;
  position: absolute;
-  top: 1.85rem;
+  top: -19vw;
-  left: 0.5rem;
+  left: 33.2vw;
 }
-.act-room-p2 {
+.act-room-bg .act-p1 {
-  width: 5rem;
+  text-indent: 1.2rem;
-  text-align: left;
-  color: #FF5000;
  font-size: 0.8rem;
-  position: absolute;
+  color: #fff;
-  top: 1.9rem;
+  padding-top: 1rem;
-  left: 4.9rem;
-  font-weight: 700;
 }
-.act-room-p3 {
+.act-room-bg .act-p1 span {
-  width: 5rem;
+  color: #FFF337;
-  text-align: center;
-  color: #467EEE;
-  font-size: 0.8rem;
-  position: absolute;
-  top: 3.3rem;
-  left: 0.5rem;
 }
-.act-room-p4 {
+.act-room-bg .act-p2 {
-  width: 5rem;
+  text-indent: 1.2rem;
-  text-align: left;
-  color: #FF5000;
  font-size: 0.8rem;
-  position: absolute;
+  color: #fff;
-  top: 3.3rem;
+  padding-top: 0.3rem;
-  left: 4.9rem;
-  font-weight: 700;
 }
-.act-title {
+.act-room-bg .act-p2 span {
-  position: absolute;
+  color: #FFF337;
-  top: 0.2rem;
-  width: 10rem;
-  text-align: center;
-  font-size: 0.8rem;
-  font-weight: 700;
-  color: #FFFFFF;
-  text-shadow: -0.06rem 0.06rem 0.06rem #1B55EC, -0.06rem 0.06rem 0.06rem #1B55EC, -0.06rem 0.06rem 0.06rem #1B55EC;
 }
--- a/ftIcon/liveData2/css/index.less
+++ b/ftIcon/liveData2/css/index.less
@@ -161,70 +161,30 @@
 //活動
 .act-room-bg{
-  position: absolute;
-  right: -33.5vw;
-  top: -18.5vw;
-  transform: scale(0.33);
  width: 10rem;
-  height: 5.646rem;
+  height: 5.577rem;
-  background: url(../images/act-room-bg.png)no-repeat;
+  background: url(../images/act-room-bg.png) no-repeat;
-  background-size: 100% 100%;
-}
-.act-room-bg2{
-  width: 8rem;
-  height: 4.393rem;
-  float: right;
-  background: url(../images/act-room-bg2.png)no-repeat;
  background-size: 100% 100%;
-  >div,>p{
+  transform: scale(0.33);
-    font-size: 0;
-  }
-}
-.act-room-p1{
-  width: 5rem;
-  text-align: center;
-  color: #467EEE;
-  font-size: 0.8rem;
-  position: absolute;
-  top: 1.85rem;
-  left: 0.5rem;
-}
-.act-room-p2{
-  width: 5rem;
-  text-align: left;
-  color: #FF5000;
-  font-size: 0.8rem;
-  position: absolute;
-  top: 1.9rem;
-  left: 4.9rem;
-  font-weight: 700;
-}
-.act-room-p3{
-  width: 5rem;
-  text-align: center;
-  color: #467EEE;
-  font-size: 0.8rem;
-  position: absolute;
-  top: 3.3rem;
-  left: 0.5rem;
-}
-.act-room-p4{
-  width: 5rem;
-  text-align: left;
-  color: #FF5000;
-  font-size: 0.8rem;
  position: absolute;
-  top: 3.3rem;
+  top: -19vw;
-  left: 4.9rem;
+  left: 33.2vw;
-  font-weight: 700;
+  .act-p1{
+    text-indent: 1.2rem;
+    font-size: 0.8rem;
+    color: #fff;
+    padding-top: 1rem;
+    span{
+      color: #FFF337;
+    }
+  }
+  .act-p2{
+    text-indent: 1.2rem;
+    font-size: 0.8rem;
+    color: #fff;
+    padding-top: 0.3rem;
+    span{
+      color: #FFF337;
+    }
+  }
 }
-.act-title{
-  position: absolute;
-  top: 0.2rem;
-  width: 10rem;
-  text-align: center;
-  font-size: 0.8rem;
-  font-weight: 700;
-  color: #FFFFFF;
-  text-shadow: -0.06rem 0.06rem 0.06rem #1B55EC,-0.06rem 0.06rem 0.06rem #1B55EC,-0.06rem 0.06rem 0.06rem #1B55EC;
-}
\ No newline at end of file
--- a/ftIcon/liveData2/images/act-room-bg.png
+++ b/ftIcon/liveData2/images/act-room-bg.png
--- a/ftIcon/liveData2/images/act-room-bg2.png
+++ b/ftIcon/liveData2/images/act-room-bg2.png
--- a/ftIcon/liveData2/images/en/act-room-bg.png
+++ b/ftIcon/liveData2/images/en/act-room-bg.png
--- a/ftIcon/liveData2/images/en/act-room-bg2.png
+++ b/ftIcon/liveData2/images/en/act-room-bg2.png
--- a/ftIcon/liveData2/index.html
+++ b/ftIcon/liveData2/index.html
@@ -69,13 +69,9 @@
    </div>
-    <div class="act-room-bg">
+    <div style="display: none;" class="act-room-bg act-room-bg2">
-        <div class="act-title"></div>
+        <p class="act-p1"><i class="en-txt1">主播積分</i>: <span>8000</span></p>
-        <p class="act-room-p1">主播積分:</p>
+        <p class="act-p2"><i class="en-txt2">進度</i>: <span class="act-span2" style="margin-right: 0.5rem;">18%</span> <i class="en-txt3">排名</i>: <span class="act-span3">5</span></p>
-        <p class="act-room-p2">--</p>
-        <p class="act-room-p3">目標積分:</p>
-        <p class="act-room-p4">--</p>
    </div>
 </body>
 <script src="lib/jquery-3.1.1.min.js"></script>
@@ -86,11 +82,26 @@
 $(function(){
    if(sessionStorage.lang!=2){
        $("body").addClass("bg-en")
-        $(".act-room-p1").text("score:")
+        // $(".act-room-p1").text("score:")
-        $(".act-room-p3").text("goal:")
+        // $(".act-room-p3").text("goal:")
+        $(".en-txt1").text("score")
+        $(".en-txt2").text("PROG")
+        $(".en-txt3").text("rank")
    }
-    var wsTimer=null
+    var jump=1
-    var socketOk=null
+    $(".act-room-bg").on("click",function(){
+        var obj = {
+            "cid": 12,
+            "reqCode": new Date().getTime(),
+            "data": {
+                "msg": '跳转集合功能',
+                "jumptype": 3,
+                "url": $url + "/activeFt/lucky777/index.html" + location.search+'&jump='+jump+'',
+            }
+        }
+        var obj2 = JSON.stringify(obj);
+        appCollaboration(obj2);
+    })
      //活動
      var obj = {
 	 	"cid": 43,
@@ -106,19 +117,19 @@ $(function(){
 	 }
 	 var obj2 = JSON.stringify(obj);
 	 appCollaboration(obj2);      //活動
-    if(sessionStorage.lang!=2){
-        $("body").addClass("bg-en")
-    }
-    if(sessionStorage.lang==2)var titleName=['','新秀出道','閃亮新星','星光熠熠','璀璨佳人','風華絕代','傾國傾城']
-    else var titleName=['','Lv.1','Lv.2','Lv.3','Lv.4','Lv.5','Lv.6']
    function actView(){
        $.ajax({
            url:$ip+'/actStarSearchTour/getRoomPartData.html',
            success:function(data){
                console.log('圖標數據',data)
-                $(".act-title").text(titleName[data.result.roomData.level])
+                jump=2
-                $(".act-room-p2").text(data.result.roomData.score)
+                $(".act-room-bg").removeClass("act-room-bg2").fadeIn(200)
-                $(".act-room-p4").text(data.result.roomData.levelScore)
+                $(".act-p1 span").text(data.result.roomData.score)
+                $(".act-span2").text(Math.floor(data.result.roomData.score/15000*100))
+                if(data.result.roomData.rank==-1)$(".act-span3").text('--')
+                else $(".act-span3").text(data.result.roomData.rank)
            }
        })
    }