From 36097b4c83dc539122e2b6f3ffe17dd7ddfeb569 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期一, 28 一月 2019 21:22:29 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 CoreServerGroup/GameServer/PyNetPack.ini |   56 ++++++++++++++++++++++++++------------------------------
 1 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/CoreServerGroup/GameServer/PyNetPack.ini b/CoreServerGroup/GameServer/PyNetPack.ini
index 6317eef..1a5332b 100644
--- a/CoreServerGroup/GameServer/PyNetPack.ini
+++ b/CoreServerGroup/GameServer/PyNetPack.ini
@@ -148,36 +148,6 @@
 PacketSubCMD_2=0x08
 PacketCallFunc_2=QueryFamilyActionInfo
 
-
-;跨服报名(上传数据)
-[MergeRegister]
-ScriptName = Player\PlayerMergeRegister.py
-Writer = hxp
-Releaser = hxp
-RegType = 0
-RegisterPackCount = 2
-
-PacketCMD_1=0xC0
-PacketSubCMD_1=0x11
-PacketCallFunc_1=MergeWarRegisterPack
-
-PacketCMD_2=0xC0
-PacketSubCMD_2=0x12
-PacketCallFunc_2=MergeWarAccQueryPack
-
-;跨服玩家
-[MergePlayer]
-ScriptName = Player\MergePlayer.py
-Writer = hxp
-Releaser = hxp
-RegType = 0
-RegisterPackCount = 1
-
-PacketCMD_1=0xC0
-PacketSubCMD_1=0x15
-PacketCallFunc_1=OnGotoMergeServer
-
-
 ;排行榜
 [PlayerBillboard]
 ScriptName = Player\PlayerBillboard.py
@@ -345,6 +315,32 @@
 PacketSubCMD_4=0x04
 PacketCallFunc_4=OnQueryBossInfo
 
+[CrossRealmPK]
+ScriptName = GameWorldLogic\CrossRealmPK.py
+Writer = hxp
+Releaser = hxp
+RegType = 0
+RegisterPackCount = 1
+
+PacketCMD_1=0xC0
+PacketSubCMD_1=0x01
+PacketCallFunc_1=OnViewCrossPKBillboard
+
+[CrossRealmPlayer]
+ScriptName = Player\CrossRealmPlayer.py
+Writer = hxp
+Releaser = hxp
+RegType = 0
+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

--
Gitblit v1.8.0