From 7154b470e1b18216018b027cfb70a68aae4aa4fb Mon Sep 17 00:00:00 2001 From: cehua_wcy <781813756@qq.com> Date: 星期四, 23 八月 2018 10:39:31 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt | 2 +- ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc | 0 db/PyMongoDataServer/PySysDB/tagChestsAward.txt | 2 +- db/PyMongoDataServer/SysDB/tagChinNPC.txt | 6 +++--- ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip | 0 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt index 59e908a..43204c6 100644 --- a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt +++ b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt @@ -174,7 +174,7 @@ 10504002 先锋官 130 10504003 军中药师 140 10504004 军需 140 -10504005 神秘老头 150 +10504005 拦路老汉 150 10504006 随行弟子 150 10504007 冰玉 160 10504008 枯藤老人 160 diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip index 30fb099..6736e2c 100644 --- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip +++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip 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 301008f..232f5f1 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/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt index 7e3c412..15e5ab6 100644 --- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt +++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt @@ -125,5 +125,5 @@ 2338 0 [[1428,[10541,1]],[2856,[10542,1]],[4284,[10543,1]],[5712,[10544,1]],[7140,[10545,1]],[8568,[10546,1]],[10000,[10547,1]]] 1 [[10541,20541,30541],[10542,20542,30542],[10543,20543,30543],[10544,20544,30544],[10545,20545,30545],[10546,20546,30546],[10547,20547,30547]] 2339 0 [[7000,[14,1]],[9000,[18,1]],[10000,[19,1]]] 1 2340 0 [[2000,[181,10]],[4000,[181,11]],[6000,[181,12]],[8000,[181,13]],[9000,[181,14]],[10000,[181,15]]] 1 -2341 0 [[1300,[2107,3]],[1500,[4609,1]],[1600,[4610,1]],[1800,[181,10]],[2000,[4151,10]],[2400,[14,1]],[3000,[151,1]],[5000,[181,1]],[7000,[4151,1]],[10000,[150,1]]] 1 +2341 0 [[1300,[2107,3]],[1500,[4609,1]],[1600,[4610,1]],[1800,[181,10]],[2000,[4151,10]],[2400,[14,1]],[3000,[151,1]],[5000,[181,1]],[7000,[4151,1]],[10000,[150,1]]] 1 [2107,4609,4610,14] 2342 0 [[2000,[4611,1]],[4000,[4612,1]],[6000,[4613,1]],[8000,[4614,1]],[10000,[4615,1]]] 1 diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt index 7ae07c4..56a4924 100644 --- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt +++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt @@ -174,7 +174,7 @@ 10504002 0 1 先锋官 130 0 607 742 1264 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1390 3772 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 5 0 0 0 200 0 1 10504003 0 1 军中药师 140 0 607 742 1264 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1390 3772 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 5 0 0 0 200 0 1 10504004 0 1 军需 140 0 607 742 1264 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1390 3772 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 5 0 0 0 200 0 1 -10504005 0 1 神秘老头 150 0 272 283 555 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 838 104 10 300 0 6 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 200 1 1 +10504005 0 1 拦路老汉 150 0 272 283 555 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 838 104 10 300 0 6 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 200 1 1 10504006 0 1 随行弟子 150 0 607 742 1264 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1390 3772 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 5 0 0 0 200 0 1 10504007 0 1 冰玉 160 0 607 742 1264 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1390 3772 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 5 0 0 0 200 0 1 10504008 0 1 枯藤老人 160 0 607 742 1264 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1390 3772 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 5 0 0 0 200 0 1 @@ -340,8 +340,8 @@ 10401002 2 0 魔化哨兵 80 0 311 311 106 0 0 301 0 0 0 0 0 0 35274 0 0 0 4000 20774 0 0 200 2 6 0 0 0 0 0 0 0 0 0 10 1 2397 0 0 0 0 0 1021 0 1 1 1 10401003 2 0 狂暴妖兵 90 0 356 356 0 0 0 301 0 0 0 0 0 0 56557 0 0 0 4000 22560 0 0 200 2 6 0 0 0 0 0 0 0 0 0 10 1 5177 0 0 0 0 0 2099 0 1 1 1 10401004 2 0 魔界冥魂 100 0 410 410 0 0 0 301 0 0 0 0 0 0 74789 0 0 0 4000 24158 0 0 200 2 6 0 0 0 0 0 0 0 0 0 10 1 6208 0 0 0 0 0 3099 0 1 1 1 -10401005 2 0 花妖 110 0 488 488 0 0 0 301 10000 0 0 0 0 0 111509 0 0 0 4000 25850 0 0 200 2 6 0 0 0 0 0 0 0 0 0 10 1 7207 0 0 0 0 0 3900 0 1 1 1 -10402001 2 0 树妖 120 0 587 587 0 0 0 297 10000 0 0 0 0 0 148071 0 0 0 4000 27636 0 0 200 2 6 0 0 0 0 0 0 0 0 0 10 1 8975 0 0 0 0 1 4731 0 1 1 1 +10401005 2 0 花妖 110 0 488 488 0 0 0 301 0 0 0 0 0 0 111509 0 0 0 4000 25850 0 0 200 2 6 0 0 0 0 0 0 0 0 0 10 1 7207 0 0 0 0 0 3900 0 1 1 1 +10402001 2 0 树妖 120 0 587 587 0 0 0 297 0 0 0 0 0 0 148071 0 0 0 4000 27636 0 0 200 2 6 0 0 0 0 0 0 0 0 0 10 1 8975 0 0 0 0 1 4731 0 1 1 1 10501001 2 0 异化魔兵 130 0 681 681 0 0 0 297 10000 5 0 0 320 0 192676 0 0 2 4000 47564 0 0 200 2 6 10030 0 0 0 0 0 0 0 0 10 2 10810 0 0 0 0 0 5977 0 1 1 1 10501002 2 0 冰霜巨蝎 140 0 799 799 0 0 0 297 10000 13 0 0 800 0 256281 0 0 2 4000 52640 0 0 200 2 6 10030 0 0 0 0 0 0 0 0 10 2 11903 0 0 0 0 1 7550 0 1 1 1 10501003 2 0 冰川蛮兽 150 0 886 886 0 0 0 291 10000 5 0 0 1040 0 310521 0 0 2 4000 57715 0 0 200 2 6 10030 0 0 0 0 0 0 0 0 10 2 12825 0 0 0 0 0 11103 0 1 1 1 -- Gitblit v1.8.0