From 5ed9d1987467419a31295ab8643bdcd8bc7456a6 Mon Sep 17 00:00:00 2001
From: cehua_ZWJ <123456>
Date: 星期二, 08 一月 2019 10:54:53 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini |   84 +++++++++++++++++++++++++++++-------------
 1 files changed, 58 insertions(+), 26 deletions(-)

diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
index ebf8152..ba09622 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
@@ -258,7 +258,7 @@
 Writer = alee
 Releaser = alee
 RegType = 0
-RegisterPackCount = 3
+RegisterPackCount = 4
 
 PacketCMD_1=0xA8
 PacketSubCMD_1=0x01
@@ -271,6 +271,11 @@
 PacketCMD_3=0xA8
 PacketSubCMD_3=0x05
 PacketCallFunc_3=OnVIPKillNPCLVInfoSwitch
+
+PacketCMD_4=0xA8
+PacketSubCMD_4=0x06
+PacketCallFunc_4=OnQueryRecharge
+
 
 ;在线奖励
 [PlayerOnlinePrize]
@@ -368,9 +373,9 @@
 PacketSubCMD_8=0x03
 PacketCallFunc_8=PySetAdult
 
-PacketCMD_9=0xC1
-PacketSubCMD_9=0x03
-PacketCallFunc_9=ClientPlayerGetReward
+PacketCMD_9=C1
+PacketSubCMD_9=05
+PacketCallFunc_9=OnEnterCrossServer
 
 PacketCMD_10=0xB4
 PacketSubCMD_10=0x04
@@ -551,38 +556,37 @@
 PacketCallFunc_2 = OnGetManorWarDailyAward
 
 
-;跨服匹配PK
-[PlayerMergePK]
-ScriptName = Player\PlayerMergePK.py
+;跨服PK竞技场
+[PlayerCrossRealmPK]
+ScriptName = Player\PlayerCrossRealmPK.py
 Writer = hxp
 Releaser = hxp
 RegType = 0
-RegisterPackCount = 2
+RegisterPackCount = 3
 
 PacketCMD_1=0xC1
-PacketSubCMD_1=0x09
-PacketCallFunc_1=OnRequestMergePK
+PacketSubCMD_1=0x01
+PacketCallFunc_1=OnCrossRealmPKMatch
 
 PacketCMD_2=0xC1
-PacketSubCMD_2=0x10
-PacketCallFunc_2=OnRequestRecoverMergePKWin
+PacketSubCMD_2=0x02
+PacketCallFunc_2=OnCrossRealmPKBuy
 
-;王者争霸
-[PlayerMergeKing]
-ScriptName = Player\PlayerMergeKing.py
+PacketCMD_3=0xC1
+PacketSubCMD_3=0x03
+PacketCallFunc_3=OnCrossRealmPKGetAward
+
+;跨服玩家
+[CrossRealmPlayer]
+ScriptName = Player\CrossRealmPlayer.py
 Writer = hxp
 Releaser = hxp
 RegType = 0
-RegisterPackCount = 2
+RegisterPackCount = 1
 
 PacketCMD_1=0xC1
-PacketSubCMD_1=0x11
-PacketCallFunc_1=Client_MergeKingSupport
-
-PacketCMD_2=0xC1
-PacketSubCMD_2=0x08
-PacketCallFunc_2=Client_MergeKingWorship
-
+PacketSubCMD_1=0x04
+PacketCallFunc_1=OnExitCrossRealm
 
 ;改名功能
 [UpdatePlayerName]
@@ -1003,11 +1007,15 @@
 Writer = xdh
 Releaser = xdh
 RegType = 0
-RegisterPackCount = 1
+RegisterPackCount = 2
 
 PacketCMD_1=0xA5
 PacketSubCMD_1=0x0B
 PacketCallFunc_1=OnPlayerCoatUp
+
+PacketCMD_2=0xA5
+PacketSubCMD_2=0x20
+PacketCallFunc_2=OnCoatDecompose
 
 ;悬赏任务
 [PlayerArrestTask]
@@ -1093,7 +1101,7 @@
 Writer = xdh
 Releaser = xdh
 RegType = 0
-RegisterPackCount = 6
+RegisterPackCount = 7
 
 PacketCMD_1=0xA5
 PacketSubCMD_1=0x0D
@@ -1118,6 +1126,10 @@
 PacketCMD_6=0xA5
 PacketSubCMD_6=0x12
 PacketCallFunc_6=OnActiveMWSoul
+
+PacketCMD_7=0xA5
+PacketSubCMD_7=0x1D
+PacketCallFunc_7=OnWearMagicWeapon
 
 ;副本
 [FBCommon]
@@ -1386,4 +1398,24 @@
 
 PacketCMD_2=0xAA
 PacketSubCMD_2=0x06
-PacketCallFunc_2=OnActWishingDrag
\ No newline at end of file
+PacketCallFunc_2=OnActWishingDrag
+
+;聚魂
+[PlayerGatherSoul]
+ScriptName = Player\PlayerGatherSoul.py
+Writer = xdh
+Releaser = xdh
+RegType = 0
+RegisterPackCount = 3
+
+PacketCMD_1=0xA5
+PacketSubCMD_1=0x18
+PacketCallFunc_1=OnGatherSoulUp
+
+PacketCMD_2=0xA5
+PacketSubCMD_2=0x19
+PacketCallFunc_2=OnGatherSoulDecompose
+
+PacketCMD_3=0xA5
+PacketSubCMD_3=0x1C
+PacketCallFunc_3=OnGatherSoulCompound
\ No newline at end of file

--
Gitblit v1.8.0