diff --git a/activeFt/goddess/css/index.css b/activeFt/goddess/css/index.css
index fa25e0c..e8776e1 100644
--- a/activeFt/goddess/css/index.css
+++ b/activeFt/goddess/css/index.css
@@ -1,3 +1,68 @@
+.bg-en .top-btn1 {
+ background: url(../images/en/top-btn1.png) no-repeat;
+ background-size: 100% 100%;
+}
+.bg-en .top-btn2 {
+ background: url(../images/en/top-btn2.png) no-repeat;
+ background-size: 100% 100%;
+}
+.bg-en .gift-box {
+ background: url(../images/en/gift-box.png) no-repeat;
+ background-size: 100% 100%;
+}
+.bg-en .banner {
+ background: url(../images/en/banner.png) no-repeat;
+ background-size: 100% 100%;
+}
+.bg-en .user-sign-box {
+ background: url(../images/en/user-sign-box.png) no-repeat;
+ background-size: 100% 100%;
+}
+.bg-en .card-box1 {
+ top: 3.4rem;
+}
+.bg-en .card-box2 {
+ top: 3.4rem;
+}
+.bg-en .user-reg-box {
+ background: url(../images/en/user-reg-box.png) no-repeat;
+ background-size: 100% 100%;
+}
+.bg-en .user-gift-box {
+ background: url(../images/en/user-gift-box.png) no-repeat;
+ background-size: 100% 100%;
+}
+.bg-en .gift-btn {
+ background: url(../images/en/gift-btn.png) no-repeat;
+ background-size: 100% 100%;
+}
+.bg-en .user-vip-card {
+ background: url(../images/en/user-vip-card.png) no-repeat;
+ background-size: 100% 100%;
+}
+.bg-en .vip-btn2 {
+ top: 9.6rem;
+}
+.bg-en .vip-btn {
+ background: url(../images/en/vip-btn.png) no-repeat;
+ background-size: 100% 100%;
+}
+.bg-en .vip-btn2 {
+ background: url(../images/en/vip-btn2.png) no-repeat;
+ background-size: 100% 100%;
+}
+.bg-en .list-bg {
+ background: url(../images/en/list-bg.png) no-repeat;
+ background-size: 100% 100%;
+}
+.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%;
+}
.bg {
margin: 0 auto;
width: 10rem;
@@ -17,6 +82,12 @@
position: relative;
margin: 0 auto;
}
+.rule-bg-en {
+ width: 10rem;
+ height: 46rem;
+ background: url(../images/en/rule-bg.png) no-repeat;
+ background-size: 100% auto;
+}
.rule-btn {
width: 1.586rem;
position: fixed;
@@ -458,7 +529,7 @@
background: url(../images/vip-btn.png) no-repeat;
background-size: 100% 100%;
position: absolute;
- top: 9.5rem;
+ top: 9.6rem;
left: 50%;
margin-left: -1.846rem;
}
diff --git a/activeFt/goddess/css/index.less b/activeFt/goddess/css/index.less
index a2167cb..6c4b33b 100644
--- a/activeFt/goddess/css/index.less
+++ b/activeFt/goddess/css/index.less
@@ -1,3 +1,70 @@
+.bg-en{
+ .top-btn1{
+ background: url(../images/en/top-btn1.png) no-repeat;
+ background-size: 100% 100%;
+ }
+ .top-btn2{
+ background: url(../images/en/top-btn2.png) no-repeat;
+ background-size: 100% 100%;
+ }
+ .gift-box{
+ background: url(../images/en/gift-box.png) no-repeat;
+ background-size: 100% 100%;
+ }
+ .banner{
+ background: url(../images/en/banner.png) no-repeat;
+ background-size: 100% 100%;
+ }
+ .user-sign-box{
+ background: url(../images/en/user-sign-box.png) no-repeat;
+ background-size: 100% 100%;
+ }
+ .card-box1{
+ top: 3.4rem;
+ }
+ .card-box2{
+ top: 3.4rem;
+ }
+ .user-reg-box{
+ background: url(../images/en/user-reg-box.png) no-repeat;
+ background-size: 100% 100%;
+ }
+ .user-gift-box{
+ background: url(../images/en/user-gift-box.png) no-repeat;
+ background-size: 100% 100%;
+ }
+ .gift-btn{
+ background: url(../images/en/gift-btn.png) no-repeat;
+ background-size: 100% 100%;
+ }
+ .user-vip-card{
+ background: url(../images/en/user-vip-card.png) no-repeat;
+ background-size: 100% 100%;
+ }
+ .vip-btn2{
+ top: 9.6rem;
+ }
+ .vip-btn{
+ background: url(../images/en/vip-btn.png) no-repeat;
+ background-size: 100% 100%;
+ }
+ .vip-btn2{
+ background: url(../images/en/vip-btn2.png) no-repeat;
+ background-size: 100% 100%;
+ }
+ .list-bg{
+ background: url(../images/en/list-bg.png) no-repeat;
+ background-size: 100% 100%;
+ }
+ .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%;
+ }
+}
.bg{
margin: 0 auto;
width: 10rem;
@@ -17,6 +84,12 @@
position: relative;
margin: 0 auto;
}
+.rule-bg-en{
+ width: 10rem;
+ height: 46rem;
+ background: url(../images/en/rule-bg.png)no-repeat;
+ background-size: 100% auto;
+}
.rule-btn{
width: 1.586rem;
position: fixed;
@@ -467,7 +540,7 @@
background: url(../images/vip-btn.png) no-repeat;
background-size: 100% 100%;
position: absolute;
- top: 9.5rem;
+ top: 9.6rem;
left: 50%;
margin-left: -1.846rem;
}
diff --git a/activeFt/goddess/images/bottom-nav.png b/activeFt/goddess/images/bottom-nav.png
new file mode 100644
index 0000000..6497e45
Binary files /dev/null and b/activeFt/goddess/images/bottom-nav.png differ
diff --git a/activeFt/goddess/images/en/act-room-bg2.png b/activeFt/goddess/images/en/act-room-bg2.png
new file mode 100644
index 0000000..9cfb5f9
Binary files /dev/null and b/activeFt/goddess/images/en/act-room-bg2.png differ
diff --git a/activeFt/goddess/images/en/act-room.png b/activeFt/goddess/images/en/act-room.png
new file mode 100644
index 0000000..0ab1c56
Binary files /dev/null and b/activeFt/goddess/images/en/act-room.png differ
diff --git a/activeFt/goddess/images/en/back.png b/activeFt/goddess/images/en/back.png
new file mode 100644
index 0000000..8c753b2
Binary files /dev/null and b/activeFt/goddess/images/en/back.png differ
diff --git a/activeFt/goddess/images/en/banner.png b/activeFt/goddess/images/en/banner.png
new file mode 100644
index 0000000..ce914f8
Binary files /dev/null and b/activeFt/goddess/images/en/banner.png differ
diff --git a/activeFt/goddess/images/en/gift-box.png b/activeFt/goddess/images/en/gift-box.png
new file mode 100644
index 0000000..d092574
Binary files /dev/null and b/activeFt/goddess/images/en/gift-box.png differ
diff --git a/activeFt/goddess/images/en/gift-btn.png b/activeFt/goddess/images/en/gift-btn.png
new file mode 100644
index 0000000..6210bf3
Binary files /dev/null and b/activeFt/goddess/images/en/gift-btn.png differ
diff --git a/activeFt/goddess/images/en/layer-reg.png b/activeFt/goddess/images/en/layer-reg.png
new file mode 100644
index 0000000..7aa064f
Binary files /dev/null and b/activeFt/goddess/images/en/layer-reg.png differ
diff --git a/activeFt/goddess/images/en/layer-user-gift.png b/activeFt/goddess/images/en/layer-user-gift.png
new file mode 100644
index 0000000..02b6787
Binary files /dev/null and b/activeFt/goddess/images/en/layer-user-gift.png differ
diff --git a/activeFt/goddess/images/en/layer-vip.png b/activeFt/goddess/images/en/layer-vip.png
new file mode 100644
index 0000000..d3ade4f
Binary files /dev/null and b/activeFt/goddess/images/en/layer-vip.png differ
diff --git a/activeFt/goddess/images/en/layer-yesterday.png b/activeFt/goddess/images/en/layer-yesterday.png
new file mode 100644
index 0000000..37259a8
Binary files /dev/null and b/activeFt/goddess/images/en/layer-yesterday.png differ
diff --git a/activeFt/goddess/images/en/list-bg.png b/activeFt/goddess/images/en/list-bg.png
new file mode 100644
index 0000000..909f312
Binary files /dev/null and b/activeFt/goddess/images/en/list-bg.png differ
diff --git a/activeFt/goddess/images/en/lucky-btn.png b/activeFt/goddess/images/en/lucky-btn.png
new file mode 100644
index 0000000..8ec0661
Binary files /dev/null and b/activeFt/goddess/images/en/lucky-btn.png differ
diff --git a/activeFt/goddess/images/en/ok.png b/activeFt/goddess/images/en/ok.png
new file mode 100644
index 0000000..2faf01c
Binary files /dev/null and b/activeFt/goddess/images/en/ok.png differ
diff --git a/activeFt/goddess/images/en/rule-bg.png b/activeFt/goddess/images/en/rule-bg.png
new file mode 100644
index 0000000..bd1a4e8
Binary files /dev/null and b/activeFt/goddess/images/en/rule-bg.png differ
diff --git a/activeFt/goddess/images/en/rule-btn.png b/activeFt/goddess/images/en/rule-btn.png
new file mode 100644
index 0000000..aefe28a
Binary files /dev/null and b/activeFt/goddess/images/en/rule-btn.png differ
diff --git a/activeFt/goddess/images/en/top-btn1.png b/activeFt/goddess/images/en/top-btn1.png
new file mode 100644
index 0000000..c9c6d58
Binary files /dev/null and b/activeFt/goddess/images/en/top-btn1.png differ
diff --git a/activeFt/goddess/images/en/top-btn2.png b/activeFt/goddess/images/en/top-btn2.png
new file mode 100644
index 0000000..e28f7d5
Binary files /dev/null and b/activeFt/goddess/images/en/top-btn2.png differ
diff --git a/activeFt/goddess/images/en/user-gift-box.png b/activeFt/goddess/images/en/user-gift-box.png
new file mode 100644
index 0000000..6f13bba
Binary files /dev/null and b/activeFt/goddess/images/en/user-gift-box.png differ
diff --git a/activeFt/goddess/images/en/user-reg-box.png b/activeFt/goddess/images/en/user-reg-box.png
new file mode 100644
index 0000000..ba73168
Binary files /dev/null and b/activeFt/goddess/images/en/user-reg-box.png differ
diff --git a/activeFt/goddess/images/en/user-sign-box.png b/activeFt/goddess/images/en/user-sign-box.png
new file mode 100644
index 0000000..2f54abd
Binary files /dev/null and b/activeFt/goddess/images/en/user-sign-box.png differ
diff --git a/activeFt/goddess/images/en/user-vip-card.png b/activeFt/goddess/images/en/user-vip-card.png
new file mode 100644
index 0000000..d259b06
Binary files /dev/null and b/activeFt/goddess/images/en/user-vip-card.png differ
diff --git a/activeFt/goddess/images/en/vip-btn.png b/activeFt/goddess/images/en/vip-btn.png
new file mode 100644
index 0000000..552b698
Binary files /dev/null and b/activeFt/goddess/images/en/vip-btn.png differ
diff --git a/activeFt/goddess/images/en/yesterday-btn.png b/activeFt/goddess/images/en/yesterday-btn.png
new file mode 100644
index 0000000..a80e2f8
Binary files /dev/null and b/activeFt/goddess/images/en/yesterday-btn.png differ
diff --git "a/activeFt/goddess/images/en/\344\273\212\346\227\245\345\267\262\350\264\255\344\271\260.png" "b/activeFt/goddess/images/en/\344\273\212\346\227\245\345\267\262\350\264\255\344\271\260.png"
new file mode 100644
index 0000000..a884238
Binary files /dev/null and "b/activeFt/goddess/images/en/\344\273\212\346\227\245\345\267\262\350\264\255\344\271\260.png" differ
diff --git "a/activeFt/goddess/images/en/\344\273\212\346\227\245\350\276\276\346\240\207.png" "b/activeFt/goddess/images/en/\344\273\212\346\227\245\350\276\276\346\240\207.png"
new file mode 100644
index 0000000..42257f8
Binary files /dev/null and "b/activeFt/goddess/images/en/\344\273\212\346\227\245\350\276\276\346\240\207.png" differ
diff --git "a/activeFt/goddess/images/en/\345\245\263\347\245\236\302\267\346\234\210\343\201\256\347\245\235\347\246\217\345\274\271\347\252\227 \346\213\267\350\264\235 2.png" "b/activeFt/goddess/images/en/\345\245\263\347\245\236\302\267\346\234\210\343\201\256\347\245\235\347\246\217\345\274\271\347\252\227 \346\213\267\350\264\235 2.png"
new file mode 100644
index 0000000..d01fcbc
Binary files /dev/null and "b/activeFt/goddess/images/en/\345\245\263\347\245\236\302\267\346\234\210\343\201\256\347\245\235\347\246\217\345\274\271\347\252\227 \346\213\267\350\264\235 2.png" differ
diff --git "a/activeFt/goddess/images/en/\350\276\276\346\240\207\347\201\260.png" "b/activeFt/goddess/images/en/\350\276\276\346\240\207\347\201\260.png"
new file mode 100644
index 0000000..6121a78
Binary files /dev/null and "b/activeFt/goddess/images/en/\350\276\276\346\240\207\347\201\260.png" differ
diff --git a/activeFt/goddess/index.html b/activeFt/goddess/index.html
index 99fc3e1..6b48d6b 100644
--- a/activeFt/goddess/index.html
+++ b/activeFt/goddess/index.html
@@ -156,6 +156,12 @@
<script src="lib/swiper.min.js"></script>
<script>
$(function(){
+ if(sessionStorage.lang!=2){
+ $("body").addClass("bg-en")
+ $(".top-mc-p1").text("Best MC of yesterday")
+ $(".user-sign-box >p").text("Please click to select the sign-in card")
+ $(".rule-btn").attr("src","images/en/rule-btn.png")
+ }
if(sessionStorage.lang==2)var titleName="女神物語"
else var titleName="Goddess Chronicles"
var obj = {
@@ -303,8 +309,16 @@ $(function(){
html+='<p class="list-p2">積分 : '+list.score+'</p>';
html+='</div>';
html+='<div class="list-box3">';
- if(list.score>=10000)html+='<div class="list-ok">今日達標</div>';
- else html+='<div class="list-box3">今日進度:'+Math.floor(list.score/10000*100)+'%</div>';
+ if(list.score>=10000){
+ if(sessionStorage.lang==2) html+='<div class="list-ok">今日達標</div>';
+ else html+='<div class="list-ok">Completed</div>';
+
+ }
+ else{
+ if(sessionStorage.lang==2)html+='<div class="list-box3">今日進度:'+Math.floor(list.score/10000*100)+'%</div>';
+ else html+='<div class="list-box3">progress:'+Math.floor(list.score/10000*100)+'%</div>';
+
+ }
html+='</div>';
html+='<img class="line" src="images/line.png" alt="">';
html+='</li>';
@@ -359,21 +373,26 @@ $(function(){
}
html+='</div>';
$(".card2").html(html)
- $(".user-sign-box >p").text("今日已簽到，禮物已發放至背包，請明日再來")
+ if(sessionStorage.lang==2) $(".user-sign-box >p").text("今日已簽到，禮物已發放至背包，請明日再來")
+ else $(".user-sign-box >p").text("Signed in, gift in backpack. Come back tomorrow.")
+
}
})
})
}else{
- $(".user-sign-box >p").text("今日已簽到，禮物已發放至背包，請明日再來")
+ if(sessionStorage.lang==2) $(".user-sign-box >p").text("今日已簽到，禮物已發放至背包，請明日再來")
+ else $(".user-sign-box >p").text("Signed in, gift in backpack. Come back tomorrow.")
var html='';
html+='<div class="card-content">';
if(list.checkinReward==4){
html+='<img src="images/g2.png" alt="">';
- html+='<p>女神花束*1</p>';
+ if(sessionStorage.lang==2)html+='<p>女神花束*1</p>';
+ else html+='<p>flowers*1</p>';
}
else{
html+='<img src="images/g1.png" alt="">';
- html+='<p>女神硬幣*'+list.checkinReward+'</p>';
+ if(sessionStorage.lang==2)html+='<p>女神硬幣*'+list.checkinReward+'</p>';
+ else html+='<p>goddess coin*'+list.checkinReward+'</p>';
}
html+='</div>';
$(".card2").html(html)
@@ -387,7 +406,8 @@ $(function(){
//儲值抽獎
if(list.status==-1){
//未達標
- $(".lucky-btn").addClass("lucky-btn2").text("點擊前往儲值 >")
+ if(sessionStorage.lang==2)$(".lucky-btn").addClass("lucky-btn2").text("點擊前往儲值 >")
+ else $(".lucky-btn").addClass("lucky-btn2").text("Go to recharge >")
$(".lucky-btn").unbind("click").on("click",function(){
window.location.href='https://www.footseen.com/footseen/phonepay/applepay.html'+location.search
})
@@ -400,7 +420,8 @@ $(function(){
}
else if(list.status==1){
//已領取
- $(".lucky-btn").addClass("lucky-btn2").text("已獲得"+list.todayRewardDiamond+"寶石")
+ if(sessionStorage.lang==2)$(".lucky-btn").addClass("lucky-btn2").text("已獲得"+list.todayRewardDiamond+"寶石")
+ else $(".lucky-btn").addClass("lucky-btn2").text("Already obtained"+list.todayRewardDiamond+"GEMs")
}
}
if(i==2){
@@ -413,7 +434,9 @@ $(function(){
}
else{
//已購買
- $(".gift-btn").addClass("gift-btn2").text("今日已購買")
+ if(sessionStorage.lang==2) $(".gift-btn").addClass("gift-btn2").text("今日已購買")
+ else $(".gift-btn").addClass("gift-btn2").text("Purchased today")
+
}
}
if(i==3){
@@ -425,8 +448,14 @@ $(function(){
})
}else{
//已購買
- $(".vip-btn").addClass("vip-btn2").text("已購買：有效期至"+timeGet(list.validEndTime)[1]+"月"+timeGet(list.validEndTime)[2]+"日")
- $(".layer-vip-p3").text("已購買：有效期至"+timeGet(list.validEndTime)[1]+"月"+timeGet(list.validEndTime)[2]+"日")
+ if(sessionStorage.lang==2){
+ $(".vip-btn").addClass("vip-btn2").text("已購買：有效期至"+timeGet(list.validEndTime)[1]+"月"+timeGet(list.validEndTime)[2]+"日")
+ $(".layer-vip-p3").text("已購買：有效期至"+timeGet(list.validEndTime)[1]+"月"+timeGet(list.validEndTime)[2]+"日")
+ }else{
+ $(".vip-btn").addClass("vip-btn2").text("Purchased until"+timeGet(list.validEndTime)[1]+"-"+timeGet(list.validEndTime)[2]+"")
+ $(".layer-vip-p3").text("Purchased until"+timeGet(list.validEndTime)[1]+"-"+timeGet(list.validEndTime)[2]+"")
+ }
+
}
}
}
diff --git a/activeFt/goddess/lib/default.js b/activeFt/goddess/lib/default.js
index 1a3da4a..c46d5c9 100644
--- a/activeFt/goddess/lib/default.js
+++ b/activeFt/goddess/lib/default.js
@@ -68,7 +68,7 @@ if(sessionStorage.open==undefined)sessionStorage.open=1
sessionStorage.roomId=23864554
}
if (bbb.indexOf("file:///E:") > -1) {
- sessionStorage.lang=2
+ sessionStorage.lang=1
sessionStorage.uid =11146505;
sessionStorage.token = 'debug'
sessionStorage.roomId=11134747;
diff --git a/activeFt/goddess/oldView.html b/activeFt/goddess/oldView.html
index 00505fd..e160227 100644
--- a/activeFt/goddess/oldView.html
+++ b/activeFt/goddess/oldView.html
@@ -45,8 +45,6 @@
$(function(){
if(sessionStorage.lang!=2){
$("body").addClass("bg-en")
- $(".act-room-tips1").text("the one ahead")
- $(".act-room-tips2").text("rank")
}
$(".act-room-bg1").on("click",function(){
var obj = {
@@ -73,8 +71,14 @@ $(function(){
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)
- $(".act-room-p3").text("進度 : "+Math.floor(data.result.roomData.score/10000*100)+'%')
- $(".act-room-p4").text("排名 : "+data.result.roomData.rank+"")
+ 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+"")
+ }
+
}
})
}
diff --git a/activeFt/goddess/rule.html b/activeFt/goddess/rule.html
index 5ea6828..6cfb3c1 100644
--- a/activeFt/goddess/rule.html
+++ b/activeFt/goddess/rule.html
@@ -40,6 +40,9 @@
<script src="lib/default.js?v='2023120901'"></script>
<script>
$(function(){
+ if(sessionStorage.lang!=2){
+ $(".back").attr("src","images/en/back.png")
+ }
if(sessionStorage.lang==2)var titleName="女神物語"
else var titleName="Goddess Chronicles"
var obj = {
diff --git a/footseenIcon/action/css/index.css b/footseenIcon/action/css/index.css
index b1d9888..27568cf 100644
--- a/footseenIcon/action/css/index.css
+++ b/footseenIcon/action/css/index.css
@@ -3,8 +3,10 @@
background-size: 100% 100%;
}
.bg-en .act-room-bg2 {
- background: url(../images/act-room-bg2.png) 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;
@@ -15,8 +17,8 @@
}
.act-room-bg2 {
position: relative;
- width: 10rem;
- height: 7.251rem;
+ width: 9rem;
+ height: 6rem;
background: url(../images/act-room-bg2.png) no-repeat;
background-size: 100% 100%;
transform: scale(0.85);
diff --git a/footseenIcon/action/css/index.less b/footseenIcon/action/css/index.less
index e8ac761..dcd7c80 100644
--- a/footseenIcon/action/css/index.less
+++ b/footseenIcon/action/css/index.less
@@ -4,8 +4,10 @@
background-size: 100% 100%;
}
.act-room-bg2{
- background: url(../images/act-room-bg2.png)no-repeat;
+ background: url(../images/en/act-room-bg2.png)no-repeat;
background-size: 100% 100%;
+ height: 6rem;
+ width: 10rem;
}
}
.act-room-bg1{
@@ -17,8 +19,8 @@
}
.act-room-bg2{
position: relative;
- width: 10rem;
- height: 7.251rem;
+ width: 9rem;
+ height: 6rem;
background: url(../images/act-room-bg2.png)no-repeat;
background-size: 100% 100%;
transform: scale(0.85);
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 6981347..f5d8be8 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=2024061701">
+ <link rel="stylesheet" href="css/index.css?v=2024073101">
<link rel="stylesheet" href="css/liMarquee.css">
<style>
.layui-layer-shade {
@@ -54,7 +54,7 @@ $(function(){
"type":1,
// "width":314,
"width":120,
- "height":73,
+ "height":87.6,
'unit':2,
"position":1
}
@@ -69,10 +69,18 @@ $(function(){
console.log('获取主播信息',data)
if(data.result.userData.signReceive==1)$(".act-room-bg1").removeClass("act-room-bg2")
$(".act-room-bg1").show()
- $(".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+"")
+ if(sessionStorage.lang==2){
+ $(".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{
+ $(".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+"")
+ }
+
}
})
}
diff --git a/footseenIcon/liveData2/css/index.css b/footseenIcon/liveData2/css/index.css
index 97c922d..2f37577 100644
--- a/footseenIcon/liveData2/css/index.css
+++ b/footseenIcon/liveData2/css/index.css
@@ -147,23 +147,23 @@
.bg-en .act-room-bg2 {
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;
+ height: 6.085rem;
background: url(../images/act-room-bg.png) no-repeat;
background-size: 100% 100%;
- position: absolute;
- right: -33vw;
+ position: relative;
+ right: 0.8vw;
top: -20vw;
transform: scale(0.33);
}
.act-room-bg2 {
- position: absolute;
- width: 8rem;
- height: 5.44rem;
- right: -25vw;
- top: -19vw;
+ position: relative;
+ width: 9rem;
+ height: 6rem;
background: url(../images/act-room-bg2.png) no-repeat;
background-size: 100% 100%;
}
@@ -171,22 +171,23 @@
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/liveData2/css/index.less b/footseenIcon/liveData2/css/index.less
index 088e178..b151010 100644
--- a/footseenIcon/liveData2/css/index.less
+++ b/footseenIcon/liveData2/css/index.less
@@ -158,6 +158,7 @@
}
//活动
+
.bg-en{
.act-room-bg1{
background: url(../images/en/act-room-bg.png)no-repeat;
@@ -166,49 +167,49 @@
.act-room-bg2{
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;
+ height: 6.085rem;
background: url(../images/act-room-bg.png)no-repeat;
background-size: 100% 100%;
- position: absolute;
- right: -33vw;
+ position: relative;
+ right: 0.8vw;
top: -20vw;
transform: scale(0.33);
}
.act-room-bg2{
- position: absolute;
- width: 8rem;
- height: 5.44rem;
- right: -25vw;
- top: -19vw;
+ position: relative;
+ width: 9rem;
+ height: 6rem;
background: url(../images/act-room-bg2.png)no-repeat;
background-size: 100% 100%;
+ // transform: scale(0.85);
p{
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/liveData2/images/act-room-bg.png b/footseenIcon/liveData2/images/act-room-bg.png
index 5f9435b..7a7bd73 100644
Binary files a/footseenIcon/liveData2/images/act-room-bg.png and b/footseenIcon/liveData2/images/act-room-bg.png differ
diff --git a/footseenIcon/liveData2/images/act-room-bg2.png b/footseenIcon/liveData2/images/act-room-bg2.png
index 824305d..7465a69 100644
Binary files a/footseenIcon/liveData2/images/act-room-bg2.png and b/footseenIcon/liveData2/images/act-room-bg2.png differ
diff --git a/footseenIcon/liveData2/images/en/act-room-bg.png b/footseenIcon/liveData2/images/en/act-room-bg.png
index 16dffa4..d01fcbc 100644
Binary files a/footseenIcon/liveData2/images/en/act-room-bg.png and b/footseenIcon/liveData2/images/en/act-room-bg.png differ
diff --git a/footseenIcon/liveData2/images/en/act-room-bg2.png b/footseenIcon/liveData2/images/en/act-room-bg2.png
index 978196a..9cfb5f9 100644
Binary files a/footseenIcon/liveData2/images/en/act-room-bg2.png and b/footseenIcon/liveData2/images/en/act-room-bg2.png differ
diff --git a/footseenIcon/liveData2/index.html b/footseenIcon/liveData2/index.html
index 17a6253..a1e7af3 100644
--- a/footseenIcon/liveData2/index.html
+++ b/footseenIcon/liveData2/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=2023010405">
+ <link rel="stylesheet" href="css/index.css?v=2024073101">
<link rel="stylesheet" href="css/liMarquee.css">
<style>
.layui-layer-shade {
@@ -67,10 +67,10 @@
</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 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>
</div>
@@ -177,7 +177,7 @@ $(function(){
"data": {
"popupType":2,
// "width":314,
- "url":''+$url+'/activeFt/summer/index.html',
+ "url":''+$url+'/activeFt/goddess/index.html',
"heightR":160,
"clickBlank":1,
"bottom":'0',
diff --git a/ftIcon/liveData/css/index.css b/ftIcon/liveData/css/index.css
index e6b6216..421ecb3 100644
--- a/ftIcon/liveData/css/index.css
+++ b/ftIcon/liveData/css/index.css
@@ -6,6 +6,14 @@
position: relative;
display: none;
}
+.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%;
+}
i {
font-style: normal;
}
@@ -135,62 +143,52 @@ i {
}
.act-room-bg1 {
width: 10rem;
- height: 10.48rem;
- background: url(../images/act-room-bg.png) no-repeat;
+ height: 12.05rem;
+ background: url(../images/act-room.png) no-repeat;
background-size: 100% 100%;
position: relative;
}
-.act-room-bg1 .act-room-p1 {
- font-size: 0.8rem;
+.act-room-p1 {
+ color: #AC2867;
+ font-size: 0.35rem;
+ width: 10rem;
+}
+.act-room-p2 {
+ color: #AC2867;
+ width: 10rem;
+ height: 3.8rem;
+ text-align: center;
+ line-height: 3.8rem;
+ font-size: 1rem;
font-weight: 700;
- color: #1FFFF2;
position: absolute;
- background: url(../images/act-room-p.png) no-repeat;
- background-size: 100% 100%;
- left: 2rem;
- top: 4rem;
- height: 2rem;
- line-height: 2rem;
- width: 6rem;
- text-align: center;
+ top: 4.3rem;
}
-.act-room-bg1 .act-room-p2 {
+.act-room-p3 {
position: absolute;
- left: 2rem;
- width: 6rem;
- font-size: 0.8rem;
- font-weight: 700;
- background: url(../images/act-room-p.png) no-repeat;
- background-size: 100% 100%;
- color: #1FFFF2;
- top: 7.85rem;
- height: 2rem;
- line-height: 2rem;
- text-align: center;
+ top: 8.6rem;
+ color: #AC2867;
+ text-align: left;
+ font-size: 0.85rem;
+ width: 10rem;
+ text-indent: 2.5rem;
+}
+.act-room-p4 {
+ position: absolute;
+ top: 10rem;
+ color: #AC2867;
+ text-align: left;
+ font-size: 0.85rem;
+ width: 10rem;
+ text-indent: 2.5rem;
}
.act-room-bg2 {
- position: relative;
- width: 8rem;
- height: 5.44rem;
+ width: 10rem;
+ height: 7.251rem;
background: url(../images/act-room-bg2.png) no-repeat;
background-size: 100% 100%;
+ transform: scale(0.85);
}
-.act-room-bg2 p {
- font-size: 0 !important;
-}
-.act-room-tips1 {
- color: #fff;
- font-size: 0.6rem;
- text-align: center;
- width: 10rem;
- position: absolute;
- top: 2.9rem;
-}
-.act-room-tips2 {
- color: #fff;
- font-size: 0.6rem;
- text-align: center;
- width: 10rem;
- position: absolute;
- top: 6.7rem;
+.act-room-bg2 > div {
+ display: none;
}
diff --git a/ftIcon/liveData/css/index.less b/ftIcon/liveData/css/index.less
index 710957e..bdbc8a2 100644
--- a/ftIcon/liveData/css/index.less
+++ b/ftIcon/liveData/css/index.less
@@ -6,6 +6,17 @@
position: relative;
display: none;
}
+.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%;
+ }
+}
+
i{
font-style: normal;
}
@@ -154,64 +165,53 @@ i{
}
.act-room-bg1{
width: 10rem;
- height: 10.48rem;
- background: url(../images/act-room-bg.png)no-repeat;
+ height: 12.05rem;
+ background: url(../images/act-room.png)no-repeat;
background-size: 100% 100%;
position: relative;
- .act-room-p1{
- font-size: 0.8rem;
- font-weight: 700;
- color: #1FFFF2;
- position: absolute;
- background: url(../images/act-room-p.png)no-repeat;
- background-size: 100% 100%;
- left: 2rem;
- top: 4rem;
- height: 2rem;
- line-height: 2rem;
- width: 6rem;
- text-align: center;
- }
- .act-room-p2{
- position: absolute;
- left: 2rem;
- width: 6rem;
- font-size: 0.8rem;
- font-weight: 700;
- background: url(../images/act-room-p.png)no-repeat;
- background-size: 100% 100%;
- color: #1FFFF2;
- top: 7.85rem;
- height: 2rem;
- line-height: 2rem;
- text-align: center;
- }
}
-.act-room-bg2{
- position: relative;
- // float: right;
- width: 8rem;
- height: 5.44rem;
- background: url(../images/act-room-bg2.png)no-repeat;
- background-size: 100% 100%;
- p{
- font-size: 0 !important;
- }
+.act-room-p1{
+ color: #AC2867;
+ font-size: 0.35rem;
+ width: 10rem;
}
-.act-room-tips1{
- color: #fff;
- font-size: 0.6rem;
- text-align: center;
+.act-room-p2{
+ color: #AC2867;
width: 10rem;
+ height: 3.8rem;
+ // background: pink;
+ text-align: center;
+ line-height: 3.8rem;
+ font-size: 1rem;
+ font-weight: 700;
position: absolute;
- top: 2.9rem;
-
+ top: 4.3rem;
}
-.act-room-tips2{
- color: #fff;
- font-size: 0.6rem;
- text-align: center;
+.act-room-p3{
+ position: absolute;
+ top: 8.6rem;
+ color: #AC2867;
+ text-align: left;
+ font-size: 0.85rem;
width: 10rem;
+ text-indent: 2.5rem;
+}
+.act-room-p4{
position: absolute;
- top: 6.7rem;
+ top:10rem;
+ color: #AC2867;
+ text-align: left;
+ font-size: 0.85rem;
+ width: 10rem;
+ text-indent: 2.5rem;
+}
+.act-room-bg2{
+ width: 10rem;
+ height: 7.251rem;
+ background: url(../images/act-room-bg2.png)no-repeat;
+ background-size: 100% 100%;
+ transform: scale(0.85);
+ >div{
+ display: none;
+ }
}
\ No newline at end of file
diff --git a/ftIcon/liveData/images/act-room-bg.png b/ftIcon/liveData/images/act-room-bg.png
deleted file mode 100644
index 17deb96..0000000
Binary files a/ftIcon/liveData/images/act-room-bg.png and /dev/null differ
diff --git a/ftIcon/liveData/images/act-room-bg2.png b/ftIcon/liveData/images/act-room-bg2.png
index 824305d..7465a69 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.png b/ftIcon/liveData/images/act-room.png
new file mode 100644
index 0000000..243f25b
Binary files /dev/null and b/ftIcon/liveData/images/act-room.png differ
diff --git a/ftIcon/liveData/images/en/act-room-bg.png b/ftIcon/liveData/images/en/act-room-bg.png
deleted file mode 100644
index 4c6cb6e..0000000
Binary files a/ftIcon/liveData/images/en/act-room-bg.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
index 978196a..9cfb5f9 100644
Binary files a/ftIcon/liveData/images/en/act-room-bg2.png and b/ftIcon/liveData/images/en/act-room-bg2.png differ
diff --git a/ftIcon/liveData/images/en/act-room.png b/ftIcon/liveData/images/en/act-room.png
new file mode 100644
index 0000000..0ab1c56
Binary files /dev/null and b/ftIcon/liveData/images/en/act-room.png differ
diff --git a/ftIcon/liveData/index.html b/ftIcon/liveData/index.html
index 2cf4092..49c4042 100644
--- a/ftIcon/liveData/index.html
+++ b/ftIcon/liveData/index.html
@@ -31,12 +31,11 @@
</style>
</head>
<body c style="background:rgba(0,0,0,0)">
- <div class="act-room-bg1">
- <div class="act-title"></div>
- <p class="act-room-tips1">距離上一名</p>
- <p class="act-room-tips2">當前排名</p>
- <p class="act-room-p1">--</p>
- <p class="act-room-p2">--</p>
+ <div class="act-room-bg1 act-room-bg2">
+ <!-- <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>
<div class="room-bg1">
<div class="room-bg-top">人氣</div>
@@ -79,8 +78,6 @@ $(function(){
var socketOk=null
if(sessionStorage.lang!=2){
$("body").addClass("bg-en")
- $(".act-room-tips1").text("the one ahead")
- $(".act-room-tips2").text("rank")
}
//活動
$(".act-room-bg1").on("click",function(){
@@ -90,7 +87,7 @@ $(function(){
"data": {
"msg": '跳转集合功能',
"jumptype": 3,
- "url": $url + "/activeFt/summer/index.html" + location.search,
+ "url": $url + "/activeFt/goddess/index.html" + location.search,
}
}
var obj2 = JSON.stringify(obj);
@@ -99,17 +96,18 @@ $(function(){
function ActView(){
$.ajax({
- url:$ip+'/actSummerDew/getRoomPartData.html',
+ url:$ip+'/actGoddessStory/getRoomPartData.html',
success:function(data){
console.log('获取主播信息',data)
- $(".act-room-p1").text(data.result.roomData.diffPreScore)
- $(".act-room-p2").text(data.result.roomData.rank)
- if(data.result.roomData.rank==1){
- if(sessionStorage.lang==2) $(".act-room-tips1").text("距離被超越")
- else $(".act-room-tips1").text("Leading")
+ 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{
- if(sessionStorage.lang==2) $(".act-room-tips1").text("距離上一名")
- else $(".act-room-tips1").text("the one ahead")
+ $(".act-room-p3").text("PROG : "+Math.floor(data.result.roomData.score/10000*100)+'%')
+ $(".act-room-p4").text("rank : "+data.result.roomData.rank+"")
}
}
})
diff --git a/ftIcon/liveData/lib/default.js b/ftIcon/liveData/lib/default.js
index 2663583..be346f3 100644
--- a/ftIcon/liveData/lib/default.js
+++ b/ftIcon/liveData/lib/default.js
@@ -58,7 +58,7 @@ if (bbb.indexOf("http://localhost:63342") > -1) {
}
if (bbb.indexOf("file:///") > -1) {
sessionStorage.lang=1
- sessionStorage.uid = 210102;
+ sessionStorage.uid = 155100;
sessionStorage.token = 'debug'
sessionStorage.roomId=155100;
sessionStorage.version=8890