From acc1bd1e76fbccb8250a2036363e7fc43b51ce00 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期四, 06 十二月 2018 10:29:46 +0800
Subject: [PATCH] Merge branch '1.3' of http://192.168.0.87:10010/r/snxx_server into 1.3

---
 CoreServerGroup/GameServer/PyNetPack.ini                               |    6 +++++-
 CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc     |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc |    0 
 CoreServerGroup/GameServer/Script/ChPyNetPack.pyc                      |    0 
 4 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/CoreServerGroup/GameServer/PyNetPack.ini b/CoreServerGroup/GameServer/PyNetPack.ini
index 3a5b702..6317eef 100644
--- a/CoreServerGroup/GameServer/PyNetPack.ini
+++ b/CoreServerGroup/GameServer/PyNetPack.ini
@@ -327,7 +327,7 @@
 Writer = xdh
 Releaser = xdh
 RegType = 0
-RegisterPackCount = 3
+RegisterPackCount = 4
 
 PacketCMD_1=0xA9
 PacketSubCMD_1=0x03
@@ -341,6 +341,10 @@
 PacketSubCMD_3=0x05
 PacketCallFunc_3=OnCallupFamilyMemberToBoss
 
+PacketCMD_4=0xA9
+PacketSubCMD_4=0x04
+PacketCallFunc_4=OnQueryBossInfo
+
 [PlayerXMZZ]
 ScriptName = Player\PlayerXMZZ.py
 Writer = xdh
diff --git a/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc
index 4f1c871..51015ce 100644
--- a/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc
+++ b/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc
index 4fe462a..303abac 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc
index 25c0e6e..140dc5f 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc
Binary files differ

--
Gitblit v1.8.0