From 794d31c3d9615701ef8f04a199417737ddf60bd7 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期五, 11 一月 2019 09:59:57 +0800
Subject: [PATCH] 5762 子 【开发】【1.5】新增300级后的成长基金 / 【后端】【1.5】新增300级后的成长基金

---
 ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py |   61 +++++++++++++++++++++++++++++-
 1 files changed, 58 insertions(+), 3 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py
index 2acf04c..f0c731d 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py
@@ -20,7 +20,9 @@
 import PlayerControl
 import IPY_GameServer
 import CrossRealmPlayer
+import GameWorldBoss
 import CrossRealmPK
+import CrossBoss
 import ChConfig
 import GMShell
 
@@ -41,13 +43,13 @@
 def OnCrossServerReceiveMsg(recvMsg, tick):
     ## 跨服服务器收到信息处理
     try:
-        GameWorld.Log("OnCrossServerReceiveMsg: %s" % recvMsg)
+        #GameWorld.Log("OnCrossServerReceiveMsg: %s" % recvMsg)
         msgDict = eval(recvMsg)
         
         msgType = msgDict.get("MsgType", -1)    
         msgData = msgDict.get("Data", "")
         serverGroupID = msgDict.get("ServerGroupID", 0)
-            
+        
         if msgType == ShareDefine.ClientServerMsg_PKMatch:
             CrossRealmPK.ClientServerMsg_PKMatch(serverGroupID, msgData, tick)
             
@@ -69,6 +71,10 @@
         elif msgType == ShareDefine.ClientServerMsg_ViewPlayerCache:
             CrossRealmPlayer.ClientServerMsg_ViewPlayerCache(serverGroupID, msgData)
             
+        # 需要发送到地图服务器处理的
+        elif msgType in [ShareDefine.ClientServerMsg_Reborn]:
+            MapServer_CrossServerReceiveMsg(msgType, msgData, serverGroupID)
+            
         else:
             GameWorld.ErrLog("没有该信息类型逻辑处理！")
             
@@ -85,6 +91,22 @@
     GameWorld.Log("收到跨服子服连接成功通知!")
     CrossRealmPlayer.ClientServerMsg_ServerInitOK(serverGroupID)
     CrossRealmPK.ClientServerMsg_ServerInitOK(serverGroupID, tick)
+    CrossBoss.ClientServerMsg_ServerInitOK(serverGroupID)
+    return
+
+def MapServer_CrossServerReceiveMsg(msgType, msgData, serverGroupID):
+    ## 收到子服信息，需要发送到地图服务器处理
+    
+    if not isinstance(msgData, dict):
+        return
+    tagPlayerID = msgData.get("PlayerID")
+    if not tagPlayerID:
+        return
+    tagPlayer = GameWorld.GetPlayerManager().FindPlayerByID(tagPlayerID)
+    if not tagPlayer:
+        return
+    msgInfo = str([msgType, msgData, serverGroupID])
+    tagPlayer.MapServer_QueryPlayerResult(0, 0, "CrossServerReceiveMsg", msgInfo, len(msgInfo))
     return
 
 ## ================================================================================================
@@ -114,7 +136,7 @@
     ## 子服收到跨服服务器信息
     dataPack = IPY_GameServer.IPY_MGBroadcastMergeClient()
     dataMsg = dataPack.GetData()
-    GameWorld.Log("OnClientServerReceiveMsg: %s" % dataMsg)
+    #GameWorld.Log("OnClientServerReceiveMsg: %s" % dataMsg)
     
     try:
         msgDict = eval(dataMsg)
@@ -151,6 +173,25 @@
         elif msgType == ShareDefine.CrossServerMsg_PKSyncBillboard:
             CrossRealmPK.CrossServerMsg_PKSyncBillboard(msgData)
             
+        elif msgType == ShareDefine.CrossServerMsg_CrossBossInfo:
+            CrossBoss.CrossServerMsg_CrossBossInfo(msgData)
+            
+        elif msgType == ShareDefine.CrossServerMsg_CrossBossState:
+            CrossBoss.CrossServerMsg_CrossBossState(msgData)
+            
+        elif msgType == ShareDefine.CrossServerMsg_PutInItem:
+            CrossRealmPlayer.CrossServerMsg_PutInItem(msgData)
+            
+        elif msgType == ShareDefine.CrossServerMsg_GiveMoney:
+            CrossRealmPlayer.CrossServerMsg_GiveMoney(msgData)
+            
+        elif msgType == ShareDefine.CrossServerMsg_DropGoodItem:
+            GameWorldBoss.CrossServerMsg_DropGoodItem(msgData, tick)
+            
+        # 需要发送到地图服务器处理的
+        elif msgType in [ShareDefine.CrossServerMsg_RebornRet]:
+            MapServer_ClientServerReceiveMsg(msgType, msgData)
+            
         elif msgType == ShareDefine.CrossServerMsg_CrossServerState:
             CrossRealmPlayer.CrossServerMsg_CrossServerState(msgData)
             
@@ -164,6 +205,20 @@
         
     return
 
+def MapServer_ClientServerReceiveMsg(msgType, msgData):
+    ## 收到跨服服务器信息，需要发送到地图服务器处理
+    
+    if not isinstance(msgData, dict):
+        return
+    tagPlayerID = msgData.get("PlayerID")
+    if not tagPlayerID:
+        return
+    tagPlayer = GameWorld.GetPlayerManager().FindPlayerByID(tagPlayerID)
+    if not tagPlayer:
+        return
+    msgInfo = str([msgType, msgData])
+    tagPlayer.MapServer_QueryPlayerResult(0, 0, "ClientServerReceiveMsg", msgInfo, len(msgInfo))
+    return
 
 # 连接跨服服务器状态
 # 1 为连接成功; 其他为失败，失败会延迟通知

--
Gitblit v1.8.0