From 1a92edebafd2e87f327ccb303ca59addc5c43713 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 26 十二月 2018 20:12:34 +0800
Subject: [PATCH] 5424 【后端】【1.4】跨服竞技场开发(增加荣誉货币类型18及使用效果;增加荣誉商店支持按赛季重置物品购买次数;)

---
 ServerPython/CoreServerGroup/GameServer/PyNetPack.ini |   68 ++++++++++++++++++----------------
 1 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/PyNetPack.ini b/ServerPython/CoreServerGroup/GameServer/PyNetPack.ini
index ed48a02..1a5332b 100644
--- a/ServerPython/CoreServerGroup/GameServer/PyNetPack.ini
+++ b/ServerPython/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
@@ -269,7 +239,7 @@
 Writer = hxp
 Releaser = hxp
 RegType = 0
-RegisterPackCount = 9
+RegisterPackCount = 10
 
 PacketCMD_1=0xB9
 PacketSubCMD_1=0x01
@@ -307,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
@@ -323,7 +297,7 @@
 Writer = xdh
 Releaser = xdh
 RegType = 0
-RegisterPackCount = 3
+RegisterPackCount = 4
 
 PacketCMD_1=0xA9
 PacketSubCMD_1=0x03
@@ -337,6 +311,36 @@
 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