From 9fd29e111b8ca3b40e9423398c56f503d4535a29 Mon Sep 17 00:00:00 2001 From: cehua_hzl <648597270@qq.com> Date: 星期五, 31 八月 2018 14:16:12 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc | 0 db/PyMongoDataServer/SysDB/tagChinNPC.txt | 2 +- 3 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc index 907d230..4360844 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc index 9fd1550..400e6a7 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerFamily.pyc Binary files differ diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt index e0ccb7f..0990af6 100644 --- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt +++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt @@ -403,7 +403,7 @@ 20102005 2 0 精英海斗士 210 0 2508 2508 0 4 0 0 0 818 0 0 0 0 0 0 0 3 3000 951846 28 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 2358193 0 0 0 0 1 872021 0 1 1 1 20102006 2 0 精英地龙 230 0 2903 2903 0 4 0 0 0 865 0 0 0 0 0 0 0 3 3000 1105585 31 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 4271978 0 0 0 0 1 1332263 0 1 1 1 20102007 2 0 精英冰骨妖 260 0 3994 3994 0 7 0 0 0 1040 0 0 0 0 0 0 0 3 3000 1353274 34 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 8807991 0 0 0 0 1 2526516 0 1 1 1 -20103001 2 0 蜘蛛女皇 125 0 1184 1184 0 3 0 0 10000 1430 0 1 0 0 0 0 0 3 3000 453622 18 0 300 2 6 23010 0 0 0 0 0 0 0 0 10 2 1742024 0 10000 0 0 5 0 0 186 1 1 +20103001 2 0 蜘蛛女皇 125 0 1967 1967 0 3 0 0 10000 2930 0 1 0 0 0 0 0 3 3000 453622 18 0 300 2 6 23010 0 0 0 0 0 0 0 0 10 2 1742024 0 10000 0 0 5 0 0 186 1 1 20103002 2 0 嗜海狂鲨 145 0 2863 2863 0 4 0 0 10000 4148 0 1 0 0 0 0 0 3 3000 556113 20 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 5087089 0 10000 0 0 5 0 0 186 1 1 20103003 2 0 古墓石巨人 160 0 3046 3046 0 4 0 0 10000 4235 0 1 0 0 0 0 0 3 3000 634880 22 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 7079698 0 10000 0 0 5 0 0 186 1 1 20103004 2 0 残暴海怪 180 0 3599 3599 0 5 0 0 10000 4474 0 1 0 0 0 0 0 3 3000 738321 25 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 9937882 0 10000 0 0 5 0 0 186 1 1 -- Gitblit v1.8.0