diff --git a/public/static/handle/css/index_tab.css b/public/static/handle/css/index_tab.css index d1eaff6..d0315e5 100644 --- a/public/static/handle/css/index_tab.css +++ b/public/static/handle/css/index_tab.css @@ -1050,25 +1050,11 @@ body{ } .countdown{ - /*background: url(../new_img/countdown.png) no-repeat center center;*/ - height: 100vh; - width: 60%; - overflow: hidden; - -webkit-background-size: 100%; - background-size: 100%; - position:absolute; - float: left; - display: block; - opacity: 0; - margin-left: 1vw; - top:50%; + display: none !important; } .countdown .num{ - line-height: 60vh; - font-size: 60vh; - color: #000000; - opacity: 0.4; + display: none !important; } diff --git a/public/static/handle/js/handle.js b/public/static/handle/js/handle.js index b1732fc..e458bc0 100644 --- a/public/static/handle/js/handle.js +++ b/public/static/handle/js/handle.js @@ -2010,17 +2010,17 @@ function SoloPath(ctb,unit,x,y,type,corners,luck_six,dragon_seven,panda_eight){ if(game_id==1 && luck_six > 0){ var color='#8b1a1a'; var fonts="6"; - ctb.strokeStyle = "#2eb553"; + ctb.strokeStyle = "#a03030"; ctb.lineWidth = 2; } else if(game_id==1 && dragon_seven > 0){ var color='#b8860b'; var fonts="7"; - ctb.strokeStyle = "#e6b822"; + ctb.strokeStyle = "#c9980a"; ctb.lineWidth = 2; } else if(game_id==1 && panda_eight > 0){ var color='#34495e'; var fonts="8"; - ctb.strokeStyle = "#4a9af5"; + ctb.strokeStyle = "#506878"; ctb.lineWidth = 2; } else if (game_id == 6){ if(type==0){ diff --git a/public/static/handle/js/handle_b.js b/public/static/handle/js/handle_b.js index 528d292..b3c3ee7 100644 --- a/public/static/handle/js/handle_b.js +++ b/public/static/handle/js/handle_b.js @@ -202,8 +202,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(); @@ -260,15 +259,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(''); @@ -278,15 +272,13 @@ 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){ @@ -299,8 +291,7 @@ websocket.on('endBet',function(data){ $('#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); // 识别相关 @@ -801,9 +792,6 @@ 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){ @@ -817,8 +805,6 @@ 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; } @@ -1210,19 +1196,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; } @@ -1467,15 +1447,15 @@ function SoloPath(ctb,unit,x,y,type,corners,luck_six,dragon_seven,panda_eight){ var radius=unit/2||0; if(game_id==1 && luck_six > 0){ var color='#8b1a1a', fonts="6"; - ctb.strokeStyle = "#2eb553"; + ctb.strokeStyle = "#a03030"; ctb.lineWidth = 2; }else if(game_id==1 && dragon_seven > 0){ var color='#b8860b', fonts="7"; - ctb.strokeStyle = "#e6b822"; + ctb.strokeStyle = "#c9980a"; ctb.lineWidth = 2; }else if(game_id==1 && panda_eight > 0){ var color='#34495e', fonts="8"; - ctb.strokeStyle = "#4a9af5"; + ctb.strokeStyle = "#506878"; ctb.lineWidth = 2; }else if(type==1){ var color='#b20a00'; diff --git a/public/static/handle/js/handle_b_sb.js b/public/static/handle/js/handle_b_sb.js index 6c24e94..9078fff 100644 --- a/public/static/handle/js/handle_b_sb.js +++ b/public/static/handle/js/handle_b_sb.js @@ -2123,17 +2123,17 @@ function SoloPath(ctb,unit,x,y,type,corners,luck_six,dragon_seven,panda_eight){ } else if(game_id==1 && luck_six > 0){ var color='#8b1a1a'; var fonts="6"; - ctb.strokeStyle = "#2eb553"; + ctb.strokeStyle = "#a03030"; ctb.lineWidth = 2; } else if(game_id==1 && dragon_seven > 0){ var color='#b8860b'; var fonts="7"; - ctb.strokeStyle = "#e6b822"; + ctb.strokeStyle = "#c9980a"; ctb.lineWidth = 2; } else if(game_id==1 && panda_eight > 0){ var color='#34495e'; var fonts="8"; - ctb.strokeStyle = "#4a9af5"; + ctb.strokeStyle = "#506878"; ctb.lineWidth = 2; } else { if(type==1){