diff --git a/res b/res index 30fa1ce..23cc5eb 120000 --- a/res +++ b/res @@ -1 +1 @@ -config \ No newline at end of file +../conf_test/game2004api/webapp/config/6006 \ No newline at end of file diff --git a/webapp/controller/ActivityController.class.php b/webapp/controller/ActivityController.class.php index 5210cf3..4750e88 100644 --- a/webapp/controller/ActivityController.class.php +++ b/webapp/controller/ActivityController.class.php @@ -454,12 +454,18 @@ class ActivityController{ phpcommon\sendError(ERR_USER_BASE + 1,'session失效'); return; } - if ($row['free_times'] + $row['video_times'] + 1 == 5) { + $day = 1; + if (phpcommon\extractChannel($account_id) == DOUYIN_CHANNEL) { + $day = date('w', time()); + if ($day == 0) { + $day = 7; + } + } $g_conf_lot_cluster = require('../res/lottery@lottery.php'); for($g = 1; $g <= count($g_conf_lot_cluster); $g++) { $l = $this->getLottery($g); - if ($l['jilv'] == 0) { + if ($l['jilv'] == 0 && $l['day'] == $day) { array_push($lot_array, array( 'key' => $g )); @@ -651,7 +657,7 @@ class ActivityController{ $g_conf_lot_cluster = require('../res/lotterydraw@lotterydraw.php'); } $day = 1; - if ($type == 1 && phpcommon\extractChannel($accountid) == 6006) { + if ($type == 1 && phpcommon\extractChannel($accountid) == DOUYIN_CHANNEL) { $day = date('w', time()); if ($day == 0) { $day = 7;