From ea4f0268501847eb74cee670288e6ec6c47a75e7 Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期一, 14 一月 2019 16:58:46 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 CoreServerGroup/GameServer/ServerCommScript.ini |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/CoreServerGroup/GameServer/ServerCommScript.ini b/CoreServerGroup/GameServer/ServerCommScript.ini
index 9ca368e..e4d2304 100644
--- a/CoreServerGroup/GameServer/ServerCommScript.ini
+++ b/CoreServerGroup/GameServer/ServerCommScript.ini
@@ -114,15 +114,19 @@
 PacketSubCMD_1=0x4
 PacketCallFunc_1=GetDGDBOperResultInfo
 
-[MergeBroadCast]
-ScriptName = Player\MergeBroadCastRecive.py
-Writer = wdb
-Releaser = wdb
+[CrossRealmMsg]
+ScriptName = GameWorldLogic\CrossRealmMsg.py
+Writer = hxp
+Releaser = hxp
 RegType = 0
-RegisterPackCount = 1
+RegisterPackCount = 2
 PacketCMD_1=0x4
 PacketSubCMD_1=0x5
-PacketCallFunc_1=OnMergeBroadCastPack
+PacketCallFunc_1=OnClientServerReceiveMsg
+
+PacketCMD_2=0x4
+PacketSubCMD_2=0x7
+PacketCallFunc_2=OnConnCorossServer
 
 ;家族
 [PlayerFamily]

--
Gitblit v1.8.0