From a5e673e6a40d097166de03fd58ba0b6dcf566ee6 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期六, 10 十一月 2018 16:32:35 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagFunctionForecast.txt | 1
ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/Map107_Shgm.col | 0
db/PyMongoDataServer/PySysDB/tagStore.txt | 2
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerVip.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetVerFix.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc | 0
db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt | 67 +++++++++++++++------------------
9 files changed, 33 insertions(+), 37 deletions(-)
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/Map107_Shgm.col b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/Map107_Shgm.col
index 81e5e98..8141d77 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/Map107_Shgm.col
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/Map107_Shgm.col
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
index 780332a..7f03ff6 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/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index 87b7e0c..b598a22 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetVerFix.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetVerFix.pyc
new file mode 100644
index 0000000..0c49eb4
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetVerFix.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc
index 8945001..84b026c 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerCoin.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerVip.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerVip.pyc
index 4f07614..e15ce50 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerVip.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerVip.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagFunctionForecast.txt b/db/PyMongoDataServer/PySysDB/tagFunctionForecast.txt
index 3d57e10..1a89502 100644
--- a/db/PyMongoDataServer/PySysDB/tagFunctionForecast.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFunctionForecast.txt
@@ -14,6 +14,7 @@
145
93 {"1":[[5410,1]],"2":[[5410,1]],"3":[[5410,1]]}
138 {"1":[[8353,2]],"2":[[8353,2]],"3":[[8353,2]]}
+149 {"1":[[966,1]],"2":[[966,1]],"3":[[966,1]]}
103
140
141
diff --git a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
index 8099af2..30aed68 100644
--- a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
+++ b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
@@ -69,17 +69,17 @@
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]] []
10403001 210 205 2 0 [(411960,0),(555293,(3,2,107)),(1000000,(3,3,107))] 30 {(3,4,107):1000000,(3,5,107):0,(3,2,108):100000,(3,3,108):10000,(3,4,108):2500} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(2500,1),(10000,2)],5:[(10000,2)]} [1,3,4,[(8000,1),(10000,2)],107] [] {2320:100000,2339:20000,2340:80000} {} {} {} {} 25 800 1077 1615 [] [1005,3904]
-10503001 210 300 2 0 [(409607,0),(552940,(4,2,107)),(1000000,(4,3,107))] 30 {(4,4,107):1000000,(4,5,107):50000,(4,2,108):100000,(4,3,108):20000,(4,4,108):5000} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(1000,1),(10000,2)],5:[(10000,2)]} [1,4,4,[(10000,2)],107] [] {3801:300000,3802:50000,2320:100000,2340:80000,2339:20000,2404:50000} {} {} {} {} 25 800 1115 1673 [] [999,3904]
-10603001 210 350 2 0 [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))] 30 {(5,4,107):1000000,(5,5,107):50000,(5,2,108):100000,(5,3,108):10000,(5,4,108):2500} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(3000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:300000,3802:50000,9051:3472,2320:100000,2340:80000,2339:20000,2404:60000} {} {} {} {} 25 800 1123 1685 [] [999,3904]
+10503001 210 300 2 0 [(409607,0),(552940,(4,2,107)),(1000000,(4,3,107))] 30 {(4,4,107):1000000,(4,5,107):50000,(4,2,108):100000,(4,3,108):20000,(4,4,108):5000} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(1000,1),(10000,2)],5:[(10000,2)]} [1,4,4,[(10000,2)],107] [] {3801:200000,3802:50000,2320:100000,2340:80000,2339:20000,2404:50000} {} {} {} {} 25 800 1115 1673 [] [999,3904]
+10603001 210 350 2 0 [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))] 30 {(5,4,107):1000000,(5,5,107):50000,(5,2,108):100000,(5,3,108):10000,(5,4,108):2500} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(3000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:200000,3802:50000,9051:3472,2320:100000,2340:80000,2339:20000,2404:60000} {} {} {} {} 25 800 1123 1685 [] [999,3904]
10403001 1000 205 2 0 [(411960,0),(555293,(3,2,107)),(1000000,(3,3,107))] 30 {(3,4,107):1000000,(3,5,107):0,(3,2,108):100000,(3,3,108):10000,(3,4,108):2500} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(2500,1),(10000,2)],5:[(10000,2)]} [1,3,4,[(8000,1),(10000,2)],107] [] {2320:100000,2339:20000,2340:80000} {} {} {} {} 25 800 1077 1615 [] [999,3904]
-10503001 1000 300 2 0 [(409607,0),(552940,(4,2,107)),(1000000,(4,3,107))] 30 {(4,4,107):1000000,(4,5,107):50000,(4,2,108):100000,(4,3,108):20000,(4,4,108):5000} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(1000,1),(10000,2)],5:[(10000,2)]} [1,4,4,[(10000,2)],107] [] {3801:300000,3802:10000,2320:100000,2340:80000,2339:20000,2404:50000} {} {} {} {} 25 800 1115 1673 [] [999,3904]
-10603001 1000 350 2 0 [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))] 30 {(5,4,107):1000000,(5,5,107):50000,(5,2,108):100000,(5,3,108):10000,(5,4,108):2500} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(3000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:300000,3802:16000,9051:3472,2320:100000,2340:80000,2339:20000,2404:60000} {} {} {} {} 25 800 1123 1685 [] [999,3904]
-10703001 290 400 2 0 [(397839,0),(541172,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1000000,(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:[(3000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:200000,3802:20000,3803:5000,9051:6173,2320:100000,2340:80000,2339:20000,2404: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):1000000,(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:[(3000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:200000,3802:20000,3803:1000,9051:6173,2320:100000,2340:80000,2339:20000,2404:80000} {} {} {} {} 25 800 1129 1694 [] [999,3904]
+10503001 1000 300 2 0 [(409607,0),(552940,(4,2,107)),(1000000,(4,3,107))] 30 {(4,4,107):1000000,(4,5,107):50000,(4,2,108):100000,(4,3,108):20000,(4,4,108):5000} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(1000,1),(10000,2)],5:[(10000,2)]} [1,4,4,[(10000,2)],107] [] {3801:100000,3802:10000,2320:100000,2340:80000,2339:20000,2404:50000} {} {} {} {} 25 800 1115 1673 [] [999,3904]
+10603001 1000 350 2 0 [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))] 30 {(5,4,107):1000000,(5,5,107):50000,(5,2,108):100000,(5,3,108):10000,(5,4,108):2500} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(3000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:100000,3802:16000,9051:3472,2320:100000,2340:80000,2339:20000,2404:60000} {} {} {} {} 25 800 1123 1685 [] [999,3904]
+10703001 290 400 2 0 [(397839,0),(541172,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1000000,(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:[(3000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:100000,3802:20000,3803:5000,9051:6173,2320:100000,2340:80000,2339:20000,2404: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):1000000,(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:[(3000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:100000,3802:20000,3803:1000,9051:6173,2320:100000,2340:80000,2339:20000,2404: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):1000000,(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:[(3000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:100000,3802:20000,3803:2500,9051:7330,2320:100000,2340:80000,2339:20000,2404:100000} {} {} {} {} 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):1000000,(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:[(3000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:50000,3802:20000,3803:5000,9051:9259,2320:100000,2340:80000,2339:20000,5408:2222,2404:140000} {} {} {} {} 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):1000000,(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:[(3000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:30000,3802:20000,3803:5000,9051:11574,2320:100000,2340:80000,2339:20000,5408:2667,2404:140000} {} {} {} {} 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):1000000,(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:[(3000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:20000,3802:20000,3803:5000,9051:11574,2320:100000,2340:80000,2339:20000,5408:2667,2404:140000} {} {} {} {} 25 800 1129 1694 [] [998,3904]
+10903001 1000 500 2 0 [(397839,0),(541172,(8,2,107)),(1000000,(8,3,107))] 30 {(8,4,107):1000000,(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:[(3000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:100000,3802:20000,3803:5000,9051:9259,2320:100000,2340:80000,2339:20000,5408:2222,2404:140000} {} {} {} {} 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):1000000,(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:[(3000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:100000,3802:20000,3803:5000,9051:11574,2320:100000,2340:80000,2339:20000,5408:2667,2404:140000} {} {} {} {} 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):1000000,(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:[(3000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:100000,3802:20000,3803:5000,9051:11574,2320:100000,2340:80000,2339:20000,5408:2667,2404:140000} {} {} {} {} 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 [] []
@@ -116,34 +116,27 @@
20202007 0 460 1 0 [(974945,0),(981945,(8,1,107)),(996667,(8,2,107)),(1000000,(8,3,107))] 1 {} 0 {} {3:[(9600,0),(10000,1)]} [] [] {951:208,4011:833,4151:556,181:833} {} {2:500000} {} {2:1} 1 800 1588 1962 [] []
20103001 210 225 2 0 [(411960,0),(555293,(3,2,107)),(1000000,(3,3,107))] 30 {(3,4,107):1000000,(3,5,107):0,(3,2,108):100000,(3,3,108):20000,(3,4,108):5000} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(1500,1),(10000,2)],5:[(10000,2)]} [1,3,4,[(10000,2)],107] [] {2320:100000,2340:80000,2339:20000} {} {} {} {} 25 800 1077 1615 [] [1005,3904]
20103002 210 245 2 0 [(411960,0),(555293,(3,2,107)),(1000000,(3,3,107))] 30 {(3,4,107):1000000,(3,5,107):0,(3,2,108):100000,(3,3,108):20000,(3,4,108):5000} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(500,1),(10000,2)],5:[(10000,2)]} [1,3,4,[(10000,2)],107] [] {2320:100000,2340:80000,2339:20000} {} {} {} {} 25 800 1077 1615 [] [1005,3904]
-20103003 210 260 2 0 [(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))] 30 {(4,4,107):1000000,(4,5,107):50000,(4,2,108):100000,(4,3,108):20000,(4,4,108):5000} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(3000,1),(10000,2)],5:[(10000,2)]} [1,4,4,[(10000,2)],107] [] {3801:300000,2320:100000,2340:80000,2339:20000} {} {} {} {} 25 800 1115 1673 [1,0,0,[3801]] [999,3904]
-20103004 210 280 2 0 [(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))] 30 {(4,4,107):1000000,(4,5,107):80000,(4,2,108):100000,(4,3,108):20000,(4,4,108):5000} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(1000,1),(10000,2)],5:[(10000,2)]} [1,4,5,[(10000,2)],107] [] {3801:300000,2320:100000,5202:420000,2340:80000,2339:20000} {} {2:499200} {} {2:5} 25 800 1115 1673 [] [999,3904]
-20103005 210 315 2 0 [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))] 30 {(5,4,107):1000000,(5,5,107):50000,(5,2,108):100000,(5,3,108):10000,(5,4,108):2500} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(4000,1),(10000,2)],5:[(10000,2)]} [1,5,5,[(10000,2)],107] [] {3801:300000,3802:50000,2320:100000,5202:440000,2340:80000,2339:20000,2404:60000} {} {2:582400} {} {2:5} 25 800 1123 1685 [] [999,3904]
-20103006 210 335 2 0 [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))] 30 {(5,4,107):1000000,(5,5,107):80000,(5,2,108):100000,(5,3,108):10000,(5,4,108):2500} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(3000,1),(10000,2)],5:[(10000,2)]} [1,5,5,[(10000,2)],107] [] {3801:300000,3802:50000,2320:100000,5202:460000,2340:80000,2339:20000,2404:60000} {} {2:665600} {} {2:5} 25 800 1123 1685 [] [999,3904]
-20103007 210 365 2 0 [(402547,0),(545880,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1000000,(6,5,107):80000,(6,2,108):100000,(6,3,108):10000,(6,4,108):2500} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(2000,1),(10000,2)],5:[(10000,2)]} [1,6,5,[(10000,2)],107] [] {3801:300000,3802:50000,9051:4630,2320:100000,5202:480000,2340:80000,2339:20000,2404:80000} {} {2:748800} {} {2:5} 25 800 1129 1694 [] [999,3904]
-20203001 210 355 2 0 [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1000000,(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:[(4000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:300000,3802:50000,9051:7330,2320:100000,5202:440000,2340:80000,2339:20000,2404:80000} {} {2:800000} {} {2:5} 25 800 1123 1685 [] [999,3904]
-20203002 210 360 2 0 [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1000000,(6,5,107):80000,(6,2,108):100000,(6,3,108):10000,(6,4,108):2500} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(3000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:300000,3802:50000,9051:7330,2320:100000,5202:460000,2340:80000,2339:20000,2404:80000} {} {2:800000} {} {2:5} 25 800 1123 1685 [] [999,3904]
-20203003 210 405 2 0 [(391956,0),(535289,(7,2,107)),(1000000,(7,3,107))] 30 {(7,4,107):1000000,(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:[(4000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:300000,3802:50000,3803:5000,9051:8102,2320:100000,5202:480000,2340:80000,2339:20000,2404:100000} {} {2:800000} {} {2:5} 25 800 1129 1694 [] [999,3904]
-20203004 210 410 2 0 [(391956,0),(535289,(7,2,107)),(1000000,(7,3,107))] 30 {(7,4,107):1000000,(7,5,107):80000,(7,2,108):100000,(7,3,108):10000,(7,4,108):2500} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(3000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:300000,3802:50000,3803:5000,9051:8102,2320:100000,5202:500000,2340:80000,2339:20000,2404:100000} {} {2:800000} {} {2:5} 25 800 1129 1694 [] [999,3904]
-20203005 210 455 2 0 [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))] 30 {(8,4,107):1000000,(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:[(4000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:300000,3802:50000,3803:3000,9051:9259,2320:100000,5202:520000,2340:80000,2339:20000,5408:1778,2404:120000} {} {2:800000} {} {2:5} 25 800 1356 1824 [] [999,3904]
-20203006 210 460 2 0 [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))] 30 {(8,4,107):1000000,(8,5,107):80000,(8,2,108):100000,(8,3,108):10000,(8,4,108):2500} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(3000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:300000,3802:50000,3803:3500,9051:9259,2320:100000,5202:540000,2340:80000,2339:20000,5408:2222,2404:120000} {} {2:800000} {} {2:5} 25 800 1356 1824 [] [999,3904]
-20203007 210 505 2 0 [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))] 30 {(8,4,107):1000000,(8,5,107):80000,(8,2,108):100000,(8,3,108):10000,(8,4,108):2500} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(4000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:300000,3802:50000,3803:5000,9051:11574,2320:100000,5202:560000,2340:80000,2339:20000,5408:2667,2404:140000} {} {2:800000} {} {2:5} 25 800 1588 1962 [] [999,3904]
+20103003 210 260 2 0 [(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))] 30 {(4,4,107):1000000,(4,5,107):50000,(4,2,108):100000,(4,3,108):20000,(4,4,108):5000} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(3000,1),(10000,2)],5:[(10000,2)]} [1,4,4,[(10000,2)],107] [] {3801:200000,2320:100000,2340:80000,2339:20000} {} {} {} {} 25 800 1115 1673 [1,0,0,[3801]] [999,3904]
+20103004 210 280 2 0 [(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))] 30 {(4,4,107):1000000,(4,5,107):80000,(4,2,108):100000,(4,3,108):20000,(4,4,108):5000} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(1000,1),(10000,2)],5:[(10000,2)]} [1,4,5,[(10000,2)],107] [] {3801:200000,2320:100000,5202:420000,2340:80000,2339:20000} {} {2:499200} {} {2:5} 25 800 1115 1673 [] [999,3904]
+20103005 210 315 2 0 [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))] 30 {(5,4,107):1000000,(5,5,107):50000,(5,2,108):100000,(5,3,108):10000,(5,4,108):2500} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(4000,1),(10000,2)],5:[(10000,2)]} [1,5,5,[(10000,2)],107] [] {3801:200000,3802:50000,2320:100000,5202:440000,2340:80000,2339:20000,2404:60000} {} {2:582400} {} {2:5} 25 800 1123 1685 [] [999,3904]
+20103006 210 335 2 0 [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))] 30 {(5,4,107):1000000,(5,5,107):80000,(5,2,108):100000,(5,3,108):10000,(5,4,108):2500} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(3000,1),(10000,2)],5:[(10000,2)]} [1,5,5,[(10000,2)],107] [] {3801:200000,3802:50000,2320:100000,5202:460000,2340:80000,2339:20000,2404:60000} {} {2:665600} {} {2:5} 25 800 1123 1685 [] [999,3904]
+20103007 210 365 2 0 [(402547,0),(545880,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1000000,(6,5,107):80000,(6,2,108):100000,(6,3,108):10000,(6,4,108):2500} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(2000,1),(10000,2)],5:[(10000,2)]} [1,6,5,[(10000,2)],107] [] {3801:200000,3802:50000,9051:4630,2320:100000,5202:480000,2340:80000,2339:20000,2404:80000} {} {2:748800} {} {2:5} 25 800 1129 1694 [] [999,3904]
20103001 1000 225 2 0 [(411960,0),(555293,(3,2,107)),(1000000,(3,3,107))] 30 {(3,4,107):1000000,(3,5,107):0,(3,2,108):100000,(3,3,108):20000,(3,4,108):5000} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(1500,1),(10000,2)],5:[(10000,2)]} [1,3,4,[(10000,2)],107] [] {2320:100000,2340:80000,2339:20000} {} {} {} {} 25 800 1077 1615 [] [999,3904]
20103002 1000 245 2 0 [(411960,0),(555293,(3,2,107)),(1000000,(3,3,107))] 30 {(3,4,107):1000000,(3,5,107):0,(3,2,108):100000,(3,3,108):20000,(3,4,108):5000} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(500,1),(10000,2)],5:[(10000,2)]} [1,3,4,[(10000,2)],107] [] {2320:100000,2340:80000,2339:20000} {} {} {} {} 25 800 1077 1615 [] [999,3904]
-20103003 1000 260 2 0 [(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))] 30 {(4,4,107):1000000,(4,5,107):50000,(4,2,108):100000,(4,3,108):20000,(4,4,108):5000} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(3000,1),(10000,2)],5:[(10000,2)]} [1,4,4,[(10000,2)],107] [] {3801:300000,2320:100000,2340:80000,2339:20000} {} {} {} {} 25 800 1115 1673 [1,0,0,[3801]] [999,3904]
-20103004 1000 280 2 0 [(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))] 30 {(4,4,107):1000000,(4,5,107):80000,(4,2,108):100000,(4,3,108):20000,(4,4,108):5000} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(1000,1),(10000,2)],5:[(10000,2)]} [1,4,5,[(10000,2)],107] [] {3801:300000,2320:100000,5202:420000,2340:80000,2339:20000} {} {2:499200} {} {2:5} 25 800 1115 1673 [] [999,3904]
-20103005 1000 315 2 0 [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))] 30 {(5,4,107):1000000,(5,5,107):50000,(5,2,108):100000,(5,3,108):10000,(5,4,108):2500} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(4000,1),(10000,2)],5:[(10000,2)]} [1,5,5,[(10000,2)],107] [] {3801:300000,3802:12000,2320:100000,5202:440000,2340:80000,2339:20000,2404:60000} {} {2:582400} {} {2:5} 25 800 1123 1685 [] [999,3904]
-20103006 1000 335 2 0 [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))] 30 {(5,4,107):1000000,(5,5,107):80000,(5,2,108):100000,(5,3,108):10000,(5,4,108):2500} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(3000,1),(10000,2)],5:[(10000,2)]} [1,5,5,[(10000,2)],107] [] {3801:300000,3802:14000,2320:100000,5202:460000,2340:80000,2339:20000,2404:60000} {} {2:665600} {} {2:5} 25 800 1123 1685 [] [999,3904]
-20103007 1000 365 2 0 [(402547,0),(545880,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1000000,(6,5,107):80000,(6,2,108):100000,(6,3,108):10000,(6,4,108):2500} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(2000,1),(10000,2)],5:[(10000,2)]} [1,6,5,[(10000,2)],107] [] {3801:200000,3802:18000,9051:4630,2320:100000,5202:480000,2340:80000,2339:20000,2404:80000} {} {2:748800} {} {2:5} 25 800 1129 1694 [] [999,3904]
-20203001 1000 355 2 0 [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1000000,(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:[(4000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:200000,3802:20000,9051:7330,2320:100000,5202:440000,2340:80000,2339:20000,2404:80000} {} {2:800000} {} {2:5} 25 800 1123 1685 [] [999,3904]
-20203002 1000 360 2 0 [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1000000,(6,5,107):80000,(6,2,108):100000,(6,3,108):10000,(6,4,108):2500} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(3000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:200000,3802:20000,9051:7330,2320:100000,5202:460000,2340:80000,2339:20000,2404:80000} {} {2:800000} {} {2:5} 25 800 1123 1685 [] [999,3904]
+20103003 1000 260 2 0 [(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))] 30 {(4,4,107):1000000,(4,5,107):50000,(4,2,108):100000,(4,3,108):20000,(4,4,108):5000} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(3000,1),(10000,2)],5:[(10000,2)]} [1,4,4,[(10000,2)],107] [] {3801:100000,2320:100000,2340:80000,2339:20000} {} {} {} {} 25 800 1115 1673 [1,0,0,[3801]] [999,3904]
+20103004 1000 280 2 0 [(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))] 30 {(4,4,107):1000000,(4,5,107):80000,(4,2,108):100000,(4,3,108):20000,(4,4,108):5000} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(1000,1),(10000,2)],5:[(10000,2)]} [1,4,5,[(10000,2)],107] [] {3801:100000,2320:100000,5202:420000,2340:80000,2339:20000} {} {2:499200} {} {2:5} 25 800 1115 1673 [] [999,3904]
+20103005 1000 315 2 0 [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))] 30 {(5,4,107):1000000,(5,5,107):50000,(5,2,108):100000,(5,3,108):10000,(5,4,108):2500} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(4000,1),(10000,2)],5:[(10000,2)]} [1,5,5,[(10000,2)],107] [] {3801:100000,3802:12000,2320:100000,5202:440000,2340:80000,2339:20000,2404:60000} {} {2:582400} {} {2:5} 25 800 1123 1685 [] [999,3904]
+20103006 1000 335 2 0 [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))] 30 {(5,4,107):1000000,(5,5,107):80000,(5,2,108):100000,(5,3,108):10000,(5,4,108):2500} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(3000,1),(10000,2)],5:[(10000,2)]} [1,5,5,[(10000,2)],107] [] {3801:100000,3802:14000,2320:100000,5202:460000,2340:80000,2339:20000,2404:60000} {} {2:665600} {} {2:5} 25 800 1123 1685 [] [999,3904]
+20103007 1000 365 2 0 [(402547,0),(545880,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1000000,(6,5,107):80000,(6,2,108):100000,(6,3,108):10000,(6,4,108):2500} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(2000,1),(10000,2)],5:[(10000,2)]} [1,6,5,[(10000,2)],107] [] {3801:100000,3802:18000,9051:4630,2320:100000,5202:480000,2340:80000,2339:20000,2404:80000} {} {2:748800} {} {2:5} 25 800 1129 1694 [] [999,3904]
+20203001 1000 355 2 0 [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1000000,(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:[(4000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:100000,3802:20000,9051:7330,2320:100000,5202:440000,2340:80000,2339:20000,2404:80000} {} {2:800000} {} {2:5} 25 800 1123 1685 [] [999,3904]
+20203002 1000 360 2 0 [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1000000,(6,5,107):80000,(6,2,108):100000,(6,3,108):10000,(6,4,108):2500} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(3000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:100000,3802:20000,9051:7330,2320:100000,5202:460000,2340:80000,2339:20000,2404:80000} {} {2:800000} {} {2:5} 25 800 1123 1685 [] [999,3904]
20203003 290 405 2 0 [(391956,0),(535289,(7,2,107)),(1000000,(7,3,107))] 30 {(7,4,107):1000000,(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:[(4000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:100000,3802:20000,3803:5000,9051:8102,2320:100000,5202:480000,2340:80000,2339:20000,2404:100000} {} {2:800000} {} {2:5} 25 800 1129 1694 [] [999,3904]
20203004 290 410 2 0 [(391956,0),(535289,(7,2,107)),(1000000,(7,3,107))] 30 {(7,4,107):1000000,(7,5,107):80000,(7,2,108):100000,(7,3,108):10000,(7,4,108):2500} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(3000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:100000,3802:20000,3803:5000,9051:8102,2320:100000,5202:500000,2340:80000,2339:20000,2404:100000} {} {2:800000} {} {2:5} 25 800 1129 1694 [] [999,3904]
20203003 1000 405 2 0 [(391956,0),(535289,(7,2,107)),(1000000,(7,3,107))] 30 {(7,4,107):1000000,(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:[(4000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:100000,3802:20000,3803:1500,9051:8102,2320:100000,5202:480000,2340:80000,2339:20000,2404:100000} {} {2:800000} {} {2:5} 25 800 1129 1694 [] [999,3904]
20203004 1000 410 2 0 [(391956,0),(535289,(7,2,107)),(1000000,(7,3,107))] 30 {(7,4,107):1000000,(7,5,107):80000,(7,2,108):100000,(7,3,108):10000,(7,4,108):2500} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(3000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:100000,3802:20000,3803:2000,9051:8102,2320:100000,5202:500000,2340:80000,2339:20000,2404:100000} {} {2:800000} {} {2:5} 25 800 1129 1694 [] [999,3904]
-20203005 1000 455 2 0 [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))] 30 {(8,4,107):1000000,(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:[(4000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:80000,3802:20000,3803:3000,9051:9259,2320:100000,5202:520000,2340:80000,2339:20000,5408:1778,2404:120000} {} {2:800000} {} {2:5} 25 800 1356 1824 [] [999,3904]
-20203006 1000 460 2 0 [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))] 30 {(8,4,107):1000000,(8,5,107):80000,(8,2,108):100000,(8,3,108):10000,(8,4,108):2500} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(3000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:80000,3802:20000,3803:3500,9051:9259,2320:100000,5202:540000,2340:80000,2339:20000,5408:2222,2404:120000} {} {2:800000} {} {2:5} 25 800 1356 1824 [] [999,3904]
-20203007 1000 505 2 0 [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))] 30 {(8,4,107):1000000,(8,5,107):80000,(8,2,108):100000,(8,3,108):10000,(8,4,108):2500} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(4000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:80000,3802:20000,3803:5000,9051:11574,2320:100000,5202:560000,2340:80000,2339:20000,5408:2667,2404:140000} {} {2:800000} {} {2:5} 25 800 1588 1962 [] [999,3904]
+20203005 1000 455 2 0 [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))] 30 {(8,4,107):1000000,(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:[(4000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:100000,3802:20000,3803:3000,9051:9259,2320:100000,5202:520000,2340:80000,2339:20000,5408:1778,2404:120000} {} {2:800000} {} {2:5} 25 800 1356 1824 [] [999,3904]
+20203006 1000 460 2 0 [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))] 30 {(8,4,107):1000000,(8,5,107):80000,(8,2,108):100000,(8,3,108):10000,(8,4,108):2500} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(3000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:100000,3802:20000,3803:3500,9051:9259,2320:100000,5202:540000,2340:80000,2339:20000,5408:2222,2404:120000} {} {2:800000} {} {2:5} 25 800 1356 1824 [] [999,3904]
+20203007 1000 505 2 0 [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))] 30 {(8,4,107):1000000,(8,5,107):80000,(8,2,108):100000,(8,3,108):10000,(8,4,108):2500} 1 {4:4,5:2} {3:[(9250,0),(10000,1)],4:[(4000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:100000,3802:20000,3803:5000,9051:11574,2320:100000,5202:560000,2340:80000,2339:20000,5408:2667,2404:140000} {} {2:800000} {} {2:5} 25 800 1588 1962 [] [999,3904]
30303001 1000 255 0 0 [(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))] 30 {(4,4,107):1000000,(4,5,107):50000,(4,2,108):50000,(4,3,108):5000,(4,4,108):0} 1 {4:2,5:1} {3:[(9250,0),(10000,1)],4:[(4000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:80000,2320:50000} {} {} {} {} 20 800 1123 1685 [] [1004]
30303002 1000 280 0 0 [(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))] 30 {(4,4,107):1000000,(4,5,107):80000,(4,2,108):50000,(4,3,108):5000,(4,4,108):0} 1 {4:2,5:1} {3:[(9250,0),(10000,1)],4:[(2000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:80000,2320:50000} {} {} {} {} 20 800 1129 1694 [] [1004]
30303003 1000 310 0 0 [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))] 30 {(5,4,107):1000000,(5,5,107):20000,(5,2,108):50000,(5,3,108):5000,(5,4,108):0} 1 {4:2,5:1} {3:[(9250,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:80000,3802:5000,2320:50000} {} {} {} {} 20 800 1129 1694 [] [1004]
@@ -214,11 +207,13 @@
30903001 700 0 0 0 [(250000,0),(375000,(14,2,107)),(918750,(14,3,107)),(987500,(14,4,107)),(1000000,(14,5,107))] 80 {(14,4,107):2000000} 1 {4:8,5:1} {3:[(80,0),(100,1)],4:[(50,1),(100,2)],5:[(100,2)]} [] [] {} {} {} {} {} 0 0 0 0 [] []
30903001 750 0 0 0 [(250000,0),(375000,(15,2,107)),(918750,(15,3,107)),(987500,(15,4,107)),(1000000,(15,5,107))] 80 {(15,4,107):2000000} 1 {4:8,5:1} {3:[(80,0),(100,1)],4:[(50,1),(100,2)],5:[(100,2)]} [] [] {} {} {} {} {} 0 0 0 0 [] []
31903001 0 0 0 0 [(716666,0),(783333,(3,2,107)),(1000000,(3,3,107)),(1000000,(3,2,108)),(1000000,(3,3,108))] 30 {(3,4,107):1000000,(3,5,107):0,(3,2,108):0,(3,3,108):0,(3,4,108):0} 1 {4:2,5:1} {3:[(9250,0),(10000,1)],4:[(1000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:100000,4151:1000000,4184:1000000} {4151:4,5202:1} {2:0} {} {2:5} 0 0 0 0 [] [1006]
-31903002 0 0 0 0 [(716666,0),(783333,(4,2,107)),(1000000,(4,3,107)),(1000000,(4,2,108)),(1000000,(4,3,108))] 30 {(4,4,107):1000000,(4,5,107):150000,(4,2,108):0,(4,3,108):0,(4,4,108):0} 1 {4:2,5:1} {3:[(9250,0),(10000,1)],4:[(2000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:100000,3802:2000,4609:100000,5202:500000,4151:1000000,4184:1000000,2405:301724} {4151:4,5202:1} {2:512000} {} {2:5} 0 0 0 0 [] [1006]
-31903003 0 0 0 0 [(716666,0),(783333,(5,2,107)),(1000000,(5,3,107)),(1000000,(5,2,108)),(1000000,(5,3,108))] 30 {(5,4,107):1000000,(5,5,107):50000,(5,2,108):0,(5,3,108):0,(5,4,108):0} 1 {4:2,5:1} {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:100000,3802:2000,9074:3000,4609:100000,5202:520000,4151:1000000,4184:1000000,2405:301724} {4151:4,5202:1} {2:832000} {} {2:5} 0 0 0 0 [] [1006]
-31903004 0 0 0 0 [(716666,0),(783333,(6,2,107)),(1000000,(6,3,107)),(1000000,(6,2,108)),(1000000,(6,3,108))] 30 {(6,4,107):1000000,(6,5,107):5000,(6,2,108):0,(6,3,108):0,(6,4,108):0} 1 {4:2,5:1} {3:[(9250,0),(10000,1)],4:[(9000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:100000,3802:2000,3803:100,9074:3000,4609:100000,5202:540000,4151:1000000,4184:1000000,2405:301724} {4151:4,5202:1} {2:676000} {} {2:10} 0 0 0 0 [] [1006]
-31903005 0 0 0 0 [(716666,0),(783333,(7,2,107)),(1000000,(7,3,107)),(1000000,(7,2,108)),(1000000,(7,3,108))] 30 {(7,4,107):1000000,(7,5,107):5000,(7,2,108):0,(7,3,108):0,(7,4,108):0} 1 {4:2,5:1} {3:[(9250,0),(10000,1)],4:[(9000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:100000,3802:2000,3803:100,9074:3000,4609:100000,5202:560000,4151:1000000,4184:1000000,2405:301724} {4151:4,5202:1} {2:732333} {} {2:15} 0 0 0 0 [] [1006]
-31903006 0 0 0 0 [(716666,0),(783333,(8,2,107)),(1000000,(8,3,107)),(1000000,(8,2,108)),(1000000,(8,3,108))] 30 {(8,4,107):1000000,(8,5,107):5000,(8,2,108):0,(8,3,108):0,(8,4,108):0} 1 {4:2,5:1} {3:[(9250,0),(10000,1)],4:[(9000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:100000,3802:2000,3803:100,9074:3000,4609:100000,5202:580000,4151:1000000,4184:1000000,5408:4000,2405:301724} {4151:4,5202:1} {2:915416} {} {2:15} 0 0 0 0 [] [1006]
+31903002 230 0 0 0 [(716666,0),(783333,(4,2,107)),(1000000,(4,3,107)),(1000000,(4,2,108)),(1000000,(4,3,108))] 30 {(4,4,107):1000000,(4,5,107):150000,(4,2,108):0,(4,3,108):0,(4,4,108):0} 1 {4:2,5:1} {3:[(9250,0),(10000,1)],4:[(2000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:100000,3802:150000,4609:100000,5202:500000,4151:1000000,4184:1000000,2405:301724} {4151:4,5202:1} {2:512000} {} {2:5} 0 0 0 0 [] [1006]
+31903003 230 0 0 0 [(716666,0),(783333,(5,2,107)),(1000000,(5,3,107)),(1000000,(5,2,108)),(1000000,(5,3,108))] 30 {(5,4,107):1000000,(5,5,107):50000,(5,2,108):0,(5,3,108):0,(5,4,108):0} 1 {4:2,5:1} {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:100000,3802:200000,9074:3000,4609:100000,5202:520000,4151:1000000,4184:1000000,2405:301724} {4151:4,5202:1} {2:832000} {} {2:5} 0 0 0 0 [] [1006]
+31903002 1000 0 0 0 [(716666,0),(783333,(4,2,107)),(1000000,(4,3,107)),(1000000,(4,2,108)),(1000000,(4,3,108))] 30 {(4,4,107):1000000,(4,5,107):150000,(4,2,108):0,(4,3,108):0,(4,4,108):0} 1 {4:2,5:1} {3:[(9250,0),(10000,1)],4:[(2000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:100000,3802:10000,4609:100000,5202:500000,4151:1000000,4184:1000000,2405:301724} {4151:4,5202:1} {2:512000} {} {2:5} 0 0 0 0 [] [1006]
+31903003 1000 0 0 0 [(716666,0),(783333,(5,2,107)),(1000000,(5,3,107)),(1000000,(5,2,108)),(1000000,(5,3,108))] 30 {(5,4,107):1000000,(5,5,107):50000,(5,2,108):0,(5,3,108):0,(5,4,108):0} 1 {4:2,5:1} {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:100000,3802:10000,9074:3000,4609:100000,5202:520000,4151:1000000,4184:1000000,2405:301724} {4151:4,5202:1} {2:832000} {} {2:5} 0 0 0 0 [] [1006]
+31903004 0 0 0 0 [(716666,0),(783333,(6,2,107)),(1000000,(6,3,107)),(1000000,(6,2,108)),(1000000,(6,3,108))] 30 {(6,4,107):1000000,(6,5,107):5000,(6,2,108):0,(6,3,108):0,(6,4,108):0} 1 {4:2,5:1} {3:[(9250,0),(10000,1)],4:[(9000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:100000,3802:10000,3803:100,9074:3000,4609:100000,5202:540000,4151:1000000,4184:1000000,2405:301724} {4151:4,5202:1} {2:676000} {} {2:10} 0 0 0 0 [] [1006]
+31903005 0 0 0 0 [(716666,0),(783333,(7,2,107)),(1000000,(7,3,107)),(1000000,(7,2,108)),(1000000,(7,3,108))] 30 {(7,4,107):1000000,(7,5,107):5000,(7,2,108):0,(7,3,108):0,(7,4,108):0} 1 {4:2,5:1} {3:[(9250,0),(10000,1)],4:[(9000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:100000,3802:10000,3803:100,9074:3000,4609:100000,5202:560000,4151:1000000,4184:1000000,2405:301724} {4151:4,5202:1} {2:732333} {} {2:15} 0 0 0 0 [] [1006]
+31903006 0 0 0 0 [(716666,0),(783333,(8,2,107)),(1000000,(8,3,107)),(1000000,(8,2,108)),(1000000,(8,3,108))] 30 {(8,4,107):1000000,(8,5,107):5000,(8,2,108):0,(8,3,108):0,(8,4,108):0} 1 {4:2,5:1} {3:[(9250,0),(10000,1)],4:[(9000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:100000,3802:10000,3803:100,9074:3000,4609:100000,5202:580000,4151:1000000,4184:1000000,5408:4000,2405:301724} {4151:4,5202:1} {2:915416} {} {2:15} 0 0 0 0 [] [1006]
30301001 0 280 0 0 [] 0 {} 0 {} {} [] [] {} {} {} {} {} 0 0 0 0 [] []
30301002 0 300 0 0 [] 0 {} 0 {} {} [] [] {} {} {} {} {} 0 0 0 0 [] []
30603001 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {} {} {} 0 0 0 0 [] []
diff --git a/db/PyMongoDataServer/PySysDB/tagStore.txt b/db/PyMongoDataServer/PySysDB/tagStore.txt
index 1d7f6ef..aed5d55 100644
--- a/db/PyMongoDataServer/PySysDB/tagStore.txt
+++ b/db/PyMongoDataServer/PySysDB/tagStore.txt
@@ -12,7 +12,7 @@
12 1 0 2325 1 1 [] 0 7 0 110 1 0 2 0 0 0
13 1 0 4741 1 1 [] 0 7 1 125 1 0 1 30 0 0
14 1 0 2389 1 1 [] 0 7 0 260 2 0 1 100 0 0
-15 1 0 1129 1 1 [] 0 7 3 110 1 0 1 150 0 0
+15 1 0 1129 1 1 [] 0 7 3 110 3 0 1 99 0 0
51 2 0 3796 1 0 [] 0 0 0 0 0 0 1 280 0 0
52 2 0 3797 1 0 [] 0 0 0 0 0 0 1 280 0 0
53 2 0 4101 1 0 [] 0 0 0 0 0 0 1 380 0 0
--
Gitblit v1.8.0