From 7d6b028c24c2e90109f118eb3008b655e9b063b8 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 25 十二月 2018 14:26:34 +0800
Subject: [PATCH] 5512 子 【开发】【1.4】跨服竞技场 / 【后端】【1.4】跨服竞技场开发 -- 链接跨服状态通知gameserver
---
ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py | 12 ++++++++++++
ServerPython/CoreServerGroup/GameServer/Script/IPY_ServerDefine.py | 1 +
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IPY_ServerDefine.py | 1 +
ServerPython/CoreServerGroup/GameServer/ServerCommScript.ini | 6 +++++-
ServerPython/CoreServerGroup/GameServer/Script/IPY_MapServerToGameServer.py | 20 ++++++++++++++++++++
5 files changed, 39 insertions(+), 1 deletions(-)
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py
index 9967705..b5b217c 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.py
@@ -144,3 +144,15 @@
return
+
+# 连接跨服服务器状态
+# 1 为连接成功; 其他为失败，失败会延迟通知
+def OnConnCorossServer(index, tick):
+ ## 子服收到跨服服务器信息
+ dataPack = IPY_GameServer.IPY_LGCrossLoginResult()
+ result = dataPack.GetResult()
+ if result == 1:
+ GameWorld.Log("OnConnCorossServer conn success!!!")
+ else:
+ GameWorld.Log("--OnClientServerReceiveMsg disconn")
+
\ No newline at end of file
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/IPY_MapServerToGameServer.py b/ServerPython/CoreServerGroup/GameServer/Script/IPY_MapServerToGameServer.py
index 21db375..3e1a87a 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/IPY_MapServerToGameServer.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/IPY_MapServerToGameServer.py
@@ -940,6 +940,26 @@
IPY_MGMergerChildToCenter_swigregister(IPY_MGMergerChildToCenter)
+def GettagLGCrossLoginResult():
+ return _IPY_MapServerToGameServer.GettagLGCrossLoginResult()
+GettagLGCrossLoginResult = _IPY_MapServerToGameServer.GettagLGCrossLoginResult
+class IPY_LGCrossLoginResult(_object):
+ __swig_setmethods__ = {}
+ __setattr__ = lambda self, name, value: _swig_setattr(self, IPY_LGCrossLoginResult, name, value)
+ __swig_getmethods__ = {}
+ __getattr__ = lambda self, name: _swig_getattr(self, IPY_LGCrossLoginResult, name)
+ __repr__ = _swig_repr
+ def GetResult(self): return _IPY_MapServerToGameServer.IPY_LGCrossLoginResult_GetResult(self)
+ def __init__(self):
+ this = _IPY_MapServerToGameServer.new_IPY_LGCrossLoginResult()
+ try: self.this.append(this)
+ except: self.this = this
+ __swig_destroy__ = _IPY_MapServerToGameServer.delete_IPY_LGCrossLoginResult
+ __del__ = lambda self : None;
+IPY_LGCrossLoginResult_swigregister = _IPY_MapServerToGameServer.IPY_LGCrossLoginResult_swigregister
+IPY_LGCrossLoginResult_swigregister(IPY_LGCrossLoginResult)
+
+
def GettagGCalcFamilyWarResult():
return _IPY_MapServerToGameServer.GettagGCalcFamilyWarResult()
GettagGCalcFamilyWarResult = _IPY_MapServerToGameServer.GettagGCalcFamilyWarResult
diff --git a/ServerPython/CoreServerGroup/GameServer/Script/IPY_ServerDefine.py b/ServerPython/CoreServerGroup/GameServer/Script/IPY_ServerDefine.py
index cb878e0..15a1946 100644
--- a/ServerPython/CoreServerGroup/GameServer/Script/IPY_ServerDefine.py
+++ b/ServerPython/CoreServerGroup/GameServer/Script/IPY_ServerDefine.py
@@ -284,6 +284,7 @@
dgMergeQueryNewAccount = _IPY_ServerDefine.dgMergeQueryNewAccount
dgBroadcastMergeClient = _IPY_ServerDefine.dgBroadcastMergeClient
dgMergerChildToCenter = _IPY_ServerDefine.dgMergerChildToCenter
+dgLoginMergeServer = _IPY_ServerDefine.dgLoginMergeServer
gmMapInitOk = _IPY_ServerDefine.gmMapInitOk
gmPlayerInit = _IPY_ServerDefine.gmPlayerInit
gmPlayerLogout = _IPY_ServerDefine.gmPlayerLogout
diff --git a/ServerPython/CoreServerGroup/GameServer/ServerCommScript.ini b/ServerPython/CoreServerGroup/GameServer/ServerCommScript.ini
index dba229f..e4d2304 100644
--- a/ServerPython/CoreServerGroup/GameServer/ServerCommScript.ini
+++ b/ServerPython/CoreServerGroup/GameServer/ServerCommScript.ini
@@ -119,11 +119,15 @@
Writer = hxp
Releaser = hxp
RegType = 0
-RegisterPackCount = 1
+RegisterPackCount = 2
PacketCMD_1=0x4
PacketSubCMD_1=0x5
PacketCallFunc_1=OnClientServerReceiveMsg
+PacketCMD_2=0x4
+PacketSubCMD_2=0x7
+PacketCallFunc_2=OnConnCorossServer
+
;家族
[PlayerFamily]
ScriptName = Player\PlayerFamily.py
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IPY_ServerDefine.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IPY_ServerDefine.py
index e8aadc5..d6b3247 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IPY_ServerDefine.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IPY_ServerDefine.py
@@ -285,6 +285,7 @@
dgMergeQueryNewAccount = _IPY_ServerDefine.dgMergeQueryNewAccount
dgBroadcastMergeClient = _IPY_ServerDefine.dgBroadcastMergeClient
dgMergerChildToCenter = _IPY_ServerDefine.dgMergerChildToCenter
+dgLoginMergeServer = _IPY_ServerDefine.dgLoginMergeServer
gmMapInitOk = _IPY_ServerDefine.gmMapInitOk
gmPlayerInit = _IPY_ServerDefine.gmPlayerInit
gmPlayerLogout = _IPY_ServerDefine.gmPlayerLogout
--
Gitblit v1.8.0