This commit is contained in:
hujiabin 2022-10-18 14:59:06 +08:00
parent 0dfee792a6
commit 34c303d1a4
3 changed files with 9 additions and 7 deletions

View File

@ -58,7 +58,7 @@ class Ranking(object):
'response': [ 'response': [
_common.RspHead(), _common.RspHead(),
['status', 0, '0:常规状态 1:引导初始排位 2:赛季初,需结算上个赛季'], ['status', 0, '0:常规状态 1:引导初始排位 2:赛季初,需结算上个赛季'],
['is_rank', 0, '赛季是否空挡期 1:是 0:不是'] ['is_rank', 0, '1:赛季开始了 0:赛季未开始']
] ]
}, },
{ {

View File

@ -4,6 +4,7 @@ require_once('models/User.php');
require_once('models/Season.php'); require_once('models/Season.php');
require_once('mt/RankActivity.php'); require_once('mt/RankActivity.php');
require_once('mt/RankSeason.php');
use phpcommon\SqlHelper; use phpcommon\SqlHelper;
@ -17,7 +18,7 @@ class RankingController extends BaseAuthedController {
$currSeasonMeta = mt\RankSeason::getCurrentSeason(); $currSeasonMeta = mt\RankSeason::getCurrentSeason();
if($currSeasonMeta){ if($currSeasonMeta){
$this->_setV(TN_RANK_STATUS, 1, 1); $this->_setV(TN_RANK_STATUS, 1, 1);
if ($currSeasonMeta['id'] != $userInfo['last_season_id']){ if ($userInfo['last_season_id'] > 0 && $currSeasonMeta['id'] != $userInfo['last_season_id'] ){
$this->_setV(TN_RANK_STATUS, 0, 2); $this->_setV(TN_RANK_STATUS, 0, 2);
} }
}else{ }else{
@ -114,7 +115,7 @@ class RankingController extends BaseAuthedController {
public function resetRankGainAward(){ public function resetRankGainAward(){
$userInfo = $this->_getOrmUserInfo(); $userInfo = $this->_getOrmUserInfo();
$currSeasonMeta = mt\RankSeason::getCurrentSeason(); $currSeasonMeta = mt\RankSeason::getCurrentSeason();
if ($currSeasonMeta && $currSeasonMeta['id'] > $userInfo['last_season_id']) { if ($currSeasonMeta && $userInfo['last_season_id'] > 0 && $currSeasonMeta['id'] > $userInfo['last_season_id']) {
$rank = $userInfo['rank']; $rank = $userInfo['rank'];
for ($i=$userInfo['last_season_id'];$i<$currSeasonMeta['id'];$i++){ for ($i=$userInfo['last_season_id'];$i<$currSeasonMeta['id'];$i++){
$currRankMeta = mt\Rank::getRankById($rank); $currRankMeta = mt\Rank::getRankById($rank);

View File

@ -9,6 +9,7 @@ require_once('models/Gun.php');
require_once('mt/Parameter.php'); require_once('mt/Parameter.php');
require_once('mt/Drop.php'); require_once('mt/Drop.php');
require_once('mt/Season.php'); require_once('mt/Season.php');
require_once('mt/RankSeason.php');
require_once('mt/Hero.php'); require_once('mt/Hero.php');
require_once('mt/Rank.php'); require_once('mt/Rank.php');
require_once('mt/Item.php'); require_once('mt/Item.php');
@ -678,10 +679,10 @@ class UserController extends BaseAuthedController {
private function createNewUserV2($userName){ private function createNewUserV2($userName){
$currSeasonMeta = mt\RankSeason::getCurrentSeason(); $currSeasonMeta = mt\RankSeason::getCurrentSeason();
if (!$currSeasonMeta){ // if (!$currSeasonMeta){
$time = $this->_getNowTime() + (86400*10); // $time = $this->_getNowTime() + (86400*10);
$currSeasonMeta = mt\RankSeason::getSeasonByTime($time); // $currSeasonMeta = mt\RankSeason::getSeasonByTime($time);
} // }
SqlHelper::upsert SqlHelper::upsert
($this->_getSelfMysql(), ($this->_getSelfMysql(),
't_user', 't_user',