diff --git a/public/static/handle/js/handle_b.js b/public/static/handle/js/handle_b.js index f89f7d3..7960de1 100644 --- a/public/static/handle/js/handle_b.js +++ b/public/static/handle/js/handle_b.js @@ -85,8 +85,9 @@ var opening = function(){ var opening = $('#opening').val(); var banker_pair = $('#result_banker_pair').val(); var player_pair = $('#result_player_pair').val(); + var luck_six = parseInt($('#lucky_six').val()) || 0; if(opening > 0){ - websocket.emit('openingBaccarat',{table_id : table_id, number_tab_id : number_tab_id,opening : opening,banker_pair : banker_pair,player_pair:player_pair,luck_six:0}); + websocket.emit('openingBaccarat',{table_id : table_id, number_tab_id : number_tab_id,opening : opening,banker_pair : banker_pair,player_pair:player_pair,luck_six:luck_six}); } }else if(game_id == 2){ var opening = $('#opening').val(); @@ -451,10 +452,12 @@ $(function(){ } var betStatus = $("#number_tab_status").val(); if(betStatus == 2){ - if(e.keyCode == 105){ + // Numpad 1(97)=庄 Numpad 2(98)=闲 Numpad 3(99)=和 + if(e.keyCode == 97){ $('#opening').val('1'); $('#result_banker_pair').val('0'); $('#result_player_pair').val('0'); + $('#lucky_six').val('0'); $('#dt_pair').val('0'); $('#openingElement').show(); if(game_id == 1){ @@ -463,10 +466,11 @@ $(function(){ showPngDt(1,0); } } - if(e.keyCode == 103){ + if(e.keyCode == 98){ $('#opening').val('2'); $('#result_banker_pair').val('0'); $('#result_player_pair').val('0'); + $('#lucky_six').val('0'); $('#dt_pair').val('0'); $('#openingElement').show(); if(game_id == 1){ @@ -475,60 +479,80 @@ $(function(){ showPngDt(2,0) } } - if(e.keyCode == 104){ + if(e.keyCode == 99){ $('#opening').val('3'); $('#result_banker_pair').val('0'); $('#result_player_pair').val('0'); + $('#lucky_six').val('0'); $('#dt_pair').val('0'); $('#openingElement').show(); showPng(3,0,0); } + // Numpad 6(102)=幸运6(庄赢+标记,切换:2张牌→3张牌→取消) if(e.keyCode == 102){ if(game_id == 1){ - var result = $('#opening').val(); - $('#result_banker_pair').val('1'); + var curLs = parseInt($('#lucky_six').val()) || 0; + if(curLs == 0){ curLs = 2; } + else if(curLs == 2){ curLs = 3; } + else { curLs = 0; } + $('#opening').val(curLs > 0 ? '1' : '0'); + $('#result_banker_pair').val('0'); $('#result_player_pair').val('0'); - if(result == 1){ - showPng(1,1,0); - } - if(result == 2){ - showPng(2,1,0); - } - if(result == 3){ - showPng(3,1,0); - } + $('#lucky_six').val(curLs); + $('#openingElement').show(); + if(curLs > 0) showPng(1,0,0); } } + // Numpad 7(103)=龙7(庄赢+标记) + if(e.keyCode == 103){ + if(game_id == 1){ + $('#opening').val('1'); + $('#result_banker_pair').val('0'); + $('#result_player_pair').val('0'); + $('#lucky_six').val('0'); + $('#openingElement').show(); + showPng(1,0,0); + } + } + // Numpad 8(104)=熊8(闲赢+标记) + if(e.keyCode == 104){ + if(game_id == 1){ + $('#opening').val('2'); + $('#result_banker_pair').val('0'); + $('#result_player_pair').val('0'); + $('#lucky_six').val('0'); + $('#openingElement').show(); + showPng(2,0,0); + } + } + // Numpad 4(100)=庄对(可叠加) if(e.keyCode == 100){ if(game_id == 1){ var result = $('#opening').val(); - $('#result_player_pair').val('2'); - $('#result_banker_pair').val('0'); - if(result == 1){ - showPng(1,2,0); - } - if(result == 2){ - showPng(2,2,0); - } - if(result == 3){ - showPng(3,2,0); - } + var bp = $('#result_banker_pair').val(); + bp = (bp == '1') ? '0' : '1'; + $('#result_banker_pair').val(bp); + var pp = $('#result_player_pair').val(); + var pair = 0; + if(bp == '1' && pp == '2') pair = 3; + else if(bp == '1') pair = 1; + else if(pp == '2') pair = 2; + if(result > 0) showPng(parseInt(result),pair,0); } } + // Numpad 5(101)=闲对(可叠加) if(e.keyCode == 101){ if(game_id == 1){ var result = $('#opening').val(); - $('#result_banker_pair').val('1'); - $('#result_player_pair').val('2'); - if(result == 1){ - showPng(1,3,0); - } - if(result == 2){ - showPng(2,3,0); - } - if(result == 3){ - showPng(3,3,0); - } + var pp = $('#result_player_pair').val(); + pp = (pp == '2') ? '0' : '2'; + $('#result_player_pair').val(pp); + var bp = $('#result_banker_pair').val(); + var pair = 0; + if(bp == '1' && pp == '2') pair = 3; + else if(bp == '1') pair = 1; + else if(pp == '2') pair = 2; + if(result > 0) showPng(parseInt(result),pair,0); } } }