From af15e5ac7d06c96b45edbc23e0fc1b8c8de6245c Mon Sep 17 00:00:00 2001
From: libai <libai@yazhai.co>
Date: Wed, 14 Aug 2024 17:45:40 +0800
Subject: [PATCH] ft活动上线
---
activeFt/garden/css/index.css | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
activeFt/garden/css/index.less | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
activeFt/garden/images/back.png | Bin 0 -> 2845 bytes
activeFt/garden/images/bottom-nav.png | Bin 0 -> 3984 bytes
activeFt/garden/images/ref.png | Bin 0 -> 2410 bytes
activeFt/garden/images/rule-btn.png | Bin 0 -> 3059 bytes
activeFt/garden/images/rule.png | Bin 0 -> 1632131 bytes
activeFt/garden/index.html | 41 +++++++++++++++++++++++++++++++++++------
activeFt/garden/rule.html | 21 ++++++++++-----------
ftIcon/liveData/index.html | 1 +
10 files changed, 216 insertions(+), 18 deletions(-)
create mode 100644 activeFt/garden/images/back.png
create mode 100644 activeFt/garden/images/bottom-nav.png
create mode 100644 activeFt/garden/images/ref.png
create mode 100644 activeFt/garden/images/rule-btn.png
create mode 100644 activeFt/garden/images/rule.png
diff --git a/activeFt/garden/css/index.css b/activeFt/garden/css/index.css
index 93f64d1..370fbf1 100644
--- a/activeFt/garden/css/index.css
+++ b/activeFt/garden/css/index.css
@@ -291,6 +291,13 @@ iframe {
color: #067B00;
text-align: center;
}
+.task3-time {
+ color: #067B00;
+ font-size: 0.3rem;
+ position: absolute;
+ top: 6.25rem;
+ left: 3.9rem;
+}
.list-top1 {
width: 2.8rem;
height: 3.9rem;
@@ -621,3 +628,81 @@ iframe {
right: 0rem;
top: 0rem;
}
+.ref {
+ width: 0.8rem;
+ position: fixed;
+ left: 0;
+ top: 6rem;
+ z-index: 500;
+}
+.rule-btn {
+ position: fixed;
+ top: 6rem;
+ z-index: 500;
+ width: 1.64rem;
+ right: 0;
+}
+.back {
+ position: fixed;
+ top: 6rem;
+ z-index: 500;
+ width: 1.64rem;
+ right: 0;
+}
+.rule-bg {
+ width: 10rem;
+ height: 28.55rem;
+ background: url(../images/rule.png) no-repeat;
+ background-size: 100% auto;
+ position: relative;
+ margin: 0 auto;
+}
+.callKF {
+ width: 10rem;
+ position: absolute;
+ bottom: 0.3rem;
+ height: 0.8rem;
+ color: #FBF3FF;
+ text-align: center;
+ font-size: 0.33rem;
+}
+.callKF > span {
+ height: 0.5rem;
+ padding: 0.08rem;
+ padding-left: 0.25rem;
+ padding-right: 0.25rem;
+ background: #f3f3f3;
+ border-radius: 0.1rem;
+ color: #025752;
+}
+.bottom-nav {
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ z-index: 500;
+ width: 10rem;
+ height: 1.866rem;
+ background: url(../images/bottom-nav.png) no-repeat;
+ background-size: 100% 100%;
+}
+.bottom-nav .list-box1 {
+ height: 1.866rem;
+ line-height: 1.866rem;
+ color: #fff;
+ font-weight: 700;
+}
+.bottom-nav .list-box2 {
+ height: 1.866rem;
+ line-height: 1.866rem;
+ color: #fff;
+ font-weight: 700;
+}
+.bottom-nav .list-box3 {
+ height: 1.866rem;
+ line-height: 1.866rem;
+ color: #fff;
+ font-weight: 700;
+}
+.bottom-nav .list-mc-face {
+ top: 0.5rem;
+}
diff --git a/activeFt/garden/css/index.less b/activeFt/garden/css/index.less
index f66d8c5..37b14f0 100644
--- a/activeFt/garden/css/index.less
+++ b/activeFt/garden/css/index.less
@@ -282,7 +282,6 @@ iframe{
}
.list-top-box{
height: 5rem;
-
width: 9rem;
margin: 0 auto;
position: relative;
@@ -295,6 +294,13 @@ iframe{
text-align: center;
}
}
+.task3-time{
+ color: #067B00;
+ font-size: 0.3rem;
+ position: absolute;
+ top: 6.25rem;
+ left: 3.9rem;
+}
.list-top1{
width: 2.8rem;
height: 3.9rem;
@@ -637,4 +643,82 @@ iframe{
background-size: 100% 100%;
right: 0rem;
top: 0rem;
+}
+.ref{
+ width: 0.8rem;
+ position: fixed;
+ left: 0;
+ top: 6rem;
+ z-index: 500;
+}
+.rule-btn{
+ position: fixed;
+ top: 6rem;
+ z-index: 500;
+ width: 1.64rem;
+ right: 0;
+}
+.back{
+ position: fixed;
+ top: 6rem;
+ z-index: 500;
+ width: 1.64rem;
+ right: 0;
+}
+.rule-bg{
+ width: 10rem;
+ height: 28.55rem;
+ background: url(../images/rule.png)no-repeat;
+ background-size: 100% auto;
+ position: relative;
+ margin: 0 auto;
+}
+.callKF{
+ width: 10rem;
+ position: absolute;
+ bottom: 0.3rem;
+ height: 0.8rem;
+ color: #FBF3FF;
+ text-align: center;
+ font-size: 0.33rem;
+ >span{
+ height: 0.5rem;
+ padding: 0.08rem;
+ padding-left: 0.25rem;
+ padding-right: 0.25rem;
+ background: #f3f3f3;
+ border-radius: 0.1rem;
+ color: #025752;
+ }
+}
+.bottom-nav{
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ z-index: 500;
+ width: 10rem;
+ height: 1.866rem;
+ background: url(../images/bottom-nav.png)no-repeat;
+ background-size: 100% 100%;
+ .list-box1{
+ height: 1.866rem;
+ line-height: 1.866rem;
+ color: #fff;
+ font-weight: 700;
+ }
+ .list-box2{
+ height: 1.866rem;
+ line-height: 1.866rem;
+ color: #fff;
+ font-weight: 700;
+ }
+ .list-box3{
+ height: 1.866rem;
+ line-height: 1.866rem;
+ color: #fff;
+ font-weight: 700;
+ }
+ .list-mc-face{
+ top: 0.5rem;
+ }
}
\ No newline at end of file
diff --git a/activeFt/garden/images/back.png b/activeFt/garden/images/back.png
new file mode 100644
index 0000000..3ad0b04
Binary files /dev/null and b/activeFt/garden/images/back.png differ
diff --git a/activeFt/garden/images/bottom-nav.png b/activeFt/garden/images/bottom-nav.png
new file mode 100644
index 0000000..c6b9329
Binary files /dev/null and b/activeFt/garden/images/bottom-nav.png differ
diff --git a/activeFt/garden/images/ref.png b/activeFt/garden/images/ref.png
new file mode 100644
index 0000000..39da9c4
Binary files /dev/null and b/activeFt/garden/images/ref.png differ
diff --git a/activeFt/garden/images/rule-btn.png b/activeFt/garden/images/rule-btn.png
new file mode 100644
index 0000000..fb04b08
Binary files /dev/null and b/activeFt/garden/images/rule-btn.png differ
diff --git a/activeFt/garden/images/rule.png b/activeFt/garden/images/rule.png
new file mode 100644
index 0000000..fe12c22
Binary files /dev/null and b/activeFt/garden/images/rule.png differ
diff --git a/activeFt/garden/index.html b/activeFt/garden/index.html
index 51713dc..cff6f9d 100644
--- a/activeFt/garden/index.html
+++ b/activeFt/garden/index.html
@@ -31,8 +31,11 @@
</head>
<script src="lib/lottie-player.js"></script>
<body>
+
<div class="layer-game"></div>
<div class="bg">
+ <img class="ref" src="images/ref.png" alt="">
+ <a href="rule.html"><img class="rule-btn" src="images/rule-btn.png" alt=""></a>
<div class="banner"></div>
<div class="top-btn1 ">
<div></div>
@@ -135,6 +138,7 @@
</div>
<div style="display: none;" class="user-box">
<div class="task-box">
+ <div class="task3-time">(<span>0</span>/20分鐘)</div>
<div data-type="1" class="task-btn1 task1"></div>
<div data-type="2" class="task-btn1 task2"></div>
<div data-type="3" class="task-btn1 task3"></div>
@@ -203,8 +207,17 @@
</ul>
</div>
</div>
-
- <div style="height: 1rem;"></div>
+ <div style="display: none;" class="bottom-nav">
+ <!-- <li>
+ <div class="list-box1">2</div>
+ <div class="list-box2">
+ <img class="list-mc-face" src="https://big.bgp.ourpow.com/comm/user/boy.png?x-oss-process=image/resize,w_90" alt="">
+ <p>用戶暱稱預留</p>
+ </div>
+ <div class="list-box3">花園積分 : 456789</div>
+ </li> -->
+ </div>
+ <div style="height: 1.5rem;"></div>
</div>
</body>
<script src="lib/jquery-3.1.1.min.js"></script>
@@ -215,7 +228,7 @@
<script>
$(function(){
if(sessionStorage.lang==2)var titleName="她の秘密後花園"
- else var titleName="Goddess Chronicles"
+ else var titleName="Her Secret Garden"
var obj = {
"cid": 34, //修改网页title 居中显示。
"data": {
@@ -280,10 +293,12 @@ $(function(){
list(1,0)
list(2,0)
topMc()
+
+
if(sessionStorage.roomId!=0){
$(".lucky-game iframe").attr("src","http://test.ybact.yazhaiyabo.com/games/fireGarden2/index.html"+location.search+"")
$(".lucky-game").show()
-
+ bottom()
}
function list(type,date){
$.ajax({
@@ -295,6 +310,8 @@ $(function(){
success:function(data){
console.log('榜單數據',data)
var html=''
+ if(type==1)scoreName='花園積分'
+ else scoreName='男神指數'
for(var i=0;i<3;i++){
if(data.result.rankList[i]==undefined)continue;
var list=data.result.rankList[i]
@@ -302,7 +319,7 @@ $(function(){
html+='<a href="yazhai://_' + list.uid + '_zone"><div class="top-face"></div></a>';
html+='<img class="top-mc-face" src="https://big.bgp.ourpow.com/comm'+list.face+'?x-oss-process=image/resize,w_90" alt="">';
html+='<p class="top-mc-p1">'+list.name+'</p>';
- html+='<p class="top-mc-p2">花園積分</p>';
+ html+='<p class="top-mc-p2">'+scoreName+'</p>';
html+='<p class="top-mc-p3">'+list.score+'</p>';
html+='</div>';
}
@@ -321,7 +338,7 @@ $(function(){
html+='<a href="yazhai://_' + list.uid + '_zone"><img class="list-mc-face" src="https://big.bgp.ourpow.com/comm'+list.face+'?x-oss-process=image/resize,w_90" alt=""></a>';
html+='<p>'+list.name+'</p>';
html+='</div>';
- html+='<div class="list-box3">花園積分 : '+list.score+'</div>';
+ html+='<div class="list-box3">'+scoreName+' : '+list.score+'</div>';
html+='<img class="line" src="images/line.png">'
html+='</li>';
}
@@ -339,6 +356,17 @@ $(function(){
},
success:function(data){
console.log('底部導航欄',data)
+ var html='';
+ html+='<li>';
+ if(data.result.roomData.rank==-1) html+='<div class="list-box1">--</div>';
+ else html+='<div class="list-box1">'+data.result.roomData.rank+'</div>';
+ html+='<div class="list-box2">';
+ html+='<img class="list-mc-face" src="https://big.bgp.ourpow.com/comm'+data.result.roomData.roomFace+'?x-oss-process=image/resize,w_90" alt="">';
+ html+='<p>'+data.result.roomData.roomName+'</p>';
+ html+='</div>';
+ html+='<div class="list-box3">花園積分 : '+data.result.roomData.score+'</div>';
+ html+='</li>';
+ $(".bottom-nav").html(html).show();
}
})
}
@@ -348,6 +376,7 @@ $(function(){
success:function(data){
console.log('獲取任務數據',data)
$("#target").text(data.result.taskList[3].speakMsg)
+ $(".task3-time span").text(Math.floor(data.result.taskList[2].userWatchTime/60))
for(var i=0;i<data.result.taskList.length;i++){
var list=data.result.taskList[i]
if(list.taskStatus==1){
diff --git a/activeFt/garden/rule.html b/activeFt/garden/rule.html
index cbb4937..c189843 100644
--- a/activeFt/garden/rule.html
+++ b/activeFt/garden/rule.html
@@ -8,7 +8,7 @@
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
<meta content="telephone=no" name="format-detection">
<meta name="wap-font-scale" content="no">
- <title>女神物語</title>
+ <title>她の秘密後花園</title>
<script src="lib/fsize.js"></script>
<link rel="stylesheet" href="css/base.css">
<link rel="stylesheet" href="css/layer.css">
@@ -29,7 +29,7 @@
</style>
</head>
<script src="lib/lottie-player.js"></script>
-<body style="background: #ED71AD;">
+<body style="background: rgb(58,124,37);">
<div class="rule-bg">
<a href="javascript:history.go(-1);"><img class="back" src="images/back.png" alt=""></a>
<div class="callKF">如有問題點擊聯繫 <span>7*24小時在線客服</span></div>
@@ -41,11 +41,10 @@
<script>
$(function(){
if(sessionStorage.lang!=2){
- $(".back").attr("src","images/en/back.png")
- $("title").text("Goddess Chronicles")
+
}
- if(sessionStorage.lang==2)var titleName="女神物語"
- else var titleName="Goddess Chronicles"
+ if(sessionStorage.lang==2)var titleName="她の秘密後花園"
+ else var titleName="Her Secret Garden"
var obj = {
"cid": 34, //修改网页title 居中显示。
"data": {
@@ -56,11 +55,11 @@ $(function(){
var obj2 = JSON.stringify(obj);
appCollaboration(obj2);
if(sessionStorage.lang!=2){
- $("title").text('Summer Carnival')
- $(".rule-bg").addClass("rule-bg-en")
-// $(".back").attr("src","images/en/back.png")
-$(".callKF").html('For any questions, please click <span>7*24 hour online service</span>')
-
+ $(".back").attr("src","images/en/back.png")
+ $("title").text("Her Secret Garden")
+ $(".rule-bg").addClass("rule-bg-en")
+ // $(".back").attr("src","images/en/back.png")
+ $(".callKF").html('For any questions, please click <span>7*24 hour online service</span>')
}
$(".callKF").on("click",function(){
diff --git a/ftIcon/liveData/index.html b/ftIcon/liveData/index.html
index 2c81700..f891b2c 100644
--- a/ftIcon/liveData/index.html
+++ b/ftIcon/liveData/index.html
@@ -114,6 +114,7 @@ $(function(){
success:function(data){
console.log('圖標數據',data)
if(data.result.roomData.rank==1)$(".act-room-p1").text("距離被超越 :")
+ else $(".act-room-p1").text("距離上一名 :")
$(".act-room-p2").text(data.result.roomData.diffPreScore)
if(data.result.roomData.rank==-1) $(".act-room-p4").text("未上榜")
else $(".act-room-p4").text(data.result.roomData.rank)
--
libgit2 0.25.0