From 6837d0c5a1194abd39afbf4b652f1518cb6f2888 Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期五, 24 八月 2018 15:20:46 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagFBLine.txt | 16 ++++++++--------
db/PyMongoDataServer/SysDB/tagChinNPC.txt | 44 ++++++++++++++++++++++----------------------
2 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/db/PyMongoDataServer/PySysDB/tagFBLine.txt b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
index 093b4f7..4120b6e 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBLine.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
@@ -45,14 +45,14 @@
31220 0 31220 110 0 0 0 0 0 0 0 0 [12,23]
31230 0 31230 0 0 0 0 0 0 0 0 0 [12,6] [900,[30,20,10,9,8,7,6,5,4,3,2,1]]
31240 0 31240 0 0 0 4010 2 80 0 0 0 [32,16] [5,1800,15,101]
-51010 0 51010 190 500 0 0 0 0 0 0 0 [24,20,3] [10,1800,10] [{5101011:1},{5101012:1},{5101013:1},{5101014:1}] [135,33,33,33,33] [424500, [141,10]]
-51010 1 51010 190 500 0 0 0 0 0 0 0 [70,19,3] [10,1800,10] [{5101021:1},{5101022:1},{5101023:1},{5101024:1}] [135,33,33,33,33] [536000, [141,10]]
-51010 2 51010 190 500 0 0 0 0 0 0 0 [126,9,3] [10,1800,10] [{5101031:1, 5101032:1}] [152,38,38,38,38] [665000, [141,15]]
-51010 3 51010 190 500 0 0 0 0 0 0 0 [30,62,3] [10,1800,10] [{5101041:0, 5101042:1}] [155,38,38,38,38] [812000, [142,10]]
-51010 4 51010 190 500 0 0 0 0 0 0 0 [84,63,3] [10,1800,10] [{5101051:1, 5101052:0}] [150,38,38,38,38] [975500, [142,15]]
-51010 5 51010 190 500 0 0 0 0 0 0 0 [137,73,3] [10,1800,10] [{5101061:0,5101063:0, 5101064:0, 5101065:0, 5101062:1}] [153,38,38,38,38] [1157000, [143,10]]
-51010 6 51010 190 500 0 0 0 0 0 0 0 [14,114,3] [10,1800,10] [{5101071:1, 5101072:0}] [155,38,38,38,38] [1356500, [143,15]]
-51010 7 51010 190 500 0 0 0 0 0 0 0 [71,111,3] [10,1800,10] [{5101081:1}] [220,38,38,38,38] [1573500, [144,10]]
+51010 0 51010 160 500 0 0 0 0 0 0 0 [24,20,3] [10,1800,10] [{5101011:1},{5101012:1},{5101013:1},{5101014:1}] [135,33,33,33,33] [424500, [141,10]]
+51010 1 51010 160 500 0 0 0 0 0 0 0 [70,19,3] [10,1800,10] [{5101021:1},{5101022:1},{5101023:1},{5101024:1}] [135,33,33,33,33] [536000, [141,10]]
+51010 2 51010 160 500 0 0 0 0 0 0 0 [126,9,3] [10,1800,10] [{5101031:1, 5101032:1}] [152,38,38,38,38] [665000, [141,15]]
+51010 3 51010 160 500 0 0 0 0 0 0 0 [30,62,3] [10,1800,10] [{5101041:0, 5101042:1}] [155,38,38,38,38] [812000, [142,10]]
+51010 4 51010 160 500 0 0 0 0 0 0 0 [84,63,3] [10,1800,10] [{5101051:1, 5101052:0}] [150,38,38,38,38] [975500, [142,15]]
+51010 5 51010 160 500 0 0 0 0 0 0 0 [137,73,3] [10,1800,10] [{5101061:0,5101063:0, 5101064:0, 5101065:0, 5101062:1}] [153,38,38,38,38] [1157000, [143,10]]
+51010 6 51010 160 500 0 0 0 0 0 0 0 [14,114,3] [10,1800,10] [{5101071:1, 5101072:0}] [155,38,38,38,38] [1356500, [143,15]]
+51010 7 51010 160 500 0 0 0 0 0 0 0 [71,111,3] [10,1800,10] [{5101081:1}] [220,38,38,38,38] [1573500, [144,10]]
60010 0 60010 105 500 0 0 0 0 0 0 0 [83,13] [10,1800,50,10] [[[(30601001,8)],[(30601002,12)],[(30603001,1)]], [101,102,103,104,105]] {1:[[1131,1,1]],2:[[1131,2,1]],3:[[1131,3,1]],4:[[1131,4,1]],5:[[1131,5,1]]}
60010 1 60010 150 500 0 0 0 0 0 0 0 [208,24] [10,1800,50,10] [[[(30601003,8)],[(30601004,10)],[(30601005,2)],[(30603002,1)]], [106,107,108,109,110]] {1:[[1132,1,1]],2:[[1132,2,1]],3:[[1132,3,1]],4:[[1132,4,1]],5:[[1132,5,2]]}
60010 2 60010 200 500 0 0 0 0 0 0 0 [317,21] [10,1800,50,10] [[[(30601006,8)],[(30601007,12)],[(30601008,2)],[(30603003,1)]], [111,112,113,114,115]] {1:[[1133,1,1]],2:[[1133,2,1]],3:[[1133,3,1]],4:[[1133,4,1]],5:[[1133,5,2]]}
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index d9fbb96..2fdcc42 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -759,32 +759,32 @@
60203020 18 0 刑天之主 455 2 303827 303827 0 21 0 0 10000 10546 0 0 0 0 0 0 0 0 2500 2274753 57 0 300 0 6 23010 0 0 0 0 0 0 0 1 10 2 72283925 477365 0 0 0 5 0 0 186 1 1
61103000 2 0 境界·个人 80 2 970 970 210 1 0 0 10000 357 0 0 0 0 0 0 32406 0 2500 279006 12 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 75546 0 0 0 0 3 0 7 186 1 1
61103001 2 0 境界·个人 110 2 1881 1881 531 2 0 0 10000 735 0 0 0 0 0 0 97301 0 2500 390039 16 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 193528 0 0 0 0 3 0 8 186 1 1
-61103002 2 0 境界·个人 140 2 3676 3676 1373 5 0 0 10000 1444 0 0 0 0 0 0 229079 0 2500 505817 19 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 782235 0 0 0 0 3 0 9 186 1 1
-61103003 2 0 境界·个人 160 2 5068 5068 2157 7 0 0 10000 1975 0 0 0 0 0 0 377626 0 2500 634880 22 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 1631537 0 0 0 0 3 0 10 186 1 1
-61103004 2 0 境界·个人 205 2 10109 10109 1300 9 0 0 10000 3582 0 0 0 0 0 0 1034753 0 2500 916733 28 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 7798849 0 0 0 0 3 0 11 186 1 1
-61103005 2 0 境界·个人 230 2 13205 13205 1914 11 0 0 10000 4529 0 0 0 0 0 0 1599712 0 2500 1105585 31 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 17033779 0 0 0 0 3 0 12 186 1 1
-61103006 2 0 境界·个人 260 2 22483 22483 3167 12 0 0 10000 7083 0 0 0 0 0 0 3076461 0 2500 1353274 34 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 45790147 0 0 0 0 3 0 13 186 1 1
-61103007 2 0 境界·个人 270 2 25322 25322 3529 14 0 0 10000 7899 0 0 0 0 0 0 3861992 0 2500 1435837 35 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 61922664 0 0 0 0 3 0 14 186 1 1
-61103008 2 0 境界·个人 300 2 36300 36300 4878 15 0 0 10000 10398 0 0 0 0 0 0 5905484 0 2500 1683526 39 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 13434613 0 0 0 0 3 0 15 186 1 1
-61103009 2 0 境界·个人 310 2 41016 41016 5448 17 0 0 10000 12066 0 0 0 0 0 0 6899204 0 2500 1766089 40 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 45379347 1 0 0 0 3 0 16 186 1 1
-61103010 2 0 境界·个人 330 2 47716 47716 6487 18 0 0 10000 15663 0 0 0 0 0 0 8825643 0 2500 1931215 42 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 11967142 1 0 0 0 3 0 17 186 1 1
-61103011 2 0 境界·个人 340 2 53346 53346 7169 20 0 0 10000 21428 0 0 0 0 0 0 10064820 0 2500 2013778 43 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 56463077 2 0 0 0 3 0 18 186 1 1
-61103012 2 0 境界·个人 360 2 69197 69197 9085 21 0 0 10000 31498 0 0 0 0 0 0 13190829 0 2500 2110576 46 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 87213557 4 0 0 0 3 0 19 186 1 1
-61103013 2 0 境界·个人 370 2 79320 79320 10067 19 0 0 10000 34333 0 0 0 0 0 0 14719199 0 2500 2124811 47 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 34509702 5 0 0 0 3 0 20 186 1 1
-61103014 2 0 境界·个人 380 2 88990 88990 10908 21 0 0 10000 40066 0 0 0 0 0 0 16261918 0 2500 2139046 48 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 83875376 6 0 0 0 3 0 21 186 1 1
-61103015 2 0 境界·个人 390 2 102568 102568 11665 21 0 0 10000 44150 0 0 0 0 0 0 17893461 0 2500 2153281 49 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 34923272 8 0 0 0 3 0 22 186 1 1
-61103016 2 0 境界·个人 400 2 112283 112283 12383 22 0 0 10000 45036 0 0 0 0 0 0 19274365 0 2500 2167516 50 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 87879649 8 0 0 0 3 0 23 186 1 1
-61103017 2 0 境界·个人 410 2 120139 120139 12906 22 0 0 10000 46434 0 0 0 0 0 0 21459509 0 2500 2181751 51 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 47575284 9 0 0 0 3 0 24 186 1 1
-61103018 2 0 境界·个人 420 2 126156 126156 13376 22 0 0 10000 47395 0 0 0 0 0 0 23535315 0 2500 2195986 52 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 95579892 10 0 0 0 3 0 25 186 1 1
-61103019 2 0 境界·个人 430 2 131588 131588 13977 22 0 0 10000 48131 0 0 0 0 0 0 25450532 0 2500 2210221 53 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 33526629 10 0 0 0 3 0 26 186 1 1
-61103020 2 0 境界·个人 440 2 136985 136985 14572 22 0 0 10000 48922 0 0 0 0 0 0 27657569 0 2500 2224456 54 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 54896181 7 0 0 0 3 0 27 186 1 1
-61203001 2 0 境界·组队 125 2 3373 3373 353 4 0 0 10000 1347 0 0 0 0 0 0 145814 0 2500 459316 18 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 873071 0 0 0 0 3 0 28 186 1 1
+61103002 2 0 境界·个人 140 2 3676 3676 1373 4 0 0 10000 1444 0 0 0 0 0 0 229079 0 2500 505817 19 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 782235 0 0 0 0 3 0 9 186 1 1
+61103003 2 0 境界·个人 160 2 5068 5068 2157 5 0 0 10000 1975 0 0 0 0 0 0 377626 0 2500 634880 22 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 1631537 0 0 0 0 3 0 10 186 1 1
+61103004 2 0 境界·个人 205 2 10109 10109 1300 7 0 0 10000 3582 0 0 0 0 0 0 1034753 0 2500 916733 28 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 7798849 0 0 0 0 3 0 11 186 1 1
+61103005 2 0 境界·个人 230 2 13205 13205 1914 9 0 0 10000 4529 0 0 0 0 0 0 1599712 0 2500 1105585 31 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 17033779 0 0 0 0 3 0 12 186 1 1
+61103006 2 0 境界·个人 260 2 22483 22483 3167 11 0 0 10000 7083 0 0 0 0 0 0 3076461 0 2500 1353274 34 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 45790147 0 0 0 0 3 0 13 186 1 1
+61103007 2 0 境界·个人 270 2 25322 25322 3529 12 0 0 10000 7899 0 0 0 0 0 0 3861992 0 2500 1435837 35 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 61922664 0 0 0 0 3 0 14 186 1 1
+61103008 2 0 境界·个人 300 2 36300 36300 4878 14 0 0 10000 10398 0 0 0 0 0 0 5905484 0 2500 1683526 39 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 13434613 0 0 0 0 3 0 15 186 1 1
+61103009 2 0 境界·个人 310 2 41016 41016 5448 15 0 0 10000 12066 0 0 0 0 0 0 6899204 0 2500 1766089 40 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 45379347 1 0 0 0 3 0 16 186 1 1
+61103010 2 0 境界·个人 330 2 47716 47716 6487 17 0 0 10000 15663 0 0 0 0 0 0 8825643 0 2500 1931215 42 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 11967142 1 0 0 0 3 0 17 186 1 1
+61103011 2 0 境界·个人 340 2 53346 53346 7169 18 0 0 10000 21428 0 0 0 0 0 0 10064820 0 2500 2013778 43 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 56463077 2 0 0 0 3 0 18 186 1 1
+61103012 2 0 境界·个人 360 2 69197 69197 9085 20 0 0 10000 31498 0 0 0 0 0 0 13190829 0 2500 2110576 46 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 87213557 4 0 0 0 3 0 19 186 1 1
+61103013 2 0 境界·个人 370 2 79320 79320 10067 21 0 0 10000 34333 0 0 0 0 0 0 14719199 0 2500 2124811 47 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 34509702 5 0 0 0 3 0 20 186 1 1
+61103014 2 0 境界·个人 380 2 88990 88990 10908 22 0 0 10000 40066 0 0 0 0 0 0 16261918 0 2500 2139046 48 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 83875376 6 0 0 0 3 0 21 186 1 1
+61103015 2 0 境界·个人 390 2 102568 102568 11665 23 0 0 10000 44150 0 0 0 0 0 0 17893461 0 2500 2153281 49 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 34923272 8 0 0 0 3 0 22 186 1 1
+61103016 2 0 境界·个人 400 2 112283 112283 12383 24 0 0 10000 45036 0 0 0 0 0 0 19274365 0 2500 2167516 50 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 87879649 8 0 0 0 3 0 23 186 1 1
+61103017 2 0 境界·个人 410 2 120139 120139 12906 25 0 0 10000 46434 0 0 0 0 0 0 21459509 0 2500 2181751 51 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 47575284 9 0 0 0 3 0 24 186 1 1
+61103018 2 0 境界·个人 420 2 126156 126156 13376 26 0 0 10000 47395 0 0 0 0 0 0 23535315 0 2500 2195986 52 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 95579892 10 0 0 0 3 0 25 186 1 1
+61103019 2 0 境界·个人 430 2 131588 131588 13977 27 0 0 10000 48131 0 0 0 0 0 0 25450532 0 2500 2210221 53 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 33526629 10 0 0 0 3 0 26 186 1 1
+61103020 2 0 境界·个人 440 2 136985 136985 14572 28 0 0 10000 48922 0 0 0 0 0 0 27657569 0 2500 2224456 54 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 54896181 7 0 0 0 3 0 27 186 1 1
+61203001 2 0 境界·组队 125 2 3373 3373 353 3 0 0 10000 1347 0 0 0 0 0 0 145814 0 2500 459316 18 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 873071 0 0 0 0 3 0 28 186 1 1
61203002 2 0 境界·组队 190 2 7395 7395 1039 6 0 0 10000 2617 0 0 0 0 0 0 746532 0 2500 809496 26 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 4487771 0 0 0 0 3 0 29 186 1 1
61203003 2 0 境界·组队 220 2 11223 11223 1631 8 0 0 10000 3784 0 0 0 0 0 0 1336445 0 2500 1023022 29 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 13221460 0 0 0 0 3 0 30 186 1 1
61203004 2 0 境界·组队 250 2 16155 16155 2351 10 0 0 10000 5126 0 0 0 0 0 0 2179851 0 2500 1270711 33 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 28363570 3 0 0 0 3 0 31 186 1 1
61203005 2 0 境界·组队 290 2 34494 34494 4372 13 0 0 10000 10339 0 0 0 0 0 0 5251783 0 2500 1600963 38 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 3212140 6 0 0 0 3 0 32 186 1 1
-61203006 2 0 境界·组队 320 2 46696 46696 5939 22 0 0 10000 14845 0 0 0 0 0 0 7805561 0 2500 1848652 41 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 88063227 8 0 0 0 3 0 33 186 1 1
-61203007 2 0 境界·组队 350 2 64856 64856 8169 22 0 0 10000 29877 0 0 0 0 0 0 11509678 0 2500 2096341 45 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 31568220 10 0 0 0 3 0 34 186 1 1
+61203006 2 0 境界·组队 320 2 46696 46696 5939 16 0 0 10000 14845 0 0 0 0 0 0 7805561 0 2500 1848652 41 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 88063227 8 0 0 0 3 0 33 186 1 1
+61203007 2 0 境界·组队 350 2 64856 64856 8169 19 0 0 10000 29877 0 0 0 0 0 0 11509678 0 2500 2096341 45 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 31568220 10 0 0 0 3 0 34 186 1 1
61203008 2 0 境界·组队 380 2 94952 94952 10908 22 0 0 10000 41516 0 0 0 0 0 0 16261918 0 2500 2139046 48 0 300 0 6 23010 0 0 0 0 0 0 0 1 20 2 16133735 40 0 0 0 3 0 35 186 1 1
61303001 14 0 仙盟采集桌 1 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 0 0 0 300 0 0 0 0 0 0 0 0 0 0 0 15 2 3000 0 0 0 0 0 0 0 214 0 1
30601001 2 0 暗影剑士 105 0 643 643 0 2 0 0 0 159 0 0 0 0 0 0 0 0 2500 38634 16 0 300 2 4 0 0 0 0 0 0 0 0 0 15 2 47423 0 0 0 0 1 0 0 1 1 1
--
Gitblit v1.8.0