From 08e3e6cea67b249564abac36ea1e8aefa17982e4 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 12 三月 2019 16:36:47 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode

---
 ServerPython/CoreServerGroup/GameServer/PyNetPack.ini |   84 +++++++++++++++++++++++++++---------------
 1 files changed, 54 insertions(+), 30 deletions(-)

diff --git a/ServerPython/CoreServerGroup/GameServer/PyNetPack.ini b/ServerPython/CoreServerGroup/GameServer/PyNetPack.ini
index 6317eef..aaf50ba 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
@@ -250,6 +220,34 @@
 PacketCMD_1=0xB5
 PacketSubCMD_1=0x03
 PacketCallFunc_1=OnPYQueryBourseItemOnSale
+
+;拍卖行
+[AuctionHouse]
+ScriptName = GameWorldLogic\AuctionHouse.py
+Writer = hxp
+Releaser = hxp
+RegType = 0
+RegisterPackCount = 5
+
+PacketCMD_1=0xB5
+PacketSubCMD_1=0x10
+PacketCallFunc_1=OnQueryAuctionItem
+
+PacketCMD_2=0xB5
+PacketSubCMD_2=0x17
+PacketCallFunc_2=OnQueryTagAuctionItem
+
+PacketCMD_3=0xB5
+PacketSubCMD_3=0x12
+PacketCallFunc_3=OnQueryAuctionRecord
+
+PacketCMD_4=0xB5
+PacketSubCMD_4=0x16
+PacketCallFunc_4=OnQueryAttentionAuctionItem
+
+PacketCMD_5=0xB5
+PacketSubCMD_5=0x18
+PacketCallFunc_5=OnAttentionAuctionItemChange
 
 ;境界渡劫
 [PlayerDuJie.py]
@@ -345,6 +343,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