diff --git a/webapp/controller/BaseAuthedController.class.php b/webapp/controller/BaseAuthedController.class.php index d569777b..3e6179df 100644 --- a/webapp/controller/BaseAuthedController.class.php +++ b/webapp/controller/BaseAuthedController.class.php @@ -18,9 +18,6 @@ class BaseAuthedController extends BaseController { { $this->accountId = $_REQUEST['account_id']; $this->sessionId = $_REQUEST['session_id']; - if ($_REQUEST['c'] == 'Role' && $_REQUEST['a'] == 'battleReport') { - return; - } if (!phpcommon\isValidSessionId($this->accountId, $this->sessionId)) { phpcommon\sendError(500, '无效的session_id'); @@ -335,4 +332,15 @@ class BaseAuthedController extends BaseController { DynData::decV($x, $y, $decVal); } + public function _checkSeason($userInfo, $initRankMeta, $currSeasonMeta) + { + #$rankMeta = mt\Rank::get(1); + if ($initRankMeta && $userInfo['rank'] < $initRankMeta['rank']) { + $this->_updateUserInfo(array( + 'rank' => $initRankMeta['rank'], + 'score' => $initRrankMeta['min_score'], + )); + } + } + } diff --git a/webapp/controller/UserController.class.php b/webapp/controller/UserController.class.php index cabb9d05..c454eb38 100644 --- a/webapp/controller/UserController.class.php +++ b/webapp/controller/UserController.class.php @@ -43,12 +43,8 @@ class UserController extends BaseAuthedController { private function loginCheck($userInfo) { - $rankMeta = mt\Rank::get(1); - if ($rankMeta && $userInfo['rank'] < $rankMeta['rank']) { - $this->updateUserInfo(array( - 'rank' => $rankMeta['rank'], - 'score' => $rankMeta['min_score'], - )); + if (!$this->_checkSeason()) { + return false; } return true; }