feat: 修改上局结果支持幸运6/龙7/熊8
- tab_b.html: 下拉菜单加6/7/8选项(5段格式 opening-pair-luck_six-dragon_seven-panda_eight) - handle_b.js: retreated()解析并传dragon_seven/panda_eight - NumberTab: resetBaccarat更新luck_six/dragon_seven/panda_eight字段 - ResetBaccaratService: 比较条件加上三个字段
This commit is contained in:
+1
-1
@@ -3,7 +3,7 @@
|
|||||||
//应用公共文件
|
//应用公共文件
|
||||||
|
|
||||||
// 版本号
|
// 版本号
|
||||||
define('VERSION_V','?ver=v10.0.7');
|
define('VERSION_V','?ver=v10.0.8');
|
||||||
|
|
||||||
// 强制加载中文语言包
|
// 强制加载中文语言包
|
||||||
\think\facade\Lang::load(__DIR__ . '/lang/zh-cn.php');
|
\think\facade\Lang::load(__DIR__ . '/lang/zh-cn.php');
|
||||||
|
|||||||
@@ -254,18 +254,22 @@
|
|||||||
{:lang('select_result')}:
|
{:lang('select_result')}:
|
||||||
<select id="update_ludan_result">
|
<select id="update_ludan_result">
|
||||||
<option value="">{:lang('select')}</option>
|
<option value="">{:lang('select')}</option>
|
||||||
<option value="1-0">{:lang('banker')}</option>
|
<option value="1-0-0-0-0">{:lang('banker')}</option>
|
||||||
<option value="2-0">{:lang('player')}</option>
|
<option value="2-0-0-0-0">{:lang('player')}</option>
|
||||||
<option value="3-0">{:lang('tie')}</option>
|
<option value="3-0-0-0-0">{:lang('tie')}</option>
|
||||||
<option value="1-1">{:lang('banker')}-{:lang('banker_pair')}</option>
|
<option value="1-1-0-0-0">{:lang('banker')}-{:lang('banker_pair')}</option>
|
||||||
<option value="1-2">{:lang('banker')}-{:lang('player_pair')}</option>
|
<option value="1-2-0-0-0">{:lang('banker')}-{:lang('player_pair')}</option>
|
||||||
<option value="1-3">{:lang('banker')}-{:lang('both_pair')}</option>
|
<option value="1-3-0-0-0">{:lang('banker')}-{:lang('both_pair')}</option>
|
||||||
<option value="2-1">{:lang('player')}-{:lang('banker_pair')}</option>
|
<option value="1-0-2-0-0">{:lang('banker')}-幸运6(2张)</option>
|
||||||
<option value="2-2">{:lang('player')}-{:lang('player_pair')}</option>
|
<option value="1-0-3-0-0">{:lang('banker')}-幸运6(3张)</option>
|
||||||
<option value="2-3">{:lang('player')}-{:lang('both_pair')}</option>
|
<option value="1-0-0-0-1">{:lang('banker')}-熊8</option>
|
||||||
<option value="3-1">{:lang('tie')}-{:lang('banker_pair')}</option>
|
<option value="2-1-0-0-0">{:lang('player')}-{:lang('banker_pair')}</option>
|
||||||
<option value="3-2">{:lang('tie')}-{:lang('player_pair')}</option>
|
<option value="2-2-0-0-0">{:lang('player')}-{:lang('player_pair')}</option>
|
||||||
<option value="3-3">{:lang('tie')}-{:lang('both_pair')}</option>
|
<option value="2-3-0-0-0">{:lang('player')}-{:lang('both_pair')}</option>
|
||||||
|
<option value="2-0-0-1-0">{:lang('player')}-龙7</option>
|
||||||
|
<option value="3-1-0-0-0">{:lang('tie')}-{:lang('banker_pair')}</option>
|
||||||
|
<option value="3-2-0-0-0">{:lang('tie')}-{:lang('player_pair')}</option>
|
||||||
|
<option value="3-3-0-0-0">{:lang('tie')}-{:lang('both_pair')}</option>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
<div class="update-ludan-footer">
|
<div class="update-ludan-footer">
|
||||||
|
|||||||
@@ -687,6 +687,9 @@ class NumberTab extends BaseModel
|
|||||||
'result_before_edit' => $numberTabInfo['result'],
|
'result_before_edit' => $numberTabInfo['result'],
|
||||||
'pair' => $event['pair'],
|
'pair' => $event['pair'],
|
||||||
'pair_before_edit' => $numberTabInfo['pair'],
|
'pair_before_edit' => $numberTabInfo['pair'],
|
||||||
|
'luck_six' => intval($event['luck_six'] ?? 0),
|
||||||
|
'dragon_seven' => intval($event['dragon_seven'] ?? 0),
|
||||||
|
'panda_eight' => intval($event['panda_eight'] ?? 0),
|
||||||
);
|
);
|
||||||
|
|
||||||
NumberTab::where(['id' => $numberTabInfo['id']])->update($updateNumberTab);
|
NumberTab::where(['id' => $numberTabInfo['id']])->update($updateNumberTab);
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ class ResetBaccaratService
|
|||||||
}
|
}
|
||||||
|
|
||||||
$numberTabInfo = $numberTabInfo[1];
|
$numberTabInfo = $numberTabInfo[1];
|
||||||
if($event['opening'] == $numberTabInfo['result'] && $event['pair'] == $numberTabInfo['pair'] && $event['luck_six'] == $numberTabInfo['luck_six']){
|
if($event['opening'] == $numberTabInfo['result'] && $event['pair'] == $numberTabInfo['pair'] && ($event['luck_six'] ?? 0) == $numberTabInfo['luck_six'] && ($event['dragon_seven'] ?? 0) == $numberTabInfo['dragon_seven'] && ($event['panda_eight'] ?? 0) == $numberTabInfo['panda_eight']){
|
||||||
$ws->emit('resetBaccarat', ['status' => false, 'msg' => '结果一样']);
|
$ws->emit('resetBaccarat', ['status' => false, 'msg' => '结果一样']);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -111,7 +111,10 @@ var retreated = function(){
|
|||||||
if(game_id == 1){
|
if(game_id == 1){
|
||||||
var opening = result_arr[0];
|
var opening = result_arr[0];
|
||||||
var pair = result_arr[1];
|
var pair = result_arr[1];
|
||||||
websocket.emit('resetBaccarat',{table_id : table_id, number_tab_id : number_tab_id,opening : opening,pair : pair,luck_six:0});
|
var luck_six = parseInt(result_arr[2]) || 0;
|
||||||
|
var dragon_seven = parseInt(result_arr[3]) || 0;
|
||||||
|
var panda_eight = parseInt(result_arr[4]) || 0;
|
||||||
|
websocket.emit('resetBaccarat',{table_id : table_id, number_tab_id : number_tab_id,opening : opening,pair : pair,luck_six:luck_six,dragon_seven:dragon_seven,panda_eight:panda_eight});
|
||||||
|
|
||||||
}else if(game_id == 2){
|
}else if(game_id == 2){
|
||||||
var opening = result_arr[0];
|
var opening = result_arr[0];
|
||||||
|
|||||||
Reference in New Issue
Block a user