From f47e3587c7a92e487300986380826cbba2683b19 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期一, 24 十二月 2018 17:56:08 +0800
Subject: [PATCH] 5368 【后端】【1.4】聚魂功能开发(报错修复)

---
 ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py |   60 +++++++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
index e79356d..2f5eb69 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/Player/PlayerQuery.py
@@ -60,6 +60,7 @@
 #import PlayerFamilyTech
 import MergeChildMsg
 import PlayerFamilyRedPacket
+import PlayerFBHelpBattle
 import PlayerFamilyStore
 import PlayerFamilySWRH
 import GameWorldProcess
@@ -73,6 +74,9 @@
 import PyGameData
 import PlayerTalk
 import PlayerStore
+import CrossRealmPlayer
+import CrossRealmMsg
+import CrossRealmPK
 
 import time
 import datetime
@@ -425,12 +429,14 @@
         PlayerCompensation.SendPersonalItemMailBatch(eval(resultName))
         return
     
-    if callName == 'SendMergerChildMsg':
-        operType, dataMsg = eval(resultName)
-        MergeChildMsg.SendMergerChildToCenterStringData(operType, dataMsg)
-        # 如果是恢复跨服PK连胜的，先记录恢复的玩家ID, 等待成功后同步最新结果给玩家
-        if operType == ChConfig.Def_RecoverMergePKWin:
-            GameWorldMergePK.Add_RecoverMergePKWinPlayer(srcPlayerID)
+    if callName == "SendMsgToCrossServer":
+        msgType, dataMsg = eval(resultName)
+        CrossRealmMsg.SendMsgToCrossServer(msgType, dataMsg)
+        return
+    
+    if callName == "SendMsgToClientServer":
+        msgType, dataMsg, serverGroupIDList = eval(resultName)
+        CrossRealmMsg.SendMsgToClientServer(msgType, dataMsg, serverGroupIDList)
         return
     
     if callName == 'MergeWorldNotify':
@@ -533,26 +539,36 @@
         return
 
     #跨服赛报名获得新账号
-    if callName == 'MergeRegister':
-        PlayerMergeRegister.MergeWarRegisterNewAcc(srcPlayerID, eval(resultName), tick)
-        return    
+    #if callName == 'MergeRegister':
+    #    PlayerMergeRegister.MergeWarRegisterNewAcc(srcPlayerID, eval(resultName), tick)
+    #    return    
     
     #跨服王者争霸
     if callName == 'MergeKingFB':
         GameWorldMergeKing.MapServer_MergeKingFB(eval(resultName))
         return
     
-    #跨服匹配PK
-    if callName == 'MergePKOver':
-        GameWorldMergePK.MapServer_MergePKOver(eval(resultName))
+    #跨服匹配PK战斗结算
+    if callName == "CrossPKOver":
+        CrossRealmPK.MapServer_MergePKOver(eval(resultName))
+        return
+    
+    #跨服匹配房间开启
+    if callName == "CrossPKRoomOpen":
+        CrossRealmPK.MapServer_CrossPKRoomOpen(eval(resultName))
         return
     
     #跨服匹配PK取消匹配
-    if callName == 'MergePKCancel':
+    if callName == "CrossRealmPKCancel":
         curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
         if not curPlayer:
             return
-        GameWorldMergePK.SendCancelMergePKMatch(curPlayer, resultName)
+        CrossRealmPK.SendCancelCrossRealmPKMatch(curPlayer, resultName)
+        return
+    
+    #跨服注册结果
+    if callName == "CrossRealmReg":
+        CrossRealmPlayer.OnCrossRealmRegOK(srcPlayerID, eval(resultName), tick)
         return
     
     #py喇叭聊天
@@ -781,7 +797,10 @@
         if not curPlayer:
             return
         ret = PlayerStore.DoStoreServerBuyQueryResult(curPlayer, eval(resultName))
-        resultName = '%s' % ret
+        if ret == None:
+            resultName = ''
+        else:
+            resultName = '%s' % ret
         
     #玩家等级奖励
     if callName == "GetPlayerLVAward":
@@ -840,6 +859,17 @@
 #        curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
 #        resultName = '%s' % PlayerFamilyTech.OnQuery_PlayerFamilyTechLVUP(curPlayer, eval(resultName))
     
+    
+    # 副本助战
+    if callName =="FBHelpBattle":
+        curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)
+        if not curPlayer:
+            return
+        ret = PlayerFBHelpBattle.MapServer_FBHelpBattle(curPlayer, eval(resultName))
+        if ret == None:
+            return
+        resultName = '%s' % ret
+        
     # 战盟仓库
     if callName == "FamilyStore":
         curPlayer = GameWorld.GetPlayerManager().FindPlayerByID(srcPlayerID)

--
Gitblit v1.8.0