From be15b990ac94f5c24dfc8077e5dc62ce79236c43 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期六, 22 十二月 2018 18:09:05 +0800
Subject: [PATCH] 5424 【后端】【1.4】跨服竞技场开发(修复无法收到匹配请求bug,修改发送子服信息模式)

---
 ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py                   |    7 +++++--
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini                       |   12 ++++++------
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.py |    1 +
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py
index db3b4d1..9967705 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py
@@ -24,6 +24,7 @@
 import GMShell
 
 import traceback
+import json
 
 def SendMsgToCrossServer(msgType, dataMsg):
     ## 发送信息到跨服服务器上
@@ -95,8 +96,10 @@
         GameWorld.GetGameWorld().SendBroadcastMergeClient(sendMsg)
     else:
         serverGroupIDList = list(set(serverGroupIDList)) # 去重
-        for serverGroupID in serverGroupIDList:
-            GameWorld.GetGameWorld().SendMergeMsgToClientByGroupID(serverGroupID, sendMsg)
+        #for serverGroupID in serverGroupIDList:
+        #    GameWorld.GetGameWorld().SendMergeMsgToClientByGroupID(serverGroupID, sendMsg)
+        jsonGroupIDInfo = json.dumps(serverGroupIDList, ensure_ascii=False)
+        GameWorld.GetGameWorld().SendMergeMsgToClientByGroupList(jsonGroupIDInfo, sendMsg)
     return
 
 def OnClientServerReceiveMsg(index, tick):
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
index b0859b9..c9910a8 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
@@ -563,13 +563,13 @@
 PacketSubCMD_1=0x01
 PacketCallFunc_1=OnCrossRealmPKMatch
 
-PacketCMD_1=0xC1
-PacketSubCMD_1=0x02
-PacketCallFunc_1=OnCrossRealmPKBuy
+PacketCMD_2=0xC1
+PacketSubCMD_2=0x02
+PacketCallFunc_2=OnCrossRealmPKBuy
 
-PacketCMD_1=0xC1
-PacketSubCMD_1=0x03
-PacketCallFunc_1=OnCrossRealmPKGetAward
+PacketCMD_3=0xC1
+PacketSubCMD_3=0x03
+PacketCallFunc_3=OnCrossRealmPKGetAward
 
 ;跨服玩家
 [CrossRealmPlayer]
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.py
index a354518..813dc47 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.py
@@ -60,6 +60,7 @@
     requestType = clientData.Type
     
     if GameWorld.IsCrossServer():
+        GameWorld.DebugLog("跨服服务器无法发起匹配!")
         return
         
     if not IsCrossRealmPKOpen():

--
Gitblit v1.8.0