diff --git a/webapp/controller/BaseAuthedController.class.php b/webapp/controller/BaseAuthedController.class.php index 0686f700..8c6bc5e3 100644 --- a/webapp/controller/BaseAuthedController.class.php +++ b/webapp/controller/BaseAuthedController.class.php @@ -219,12 +219,12 @@ class BaseAuthedController extends BaseController { break; case V_ITEM_ACTIVE: { - $addItem = max(0, mt\Parameter::getVal('activeness_limit', 0) - $this->_getV(TN_DAILY_ACTIVE, 0)); + $addItem = max(0, mt\Parameter::getVal('activeness_limit', 0) - $this->_getDailyV(TN_DAILY_ACTIVE, 0)); $addItem = min($addItem, $itemNum); if ($addItem > 0) { $this->_incV(TN_ACTIVE, 0, $itemNum); - $this->_incV(TN_DAILY_ACTIVE, 0, $itemNum); - $this->_incV(TN_WEEKLY_ACTIVE, 0, $itemNum); + $this->_incDailyV(TN_DAILY_ACTIVE, 0, $itemNum); + $this->_incWeeklyV(TN_WEEKLY_ACTIVE, 0, $itemNum); } } break; diff --git a/webapp/controller/MissionController.class.php b/webapp/controller/MissionController.class.php index f3746f26..8b7d4f7b 100644 --- a/webapp/controller/MissionController.class.php +++ b/webapp/controller/MissionController.class.php @@ -104,7 +104,7 @@ class MissionController extends BaseAuthedController { $specMissionDto['state'] == Mission::RECEIVEABLE_STATE; } $this->_rspData(array( - 'current_active_value' => $this->_getV(TN_DAILY_ACTIVE, 0), + 'current_active_value' => min($this->_getV(TN_ACTIVE, 0), mt\Parameter::getVal('max_activity', 0)), 'max_active_value' => mt\Parameter::getVal('max_activity', 0), 'mission_list1' => $missionDtoList1, 'mission_list2' => $missionDtoList2