Merge branch 'ceshi' of http://git.yabolive.net:88/libai/fsActive into ceshi

activeFt/luckySpace/index.html

@@ -302,7 +302,7 @@
 <script src="lib/jquery-3.1.1.min.js"></script>
 <script src="lib/jquery-3.1.1.min.js"></script>
 <script src="layer-v3.1.0/layer/layer.js"></script>
 <script src="layer-v3.1.0/layer/layer.js"></script>
 <script src="lib/liMarquee.js"></script>
 <script src="lib/liMarquee.js"></script>
-<script src="lib/default.js?v='2024062103'"></script>
+<script src="lib/default.js?v=20260122"></script>
 <script>
 <script>
   var betType;
   var betType;
 
 
@@ -1061,6 +1061,7 @@
     });
     });
   }
   }
 
 
+  var lastExchangeTime = 0;
   function bet(gid, type) {
   function bet(gid, type) {
     $.ajax({
     $.ajax({
       url: $ip + "/rocketlaunch/playGame",
       url: $ip + "/rocketlaunch/playGame",
@@ -1078,16 +1079,22 @@
             layer.msg("露水不足");
             layer.msg("露水不足");
           else layer.msg("no DEWs");
           else layer.msg("no DEWs");
           setTimeout(function () {
           setTimeout(function () {
-            var obj = {
-              cid: 12,
-              reqCode: new Date().getTime(),
-              data: {
-                msg: "兌換露水",
-                jumptype: 15,
-              },
-            };
-            var obj2 = JSON.stringify(obj);
-            appCollaboration(obj2);
+            var currentTime = new Date().getTime();
+            // 新增防抖 避免用户频繁操作导致兑换露水页面重复弹出
+            if (currentTime - lastExchangeTime > 3000) {
+              lastExchangeTime = currentTime;
+              var obj = {
+                cid: 12,
+                reqCode: new Date().getTime(),
+                data: {
+                  msg: "兌換露水",
+                  jumptype: 15,
+                },
+              };
+              var obj2 = JSON.stringify(obj);
+              appCollaboration(obj2);
+            }
+
           }, 1000);
           }, 1000);
         } else if (data.code != 1) {
         } else if (data.code != 1) {
           layer.msg(data.msg);
           layer.msg(data.msg);

activeFt/luckySpace/lib/default.js

@@ -7,12 +7,14 @@ if (bbb.indexOf("https://fsactive.fusi.club/") > -1) {
   $ws = "wss://zhiboweb.ishuaji.cn/yzsocket/ws?type=2";
   $ws = "wss://zhiboweb.ishuaji.cn/yzsocket/ws?type=2";
   $url = "https://activity.ishuaji.cn/";
   $url = "https://activity.ishuaji.cn/";
 } else {
 } else {
-  $ip = "http://testvc.game.tealive66.com";
+  $ip = "https://testvc.game.tealive66.com";
   $ws = "ws://114.55.165.186:12308/ws?type=-1";
   $ws = "ws://114.55.165.186:12308/ws?type=-1";
   $url = "https://vc.game.tealive66.com";
   $url = "https://vc.game.tealive66.com";
 }
 }
 var bbb = location.href;
 var bbb = location.href;
 var data = url_get_params(bbb);
 var data = url_get_params(bbb);
+console.log(data,'data~');
+
 var mAudios = {
 var mAudios = {
   bgm: new Audio(),
   bgm: new Audio(),
   boom: new Audio(),
   boom: new Audio(),
@@ -23,7 +25,8 @@ var mAudios = {
   water: new Audio(),
   water: new Audio(),
   boom: new Audio(),
   boom: new Audio(),
 };
 };
-if (sessionStorage.kkk == undefined) {
+
+if (sessionStorage.kkk == undefined || sessionStorage.kkk == "undefined") {
   sessionStorage.kkk = data.token; //t
   sessionStorage.kkk = data.token; //t
   sessionStorage.bbb = data.uid; //u
   sessionStorage.bbb = data.uid; //u
   sessionStorage.version = data.appversion;
   sessionStorage.version = data.appversion;