diff --git a/webapp/controller/QuestController.class.php b/webapp/controller/QuestController.class.php index 74abc6c..35d05cb 100644 --- a/webapp/controller/QuestController.class.php +++ b/webapp/controller/QuestController.class.php @@ -240,10 +240,11 @@ class QuestController{ phpcommon\sendError(ERR_USER_BASE + 2, '没有这个任务'); return; } - $array = $this->getExplode($q['reward']); - $reward_id = $array[0][0]; - $reward_num = $array[0][1]; - $addreward->addReward($reward_id, $reward_num, $account_id, 0, 0); + $re_array = $this->getExplode($q['reward']); + $reward_id = $re_array[0][0]; + $reward_num = $re_array[0][1]; + $reward_time = $re_array[0][2]; + $all_item_list = $addreward->addReward($reward_id, $reward_num, $account_id, $reward_time, 0); array_push($item_list, array( 'item_id' => $reward_id, 'item_num' => $reward_num, @@ -258,7 +259,8 @@ class QuestController{ 'errmsg' => '', 'item_list' => $item_list, 'coin_nums' => $coin_num, - 'diamond_nums' => $diamond_num + 'diamond_nums' => $diamond_num, + 'all_item_list' => $all_item_list )); } diff --git a/webapp/controller/ShopController.class.php b/webapp/controller/ShopController.class.php index 19353c8..3b6bb64 100644 --- a/webapp/controller/ShopController.class.php +++ b/webapp/controller/ShopController.class.php @@ -263,7 +263,6 @@ class ShopController{ } foreach($coin_shop as &$co) { if ($co['id'] == $randcoin_id && $co['status'] != 1) { - error_log($randcoin_id); $co['discount'] = $coin_discount; $co['price'] = round($co['price'] * $coin_discount / 10); }