From 1191d5eb74dfabf16accc9a1e15573e217def7a6 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期三, 26 十二月 2018 17:00:06 +0800
Subject: [PATCH] 5372 【后端】【1.4】聚魂副本开发(物品给错背包修复)

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

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
index 2a16803..9f1aafe 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
@@ -334,7 +334,7 @@
 Writer = hxp
 Releaser = hxp
 RegType = 0
-RegisterPackCount = 17
+RegisterPackCount = 18
 
 PacketCMD_1 = 0xA5
 PacketSubCMD_1 = 0x04
@@ -368,9 +368,9 @@
 PacketSubCMD_8=0x03
 PacketCallFunc_8=PySetAdult
 
-PacketCMD_9=0xC1
-PacketSubCMD_9=0x03
-PacketCallFunc_9=ClientPlayerGetReward
+PacketCMD_9=
+PacketSubCMD_9=
+PacketCallFunc_9=
 
 PacketCMD_10=0xB4
 PacketSubCMD_10=0x04
@@ -403,6 +403,10 @@
 PacketCMD_17=0xA2
 PacketSubCMD_17=0x29
 PacketCallFunc_17=OnSetLittleHelper
+
+PacketCMD_18=0xA2
+PacketSubCMD_18=0x30
+PacketCallFunc_18=OnSetChatBubbleBox
 
 ;购买相关的
 [BuySomething]
@@ -547,38 +551,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]
@@ -886,12 +889,15 @@
 Writer = ljd
 Releaser = ljd
 RegType = 0
-RegisterPackCount = 1
+RegisterPackCount = 2
 
 PacketCMD_1=0xA5
 PacketSubCMD_1=0x55
 PacketCallFunc_1=OnPlusGodWeapon
 
+PacketCMD_2=0xA5
+PacketSubCMD_2=0x56
+PacketCallFunc_2=OnGodWeaponActivate
 
 ;聊天
 [PlayerTalk]
@@ -1086,7 +1092,7 @@
 Writer = xdh
 Releaser = xdh
 RegType = 0
-RegisterPackCount = 6
+RegisterPackCount = 7
 
 PacketCMD_1=0xA5
 PacketSubCMD_1=0x0D
@@ -1112,6 +1118,10 @@
 PacketSubCMD_6=0x12
 PacketCallFunc_6=OnActiveMWSoul
 
+PacketCMD_7=0xA5
+PacketSubCMD_7=0x1D
+PacketCallFunc_7=OnWearMagicWeapon
+
 ;副本
 [FBCommon]
 ScriptName = GameWorldLogic\FBProcess\FBCommon.py
@@ -1123,6 +1133,26 @@
 PacketCMD_1=0xA5
 PacketSubCMD_1=0x75
 PacketCallFunc_1=BuyFBEnterCount
+
+;副本助战
+[FBHelpBattle]
+ScriptName = GameWorldLogic\FBProcess\FBHelpBattle.py
+Writer = hxp
+Releaser = hxp
+RegType = 0
+RegisterPackCount = 3
+
+PacketCMD_1=0xB1
+PacketSubCMD_1=0x5
+PacketCallFunc_1=OnHelpBattleCheckIn
+
+PacketCMD_2=0xB1
+PacketSubCMD_2=0x6
+PacketCallFunc_2=OnHelpBattleCall
+
+PacketCMD_3=0xB1
+PacketSubCMD_3=0x7
+PacketCallFunc_3=OnHelpBattleRefresh
 
 ;组队
 [PlayerTeam]
@@ -1359,4 +1389,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