This commit is contained in:
aozhiwei 2020-11-20 16:14:42 +08:00
parent fb099b0f73
commit b2916c51c2

View File

@ -338,7 +338,8 @@ class ActivityController{
$day = 1; $day = 1;
if (phpcommon\extractChannel($account_id) == 6001 || if (phpcommon\extractChannel($account_id) == 6001 ||
phpcommon\extractChannel($account_id) == 6000 || phpcommon\extractChannel($account_id) == 6000 ||
phpcommon\extractChannel($account_id) == 6006) { phpcommon\extractChannel($account_id) == 6006 ||
phpcommon\extractChannel($account_id) == 6007) {
$day = $row['now_days']; $day = $row['now_days'];
} }
$g_conf_lot_cluster = require('../res/lottery@lottery.php'); $g_conf_lot_cluster = require('../res/lottery@lottery.php');
@ -350,23 +351,23 @@ class ActivityController{
)); ));
} }
} }
for ($i1 = 0; $i1 < count($lot_array); $i1++) { // for ($i1 = 0; $i1 < count($lot_array); $i1++) {
$l = $this->getLottery($lot_array[$i1]['key']); // $l = $this->getLottery($lot_array[$i1]['key']);
$weight_sum += $l['jilv']; // $weight_sum += $l['jilv'];
} // }
$random = Rand(0, 100); //$random = Rand(0, 100);
if ($random >= 50) { //if ($random >= 50) {
$key = $lot_array[0]['key']; $key = $lot_array[0]['key'];
} else { // } else {
$key = $lot_array[1]['key']; // $key = $lot_array[1]['key'];
} // }
} else if ($row['free_times'] + $row['video_times'] + 1 == 6) { // } else if ($row['free_times'] + $row['video_times'] + 1 == 6) {
foreach ($user_db['draw_list'] as $draw) { // foreach ($user_db['draw_list'] as $draw) {
if (isset($draw['status']) && $draw['status'] != 0) { // if (isset($draw['status']) && $draw['status'] != 0) {
continue; // continue;
} // }
$key = $draw['key'] + 1; // $key = $draw['key'] + 1;
} // }
} else { } else {
foreach ($user_db['draw_list'] as $draw) { foreach ($user_db['draw_list'] as $draw) {
if (isset($draw['status']) && $draw['status'] != 0) { if (isset($draw['status']) && $draw['status'] != 0) {
@ -808,7 +809,8 @@ class ActivityController{
$day = 1; $day = 1;
if (phpcommon\extractChannel($account_id) == DOUYIN_CHANNEL || if (phpcommon\extractChannel($account_id) == DOUYIN_CHANNEL ||
phpcommon\extractChannel($account_id) == 6001 || phpcommon\extractChannel($account_id) == 6001 ||
phpcommon\extractChannel($account_id) == 6000) { phpcommon\extractChannel($account_id) == 6000 ||
phpcommon\extractChannel($account_id) == 6007) {
$day = date('w', time()); $day = date('w', time());
if ($day == 0) { if ($day == 0) {
$day = 7; $day = 7;
@ -1010,7 +1012,8 @@ class ActivityController{
$day = 1; $day = 1;
if ($type == 1) { if ($type == 1) {
if (phpcommon\extractChannel($accountid) == 6001 || if (phpcommon\extractChannel($accountid) == 6001 ||
phpcommon\extractChannel($accountid) == 6000) { phpcommon\extractChannel($accountid) == 6000 ||
phpcommon\extractChannel($accountid) == 6007) {
$day = $days; $day = $days;
} }
} }
@ -1077,7 +1080,8 @@ class ActivityController{
if ($type == 1) { if ($type == 1) {
if (phpcommon\extractChannel($accountid) == 6001 || if (phpcommon\extractChannel($accountid) == 6001 ||
phpcommon\extractChannel($accountid) == 6006 || phpcommon\extractChannel($accountid) == 6006 ||
phpcommon\extractChannel($accountid) == 6000) { phpcommon\extractChannel($accountid) == 6000 ||
phpcommon\extractChannel($accountid) == 6007) {
$day = date('w', time()); $day = date('w', time());
if ($day == 0) { if ($day == 0) {
$day = 7; $day = 7;