diff --git a/webapp/controller/ActivityController.class.php b/webapp/controller/ActivityController.class.php index 89a18de..cf2ebda 100644 --- a/webapp/controller/ActivityController.class.php +++ b/webapp/controller/ActivityController.class.php @@ -336,9 +336,7 @@ class ActivityController{ $p_free = $this->getParameter(FREELOTTERY_TIME); $p_video = $this->getParameter(VIDEOLOTTERY_TIME); $costlist = $this->getParameter(LOTTERY_COST); - $free_times = $p_free['value']; - $video_times = $p_video['value']; - $left = $free_times + $video_times - $row['free_times'] - $row['video_times']; + $left = $p_free['value'] + $p_video['value'] - $row['free_times'] - $row['video_times']; if ($left < 1) { phpcommon\sendError(ERR_USER_BASE + 2, '没有这个玩家'); return; @@ -474,21 +472,6 @@ class ActivityController{ } } - //增加奖励 - $addreward = new classes\AddReward(); - $all_item_list = $addreward->addReward($item_id, $item_num, $account_id, $time, 0); - $coin_num = $addreward->getCoinNum($account_id); - $diamond_num = $addreward->getDiamondNum($account_id); - $item_list = array(); - $quest = new classes\Quest(); - $quest->triggerQuest(71004, 1, 1, $account_id); - $quest->flushHolidayQuest(72004, 1, $account_id); - array_push($item_list,array( - 'item_id' => $item_id, - 'item_num' => $item_num, - 'time' => $time - )); - if ($_REQUEST['type'] == 0) { $p_flush = $this->getParameter(FREELOTTERY_TIME); if ($p_flush['value'] <= $row['free_times']) { @@ -508,8 +491,7 @@ class ActivityController{ die(); return; } - } - if ($_REQUEST['type'] == 1) { + } else if ($_REQUEST['type'] == 1) { $p_flush = $this->getParameter(VIDEOLOTTERY_TIME); $now_days = $row['now_days']; if ($p_flush['value'] <= $row['video_times']) { @@ -540,8 +522,26 @@ class ActivityController{ die(); return; } + } else { + die(); + return; } + //增加奖励 + $addreward = new classes\AddReward(); + $all_item_list = $addreward->addReward($item_id, $item_num, $account_id, $time, 0); + $coin_num = $addreward->getCoinNum($account_id); + $diamond_num = $addreward->getDiamondNum($account_id); + $item_list = array(); + $quest = new classes\Quest(); + $quest->triggerQuest(71004, 1, 1, $account_id); + $quest->flushHolidayQuest(72004, 1, $account_id); + array_push($item_list,array( + 'item_id' => $item_id, + 'item_num' => $item_num, + 'time' => $time + )); + echo json_encode(array( 'errcode' => 0, 'errmsg'=> '',