From d5e9bbcf96cf98d767ba073774b1ee287569659d Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期六, 24 十一月 2018 18:20:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini |  104 ++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 89 insertions(+), 15 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
index e1f34d8..a164022 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
@@ -96,11 +96,15 @@
 Writer = wdb
 Releaser = wdb
 RegType = 0
-RegisterPackCount = 1
+RegisterPackCount = 2
 
 PacketCMD_1=0xA3
 PacketSubCMD_1=0x03
 PacketCallFunc_1=OnItemCompound
+
+PacketCMD_2=0xA3
+PacketSubCMD_2=0x13
+PacketCallFunc_2=OnItemDecompound
 
 ;装备宝石
 [EquipStone]
@@ -330,7 +334,7 @@
 Writer = hxp
 Releaser = hxp
 RegType = 0
-RegisterPackCount = 15
+RegisterPackCount = 18
 
 PacketCMD_1 = 0xA5
 PacketSubCMD_1 = 0x04
@@ -392,6 +396,17 @@
 PacketSubCMD_15=0x05
 PacketCallFunc_15=PYWorldTransPort
 
+PacketCMD_16=0xA2
+PacketSubCMD_16=0x27
+PacketCallFunc_16=OnQueryMapNPCCntInfo
+
+PacketCMD_17=0xA2
+PacketSubCMD_17=0x29
+PacketCallFunc_17=OnSetLittleHelper
+
+PacketCMD_18=0xA2
+PacketSubCMD_18=0x30
+PacketCallFunc_18=OnSetChatBubbleBox
 
 ;购买相关的
 [BuySomething]
@@ -497,7 +512,7 @@
 Writer = xdh
 Releaser = xdh
 RegType = 0
-RegisterPackCount = 4
+RegisterPackCount = 5
 
 PacketCMD_1=0xA5
 PacketSubCMD_1=0x65
@@ -514,6 +529,10 @@
 PacketCMD_4=0xA5
 PacketSubCMD_4=0x78
 PacketCallFunc_4=OnRuneCompound
+
+PacketCMD_5=0xA5
+PacketSubCMD_5=0x13
+PacketCallFunc_5=OnUnlockRuneHole
 
 ;领地争夺战
 [GameLogic_ManorWar]
@@ -802,19 +821,15 @@
 Writer = hxp
 Releaser = hxp
 RegType = 0
-RegisterPackCount = 3
+RegisterPackCount = 2
 
 PacketCMD_1=0xA5
-PacketSubCMD_1=0x48
-PacketCallFunc_1=OnExchangeMasterExp
+PacketSubCMD_1=0x49
+PacketCallFunc_1=OnAddMasterSkillPoint
 
 PacketCMD_2=0xA5
-PacketSubCMD_2=0x49
-PacketCallFunc_2=OnAddMasterSkillPoint
-
-PacketCMD_3=0xA5
-PacketSubCMD_3=0x50
-PacketCallFunc_3=OnResetMasterSkill
+PacketSubCMD_2=0x50
+PacketCallFunc_2=OnResetMasterSkill
 
 ;装备洗练
 [EquipWash]
@@ -875,12 +890,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]
@@ -1131,11 +1149,15 @@
 Writer = sgj
 Releaser = sgj
 RegType = 0
-RegisterPackCount = 1
+RegisterPackCount = 2
 
 PacketCMD_1=0xA5
 PacketSubCMD_1=0x76
 PacketCallFunc_1=PlayerRefineItem
+
+PacketCMD_2=0xA5
+PacketSubCMD_2=0x14
+PacketCallFunc_2=PlayerPrayElixir
 
 
 [PassiveBuffEffMng]
@@ -1242,6 +1264,18 @@
 PacketSubCMD_1=0x03
 PacketCallFunc_1=OnActiveAllEquipAttr
 
+;仙盟抢boss
+[FamilyRobBoss]
+ScriptName = GameWorldLogic\FamilyRobBoss.py
+Writer = hxp
+Releaser = hxp
+RegType = 0
+RegisterPackCount = 1
+
+PacketCMD_1=0xA2
+PacketSubCMD_1=0x28
+PacketCallFunc_1=OnQueryFamilyBossHurt
+
 ;神兽
 [PlayerDogz]
 ScriptName = Player\PlayerDogz.py
@@ -1292,4 +1326,44 @@
 
 PacketCMD_1=0xA5
 PacketSubCMD_1=0x11
-PacketCallFunc_1=OnTryFirstGoldItem
\ No newline at end of file
+PacketCallFunc_1=OnTryFirstGoldItem
+
+;绑玉转盘
+[PlayerBindJadeWheel]
+ScriptName = Player\PlayerBindJadeWheel.py
+Writer = xdh
+Releaser = xdh
+RegType = 0
+RegisterPackCount = 1
+
+PacketCMD_1=0xA5
+PacketSubCMD_1=0x17
+PacketCallFunc_1=OnStartBindJadeWheel
+
+;限时抢购
+[PlayerFlashSale]
+ScriptName = Player\PlayerFlashSale.py
+Writer = xdh
+Releaser = xdh
+RegType = 0
+RegisterPackCount = 1
+
+PacketCMD_1=0xAA
+PacketSubCMD_1=0x05
+PacketCallFunc_1=OnFlashSaleAppointment
+
+;许愿池
+[PlayerWishingWell]
+ScriptName = Player\PlayerWishingWell.py
+Writer = xdh
+Releaser = xdh
+RegType = 0
+RegisterPackCount = 2
+
+PacketCMD_1=0xAA
+PacketSubCMD_1=0x07
+PacketCallFunc_1=OnActWishingRefresh
+
+PacketCMD_2=0xAA
+PacketSubCMD_2=0x06
+PacketCallFunc_2=OnActWishingDrag
\ No newline at end of file

--
Gitblit v1.8.0