diff --git a/ftIcon/action2/css/index.css b/ftIcon/action2/css/index.css
index e8d0bf7..d8d6803 100644
--- a/ftIcon/action2/css/index.css
+++ b/ftIcon/action2/css/index.css
@@ -1,7 +1,34 @@
+.bg-en .act-room-bg2 {
+ background: url(../images/en/act-room-bg2.png) no-repeat;
+ background-size: 100% 100%;
+}
.act-room-bg {
- float: right;
+ position: relative;
width: 8rem;
- height: 3.352rem;
- background: url(../images/act-room1.png) no-repeat;
+ height: 3.402rem;
+ background: url(../images/act-room-bg.png) no-repeat;
background-size: 100% 100%;
+ float: right;
+}
+.act-room-p1 {
+ color: #fff;
+ font-size: 0.65rem;
+ text-indent: 0.7rem;
+ padding-top: 0.6rem;
+}
+.act-room-p2 {
+ color: #fff;
+ font-size: 0.65rem;
+ text-indent: 0.7rem;
+ padding-top: 0.2rem;
+}
+.act-room-bg2 {
+ position: relative;
+ width: 5.04rem;
+ height: 3.402rem;
+ background: url(../images/act-room-bg2.png) no-repeat;
+ background-size: 100% 100%;
+}
+.act-room-bg2 p {
+ display: none;
}
diff --git a/ftIcon/action2/css/index.less b/ftIcon/action2/css/index.less
index c922e26..787900f 100644
--- a/ftIcon/action2/css/index.less
+++ b/ftIcon/action2/css/index.less
@@ -1,7 +1,38 @@
+
+.bg-en{
+ .act-room-bg2{
+ background:url(../images/en/act-room-bg2.png)no-repeat;
+ background-size: 100% 100%;
+ }
+}
+
.act-room-bg{
- float: right;
+ position: relative;
width: 8rem;
- height: 3.352rem;
- background: url(../images/act-room1.png)no-repeat;
+ height: 3.402rem;
+ background: url(../images/act-room-bg.png)no-repeat;
+ background-size: 100% 100%;
+ float: right;
+}
+.act-room-p1{
+ color: #fff;
+ font-size: 0.65rem;
+ text-indent: 0.7rem;
+ padding-top: 0.6rem;
+}
+.act-room-p2{
+ color: #fff;
+ font-size: 0.65rem;
+ text-indent: 0.7rem;
+ padding-top: 0.2rem;
+}
+.act-room-bg2{
+ position: relative;
+ width: 5.04rem;
+ height: 3.402rem;
+ background: url(../images/act-room-bg2.png)no-repeat;
background-size: 100% 100%;
+ p{
+ display: none;
+ }
}
\ No newline at end of file
diff --git a/ftIcon/action2/images/act-room-bg.png b/ftIcon/action2/images/act-room-bg.png
new file mode 100644
index 0000000..cafbbd3
Binary files /dev/null and b/ftIcon/action2/images/act-room-bg.png differ
diff --git a/ftIcon/action2/images/act-room-bg2.png b/ftIcon/action2/images/act-room-bg2.png
new file mode 100644
index 0000000..b382bf8
Binary files /dev/null and b/ftIcon/action2/images/act-room-bg2.png differ
diff --git a/ftIcon/action2/images/act-room1.png b/ftIcon/action2/images/act-room1.png
deleted file mode 100644
index a43ad61..0000000
Binary files a/ftIcon/action2/images/act-room1.png and /dev/null differ
diff --git a/ftIcon/action2/images/en/act-room-bg2.png b/ftIcon/action2/images/en/act-room-bg2.png
new file mode 100644
index 0000000..4eddb58
Binary files /dev/null and b/ftIcon/action2/images/en/act-room-bg2.png differ
diff --git a/ftIcon/action2/index.html b/ftIcon/action2/index.html
index a6e7e15..686cedc 100644
--- a/ftIcon/action2/index.html
+++ b/ftIcon/action2/index.html
@@ -30,7 +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-bg"></div>
+ <div class="act-room-bg act-room-bg2">
+ <p class="act-room-p1">主播積分 : 8000</p>
+ <p class="act-room-p2">排名 : 5</p>
+ </div>
</body>
<script src="lib/jquery-3.1.1.min.js"></script>
<script src="lib/fsize.js"></script>
@@ -39,6 +42,9 @@
<script type="text/javascript" src="https://app.ixiulive.com/static/js/socket.io.js"></script>
<script>
$(function(){
+ if(sessionStorage.lang!=2){
+ $("body").addClass("bg-en")
+ }
var wsTimer=null
if(sessionStorage.lang!=2){
$(".act-room-bg").fadeIn(200)
@@ -51,7 +57,7 @@ $(function(){
"data": {
"msg": '跳转集合功能',
"jumptype": 3,
- "url": $url + "/activeFt/Fishing/index.html" + location.search+'',
+ "url": $url + "/activeFt/luckyFly/index.html" + location.search+'',
}
}
var obj2 = JSON.stringify(obj);
@@ -72,22 +78,40 @@ $(function(){
var obj2 = JSON.stringify(obj);
appCollaboration(obj2);
- function view(){
-
- }
view()
setInterval(function(){
-
+ view()
},60000)
+ function view(){
+ $.ajax({
+ url:$ip+'/actSpaceOdyssey/getRoomPartData.html',
+ success:function(data){
+ console.log('圖標數據',data)
+ if(data.result.userData.signReceive!=0){
+ $(".act-room-bg").removeClass("act-room-bg2")
+ }
+ if(sessionStorage.lang==2){
+ $(".act-room-p1").text('主播積分 : '+data.result.roomData.score+'')
+ if(data.result.roomData.rank!=-1)$(".act-room-p2").text('排名 : '+data.result.roomData.rank+'')
+ else $(".act-room-p2").text('排名 : --')
+ }else{
+ $(".act-room-p1").text('score : '+data.result.roomData.score+'')
+ if(data.result.roomData.rank!=-1)$(".act-room-p2").text('rank : '+data.result.roomData.rank+'')
+ else $(".act-room-p2").text('rank : --')
+ }
+ }
+ })
+ }
+
setTimeout(function(){
if(sessionStorage.lang==2)return;
$.ajax({
url:$ip+'/actSecretGarden/openPopup.html',
data:{
width:'0',
- popupUrl:$url + "/activeFt/Fishing/pop.html",
+ popupUrl:$url + "/activeFt/luckyFly/pop.html",
height:'0.5',
- heightR:'80',
+ heightR:'95',
x:'0',
y:'0.5',
},
diff --git a/ftIcon/liveData/images/act-room-bg.png b/ftIcon/liveData/images/act-room-bg.png
index fee712e..cafbbd3 100644
Binary files a/ftIcon/liveData/images/act-room-bg.png and b/ftIcon/liveData/images/act-room-bg.png differ
diff --git a/ftIcon/liveData/images/act-room-bg2.png b/ftIcon/liveData/images/act-room-bg2.png
deleted file mode 100644
index 163100a..0000000
Binary files a/ftIcon/liveData/images/act-room-bg2.png and /dev/null differ
diff --git a/ftIcon/liveData/images/en/act-room-bg2.png b/ftIcon/liveData/images/en/act-room-bg2.png
deleted file mode 100644
index 163100a..0000000
Binary files a/ftIcon/liveData/images/en/act-room-bg2.png and /dev/null differ
diff --git a/ftIcon/liveData2/css/index.css b/ftIcon/liveData2/css/index.css
index a55a977..a0a3e8b 100644
--- a/ftIcon/liveData2/css/index.css
+++ b/ftIcon/liveData2/css/index.css
@@ -141,30 +141,32 @@
top: -0.95vw;
}
.act-room-bg {
- width: 10rem;
- height: 5.577rem;
+ position: relative;
+ width: 8rem;
+ height: 3.402rem;
background: url(../images/act-room-bg.png) no-repeat;
background-size: 100% 100%;
- transform: scale(0.33);
- position: absolute;
- top: -19vw;
- left: 33.2vw;
+ float: right;
}
-.act-room-bg .act-p1 {
- text-indent: 1.2rem;
- font-size: 0.8rem;
+.act-room-p1 {
color: #fff;
- padding-top: 1rem;
-}
-.act-room-bg .act-p1 span {
- color: #FFF337;
+ font-size: 0.65rem;
+ text-indent: 0.7rem;
+ padding-top: 0.6rem;
}
-.act-room-bg .act-p2 {
- text-indent: 1.2rem;
- font-size: 0.8rem;
+.act-room-p2 {
color: #fff;
- padding-top: 0.3rem;
+ font-size: 0.65rem;
+ text-indent: 0.7rem;
+ padding-top: 0.2rem;
}
-.act-room-bg .act-p2 span {
- color: #FFF337;
+.act-room-bg2 {
+ position: relative;
+ width: 5.04rem;
+ height: 3.402rem;
+ background: url(../images/act-room-bg2.png) no-repeat;
+ background-size: 100% 100%;
+}
+.act-room-bg2 p {
+ display: none;
}
diff --git a/ftIcon/liveData2/css/index.less b/ftIcon/liveData2/css/index.less
index 8052f9d..86a54db 100644
--- a/ftIcon/liveData2/css/index.less
+++ b/ftIcon/liveData2/css/index.less
@@ -160,31 +160,36 @@
//活动
//活動
+
+
+
.act-room-bg{
- width: 10rem;
- height: 5.577rem;
- background: url(../images/act-room-bg.png) no-repeat;
+ position: relative;
+ width: 8rem;
+ height: 3.402rem;
+ background: url(../images/act-room-bg.png)no-repeat;
background-size: 100% 100%;
- transform: scale(0.33);
- position: absolute;
- top: -19vw;
- left: 33.2vw;
- .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;
- }
+ float: right;
+}
+.act-room-p1{
+ color: #fff;
+ font-size: 0.65rem;
+ text-indent: 0.7rem;
+ padding-top: 0.6rem;
+}
+.act-room-p2{
+ color: #fff;
+ font-size: 0.65rem;
+ text-indent: 0.7rem;
+ padding-top: 0.2rem;
+}
+.act-room-bg2{
+ position: relative;
+ width: 5.04rem;
+ height: 3.402rem;
+ background: url(../images/act-room-bg2.png)no-repeat;
+ background-size: 100% 100%;
+ p{
+ display: none;
}
}
diff --git a/ftIcon/liveData2/images/act-room-bg.png b/ftIcon/liveData2/images/act-room-bg.png
index fbfcc18..cafbbd3 100644
Binary files a/ftIcon/liveData2/images/act-room-bg.png and b/ftIcon/liveData2/images/act-room-bg.png differ
diff --git a/ftIcon/liveData2/index.html b/ftIcon/liveData2/index.html
index c3cea70..edb2d57 100644
--- a/ftIcon/liveData2/index.html
+++ b/ftIcon/liveData2/index.html
@@ -69,9 +69,9 @@
</div>
- <div style="display: none;" class="act-room-bg act-room-bg2">
- <p class="act-p1"><i class="en-txt1">主播積分</i>: <span>8000</span></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>
+ <div class="act-room-bg">
+ <p class="act-room-p1">主播積分 : 8000</p>
+ <p class="act-room-p2">排名 : 5</p>
</div>
</body>
<script src="lib/jquery-3.1.1.min.js"></script>
@@ -96,7 +96,7 @@ $(function(){
"data": {
"msg": '跳转集合功能',
"jumptype": 3,
- "url": $url + "/activeFt/lucky777/index.html" + location.search+'&jump='+jump+'',
+ "url": $url + "/activeFt/luckyFly/index.html" + location.search+'&jump='+jump+'',
}
}
var obj2 = JSON.stringify(obj);
@@ -121,15 +121,19 @@ $(function(){
function actView(){
$.ajax({
- url:$ip+'/actLucky777/getRoomPartData.html',
+ url:$ip+'/actSpaceOdyssey/getRoomPartData.html',
success:function(data){
console.log('圖標數據',data)
- jump=2
- $(".act-room-bg").removeClass("act-room-bg2").fadeIn(200)
- $(".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)
+
+ if(sessionStorage.lang==2){
+ $(".act-room-p1").text('主播積分 : '+data.result.roomData.score+'')
+ if(data.result.roomData.rank!=-1)$(".act-room-p2").text('排名 : '+data.result.roomData.rank+'')
+ else $(".act-room-p2").text('排名 : --')
+ }else{
+ $(".act-room-p1").text('score : '+data.result.roomData.score+'')
+ if(data.result.roomData.rank!=-1)$(".act-room-p2").text('rank : '+data.result.roomData.rank+'')
+ else $(".act-room-p2").text('rank : --')
+ }
}
})
}