From 90d348d77ac0c259c2d14894a08e9ca32b8ddec8 Mon Sep 17 00:00:00 2001 From: li Date: Wed, 11 Feb 2026 19:53:08 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BA=94=E5=85=AC=E6=9D=80=E8=B5=94?= =?UTF-8?q?=E4=BB=8E5=E5=80=8D=E6=94=B9=E4=B8=BA4=E5=80=8D=EF=BC=8C?= =?UTF-8?q?=E5=9B=9B=E6=9D=A1=E6=9D=80=E8=B5=94=E4=BF=9D=E6=8C=815?= =?UTF-8?q?=E5=80=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .DS_Store | Bin 6148 -> 6148 bytes app/.DS_Store | Bin 8196 -> 8196 bytes app/services/.DS_Store | Bin 6148 -> 10244 bytes app/services/bet/ToBetNnService.php | 6 ++- app/services/bet/ToBetTcService.php | 6 ++- app/services/opening/OpeningNnService.php | 48 +++++++++++----------- freedom/.DS_Store | Bin 0 -> 6148 bytes 7 files changed, 32 insertions(+), 28 deletions(-) create mode 100644 freedom/.DS_Store diff --git a/.DS_Store b/.DS_Store index f18290b7a8094eb0f2f2b77bf1091b3227b1d59a..91240f38a8c973c2c62c44c05b476a4167488908 100644 GIT binary patch delta 161 zcmZoMXfc=|#>B!ku~2NHo}wrl0|Nsi1A_oVaY0f}eiD$kJ*i;xL+0ho+#o4thD3$} zhJs1V4eZ7SraB51rjzF}Nl#wHtg`to6DuP>J3|^n5ko2vrZD6)B)qu~2NHo}wrV0|Nsi1A_oVaY0f}eiD$kBdK6x;c`Z9kPI_JB0~W~ z!Q>CD$2Z?$VP)KWmCcB8W5Z{r&Fmcf96(bx3vzsCp3E=e$N^LhGKgh!gvc6Z00?gw Av;Y7A diff --git a/app/.DS_Store b/app/.DS_Store index 029c058c38dcbb292bd783c3de0786a007577f5a..c5bcafc8c1c36dd306bc984ccdd7673409f32dd3 100644 GIT binary patch delta 54 zcmZp1XmQveEX=rlvVu?{mw0uxv4N?Mf`#ei3BuBhos$m;$}@ItJ|oP}xcRY+BJ;!s Kp3UqMf7t=afDs7* delta 29 lcmZp1XmQveEIe6TVBh8o!d#4-pU5aMPi)}X%r5bl9RQzk3RM6A diff --git a/app/services/.DS_Store b/app/services/.DS_Store index 3c16336259ea44c932eb304a590b8aace1b1c34c..976f0c9d75dd96e0c7f08a04212955366bd740ac 100644 GIT binary patch literal 10244 zcmeHMU2GIp6h3EK=$&bip|t!sDP1X;S_`cGS^j1F1Bg@$Y=0@R?Cy;1$aJRc%S%sKa* zJ9Ex_XU^Wc0Dzr2{Skl&05IyDs#P@Hpz(R$XEiC1C`6I$!JSB3PMWw+(i5|^LqQmU zFalu&!U%*B2qW-chyc}W-dLre;TT3Bj6fKHs}bPehX{2};{lx()crF)u*E=OPVz{g7Z2#Ppu!w5*nD7cXAE{I=--{zkNE0< zaY4f|j6fKH*%9D-_cBO>0baUr{r=rDT`wBFj8a+ooVgXOf>pBpi7}^;@KRpR?M!7y zIM?SmR=RkdN)MPuA*t4MIkuNFZ6oU&n7TnK`vy&0cM6?O&emPuHX$aM%;coHcye-W zthG53i%vC1CfBz_nnY8n>Mj;`uT72Ee=$e@<)Rx5szQ(b)Br&c?!KP7nEnqw^JY ze@3g z2vJ3g#~Jfq8p*lIR^9ZRtRIb@dQBVVOLgeFp_9`~7A;n_-CBaF7sy66?Yv1CrgtHr z%o^fN;+4#Zh+ISlij{`V_!*~EkaSWfvLwFdE;UrGs zvv?d|#Fy}8d=uZoxA9$k56|Fdcn&|u^LPm_<2U#V{)SiZPy9=&keH-MmC`b)UTT!u zrI_$QDyGZuOpm1P#0R-g=@OjXN#2dprEcps<*~b(F5gx01X)nMu%>odL*uHJ*v2ha zVI)vj1lsig_Axu-z51B-bEgzLcqj3Xc?X#?B65x zefS8@!Z|okNc{nRgrDIL1e}Xigv@0aA#|?5m4wbHwqPr^;bz=|9oR`&?ZGE;7w*PA zID-2zi3c%7NVRYrZ7kqXLhCbx*W>scp1_m%3ZBB(@O6B{$L$CBVF?m<%tRu7aSe(2 zMAo((dz2&`x8;z5F-Xm*PG^ed}#N+qc!w(b_?iI*R0H!V-k)8tiuO8l$< z2PUWr+h9^3z1y|8HQL@BS=W9GXK$w#mpB#HWKr3}njF^TTh-**X%p6F|5t8Uo9|L> zEjo!Y{&hT%O$+Lqla6mr^bY+Q5bpoO{r^8X Ko&F#0|NjQ^A!UaE delta 122 zcmZn(XfcprU|?W$DortDU=RQ@Ie-{MGjdEU6q~50D9QxlfW(r@iwlx+@{@r49TN+e zPc~3tnY>!;#b$rG9gG_rB3Kr)b8rYU17(3gfE!4-f=t<1_?>w&zl!B#9~Eg $v){ - if ($v > $userInfo['limit_high'] && !in_array($k,$withholdKeys)){ + $nnLimitHigh = ($userInfo['limit_high_nn'] > 0) ? $userInfo['limit_high_nn'] : $userInfo['limit_high']; + if ($v > $nnLimitHigh && !in_array($k,$withholdKeys)){ $ws->emit('toBet',['status' => false, 'table_id' => $tableInfo['id'], 'msg' => 'exceeds_limit_user']); SocketSession::resetRepeat($fd,'user','isToBet'); return; } } foreach ($betTotalAmount AS $k => $v){ - if ($v > 0 && $v < $userInfo['limit_low'] && !in_array($k,$withholdKeys)){ + $nnLimitLow = ($userInfo['limit_low_nn'] > 0) ? $userInfo['limit_low_nn'] : $userInfo['limit_low']; + if ($v > 0 && $v < $nnLimitLow && !in_array($k,$withholdKeys)){ $ws->emit('toBet',['status' => false, 'table_id' => $tableInfo['id'], 'msg' => 'under_limit_user']); SocketSession::resetRepeat($fd,'user','isToBet'); return; diff --git a/app/services/bet/ToBetTcService.php b/app/services/bet/ToBetTcService.php index f819170..b1fbab4 100644 --- a/app/services/bet/ToBetTcService.php +++ b/app/services/bet/ToBetTcService.php @@ -97,14 +97,16 @@ class ToBetTcService 'withhold_player_3_banker_times', ]; foreach ($betTotalAmount AS $k => $v){ - if ($v > $userInfo['limit_high'] && !in_array($k,$withholdKeys)){ + $nnLimitHigh = ($userInfo['limit_high_nn'] > 0) ? $userInfo['limit_high_nn'] : $userInfo['limit_high']; + if ($v > $nnLimitHigh && !in_array($k,$withholdKeys)){ $ws->emit('toBet',['status' => false, 'table_id' => $tableInfo['id'], 'msg' => 'exceeds_limit_user']); SocketSession::resetRepeat($fd,'user','isToBet'); return; } } foreach ($betTotalAmount AS $k => $v){ - if ($v > 0 && $v < $userInfo['limit_low'] && !in_array($k,$withholdKeys)){ + $nnLimitLow = ($userInfo['limit_low_nn'] > 0) ? $userInfo['limit_low_nn'] : $userInfo['limit_low']; + if ($v > 0 && $v < $nnLimitLow && !in_array($k,$withholdKeys)){ $ws->emit('toBet',['status' => false, 'table_id' => $tableInfo['id'], 'msg' => 'under_limit_user']); SocketSession::resetRepeat($fd,'user','isToBet'); return; diff --git a/app/services/opening/OpeningNnService.php b/app/services/opening/OpeningNnService.php index ebedde2..71fdc2c 100644 --- a/app/services/opening/OpeningNnService.php +++ b/app/services/opening/OpeningNnService.php @@ -211,7 +211,7 @@ class OpeningNnService $timesPlayer1 = $userInfo['price_nn']; }elseif($data['result_player_1'] == 11){ $winTotal += round($v['amount_player_1_times'] * $userInfo['price_5n'],2); - $winTotalActual += round($v['amount_player_1_times'] * 5,2); + $winTotalActual += round($v['amount_player_1_times'] * 4,2); $timesPlayer1 = $userInfo['price_5n']; }elseif($data['result_player_1'] == 12){ $winTotal += round($v['amount_player_1_times'] * $userInfo['price_bomb'],2); @@ -240,9 +240,9 @@ class OpeningNnService $rebate += round($v['amount_player_1_banker_times'] * 3); $rebatePlayer1 += round($v['amount_player_1_banker_times'] * 3); }elseif($data['result_player_1'] == 11){ - $winTotal -= round($v['amount_player_1_banker_times'] * 5,2); - $rebate += round($v['amount_player_1_banker_times'] * 5); - $rebatePlayer1 += round($v['amount_player_1_banker_times'] * 5); + $winTotal -= round($v['amount_player_1_banker_times'] * 4,2); + $rebate += round($v['amount_player_1_banker_times'] * 4); + $rebatePlayer1 += round($v['amount_player_1_banker_times'] * 4); }elseif($data['result_player_1'] == 12){ $winTotal -= round($v['amount_player_1_banker_times'] * 5,2); $rebate += round($v['amount_player_1_banker_times'] * 5); @@ -293,10 +293,10 @@ class OpeningNnService $rebate += $v['amount_player_1_times'] * 3; $rebatePlayer1 -= $v['amount_player_1_times'] * 3; }elseif($data['result_banker'] == 11){ - $winTotal -= $v['amount_player_1_times'] * 5; - $winTotalActual -= $v['amount_player_1_times'] * 5; - $rebate += $v['amount_player_1_times'] * 5; - $rebatePlayer1 -= $v['amount_player_1_times'] * 5; + $winTotal -= $v['amount_player_1_times'] * 4; + $winTotalActual -= $v['amount_player_1_times'] * 4; + $rebate += $v['amount_player_1_times'] * 4; + $rebatePlayer1 -= $v['amount_player_1_times'] * 4; }elseif($data['result_banker'] == 12){ $winTotal -= $v['amount_player_1_times'] * 5; $winTotalActual -= $v['amount_player_1_times'] * 5; @@ -326,7 +326,7 @@ class OpeningNnService $timesPlayer2 = $userInfo['price_nn']; }elseif($data['result_player_2'] == 11){ $winTotal += round($v['amount_player_2_times'] * $userInfo['price_5n'],2); - $winTotalActual += round($v['amount_player_2_times'] * 5,2); + $winTotalActual += round($v['amount_player_2_times'] * 4,2); $timesPlayer2 = $userInfo['price_5n']; }elseif($data['result_player_2'] == 12){ $winTotal += round($v['amount_player_2_times'] * $userInfo['price_bomb'],2); @@ -355,9 +355,9 @@ class OpeningNnService $rebate += round($v['amount_player_2_banker_times'] * 3); $rebatePlayer2 += round($v['amount_player_2_banker_times'] * 3); }elseif($data['result_player_2'] == 11){ - $winTotal -= round($v['amount_player_2_banker_times'] * 5,2); - $rebate += round($v['amount_player_2_banker_times'] * 5); - $rebatePlayer2 += round($v['amount_player_2_banker_times'] * 5); + $winTotal -= round($v['amount_player_2_banker_times'] * 4,2); + $rebate += round($v['amount_player_2_banker_times'] * 4); + $rebatePlayer2 += round($v['amount_player_2_banker_times'] * 4); }elseif($data['result_player_2'] == 12){ $winTotal -= round($v['amount_player_2_banker_times'] * 5,2); $rebate += round($v['amount_player_2_banker_times'] * 5); @@ -408,10 +408,10 @@ class OpeningNnService $rebate += $v['amount_player_2_times'] * 3; $rebatePlayer2 -= $v['amount_player_2_times'] * 3; }elseif($data['result_banker'] == 11){ - $winTotal -= $v['amount_player_2_times'] * 5; - $winTotalActual -= $v['amount_player_2_times'] * 5; - $rebate += $v['amount_player_2_times'] * 5; - $rebatePlayer2 -= $v['amount_player_2_times'] * 5; + $winTotal -= $v['amount_player_2_times'] * 4; + $winTotalActual -= $v['amount_player_2_times'] * 4; + $rebate += $v['amount_player_2_times'] * 4; + $rebatePlayer2 -= $v['amount_player_2_times'] * 4; }elseif($data['result_banker'] == 12){ $winTotal -= $v['amount_player_2_times'] * 5; $winTotalActual -= $v['amount_player_2_times'] * 5; @@ -441,7 +441,7 @@ class OpeningNnService $timesPlayer3 = $userInfo['price_nn']; }elseif($data['result_player_3'] == 11){ $winTotal += round($v['amount_player_3_times'] * $userInfo['price_5n'],2); - $winTotalActual += round($v['amount_player_3_times'] * 5,2); + $winTotalActual += round($v['amount_player_3_times'] * 4,2); $timesPlayer3 = $userInfo['price_5n']; }elseif($data['result_player_3'] == 12){ $winTotal += round($v['amount_player_3_times'] * $userInfo['price_bomb'],2); @@ -470,9 +470,9 @@ class OpeningNnService $rebate += round($v['amount_player_3_banker_times'] * 3); $rebatePlayer3 += round($v['amount_player_3_banker_times'] * 3); }elseif($data['result_player_3'] == 11){ - $winTotal -= round($v['amount_player_3_banker_times'] * 5,2); - $rebate += round($v['amount_player_3_banker_times'] * 5); - $rebatePlayer3 += round($v['amount_player_3_banker_times'] * 5); + $winTotal -= round($v['amount_player_3_banker_times'] * 4,2); + $rebate += round($v['amount_player_3_banker_times'] * 4); + $rebatePlayer3 += round($v['amount_player_3_banker_times'] * 4); }elseif($data['result_player_3'] == 12){ $winTotal -= round($v['amount_player_3_banker_times'] * 5,2); $rebate += round($v['amount_player_3_banker_times'] * 5); @@ -524,10 +524,10 @@ class OpeningNnService $rebate += $v['amount_player_3_times'] * 3; $rebatePlayer3 -= $v['amount_player_3_times'] * 3; }elseif($data['result_banker'] == 11){ - $winTotal -= $v['amount_player_3_times'] * 5; - $winTotalActual -= $v['amount_player_3_times'] * 5; - $rebate += $v['amount_player_3_times'] * 5; - $rebatePlayer3 -= $v['amount_player_3_times'] * 5; + $winTotal -= $v['amount_player_3_times'] * 4; + $winTotalActual -= $v['amount_player_3_times'] * 4; + $rebate += $v['amount_player_3_times'] * 4; + $rebatePlayer3 -= $v['amount_player_3_times'] * 4; }elseif($data['result_banker'] == 12){ $winTotal -= $v['amount_player_3_times'] * 5; $winTotalActual -= $v['amount_player_3_times'] * 5; diff --git a/freedom/.DS_Store b/freedom/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..e1f0acfde7df9fc063b23e5c7338c80ebd6f3ebd GIT binary patch literal 6148 zcmeHK%}T>S5Z<+|O({YS3Oz1(E!ZEih?fxS3mDOZN=-=7V9b^#v4>K~SzpK}@p+ut z-9U@Mqlle>-EVe&b~7Jje;8xj&BH!pHe<|!hR9K=5Hwf1c1$oLS97GnBAo@X3@WDi znA_t7)~Zd+$juyv)z?)b;1LIJ%ND4ock* zuA}KH;^T29vXZch$F+dFbzyR(K0ve)Yu+XTs4(RaujQ%