diff --git a/webapp/controller/ActivityController.class.php b/webapp/controller/ActivityController.class.php index f875948..405e6d5 100644 --- a/webapp/controller/ActivityController.class.php +++ b/webapp/controller/ActivityController.class.php @@ -315,12 +315,8 @@ class ActivityController{ return; } if ($row['free_times'] + $row['video_times'] + 1 == 6) { - $day = 1; - if (phpcommon\extractChannel($account_id) == 6001 || - phpcommon\extractChannel($account_id) == 6000 || - phpcommon\extractChannel($account_id) == 6006) { - $day = $row['now_days']; - } + //$day = 1; + $day = $row['now_days']; $g_conf_lot_cluster = require('../res/lottery@lottery.php'); for($g = 1; $g <= count($g_conf_lot_cluster); $g++) { $l = $this->getLottery($g); @@ -331,14 +327,6 @@ class ActivityController{ } } $key = $lot_array[0]['key']; - - // } else if ($row['free_times'] + $row['video_times'] + 1 == 6) { - // foreach ($user_db['draw_list'] as $draw) { - // if (isset($draw['status']) && $draw['status'] != 0) { - // continue; - // } - // $key = $draw['key'] + 1; - // } } else { foreach ($user_db['draw_list'] as $draw) { if (isset($draw['status']) && $draw['status'] != 0) { @@ -677,10 +665,7 @@ class ActivityController{ $day = 1; if ($type == 1) { - if (phpcommon\extractChannel($accountid) == 6001 || - phpcommon\extractChannel($accountid) == 6000) { - $day = $days; - } + $day = $days; } for ($i = 1; $i <= count($g_conf_lot_cluster); $i++) { $item_id = 0; diff --git a/webapp/controller/FriendController.class.php b/webapp/controller/FriendController.class.php index da7676f..6630f54 100644 --- a/webapp/controller/FriendController.class.php +++ b/webapp/controller/FriendController.class.php @@ -199,7 +199,7 @@ class FriendController{ $robot_meta = getRobotConfig($robot_meta_cluster, $robot_id); if ($robot_meta['name'] == $user_name) { $flag = 1; - $accountid = '6000_2004_robot' . $i; + $accountid = '6511_2005_robot' . $i; break; } }