From b72c3a42e092a5ba3c99de74209d93dda0526960 Mon Sep 17 00:00:00 2001 From: cehua_hzl <648597270@qq.com> Date: 星期四, 30 八月 2018 19:15:29 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FamilyRobBoss.pyc | 0 CoreServerGroup/GameServer/PyNetPack.ini | 6 +++++- db/PyMongoDataServer/PySysDB/tagPetInfo.txt | 6 +++--- CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldBoss.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc | 0 CoreServerGroup/GameServer/Script/ChPyNetPack.pyc | 0 6 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CoreServerGroup/GameServer/PyNetPack.ini b/CoreServerGroup/GameServer/PyNetPack.ini index 6b0a4e7..e07f7b6 100644 --- a/CoreServerGroup/GameServer/PyNetPack.ini +++ b/CoreServerGroup/GameServer/PyNetPack.ini @@ -319,7 +319,7 @@ Writer = xdh Releaser = xdh RegType = 0 -RegisterPackCount = 2 +RegisterPackCount = 3 PacketCMD_1=0xA9 PacketSubCMD_1=0x03 @@ -329,6 +329,10 @@ PacketSubCMD_2=0x04 PacketCallFunc_2=OnQueryAllFamilyBossHurt +PacketCMD_3=0xAC +PacketSubCMD_3=0x05 +PacketCallFunc_3=OnCallupFamilyMemberToBoss + [PlayerXMZZ] ScriptName = Player\PlayerXMZZ.py Writer = xdh diff --git a/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetPack.pyc index c824aa3..d06baee 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 137d8ad..15ef633 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 d5a76dd..0cb071b 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetPack.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FamilyRobBoss.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FamilyRobBoss.pyc index e9467cc..68ae0c5 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FamilyRobBoss.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FamilyRobBoss.pyc Binary files differ diff --git a/db/PyMongoDataServer/PySysDB/tagPetInfo.txt b/db/PyMongoDataServer/PySysDB/tagPetInfo.txt index 34dae6e..262e704 100644 --- a/db/PyMongoDataServer/PySysDB/tagPetInfo.txt +++ b/db/PyMongoDataServer/PySysDB/tagPetInfo.txt @@ -1,5 +1,5 @@ ID Quality UnlockSys UnLockNeedItemID UnLockNeedItemCnt DecomposeExp InitRank MaxRank UseNeedRank SkillID SkillUnLock SkillUnLockSys InitFightPower -50106001 2 GetPet 4201 1 1000 1 20 1 48200|48205|48210 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 1036 +50106001 2 GetPet13 4201 1 1000 1 20 1 48200|48205|48210 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 1036 50106002 2 GetPet 4202 1 1000 1 20 4 48215|48220|48225 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 1396 50106101 3 GetPet2 4203 1 1000 1 30 6 47111|48235|48240 4|10|20 ['PetUpLv1','PetUpLv','PetUpLv'] 2476 50106102 3 GetPet3 4204 1 1000 1 30 6 48245|48250|48255 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 2476 @@ -8,8 +8,8 @@ 50106204 4 GetPet5 4212 1 1000 1 40 6 48275|48280|48285 4|10|20 ['PetUpLv','PetUpLv','PetUpLv3'] 4636 50106301 5 GetPet8 4206 1 1000 1 50 6 48290|48295|48300 4|10|20 ['PetUpLv','PetUpLv','PetUpLv4'] 13996 50106302 5 GetPet9 4207 1 1000 1 50 6 48305|48310|48315 4|10|20 ['PetUpLv','PetUpLv','PetUpLv5'] 31996 -50106303 4 GetPet6 4209 1 1000 1 40 6 48335|48340|48345 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 13248 +50106303 4 GetPet6 4209 1 1000 1 40 6 48335|48340|48345 4|10|20 ['PetUpLv','PetUpLv7','PetUpLv'] 13248 50106304 5 GetPet10 4210 1 1000 1 50 6 48350|48355|48360 4|10|20 ['PetUpLv','PetUpLv','PetUpLv6'] 24796 50106305 3 GetPet11 4213 1 1000 1 30 6 48380|48385|48390 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 2470 -50106306 4 GetPet12 4214 1 1000 1 40 6 48410|48415|48420 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 4608 +50106306 4 GetPet12 4214 1 1000 1 40 6 48410|48415|48420 4|10|20 ['PetUpLv','PetUpLv','PetUpLv8'] 4608 50106307 2 GetPet1 4215 1 1000 1 40 6 48395|48400|48405 4|10|20 ['PetUpLv','PetUpLv','PetUpLv'] 1400 -- Gitblit v1.8.0