diff --git a/webapp/bootstrap/constant.php b/webapp/bootstrap/constant.php index 7e22cfcb..8f38f857 100644 --- a/webapp/bootstrap/constant.php +++ b/webapp/bootstrap/constant.php @@ -29,6 +29,11 @@ define('TN_WEEKLY_RECHARGE_UPGRADE_TIMES', 10004); define('TN_WEEKLY_SHARE_GAMES', 10005); define('TN_WEEKLY_END', 10005); +define('TN_OFFER_REWARD_BEGIN', 11001); +define('TN_OFFER_REWARD_RECEIVE', 11002); +define('TN_OFFER_REWARD_REFRESH', 11003); +define('TN_OFFER_REWARD_END', 11005); + const kHAT_Begin = 0; const kHAT_Hp = 1; const kHAT_HPRecover = 2; diff --git a/webapp/controller/MissionController.class.php b/webapp/controller/MissionController.class.php index 33189460..892abaa3 100644 --- a/webapp/controller/MissionController.class.php +++ b/webapp/controller/MissionController.class.php @@ -64,7 +64,7 @@ class MissionController extends BaseAuthedController { public function missionList() { $type = getReqVal('type', 0); - $missionMetaList = mt\Task::getCustomTypeMetaList($type); + $missionMetaList = mt\Task::getCustomTypeMetaList($type, $this->missionService); $missionHash = Mission::allToHash(); $missionDtoList1 = array(); $missionDtoList2 = array(); @@ -156,7 +156,7 @@ class MissionController extends BaseAuthedController { public function commitAll() { $type = getReqVal('type', 0); - $missionMetaList = mt\Task::getCustomTypeMetaList($type); + $missionMetaList = mt\Task::getCustomTypeMetaList($type, $this->missionService); $missionHash = Mission::allToHash(); $missionDtoList = array(); $specMissionDto = null; diff --git a/webapp/mt/Task.php b/webapp/mt/Task.php index 099eca5c..b3566183 100644 --- a/webapp/mt/Task.php +++ b/webapp/mt/Task.php @@ -50,6 +50,7 @@ class Task { const T1OTAL_CREATE_OR_JOIN_GUILD_COUNT_COND = 43; //段位达到X且进行Y场比赛 const DAILY_ACTIVE_VALUE_COND = 44; //每日活跃度达到X const WEEKLY_ACTIVE_VALUE_COND = 45; //每周活跃度达到X + const OFFER_REWARD_COND = 46; const DAILY_MISSON_TYPE = 1; const ACHIEVEMENT_MISSON_TYPE = 2; @@ -75,7 +76,7 @@ class Task { return getXVal(self::getMetaList(), $id); } - public static function getCustomTypeMetaList($type) + public static function getCustomTypeMetaList($type, $missionService) { $metaList = array(); foreach (self::getMetaList() as $meta) {