From 3393d67466cc66a1e84e726d8c6cc2da99d32804 Mon Sep 17 00:00:00 2001 From: cehua_hzl <648597270@qq.com> Date: 星期六, 24 十一月 2018 11:37:53 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server --- db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt | 8 ++++---- db/PyMongoDataServer/SysDB/tagChinSkill.txt | 10 +++++----- db/PyMongoDataServer/SysDB/tagNPCRefresh.txt | 28 ++++++++++++++-------------- db/PyMongoDataServer/SysDB/tagChinNPC.txt | 4 ++-- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt b/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt index 1468533..af80174 100644 --- a/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt +++ b/db/PyMongoDataServer/PySysDB/tagNPCStrengthen.txt @@ -100,17 +100,17 @@ 50103006 1 3 1 419000 10000 0 8000 2 9900 50 1 0 0 947 0 50103007 1 3 1 465600 10000 0 8000 2 9900 50 1 0 0 874 0 31401002 0 2 0 2000 10000 0 8000 3 9900 50 24 0 0 0 0 -31403002 0 2 0 6000 10000 0 8000 3 9900 50 1 0 0 50 0 +31403002 0 2 0 5500 10000 0 8000 3 9900 50 1 0 0 50 0 31401003 0 2 0 800 10000 0 8000 3 9900 50 24 0 0 0 0 31403003 0 2 0 6000 10000 0 8000 3 9900 50 1 0 0 50 0 31401004 0 2 0 800 10000 1000 8000 3 9900 50 12 0 0 0 0 31403004 0 2 0 6000 10000 0 8000 3 9900 50 1 0 0 50 0 -31401005 0 2 0 1000 10000 0 8000 3 9900 50 12 0 0 0 0 +31401005 0 2 0 1500 10000 0 8000 3 9900 50 12 0 0 0 0 31403005 0 2 0 6000 10000 0 8000 3 9900 50 1 0 0 50 0 31401006 0 2 0 800 10000 0 8000 3 9900 50 12 0 0 0 0 31403006 0 2 0 6000 10000 0 8000 3 9900 50 1 0 0 50 0 31401007 0 2 0 1000 10000 0 8000 3 9900 50 12 0 0 0 0 -31403007 0 2 0 6000 10000 0 8000 3 9900 50 1 0 0 50 0 +31403007 0 2 0 5500 10000 0 8000 3 9900 50 1 0 0 50 0 31401008 0 2 0 500 10000 0 8000 3 9900 50 12 0 0 0 0 31403008 0 2 0 6000 10000 0 8000 3 9900 50 1 0 0 50 0 -31401009 0 2 0 800 10000 0 8000 3 9900 50 12 0 0 0 0 +31401009 0 2 0 1500 10000 0 8000 3 9900 50 12 0 0 0 0 diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt index 7c35e26..3dcbe0b 100644 --- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt +++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt @@ -680,14 +680,14 @@ 31203106 2 0 招魂幡 380 0 120343 120343 23388 0 0 0 0 57690 0 0 0 0 0 0 33889452 101 800 171260 132 0 300 2 6 11026 11027 10313 0 0 0 0 0 0 40 2 78848073 1 0 0 0 3 0 0 186 1 1 31401001 2 0 冰霜石精 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 0 0 0 0 0 1 0 0 1 1 1 31403001 2 0 霜冻巨石 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 0 0 0 0 0 1 0 0 198 1 1 -31401002 2 0 试炼木人 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 100 0 0 0 0 1 0 0 180 1 1 +31401002 2 0 试炼木人 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 0 0 0 0 0 0 0 0 0 30 2 100 0 0 0 0 1 0 0 180 1 1 31401003 2 0 冰霜毒蝎 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 0 0 0 0 0 0 0 0 0 30 2 100 0 0 0 0 1 0 0 180 1 1 31401004 2 0 顽固之石 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 0 2 6 0 0 0 0 0 0 0 0 0 5 2 100 0 0 0 0 1 0 0 180 1 1 31401005 2 0 虾兵 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 0 0 0 0 0 0 0 0 0 5 2 100 0 0 0 0 1 0 0 180 1 1 31401006 2 0 深渊刺客 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 0 2 6 0 0 0 0 0 0 0 0 0 5 2 100 0 0 0 0 1 0 0 180 1 1 31401007 2 0 海马勇士 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 0 2 6 0 0 0 0 0 0 0 0 0 5 2 100 0 0 0 0 1 0 0 180 1 1 31401008 2 0 花精灵 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 0 2 6 23045 0 0 0 0 0 0 0 0 10 2 100 0 0 0 0 1 0 0 180 1 1 -31401009 2 0 毒牙 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 0 2 6 0 0 0 0 0 0 0 0 0 5 2 100 0 0 0 0 1 0 0 180 1 1 +31401009 2 0 毒牙 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 0 0 0 0 0 0 0 0 0 5 2 100 0 0 0 0 1 0 0 180 1 1 31403002 2 0 冰晶巨石 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 100 0 0 0 0 1 0 0 198 1 1 31403003 2 0 巨石之力 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 23041 0 0 0 0 0 0 0 0 10 1 100 0 0 0 0 1 0 0 186 1 1 31403004 2 0 深海龙王 50 0 309 309 0 0 0 0 20000 0 0 0 0 0 0 0 0 0 2000 7049 0 0 300 2 6 23042 0 0 0 0 0 0 0 0 10 1 100 0 0 0 0 1 0 0 186 1 1 diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt index ea96d5f..f3c1746 100644 --- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt +++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt @@ -620,12 +620,12 @@ 23024 第四层加血 23024 1 1 0 0 0 2 0 0 8 5 141 20 0 30000 0 0 0 0 0 1000 1000 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 23030 境界压制 23030 1 1 0 11 0 13 0 0 16 0 40 8 0 180000 0 0 0 0 0 1060 50105019 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 10000 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 23031 压制法阵 23031 1 1 0 11 0 1 0 0 2 6 40 0 0 1000 0 0 0 0 0 1010 10000 0 0 9999 1000 0 0 1200 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1000 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 -23041 新冰晶矿脉3层加防 23041 1 1 0 0 0 5 0 0 6 200 140 9 0 1800000 0 0 0 0 0 13 50000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 120000 0 0 0 0 0 0 0 0 0 2 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +23041 新冰晶矿脉3层加防 23041 1 1 0 0 0 5 0 0 6 200 140 9 0 1800000 0 0 0 0 0 13 100000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 60000 0 0 0 0 0 0 0 0 0 2 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 23042 新冰晶矿脉4层放毒 23042 1 1 0 0 0 4 0 0 6 200 140 9 0 1800000 0 0 0 0 0 1089 10000 0 10 9999 1000 0 0 4012 14 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 10000 0 0 0 0 0 0 0 0 0 2 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -23043 新冰晶矿脉5层减攻 23043 1 1 0 0 0 6 0 0 6 201 40 9 0 1800000 0 0 0 0 0 9 5000 4 0 10 5000 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 120000 0 0 0 0 0 0 0 0 0 2 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 31140 0 0 -23044 新冰晶矿脉6层加攻 23044 1 1 0 0 0 5 0 0 6 201 40 9 0 1800000 0 0 0 0 0 9 5000 3 0 10 5000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 300000 0 0 0 0 0 0 0 0 0 2 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 31140 0 0 -23045 新冰晶矿脉7层加血 23045 1 1 0 0 0 2 0 0 8 0 151 10 0 0 0 0 0 0 0 0 500 0 5 2103 31403007 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -23046 新冰晶矿脉8层沉默 23046 1 1 0 0 3100 1 0 0 2 5 41 6 0 60000 0 0 0 0 0 1010 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 23050 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +23043 新冰晶矿脉5层减攻 23043 1 1 0 0 0 6 0 0 6 201 40 9 0 1800000 0 0 0 0 0 9 8000 4 0 10 8000 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 60000 0 0 0 0 0 0 0 0 0 2 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 31140 0 0 +23044 新冰晶矿脉6层加攻 23044 1 1 0 0 0 5 0 0 6 201 40 9 0 1800000 0 0 0 0 0 9 8000 3 0 10 8000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 300000 0 0 0 0 0 0 0 0 0 2 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 31140 0 0 +23045 新冰晶矿脉7层加血 23045 1 1 0 0 0 2 0 0 8 0 151 30 0 0 0 0 0 0 0 0 500 0 5 2103 31403007 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +23046 新冰晶矿脉8层沉默 23046 1 1 0 0 2000 1 0 0 2 5 41 6 0 60000 0 0 0 0 0 1010 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 0 0 23050 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 23050 沉默 23050 1 1 0 5 0 14 0 0 1 0 41 0 0 0 0 0 0 0 0 4012 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 8000 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 2 0 0 2 0 0 0 0 0 0 0 23100 复仇之刃（1层） 23100 1 10 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 9 1000 3 0 10 1000 3 0 7 1000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1200000 0 0 0 0 0 0 0 0 0 3 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 31160 0 0 23101 复仇之刃（2层） 23100 2 10 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 9 2000 3 0 10 2000 3 0 7 2000 3 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 1200000 0 0 0 0 0 0 0 0 0 3 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 31160 0 0 diff --git a/db/PyMongoDataServer/SysDB/tagNPCRefresh.txt b/db/PyMongoDataServer/SysDB/tagNPCRefresh.txt index c474a48..f76fd7c 100644 --- a/db/PyMongoDataServer/SysDB/tagNPCRefresh.txt +++ b/db/PyMongoDataServer/SysDB/tagNPCRefresh.txt @@ -601,6 +601,11 @@ 108543 30301003 31031 0 [69,65,0,15] 1 1 0 3000 0 0 1 5 5 0 0 34587 10801003 10080 0 [55,104,1,15] 1 1 0 2500 0 0 1 5 5 0 0 34588 10801003 10080 0 [57,106,1,15] 1 1 0 2500 0 0 1 5 5 0 0 +108557 0 31140 0 [25,10,2,10] 1 1 0 0 0 0 1 5 5 0 105 +108558 0 31140 0 [7,11,2,10] 1 1 0 0 0 0 1 5 5 0 105 +108559 0 31140 0 [8,21,2,10] 1 1 0 0 0 0 1 5 5 0 105 +108560 0 31140 0 [26,15,2,5] 1 1 0 0 0 0 1 5 5 0 106 +108561 0 31140 0 [5,15,2,5] 1 1 0 0 0 0 1 5 5 0 106 81048 0 31150 0 [144,120,0,12] 1 1 0 0 0 0 1 5 5 0 91 108495 0 31031 0 [71,17,0,15] 1 1 0 0 0 0 1 5 5 0 90 108497 0 31031 0 [17,70,0,15] 1 1 0 0 0 0 1 5 5 0 91 @@ -693,6 +698,7 @@ 68424 0 60010 0 [236,96,6,15] 1 1 0 0 0 0 1 5 5 0 128 68425 0 60010 0 [243,95,6,15] 1 1 0 0 0 0 1 5 5 0 129 68426 0 60010 0 [239,129,1,15] 1 1 0 0 0 0 1 5 5 0 130 +108569 0 31140 0 [16,15,1,20] 1 1 0 0 0 0 1 5 5 0 102 80253 10901004 10090 0 [74,92,0,15] 1 1 0 3000 0 0 1 5 5 0 0 18735 10702001 10070 0 [56,183,1,15] 1 1 0 2500 0 0 1 5 5 0 0 27800 10601004 10060 0 [11,99,1,15] 1 1 0 2500 0 0 1 5 5 0 0 @@ -1616,7 +1622,14 @@ 13402 10504001 10050 0 [103,22,0,1] 1 1 0 0 0 0 1 5 5 64 0 13404 10501004 10050 0 [25,93,1,16] 1 1 0 2500 0 0 1 5 5 0 0 13406 10501005 10050 0 [68,96,1,12] 1 1 0 2500 0 0 1 5 5 0 0 -108569 0 31140 0 [16,15,1,20] 1 1 0 0 0 0 1 5 5 0 102 +108549 0 31140 0 [7,11,2,30] 1 1 0 0 0 0 1 5 5 0 101 +108550 0 31140 0 [8,21,2,30] 1 1 0 0 0 0 1 5 5 0 101 +108551 0 31140 0 [25,21,2,30] 1 1 0 0 0 0 1 5 5 0 101 +108552 0 31140 0 [25,10,2,30] 1 1 0 0 0 0 1 5 5 0 101 +108553 0 31140 0 [26,15,2,30] 1 1 0 0 0 0 1 5 5 0 103 +108554 0 31140 0 [5,15,2,30] 1 1 0 0 0 0 1 5 5 0 103 +108555 0 31140 0 [16,15,1,8] 1 1 0 5 0 0 1 5 5 0 104 +108556 0 31140 0 [25,21,2,10] 1 1 0 0 0 0 1 5 5 0 105 27962 10601003 10060 0 [32,57,1,15] 1 1 0 2500 0 0 1 5 5 0 0 80291 10901005 10090 0 [69,139,0,15] 1 1 0 3000 0 0 1 5 5 0 0 76661 10301002 10030 0 [51,72,1,16] 1 1 0 1800 0 0 1 5 5 0 0 @@ -1716,8 +1729,6 @@ 101010 30301002 31030 0 [74,64,1,15] 1 1 0 2500 0 0 1 5 5 0 0 77036 10401002 10040 0 [147,74,1,15] 1 1 0 1800 0 0 1 5 5 0 0 101012 0 31030 0 [95,30,0,12] 1 1 0 0 0 0 1 5 5 0 90 -108558 0 31140 0 [7,11,2,10] 1 1 0 0 0 0 1 5 5 0 105 -108559 0 31140 0 [8,21,2,10] 1 1 0 0 0 0 1 5 5 0 105 101016 30301002 31030 0 [73,61,1,15] 1 1 0 2500 0 0 1 5 5 0 0 101018 30301002 31030 0 [72,64,1,15] 1 1 0 2500 0 0 1 5 5 0 0 101020 30301002 31030 0 [75,61,1,15] 1 1 0 2500 0 0 1 5 5 0 0 @@ -1737,14 +1748,6 @@ 19011 10701003 10070 0 [66,52,1,15] 1 1 0 2500 0 0 1 5 5 0 0 241 0 31130 0 [16,16,0,30] 1 1 0 0 0 0 1 5 5 0 101 19013 10701005 10070 0 [101,151,1,15] 1 1 0 2500 0 0 1 5 5 0 0 -108549 0 31140 0 [7,11,2,30] 1 1 0 0 0 0 1 5 5 0 101 -108550 0 31140 0 [8,21,2,30] 1 1 0 0 0 0 1 5 5 0 101 -108551 0 31140 0 [25,21,2,30] 1 1 0 0 0 0 1 5 5 0 101 -108552 0 31140 0 [25,10,2,30] 1 1 0 0 0 0 1 5 5 0 101 -108553 0 31140 0 [16,23,2,30] 1 1 0 0 0 0 1 5 5 0 103 -108554 0 31140 0 [16,6,2,30] 1 1 0 0 0 0 1 5 5 0 103 -108555 0 31140 0 [16,15,1,8] 1 1 0 5 0 0 1 5 5 0 104 -108556 0 31140 0 [25,21,2,10] 1 1 0 0 0 0 1 5 5 0 105 27762 10601001 10060 0 [77,16,1,10] 1 1 0 2500 0 0 1 5 5 0 0 76649 10301001 10030 0 [61,23,1,16] 1 1 0 1800 0 0 1 5 5 0 0 76651 10302001 10030 0 [12,112,1,15] 1 1 0 1800 0 0 1 5 5 0 0 @@ -1759,8 +1762,6 @@ 77519 10604002 10060 0 [76,29,0,15] 1 1 0 0 0 0 1 5 5 80 0 18751 10702001 10070 0 [70,180,1,15] 1 1 0 2500 0 0 1 5 5 0 0 77520 10604004 10060 0 [72,8,0,15] 1 1 0 0 0 0 1 5 5 65 0 -108560 0 31140 0 [16,23,2,5] 1 1 0 0 0 0 1 5 5 0 106 -108561 0 31140 0 [16,6,2,5] 1 1 0 0 0 0 1 5 5 0 106 77116 10404004 10040 0 [153,88,0,1] 1 1 0 0 0 0 1 5 5 127 0 76083 10201001 10020 0 [183,33,1,16] 1 1 0 1800 0 0 1 5 5 0 0 76085 10202001 10020 0 [48,100,1,16] 1 1 0 1800 0 0 1 5 5 0 0 @@ -1904,7 +1905,6 @@ 108545 30301003 31031 0 [69,67,0,15] 1 1 0 3000 0 0 1 5 5 0 0 108546 30301003 31031 0 [71,67,0,15] 1 1 0 3000 0 0 1 5 5 0 0 108547 30301003 31031 0 [67,64,0,15] 1 1 0 3000 0 0 1 5 5 0 0 -108557 0 31140 0 [25,10,2,10] 1 1 0 0 0 0 1 5 5 0 105 51407 30908001 31230 0 [9,40,0,1] 1 1 0 0 0 0 1 5 5 0 0 76003 10201001 10020 0 [195,32,1,9] 1 1 0 1800 0 0 1 5 5 0 0 51408 30908001 31230 0 [15,40,0,0] 1 1 0 0 0 0 1 5 5 0 0 -- Gitblit v1.8.0