From 7d0bf94563bceca5427b5e66179542432d30cb79 Mon Sep 17 00:00:00 2001 From: cehua_wcy <781813756@qq.com> Date: 星期六, 22 十二月 2018 18:14:27 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini | 12 ++++++------ ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc | 0 CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc | 0 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc index e4acd0b..95aeac1 100644 --- a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc +++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmMsg.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini index b0859b9..c9910a8 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini +++ b/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/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc index bbd5554..6f9a7fb 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc Binary files differ -- Gitblit v1.8.0