og/Socket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: og/Socket:3a1358075414ea96c8d680e08248407c288922d8
Branches Tags
og/Socket:main
...
compare: og/Socket:b5a564155742d7bc68d6f2f8f3c06300bb38ec85
Branches Tags
og/Socket:main
2 Commits
3a13580754 ... b5a5641557
Author SHA1 Message Date
testadmin b5a5641557 feat: 荷官端倒计时和开牌结果缩小移至右上角 
- .countdown 从屏幕中央(28%/37%)移到右上角(8px)，字体从13vw缩至4vw
- .result-box 从屏幕中央(40%/40%/320px)移到右上角(8px/120px)
- index_tab.css 同步调整(210px→80px, 60px→32px)
 2026-05-01 22:09:36 +08:00
testadmin 17f9862515 feat: 百家乐荷官端键位重映射（匹配单机版布局） 
- 庄/闲/和 从 9/7/8 移到 1/2/3
- 庄对/闲对 改为 4/5（可叠加，按两下=庄闲对）
- 6=幸运6（庄赢+标记）、7=龙7（庄赢）、8=熊8（闲赢）
- opening() 传 luck_six 实际值（原来硬编码0）
 2026-05-01 22:02:30 +08:00
3 changed files with 79 additions and 56 deletions
Expand all files Collapse all files
public/static/handle/css/common.css
+11 -12
View File
@@ -676,14 +676,15 @@ margin-left: 0;
position:absolute; position:absolute;
display: none; display: none;
top: 28%; top: 8px;
left: 37%; right: 8px;
left: auto;
} }
.countdown .grab-count{ .countdown .grab-count{
background: url(../img/count.png) no-repeat; background: url(../img/count.png) no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
width: 27vw; width: 8vw;
height: 27vw; height: 8vw;
} }
.round-txt-item { position: absolute;width: 100%; top:0; } .round-txt-item { position: absolute;width: 100%; top:0; }
.top-sec .count-active{animation: myMove1 6s 0s linear infinite;} .top-sec .count-active{animation: myMove1 6s 0s linear infinite;}
@@ -711,13 +712,13 @@ margin-left: 0;
.countdown .num{ .countdown .num{
font-size: 13vw; font-size: 4vw;
position: absolute; position: absolute;
font-weight: 500; font-weight: 500;
z-index: 999; z-index: 999;
text-align: center; text-align: center;
text-shadow: 0px 1px 0px #555; text-shadow: 0px 1px 0px #555;
line-height: 27vw; line-height: 8vw;
color: #eee; color: #eee;
border-radius: 50%; border-radius: 50%;
background-color: rgba(0,0,0,0.5); background-color: rgba(0,0,0,0.5);
@@ -786,12 +787,10 @@ margin-left: 0;
.result-box{ .result-box{
position: fixed; position: fixed;
z-index: 1000; z-index: 1000;
top: 40%; top: 8px;
left: 40%; right: 8px;
width: 320px; left: auto;
width: 120px;
/* -webkit-animation: bounceIn .5s 0s ease both;
-moz-animation: bounceIn .5s 0s ease both;*/
} }
.result-box.blink{ .result-box.blink{
public/static/handle/css/index_tab.css
+7 -7
View File
@@ -587,11 +587,11 @@ body{
display: none; display: none;
position: absolute; position: absolute;
z-index: 999; z-index: 999;
width: 210px; width: 80px;
height: 210px; height: 80px;
/*background: rgba(21, 34, 34, 0.71);*/ top: 8px;
bottom: 5px; right: 8px;
right: 5px; bottom: auto;
} }
.countdown .roll{ .countdown .roll{
position: absolute; position: absolute;
@@ -611,12 +611,12 @@ body{
.countdown .num{ .countdown .num{
color: #fff; color: #fff;
font-size: 60px; font-size: 32px;
position: relative; position: relative;
font-weight: 500; font-weight: 500;
z-index: 999; z-index: 999;
text-align: center; text-align: center;
line-height: 210px; line-height: 80px;
text-shadow: 0px 1px 0px #555; text-shadow: 0px 1px 0px #555;
} }
public/static/handle/js/handle_b.js
+61 -37
View File
@@ -85,8 +85,9 @@ var opening = function(){
var opening = $('#opening').val(); var opening = $('#opening').val();
var banker_pair = $('#result_banker_pair').val(); var banker_pair = $('#result_banker_pair').val();
var player_pair = $('#result_player_pair').val(); var player_pair = $('#result_player_pair').val();
var luck_six = parseInt($('#lucky_six').val()) || 0;
if(opening > 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){ }else if(game_id == 2){
var opening = $('#opening').val(); var opening = $('#opening').val();
@@ -451,10 +452,12 @@ $(function(){
} }
var betStatus = $("#number_tab_status").val(); var betStatus = $("#number_tab_status").val();
if(betStatus == 2){ if(betStatus == 2){
if(e.keyCode == 105){ // Numpad 1(97)=庄 Numpad 2(98)=闲 Numpad 3(99)=和
if(e.keyCode == 97){
$('#opening').val('1'); $('#opening').val('1');
$('#result_banker_pair').val('0'); $('#result_banker_pair').val('0');
$('#result_player_pair').val('0'); $('#result_player_pair').val('0');
$('#lucky_six').val('0');
$('#dt_pair').val('0'); $('#dt_pair').val('0');
$('#openingElement').show(); $('#openingElement').show();
if(game_id == 1){ if(game_id == 1){
@@ -463,10 +466,11 @@ $(function(){
showPngDt(1,0); showPngDt(1,0);
} }
} }
if(e.keyCode == 103){ if(e.keyCode == 98){
$('#opening').val('2'); $('#opening').val('2');
$('#result_banker_pair').val('0'); $('#result_banker_pair').val('0');
$('#result_player_pair').val('0'); $('#result_player_pair').val('0');
$('#lucky_six').val('0');
$('#dt_pair').val('0'); $('#dt_pair').val('0');
$('#openingElement').show(); $('#openingElement').show();
if(game_id == 1){ if(game_id == 1){
@@ -475,60 +479,80 @@ $(function(){
showPngDt(2,0) showPngDt(2,0)
} }
} }
if(e.keyCode == 104){ if(e.keyCode == 99){
$('#opening').val('3'); $('#opening').val('3');
$('#result_banker_pair').val('0'); $('#result_banker_pair').val('0');
$('#result_player_pair').val('0'); $('#result_player_pair').val('0');
$('#lucky_six').val('0');
$('#dt_pair').val('0'); $('#dt_pair').val('0');
$('#openingElement').show(); $('#openingElement').show();
showPng(3,0,0); showPng(3,0,0);
} }
// Numpad 6(102)=幸运6（庄赢+标记，切换：2张牌→3张牌→取消）
if(e.keyCode == 102){ if(e.keyCode == 102){
if(game_id == 1){ if(game_id == 1){
var result = $('#opening').val(); var curLs = parseInt($('#lucky_six').val()) || 0;
$('#result_banker_pair').val('1'); 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'); $('#result_player_pair').val('0');
if(result == 1){ $('#lucky_six').val(curLs);
showPng(1,1,0); $('#openingElement').show();
} if(curLs > 0) showPng(1,0,0);
if(result == 2){
showPng(2,1,0);
}
if(result == 3){
showPng(3,1,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(e.keyCode == 100){
if(game_id == 1){ if(game_id == 1){
var result = $('#opening').val(); var result = $('#opening').val();
$('#result_player_pair').val('2'); var bp = $('#result_banker_pair').val();
$('#result_banker_pair').val('0'); bp = (bp == '1') ? '0' : '1';
if(result == 1){ $('#result_banker_pair').val(bp);
showPng(1,2,0); var pp = $('#result_player_pair').val();
} var pair = 0;
if(result == 2){ if(bp == '1' && pp == '2') pair = 3;
showPng(2,2,0); else if(bp == '1') pair = 1;
} else if(pp == '2') pair = 2;
if(result == 3){ if(result > 0) showPng(parseInt(result),pair,0);
showPng(3,2,0);
}
} }
} }
// Numpad 5(101)=闲对（可叠加）
if(e.keyCode == 101){ if(e.keyCode == 101){
if(game_id == 1){ if(game_id == 1){
var result = $('#opening').val(); var result = $('#opening').val();
$('#result_banker_pair').val('1'); var pp = $('#result_player_pair').val();
$('#result_player_pair').val('2'); pp = (pp == '2') ? '0' : '2';
if(result == 1){ $('#result_player_pair').val(pp);
showPng(1,3,0); var bp = $('#result_banker_pair').val();
} var pair = 0;
if(result == 2){ if(bp == '1' && pp == '2') pair = 3;
showPng(2,3,0); else if(bp == '1') pair = 1;
} else if(pp == '2') pair = 2;
if(result == 3){ if(result > 0) showPng(parseInt(result),pair,0);
showPng(3,3,0);
}
} }
} }
} }