Compare commits
4
Commits
510802551c
...
78797462b5
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
78797462b5 | ||
|
|
307338fa7d | ||
|
|
6e526d1678 | ||
|
|
6768684116 |
@@ -117,31 +117,36 @@
|
||||
<span id="betstatus"></span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="limit-box">
|
||||
<div class="list clearfix" style="padding-top:0;">
|
||||
<div class="lab" style="margin:0;">
|
||||
{:lang('banker')}\{:lang('player')}
|
||||
<div class="bottom-row">
|
||||
<div class="limit-box">
|
||||
<div class="list clearfix" style="padding-top:0;">
|
||||
<div class="lab" style="margin:0;">
|
||||
{:lang('banker')}\{:lang('player')}
|
||||
</div>
|
||||
<div class="item fl">
|
||||
<span class="fr showLimitBP"> </span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="item fl">
|
||||
<span class="fr showLimitBP"> </span>
|
||||
<div class="list clearfix" style="padding-top:0;">
|
||||
<div class="lab" style="margin:0;">
|
||||
{:lang('tie')}
|
||||
</div>
|
||||
<div class="item fl">
|
||||
<span class="fr showLimitTie"> </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"> </span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="list clearfix" style="padding-top:0;">
|
||||
<div class="lab" style="margin:0;">
|
||||
{:lang('tie')}
|
||||
</div>
|
||||
<div class="item fl">
|
||||
<span class="fr showLimitTie"> </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"> </span>
|
||||
</div>
|
||||
|
||||
<div class="result-area">
|
||||
<div class="result-area-timer" id="resultAreaTimer"></div>
|
||||
<div class="result-area-img" id="resultAreaImg"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -419,11 +419,11 @@ margin-left: 0;
|
||||
}
|
||||
.table-data .title li strong{
|
||||
font-weight: 600;
|
||||
font-size: 18px;
|
||||
font-size: 13px;
|
||||
text-shadow: 0px 1px 0px #fff;
|
||||
}
|
||||
.table-data .title li small{
|
||||
font-size: 12px;
|
||||
font-size: 10px;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
@@ -434,9 +434,10 @@ margin-left: 0;
|
||||
text-align: center;
|
||||
margin: 0 auto;
|
||||
border-radius: 2px;
|
||||
margin-top: 0.8vh;
|
||||
line-height: 3vh;
|
||||
margin-top: 0.3vh;
|
||||
line-height: 2.2vh;
|
||||
font-weight: 500;
|
||||
font-size: 13px;
|
||||
-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;
|
||||
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{
|
||||
width: 95%;
|
||||
flex: 1;
|
||||
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{
|
||||
@@ -471,12 +505,12 @@ margin-left: 0;
|
||||
font-weight: 600;
|
||||
}
|
||||
.limit-box .list{
|
||||
padding: 0.6vh 0;
|
||||
padding: 1vh 0;
|
||||
padding-left: 50px;
|
||||
position: relative;
|
||||
font-size: 14px;
|
||||
font-size: 16px;
|
||||
color: #3c180a;
|
||||
line-height: 3vh;
|
||||
line-height: 3.5vh;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
@@ -674,17 +708,17 @@ margin-left: 0;
|
||||
|
||||
.countdown{ z-index: 999;
|
||||
|
||||
position:absolute;
|
||||
display: none;
|
||||
top: 8px;
|
||||
right: 8px;
|
||||
position:fixed;
|
||||
display: none !important;
|
||||
bottom: 22vh;
|
||||
right: 1vw;
|
||||
left: auto;
|
||||
}
|
||||
.countdown .grab-count{
|
||||
background: url(../img/count.png) no-repeat;
|
||||
background-size: 100% 100%;
|
||||
width: 8vw;
|
||||
height: 8vw;
|
||||
width: 6vw;
|
||||
height: 6vw;
|
||||
}
|
||||
.round-txt-item { position: absolute;width: 100%; top:0; }
|
||||
.top-sec .count-active{animation: myMove1 6s 0s linear infinite;}
|
||||
@@ -712,13 +746,13 @@ margin-left: 0;
|
||||
|
||||
|
||||
.countdown .num{
|
||||
font-size: 4vw;
|
||||
font-size: 3vw;
|
||||
position: absolute;
|
||||
font-weight: 500;
|
||||
z-index: 999;
|
||||
text-align: center;
|
||||
text-shadow: 0px 1px 0px #555;
|
||||
line-height: 8vw;
|
||||
line-height: 6vw;
|
||||
color: #eee;
|
||||
border-radius: 50%;
|
||||
background-color: rgba(0,0,0,0.5);
|
||||
@@ -783,14 +817,9 @@ margin-left: 0;
|
||||
}
|
||||
|
||||
|
||||
/*结果弹窗*/
|
||||
/*结果弹窗 - 隐藏原始大 overlay,结果在右侧面板 .result-area 显示*/
|
||||
.result-box{
|
||||
position: fixed;
|
||||
z-index: 1000;
|
||||
top: 8px;
|
||||
right: 8px;
|
||||
left: auto;
|
||||
width: 120px;
|
||||
display: none !important;
|
||||
}
|
||||
|
||||
.result-box.blink{
|
||||
|
||||
@@ -585,13 +585,12 @@ body{
|
||||
|
||||
.countdown{
|
||||
display: none;
|
||||
position: absolute;
|
||||
position: fixed;
|
||||
z-index: 999;
|
||||
width: 80px;
|
||||
height: 80px;
|
||||
top: 8px;
|
||||
right: 8px;
|
||||
bottom: auto;
|
||||
width: 70px;
|
||||
height: 70px;
|
||||
bottom: 22vh;
|
||||
right: 1vw;
|
||||
}
|
||||
.countdown .roll{
|
||||
position: absolute;
|
||||
@@ -611,7 +610,7 @@ body{
|
||||
|
||||
.countdown .num{
|
||||
color: #fff;
|
||||
font-size: 32px;
|
||||
font-size: 28px;
|
||||
position: relative;
|
||||
font-weight: 500;
|
||||
z-index: 999;
|
||||
@@ -1051,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;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -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 cy = radius+unit*(y-1);
|
||||
if(game_id==1 && luck_six > 0){
|
||||
var color='#1a8c3a';
|
||||
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='#d4a017';
|
||||
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='#1a6ed8';
|
||||
var color='#34495e';
|
||||
var fonts="8";
|
||||
ctb.strokeStyle = "#4a9af5";
|
||||
ctb.strokeStyle = "#506878";
|
||||
ctb.lineWidth = 2;
|
||||
} else if (game_id == 6){
|
||||
if(type==0){
|
||||
|
||||
@@ -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);
|
||||
|
||||
// 识别相关
|
||||
@@ -715,7 +706,11 @@ function showPng(opening, pair,isVoice){
|
||||
if(isVoice){
|
||||
audioMp3(mp3List).Play();
|
||||
}
|
||||
|
||||
var imgSrc = $('#openingPng').attr('src');
|
||||
if(imgSrc){
|
||||
$("#resultAreaTimer").hide();
|
||||
$("#resultAreaImg").html('<img src="'+imgSrc+'"/>');
|
||||
}
|
||||
}
|
||||
|
||||
function showPngDt (opening,isVoice){
|
||||
@@ -797,9 +792,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();
|
||||
@@ -811,8 +805,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;
|
||||
}
|
||||
}
|
||||
@@ -1203,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;
|
||||
}
|
||||
@@ -1459,16 +1446,16 @@ function SoloPath(ctb,unit,x,y,type,corners,luck_six,dragon_seven,panda_eight){
|
||||
ctb.strokeStyle = "#000";
|
||||
var radius=unit/2||0;
|
||||
if(game_id==1 && luck_six > 0){
|
||||
var color='#1a8c3a', fonts="6";
|
||||
ctb.strokeStyle = "#2eb553";
|
||||
var color='#8b1a1a', fonts="6";
|
||||
ctb.strokeStyle = "#a03030";
|
||||
ctb.lineWidth = 2;
|
||||
}else if(game_id==1 && dragon_seven > 0){
|
||||
var color='#d4a017', fonts="7";
|
||||
ctb.strokeStyle = "#e6b822";
|
||||
var color='#b8860b', fonts="7";
|
||||
ctb.strokeStyle = "#c9980a";
|
||||
ctb.lineWidth = 2;
|
||||
}else if(game_id==1 && panda_eight > 0){
|
||||
var color='#1a6ed8', fonts="8";
|
||||
ctb.strokeStyle = "#4a9af5";
|
||||
var color='#34495e', fonts="8";
|
||||
ctb.strokeStyle = "#506878";
|
||||
ctb.lineWidth = 2;
|
||||
}else if(type==1){
|
||||
var color='#b20a00';
|
||||
|
||||
@@ -2121,19 +2121,19 @@ function SoloPath(ctb,unit,x,y,type,corners,luck_six,dragon_seven,panda_eight){
|
||||
ctb.strokeStyle = "#E35C4C";
|
||||
}
|
||||
} else if(game_id==1 && luck_six > 0){
|
||||
var color='#1a8c3a';
|
||||
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='#d4a017';
|
||||
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='#1a6ed8';
|
||||
var color='#34495e';
|
||||
var fonts="8";
|
||||
ctb.strokeStyle = "#4a9af5";
|
||||
ctb.strokeStyle = "#506878";
|
||||
ctb.lineWidth = 2;
|
||||
} else {
|
||||
if(type==1){
|
||||
|
||||
Reference in New Issue
Block a user