hwj35
2025-10-14 d54d82c2dd0bb88650f0a3d8d436862a87f43d87
Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_Server
36个文件已修改
6个文件已添加
72542 ■■■■ 已修改文件
ServersRoute/Collections/CheckAndUpdateIndex.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ServersRoute/Common/CommFuncEx.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ServersRoute/Config/DBConfig.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ServersRoute/Config/ServersConfig.json 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServersRoute/Config/ServersConfig.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ServersRoute/DBCommon/CommonDefine.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ServersRoute/DBCommon/DBController.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ServersRoute/GMToolLogicProcess/Commands/GMT_OpenServer.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ServersRoute/GMToolLogicProcess/Commands/GMT_ReloadServersConfig.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ServersRoute/GMToolLogicProcess/ProjSpecialProcess.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ServersRoute/LogicProcess/UserCtrlDB.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ServersRoute/LogicProcessThread.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ServersRoute/MergeProxyClientMgr.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ServersRoute/MergeServer_ChildLogicProcess.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ServersRoute/MergeServer_LogicProcess.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ServersRoute/MergeServer_PackDispatch.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ServersRoute/Net/MongoDBServer.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ServersRoute/Net/MongoDBServerClient.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ServersRoute/NetCore/AsynServerClient.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ServersRoute/NetCore/AsyncoreClient.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ServersRoute/NetCore/AsyncoreServer.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ServersRoute/PegasusCollectorProxy.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ServersRoute/Protocol/MergeServerRecvProtocol.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ServersRoute/Protocol/MergeServerSendProtocol.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ServersRoute/Protocol/RecvPackProtocol.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ServersRoute/Protocol/SendPackProtocol.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ServersRoute/PyMongoDataServer.ini 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ServersRoute/ServerRouteClient.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ServersRoute/main.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/RouteServer/ChinRouteServer.exe 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/RouteServer/ChinRouteServer.map 72509 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/RouteServer/ChinRouteServer.tds 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/PyCrossServerPack.ini 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChServerToServerPyPack.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/CrossServerPackLogic.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NetPackCommon.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/DBCommon/CommonDefine.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/LogicProcess/UserCtrlDB.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/Protocol/MergeServerRecvProtocol.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/Protocol/RecvPackProtocol.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/Protocol/SendPackProtocol.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/RecvPackToMapDB.pyc 补丁 | 查看 | 原始文档 | blame | 历史
ServersRoute/Collections/CheckAndUpdateIndex.pyc
Binary files differ
ServersRoute/Common/CommFuncEx.pyc
Binary files differ
ServersRoute/Config/DBConfig.pyc
Binary files differ
ServersRoute/Config/ServersConfig.json
@@ -1 +1 @@
{3:[1,10010], 5:[99999,10010], 6:[99999,10120], 9006:[99999,10090]}
{3:["severname",10010, 0], 502:["severname",10010, 1], 503:["severname",10020, 2], 9006:["severname",10090, 0], 504:["severname2",10010, 0], 505:["severname2",10010, 1], 506:["severname2",10020, 2], 507:["severname2",10090, 0]}
ServersRoute/Config/ServersConfig.pyc
Binary files differ
ServersRoute/DBCommon/CommonDefine.pyc
Binary files differ
ServersRoute/DBCommon/DBController.pyc
Binary files differ
ServersRoute/GMToolLogicProcess/Commands/GMT_OpenServer.pyc
Binary files differ
ServersRoute/GMToolLogicProcess/Commands/GMT_ReloadServersConfig.pyc
Binary files differ
ServersRoute/GMToolLogicProcess/ProjSpecialProcess.pyc
Binary files differ
ServersRoute/LogicProcess/UserCtrlDB.pyc
Binary files differ
ServersRoute/LogicProcessThread.pyc
Binary files differ
ServersRoute/MergeProxyClientMgr.pyc
Binary files differ
ServersRoute/MergeServer_ChildLogicProcess.pyc
Binary files differ
ServersRoute/MergeServer_LogicProcess.pyc
Binary files differ
ServersRoute/MergeServer_PackDispatch.pyc
Binary files differ
ServersRoute/Net/MongoDBServer.pyc
Binary files differ
ServersRoute/Net/MongoDBServerClient.pyc
Binary files differ
ServersRoute/NetCore/AsynServerClient.pyc
Binary files differ
ServersRoute/NetCore/AsyncoreClient.pyc
Binary files differ
ServersRoute/NetCore/AsyncoreServer.pyc
Binary files differ
ServersRoute/PegasusCollectorProxy.pyc
Binary files differ
ServersRoute/Protocol/MergeServerRecvProtocol.pyc
Binary files differ
ServersRoute/Protocol/MergeServerSendProtocol.pyc
Binary files differ
ServersRoute/Protocol/RecvPackProtocol.pyc
Binary files differ
ServersRoute/Protocol/SendPackProtocol.pyc
Binary files differ
ServersRoute/PyMongoDataServer.ini
@@ -3,15 +3,16 @@
USER_DB_NAME=GameUser
[platform]
;GroupID 尽量不要存储,只是通信识别用
GroupID = 99999
;GroupName 尽量不要存储,只是通信识别用;相当于是对ServerRoute的命名
GroupName=severname
;跨服相关配置
[Merge]
;连接任意一台当作中转,可以所有跨服一起,也可以几个物理服一个跨服(按功能的最大跨服区配置)
MergeServerIP =
MergeServerPort = 16908
;信息转发中心,用于不同的ServerRoute间通信,取其中一台物理机当中心即可
[MsgHub]
;本机是否用于信息转发中心
IsMsgFowardHub = 0
MsgFowardHubIP = vm-kuafu1
MsgFowardHubPort = 16908
[EventReport]
;上报报错信息
ServersRoute/ServerRouteClient.pyc
Binary files differ
ServersRoute/main.pyc
Binary files differ
ZoneServerGroup/RouteServer/ChinRouteServer.exe
Binary files differ
ZoneServerGroup/RouteServer/ChinRouteServer.map
Diff too large
ZoneServerGroup/RouteServer/ChinRouteServer.tds
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/PyCrossServerPack.ini
New file
@@ -0,0 +1,16 @@
;RegType 为0表示是封包注册, 为1表示是类名注册(py类名不使用)
;服务器间的跨服包,既是发包也是收包
;跨服PY包注册
[CrossServerPackLogic]
ScriptName = CrossServerPackLogic.py
Writer = alee
Releaser = alee
RegType = 0
RegisterPackCount = 1
PacketCMD_1=0xC2
PacketSubCMD_1=0x01
PacketCallFunc_1=OnTest
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChServerToServerPyPack.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/CrossServerPackLogic.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NetPackCommon.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/DBCommon/CommonDefine.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/LogicProcess/UserCtrlDB.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/Protocol/MergeServerRecvProtocol.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/Protocol/RecvPackProtocol.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/Protocol/SendPackProtocol.pyc
Binary files differ
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyMongoDB/RecvPackToMapDB.pyc
Binary files differ