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

Compare commits

base: og/Socket:510802551c9168aa0accdccb42236efd2d662ca9
Branches Tags
og/Socket:main
...
compare: og/Socket:78797462b51e462ed6faef716622db689bc0c637
Branches Tags
og/Socket:main
4 Commits
510802551c ... 78797462b5
Author SHA1 Message Date
testadmin 78797462b5 fix: 荷官端倒计时改用右侧面板显示，路子珠描边色统一调暗 
- handle_b.js: 移除所有 .countdown 大字覆盖操作，统一用 #resultAreaTimer
- index_tab.css: .countdown display:none !important 彻底隐藏
- 所有 handle JS: 幸运6描边 #a03030(暗红)、龙7 #c9980a(暗黄)、熊8 #506878(灰蓝)
 2026-05-05 23:37:37 +08:00
testadmin 307338fa7d feat: 计时/开牌结果移到右侧面板（限红区旁边） 
- tab_b.html: limit-box 和 result-area 并排布局
- CSS: 隐藏原始大 overlay，结果在右侧面板显示
- JS: countDown/showPng 同步更新到 #resultAreaTimer/#resultAreaImg
 2026-05-05 23:01:16 +08:00
testadmin 6e526d1678 feat: 荷官端布局调整 - 统计区缩小/限红区放大/结果显示移至右下 
- 统计区(.title/.top) 字体 18→13px，行高缩小
- 限红区(.limit-box) 字体 14→16px，间距加大
- 倒计时(.countdown) 移到右下角 bottom:22vh，缩小 6vw
- 开牌结果(.result-box) 移到右下角 bottom:2vh，宽度 12vw
 2026-05-05 22:51:21 +08:00
