From fcb396731a43e01a4e5c4e9495bc676cdb9df73e Mon Sep 17 00:00:00 2001 From: cehua-TT <448191260@qq.com> Date: 星期二, 28 八月 2018 15:02:45 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- db/PyMongoDataServer/PySysDB/tagDailyQuest.txt | 2 +- CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc | 0 db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt | 1 + db/PyMongoDataServer/SysDB/tagChinNPC.txt | 26 +++++++++++++------------- CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt | 1 + 7 files changed, 16 insertions(+), 14 deletions(-) diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt index e3fa4db..ccf0c14 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt @@ -88,3 +88,4 @@ 136 250 0 0 137 205 0 0 138 0 11003 0 +139 130 0 0 diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.pyc index 42bcfbb..206f140 100644 --- a/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.pyc +++ b/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.pyc Binary files differ diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc index f34437f..a90494a 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/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc index 332a875..72d3340 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/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt b/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt index e5633b5..7542d04 100644 --- a/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt +++ b/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt @@ -24,4 +24,4 @@ 24 1 16 23 1 20 0 25 2 31240 22 1 30 0 26 2 31150 92 1 30 0 -27 1 17 0 1 0 0 +27 1 17 139 1 0 0 diff --git a/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt index 51e532c..c4be995 100644 --- a/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt +++ b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt @@ -88,3 +88,4 @@ 136 250 0 0 0 137 205 0 0 0 138 0 11003 0 0 +139 130 0 0 0 diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt index fc0f674..6cd6495 100644 --- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt +++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt @@ -385,8 +385,8 @@ 11101004 2 0 地宫风水师 340 0 8223 8223 0 0 0 300 10000 89 0 0 1760 0 8081603 0 0 2 4000 158578 0 0 200 2 6 10033 0 0 0 0 0 0 0 0 10 2 251884 0 0 0 0 0 232539 33 1 1 1 11101005 2 0 青铜士兵 350 0 12124 12124 0 0 0 300 10000 144 0 0 2000 0 9221236 0 0 2 4000 166756 0 0 200 2 6 10033 0 0 0 0 0 0 0 0 10 2 308118 0 0 0 0 0 247062 38 1 1 1 11102001 2 0 黄金战将 350 0 14548 14548 0 0 0 521 10000 233 0 0 2000 0 9221236 0 0 2 4000 166756 0 0 200 2 6 10033 0 0 0 0 0 0 0 0 10 2 616237 0 0 0 0 1 494125 38 1 1 1 -10303001 2 0 御剑尊者 100 0 864 864 479 1 0 0 10000 2598 0 3 0 0 0 0 0 0 3000 428948 17 42 200 0 6 23010 23030 0 0 0 0 0 0 0 10 1 169500 0 10000 0 0 5 0 0 186 1 1 -10403001 2 0 逍遥城主 105 0 836 836 0 2 0 0 10000 1024 0 1 0 0 0 0 0 0 3000 349232 14 0 200 2 6 23010 23030 0 0 0 0 0 0 0 10 1 435020 0 10000 0 0 5 0 0 186 1 1 +10303001 2 0 御剑尊者 100 0 864 864 479 1 0 0 10000 2598 0 3 0 0 0 0 0 0 3000 428948 17 42 200 0 6 23010 0 0 0 0 0 0 0 0 10 1 169500 0 10000 0 0 5 0 0 186 1 1 +10403001 2 0 逍遥城主 105 0 836 836 0 2 0 0 10000 1024 0 1 0 0 0 0 0 0 3000 349232 14 0 200 2 6 23010 0 0 0 0 0 0 0 0 10 1 435020 0 10000 0 0 5 0 0 186 1 1 10503001 2 0 极寒之心 200 0 5004 5004 0 6 0 0 10000 6150 0 1 0 0 0 0 0 3 3000 874028 27 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 7757656 0 10000 0 0 5 0 0 186 1 1 10603001 2 0 潮汐巨兽 250 0 11001 11001 0 9 0 0 10000 12208 0 1 0 0 0 0 0 3 3000 1312467 34 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 12067097 1 10000 0 0 5 0 0 186 1 1 10703001 2 0 极炎之兽 300 0 21078 21078 0 13 0 0 10000 21302 0 1 0 0 0 0 0 3 3000 1725282 39 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 53776857 3 10000 0 0 5 0 0 186 1 1 @@ -401,7 +401,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 23030 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 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 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 @@ -519,9 +519,9 @@ 31003003 2 0 遗迹残魂 210 0 6699 6699 0 8 0 0 0 4091 0 0 0 0 0 0 0 0 2500 97853 29 0 300 2 6 23016 23015 23010 0 0 0 0 0 0 100 2 11790969 0 0 0 0 5 0 0 186 1 1 31003004 2 0 遗迹古妖 235 0 17520 17520 0 10 0 0 0 11737 0 0 0 0 0 0 0 0 2500 109510 31 0 300 2 6 23010 23017 23030 0 0 0 0 0 0 100 2 25933382 0 0 0 0 5 0 0 186 1 1 31003005 2 0 遗迹天将 250 0 22863 22863 5783 11 0 0 0 14194 0 0 0 0 0 0 0 0 2500 125866 33 0 300 2 6 23010 23018 23030 0 0 0 0 0 0 100 2 32175092 0 0 0 0 5 0 0 186 1 1 -31003006 2 0 遗迹天将 250 0 22863 22863 5783 11 0 0 0 14194 0 0 0 0 0 0 0 0 2500 125866 33 0 300 2 6 23010 23018 23030 0 0 0 0 0 0 100 2 24131319 0 0 0 0 5 0 0 186 1 1 +31003006 2 0 遗迹天将 250 0 22863 22863 0 11 0 0 0 14194 0 0 0 0 0 0 0 0 2500 125866 33 0 300 2 6 23010 23018 23030 0 0 0 0 0 0 100 2 24131319 0 0 0 0 5 0 0 186 1 1 31003007 2 0 极冰守卫 265 0 35615 35615 7059 12 0 0 0 21938 0 0 0 0 0 0 0 0 2500 142222 35 0 300 2 6 23010 23021 23030 0 0 0 0 0 0 100 2 57127167 0 0 0 0 5 0 0 186 1 1 -31003008 2 0 执印龙王 300 0 49763 49763 0 15 0 0 0 26158 0 0 0 0 0 0 0 0 2500 166756 39 0 300 2 6 10016 23025 23022 0 0 0 0 0 0 100 2 56279846 2 0 0 0 5 0 0 186 1 1 +31003008 2 0 执印龙王 300 0 49763 49763 0 15 0 0 0 26158 0 0 0 0 0 0 0 0 2500 166756 39 0 300 2 6 10016 23025 23022 23030 0 0 0 0 0 100 2 56279846 2 0 0 0 5 0 0 186 1 1 31001001 2 0 镇守妖兵 160 0 1154 1154 0 4 0 0 0 391 0 0 0 0 0 0 0 0 2500 62885 22 0 300 2 6 0 0 0 0 0 0 0 0 0 100 2 48007 0 0 0 0 1 0 0 180 1 1 31001002 2 0 阵守蛮兽 160 0 1154 1154 0 4 0 0 0 391 0 0 0 0 0 0 0 0 2500 62885 22 0 300 2 6 0 0 0 0 0 0 0 0 0 100 2 84013 0 0 0 0 1 0 0 180 1 1 31001003 2 0 雪山巨猿 160 0 1154 1154 0 4 0 0 0 391 0 0 0 0 0 0 0 0 2500 62885 22 0 300 2 6 0 0 0 0 0 0 0 0 0 100 2 108017 0 0 0 0 1 0 0 180 1 1 @@ -629,14 +629,14 @@ 32502001 2 0 笼子 100 0 1 1 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 2000 939508 0 0 300 2 6 0 0 0 0 0 0 0 0 1 10 2 3000 0 0 0 0 1 0 0 201 1 1 32503001 2 0 强盗首领 32 0 131 131 0 0 0 0 10000 55 0 0 0 0 0 0 0 0 2000 1033458 0 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 9517 0 0 0 0 3 0 0 1 1 1 32504001 0 0 幼龙 100 0 119707 2542 59281 0 0 0 10000 39555 0 0 0 0 0 0 0 0 2000 1136803 0 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 10 0 0 0 0 0 0 0 200 1 1 -60103001 2 0 妖兵 32 0 71 71 0 0 0 0 10000 217 0 0 0 0 0 0 0 100 2500 193596 8 0 300 2 5 23030 0 0 0 0 0 0 0 0 40 2 10640 0 0 0 0 3 0 0 2 1 1 -60103002 2 0 机关幻兽 36 0 89 89 0 0 0 0 10000 272 0 0 0 0 0 0 0 100 2500 227760 10 0 300 2 5 23030 0 0 0 0 0 0 0 0 40 2 13300 0 0 0 0 3 0 0 2 1 1 -60103003 2 0 符塔狂豹 40 0 113 113 0 0 0 0 10000 378 0 0 0 0 0 0 0 100 2500 260975 11 0 300 2 5 23030 0 0 0 0 0 0 0 0 40 2 14069 0 0 0 0 3 0 0 2 1 1 -60103004 2 0 狂暴巨熊 44 0 138 138 0 0 0 0 10000 485 0 0 0 0 0 0 0 100 2500 296088 12 0 300 2 5 23030 0 0 0 0 0 0 0 0 40 2 14839 0 0 0 0 3 0 0 2 1 1 -60103005 2 0 魔化豪猪 50 0 156 156 0 0 0 0 10000 595 0 0 0 0 0 0 0 100 2500 353028 14 0 300 2 5 23030 0 0 0 0 0 0 0 0 40 2 16053 0 0 0 0 3 0 0 2 1 1 -60103006 2 0 残暴凶狼 56 0 175 175 0 0 0 0 10000 705 0 0 0 0 0 0 0 100 2500 408070 17 0 300 2 5 23030 0 0 0 0 0 0 0 0 40 2 17267 0 0 0 0 3 0 0 2 1 1 -60103007 2 0 幽魂邪道 70 0 178 178 0 0 0 0 10000 795 0 0 0 0 0 0 0 100 2500 453622 18 0 300 2 5 23030 0 0 0 0 0 0 0 0 40 2 21440 0 0 0 0 3 0 0 2 1 1 -60103008 2 0 狂躁巨猿 80 0 181 181 0 1 0 0 10000 886 0 0 0 0 0 0 0 100 2500 505817 19 0 300 2 5 23030 0 0 0 0 0 0 0 0 40 2 30932 0 0 0 0 3 0 0 2 1 1 +60103001 2 0 妖兵 32 0 71 71 0 0 0 0 10000 217 0 0 0 0 0 0 0 100 2500 193596 8 0 300 2 5 0 0 0 0 0 0 0 0 0 40 2 10640 0 0 0 0 3 0 0 2 1 1 +60103002 2 0 机关幻兽 36 0 89 89 0 0 0 0 10000 272 0 0 0 0 0 0 0 100 2500 227760 10 0 300 2 5 0 0 0 0 0 0 0 0 0 40 2 13300 0 0 0 0 3 0 0 2 1 1 +60103003 2 0 符塔狂豹 40 0 113 113 0 0 0 0 10000 378 0 0 0 0 0 0 0 100 2500 260975 11 0 300 2 5 0 0 0 0 0 0 0 0 0 40 2 14069 0 0 0 0 3 0 0 2 1 1 +60103004 2 0 狂暴巨熊 44 0 138 138 0 0 0 0 10000 485 0 0 0 0 0 0 0 100 2500 296088 12 0 300 2 5 0 0 0 0 0 0 0 0 0 40 2 14839 0 0 0 0 3 0 0 2 1 1 +60103005 2 0 魔化豪猪 50 0 156 156 0 0 0 0 10000 595 0 0 0 0 0 0 0 100 2500 353028 14 0 300 2 5 0 0 0 0 0 0 0 0 0 40 2 16053 0 0 0 0 3 0 0 2 1 1 +60103006 2 0 残暴凶狼 56 0 175 175 0 0 0 0 10000 705 0 0 0 0 0 0 0 100 2500 408070 17 0 300 2 5 0 0 0 0 0 0 0 0 0 40 2 17267 0 0 0 0 3 0 0 2 1 1 +60103007 2 0 幽魂邪道 70 0 178 178 0 0 0 0 10000 795 0 0 0 0 0 0 0 100 2500 453622 18 0 300 2 5 0 0 0 0 0 0 0 0 0 40 2 21440 0 0 0 0 3 0 0 2 1 1 +60103008 2 0 狂躁巨猿 80 0 181 181 0 1 0 0 10000 886 0 0 0 0 0 0 0 100 2500 505817 19 0 300 2 5 0 0 0 0 0 0 0 0 0 40 2 30932 0 0 0 0 3 0 0 2 1 1 60103009 2 0 守塔剑士 90 0 503 503 0 1 0 0 40000 914 0 0 0 0 0 0 0 100 2500 556113 20 0 300 2 5 23030 0 0 0 0 0 0 0 0 40 2 47772 0 0 0 0 3 0 0 2 1 1 60103010 2 0 巨剑师 100 0 610 610 0 1 0 0 40000 1010 0 0 0 0 0 0 0 100 2500 608308 22 0 300 2 5 23030 0 0 0 0 0 0 0 0 40 2 66969 0 0 0 0 3 0 0 2 1 1 60103011 2 0 符塔剑魂 110 0 896 896 0 2 0 0 40000 1060 0 0 0 0 0 0 0 100 2500 659554 23 0 300 2 5 23030 0 0 0 0 0 0 0 0 40 2 81872 0 0 0 0 3 0 0 2 1 1 -- Gitblit v1.8.0