From 8e8ef302eaf503af9ae7c39ae869123089f00789 Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期四, 08 十一月 2018 10:18:16 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagStore.txt | 2 +-
db/PyMongoDataServer/PySysDB/tagChestsAward.txt | 42 +++++++++++++++++++++---------------------
db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt | 14 +++++++-------
3 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
index 74e320c..908b074 100644
--- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
@@ -135,34 +135,34 @@
2348 0 [[5000,[3506,1]],[10000,[3516,1]]] 1
2349 0 [[3000,[4151,10]],[5000,[4151,11]],[7000,[4151,12]],[8000,[4151,13]],[9000,[4151,14]],[10000,[4151,15]]] 1
2350 0 [[3000,[181,10]],[5000,[181,11]],[7000,[181,12]],[8000,[181,13]],[9000,[181,14]],[10000,[181,15]]] 1
-2351 0 4151_5 [[10000,[4253,1]]] [[7000,0],[10000,1]] [4253]
+2351 0 4151_5 [[10000,[4253,1]]] [[1560,0],[10000,1]] [4253]
2352 0 4151_10 [[10000,[4253,1]]] 1 [4253]
-2353 0 4151_10 [[10000,[4253,1]]] [[5000,0],[10000,1]] [4253]
-2354 0 4151_10 [[10000,[4253,1]]] [[7500,0],[10000,1]] [4253]
-2355 0 181_5 [[10000,[224,1]]] [[7000,0],[10000,1]] [224]
+2353 0 4151_10 [[10000,[4253,1]]] [[3600,0],[10000,1]] [4253]
+2354 0 4151_10 [[10000,[4253,1]]] [[6800,0],[10000,1]] [4253]
+2355 0 181_5 [[10000,[224,1]]] [[6620,0],[10000,1]] [224]
2356 0 181_10 [[10000,[224,1]]] 1 [224]
-2357 0 181_10 [[10000,[224,1]]] [[5000,0],[10000,1]] [224]
-2358 0 181_10 [[10000,[224,1]]] [[7500,0],[10000,1]] [224]
-2359 0 4151_5 [[10000,[4252,1]]] [[7000,0],[10000,1]] [4252]
+2357 0 181_10 [[10000,[224,1]]] [[3600,0],[10000,1]] [224]
+2358 0 181_10 [[10000,[224,1]]] [[6800,0],[10000,1]] [224]
+2359 0 4151_5 [[10000,[4252,1]]] [[6620,0],[10000,1]] [4252]
2360 0 4151_10 [[10000,[4252,1]]] 1 [4252]
-2361 0 4151_10 [[10000,[4252,1]]] [[5000,0],[10000,1]] [4252]
-2362 0 4151_10 [[10000,[4252,1]]] [[7500,0],[10000,1]] [4252]
-2363 0 181_5 [[10000,[222,1]]] [[9900,0],[10000,1]] [222]
+2361 0 4151_10 [[10000,[4252,1]]] [[3600,0],[10000,1]] [4252]
+2362 0 4151_10 [[10000,[4252,1]]] [[6800,0],[10000,1]] [4252]
+2363 0 181_5 [[10000,[222,1]]] [[9160,0],[10000,1]] [222]
2364 0 181_10 [[10000,[222,1]]] 1 [222]
-2365 0 181_10 [[10000,[222,1]]] [[5000,0],[10000,1]] [222]
-2366 0 181_10 [[10000,[222,1]]] [[7500,0],[10000,1]] [222]
-2367 0 4151_5 [[10000,[4250,1]]] [[9900,0],[10000,1]] [4250]
+2365 0 181_10 [[10000,[222,1]]] [[3600,0],[10000,1]] [222]
+2366 0 181_10 [[10000,[222,1]]] [[6800,0],[10000,1]] [222]
+2367 0 4151_5 [[10000,[4250,1]]] [[9160,0],[10000,1]] [4250]
2368 0 4151_10 [[10000,[4250,1]]] 1 [4250]
-2369 0 4151_10 [[10000,[4250,1]]] [[5000,0],[10000,1]] [4250]
-2370 0 4151_10 [[10000,[4250,1]]] [[7500,0],[10000,1]] [4250]
-2371 0 181_5 [[10000,[223,1]]] [[9900,0],[10000,1]] [223]
+2369 0 4151_10 [[10000,[4250,1]]] [[3600,0],[10000,1]] [4250]
+2370 0 4151_10 [[10000,[4250,1]]] [[6800,0],[10000,1]] [4250]
+2371 0 181_5 [[10000,[223,1]]] [[9170,0],[10000,1]] [223]
2372 0 181_10 [[10000,[223,1]]] 1 [223]
-2373 0 181_10 [[10000,[223,1]]] [[5000,0],[10000,1]] [223]
-2374 0 181_10 [[10000,[223,1]]] [[7500,0],[10000,1]] [223]
-2375 0 4151_5 [[10000,[4251,1]]] [[9900,0],[10000,1]] [4251]
+2373 0 181_10 [[10000,[223,1]]] [[3600,0],[10000,1]] [223]
+2374 0 181_10 [[10000,[223,1]]] [[6800,0],[10000,1]] [223]
+2375 0 4151_5 [[10000,[4251,1]]] [[9170,0],[10000,1]] [4251]
2376 0 4151_10 [[10000,[4251,1]]] 1 [4251]
-2377 0 4151_10 [[10000,[4251,1]]] [[5000,0],[10000,1]] [4251]
-2378 0 4151_10 [[10000,[4251,1]]] [[7500,0],[10000,1]] [4251]
+2377 0 4151_10 [[10000,[4251,1]]] [[3600,0],[10000,1]] [4251]
+2378 0 4151_10 [[10000,[4251,1]]] [[6800,0],[10000,1]] [4251]
2379 0 [[5000,[4151,3]],[7000,[4151,4]],[9000,[4151,5]],[10000,[4151,6]]] 1
2380 0 [[5000,[181,3]],[7000,[181,4]],[9000,[181,5]],[10000,[181,6]]] 1
2381 0 [[2000,[4611,1]],[4000,[4612,1]],[6000,[4613,1]],[8000,[4614,1]],[9990,[4615,1]],[10000,[4609,1]]] 1 [4609]
diff --git a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
index 488d5a7..54468f1 100644
--- a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
+++ b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
@@ -239,10 +239,10 @@
20303005 0 0 0 0 [(394309,0),(537642,(7,2,107)),(1000000,(7,3,107))] 20 {(7,4,107):1000000,(7,5,107):2000} 1 {4:2,5:1} {3:[(9600,0),(10000,1)],4:[(9000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {} {} {1000:0,2000:1600000,2001:1000000,2002:400000,3001:210000,3002:75000,3003:15000} {} {} 25 800 1129 1694 [] [1144]
20303006 0 0 0 0 [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))] 20 {(8,4,107):1000000,(8,5,107):2000} 1 {4:2,5:1} {3:[(9600,0),(10000,1)],4:[(9000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {} {} {1000:0,2000:1550000,2001:1000000,2002:450000,3001:280000,3002:100000,3003:20000} {} {} 25 800 1356 1824 [] [1144]
20303007 0 0 0 0 [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))] 20 {(8,4,107):1000000,(8,5,107):2000} 1 {4:2,5:1} {3:[(9600,0),(10000,1)],4:[(9000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {} {} {1000:0,2000:1500000,2001:1000000,2002:500000,3001:350000,3002:125000,3003:25000} {} {} 25 800 1356 1824 [] [1144]
-50103001 0 0 0 0 [] 0 {} 0 {} {} [] [] {4202:62500,4253:1000000,4151:1000000,2379:1000000} {4253:3,4151:30,2379:2} {} {} {} 0 0 0 0 [] [1023]
-50103002 0 0 0 0 [] 0 {} 0 {} {} [] [] {250:31250,224:1000000,181:1000000,2380:1000000} {224:5,181:40,2380:3} {} {} {} 0 0 0 0 [] [1023]
-50103003 0 0 0 0 [] 0 {} 0 {} {} [] [] {4213:31250,4252:1000000,4151:1000000,2379:1000000} {4252:5,4151:40,2379:3} {} {} {} 0 0 0 0 [] [1023]
-50103004 0 0 0 0 [] 0 {} 0 {} {} [] [] {260:20833,222:1000000,181:1000000,2383:1000000} {222:3,181:50,2383:6} {} {} {} 0 0 0 0 [] [1023]
-50103005 0 0 0 0 [] 0 {} 0 {} {} [] [] {4209:20833,4250:1000000,4151:1000000,2384:1000000} {4250:3,4151:50,2384:6} {} {} {} 0 0 0 0 [] [1023]
-50103006 0 0 0 0 [] 0 {} 0 {} {} [] [] {258:4166,223:1000000,181:1000000,2385:1000000} {223:3,181:60,2385:8} {} {} {} 0 0 0 0 [] [1023]
-50103007 0 0 0 0 [] 0 {} 0 {} {} [] [] {4210:4166,4251:1000000,4151:1000000,2386:1000000} {4251:3,4151:60,2386:8} {} {} {} 0 0 0 0 [] [1023]
+50103001 0 0 0 0 [] 0 {} 0 {} {} [] [] {4151:1000000,4202:250000,4253:1000000,2379:1000000} {4151:30,4253:4,2379:2} {} {} {} 0 0 0 0 [] [1023]
+50103002 0 0 0 0 [] 0 {} 0 {} {} [] [] {181:1000000,250:150000,224:1000000,2380:1000000} {181:40,224:4,2380:3} {} {} {} 0 0 0 0 [] [1023]
+50103003 0 0 0 0 [] 0 {} 0 {} {} [] [] {4151:1000000,4213:150000,4252:1000000,2379:1000000} {4151:40,4252:4,2379:3} {} {} {} 0 0 0 0 [] [1023]
+50103004 0 0 0 0 [] 0 {} 0 {} {} [] [] {181:1000000,260:7000,222:1000000,2383:1000000} {181:50,222:5,2383:6} {} {} {} 0 0 0 0 [] [1023]
+50103005 0 0 0 0 [] 0 {} 0 {} {} [] [] {4151:1000000,4209:7000,4250:1000000,2384:1000000} {4151:50,4250:5,2384:6} {} {} {} 0 0 0 0 [] [1023]
+50103006 0 0 0 0 [] 0 {} 0 {} {} [] [] {181:1000000,258:2300,223:1000000,2385:1000000} {181:60,223:5,2385:8} {} {} {} 0 0 0 0 [] [1023]
+50103007 0 0 0 0 [] 0 {} 0 {} {} [] [] {4151:1000000,4210:2300,4251:1000000,2386:1000000} {4151:60,4251:5,2386:8} {} {} {} 0 0 0 0 [] [1023]
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index a5514b0..36114a2 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -61,7 +61,7 @@
167 4 0 261 1 1 [] 0 0 0 132 1 0 2 588 0 0
168 4 0 5410 1 1 [] 0 0 0 240 0 0 2 50 0 0
169 4 0 5411 1 1 [] 0 0 0 260 0 0 2 100 0 0
-201 5 0 12 1 1 [] 0 4 0 0 1 0 16 80 0 0
+201 5 0 13 1 1 [] 0 4 0 0 1 0 16 80 0 0
203 5 0 954 1 1 [] 0 4 0 0 20 0 16 5 0 0
204 5 0 181 1 1 [] 0 4 0 0 6 0 16 100 0 0
205 5 0 911 1 1 [] 0 4 0 0 1 0 16 100 0 0
--
Gitblit v1.8.0