From 2d31f4c2de8d6569e2b7c9c532a0279027f70241 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期二, 23 十月 2018 14:21:46 +0800
Subject: [PATCH] Merge branch '1.1.0' of http://192.168.0.87:10010/r/snxx_server into 1.1.0
---
db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt | 36 ++++++++++++++++++------------------
db/PyMongoDataServer/SysDB/tagChinItem.txt | 2 +-
db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt | 21 +++++++++++++++++++++
3 files changed, 40 insertions(+), 19 deletions(-)
diff --git a/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt b/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt
index e77f372..03020db 100644
--- a/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt
+++ b/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt
@@ -55,26 +55,26 @@
10080 10801005 340 360 12124
10080 10802001 340 360 14548
10080 10803001 0 0 0
-10090 10901001 300 320 13922
-10090 10901002 310 330 17009
-10090 10901003 320 340 18869
-10090 10901004 330 350 20697
-10090 10901005 340 360 23406
-10090 10902001 340 360 28087
+10090 10901001 350 370 12510
+10090 10901002 360 380 13052
+10090 10901003 370 390 14110
+10090 10901004 380 400 14873
+10090 10901005 390 410 16232
+10090 10902001 390 410 18394
10090 10903001 0 0 0
-10100 11001001 300 320 13922
-10100 11001002 310 330 17009
-10100 11001003 320 340 18869
-10100 11001004 330 350 20697
-10100 11001005 340 360 23406
-10100 11002001 340 360 28087
+10100 11001001 400 420 17343
+10100 11001002 410 430 18058
+10100 11001003 420 440 18932
+10100 11001004 430 450 19857
+10100 11001005 440 460 21459
+10100 11002001 440 460 24349
10100 11003001 0 0 0
-10110 11101001 300 320 13922
-10110 11101002 310 330 17009
-10110 11101003 320 340 18869
-10110 11101004 330 350 20697
-10110 11101005 340 360 23406
-10110 11102001 340 360 28087
+10110 11101001 450 470 22783
+10110 11101002 460 480 23635
+10110 11101003 470 490 24601
+10110 11101004 480 500 25806
+10110 11101005 490 510 27697
+10110 11102001 490 510 32059
10110 11103001 0 0 0
21070 20102001 110 130 767
21070 20102002 120 140 867
diff --git a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
index 044a3d2..7fbd4b5 100644
--- a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
+++ b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
@@ -47,6 +47,24 @@
10801004 0 400 1 0 [(998886,0),(999070,(7,1,107)),(999910,(7,2,107)),(1000000,(7,3,107))] 1 {} 0 {} {3:[(100,0)]} [] [] {951:5,4002:12,4003:12,4501:0,4008:3,4009:3,4005:9,4006:9,4502:0,956:10,4151:19,181:42} {} {} {} {} 1 200 112 168 [] []
10801005 0 410 1 0 [(998459,0),(998643,(7,1,107)),(999903,(7,2,107)),(1000000,(7,3,107))] 1 {} 0 {} {3:[(100,0)]} [] [] {951:5,4002:12,4003:12,4501:0,4008:4,4009:4,4005:9,4006:9,4502:0,956:10,4151:19,181:42} {} {} {} {} 1 200 112 169 [] []
10802001 0 410 1 0 [(996987,0),(997307,(7,1,107)),(999819,(7,2,107)),(1000000,(7,3,107))] 1 {} 0 {} {3:[(100,0)]} [] [] {951:9,4002:21,4003:21,4501:0,4008:7,4009:7,4005:15,4006:15,4502:0,956:18,4151:33,181:72} {} {} {} {} 1 200 112 169 [] []
+10901001 0 420 1 0 [(999136,0),(999386,(8,1,107)),(999901,(8,2,107)),(1000000,(8,3,107))] 1 {} 0 {} {3:[(100,0)]} [] [] {951:5,4002:10,4003:10,4501:0,4008:4,4009:4,4005:9,4006:9,4502:0,956:11,4151:21,181:42} {} {} {} {} 1 200 112 170 [] []
+10901002 0 430 1 0 [(999081,0),(999331,(8,1,107)),(999891,(8,2,107)),(1000000,(8,3,107))] 1 {} 0 {} {3:[(100,0)]} [] [] {951:5,4002:10,4003:10,4501:0,4008:4,4009:4,4005:9,4006:9,4502:0,956:11,4151:21,181:42} {} {} {} {} 1 200 112 170 [] []
+10901003 0 440 1 0 [(998600,0),(998850,(8,1,107)),(999881,(8,2,107)),(1000000,(8,3,107))] 1 {} 0 {} {3:[(100,0)]} [] [] {951:5,4002:10,4003:10,4501:0,4008:4,4009:4,4005:9,4006:9,4502:0,956:12,4151:21,181:42} {} {} {} {} 1 200 112 170 [] []
+10901004 0 450 1 0 [(998422,0),(998672,(8,1,107)),(999872,(8,2,107)),(1000000,(8,3,107))] 1 {} 0 {} {3:[(100,0)]} [] [] {951:5,4002:10,4003:10,4501:0,4008:4,4009:4,4005:9,4006:9,4502:0,956:12,4151:21,181:42} {} {} {} {} 1 200 112 170 [] []
+10901005 0 460 1 0 [(997812,0),(998062,(8,1,107)),(999862,(8,2,107)),(1000000,(8,3,107))] 1 {} 0 {} {3:[(100,0)]} [] [] {951:5,4002:10,4003:10,4501:0,4008:4,4009:4,4005:9,4006:9,4502:0,956:12,4151:21,181:42} {} {} {} {} 1 200 112 170 [] []
+10902001 0 460 1 0 [(995946,0),(996357,(8,1,107)),(999755,(8,2,107)),(1000000,(8,3,107))] 1 {} 0 {} {3:[(100,0)]} [] [] {951:9,4002:18,4003:18,4501:0,4008:7,4009:7,4005:15,4006:15,4502:0,956:21,4151:36,181:72} {} {} {} {} 1 200 112 170 [] []
+11001001 0 470 1 0 [(999136,0),(999386,(9,1,107)),(999901,(9,2,107)),(1000000,(9,3,107))] 1 {} 0 {} {3:[(100,0)]} [] [] {951:5,4002:10,4003:10,4501:0,4008:4,4009:4,4005:9,4006:9,4502:0,956:12,4151:21,181:42} {} {} {} {} 1 200 112 175 [] []
+11001002 0 480 1 0 [(999081,0),(999331,(9,1,107)),(999891,(9,2,107)),(1000000,(9,3,107))] 1 {} 0 {} {3:[(100,0)]} [] [] {951:5,4002:10,4003:10,4501:0,4008:4,4009:4,4005:9,4006:9,4502:0,956:12,4151:21,181:42} {} {} {} {} 1 200 112 175 [] []
+11001003 0 490 1 0 [(998600,0),(998850,(9,1,107)),(999881,(9,2,107)),(1000000,(9,3,107))] 1 {} 0 {} {3:[(100,0)]} [] [] {951:5,4002:10,4003:10,4501:0,4008:4,4009:4,4005:9,4006:9,4502:0,956:12,4151:21,181:42} {} {} {} {} 1 200 112 175 [] []
+11001004 0 500 1 0 [(998422,0),(998672,(9,1,107)),(999872,(9,2,107)),(1000000,(9,3,107))] 1 {} 0 {} {3:[(100,0)]} [] [] {951:5,4002:10,4003:10,4501:0,4008:4,4009:4,4005:9,4006:9,4502:0,956:12,4151:21,181:42} {} {} {} {} 1 200 112 175 [] []
+11001005 0 510 1 0 [(997812,0),(998062,(9,1,107)),(999862,(9,2,107)),(1000000,(9,3,107))] 1 {} 0 {} {3:[(100,0)]} [] [] {951:5,4002:10,4003:10,4501:0,4008:4,4009:4,4005:9,4006:9,4502:0,956:12,4151:21,181:42} {} {} {} {} 1 200 112 175 [] []
+11002001 0 510 1 0 [(995946,0),(996357,(9,1,107)),(999755,(9,2,107)),(1000000,(9,3,107))] 1 {} 0 {} {3:[(100,0)]} [] [] {951:9,4002:18,4003:18,4501:0,4008:7,4009:7,4005:15,4006:15,4502:0,956:21,4151:36,181:72} {} {} {} {} 1 200 112 175 [] []
+11101001 0 520 1 0 [(999136,0),(999386,(10,1,107)),(999901,(10,2,107)),(1000000,(10,3,107))] 1 {} 0 {} {3:[(100,0)]} [] [] {951:5,4002:10,4003:10,4501:0,4008:4,4009:4,4005:9,4006:9,4502:0,956:12,4151:21,181:42} {} {} {} {} 1 200 112 180 [] []
+11101002 0 530 1 0 [(999081,0),(999331,(10,1,107)),(999891,(10,2,107)),(1000000,(10,3,107))] 1 {} 0 {} {3:[(100,0)]} [] [] {951:5,4002:10,4003:10,4501:0,4008:4,4009:4,4005:9,4006:9,4502:0,956:12,4151:21,181:42} {} {} {} {} 1 200 112 180 [] []
+11101003 0 540 1 0 [(998600,0),(998850,(10,1,107)),(999881,(10,2,107)),(1000000,(10,3,107))] 1 {} 0 {} {3:[(100,0)]} [] [] {951:5,4002:10,4003:10,4501:0,4008:4,4009:4,4005:9,4006:9,4502:0,956:12,4151:21,181:42} {} {} {} {} 1 200 112 180 [] []
+11101004 0 550 1 0 [(998422,0),(998672,(10,1,107)),(999872,(10,2,107)),(1000000,(10,3,107))] 1 {} 0 {} {3:[(100,0)]} [] [] {951:5,4002:10,4003:10,4501:0,4008:4,4009:4,4005:9,4006:9,4502:0,956:12,4151:21,181:42} {} {} {} {} 1 200 112 180 [] []
+11101005 0 560 1 0 [(997812,0),(998062,(10,1,107)),(999862,(10,2,107)),(1000000,(10,3,107))] 1 {} 0 {} {3:[(100,0)]} [] [] {951:5,4002:10,4003:10,4501:0,4008:4,4009:4,4005:9,4006:9,4502:0,956:12,4151:21,181:42} {} {} {} {} 1 200 112 180 [] []
+11102001 0 560 1 0 [(995946,0),(996357,(10,1,107)),(999755,(10,2,107)),(1000000,(10,3,107))] 1 {} 0 {} {3:[(100,0)]} [] [] {951:9,4002:18,4003:18,4501:0,4008:7,4009:7,4005:15,4006:15,4502:0,956:21,4151:36,181:72} {} {} {} {} 1 200 112 180 [] []
10103001 0 70 0 0 [] 0 {} 0 {} {} [] [] {} {} {} {} {} 0 0 0 0 [1,1,1,[8011,1007]] []
10203001 0 85 0 0 [] 0 {} 0 {} {} [] [] {} {} {} {} {} 0 0 0 0 [1,1,1,[8021,1008]] []
10303001 0 160 2 0 [] 0 {} 0 {} {} [1,3,3,[(10000,1)],107] [] {} {} {} {} {} 25 800 915 1372 [1,1,1,[1014]] []
@@ -59,6 +77,9 @@
10703001 290 400 2 0 [(397839,0),(541172,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1300000,(6,5,107):50000,(6,2,108):100000,(6,3,108):10000,(6,4,108):2500} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(6000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:200000,3802:20000,3803:5000,9051:6173,2320:100000,2339:20000,2340:80000} {} {} {} {} 25 800 1129 1694 [] [999,3904]
10703001 1000 400 2 0 [(397839,0),(541172,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1300000,(6,5,107):50000,(6,2,108):100000,(6,3,108):10000,(6,4,108):2500} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(6000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:200000,3802:20000,3803:1000,9051:6173,2320:100000,2339:20000,2340:80000} {} {} {} {} 25 800 1129 1694 [] [999,3904]
10803001 1000 450 2 0 [(397839,0),(541172,(7,2,107)),(1000000,(7,3,107))] 30 {(7,4,107):1300000,(7,5,107):50000,(7,2,108):100000,(7,3,108):10000,(7,4,108):2500} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(6000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:100000,3802:20000,3803:2500,9051:7330,2320:100000,2339:20000,2340:80000} {} {} {} {} 25 800 1129 1694 [] [999,3904]
+10903001 1000 500 2 0 [(397839,0),(541172,(8,2,107)),(1000000,(8,3,107))] 30 {(8,4,107):1300000,(8,5,107):50000,(8,2,108):100000,(8,3,108):10000,(8,4,108):2500} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(6000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:50000,3802:20000,3803:2500,9051:7330,2320:100000,2339:20000,2340:80000} {} {} {} {} 25 800 1129 1694 [] [998,3904]
+11003001 1000 550 2 0 [(397839,0),(541172,(9,2,107)),(1000000,(9,3,107))] 30 {(9,4,107):1300000,(9,5,107):50000,(9,2,108):100000,(9,3,108):10000,(9,4,108):2500} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(6000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:30000,3802:20000,3803:2500,9051:7330,2320:100000,2339:20000,2340:80000} {} {} {} {} 25 800 1129 1694 [] [998,3904]
+11103001 1000 600 2 0 [(397839,0),(541172,(10,2,107)),(1000000,(10,3,107))] 30 {(10,4,107):1300000,(10,5,107):50000,(10,2,108):100000,(10,3,108):10000,(10,4,108):2500} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(6000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:20000,3802:20000,3803:2500,9051:7330,2320:100000,2339:20000,2340:80000} {} {} {} {} 25 800 1129 1694 [] [998,3904]
30201000 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {} {} {} 0 0 0 0 [] []
30201001 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {} {} {} 0 0 0 0 [] []
30201002 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {} {} {} 0 0 0 0 [] []
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index f932bef..c29831d 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -207,7 +207,7 @@
995 1 0 世界Boss经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 50 0 50 0 1 0 0 215 18000 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
996 1 0 世界Boss经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 50 0 50 0 1 0 0 215 18000 250 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
997 1 0 世界Boss经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 50 0 50 0 1 0 0 215 18000 300 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-998 1 0 世界Boss经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 50 0 50 0 1 0 0 215 18000 350 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+998 1 0 世界Boss经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 50 0 50 0 1 0 0 215 18000 600 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
999 1 0 世界Boss经验丹 13 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 50 0 50 0 1 0 0 215 18000 400 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
1000 1 0 150级升级丹 14 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 25 0 50 0 1 0 0 214 1 150 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
1001 1 0 200级升级丹 14 0 0 0 0 999 1 1 1 0 1 0 0 0 0 0 1 100 0 50 0 1 0 0 214 1 200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--
Gitblit v1.8.0