diff --git a/.DS_Store b/.DS_Store index f18290b..91240f3 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/app/.DS_Store b/app/.DS_Store index 029c058..c5bcafc 100644 Binary files a/app/.DS_Store and b/app/.DS_Store differ diff --git a/app/services/.DS_Store b/app/services/.DS_Store index 3c16336..976f0c9 100644 Binary files a/app/services/.DS_Store and b/app/services/.DS_Store differ diff --git a/app/services/bet/ToBetNnService.php b/app/services/bet/ToBetNnService.php index 62351f7..9bf30c2 100644 --- a/app/services/bet/ToBetNnService.php +++ b/app/services/bet/ToBetNnService.php @@ -96,14 +96,16 @@ class ToBetNnService '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/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 0000000..e1f0acf Binary files /dev/null and b/freedom/.DS_Store differ