From bc6e664d0909c97256b332de256be57f4450ba62 Mon Sep 17 00:00:00 2001
From: hujiabin <hujiabin@kingsome.cn>
Date: Wed, 19 Oct 2022 13:29:23 +0800
Subject: [PATCH] 1

---
 doc/User.py                                |  2 +-
 webapp/controller/UserController.class.php | 38 +++++++++++-----------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/doc/User.py b/doc/User.py
index b5284818..565ad438 100644
--- a/doc/User.py
+++ b/doc/User.py
@@ -142,7 +142,7 @@ class User(object):
                 'url': 'webapp/index.php?c=User&a=selectFreeItem',
                 'params': [
                     _common.ReqHead(),
-                    ['hero_id', '', '英雄 item id']
+                    ['hero_id', '', '英雄 item id'],
                     ['gun_id', '', '枪械 item id']
                 ],
                 'response': [
diff --git a/webapp/controller/UserController.class.php b/webapp/controller/UserController.class.php
index 78dbadfc..58e17685 100644
--- a/webapp/controller/UserController.class.php
+++ b/webapp/controller/UserController.class.php
@@ -42,23 +42,23 @@ class UserController extends BaseAuthedController {
 
         $userInfo = $this->_safeGetOrmUserInfo();
 
-//        if (SERVER_ENV == _ONLINE) {
-//            //测试服
-//            if (!$userInfo) {
-//                $this->createNewUserV2($userName);
-//                $this->addChip();           //测试需要,上线要删除
-//                $this->addFragmentBox();           //测试需要,上线要删除
-//                $userInfo = $this->_getOrmUserInfo();
-//                $this->_setV(TN_RANK_STATUS, 0, 1);
-//            }
-//            //elo 衰减
-//            $this->checkElo($userInfo);
-//            $userInfo = $this->_getOrmUserInfo();
-//            //跟新登录时间
-//            $this->_updateUserInfo(array(
-//                'last_login_time'=>myself()->_getNowTime(),
-//            ));
-//        }else{
+        if (SERVER_ENV == _ONLINE) {
+            //测试服
+            if (!$userInfo) {
+                $this->createNewUserV2($userName);
+                $this->addChip();           //测试需要,上线要删除
+                $this->addFragmentBox();           //测试需要,上线要删除
+                $userInfo = $this->_getOrmUserInfo();
+                $this->_setV(TN_RANK_STATUS, 0, 1);
+            }
+            //elo 衰减
+            $this->checkElo($userInfo);
+            $userInfo = $this->_getOrmUserInfo();
+            //跟新登录时间
+            $this->_updateUserInfo(array(
+                'last_login_time'=>myself()->_getNowTime(),
+            ));
+        }else{
             if (!$userInfo) {
                 $this->createNewUser($userName, $avatarUrl);
                 $this->addChip();           //测试需要,上线要删除
@@ -69,8 +69,8 @@ class UserController extends BaseAuthedController {
             if (!$this->loginCheck($userInfo)) {
                 $userInfo = $this->_getOrmUserInfo();
             }
-//        }
-//        $this->updateLastSeason($userInfo);
+        }
+        $this->updateLastSeason($userInfo);
         $this->_rspData(array(
             'info' => User::show($userInfo)
         ));