From 445c962196bd3495e541e6853458cb184bb6073b Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期一, 17 六月 2019 20:23:53 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 52 insertions(+), 4 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py
index 2440c9b..c6afb53 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py
@@ -20,12 +20,14 @@
import PlayerControl
import IPY_GameServer
import CrossRealmPlayer
+import PlayerCompensation
import GameWorldBoss
import CrossRealmPK
import PlayerQuery
import PlayerTalk
import CrossBoss
import ChConfig
+import PlayerFB
import GMShell
import traceback
@@ -90,8 +92,14 @@
elif msgType == ShareDefine.ClientServerMsg_QueryNPCInfo:
PlayerQuery.ClientServerMsg_QueryNPCInfo(serverGroupID, msgData)
+ elif msgType == ShareDefine.ClientServerMsg_EnterFB:
+ PlayerFB.ClientServerMsg_EnterFB(serverGroupID, msgData, tick)
+
elif msgType == ShareDefine.ClientServerMsg_SetPlayerAttrValue:
MapServer_CrossSetPlayerAttrValue(msgData)
+
+ elif msgType == ShareDefine.ClientServerMsg_AddBuff:
+ MapServer_CrossAddBuff(msgData)
# 需要发送到地图服务器处理的
elif msgType in [ShareDefine.ClientServerMsg_Reborn, ShareDefine.ClientServerMsg_CollectNPC]:
@@ -151,6 +159,20 @@
player.MapServer_QueryPlayerResult(0, 0, "CrossSetPlayerAttrValue", msgInfo, len(msgInfo))
return
+def MapServer_CrossAddBuff(msgData):
+ ## 收到子服信息，添加buff
+ tagPlayerID = msgData.get("PlayerID")
+ if not tagPlayerID:
+ return
+ tagPlayer = GameWorld.GetPlayerManager().FindPlayerByID(tagPlayerID)
+ if not tagPlayer:
+ return
+ buffID = msgData.get("buffID")
+ if not buffID:
+ return
+ sendMsg = str(buffID)
+ tagPlayer.MapServer_QueryPlayerResult(0, 0, 'AddBuff', sendMsg, len(sendMsg))
+ return
## ================================================================================================
def SendMsgToClientServer(msgType, dataMsg, serverGroupIDList=[]):
@@ -170,13 +192,13 @@
return
GameWorld.Log("SendMsgToClientServer => serverGroupIDList=%s, srcMsg=%s" % (serverGroupIDList, srcMsg))
if not serverGroupIDList:
- GameWorld.GetGameWorld().SendBroadcastMergeClient(sendMsg)
+ GameWorld.GetGameWorld().SendBroadcastMergeClient(sendMsg, len(sendMsg))
else:
serverGroupIDList = list(set(serverGroupIDList)) # 去重
#for serverGroupID in serverGroupIDList:
- # GameWorld.GetGameWorld().SendMergeMsgToClientByGroupID(serverGroupID, sendMsg)
+ # GameWorld.GetGameWorld().SendMergeMsgToClientByGroupID(serverGroupID, sendMsg, len(sendMsg))
jsonGroupIDInfo = cPickle.dumps(serverGroupIDList, 2)
- GameWorld.GetGameWorld().SendMergeMsgToClientByGroupList(jsonGroupIDInfo, sendMsg)
+ GameWorld.GetGameWorld().SendMergeMsgToClientByGroupList(jsonGroupIDInfo, len(jsonGroupIDInfo), sendMsg, len(sendMsg))
return
def OnClientServerReceiveMsg(index, tick):
@@ -246,8 +268,18 @@
elif msgType == ShareDefine.CrossServerMsg_NPCInfoRet:
PlayerQuery.CrossServerMsg_NPCInfoRet(msgData, tick)
+ elif msgType == ShareDefine.CrossServerMsg_EnterFBRet:
+ PlayerFB.CrossServerMsg_EnterFBRet(msgData, tick)
+
+ elif msgType == ShareDefine.CrossServerMsg_SendMail:
+ PlayerCompensation.CrossServerMsg_SendMail(msgData)
+
+ elif msgType == ShareDefine.CrossServerMsg_FBPlayerCount:
+ PlayerFB.CrossServerMsg_FBPlayerCount(msgData)
+
# 需要发送到地图服务器处理的
- elif msgType in [ShareDefine.CrossServerMsg_RebornRet, ShareDefine.CrossServerMsg_CollectNPCOK]:
+ elif msgType in [ShareDefine.CrossServerMsg_RebornRet, ShareDefine.CrossServerMsg_CollectNPCOK, ShareDefine.CrossServerMsg_FBEnd,
+ ShareDefine.CrossServerMsg_NPCAttackCount]:
MapServer_ClientServerReceiveMsg(msgType, msgData)
elif msgType == ShareDefine.CrossServerMsg_CrossServerState:
@@ -266,6 +298,22 @@
def MapServer_ClientServerReceiveMsg(msgType, msgData):
## 收到跨服服务器信息，需要发送到地图服务器处理
+ if msgType in [ShareDefine.CrossServerMsg_FBEnd]:
+ curServerGroupID = GameWorld.GetServerGroupID()
+ for tagPlayerID, msgInfo in msgData.items():
+ if not msgInfo:
+ continue
+ serverGroupID = msgInfo[0]
+ if curServerGroupID != serverGroupID:
+ continue
+ tagPlayer = GameWorld.GetPlayerManager().FindPlayerByID(tagPlayerID)
+ if not tagPlayer:
+ continue
+ msgInfo = str([msgType, msgInfo[1:]])
+ tagPlayer.MapServer_QueryPlayerResult(0, 0, "ClientServerReceiveMsg", msgInfo, len(msgInfo))
+
+ return
+
if not isinstance(msgData, dict):
return
tagPlayerID = msgData.get("PlayerID")
--
Gitblit v1.8.0