From 62a78d831523d27953276c71ef8cc7cebda04578 Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期六, 18 八月 2018 17:57:46 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/SysDB/tagChinSkill.txt | 4
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetMWSoul.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc | 0
db/PyMongoDataServer/PySysDB/tagSuccess.txt | 20 +++---
db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt | 3
db/PyMongoDataServer/SysDB/tagChinNPC.txt | 14 ++--
CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt | 3
CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 1
db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt | 76 ++++++++++++------------
9 files changed, 60 insertions(+), 61 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index 48d3977..b3ad5d6 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -45,6 +45,7 @@
KillBossCntLimit {(10403001,10503001,10603001,10703001,10803001,20103001,20103002,20103003,20103004,20103005,20103006,20103007,20203001,20203002,20203003,20203004,20203005,20203006,20203007):0,(30303001,30303002,30303003,30303004,30303005,30303006,30303007,30303008,30303009,30303010,30303011,30303012):1} 0_3|1_0 {0:'WB_Limit',1:'BossHome_Limit'} {1:27} {0:[21,'WorldBossNoHarm']}
CreateRoleMap {1:[10010,195,81],2:[10010,195,81],3:[10010,195,81]}
SetWorldPosShunt {10010:10, 10020:10, 10030:10, 10040:10, 10050:25, 10060:25} 160
+DogzFBRefreshCfg {(101,102,103,104,105,106,107,108,109):[20302001,1,'30',2,3], (121,122,123,124):[20302002,1,'40',2,3], (131,132,133):[20302003,10,'30',30,30]} 20303001
XMZZBetCfg {}
XMZZAward {"3":[[104,1,1]],"6":[[104,2,1]],"9":[[104,3,1]],"12":[[105,1,1]],"15":[[105,1,1]]} [[56,1,1]] [[105,2,1],[992,1,1]] [[105,1,1],[993,1,1]] 500
XMZZDogFallLimit 1000
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
index 46ed659..5a732f5 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
@@ -75,7 +75,7 @@
123 100 0 0
124 95 0 0
125 55 0 0
-126 150 0 0
+126 0 10803 0
127 100 0 0
128 35 0 0
129 120 0 0
@@ -88,4 +88,3 @@
136 250 0 0
137 200 0 0
138 0 11003 0
-139 0 10803 0
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetMWSoul.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetMWSoul.pyc
new file mode 100644
index 0000000..5531dc9
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetMWSoul.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc
index 599530c..3698bb5 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
index 5435b5f..76b6742 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
@@ -75,7 +75,7 @@
123 100 0 0 0
124 95 0 0 0
125 55 0 0 0
-126 150 0 0 0
+126 0 10803 0 0
127 100 0 0 0
128 35 0 0 0
129 120 0 0 0
@@ -88,4 +88,3 @@
136 250 0 0 0
137 200 0 0 0
138 0 11003 0 0
-139 0 10803 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
index 51eeffe..a4d1f55 100644
--- a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
+++ b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
@@ -97,30 +97,30 @@
20103002 210 245 2 0 [(411960,0),(555293,(3,2,107)),(1000000,(3,3,107))] 30 {(3,4,107):1450000,(3,2,108):100000,(3,3,108):20000,(3,4,108):10000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [1,3,4,[(10000,2)],107] [3,3,4,[(3000,1),(10000,2)],107] {3801:300000,2320:100000,2339:166666,2340:1000000} {} {} {} {} 25 800 1077 1615 [] [1005]
20103003 210 260 2 0 [(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))] 30 {(4,4,107):1495000,(4,5,107):80000,(4,2,108):100000,(4,3,108):20000,(4,4,108):10000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [1,4,5,[(10000,2)],107] [3,4,4,[(3000,1),(10000,2)],107] {3801:300000,2320:100000,4209:8680,4250:23148,2339:166666,2340:1000000} {} {} {} {} 25 800 1115 1673 [] [999]
20103004 210 280 2 0 [(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))] 30 {(4,4,107):1540000,(4,5,107):80000,(4,2,108):100000,(4,3,108):20000,(4,4,108):10000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,5202:420000,2320:100000,4209:8680,4250:23148,2339:166666,2340:1000000} {} {2:499200} {} {2:5} 25 800 1115 1673 [] [999]
-20103005 210 315 2 0 [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))] 30 {(5,4,107):1540000,(5,5,107):106667,(5,2,108):100000,(5,3,108):10000,(5,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:31250,5202:440000,2320:100000,4209:15625,4250:41666,2339:166666,2340:1000000} {} {2:5824000} {} {2:5} 25 800 1123 1685 [] [999]
-20103006 210 335 2 0 [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))] 30 {(5,4,107):1585000,(5,5,107):106667,(5,2,108):100000,(5,3,108):10000,(5,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:31250,5202:460000,2320:100000,4209:15625,4250:41666,2339:166666,2340:1000000} {} {2:6656000} {} {2:5} 25 800 1123 1685 [] [999]
-20103007 210 365 2 0 [(402547,0),(545880,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1585000,(6,5,107):106667,(6,2,108):100000,(6,3,108):10000,(6,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:41667,9051:4630,5202:480000,2320:100000,4209:10416,4250:27777,260:10416,222:27777,2339:166666,2340:1000000} {} {2:7488000} {} {2:5} 25 800 1129 1694 [] [999]
-20203001 210 355 2 0 [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1585000,(6,5,107):106667,(6,2,108):100000,(6,3,108):10000,(6,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:65972,9051:7330,5202:440000,2320:100000,4209:3298,260:3298,4250:16493,222:16493,2339:166666,2340:1000000} {} {2:8000000} {} {2:5} 25 800 1123 1685 [] [999]
-20203002 210 360 2 0 [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1585000,(6,5,107):106667,(6,2,108):100000,(6,3,108):10000,(6,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:65972,9051:7330,5202:460000,2320:100000,4209:3298,260:3298,4250:16493,222:16493,2339:166666,2340:1000000} {} {2:8000000} {} {2:5} 25 800 1123 1685 [] [999]
-20203003 210 405 2 0 [(391956,0),(535289,(7,2,107)),(1000000,(7,3,107))] 30 {(7,4,107):1630000,(7,5,107):100000,(7,2,108):100000,(7,3,108):10000,(7,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:72917,3803:8102,9051:8102,5202:480000,2320:100000,4209:3645,260:3645,4250:18229,222:18229,2339:166666,2340:1000000} {} {2:8000000} {} {2:5} 25 800 1129 1694 [] [999]
-20203004 210 410 2 0 [(391956,0),(535289,(7,2,107)),(1000000,(7,3,107))] 30 {(7,4,107):1630000,(7,5,107):100000,(7,2,108):100000,(7,3,108):10000,(7,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:72917,3803:8102,9051:8102,5202:500000,2320:100000,4209:3645,260:3645,4250:18229,222:18229,2339:166666,2340:1000000} {} {2:8000000} {} {2:5} 25 800 1129 1694 [] [999]
-20203005 210 455 2 0 [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))] 30 {(8,4,107):1675000,(8,5,107):93333,(8,2,108):100000,(8,3,108):10000,(8,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:83333,3803:9259,9051:9259,5202:520000,2320:100000,4209:4166,260:4166,4250:20833,222:20833,2339:166666,2340:1000000} {} {2:8000000} {} {2:5} 25 800 1356 1824 [] [999]
-20203006 210 460 2 0 [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))] 30 {(8,4,107):1675000,(8,5,107):93333,(8,2,108):100000,(8,3,108):10000,(8,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:83333,3803:9259,9051:9259,5202:540000,2320:100000,4209:4166,260:4166,4250:20833,222:20833,2339:166666,2340:1000000} {} {2:8000000} {} {2:5} 25 800 1356 1824 [] [999]
-20203007 210 505 2 0 [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))] 30 {(8,4,107):1675000,(8,5,107):93333,(8,2,108):100000,(8,3,108):10000,(8,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:104167,3803:11574,9051:11574,5202:560000,2320:100000,4209:5208,260:5208,4250:26041,222:26041,2339:166666,2340:1000000} {} {2:8000000} {} {2:5} 25 800 1588 1962 [] [999]
+20103005 210 315 2 0 [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))] 30 {(5,4,107):1540000,(5,5,107):106667,(5,2,108):100000,(5,3,108):10000,(5,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:31250,5202:440000,2320:100000,4209:15625,4250:41666,2339:166666,2340:1000000} {} {2:582400} {} {2:5} 25 800 1123 1685 [] [999]
+20103006 210 335 2 0 [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))] 30 {(5,4,107):1585000,(5,5,107):106667,(5,2,108):100000,(5,3,108):10000,(5,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:31250,5202:460000,2320:100000,4209:15625,4250:41666,2339:166666,2340:1000000} {} {2:665600} {} {2:5} 25 800 1123 1685 [] [999]
+20103007 210 365 2 0 [(402547,0),(545880,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1585000,(6,5,107):106667,(6,2,108):100000,(6,3,108):10000,(6,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:41667,9051:4630,5202:480000,2320:100000,4209:10416,4250:27777,260:10416,222:27777,2339:166666,2340:1000000} {} {2:748800} {} {2:5} 25 800 1129 1694 [] [999]
+20203001 210 355 2 0 [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1585000,(6,5,107):106667,(6,2,108):100000,(6,3,108):10000,(6,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:65972,9051:7330,5202:440000,2320:100000,4209:3298,260:3298,4250:16493,222:16493,2339:166666,2340:1000000} {} {2:800000} {} {2:5} 25 800 1123 1685 [] [999]
+20203002 210 360 2 0 [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1585000,(6,5,107):106667,(6,2,108):100000,(6,3,108):10000,(6,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:65972,9051:7330,5202:460000,2320:100000,4209:3298,260:3298,4250:16493,222:16493,2339:166666,2340:1000000} {} {2:800000} {} {2:5} 25 800 1123 1685 [] [999]
+20203003 210 405 2 0 [(391956,0),(535289,(7,2,107)),(1000000,(7,3,107))] 30 {(7,4,107):1630000,(7,5,107):100000,(7,2,108):100000,(7,3,108):10000,(7,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:72917,3803:8102,9051:8102,5202:480000,2320:100000,4209:3645,260:3645,4250:18229,222:18229,2339:166666,2340:1000000} {} {2:800000} {} {2:5} 25 800 1129 1694 [] [999]
+20203004 210 410 2 0 [(391956,0),(535289,(7,2,107)),(1000000,(7,3,107))] 30 {(7,4,107):1630000,(7,5,107):100000,(7,2,108):100000,(7,3,108):10000,(7,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:72917,3803:8102,9051:8102,5202:500000,2320:100000,4209:3645,260:3645,4250:18229,222:18229,2339:166666,2340:1000000} {} {2:800000} {} {2:5} 25 800 1129 1694 [] [999]
+20203005 210 455 2 0 [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))] 30 {(8,4,107):1675000,(8,5,107):93333,(8,2,108):100000,(8,3,108):10000,(8,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:83333,3803:9259,9051:9259,5202:520000,2320:100000,4209:4166,260:4166,4250:20833,222:20833,2339:166666,2340:1000000} {} {2:800000} {} {2:5} 25 800 1356 1824 [] [999]
+20203006 210 460 2 0 [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))] 30 {(8,4,107):1675000,(8,5,107):93333,(8,2,108):100000,(8,3,108):10000,(8,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:83333,3803:9259,9051:9259,5202:540000,2320:100000,4209:4166,260:4166,4250:20833,222:20833,2339:166666,2340:1000000} {} {2:800000} {} {2:5} 25 800 1356 1824 [] [999]
+20203007 210 505 2 0 [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))] 30 {(8,4,107):1675000,(8,5,107):93333,(8,2,108):100000,(8,3,108):10000,(8,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:104167,3803:11574,9051:11574,5202:560000,2320:100000,4209:5208,260:5208,4250:26041,222:26041,2339:166666,2340:1000000} {} {2:800000} {} {2:5} 25 800 1588 1962 [] [999]
20103001 1000 225 2 0 [(411960,0),(555293,(3,2,107)),(1000000,(3,3,107))] 30 {(3,4,107):1300000,(3,2,108):100000,(3,3,108):20000,(3,4,108):10000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [1,3,4,[(10000,2)],107] [3,3,4,[(3000,1),(10000,2)],107] {2320:100000,2339:83333,2340:1000000} {} {} {} {} 25 800 1077 1615 [] [999]
20103002 1000 245 2 0 [(411960,0),(555293,(3,2,107)),(1000000,(3,3,107))] 30 {(3,4,107):1300000,(3,2,108):100000,(3,3,108):20000,(3,4,108):10000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [1,3,4,[(10000,2)],107] [3,3,4,[(3000,1),(10000,2)],107] {3801:300000,2320:100000,2339:83333,2340:1000000} {} {} {} {} 25 800 1077 1615 [] [999]
20103003 1000 260 2 0 [(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))] 30 {(4,4,107):1300000,(4,5,107):80000,(4,2,108):100000,(4,3,108):20000,(4,4,108):10000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [1,4,5,[(10000,2)],107] [3,4,4,[(3000,1),(10000,2)],107] {3801:300000,2320:100000,4209:1736,4250:6944,2339:83333,2340:1000000} {} {} {} {} 25 800 1115 1673 [] [999]
20103004 1000 280 2 0 [(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))] 30 {(4,4,107):1360000,(4,5,107):80000,(4,2,108):100000,(4,3,108):20000,(4,4,108):10000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,5202:420000,2320:100000,4209:1736,4250:8680,2339:83333,2340:1000000} {} {2:499200} {} {2:5} 25 800 1115 1673 [] [999]
-20103005 1000 315 2 0 [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))] 30 {(5,4,107):1360000,(5,5,107):106667,(5,2,108):100000,(5,3,108):10000,(5,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:31250,5202:440000,2320:100000,4209:3125,4250:8680,2339:83333,2340:1000000} {} {2:5824000} {} {2:5} 25 800 1123 1685 [] [999]
-20103006 1000 335 2 0 [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))] 30 {(5,4,107):1390000,(5,5,107):106667,(5,2,108):100000,(5,3,108):10000,(5,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:31250,5202:460000,2320:100000,4209:3125,4250:15625,2339:83333,2340:1000000} {} {2:6656000} {} {2:5} 25 800 1123 1685 [] [999]
-20103007 1000 365 2 0 [(402547,0),(545880,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1390000,(6,5,107):106667,(6,2,108):100000,(6,3,108):10000,(6,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:200000,3802:41667,9051:4630,5202:480000,2320:100000,4209:2083,260:2083,4250:10416,222:10416,2339:83333,2340:1000000} {} {2:7488000} {} {2:5} 25 800 1129 1694 [] [999]
-20203001 1000 355 2 0 [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1360000,(6,5,107):106667,(6,2,108):100000,(6,3,108):10000,(6,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:200000,3802:65972,9051:7330,5202:440000,2320:100000,4209:3298,260:3298,4250:16493,222:16493,2339:83333,2340:1000000} {} {2:8000000} {} {2:5} 25 800 1123 1685 [] [999]
-20203002 1000 360 2 0 [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1390000,(6,5,107):106667,(6,2,108):100000,(6,3,108):10000,(6,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:200000,3802:65972,9051:7330,5202:460000,2320:100000,4209:3298,260:3298,4250:16493,222:16493,2339:83333,2340:1000000} {} {2:8000000} {} {2:5} 25 800 1123 1685 [] [999]
-20203003 1000 405 2 0 [(391956,0),(535289,(7,2,107)),(1000000,(7,3,107))] 30 {(7,4,107):1390000,(7,5,107):100000,(7,2,108):100000,(7,3,108):10000,(7,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:100000,3802:72917,3803:8102,9051:8102,5202:480000,2320:100000,4209:3645,260:3645,4250:18229,222:18229,2339:83333,2340:1000000} {} {2:8000000} {} {2:5} 25 800 1129 1694 [] [999]
-20203004 1000 410 2 0 [(391956,0),(535289,(7,2,107)),(1000000,(7,3,107))] 30 {(7,4,107):1390000,(7,5,107):100000,(7,2,108):100000,(7,3,108):10000,(7,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:100000,3802:72917,3803:8102,9051:8102,5202:500000,2320:100000,4209:3645,260:3645,4250:18229,222:18229,2339:83333,2340:1000000} {} {2:8000000} {} {2:5} 25 800 1129 1694 [] [999]
-20203005 1000 455 2 0 [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))] 30 {(8,4,107):1390000,(8,5,107):93333,(8,2,108):100000,(8,3,108):10000,(8,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:80000,3802:83333,3803:9259,9051:9259,5202:520000,2320:100000,4209:4166,260:4166,4250:20833,222:20833,2339:83333,2340:1000000} {} {2:8000000} {} {2:5} 25 800 1356 1824 [] [999]
-20203006 1000 460 2 0 [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))] 30 {(8,4,107):1390000,(8,5,107):93333,(8,2,108):100000,(8,3,108):10000,(8,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:80000,3802:83333,3803:9259,9051:9259,5202:540000,2320:100000,4209:4166,260:4166,4250:20833,222:20833,2339:83333,2340:1000000} {} {2:8000000} {} {2:5} 25 800 1356 1824 [] [999]
-20203007 1000 505 2 0 [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))] 30 {(8,4,107):1390000,(8,5,107):93333,(8,2,108):100000,(8,3,108):10000,(8,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:80000,3802:104167,3803:11574,9051:11574,5202:560000,2320:100000,4209:5208,260:5208,4250:26041,222:26041,2339:83333,2340:1000000} {} {2:8000000} {} {2:5} 25 800 1588 1962 [] [999]
+20103005 1000 315 2 0 [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))] 30 {(5,4,107):1360000,(5,5,107):106667,(5,2,108):100000,(5,3,108):10000,(5,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:31250,5202:440000,2320:100000,4209:3125,4250:8680,2339:83333,2340:1000000} {} {2:582400} {} {2:5} 25 800 1123 1685 [] [999]
+20103006 1000 335 2 0 [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))] 30 {(5,4,107):1390000,(5,5,107):106667,(5,2,108):100000,(5,3,108):10000,(5,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:300000,3802:31250,5202:460000,2320:100000,4209:3125,4250:15625,2339:83333,2340:1000000} {} {2:665600} {} {2:5} 25 800 1123 1685 [] [999]
+20103007 1000 365 2 0 [(402547,0),(545880,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1390000,(6,5,107):106667,(6,2,108):100000,(6,3,108):10000,(6,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:200000,3802:41667,9051:4630,5202:480000,2320:100000,4209:2083,260:2083,4250:10416,222:10416,2339:83333,2340:1000000} {} {2:748800} {} {2:5} 25 800 1129 1694 [] [999]
+20203001 1000 355 2 0 [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1360000,(6,5,107):106667,(6,2,108):100000,(6,3,108):10000,(6,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:200000,3802:65972,9051:7330,5202:440000,2320:100000,4209:3298,260:3298,4250:16493,222:16493,2339:83333,2340:1000000} {} {2:800000} {} {2:5} 25 800 1123 1685 [] [999]
+20203002 1000 360 2 0 [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1390000,(6,5,107):106667,(6,2,108):100000,(6,3,108):10000,(6,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:200000,3802:65972,9051:7330,5202:460000,2320:100000,4209:3298,260:3298,4250:16493,222:16493,2339:83333,2340:1000000} {} {2:800000} {} {2:5} 25 800 1123 1685 [] [999]
+20203003 1000 405 2 0 [(391956,0),(535289,(7,2,107)),(1000000,(7,3,107))] 30 {(7,4,107):1390000,(7,5,107):100000,(7,2,108):100000,(7,3,108):10000,(7,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:100000,3802:72917,3803:8102,9051:8102,5202:480000,2320:100000,4209:3645,260:3645,4250:18229,222:18229,2339:83333,2340:1000000} {} {2:800000} {} {2:5} 25 800 1129 1694 [] [999]
+20203004 1000 410 2 0 [(391956,0),(535289,(7,2,107)),(1000000,(7,3,107))] 30 {(7,4,107):1390000,(7,5,107):100000,(7,2,108):100000,(7,3,108):10000,(7,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:100000,3802:72917,3803:8102,9051:8102,5202:500000,2320:100000,4209:3645,260:3645,4250:18229,222:18229,2339:83333,2340:1000000} {} {2:800000} {} {2:5} 25 800 1129 1694 [] [999]
+20203005 1000 455 2 0 [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))] 30 {(8,4,107):1390000,(8,5,107):93333,(8,2,108):100000,(8,3,108):10000,(8,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:80000,3802:83333,3803:9259,9051:9259,5202:520000,2320:100000,4209:4166,260:4166,4250:20833,222:20833,2339:83333,2340:1000000} {} {2:800000} {} {2:5} 25 800 1356 1824 [] [999]
+20203006 1000 460 2 0 [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))] 30 {(8,4,107):1390000,(8,5,107):93333,(8,2,108):100000,(8,3,108):10000,(8,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:80000,3802:83333,3803:9259,9051:9259,5202:540000,2320:100000,4209:4166,260:4166,4250:20833,222:20833,2339:83333,2340:1000000} {} {2:800000} {} {2:5} 25 800 1356 1824 [] [999]
+20203007 1000 505 2 0 [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))] 30 {(8,4,107):1390000,(8,5,107):93333,(8,2,108):100000,(8,3,108):10000,(8,4,108):5000} 1 {4:4,5:2} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:80000,3802:104167,3803:11574,9051:11574,5202:560000,2320:100000,4209:5208,260:5208,4250:26041,222:26041,2339:83333,2340:1000000} {} {2:800000} {} {2:5} 25 800 1588 1962 [] [999]
30303001 210 255 0 0 [(628431,0),(728431,(4,2,107)),(998431,(4,3,107)),(999974,(4,2,108)),(1000000,(4,3,108))] 30 {(4,4,107):1596000,(4,5,107):80000} 1 {4:2,5:1} {3:[(8000,0),(10000,1)],4:[(2000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:200000,2320:100000} {} {} {} {} 20 800 1123 1685 [] [1004]
30303002 210 280 0 0 [(627646,0),(727646,(4,2,107)),(997646,(4,3,107)),(999961,(4,2,108)),(1000000,(4,3,108))] 30 {(4,4,107):1596000,(4,5,107):80000} 1 {4:2,5:1} {3:[(8000,0),(10000,1)],4:[(2000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:200000,2320:100000} {} {} {} {} 20 800 1129 1694 [] [1004]
30303003 210 310 0 0 [(627646,0),(727646,(5,2,107)),(997646,(5,3,107)),(999961,(5,2,108)),(1000000,(5,3,108))] 30 {(5,4,107):1632000,(5,5,107):146667} 1 {4:2,5:1} {3:[(8000,0),(10000,1)],4:[(2000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:200000,3802:6944,2320:100000} {} {} {} {} 20 800 1129 1694 [] [1004]
@@ -168,24 +168,24 @@
60203004 0 190 0 0 [(600000,0),(1000000,(3,2,107))] 5 {(3,3,107):1000000} 1 {4:0,5:0} {3:[(10000,0)]} [] [5,3,3,[(10000,0)],107] {987:1000000,2321:1000000} {} {} {} {} 0 0 0 0 [] []
60203005 0 190 0 0 [(600000,0),(1000000,(3,2,107))] 5 {(3,3,107):1000000} 1 {4:0,5:0} {3:[(10000,0)]} [] [5,3,3,[(10000,0)],107] {987:1000000,2321:1000000} {} {} {} {} 0 0 0 0 [] []
60203006 0 210 0 0 [(500000,0),(1000000,(3,2,107))] 5 {(3,3,107):1200000,(3,4,107):40000} 1 {4:1,5:0} {3:[(9200,0),(10000,1)],4:[(10000,1)]} [] [5,3,3,[(10000,1)],107] {987:1000000,2321:1000000} {} {} {} {} 0 0 0 0 [] []
-60203007 0 230 0 0 [(500000,0),(1000000,(3,2,107))] 5 {(3,3,107):1200000,(3,4,107):40000} 1 {4:1,5:0} {3:[(9200,0),(10000,1)],4:[(10000,1)]} [] [5,3,3,[(10000,1)],107] {987:1000000,2321:1000000} {} {5:1000000} {} {5:2} 0 0 0 0 [] []
-60203008 0 255 0 0 [(550000,0),(650000,(4,2,105)),(1000000,(4,3,105)),(1000000,(4,4,105)),(1000000,(4,5,105))] 10 {(4,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:20000,3801:60000,2321:1000000} {} {5:1000000} {} {5:4} 0 0 0 0 [] []
-60203009 0 280 0 0 [(500000,0),(600000,(4,2,105)),(1000000,(4,3,105)),(1000000,(4,4,105)),(1000000,(4,5,105))] 10 {(4,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:20000,3801:60000,2321:1000000} {2321:2} {} {2:570000} {2:2} 0 0 0 0 [] []
-60203010 0 305 0 0 [(500000,0),(600000,(5,2,105)),(1000000,(5,3,105)),(1000000,(5,4,105)),(1000000,(5,5,105))] 10 {(5,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:60000,4610:10000,2321:1000000} {2321:2} {} {2:833333} {2:3} 0 0 0 0 [] []
-60203011 0 330 0 0 [(500000,0),(600000,(5,2,105)),(1000000,(5,3,105)),(1000000,(5,4,105)),(1000000,(5,5,105))] 10 {(5,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:40000,4610:10000,2321:1000000} {2321:2} {} {2:775000} {2:4} 0 0 0 0 [] []
-60203012 0 355 0 0 [(500000,0),(600000,(6,2,105)),(1000000,(6,3,105)),(1000000,(6,4,105)),(1000000,(6,5,105))] 10 {(6,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:40000,4610:10000,2321:1000000} {2321:2} {} {2:820000} {2:5} 0 0 0 0 [] []
-60203013 0 380 0 0 [(500000,0),(600000,(6,2,105)),(1000000,(6,3,105)),(1000000,(6,4,105)),(1000000,(6,5,105))] 10 {(6,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,2321:1000000} {2321:2} {} {2:850000} {2:6} 0 0 0 0 [] []
-60203014 0 405 0 0 [(500000,0),(600000,(7,2,105)),(1000000,(7,3,105)),(1000000,(7,4,105)),(1000000,(7,5,105))] 10 {(7,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:2500,2321:1000000} {2321:2} {} {2:825000} {2:8} 0 0 0 0 [] []
-60203015 0 430 0 0 [(500000,0),(600000,(7,2,105)),(1000000,(7,3,105)),(1000000,(7,4,105)),(1000000,(7,5,105))] 10 {(7,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:2500,2321:1000000} {2321:2} {} {2:830000} {2:10} 0 0 0 0 [] []
-60203016 0 455 0 0 [(500000,0),(600000,(8,2,105)),(1000000,(8,3,105)),(1000000,(8,4,105)),(1000000,(8,5,105))] 10 {(8,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2321:1000000} {2321:2} {} {2:713333} {2:15} 0 0 0 0 [] []
-60203017 0 480 0 0 [(500000,0),(600000,(8,2,105)),(1000000,(8,3,105)),(1000000,(8,4,105)),(1000000,(8,5,105))] 10 {(8,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2321:1000000} {2321:2} {} {2:893333} {2:15} 0 0 0 0 [] []
-60203018 0 505 0 0 [(500000,0),(600000,(9,2,105)),(1000000,(9,3,105)),(1000000,(9,4,105)),(1000000,(9,5,105))] 10 {(9,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2321:1000000} {2321:2} {} {2:870000} {2:20} 0 0 0 0 [] []
-60203019 0 530 0 0 [(500000,0),(600000,(9,2,105)),(1000000,(9,3,105)),(1000000,(9,4,105)),(1000000,(9,5,105))] 10 {(9,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2321:1000000} {2321:2} {} {2:726666} {2:30} 0 0 0 0 [] []
-60203020 0 555 0 0 [(790667,0),(857334,(10,2,107)),(1000000,(10,3,107)),(1000000,(10,4,107)),(1000000,(10,5,107))] 15 {(10,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2321:1000000} {2321:2} {} {2:872000} {2:30} 0 0 0 0 [] []
-60203021 0 580 0 0 [(790667,0),(857334,(10,2,107)),(1000000,(10,3,107)),(1000000,(10,4,107)),(1000000,(10,5,107))] 15 {(10,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2321:1000000} {2321:2} {} {2:784800} {2:40} 0 0 0 0 [] []
-60203022 0 655 0 0 [(790667,0),(857334,(9,2,107)),(1000000,(9,3,107)),(1000000,(9,4,107)),(1000000,(9,5,107))] 15 {(11,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2321:1000000} {2321:2} {} {2:872000} {2:30} 0 0 0 0 [] []
-60203023 0 680 0 0 [(790667,0),(857334,(10,2,107)),(1000000,(10,3,107)),(1000000,(10,4,107)),(1000000,(10,5,107))] 15 {(11,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2321:1000000} {2321:2} {} {2:784800} {2:40} 0 0 0 0 [] []
-60203024 0 705 0 0 [(790667,0),(857334,(10,2,107)),(1000000,(10,3,107)),(1000000,(10,4,107)),(1000000,(10,5,107))] 15 {(12,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2321:1000000} {2321:2} {} {2:984800} {2:40} 0 0 0 0 [] []
+60203007 0 230 0 0 [(500000,0),(1000000,(3,2,107))] 5 {(3,3,107):1200000,(3,4,107):40000} 1 {4:1,5:0} {3:[(9200,0),(10000,1)],4:[(10000,1)]} [] [5,3,3,[(10000,1)],107] {987:1000000,2321:1000000} {} {5:2000000} {} {5:1} 0 0 0 0 [] []
+60203008 0 255 0 0 [(550000,0),(650000,(4,2,105)),(1000000,(4,3,105)),(1000000,(4,4,105)),(1000000,(4,5,105))] 10 {(4,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:20000,3801:60000,2321:1000000} {} {5:4000000} {} {5:1} 0 0 0 0 [] []
+60203009 0 280 0 0 [(500000,0),(600000,(4,2,105)),(1000000,(4,3,105)),(1000000,(4,4,105)),(1000000,(4,5,105))] 10 {(4,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:20000,3801:60000,2321:1000000} {2321:2} {} {2:1140000} {2:1} 0 0 0 0 [] []
+60203010 0 305 0 0 [(500000,0),(600000,(5,2,105)),(1000000,(5,3,105)),(1000000,(5,4,105)),(1000000,(5,5,105))] 10 {(5,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:60000,4610:10000,2321:1000000} {2321:2} {} {2:2500000} {2:1} 0 0 0 0 [] []
+60203011 0 330 0 0 [(500000,0),(600000,(5,2,105)),(1000000,(5,3,105)),(1000000,(5,4,105)),(1000000,(5,5,105))] 10 {(5,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:40000,4610:10000,2321:1000000} {2321:2} {} {2:3100000} {2:1} 0 0 0 0 [] []
+60203012 0 355 0 0 [(500000,0),(600000,(6,2,105)),(1000000,(6,3,105)),(1000000,(6,4,105)),(1000000,(6,5,105))] 10 {(6,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:40000,4610:10000,2321:1000000} {2321:2} {} {2:4100000} {2:1} 0 0 0 0 [] []
+60203013 0 380 0 0 [(500000,0),(600000,(6,2,105)),(1000000,(6,3,105)),(1000000,(6,4,105)),(1000000,(6,5,105))] 10 {(6,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,2321:1000000} {2321:2} {} {2:5100000} {2:1} 0 0 0 0 [] []
+60203014 0 405 0 0 [(500000,0),(600000,(7,2,105)),(1000000,(7,3,105)),(1000000,(7,4,105)),(1000000,(7,5,105))] 10 {(7,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:2500,2321:1000000} {2321:2} {} {2:6600000} {2:1} 0 0 0 0 [] []
+60203015 0 430 0 0 [(500000,0),(600000,(7,2,105)),(1000000,(7,3,105)),(1000000,(7,4,105)),(1000000,(7,5,105))] 10 {(7,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:2500,2321:1000000} {2321:2} {} {2:8300000} {2:1} 0 0 0 0 [] []
+60203016 0 455 0 0 [(500000,0),(600000,(8,2,105)),(1000000,(8,3,105)),(1000000,(8,4,105)),(1000000,(8,5,105))] 10 {(8,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2321:1000000} {2321:2} {} {2:10700000} {2:1} 0 0 0 0 [] []
+60203017 0 480 0 0 [(500000,0),(600000,(8,2,105)),(1000000,(8,3,105)),(1000000,(8,4,105)),(1000000,(8,5,105))] 10 {(8,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2321:1000000} {2321:2} {} {2:13400000} {2:1} 0 0 0 0 [] []
+60203018 0 505 0 0 [(500000,0),(600000,(9,2,105)),(1000000,(9,3,105)),(1000000,(9,4,105)),(1000000,(9,5,105))] 10 {(9,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2321:1000000} {2321:2} {} {2:17400000} {2:1} 0 0 0 0 [] []
+60203019 0 530 0 0 [(500000,0),(600000,(9,2,105)),(1000000,(9,3,105)),(1000000,(9,4,105)),(1000000,(9,5,105))] 10 {(9,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2321:1000000} {2321:2} {} {2:21800000} {2:1} 0 0 0 0 [] []
+60203020 0 555 0 0 [(790667,0),(857334,(10,2,107)),(1000000,(10,3,107)),(1000000,(10,4,107)),(1000000,(10,5,107))] 15 {(10,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2321:1000000} {2321:2} {} {2:26160000} {2:1} 0 0 0 0 [] []
+60203021 0 580 0 0 [(790667,0),(857334,(10,2,107)),(1000000,(10,3,107)),(1000000,(10,4,107)),(1000000,(10,5,107))] 15 {(10,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2321:1000000} {2321:2} {} {2:31392000} {2:1} 0 0 0 0 [] []
+60203022 0 655 0 0 [(790667,0),(857334,(9,2,107)),(1000000,(9,3,107)),(1000000,(9,4,107)),(1000000,(9,5,107))] 15 {(11,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2321:1000000} {2321:2} {} {2:37670400} {2:1} 0 0 0 0 [] []
+60203023 0 680 0 0 [(790667,0),(857334,(10,2,107)),(1000000,(10,3,107)),(1000000,(10,4,107)),(1000000,(10,5,107))] 15 {(11,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2321:1000000} {2321:2} {} {2:37670400} {2:1} 0 0 0 0 [] []
+60203024 0 705 0 0 [(790667,0),(857334,(10,2,107)),(1000000,(10,3,107)),(1000000,(10,4,107)),(1000000,(10,5,107))] 15 {(12,4,107):40000} 1 {4:1,5:0} {3:[(8000,0),(10000,1)],4:[(10000,1)]} [] [] {987:1000000,4609:10000,3801:20000,4610:10000,4608:1250,4606:1250,2321:1000000} {2321:2} {} {2:37670400} {2:1} 0 0 0 0 [] []
30903001 150 0 0 0 [(250000,0),(375000,(3,2,107)),(918750,(3,3,107)),(1000000,(3,4,107)),(1000000,(3,5,107))] 80 {(3,4,107):2000000} 1 {4:8,5:0} {3:[(80,0),(100,1)],4:[(50,1),(100,2)],5:[(100,2)]} [] [] {} {} {} {} {} 0 0 0 0 [] []
30903001 200 0 0 0 [(250000,0),(375000,(4,2,107)),(918750,(4,3,107)),(987500,(4,4,107)),(1000000,(4,5,107))] 80 {(4,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 250 0 0 0 [(250000,0),(375000,(5,2,107)),(918750,(5,3,107)),(987500,(5,4,107)),(1000000,(5,5,107))] 80 {(5,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 [] []
diff --git a/db/PyMongoDataServer/PySysDB/tagSuccess.txt b/db/PyMongoDataServer/PySysDB/tagSuccess.txt
index 2d22a15..e85085b 100644
--- a/db/PyMongoDataServer/PySysDB/tagSuccess.txt
+++ b/db/PyMongoDataServer/PySysDB/tagSuccess.txt
@@ -360,13 +360,13 @@
1028 63 7 0 0 0
1029 92 5 1|2|1 0 0
1030 71 5 0 0 0
-1041 91 10 50035|55035|60035 0 0
-1042 91 10 50035|55035|60035 0 0
-1043 91 10 50035|55035|60035 0 0
-1044 91 10 50035|55035|60035 0 0
-1045 91 10 50035|55035|60035 0 0
-1046 91 10 50035|55035|60035 0 0
-1047 91 10 50035|55035|60035 0 0
-1048 91 10 50035|55035|60035 0 0
-1049 91 10 50035|55035|60035 0 0
-1050 91 10 50035|55035|60035 0 0
+1041 91 10 50005|55005|60005 0 0
+1042 91 10 50105|55105|60105 0 0
+1043 91 10 50405|55405|60405 0 0
+1044 91 10 1005|2005|3005 0 0
+1045 91 10 50205|55205|60205 0 0
+1046 91 10 50305|55305|60305 0 0
+1047 91 10 50535|55535|60535 0 0
+1048 91 10 50635|55635|60635 0 0
+1049 91 10 50735|55735|60735 0 0
+1050 91 10 50835|55835|60835 0 0
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index 1b2b3ef..5b1d12a 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -235,19 +235,19 @@
10804014 0 1 后裔之魂 350 0 272 283 555 14 0 0 0 0 0 0 0 0 0 0 0 0 3000 838 104 10 300 0 6 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 200 1 1
10804015 0 1 无涯老人 350 0 272 283 555 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 838 104 10 300 0 6 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 200 1 1
10804103 0 1 神机子 350 0 272 283 555 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 838 104 10 300 0 6 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 200 1 1
-10904001 0 1 五行之魂 300 0 607 742 1264 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1390 3772 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 5 0 0 0 200 0 1
-10904002 0 1 琉璃公主 300 0 272 283 555 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 838 104 10 300 0 6 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 200 1 1
+10904001 0 1 五行之魂 300 0 607 742 1264 15 0 0 0 0 0 0 0 0 0 0 0 0 3000 1390 3772 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 5 0 0 0 200 0 1
+10904002 0 1 琉璃公主 300 0 272 283 555 9 0 0 0 0 0 0 0 0 0 0 0 0 3000 838 104 10 300 0 6 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 200 1 1
10904003 0 1 两仪村长 310 0 607 742 1264 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1390 3772 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 5 0 0 0 200 0 1
10904004 0 1 大牛 310 0 607 742 1264 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1390 3772 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 5 0 0 0 200 0 1
10904005 0 1 陈可衣 320 0 607 742 1264 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1390 3772 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 5 0 0 0 200 0 1
10904006 0 1 四喜爹 320 0 272 283 555 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 838 104 10 300 0 6 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 200 1 1
10904007 0 1 狗蛋 330 0 607 742 1264 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1390 3772 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 5 0 0 0 200 0 1
10904008 0 1 四喜 330 0 607 742 1264 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1390 3772 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 5 0 0 0 200 0 1
-10904009 0 1 云游侠士 340 0 607 742 1264 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1390 3772 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 5 0 0 0 200 0 1
-10904010 0 1 土方道人 340 0 272 283 555 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 838 104 10 300 0 6 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 200 1 1
-10904011 0 1 游方道士 350 0 607 742 1264 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1390 3772 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 5 0 0 0 200 0 1
-10904012 0 1 道人学徒 350 0 272 283 555 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 838 104 10 300 0 6 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 200 1 1
-10904013 0 1 辰龙尊者 350 0 607 742 1264 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 1390 3772 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 5 0 0 0 200 0 1
+10904009 0 1 云游侠士 340 0 607 742 1264 6 0 0 0 0 0 0 0 0 0 0 0 0 3000 1390 3772 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 5 0 0 0 200 0 1
+10904010 0 1 土方道人 340 0 272 283 555 7 0 0 0 0 0 0 0 0 0 0 0 0 3000 838 104 10 300 0 6 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 200 1 1
+10904011 0 1 游方道士 350 0 607 742 1264 8 0 0 0 0 0 0 0 0 0 0 0 0 3000 1390 3772 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 5 0 0 0 200 0 1
+10904012 0 1 道人学徒 350 0 272 283 555 5 0 0 0 0 0 0 0 0 0 0 0 0 3000 838 104 10 300 0 6 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 200 1 1
+10904013 0 1 辰龙尊者 350 0 607 742 1264 14 0 0 0 0 0 0 0 0 0 0 0 0 3000 1390 3772 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 5 0 0 0 200 0 1
10904014 0 1 无 350 0 272 283 555 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 838 104 10 300 0 6 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 200 1 1
10904015 0 1 无 350 0 272 283 555 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 838 104 10 300 0 6 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 200 1 1
10904016 0 1 无 350 0 272 283 555 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 838 104 10 300 0 6 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 200 1 1
diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
index 2f8d28f..96153d7 100644
--- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
@@ -1422,7 +1422,7 @@
50905 幽冥附体 50905 1 1 2 2 0 7 0 0 0 0 0 0 0 10000 0 0 0 0 0 4023 10000 0 0 4046 1000 5000 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 19030 0 0 0 0 0 0 0 0 0 0 0 0 0 0
50906 天玄秘法 50906 1 1 2 2 0 7 0 0 0 0 0 0 0 0 0 0 0 0 0 4049 3000 2000 0 0 0 1 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 23681 0 0 0 0 0 0 0 4 0 0 0 0 0 0
50907 混元决 50907 1 1 2 2 0 7 0 0 0 0 0 0 0 15000 0 0 0 0 0 4026 5000 0 14 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 27230 0 0 0 0 0 0 0 4 0 0 0 0 0 0
-50908 千幻冥炎 50908 1 1 2 2 0 16 0 0 0 0 10 0 0 20000 0 0 0 0 0 4024 10000 2500 0 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 30979 0 0 0 0 0 0 0 4 0 0 0 0 0 0
+50908 千幻冥炎 50908 1 1 2 2 0 16 0 0 0 0 10 0 0 20000 0 0 0 0 0 4023 10000 0 0 4024 10000 2500 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 30979 0 0 0 0 0 0 0 4 0 0 0 0 0 0
50909 神火护身 50909 1 1 2 2 0 16 0 0 0 0 10 0 0 20000 0 0 0 0 0 808 1000 20000 50939 4023 10000 5000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 0 0 0 0 0 0 0 0 2 35041 0 0 0 0 0 0 0 4 0 0 0 0 0 0
50910 元素召唤 50910 1 1 2 2 0 7 0 0 16 6 10 6 0 60000 0 0 0 0 0 1060 50105002 0 0 1013 10000 0 0 4004 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 0 0 0 0 0 0 0 0 2 40174 0 0 0 0 0 0 0 4 0 0 0 0 0 0
50911 森罗万象 50911 1 1 2 2 0 16 0 0 0 0 10 0 0 20000 0 0 0 0 0 4004 2000 0 0 4513 500 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 0 0 0 0 0 0 0 0 2 48037 0 0 0 0 0 0 0 4 0 0 0 0 0 0
@@ -2194,7 +2194,7 @@
55905 幽冥附体 55905 1 1 4 2 0 7 0 0 0 0 0 0 0 10000 0 0 0 0 0 4023 10000 0 0 4046 1000 5000 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 19030 0 0 0 0 0 0 0 0 0 0 0 0 0 0
55906 天玄秘法 55906 1 1 4 2 0 7 0 0 0 0 0 0 0 0 0 0 0 0 0 4049 3000 2000 0 0 0 1 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 23681 0 0 0 0 0 0 0 4 0 0 0 0 0 0
55907 混元决 55907 1 1 4 2 0 7 0 0 0 0 0 0 0 15000 0 0 0 0 0 4026 5000 0 14 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 27230 0 0 0 0 0 0 0 4 0 0 0 0 0 0
-55908 千幻冥炎 55908 1 1 4 2 0 16 0 0 0 0 10 0 0 20000 0 0 0 0 0 4024 10000 2500 0 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 30979 0 0 0 0 0 0 0 4 0 0 0 0 0 0
+55908 千幻冥炎 55908 1 1 4 2 0 16 0 0 0 0 10 0 0 20000 0 0 0 0 0 4023 10000 0 0 4024 10000 2500 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 30979 0 0 0 0 0 0 0 4 0 0 0 0 0 0
55909 神火护身 55909 1 1 4 2 0 16 0 0 0 0 10 0 0 20000 0 0 0 0 0 808 1000 20000 50939 4023 10000 5000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 0 0 0 0 0 0 0 0 2 35041 0 0 0 0 0 0 0 4 0 0 0 0 0 0
55910 元素召唤 55910 1 1 4 2 0 7 0 0 16 6 10 6 0 60000 0 0 0 0 0 1060 50105003 0 0 4004 10000 0 0 1013 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 0 0 0 0 0 0 0 0 2 40174 0 0 0 0 0 0 0 4 0 0 0 0 0 0
55911 森罗万象 55911 1 1 4 2 0 16 0 0 0 0 10 0 0 20000 0 0 0 0 0 4004 2000 0 0 4513 500 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10000 5000 0 0 0 0 0 0 0 0 0 0 0 0 2 48037 0 0 0 0 0 0 0 4 0 0 0 0 0 0
--
Gitblit v1.8.0