代码整理

Gameserver/Amfphp/base/Req.php

@@ -49,9 +49,8 @@ class Req extends Object_ext {
 
     /**
      * 挂载玩家数据实体
-     * @var UserInfoMo
+     * @var Data_UserGame
      */
-    public $userInfo;
     public $game;
 
     /**
@@ -97,7 +96,7 @@ class Req extends Object_ext {
      */
     public function __toString() {
         $clone = clone $this;
-        unset($clone->userInfo);                                                # 删除不必要的字段
+//        unset($clone->userInfo);                                                # 删除不必要的字段
         unset($clone->userInfoChanged);                                         # 删除不必要的字段 
         $str = JsonUtil::encode($clone);                                        # json
         return $str;
@@ -122,12 +121,12 @@ class Req extends Object_ext {
 
     /**
      * 将要进行存储的数据
-     * @return UserInfoMo
+     * @return Req
      */
     public function storage() {
         $clone = clone $this;
         if (!$clone->userInfoChanged) {
-            unset($clone->userInfo);                                                # 删除不必要的字段
+            unset($clone->game);                                                # 删除不必要的字段
         }
         return (array) $clone;
     }

Gameserver/Amfphp/process/UserProc.php

@@ -381,7 +381,6 @@ class UserProc {
      * @return Resp
      */
     public static function loginUserInfo() {
-        $userInfo = UserProc::getUserInfo(req()->zoneid, req()->uid);           # 取玩家信息
         $game = UserProc::getUserGame(req()->zoneid, req()->uid);
         if ($game == null) {                                                # 新用户, -> 6006创建账号
             $ret = array(
@@ -389,8 +388,7 @@ class UserProc {
             );
             return Resp::ok($ret);
         } else {                                                                # 2.如果玩家已存在，则处理普通登录流程
-            req()->game = $game;
-            req()->userInfo = $userInfo;                                        # 给Req挂载userInfo
+            req()->game = $game;                                                # 给Req挂载玩家数据
             UserProc::checkContidays();                                         # 连续登录,状态检查
             PayProc::m_refreshChargeOrders();                                   # 刷新订单, 多平台版本
             PayProc::checkDeltest();                                            # 检查内侧充值记录(函数内部会只检查一次)
@@ -503,7 +501,7 @@ class UserProc {
         $game->baseInfo->headImg = $profile_img;
         $game->baseInfo->firstLogin = now();
         $userInfo = new UserInfoMo();
-        req()->userInfo = $userInfo;                                             # 更新Req的userinfo,
+//        req()->userInfo = $userInfo;                                             # 更新Req的userinfo,
         req()->game = $game;
 #Ps 6006是没有获得到Userinfo到Req中的
         UserProc::checkContidays(1);                                            # 每日状态检查
@@ -547,35 +545,7 @@ class UserProc {
 // <editor-fold defaultstate="collapsed" desc="读写玩家数据">
 
     /**
-     * 玩家数据
-     * @param type $zoneid
-     * @param type $uid
-     * @return UserInfoMo
-     */
-    public static function getUserInfo($zoneid, $uid) {
-        $key = MemKey_User::Info_hash($zoneid, $uid);
-        $a = new Data_UserGame();
-        if (null == $a->readDataFromMem($key)) {                                # ps.下面这一段代码和经常删号会有冲突,因此关闭了 --gwang 2022.2.28
-//            $collection = "ylsj2019.userInfoBack";
-//            $cursor = gMongo()->find($collection, ['key' => $key]);
-//            if ($cursor && $cursor->valid()) {
-//                foreach ($cursor as $v) {
-//                    $a->LoadFrom($v->value);                                    # 加载
-//                    $a->updateDataFull($key);                                   # 反向写回redis
-//                    break;                                                      # 其实是只有一条  
-//                }
-//            } else {
-            return null;
-//            }
-        }
-        $usrInfo = new UserInfoMo();
-        $g = new Data_UserGame($a);
-        $usrInfo->game = $g;
-        return $usrInfo;
-    }
-
-    /**
-     * 玩家数据
+     * 取玩家数据
      * @param type $zoneid
      * @param type $uid
      * @return Data_UserGame