From 56d592174741fa999d41a6c62b1ca9a2fa448e02 Mon Sep 17 00:00:00 2001 From: cehua-TT <448191260@qq.com> Date: 星期二, 13 十一月 2018 21:51:42 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChGameToMapPyPack.pyc | 0 db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt | 1 + ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MagicWeapon.pyc | 0 CoreServerGroup/GameServer/Script/Player/PlayerTeam.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTeam.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc | 0 CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/GameServerPyPack.ini | 6 +++++- CoreServerGroup/GameServer/Script/ChGameToMapPyPack.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc | 0 12 files changed, 6 insertions(+), 1 deletions(-) diff --git a/CoreServerGroup/GameServer/Script/ChGameToMapPyPack.pyc b/CoreServerGroup/GameServer/Script/ChGameToMapPyPack.pyc index 1fa0726..1a15ca1 100644 --- a/CoreServerGroup/GameServer/Script/ChGameToMapPyPack.pyc +++ b/CoreServerGroup/GameServer/Script/ChGameToMapPyPack.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc index 1f12cc0..88359da 100644 --- a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc +++ b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerTeam.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerTeam.pyc index 1f12ce4..b232618 100644 --- a/CoreServerGroup/GameServer/Script/Player/PlayerTeam.pyc +++ b/CoreServerGroup/GameServer/Script/Player/PlayerTeam.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/GameServerPyPack.ini b/ZoneServerGroup/map1_8G/MapServer/MapServerData/GameServerPyPack.ini index 22de457..d8cdf01 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/GameServerPyPack.ini +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/GameServerPyPack.ini @@ -73,9 +73,13 @@ Writer = hxp Releaser = hxp RegType = 0 -RegisterPackCount = 1 +RegisterPackCount = 2 PacketCMD_1=0x05 PacketSubCMD_1=0x02 PacketCallFunc_1=GameServer_TeamInfo +PacketCMD_2=0x05 +PacketSubCMD_2=0x03 +PacketCallFunc_2=GameServer_PlayerLeaveTeam + diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc index a2fbd45..43fd860 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChGameToMapPyPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChGameToMapPyPack.pyc index 121573b..c7f5286 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChGameToMapPyPack.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChGameToMapPyPack.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc index ad2899c..a06ea3b 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MagicWeapon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MagicWeapon.pyc index 19931d2..2862abc 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MagicWeapon.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MagicWeapon.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc index cf04c14..b873c84 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc index 1f8a30d..645531c 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTeam.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTeam.pyc index a300168..41d9b93 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTeam.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTeam.pyc Binary files differ diff --git a/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt b/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt index 0afd8f7..8099973 100644 --- a/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt +++ b/db/PyMongoDataServer/PySysDB/tagVipPrivilege.txt @@ -30,3 +30,4 @@ 29 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 30 0 1 1 2 2 3 5 7 10 12 15 15 15 15 15 15 31 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +32 0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 -- Gitblit v1.8.0