From e4c53a53cc9d1c8647c943d5f56f04d92a743f43 Mon Sep 17 00:00:00 2001
From: libai <libai@yazhai.co>
Date: Wed, 30 Oct 2024 12:09:44 +0800
Subject: [PATCH] ft活动上线
---
activeFt/luckyFly/css/index.css | 1 -
activeFt/luckyFly/css/index.less | 2 +-
activeFt/luckyFly/images/img_v3_02g5_2d114381-8f5b-4c51-a885-f822937e593g.png | Bin 0 -> 170979 bytes
activeFt/luckyFly/index.html | 1 +
activeFt/luckySpace/css/index.css | 8 ++++++++
activeFt/luckySpace/css/index.less | 8 ++++++++
activeFt/luckySpace/images/layer-boom2.png | Bin 0 -> 41410 bytes
activeFt/luckySpace/index.html | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++-------------
8 files changed, 71 insertions(+), 15 deletions(-)
create mode 100644 activeFt/luckyFly/images/img_v3_02g5_2d114381-8f5b-4c51-a885-f822937e593g.png
create mode 100644 activeFt/luckySpace/images/layer-boom2.png
diff --git a/activeFt/luckyFly/css/index.css b/activeFt/luckyFly/css/index.css
index 6e61d92..edaa536 100644
--- a/activeFt/luckyFly/css/index.css
+++ b/activeFt/luckyFly/css/index.css
@@ -614,7 +614,6 @@
iframe {
height: 11.4rem;
width: 10rem;
- background: pink;
margin-top: -2.8rem;
}
.fly-task-box {
diff --git a/activeFt/luckyFly/css/index.less b/activeFt/luckyFly/css/index.less
index 34c58c8..f4400f9 100644
--- a/activeFt/luckyFly/css/index.less
+++ b/activeFt/luckyFly/css/index.less
@@ -618,7 +618,7 @@
iframe{
height: 11.4rem;
width: 10rem;
- background: pink;
+ // background: pink;
margin-top: -2.8rem;
}
.fly-task-box{
diff --git a/activeFt/luckyFly/images/img_v3_02g5_2d114381-8f5b-4c51-a885-f822937e593g.png b/activeFt/luckyFly/images/img_v3_02g5_2d114381-8f5b-4c51-a885-f822937e593g.png
new file mode 100644
index 0000000..771495f
Binary files /dev/null and b/activeFt/luckyFly/images/img_v3_02g5_2d114381-8f5b-4c51-a885-f822937e593g.png differ
diff --git a/activeFt/luckyFly/index.html b/activeFt/luckyFly/index.html
index 8a6d0b5..6de6966 100644
--- a/activeFt/luckyFly/index.html
+++ b/activeFt/luckyFly/index.html
@@ -174,6 +174,7 @@ $(function(){
userList(1000)
}
})
+ userList(2)
mcList(0)
function mcList(e){
$.ajax({
diff --git a/activeFt/luckySpace/css/index.css b/activeFt/luckySpace/css/index.css
index 24a9561..4edc347 100644
--- a/activeFt/luckySpace/css/index.css
+++ b/activeFt/luckySpace/css/index.css
@@ -727,6 +727,14 @@
position: relative;
display: none;
}
+.layer-boom2 {
+ width: 9.906rem;
+ height: 8.32rem;
+ background: url(../images/layer-boom2.png) no-repeat;
+ background-size: 100% 100%;
+ position: relative;
+ display: none;
+}
.layer-no2 {
position: relative;
width: 9.906rem;
diff --git a/activeFt/luckySpace/css/index.less b/activeFt/luckySpace/css/index.less
index 96302b6..dbdc9e5 100644
--- a/activeFt/luckySpace/css/index.less
+++ b/activeFt/luckySpace/css/index.less
@@ -702,6 +702,14 @@
position: relative;
display: none;
}
+.layer-boom2{
+ width: 9.906rem;
+ height: 8.32rem;
+ background: url(../images/layer-boom2.png)no-repeat;
+ background-size: 100% 100%;
+ position: relative;
+ display: none;
+}
.layer-no2{
position: relative;
width: 9.906rem;
diff --git a/activeFt/luckySpace/images/layer-boom2.png b/activeFt/luckySpace/images/layer-boom2.png
new file mode 100644
index 0000000..b0efe34
Binary files /dev/null and b/activeFt/luckySpace/images/layer-boom2.png differ
diff --git a/activeFt/luckySpace/index.html b/activeFt/luckySpace/index.html
index 5774998..22102bb 100644
--- a/activeFt/luckySpace/index.html
+++ b/activeFt/luckySpace/index.html
@@ -134,6 +134,35 @@
<p class="layer-no-p1">5000米</p>
<p class="layer-no-p2">0钻石</p>
</div>
+<div class="layer-boom2">
+ <div class="layer-yes2-p1">
+ <div class="line"></div>
+ <p class="layer-yes2-txt1">贏取露水總額</p>
+ <p class="layer-yes2-txt2">500813</p>
+ </div>
+ <div class="layer-yes2-p2">
+ <div class="line"></div>
+ <p class="layer-yes2-txt1">飛船最高高度</p>
+ <p class="layer-yes2-txt2">655米</p>
+ </div>
+ <div class="layer-yes2-p3">
+ <div class="line"></div>
+ <p class="layer-yes2-txt1">初始攜帶露水</p>
+ <p class="layer-yes2-txt2">0</p>
+ </div>
+ <div class="layer-yes2-p4">
+ <div class="line"></div>
+ <p class="layer-yes2-txt1">我的勝利倍率</p>
+ <p class="layer-yes2-txt2">0x</p>
+ </div>
+ <div class="layer-yes-topUser">
+ <img class="topUser-face" src="https://big.bgp.ourpow.com/comm/user/boy.png?x-oss-process=image/resize,w_90" alt="">
+ <p class="topUser-p1">本日王牌飛行員</p>
+ <p class="topUser-p2">巴斯光年</p>
+ <p class="topUser-p3">最高倍率</p>
+ <p class="topUser-p4">96.85x</p>
+ </div>
+</div>
<div class="fly-bg"></div>
<div class="get-show">
<img src="images/h4/1_00001.png" alt="">
@@ -455,7 +484,18 @@ $(function(){
_self.addClass("li-money-click")
})
$(".add-btn").on("click",function(){
- goReg()
+ 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);
+ })
})
// view()
@@ -580,9 +620,9 @@ $(function(){
}
myDiamond()
view2()
- setInterval(function(){
- view2()
- },500)
+ // setInterval(function(){
+ // view2()
+ // },500)
function view2(){
$.ajax({
url:$ip+'/rocketlaunch/queryLaunchInfo',
@@ -590,7 +630,7 @@ $(function(){
// console.log("获取视图信息接口",data)
sessionStorage.gameId=data.result.shipData.gameStage
sessionStorage.state=data.result.shipData.status
- console.log('阶段',sessionStorage.state,sessionStorage.oldState)
+
$(".time-box-man span").text(data.result.shipData.betUserNum)
$(".card-box span").text(data.result.userData.userBetAmount)
if(data.result.userData.userBetAmount>0){
@@ -618,7 +658,7 @@ $(function(){
var numArr=timeDeal2(data.result.shipData.prepareEndTime,data.systemDate)[3].toString().split("")
$(".num-box-p1").removeClass('n0 n1 n2 n3 n4 n5 n6 n7 n8 n9').addClass('n'+numArr[0]+'')
$(".num-box-p2").removeClass('n0 n1 n2 n3 n4 n5 n6 n7 n8 n9').addClass('n'+numArr[1]+'')
- console.log(numArr[0],numArr[1])
+
$(".go-btn").unbind("click").on("click",function(){
bet(sessionStorage.gameId,betType)
})
@@ -629,7 +669,6 @@ $(function(){
var newMeter=data.result.shipData.launchHeight
var addMeter=(newMeter-oldMeter)/5
if(sessionStorage.oldState==undefined||sessionStorage.oldState!=sessionStorage.state){
- console.log("跳船阶段",data)
$(".card-add-box").html('')
$(".user-going-box").hide().html('')
$(".user-out-box").show()
@@ -652,7 +691,7 @@ $(function(){
if(data.result.userData.player==1){
//用户有参与
if(data.result.userData.jumper==1){
- $(".out-fly-box").html('<div class="out-fly-end">你已下船（'+data.result.userData.jumpHeight+'米）</div>')
+ $(".out-fly-box").html('<div class="out-fly-end">你已下船（'+data.result.userData.jumpHeight+'米，获得'+data.result.userData.jumpRewardChip+'露水）</div>')
}
else if(data.result.shipData.explosion==0){
$(".out-fly-box").html('<div class="out-fly-btn"></div>')
@@ -700,7 +739,6 @@ $(function(){
if(data.result.shipData.status==2){
//第一次切换需要弹出结果
if(sessionStorage.oldState==undefined||sessionStorage.oldState!=sessionStorage.state){
- console.log('结算了',data)
myDiamond()
flyMan=0
//第一次切换需要动画
@@ -732,7 +770,7 @@ $(function(){
$(".layer-yes2-p1 .layer-yes2-txt2").text(data.result.userData.userBetAmount)
$(".layer-yes2-p2 .layer-yes2-txt2").text(""+data.result.shipData.launchHeight+"米")
- $(".layer-yes2-p3 .layer-yes2-txt2").text(""+data.result.userData.userBetAmount+"露水")
+ $(".layer-yes2-p3 .layer-yes2-txt2").text(""+data.result.userData.jumpRewardChip+"露水")
$(".layer-yes2-p4 .layer-yes2-txt2").text(data.result.userData.jumpHeigh*10+'x')
layer.open({
type: 1,
@@ -748,8 +786,10 @@ $(function(){
}
if(data.result.userData.player==1&&data.result.userData.jumper==0){
- $(".layer-no-p1").text(""+data.result.shipData.launchHeight+"米")
- $(".layer-no-p2").text(""+data.result.shipData.userBetAmount+"露水")
+ $(".layer-yes2-p1 .layer-yes2-txt2").text(data.result.userData.userBetAmount)
+ $(".layer-yes2-p2 .layer-yes2-txt2").text(""+data.result.shipData.launchHeight+"米")
+ $(".layer-yes2-p3 .layer-yes2-txt2").text(""+data.result.userData.jumpRewardChip+"露水")
+ $(".layer-yes2-p4 .layer-yes2-txt2").text(data.result.userData.jumpHeigh*10+'x')
//跳船失败
layer.open({
type: 1,
@@ -757,7 +797,7 @@ $(function(){
shadeClose: false,
skin: "yourclass5",
area: ["9.906rem", "8.32rem"],
- content: $(".layer-boom"),
+ content: $(".layer-boom2"),
end: function () {
$(".layui-layer-shade").hide()
}
--
libgit2 0.25.0