diff --git a/activeFt/Fishing/css/index.css b/activeFt/Fishing/css/index.css
index d11e2bd..e80ad10 100644
--- a/activeFt/Fishing/css/index.css
+++ b/activeFt/Fishing/css/index.css
@@ -4,6 +4,13 @@
position: relative;
overflow: hidden;
}
+.ref {
+ position: fixed;
+ top: 5rem;
+ right: 0;
+ z-index: 500;
+ width: 0.8rem;
+}
.banner {
width: 10rem;
height: 7.49rem;
@@ -264,8 +271,8 @@ iframe {
}
.act-room-bg {
float: right;
- width: 8rem;
- height: 3.352rem;
+ width: 8.8rem;
+ height: 3.687rem;
background: url(../images/act-room1.png) no-repeat;
background-size: 100% 100%;
}
@@ -285,3 +292,6 @@ iframe {
top: 6.2rem;
left: 3.435rem;
}
+.ref {
+ width: 0.72rem;
+}
diff --git a/activeFt/Fishing/css/index.less b/activeFt/Fishing/css/index.less
index 6540cff..8e3b545 100644
--- a/activeFt/Fishing/css/index.less
+++ b/activeFt/Fishing/css/index.less
@@ -4,6 +4,13 @@
position: relative;
overflow: hidden;
}
+.ref{
+ position: fixed;
+ top: 5rem;
+ right: 0;
+ z-index: 500;
+ width: 0.8rem;
+}
.banner{
width: 10rem;
height: 7.49rem;
@@ -268,8 +275,8 @@ iframe{
}
.act-room-bg{
float: right;
- width: 8rem;
- height: 3.352rem;
+ width: 8.8rem;
+ height: 3.687rem;
background: url(../images/act-room1.png)no-repeat;
background-size: 100% 100%;
}
@@ -288,4 +295,7 @@ iframe{
position: absolute;
top: 6.2rem;
left: 3.435rem;
+}
+.ref{
+ width: 0.72rem;
}
\ No newline at end of file
diff --git a/activeFt/Fishing/images/ref.png b/activeFt/Fishing/images/ref.png
new file mode 100644
index 0000000..53a7daf
Binary files /dev/null and b/activeFt/Fishing/images/ref.png differ
diff --git a/activeFt/Fishing/index.html b/activeFt/Fishing/index.html
index 2c11d1a..55e4ea6 100644
--- a/activeFt/Fishing/index.html
+++ b/activeFt/Fishing/index.html
@@ -34,6 +34,7 @@
<div class="layer-rule"></div>
<body style="background:#12479D;">
<div class="bg">
+ <img class="ref" src="images/ref.png" alt="">
<div class="banner"></div>
<div class="task-box">
<div data-type="1" class="task-btn1"></div>
@@ -85,6 +86,18 @@ $(function(){
}else{
$("iframe").attr("src","https://yazhaigray.qigame1024.com/fcarnivallive"+location.search+""+"&roomid=999991")
}
+ $(".exc-btn").on("click",function(){
+ var obj = {
+ "cid": 12,
+ "reqCode": new Date().getTime(),
+ "data": {
+ "msg": "兌換露水",
+ "jumptype": 15,
+ }
+ }
+ var obj2 = JSON.stringify(obj);
+ appCollaboration(obj2);
+ })
$(".dew-btn").on("click",function(){
layer.open({
type: 1,
diff --git a/activeFt/Fishing/oldView.html b/activeFt/Fishing/oldView.html
index 457144f..f708d73 100644
--- a/activeFt/Fishing/oldView.html
+++ b/activeFt/Fishing/oldView.html
@@ -50,7 +50,7 @@ $(function(){
"data": {
"msg": '跳转集合功能',
"jumptype": 3,
- "url": $url + "/activeFt/Fishing/index.html" + location.search+'&jump='+jump+'',
+ "url": $url + "/activeFt/Fishing/index.html" + location.search+'',
}
}
var obj2 = JSON.stringify(obj);
diff --git a/ftIcon/action2/index.html b/ftIcon/action2/index.html
index d1f5cb4..a6e7e15 100644
--- a/ftIcon/action2/index.html
+++ b/ftIcon/action2/index.html
@@ -51,7 +51,7 @@ $(function(){
"data": {
"msg": '跳转集合功能',
"jumptype": 3,
- "url": $url + "/activeFt/Fishing/index.html" + location.search+'&jump='+jump+'',
+ "url": $url + "/activeFt/Fishing/index.html" + location.search+'',
}
}
var obj2 = JSON.stringify(obj);
@@ -81,22 +81,23 @@ $(function(){
},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(){
+ $.ajax({
+ url:$ip+'/actSecretGarden/openPopup.html',
+ data:{
+ width:'0',
+ popupUrl:$url + "/activeFt/Fishing/pop.html",
+ height:'0.5',
+ heightR:'80',
+ x:'0',
+ y:'0.5',
+ },
+ success:function(){
+ }
+ })
+
+ if(localStorage.fish==undefined||localStorage.fish<new Date().getTime()){
+ localStorage.fish=(Number(new Date().getTime())+86400000)
- }
- })
}
},30000)
function getData(roomid) {