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 |   82 ++++++++++++++++++++++++----------------
 1 files changed, 49 insertions(+), 33 deletions(-)

diff --git a/CoreServerGroup/GameServer/PyNetPack.ini b/CoreServerGroup/GameServer/PyNetPack.ini
index fdc6620..1a5332b 100644
--- a/CoreServerGroup/GameServer/PyNetPack.ini
+++ b/CoreServerGroup/GameServer/PyNetPack.ini
@@ -39,7 +39,7 @@
 Writer = Alee
 Releaser = Alee
 RegType = 0
-RegisterPackCount = 8
+RegisterPackCount = 9
 
 PacketCMD_1=0xA4
 PacketSubCMD_1=0x01
@@ -72,6 +72,10 @@
 PacketCMD_8=0xA4
 PacketSubCMD_8=0x04
 PacketCallFunc_8=PyCreatFamily
+
+PacketCMD_9=0xA4
+PacketSubCMD_9=0x12
+PacketCallFunc_9=PySearchFamily
 
 [GameWorldFamilyWar]
 ScriptName = GameWorldLogic\GameWorldFamilyWar.py
@@ -143,36 +147,6 @@
 PacketCMD_2=0xA4
 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]
@@ -265,7 +239,7 @@
 Writer = hxp
 Releaser = hxp
 RegType = 0
-RegisterPackCount = 9
+RegisterPackCount = 10
 
 PacketCMD_1=0xB9
 PacketSubCMD_1=0x01
@@ -303,6 +277,10 @@
 PacketSubCMD_9=0x10
 PacketCallFunc_9=OnQueryTeamMemFuncData
 
+PacketCMD_10=0xB9
+PacketSubCMD_10=0x0A
+PacketCallFunc_10=OnInvitePlayerJoinTeamByLV
+
 [PlayerViewCache]
 ScriptName = Player\PlayerViewCache.py
 Writer = alee
@@ -319,12 +297,50 @@
 Writer = xdh
 Releaser = xdh
 RegType = 0
-RegisterPackCount = 1
+RegisterPackCount = 4
 
 PacketCMD_1=0xA9
 PacketSubCMD_1=0x03
 PacketCallFunc_1=OnAttentionBoss
 
+PacketCMD_2=0xAC
+PacketSubCMD_2=0x04
+PacketCallFunc_2=OnQueryAllFamilyBossHurt
+
+PacketCMD_3=0xAC
+PacketSubCMD_3=0x05
+PacketCallFunc_3=OnCallupFamilyMemberToBoss
+
+PacketCMD_4=0xA9
+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