From ef66019c295261bd9c7d677d6e4797f0cf8ab4c1 Mon Sep 17 00:00:00 2001
From: testadmin <admin@163.com>
Date: Wed, 13 May 2026 19:09:43 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E4=B8=8A=E5=B1=80?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=94=AF=E6=8C=81=E5=B9=B8=E8=BF=906/?=
 =?UTF-8?q?=E9=BE=997/=E7=86=8A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 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: 比较条件加上三个字段
---
 app/common.php                              |  2 +-
 app/handle/view/index/tab_b.html            | 28 ++++++++++++---------
 app/models/process/NumberTab.php            |  3 +++
 app/services/reset/ResetBaccaratService.php |  2 +-
 public/static/handle/js/handle_b.js         |  5 +++-
 5 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/app/common.php b/app/common.php
index b49cb8d..df55d0b 100644
--- a/app/common.php
+++ b/app/common.php
@@ -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');
diff --git a/app/handle/view/index/tab_b.html b/app/handle/view/index/tab_b.html
index 8ca3d90..71fb608 100644
--- a/app/handle/view/index/tab_b.html
+++ b/app/handle/view/index/tab_b.html
@@ -254,18 +254,22 @@
         {:lang('select_result')}：
         <select id="update_ludan_result">
             <option value="">{:lang('select')}</option>
-            <option value="1-0">{:lang('banker')}</option>
-            <option value="2-0">{:lang('player')}</option>
-            <option value="3-0">{:lang('tie')}</option>
-            <option value="1-1">{:lang('banker')}-{:lang('banker_pair')}</option>
-            <option value="1-2">{:lang('banker')}-{:lang('player_pair')}</option>
-            <option value="1-3">{:lang('banker')}-{:lang('both_pair')}</option>
-            <option value="2-1">{:lang('player')}-{:lang('banker_pair')}</option>
-            <option value="2-2">{:lang('player')}-{:lang('player_pair')}</option>
-            <option value="2-3">{:lang('player')}-{:lang('both_pair')}</option>
-            <option value="3-1">{:lang('tie')}-{:lang('banker_pair')}</option>
-            <option value="3-2">{:lang('tie')}-{:lang('player_pair')}</option>
-            <option value="3-3">{:lang('tie')}-{:lang('both_pair')}</option>
+            <option value="1-0-0-0-0">{:lang('banker')}</option>
+            <option value="2-0-0-0-0">{:lang('player')}</option>
+            <option value="3-0-0-0-0">{:lang('tie')}</option>
+            <option value="1-1-0-0-0">{:lang('banker')}-{:lang('banker_pair')}</option>
+            <option value="1-2-0-0-0">{:lang('banker')}-{:lang('player_pair')}</option>
+            <option value="1-3-0-0-0">{:lang('banker')}-{:lang('both_pair')}</option>
+            <option value="1-0-2-0-0">{:lang('banker')}-幸运6(2张)</option>
+            <option value="1-0-3-0-0">{:lang('banker')}-幸运6(3张)</option>
+            <option value="1-0-0-0-1">{:lang('banker')}-熊8</option>
+            <option value="2-1-0-0-0">{:lang('player')}-{:lang('banker_pair')}</option>
+            <option value="2-2-0-0-0">{:lang('player')}-{:lang('player_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>
     </div>
     <div class="update-ludan-footer">
diff --git a/app/models/process/NumberTab.php b/app/models/process/NumberTab.php
index 1861cb3..7118a5b 100644
--- a/app/models/process/NumberTab.php
+++ b/app/models/process/NumberTab.php
@@ -687,6 +687,9 @@ class NumberTab extends BaseModel
                 'result_before_edit' => $numberTabInfo['result'],
                 'pair' => $event['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);
diff --git a/app/services/reset/ResetBaccaratService.php b/app/services/reset/ResetBaccaratService.php
index 3eee4a5..6203b64 100644
--- a/app/services/reset/ResetBaccaratService.php
+++ b/app/services/reset/ResetBaccaratService.php
@@ -39,7 +39,7 @@ class ResetBaccaratService
         }
 
         $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' => '结果一样']);
             return;
         }
diff --git a/public/static/handle/js/handle_b.js b/public/static/handle/js/handle_b.js
index 5163018..d0c1e5e 100644
--- a/public/static/handle/js/handle_b.js
+++ b/public/static/handle/js/handle_b.js
@@ -111,7 +111,10 @@ var retreated = function(){
        if(game_id == 1){
            var opening = result_arr[0];
            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){
            var opening = result_arr[0];