From ba687cfb572654eaf46dba0dfe14adc109e01158 Mon Sep 17 00:00:00 2001 From: testadmin Date: Mon, 11 May 2026 14:02:31 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=89=80=E6=9C=89=E6=B8=B8=E6=88=8F?= =?UTF-8?q?=E8=8D=B7=E5=AE=98=E7=AB=AF=E7=BB=9F=E4=B8=80=E6=94=B9=E9=80=A0?= =?UTF-8?q?=E5=80=92=E8=AE=A1=E6=97=B6/=E7=BB=93=E6=9E=9C=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - handle.js: 移除所有.countdown操作，改用#resultAreaTimer - handle.js: showPng/showPngDt改为HTML文字(庄对红/闲对蓝) - common.css: 加.countdown/.result-box隐藏规则 - tab_nn/tab_knn/tab_toning/tab_b_auto/tab_dt_auto: 加#resultAreaTimer/#resultAreaImg - 版本号 v10.0.4 → v10.0.5 --- app/common.php | 2 +- app/handle/view/index/tab_b_auto.html | 4 + app/handle/view/index/tab_dt_auto.html | 4 + app/handle/view/index/tab_knn.html | 4 + app/handle/view/index/tab_nn.html | 4 + app/handle/view/index/tab_toning.html | 4 + public/static/handle/css/common.css | 4 + public/static/handle/js/handle.js | 129 ++++++------------------- 8 files changed, 57 insertions(+), 98 deletions(-) diff --git a/app/common.php b/app/common.php index eda3926..51e4a5e 100644 --- a/app/common.php +++ b/app/common.php @@ -3,7 +3,7 @@ //应用公共文件 // 版本号 -define('VERSION_V','?ver=v10.0.4'); +define('VERSION_V','?ver=v10.0.5'); // 加密秘钥 const UC_AUTH_KEY = 'L= +
+
+
+
diff --git a/app/handle/view/index/tab_dt_auto.html b/app/handle/view/index/tab_dt_auto.html index bef38b9..23a6080 100644 --- a/app/handle/view/index/tab_dt_auto.html +++ b/app/handle/view/index/tab_dt_auto.html @@ -59,6 +59,10 @@ +
+
+
+
diff --git a/app/handle/view/index/tab_knn.html b/app/handle/view/index/tab_knn.html index f922341..ba0a5be 100644 --- a/app/handle/view/index/tab_knn.html +++ b/app/handle/view/index/tab_knn.html @@ -156,6 +156,10 @@ +
+
+
+
diff --git a/app/handle/view/index/tab_nn.html b/app/handle/view/index/tab_nn.html index b5dd279..cf9386b 100644 --- a/app/handle/view/index/tab_nn.html +++ b/app/handle/view/index/tab_nn.html @@ -137,6 +137,10 @@ 0 +
+
+
+
diff --git a/app/handle/view/index/tab_toning.html b/app/handle/view/index/tab_toning.html index 333fa77..f1bf7f9 100644 --- a/app/handle/view/index/tab_toning.html +++ b/app/handle/view/index/tab_toning.html @@ -51,6 +51,10 @@ +
+
+
+
diff --git a/public/static/handle/css/common.css b/public/static/handle/css/common.css index 3aec2bb..492efde 100644 --- a/public/static/handle/css/common.css +++ b/public/static/handle/css/common.css @@ -453,6 +453,10 @@ margin-left: 0; +.countdown{ display: none !important; } +.countdown .num{ display: none !important; } +.result-box{ display: none !important; } + .bottom-row{ display: flex; width: 100%; diff --git a/public/static/handle/js/handle.js b/public/static/handle/js/handle.js index e458bc0..789c8c4 100644 --- a/public/static/handle/js/handle.js +++ b/public/static/handle/js/handle.js @@ -51,8 +51,7 @@ var initScanParams = function() { isCardScaned = false; currentPositionToChange = -1; - $(".countdown").css({"opacity":0,"display":"none"}); - $(".countdown .grab-count").removeClass("count-active"); + $("#resultAreaTimer").hide(); } // NN修改牌 var openAllCardsPanel = function(dom) { @@ -463,8 +462,7 @@ websocket.on('resetNumberTab',function(data){ } // - $(".countdown").css({"opacity":0,"display":"none"}); - $(".countdown .grab-count").removeClass("count-active"); + $("#resultAreaTimer").hide(); $(".begincard .box").animate({"opacity":"0"},function(){ $(".begincard").fadeOut(); @@ -537,15 +535,10 @@ websocket.on('endBet',function(data){ var doIntervalTime = parseInt(interval_time) + 1; var intervalTime = setInterval(function(){ doIntervalTime--; - $(".countdown .num").html(doIntervalTime) - $(".countdown").css({"opacity":1,"display":"block"}); - $(".countdown .grab-count").addClass("count-active"); - $(".countdown .round-txt-item").addClass("color-red"); + $("#resultAreaTimer").html(doIntervalTime).show(); if(doIntervalTime == 0) { clearInterval(intervalTime); - $(".countdown").css({"opacity":0,"display":"none"}); - $(".countdown .grab-count").removeClass("count-active"); - $(".countdown .round-txt-item").removeClass("color-red"); + $("#resultAreaTimer").hide(); if(game_id == 4 || game_id == 5){ $(".banker_result").html(''); $(".player_1_result").html(''); @@ -555,29 +548,26 @@ websocket.on('endBet',function(data){ $('#opening').val(0); $('#result_banker_pair').val(0); $('#result_player_pair').val(0); - $(".countdown").css({"opacity":0,"display":"none"}); - $(".countdown .grab-count").removeClass("count-active"); + $("#resultAreaTimer").hide(); setBetStatus(data.round.number_tab_status); c = parseInt($('#wait_time').val()); } },1000); } else { - $(".countdown").css({"opacity":0,"display":"none"}); - $(".countdown .grab-count").removeClass("count-active"); + $("#resultAreaTimer").hide(); mp3List = ['stop_2.mp3']; audioMp3(mp3List).Play(); if(game_id == 4 || game_id == 5){ $(".banker_result").html(''); $(".player_1_result").html(''); $(".player_2_result").html(''); - $(".player_3_result").html(''); + $(".player_3_result").html(''); } if(game_id == 6){ $('#toning_result').val(''); $(".toning-result-num").removeClass("active"); } - $(".countdown").css({"opacity":0,"display":"none"}); - $(".countdown .grab-count").removeClass("count-active"); + $("#resultAreaTimer").hide(); setBetStatus(data.round.number_tab_status); // 识别相关 @@ -918,72 +908,30 @@ function loginout(){ }); }; function showPng(opening, pair){ - if(opening == 1 && pair == 0) { - $('#openingPng').attr('src','/static/result_img/banker.png'); - mp3List = ['banker_win.mp3']; - } - if(opening == 1 && pair == 1) { - $('#openingPng').attr('src','/static/result_img/banker_bpair.png'); - mp3List = ['banker_win.mp3','banker_pair.mp3']; - } - if(opening == 1 && pair == 2) { - $('#openingPng').attr('src','/static/result_img/banker_ppair.png'); - mp3List = ['banker_win.mp3','player_pair.mp3']; - } - if(opening == 1 && pair == 3) { - $('#openingPng').attr('src','/static/result_img/banker_bpair_ppair.png'); - mp3List = ['banker_win.mp3','banker_pair.mp3','player_pair.mp3']; - } - if(opening == 2 && pair == 0) { - $('#openingPng').attr('src','/static/result_img/player.png'); - mp3List = ['player_win.mp3']; - - } - if(opening == 2 && pair == 1) { - $('#openingPng').attr('src','/static/result_img/player_bpair.png'); - mp3List = ['player_win.mp3','banker_pair.mp3']; - } - if(opening == 2 && pair == 2) { - $('#openingPng').attr('src','/static/result_img/player_ppair.png'); - mp3List = ['player_win.mp3','player_pair.mp3']; - } - if(opening == 2 && pair == 3) { - $('#openingPng').attr('src','/static/result_img/player_bpair_ppair.png'); - mp3List = ['player_win.mp3','banker_pair.mp3','player_pair.mp3']; - } - if(opening == 3 && pair == 0) { - $('#openingPng').attr('src','/static/result_img/tie.png'); - mp3List = ['tie.mp3']; - } - if(opening == 3 && pair == 1) { - $('#openingPng').attr('src','/static/result_img/tie_bpair.png'); - mp3List = ['tie.mp3','banker_pair.mp3']; - } - if(opening == 3 && pair == 2) { - $('#openingPng').attr('src','/static/result_img/tie_ppair.png'); - mp3List = ['tie.mp3','player_pair.mp3']; - } - if(opening == 3 && pair == 3) { - $('#openingPng').attr('src','/static/result_img/tie_bpair_ppair.png'); - mp3List = ['tie.mp3','banker_pair.mp3','player_pair.mp3']; - } + var winText = '', winColor = '', pairHtml = ''; + var bpLabel = (lang.banker_pair || lang.banker+'对'); + var ppLabel = (lang.player_pair || lang.player+'对'); + if(opening == 1){ winText = lang.banker+'赢'; winColor = '#b20a00'; mp3List = ['banker_win.mp3']; } + if(opening == 2){ winText = lang.player+'赢'; winColor = '#0543bc'; mp3List = ['player_win.mp3']; } + if(opening == 3){ winText = lang.tie; winColor = '#0A5101'; mp3List = ['tie.mp3']; } + if(pair == 1 || pair == 3) { pairHtml += '' + bpLabel + ' '; mp3List.push('banker_pair.mp3'); } + if(pair == 2 || pair == 3) { pairHtml += '' + ppLabel + ''; mp3List.push('player_pair.mp3'); } audioMp3(mp3List).Play(); + var html = '
'+winText+'
'; + if(pairHtml) html += '
'+pairHtml+'
'; + html += '
'; + $("#resultAreaTimer").hide(); + $("#resultAreaImg").html(html); } function showPngDt (opening){ - if(opening == 1) { - $('#openingPng').attr('src','/static/handle/img/dragon_win.png'); - mp3List = ['dragon_win.mp3']; - } - if(opening == 2) { - $('#openingPng').attr('src','/static/handle/img/tiger_win.png'); - mp3List = ['tiger_win.mp3']; - } - if(opening == 3) { - $('#openingPng').attr('src','/static/handle/img/tie.png'); - mp3List = ['tie.mp3']; - } + var winText = '', winColor = ''; + if(opening == 1){ winText = lang.dragon+'赢'; winColor = '#b20a00'; mp3List = ['dragon_win.mp3']; } + if(opening == 2){ winText = lang.tiger+'赢'; winColor = '#0543bc'; mp3List = ['tiger_win.mp3']; } + if(opening == 3){ winText = lang.tie; winColor = '#0A5101'; mp3List = ['tie.mp3']; } audioMp3(mp3List).Play(); + $("#resultAreaTimer").hide(); + $("#resultAreaImg").html('
'+winText+'
'); } function gameResult(data){ @@ -1013,13 +961,8 @@ function gameResult(data){ var src='/static/result_img/'+result_imgsrc+'.png' $(".begincard .player-card .draw .text ").html(lang.player_all+' '+data.round.player+' '+lang.point) $(".begincard .banker-card .draw .text ").html(lang.banker_all+' '+data.round.banker+' '+lang.point); - $('#openingElement').show(); - $('#openingElement').addClass("blink"); isopentime=true; setTimeout(function(){ - - $('#openingElement').removeClass("blink"); - $('#openingElement').hide(); },3000) // 清除状态 card_info=[];///清除牌数据 @@ -1107,9 +1050,8 @@ function getLang(){ } //倒计时 function countDown(time) { - $(".countdown .num").html(time) - $(".countdown").css({"opacity":1,"display":"block"}); - $(".countdown .grab-count").addClass("count-active"); + $("#resultAreaTimer").html(time).show(); + $("#resultAreaImg").empty(); if(time == 10){ mp3List = ['time_tip_10.mp3']; audioMp3(mp3List).Play(); @@ -1121,8 +1063,7 @@ function countDown(time) { if(time<=0){ mp3List = ['stop_2.mp3']; audioMp3(mp3List).Play(); - $(".countdown").css({"opacity":0,"display":"none"}); - $(".countdown .grab-count").removeClass("count-active"); + $("#resultAreaTimer").hide(); return; } } @@ -1562,19 +1503,13 @@ function nextAudio(){ } function countDownRob(time) { var table_id = $('#table_id').val(); - $(".countdown .num").html(time); - $(".countdown").css({"opacity":1,"display":"block"}); - $(".countdown .grab-count").addClass("count-active"); - //$(".countdown").fadeIn(); + $("#resultAreaTimer").html(time).show(); if(time < 5 && time > 0){ mp3List = ['time.mp3']; audioMp3(mp3List).Play(); } if(time<=0){ - // mp3List = ['end_rob.mp3']; - // audioMp3(mp3List).Play(); - $(".countdown").css({"opacity":0,"display":"none"}); - $(".countdown .grab-count").removeClass("count-active"); + $("#resultAreaTimer").hide(); webSocket.send('{"connect":"space","mode":"endRob","number_tab_id":"'+parseInt(number_tab_id)+'","table_id":"'+parseInt(table_id)+'"}'); return; }