testadmin 6768684116 fix: 路子珠特殊图标颜色调整 
- 幸运6: 绿色→暗红色(#8b1a1a)
- 龙7: 金色→暗黄色(#b8860b)
- 熊8: 亮蓝→墨蓝色(#34495e)
 2026-05-05 22:35:11 +08:00
6 changed files with 121 additions and 115 deletions
Expand all files Collapse all files
app/handle/view/index/tab_b.html
+27 -22
View File
@@ -117,31 +117,36 @@
<span id="betstatus"></span> <span id="betstatus"></span>
</div> </div>
</div> </div>
<div class="limit-box"> <div class="bottom-row">
<div class="list clearfix" style="padding-top:0;"> <div class="limit-box">
<div class="lab" style="margin:0;"> <div class="list clearfix" style="padding-top:0;">
{:lang('banker')}\{:lang('player')} <div class="lab" style="margin:0;">
{:lang('banker')}\{:lang('player')}
</div>
<div class="item fl">
<span class="fr showLimitBP">&nbsp;</span>
</div>
</div> </div>
<div class="item fl"> <div class="list clearfix" style="padding-top:0;">
<span class="fr showLimitBP">&nbsp;</span> <div class="lab" style="margin:0;">
{:lang('tie')}
</div>
<div class="item fl">
<span class="fr showLimitTie">&nbsp;</span>
</div>
</div>
<div class="list clearfix" style="padding-top:0;">
<div class="lab" style="margin:0;">
{:lang('pair')}
</div>
<div class="item fl">
<span class="fr showLimitPair">&nbsp;</span>
</div>
</div> </div>
</div> </div>
<div class="list clearfix" style="padding-top:0;"> <div class="result-area">
<div class="lab" style="margin:0;"> <div class="result-area-timer" id="resultAreaTimer"></div>
{:lang('tie')} <div class="result-area-img" id="resultAreaImg"></div>
</div>
<div class="item fl">
<span class="fr showLimitTie">&nbsp;</span>
</div>
</div>
<div class="list clearfix" style="padding-top:0;">
<div class="lab" style="margin:0;">
{:lang('pair')}
</div>
<div class="item fl">
<span class="fr showLimitPair">&nbsp;</span>
</div>
</div> </div>
</div> </div>
</div> </div>
public/static/handle/css/common.css
+52 -23
View File
@@ -419,11 +419,11 @@ margin-left: 0;
} }
.table-data .title li strong{ .table-data .title li strong{
font-weight: 600; font-weight: 600;
font-size: 18px; font-size: 13px;
text-shadow: 0px 1px 0px #fff; text-shadow: 0px 1px 0px #fff;
} }
.table-data .title li small{ .table-data .title li small{
font-size: 12px; font-size: 10px;
font-weight: 500; font-weight: 500;
} }
@@ -434,9 +434,10 @@ margin-left: 0;
text-align: center; text-align: center;
margin: 0 auto; margin: 0 auto;
border-radius: 2px; border-radius: 2px;
margin-top: 0.8vh; margin-top: 0.3vh;
line-height: 3vh; line-height: 2.2vh;
font-weight: 500; font-weight: 500;
font-size: 13px;
-webkit-box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.3) inset; -webkit-box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.3) inset;
-moz-box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.3) inset; -moz-box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.3) inset;
box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.3) inset; box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.3) inset;
@@ -452,10 +453,43 @@ margin-left: 0;
.bottom-row{
display: flex;
width: 100%;
gap: 4px;
}
.table-data .limit-box{ .table-data .limit-box{
width: 95%; flex: 1;
padding: 0 2.5%; padding: 0 2.5%;
} }
.result-area{
width: 35%;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
min-height: 10vh;
}
.result-area-timer{
font-size: 2.5vw;
font-weight: bold;
color: #fff;
text-align: center;
background: rgba(0,0,0,0.5);
border-radius: 50%;
width: 5vw;
height: 5vw;
line-height: 5vw;
margin-bottom: 4px;
display: none;
}
.result-area-img{
text-align: center;
}
.result-area-img img{
max-width: 100%;
max-height: 12vh;
}
.table-data .lan-box{ .table-data .lan-box{
@@ -471,12 +505,12 @@ margin-left: 0;
font-weight: 600; font-weight: 600;
} }
.limit-box .list{ .limit-box .list{
padding: 0.6vh 0; padding: 1vh 0;
padding-left: 50px; padding-left: 50px;
position: relative; position: relative;
font-size: 14px; font-size: 16px;
color: #3c180a; color: #3c180a;
line-height: 3vh; line-height: 3.5vh;
font-weight: 500; font-weight: 500;
} }
@@ -674,17 +708,17 @@ margin-left: 0;
.countdown{ z-index: 999; .countdown{ z-index: 999;
position:absolute; position:fixed;
display: none; display: none !important;
top: 8px; bottom: 22vh;
right: 8px; right: 1vw;
left: auto; 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: 8vw; width: 6vw;
height: 8vw; height: 6vw;
} }
.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;}
@@ -712,13 +746,13 @@ margin-left: 0;
.countdown .num{ .countdown .num{
font-size: 4vw; font-size: 3vw;
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: 8vw; line-height: 6vw;
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);
@@ -783,14 +817,9 @@ margin-left: 0;
} }
/*结果弹窗*/ /*结果弹窗 - 隐藏原始大 overlay，结果在右侧面板 .result-area 显示*/
.result-box{ .result-box{
position: fixed; display: none !important;
z-index: 1000;
top: 8px;
right: 8px;
left: auto;
width: 120px;
} }
.result-box.blink{ .result-box.blink{
public/static/handle/css/index_tab.css
+8 -23
View File
@@ -585,13 +585,12 @@ body{
.countdown{ .countdown{
display: none; display: none;
position: absolute; position: fixed;
z-index: 999; z-index: 999;
width: 80px; width: 70px;
height: 80px; height: 70px;
top: 8px; bottom: 22vh;
right: 8px; right: 1vw;
bottom: auto;
} }
.countdown .roll{ .countdown .roll{
position: absolute; position: absolute;
@@ -611,7 +610,7 @@ body{
.countdown .num{ .countdown .num{
color: #fff; color: #fff;
font-size: 32px; font-size: 28px;
position: relative; position: relative;
font-weight: 500; font-weight: 500;
z-index: 999; z-index: 999;
@@ -1051,25 +1050,11 @@ body{
} }
.countdown{ .countdown{
/*background: url(../new_img/countdown.png) no-repeat center center;*/ display: none !important;
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%;
} }
.countdown .num{ .countdown .num{
line-height: 60vh; display: none !important;
font-size: 60vh;
color: #000000;
opacity: 0.4;
} }
public/static/handle/js/handle.js
+6 -6
View File
@@ -2008,19 +2008,19 @@ function SoloPath(ctb,unit,x,y,type,corners,luck_six,dragon_seven,panda_eight){
var cx = radius+unit*(x-1); var cx = radius+unit*(x-1);
var cy = radius+unit*(y-1); var cy = radius+unit*(y-1);
if(game_id==1 && luck_six > 0){ if(game_id==1 && luck_six > 0){
var color='#1a8c3a'; var color='#8b1a1a';
var fonts="6"; var fonts="6";
ctb.strokeStyle = "#2eb553"; ctb.strokeStyle = "#a03030";
ctb.lineWidth = 2; ctb.lineWidth = 2;
} else if(game_id==1 && dragon_seven > 0){ } else if(game_id==1 && dragon_seven > 0){
var color='#d4a017'; var color='#b8860b';
var fonts="7"; var fonts="7";
ctb.strokeStyle = "#e6b822"; ctb.strokeStyle = "#c9980a";
ctb.lineWidth = 2; ctb.lineWidth = 2;
} else if(game_id==1 && panda_eight > 0){ } else if(game_id==1 && panda_eight > 0){
var color='#1a6ed8'; var color='#34495e';
var fonts="8"; var fonts="8";
ctb.strokeStyle = "#4a9af5"; ctb.strokeStyle = "#506878";
ctb.lineWidth = 2; ctb.lineWidth = 2;
} else if (game_id == 6){ } else if (game_id == 6){
if(type==0){ if(type==0){
public/static/handle/js/handle_b.js
+22 -35
View File
@@ -202,8 +202,7 @@ websocket.on('resetNumberTab',function(data){
} }
// //
$(".countdown").css({"opacity":0,"display":"none"}); $("#resultAreaTimer").hide();
$(".countdown .grab-count").removeClass("count-active");
$(".begincard .box").animate({"opacity":"0"},function(){ $(".begincard .box").animate({"opacity":"0"},function(){
$(".begincard").fadeOut(); $(".begincard").fadeOut();
@@ -260,15 +259,10 @@ websocket.on('endBet',function(data){
var doIntervalTime = parseInt(interval_time) + 1; var doIntervalTime = parseInt(interval_time) + 1;
var intervalTime = setInterval(function(){ var intervalTime = setInterval(function(){
doIntervalTime--; doIntervalTime--;
$(".countdown .num").html(doIntervalTime) $("#resultAreaTimer").html(doIntervalTime).show();
$(".countdown").css({"opacity":1,"display":"block"});
$(".countdown .grab-count").addClass("count-active");
$(".countdown .round-txt-item").addClass("color-red");
if(doIntervalTime == 0) { if(doIntervalTime == 0) {
clearInterval(intervalTime); clearInterval(intervalTime);
$(".countdown").css({"opacity":0,"display":"none"}); $("#resultAreaTimer").hide();
$(".countdown .grab-count").removeClass("count-active");
$(".countdown .round-txt-item").removeClass("color-red");
if(game_id == 4 || game_id == 5){ if(game_id == 4 || game_id == 5){
$(".banker_result").html(''); $(".banker_result").html('');
$(".player_1_result").html(''); $(".player_1_result").html('');
@@ -278,15 +272,13 @@ websocket.on('endBet',function(data){
$('#opening').val(0); $('#opening').val(0);
$('#result_banker_pair').val(0); $('#result_banker_pair').val(0);
$('#result_player_pair').val(0); $('#result_player_pair').val(0);
$(".countdown").css({"opacity":0,"display":"none"}); $("#resultAreaTimer").hide();
$(".countdown .grab-count").removeClass("count-active");
setBetStatus(data.round.number_tab_status); setBetStatus(data.round.number_tab_status);
c = parseInt($('#wait_time').val()); c = parseInt($('#wait_time').val());
} }
},1000); },1000);
} else { } else {
$(".countdown").css({"opacity":0,"display":"none"}); $("#resultAreaTimer").hide();
$(".countdown .grab-count").removeClass("count-active");
mp3List = ['stop_2.mp3']; mp3List = ['stop_2.mp3'];
audioMp3(mp3List).Play(); audioMp3(mp3List).Play();
if(game_id == 4 || game_id == 5){ if(game_id == 4 || game_id == 5){
@@ -299,8 +291,7 @@ websocket.on('endBet',function(data){
$('#toning_result').val(''); $('#toning_result').val('');
$(".toning-result-num").removeClass("active"); $(".toning-result-num").removeClass("active");
} }
$(".countdown").css({"opacity":0,"display":"none"}); $("#resultAreaTimer").hide();
$(".countdown .grab-count").removeClass("count-active");
setBetStatus(data.round.number_tab_status); setBetStatus(data.round.number_tab_status);
// 识别相关 // 识别相关
@@ -715,7 +706,11 @@ function showPng(opening, pair,isVoice){
if(isVoice){ if(isVoice){
audioMp3(mp3List).Play(); audioMp3(mp3List).Play();
} }
var imgSrc = $('#openingPng').attr('src');
if(imgSrc){
$("#resultAreaTimer").hide();
$("#resultAreaImg").html('<img src="'+imgSrc+'"/>');
}
} }
function showPngDt (opening,isVoice){ function showPngDt (opening,isVoice){
@@ -797,9 +792,8 @@ function getLang(){
} }
//倒计时 //倒计时
function countDown(time) { function countDown(time) {
$(".countdown .num").html(time) $("#resultAreaTimer").html(time).show();
$(".countdown").css({"opacity":1,"display":"block"}); $("#resultAreaImg").empty();
$(".countdown .grab-count").addClass("count-active");
if(time == 10){ if(time == 10){
mp3List = ['time_tip_10.mp3']; mp3List = ['time_tip_10.mp3'];
audioMp3(mp3List).Play(); audioMp3(mp3List).Play();
@@ -811,8 +805,7 @@ function countDown(time) {
if(time<=0){ if(time<=0){
mp3List = ['stop_2.mp3']; mp3List = ['stop_2.mp3'];
audioMp3(mp3List).Play(); audioMp3(mp3List).Play();
$(".countdown").css({"opacity":0,"display":"none"}); $("#resultAreaTimer").hide();
$(".countdown .grab-count").removeClass("count-active");
return; return;
} }
} }
@@ -1203,19 +1196,13 @@ function nextAudio(){
} }
function countDownRob(time) { function countDownRob(time) {
var table_id = $('#table_id').val(); var table_id = $('#table_id').val();
$(".countdown .num").html(time); $("#resultAreaTimer").html(time).show();
$(".countdown").css({"opacity":1,"display":"block"});
$(".countdown .grab-count").addClass("count-active");
//$(".countdown").fadeIn();
if(time < 5 && time > 0){ if(time < 5 && time > 0){
mp3List = ['time.mp3']; mp3List = ['time.mp3'];
audioMp3(mp3List).Play(); audioMp3(mp3List).Play();
} }
if(time<=0){ if(time<=0){
// mp3List = ['end_rob.mp3']; $("#resultAreaTimer").hide();
// audioMp3(mp3List).Play();
$(".countdown").css({"opacity":0,"display":"none"});
$(".countdown .grab-count").removeClass("count-active");
webSocket.send('{"connect":"space","mode":"endRob","number_tab_id":"'+parseInt(number_tab_id)+'","table_id":"'+parseInt(table_id)+'"}'); webSocket.send('{"connect":"space","mode":"endRob","number_tab_id":"'+parseInt(number_tab_id)+'","table_id":"'+parseInt(table_id)+'"}');
return; return;
} }
@@ -1459,16 +1446,16 @@ function SoloPath(ctb,unit,x,y,type,corners,luck_six,dragon_seven,panda_eight){
ctb.strokeStyle = "#000"; ctb.strokeStyle = "#000";
var radius=unit/2||0; var radius=unit/2||0;
if(game_id==1 && luck_six > 0){ if(game_id==1 && luck_six > 0){
var color='#1a8c3a', fonts="6"; var color='#8b1a1a', fonts="6";
ctb.strokeStyle = "#2eb553"; ctb.strokeStyle = "#a03030";
ctb.lineWidth = 2; ctb.lineWidth = 2;
}else if(game_id==1 && dragon_seven > 0){ }else if(game_id==1 && dragon_seven > 0){
var color='#d4a017', fonts="7"; var color='#b8860b', fonts="7";
ctb.strokeStyle = "#e6b822"; ctb.strokeStyle = "#c9980a";
ctb.lineWidth = 2; ctb.lineWidth = 2;
}else if(game_id==1 && panda_eight > 0){ }else if(game_id==1 && panda_eight > 0){
var color='#1a6ed8', fonts="8"; var color='#34495e', fonts="8";
ctb.strokeStyle = "#4a9af5"; ctb.strokeStyle = "#506878";
ctb.lineWidth = 2; ctb.lineWidth = 2;
}else if(type==1){ }else if(type==1){
var color='#b20a00'; var color='#b20a00';
public/static/handle/js/handle_b_sb.js
+6 -6
View File
@@ -2121,19 +2121,19 @@ function SoloPath(ctb,unit,x,y,type,corners,luck_six,dragon_seven,panda_eight){
ctb.strokeStyle = "#E35C4C"; ctb.strokeStyle = "#E35C4C";
} }
} else if(game_id==1 && luck_six > 0){ } else if(game_id==1 && luck_six > 0){
var color='#1a8c3a'; var color='#8b1a1a';
var fonts="6"; var fonts="6";
ctb.strokeStyle = "#2eb553"; ctb.strokeStyle = "#a03030";
ctb.lineWidth = 2; ctb.lineWidth = 2;
} else if(game_id==1 && dragon_seven > 0){ } else if(game_id==1 && dragon_seven > 0){
var color='#d4a017'; var color='#b8860b';
var fonts="7"; var fonts="7";
ctb.strokeStyle = "#e6b822"; ctb.strokeStyle = "#c9980a";
ctb.lineWidth = 2; ctb.lineWidth = 2;
} else if(game_id==1 && panda_eight > 0){ } else if(game_id==1 && panda_eight > 0){
var color='#1a6ed8'; var color='#34495e';
var fonts="8"; var fonts="8";
ctb.strokeStyle = "#4a9af5"; ctb.strokeStyle = "#506878";
ctb.lineWidth = 2; ctb.lineWidth = 2;
} else { } else {
if(type==1){ if(type==1){