From 34c303d1a406c8ee8e7be1e6a9e1f05d7d657355 Mon Sep 17 00:00:00 2001
From: hujiabin <hujiabin@kingsome.cn>
Date: Tue, 18 Oct 2022 14:59:06 +0800
Subject: [PATCH] 1

---
 doc/Ranking.py                                | 2 +-
 webapp/controller/RankingController.class.php | 5 +++--
 webapp/controller/UserController.class.php    | 9 +++++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/doc/Ranking.py b/doc/Ranking.py
index 20ba67c4..48c76264 100644
--- a/doc/Ranking.py
+++ b/doc/Ranking.py
@@ -58,7 +58,7 @@ class Ranking(object):
                 'response': [
                     _common.RspHead(),
                     ['status', 0, '0:常规状态  1:引导初始排位 2:赛季初,需结算上个赛季'],
-                    ['is_rank', 0, '赛季是否空挡期 1:是 0:不是']
+                    ['is_rank', 0, '1:赛季开始了 0:赛季未开始']
                 ]
             },
             {
diff --git a/webapp/controller/RankingController.class.php b/webapp/controller/RankingController.class.php
index 5e743874..d640a592 100644
--- a/webapp/controller/RankingController.class.php
+++ b/webapp/controller/RankingController.class.php
@@ -4,6 +4,7 @@ require_once('models/User.php');
 require_once('models/Season.php');
 
 require_once('mt/RankActivity.php');
+require_once('mt/RankSeason.php');
 
 use phpcommon\SqlHelper;
 
@@ -17,7 +18,7 @@ class RankingController extends BaseAuthedController {
         $currSeasonMeta = mt\RankSeason::getCurrentSeason();
         if($currSeasonMeta){
             $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);
             }
         }else{
@@ -114,7 +115,7 @@ class RankingController extends BaseAuthedController {
     public function resetRankGainAward(){
         $userInfo =  $this->_getOrmUserInfo();
         $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'];
             for ($i=$userInfo['last_season_id'];$i<$currSeasonMeta['id'];$i++){
                 $currRankMeta = mt\Rank::getRankById($rank);
diff --git a/webapp/controller/UserController.class.php b/webapp/controller/UserController.class.php
index 89b95780..63f2748d 100644
--- a/webapp/controller/UserController.class.php
+++ b/webapp/controller/UserController.class.php
@@ -9,6 +9,7 @@ require_once('models/Gun.php');
 require_once('mt/Parameter.php');
 require_once('mt/Drop.php');
 require_once('mt/Season.php');
+require_once('mt/RankSeason.php');
 require_once('mt/Hero.php');
 require_once('mt/Rank.php');
 require_once('mt/Item.php');
@@ -678,10 +679,10 @@ class UserController extends BaseAuthedController {
 
     private function createNewUserV2($userName){
         $currSeasonMeta = mt\RankSeason::getCurrentSeason();
-        if (!$currSeasonMeta){
-            $time = $this->_getNowTime() + (86400*10);
-            $currSeasonMeta = mt\RankSeason::getSeasonByTime($time);
-        }
+//        if (!$currSeasonMeta){
+//            $time = $this->_getNowTime() + (86400*10);
+//            $currSeasonMeta = mt\RankSeason::getSeasonByTime($time);
+//        }
         SqlHelper::upsert
         ($this->_getSelfMysql(),
             't_user',