Explorar o código

fixed: 6810返回值中matches存在null的情况

gwang %!s(int64=5) %!d(string=hai) anos
pai
achega
c8b47f8e9b

+ 2 - 2
Gameserver/Amfphp/process/FightProc/PVPProc.php

@@ -296,7 +296,7 @@ class PVPProc {
             'fightTicket' => $pvp->fightTicket, #                               # 自己的挑战票
             'defTeam' => $pvp->defTeam, #                                       # 自己的防守队伍
             'bHasNewFightLog' => $numNewLog, #                                  # 是否有战报刷新
-            'matches' => $matches, #                                            # 对手列表
+            'matches' => my_null_default($matches, array()), #                  # 对手列表
         );
         return Resp::ok($ret);                                                  # 返回
     }
@@ -572,7 +572,7 @@ class PVPProc {
         $key = MemKey_GameRun::Game_PVPScoreByZoneSeason_zset($zoneid, $seasonID); # redis key
         $arr = self::findmatcher($key, $uid);                                   # 积分榜查找 
         if (count($arr) < self::matchCount) {                                   # 再不行, 准备机器人吧
-            CLog::err('PVP刷对手数量不足, 赶快考虑加入机器人.', 'PVP');    // todo: 这里引入gm对手数据,
+            CLog::err('PVP刷对手数量不足, 赶快考虑加入机器人.', 'PVP');           // todo: 这里引入gm对手数据,
         }
         $ret = self::GetPlayerInfosForPVP(gMem(), $zoneid, $arr);
         return $ret;

+ 10 - 6
Gameserver/nbproject/private/private.xml

@@ -12,15 +12,19 @@
     </editor-bookmarks>
     <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
         <group>
-            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/process/HeroProc.php</file>
-            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/base/CmdCode.php</file>
-            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/base/ErrCode.php</file>
+            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/model/Const/globalsettings.php</file>
+            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/Services/AppServer.php</file>
+            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/base/MemKey_User.php</file>
+            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/process/FightProc.php</file>
             <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/process/FightProc/PVPProc.php</file>
             <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/test.php</file>
+            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/base/ErrCode.php</file>
+            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/process/HeroProc.php</file>
+            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/util/CLog.php</file>
+            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/process/PreProc.php</file>
+            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/process/UserProc.php</file>
             <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/main.php</file>
-            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/model/Const/globalsettings.php</file>
-            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/process/FightProc.php</file>
-            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/base/MemKey_User.php</file>
+            <file>file:/E:/www/ylsj2019/Gameserver/Amfphp/Services/TestServer.php</file>
         </group>
     </open-files>
 </project-private>