From 46f144638c190038b339a9b555c3a254f6e8035b Mon Sep 17 00:00:00 2001 From: cehua_ZWJ <123456> Date: 星期三, 26 十二月 2018 19:17:59 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0 CoreServerGroup/GameServer/Script/ChConfig.pyc | 0 CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc | 0 CoreServerGroup/GameServer/Script/ShareDefine.pyc | 0 CoreServerGroup/GameServer/Script/Player/PlayerTeam.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc | 0 CoreServerGroup/GameServer/PyNetPack.ini | 6 +++++- CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossPKMatching.pyc | 0 CoreServerGroup/GameServer/Script/ChPyNetPack.pyc | 0 14 files changed, 5 insertions(+), 1 deletions(-) diff --git a/CoreServerGroup/GameServer/PyNetPack.ini b/CoreServerGroup/GameServer/PyNetPack.ini index 2e4db7a..1a5332b 100644 --- a/CoreServerGroup/GameServer/PyNetPack.ini +++ b/CoreServerGroup/GameServer/PyNetPack.ini @@ -331,12 +331,16 @@ Writer = hxp Releaser = hxp RegType = 0 -RegisterPackCount = 1 +RegisterPackCount = 2 PacketCMD_1=0xC0 PacketSubCMD_1=0x02 PacketCallFunc_1=OnViewCrossPlayerInfo +PacketCMD_2=0xC0 +PacketSubCMD_2=0x03 +PacketCallFunc_2=OnForceQuitCrossState + [PlayerXMZZ] ScriptName = Player\PlayerXMZZ.py Writer = xdh diff --git a/CoreServerGroup/GameServer/Script/ChConfig.pyc b/CoreServerGroup/GameServer/Script/ChConfig.pyc index f3e27e1..ed2eeab 100644 --- a/CoreServerGroup/GameServer/Script/ChConfig.pyc +++ b/CoreServerGroup/GameServer/Script/ChConfig.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc index 8934b26..e1085b4 100644 --- a/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc +++ b/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc index 33849f9..d91516a 100644 --- a/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc +++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/CrossRealmPK.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc b/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc index 297ea67..1c2948a 100644 --- a/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc +++ b/CoreServerGroup/GameServer/Script/Player/CrossRealmPlayer.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerTeam.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerTeam.pyc index 459a3a5..a7ff073 100644 --- a/CoreServerGroup/GameServer/Script/Player/PlayerTeam.pyc +++ b/CoreServerGroup/GameServer/Script/Player/PlayerTeam.pyc Binary files differ diff --git a/CoreServerGroup/GameServer/Script/ShareDefine.pyc b/CoreServerGroup/GameServer/Script/ShareDefine.pyc index 5b917d6..3b995e7 100644 --- a/CoreServerGroup/GameServer/Script/ShareDefine.pyc +++ b/CoreServerGroup/GameServer/Script/ShareDefine.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc index af3419f..5ec8b98 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/ChPyNetPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc index a0f566c..88416fc 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.pyc index 723204f..c12e019 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/CrossRealmPlayer.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc index 3cf6850..cfcdd87 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc index adc70d1..07f2ac4 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCrossRealmPK.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossPKMatching.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossPKMatching.pyc new file mode 100644 index 0000000..ac2f708 --- /dev/null +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_CrossPKMatching.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc index e72ac20..0bf2f3a 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc Binary files differ -- Gitblit v1.8.0