From ee81cc6216e6912f1bac0c5b2e23b913db3979e9 Mon Sep 17 00:00:00 2001 From: cehua_LC <tingame100@163.com> Date: 星期二, 25 十二月 2018 10:01:36 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_GatherSoul.pyc | 0 db/PyMongoDataServer/PySysDB/tagMagicWeaponOfKing.txt | 33 +++++++++++++++++++++++++++++++++ ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintFightPower.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini | 6 +++++- CoreServerGroup/GameServer/Script/ShareDefine.pyc | 0 9 files changed, 38 insertions(+), 1 deletions(-) diff --git a/CoreServerGroup/GameServer/Script/ShareDefine.pyc b/CoreServerGroup/GameServer/Script/ShareDefine.pyc index 5ad1634..1be9eb4 100644 --- a/CoreServerGroup/GameServer/Script/ShareDefine.pyc +++ b/CoreServerGroup/GameServer/Script/ShareDefine.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini index c9910a8..387a425 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini @@ -1109,7 +1109,7 @@ Writer = xdh Releaser = xdh RegType = 0 -RegisterPackCount = 6 +RegisterPackCount = 7 PacketCMD_1=0xA5 PacketSubCMD_1=0x0D @@ -1135,6 +1135,10 @@ PacketSubCMD_6=0x12 PacketCallFunc_6=OnActiveMWSoul +PacketCMD_7=0xA5 +PacketSubCMD_7=0x1D +PacketCallFunc_7=OnWearMagicWeapon + ;副本 [FBCommon] ScriptName = GameWorldLogic\FBProcess\FBCommon.py diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc index 226c1ba..96fc365 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintFightPower.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintFightPower.pyc index 8835ced..17958d0 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintFightPower.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintFightPower.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_GatherSoul.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_GatherSoul.pyc index babd1b2..bd62742 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_GatherSoul.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_GatherSoul.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc index 86c818a..7cd57a0 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc index c974613..a674855 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc index 5b64196..4305bca 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc Binary files differ diff --git a/db/PyMongoDataServer/PySysDB/tagMagicWeaponOfKing.txt b/db/PyMongoDataServer/PySysDB/tagMagicWeaponOfKing.txt new file mode 100644 index 0000000..136e98a --- /dev/null +++ b/db/PyMongoDataServer/PySysDB/tagMagicWeaponOfKing.txt @@ -0,0 +1,33 @@ +MWID LV AddAttr +401 0 6_9987 +401 1 6_9988 +401 2 6_9989 +401 3 6_9990 +401 4 6_9991 +401 5 6_9992 +401 6 6_9993 +401 7 6_9994 +401 8 6_9995 +401 9 6_9996 +401 10 6_9997 +401 11 6_9998 +401 12 6_9999 +401 13 6_10000 +401 14 6_10001 +401 15 6_10002 +402 0 6_10003 +402 1 6_10004 +402 2 6_10005 +402 3 6_10006 +402 4 6_10007 +402 5 6_10008 +402 6 6_10009 +402 7 6_10010 +402 8 6_10011 +402 9 6_10012 +402 10 6_10013 +402 11 6_10014 +402 12 6_10015 +402 13 6_10016 +402 14 6_10017 +402 15 6_10018 -- Gitblit v1.8.0