diff --git a/webapp/controller/BaseAuthedController.class.php b/webapp/controller/BaseAuthedController.class.php index 3e6179d..6e140e2 100644 --- a/webapp/controller/BaseAuthedController.class.php +++ b/webapp/controller/BaseAuthedController.class.php @@ -332,15 +332,4 @@ 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/SeasonController.class.php b/webapp/controller/SeasonController.class.php index 8f65518..c66cc68 100644 --- a/webapp/controller/SeasonController.class.php +++ b/webapp/controller/SeasonController.class.php @@ -17,4 +17,8 @@ class SeasonController extends BaseAuthedController { { } + private function precheck($userInfo) + { + } + } diff --git a/webapp/controller/UserController.class.php b/webapp/controller/UserController.class.php index c454eb3..49170af 100644 --- a/webapp/controller/UserController.class.php +++ b/webapp/controller/UserController.class.php @@ -5,15 +5,12 @@ require_once('models/Hero.php'); require_once('mt/Parameter.php'); require_once('mt/Drop.php'); -require_once('mt/EquipUpgrade.php'); require_once('mt/Season.php'); -require_once('mt/SeasonPoint.php'); -require_once('mt/RankReward.php'); -require_once('mt/Equip.php'); require_once('mt/Hero.php'); require_once('mt/Rank.php'); require_once('services/PropertyChgService.php'); +require_once('services/SeasonService.php'); use phpcommon\SqlHelper; use models\User; @@ -43,15 +40,14 @@ class UserController extends BaseAuthedController { private function loginCheck($userInfo) { - if (!$this->_checkSeason()) { - return false; - } - return true; + $seasonService = new services\SeasonService(); + return $seasonService->checkSeason($userInfo); } private function createNewUser($userName, $avatarUrl) { - $rankMeta = mt\Rank::get(1); + $initRankMeta = mt\Rank::getInitRank(); + $currSeasonMeta = mt\Season::getCurrentSeason(); SqlHelper::upsert ($this->_getSelfMysql(), 't_user', @@ -70,10 +66,11 @@ class UserController extends BaseAuthedController { 'head_frame' => 19003, 'level' => 100, 'exp' => 0, - 'rank' => $rankMeta ? $rankMeta['rank'] : 0, - 'score' => $rankMeta ? $rankMeta['min_score'] : 0, + 'rank' => $initRankMeta ? $initRankMeta['rank'] : 0, + 'score' => $initRankMeta ? $initRankMeta['min_score'] : 0, 'head_id' => 18001, 'hero_id' => 30100, + 'last_season_id' => $currSeasonMeta ? $currSeasonMeta['id'] : 0, 'createtime' => $this->_getNowTime(), 'modifytime' => $this->_getNowTime(), ) diff --git a/webapp/mt/Rank.php b/webapp/mt/Rank.php index b939252..64190a0 100644 --- a/webapp/mt/Rank.php +++ b/webapp/mt/Rank.php @@ -11,6 +11,11 @@ class Rank { return getXVal(self::getMetaList(), $id); } + public static function getInitRank() + { + return self::get(1); + } + protected static function getMetaList() { if (!self::$metaList) { diff --git a/webapp/services/SeasonService.php b/webapp/services/SeasonService.php new file mode 100644 index 0000000..f302ab5 --- /dev/null +++ b/webapp/services/SeasonService.php @@ -0,0 +1,38 @@ +_updateUserInfo(array( + 'rank' => $dropRankMeta['rank'], + 'score' => $dropRankMeta['min_score'], + )); + } + } + if ($initRankMeta && $userInfo['rank'] < $initRankMeta['rank']) { + myself()->_updateUserInfo(array( + 'rank' => $initRankMeta['rank'], + 'score' => $initRankMeta['min_score'], + )); + return false; + } + return true; + } + +}