From c186c7ef2053e9bc978d36a97ca48e843f5aaceb Mon Sep 17 00:00:00 2001 From: hujiabin Date: Thu, 16 Mar 2023 20:42:19 +0800 Subject: [PATCH] 1 --- doc/Mission.py | 6 ++++-- webapp/controller/MissionController.class.php | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/doc/Mission.py b/doc/Mission.py index 98009358..bf7a5d32 100644 --- a/doc/Mission.py +++ b/doc/Mission.py @@ -17,8 +17,10 @@ class Mission(object): ], 'response': [ _common.RspHead(), - ['current_active_value', 0, '当前活跃度'], - ['max_active_value', 0, '活跃度上限'], + ['current_day_active_value', 0, '当前日活跃度'], + ['current_week_active_value', 0, '当前周活跃度'], + ['day_active_limit', 0, '每日活跃度上限'], + ['week_active_limit', 0, '每周活跃度上限'], ['!mission_list1', [_common.Mission()], '任务列表1'], ['!mission_list2', [_common.Mission()], '任务列表2'], ] diff --git a/webapp/controller/MissionController.class.php b/webapp/controller/MissionController.class.php index f5f31783..e411b115 100644 --- a/webapp/controller/MissionController.class.php +++ b/webapp/controller/MissionController.class.php @@ -102,8 +102,8 @@ class MissionController extends BaseAuthedController { // $specMissionDto['state'] = 9636; // } $this->_rspData(array( - 'current_active_value' => min($this->_getV(TN_ACTIVE, 0), mt\Parameter::getVal('max_activity', 0)), - 'max_active_value' => mt\Parameter::getVal('max_activity', 0), + 'current_day_active_value' => min($this->_getV(TN_DAILY_ACTIVE, 0), mt\Parameter::getVal('activeness_limit', 0)), + 'current_week_active_value' => min($this->_getV(TN_WEEKLY_ACTIVE, 0), mt\Parameter::getVal('max_weekly', 0)), 'day_active_limit' => mt\Parameter::getVal('activeness_limit', 0), 'week_active_limit' => mt\Parameter::getVal('max_weekly', 0), 'mission_list1' => $missionDtoList1,