gwang 5 лет назад
Родитель
Сommit
6cf801ee6d

+ 4 - 1
Gameserver/Amfphp/base/HashSaver.php

@@ -19,7 +19,10 @@ class HashSaver extends Object_ext {
      */
     function readDataFromMem($mem_key) {
         $ret = gMem()->hgetall($mem_key);                                       # 已JSON解析
-        my_Assert(null != $ret, ErrCode::err_mem);                              # 未找到数据
+        if (null == $ret) {
+            return $ret;
+        }
+//        my_Assert(null != $ret, ErrCode::err_mem);                              # 未找到数据
         $this->LoadFrom($ret);
         return $this;
     }

+ 1 - 0
Gameserver/Amfphp/model/User/UserGameModel.php

@@ -203,6 +203,7 @@ class UserGameModel extends HashSaver {
 //            $this->heroManual = new HeroManualModel();                          # 初始化图鉴数据结构
             $this->NewbieGuide = ObjectInit();                                  # 初始化新手引导结构
             $this->pvp = new UserPVPModel();                                    # 初始化pvp模块
+            $this->userSecretshop = new userSecretshopModel();                  # 神秘商店
         } else {                                                                # 实参
             parent::__construct($arg);                                          # 调用Object的构造函数
         }

+ 8 - 10
Gameserver/Amfphp/process/UserProc.php

@@ -500,17 +500,15 @@ class UserProc {
     public static function getUserInfo($mem, $zoneid, $uid) {
         $key = MemKey_User::Info_hash($zoneid, $uid);
         $a = new UserGameModel();
-        $a->readDataFromMem($key);
-//        $a = $mem->get(MemKey_User::Info_hash($zoneid, $uid));
-        if ($a) {
-            $usrInfo = new UserInfoMo();
-            $usrInfo->zoneid = $zoneid;
-            $usrInfo->uid = $uid;
-            $g = new UserGameModel($a);
-            $usrInfo->game = $g;
-            return $usrInfo;
+        if (null == $a->readDataFromMem($key)) {
+            return null;
         }
-        return null;
+        $usrInfo = new UserInfoMo();
+        $usrInfo->zoneid = $zoneid;
+        $usrInfo->uid = $uid;
+        $g = new UserGameModel($a);
+        $usrInfo->game = $g;
+        return $usrInfo;
     }
 
     /**

+ 2 - 9
Gameserver/nbproject/private/private.xml

@@ -14,19 +14,12 @@
         <group>
             <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/process/UserProc.php</file>
             <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/process/ActiveProc.php</file>
-            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/util/CRedisUtil.php</file>
             <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/model/User/UserInfoMo.php</file>
+            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/process/FightProc/PVPProc.php</file>
+            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/model/User/userSecretshopModel.php</file>
             <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/base/Object_ext.php</file>
             <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/base/HashSaver.php</file>
-            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/base/Include.php</file>
-            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/process/StoreProc.php</file>
             <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/model/User/UserGameModel.php</file>
-            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/model/User/StoreModel.php</file>
-            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/base/Req.php</file>
-            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/util/StlUtil.php</file>
-            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/process/SystemProc.php</file>
-            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/test.php</file>
-            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/main.php</file>
         </group>
     </open-files>
 </project-private>