From 2d339c82da668045051791a8187ac177acf96130 Mon Sep 17 00:00:00 2001
From: cehua_TRX <526616766@qq.com>
Date: 星期六, 29 九月 2018 01:10:07 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server
---
db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt | 14 ++--
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt | 4
CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt | 24 ++++----
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.pyc | 0
db/PyMongoDataServer/PySysDB/tagFuncConfig.txt | 2
CoreServerGroup/GameServer/Script/GM/GMShell.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc | 0
CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc | 0
CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt | 2
CoreServerGroup/GameServer/Script/GM/Commands/GMT_MagicWeaponExp.pyc | 0
CoreServerGroup/GameServer/Script/ShareDefine.pyc | 0
db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt | 81 ++++++++++++++------------
CoreServerGroup/GameServer/Script/PyGameData.pyc | 0
db/PyMongoDataServer/SysDB/tagChinSkill.txt | 8 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc | 0
db/PyMongoDataServer/SysDB/tagChinNPC.txt | 28 ++++----
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_GMTMagicWeaponExp.pyc | 0
21 files changed, 84 insertions(+), 79 deletions(-)
diff --git a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
index c0b06ce..410e5c7 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagActExpRate.txt
@@ -1,4 +1,4 @@
CfgID ActMark ServerIDList StartDate EndDate StartTime EndTime NotifyInfoStart NotifyInfoEnd LimitLV AddExpRate
1 OpenServer [] 6 6 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} 110 10000
-2 NationalDay [] 2018-10-3 2018-10-3 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} 110 10000
-3 NationalDay [] 2018-10-7 2018-10-7 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} 110 10000
+2 NationalDay [(7001,7003),(8002,8004)] 2018-10-3 2018-10-3 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} 110 10000
+3 NationalDay [(7001,7003),(8002,8004)] 2018-10-7 2018-10-7 18:00 20:00 { 0:["ExpActivity_Start", [2]]} {-5:["ExpActivity_End", [2]], 0:["ExpActivity_Close", [2]]} 110 10000
diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
index 4cb7c5e..c160a52 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
@@ -437,19 +437,19 @@
20302001 小宝箱 1
20302002 大宝箱 1
20302003 秘境守卫 260
-20302004 食灵鱼 270
-20302005 金甲蛮牛 280
-20302006 灵鲛斗士 290
-20302007 紫炎灵狮 300
-20302008 金甲剑士 310
-20302009 黄金战将 320
+20302004 食灵鱼 275
+20302005 金甲蛮牛 290
+20302006 灵鲛斗士 310
+20302007 紫炎灵狮 330
+20302008 金甲剑士 350
+20302009 黄金战将 370
20303001 残暴古熊王 265
-20303002 魅影蛛皇 275
-20303003 紫金貔貅 285
-20303004 双翼角兽 295
-20303005 金甲蛮狮 305
-20303006 麒麟瑞兽 315
-20303007 金色战神 325
+20303002 魅影蛛皇 280
+20303003 紫金貔貅 295
+20303004 双翼角兽 315
+20303005 金甲蛮狮 335
+20303006 麒麟瑞兽 355
+20303007 金色战神 375
30102001 凶狼 50
30102002 巨虎 50
30102003 幼龙 50
diff --git a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
index c6a8387..7cc3b8b 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt
@@ -16,7 +16,7 @@
RealmFBHelpAward ["RealmFBHelp",3,[(101,3,1)]]
RealmFBHelpAttr {"0":{"51":2000},"1":{"51":1500},"2":{"51":2000,"13":500}} 10000 6
RealmFBHelpLimit 10
-GlobalDropCD {3802:100,3803:20160,3804:60480,3805:86400,9062:1440,9073:4320,9074:10080,4202:5040,250:10080,4213:10080,260:15120,4209:15120,258:20160,4210:20160} {50103001:{1:[0,[4202],[]]},50103002:{1:[0,[250],[]]},50103003:{1:[0,[4213],[]]}} 0 0 0
+GlobalDropCD {3802:100,3803:2880,3804:4320,3805:86400,9062:1440,9073:4320,9074:10080,4202:5040,250:10080,4213:10080,260:15120,4209:15120,258:20160,4210:20160} {50103001:{1:[0,[4202],[]]},50103002:{1:[0,[250],[]]},50103003:{1:[0,[4213],[]]}} 0 0 0
NPCGlobalDropRate {3806:[[101,102],"10000+killedCnt*20000"]} 0 0 0 0
CreateFamilyMinLV 65 0 0 0 0
CreateFamilyNeedMoney 100 5 0 0 0
diff --git a/CoreServerGroup/GameServer/Script/GM/Commands/GMT_MagicWeaponExp.pyc b/CoreServerGroup/GameServer/Script/GM/Commands/GMT_MagicWeaponExp.pyc
new file mode 100644
index 0000000..ca96aa2
--- /dev/null
+++ b/CoreServerGroup/GameServer/Script/GM/Commands/GMT_MagicWeaponExp.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/GM/GMShell.pyc b/CoreServerGroup/GameServer/Script/GM/GMShell.pyc
index fcbd69c..67897c7 100644
--- a/CoreServerGroup/GameServer/Script/GM/GMShell.pyc
+++ b/CoreServerGroup/GameServer/Script/GM/GMShell.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc b/CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc
index 0178839..cee8e2c 100644
--- a/CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/ChPlayer.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/PyGameData.pyc b/CoreServerGroup/GameServer/Script/PyGameData.pyc
index 78d1e54..0a8765b 100644
--- a/CoreServerGroup/GameServer/Script/PyGameData.pyc
+++ b/CoreServerGroup/GameServer/Script/PyGameData.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/ShareDefine.pyc b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
index 0e8a651..d9abee3 100644
--- a/CoreServerGroup/GameServer/Script/ShareDefine.pyc
+++ b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index ead7bac..650aff7 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/Player/ChPlayer.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
index e805726..9fa0613 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/ChPlayer.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.pyc
index 86ccb7f..fb4d83a 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerDogz.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.pyc
index 40af51b..2c36629 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc
index 6a94f16..604f30b 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerTJG.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_GMTMagicWeaponExp.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_GMTMagicWeaponExp.pyc
new file mode 100644
index 0000000..d9a6510
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/RemoteQuery/GY_Query_GMTMagicWeaponExp.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
index bc57bda..e9518f8 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc
index a4f8176..b114ede 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveBuffEffMng.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index e140166..bbd9442 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -100,7 +100,7 @@
EquipSuitColorStar {"1":[4,1],"2":[5,2]} 2
EquipSuitMaxLv {"3":{"1":8,"2":8},"4":{"1":8,"2":8},"5":{"1":8,"2":8},"6":{"1":8,"2":8},"7":{"1":8,"2":8},"8":{"1":8,"2":8},"9":{"1":8,"2":8},"10":{"1":8,"2":8}}
EquipSuitType {"1":[3,4,5,6,7],"2":[8,9,10]}
-GlobalDropCD {3802:100,3803:20160,3804:60480,3805:86400,9062:1440,9073:4320,9074:10080,4202:5040,250:10080,4213:10080,260:15120,4209:15120,258:20160,4210:20160} {50103001:{1:[0,[4202],[]]},50103002:{1:[0,[250],[]]},50103003:{1:[0,[4213],[]]}} 0 0 0
+GlobalDropCD {3802:100,3803:2880,3804:4320,3805:86400,9062:1440,9073:4320,9074:10080,4202:5040,250:10080,4213:10080,260:15120,4209:15120,258:20160,4210:20160} {50103001:{1:[0,[4202],[]]},50103002:{1:[0,[250],[]]},50103003:{1:[0,[4213],[]]}} 0 0 0
NPCGlobalDropRate {3806:[[101,102],"10000+killedCnt*20000"]} 0 0 0 0
GoldModel [(500,2100),(2000,2101),(10000,2102)] 0 0 0 0
MapItemProtectTime 60000 0 0 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt b/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt
index a43abc6..e77f372 100644
--- a/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt
+++ b/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt
@@ -103,13 +103,13 @@
21100 20203005 0 0 0
21100 20203006 0 0 0
21100 20203007 0 0 0
-21110 20302003 250 260 4016
-21110 20302004 260 270 4327
-21110 20302005 270 280 4729
-21110 20302006 280 290 5235
-21110 20302007 290 300 5931
-21110 20302008 300 310 6891
-21110 20302009 310 320 7225
+21110 20302003 250 270 3619
+21110 20302004 265 285 4327
+21110 20302005 280 300 4978
+21110 20302006 300 320 6428
+21110 20302007 320 340 7397
+21110 20302008 340 360 8638
+21110 20302009 360 380 11288
21110 20303001 0 0 0
21110 20303002 0 0 0
21110 20303003 0 0 0
diff --git a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
index 6fc6c3f..cef1fa3 100644
--- a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
+++ b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
@@ -51,13 +51,14 @@
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:[(8000,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:[(6000,1),(10000,2)],5:[(10000,2)]} [1,4,4,[(10000,2)],107] [] {3801:300000,3802:30000,2320:100000,2339:20000,2340:80000} {} {} {} {} 25 800 1115 1673 [] [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:[(6000,1),(10000,2)],5:[(10000,2)]} [1,4,4,[(10000,2)],107] [] {3801:300000,3802:50000,2320:100000,2339:20000,2340:80000} {} {} {} {} 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):1300000,(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:[(6000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:300000,3802:50000,9051:3472,2320:100000,2339:20000,2340:80000} {} {} {} {} 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:[(8000,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:[(6000,1),(10000,2)],5:[(10000,2)]} [1,4,4,[(10000,2)],107] [] {3801:300000,3802:20000,2320:100000,2339:20000,2340:80000} {} {} {} {} 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):1300000,(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:[(6000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:300000,3802:40000,9051:3472,2320:100000,2339:20000,2340:80000} {} {} {} {} 25 800 1123 1685 [] [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:50000,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:50000,3803:2500,9051:7330,2320:100000,2339:20000,2340: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:[(6000,1),(10000,2)],5:[(10000,2)]} [1,4,4,[(10000,2)],107] [] {3801:300000,3802:10000,2320:100000,2339:20000,2340:80000} {} {} {} {} 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):1300000,(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:[(6000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:300000,3802:16000,9051:3472,2320:100000,2339:20000,2340:80000} {} {} {} {} 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):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]
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 [] []
@@ -96,9 +97,9 @@
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:[(6500,1),(10000,2)],5:[(10000,2)]} [1,3,4,[(10000,2)],107] [] {2320:100000,2339:20000,2340:80000} {} {} {} {} 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:[(7000,1),(10000,2)],5:[(10000,2)]} [1,4,4,[(10000,2)],107] [] {3801:300000,2320:100000,2339:20000,2340:80000} {} {} {} {} 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:[(6000,1),(10000,2)],5:[(10000,2)]} [1,4,5,[(10000,2)],107] [] {3801:300000,5202:420000,2320:100000,2339:20000,2340:80000} {} {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):1200000,(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:[(6000,1),(10000,2)],5:[(10000,2)]} [1,5,5,[(10000,2)],107] [] {3801:300000,3802:40000,5202:440000,2320:100000,2339:20000,2340:80000} {} {2:582400} {} {2:5} 25 800 1123 1685 [] [999,3904]
+20103005 210 315 2 0 [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))] 30 {(5,4,107):1200000,(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:[(6000,1),(10000,2)],5:[(10000,2)]} [1,5,5,[(10000,2)],107] [] {3801:300000,3802:50000,5202:440000,2320:100000,2339:20000,2340:80000} {} {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):1300000,(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:[(6000,1),(10000,2)],5:[(10000,2)]} [1,5,5,[(10000,2)],107] [] {3801:300000,3802:50000,5202:460000,2320:100000,2339:20000,2340:80000} {} {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):1300000,(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:[(6000,1),(10000,2)],5:[(10000,2)]} [1,6,5,[(10000,2)],107] [] {3801:300000,3802:60000,9051:4630,5202:480000,2320:100000,2339:20000,2340:80000} {} {2:748800} {} {2:5} 25 800 1129 1694 [] [999,3904]
+20103007 210 365 2 0 [(402547,0),(545880,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1300000,(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:[(6000,1),(10000,2)],5:[(10000,2)]} [1,6,5,[(10000,2)],107] [] {3801:300000,3802:50000,9051:4630,5202:480000,2320:100000,2339:20000,2340: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):1200000,(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:300000,3802:50000,9051:7330,5202:440000,2320:100000,2339:20000,2340: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):1300000,(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:[(6000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:300000,3802:50000,9051:7330,5202:460000,2320:100000,2339:20000,2340: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):1200000,(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:300000,3802:50000,3803:1500,9051:8102,5202:480000,2320:100000,2339:20000,2340:80000} {} {2:800000} {} {2:5} 25 800 1129 1694 [] [999,3904]
@@ -110,16 +111,18 @@
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:[(6500,1),(10000,2)],5:[(10000,2)]} [1,3,4,[(10000,2)],107] [] {2320:100000,2339:20000,2340:80000} {} {} {} {} 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:[(7000,1),(10000,2)],5:[(10000,2)]} [1,4,4,[(10000,2)],107] [] {3801:300000,2320:100000,2339:20000,2340:80000} {} {} {} {} 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:[(6000,1),(10000,2)],5:[(10000,2)]} [1,4,5,[(10000,2)],107] [] {3801:300000,5202:420000,2320:100000,2339:20000,2340:80000} {} {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):1200000,(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:[(6000,1),(10000,2)],5:[(10000,2)]} [1,5,5,[(10000,2)],107] [] {3801:300000,3802:30000,5202:440000,2320:100000,2339:20000,2340:80000} {} {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):1300000,(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:[(6000,1),(10000,2)],5:[(10000,2)]} [1,5,5,[(10000,2)],107] [] {3801:300000,3802:35000,5202:460000,2320:100000,2339:20000,2340:80000} {} {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):1300000,(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:[(6000,1),(10000,2)],5:[(10000,2)]} [1,6,5,[(10000,2)],107] [] {3801:200000,3802:45000,9051:4630,5202:480000,2320:100000,2339:20000,2340: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):1200000,(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:50000,9051:7330,5202:440000,2320:100000,2339:20000,2340: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):1300000,(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:[(6000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:200000,3802:50000,9051:7330,5202:460000,2320:100000,2339:20000,2340:80000} {} {2:800000} {} {2:5} 25 800 1123 1685 [] [999,3904]
-20203003 1000 405 2 0 [(391956,0),(535289,(7,2,107)),(1000000,(7,3,107))] 30 {(7,4,107):1200000,(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:50000,3803:1500,9051:8102,5202:480000,2320:100000,2339:20000,2340:80000} {} {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):1300000,(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:[(6000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:100000,3802:50000,3803:2000,9051:8102,5202:500000,2320:100000,2339:20000,2340:80000} {} {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):1200000,(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:80000,3802:50000,3803:3000,9051:9259,5202:520000,2320:100000,2339:20000,2340:80000} {} {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):1300000,(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:[(6000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:80000,3802:50000,3803:3500,9051:9259,5202:540000,2320:100000,2339:20000,2340:80000} {} {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):1300000,(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:[(6000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:80000,3802:50000,3803:5000,9051:11574,5202:560000,2320:100000,2339:20000,2340:80000} {} {2:800000} {} {2:5} 25 800 1588 1962 [] [999,3904]
+20103005 1000 315 2 0 [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))] 30 {(5,4,107):1200000,(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:[(6000,1),(10000,2)],5:[(10000,2)]} [1,5,5,[(10000,2)],107] [] {3801:300000,3802:12000,5202:440000,2320:100000,2339:20000,2340:80000} {} {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):1300000,(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:[(6000,1),(10000,2)],5:[(10000,2)]} [1,5,5,[(10000,2)],107] [] {3801:300000,3802:14000,5202:460000,2320:100000,2339:20000,2340:80000} {} {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):1300000,(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:[(6000,1),(10000,2)],5:[(10000,2)]} [1,6,5,[(10000,2)],107] [] {3801:200000,3802:18000,9051:4630,5202:480000,2320:100000,2339:20000,2340: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):1200000,(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,9051:7330,5202:440000,2320:100000,2339:20000,2340: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):1300000,(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:[(6000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:200000,3802:20000,9051:7330,5202:460000,2320:100000,2339:20000,2340: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):1200000,(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:5000,9051:8102,5202:480000,2320:100000,2339:20000,2340:80000} {} {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):1300000,(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:[(6000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:100000,3802:20000,3803:5000,9051:8102,5202:500000,2320:100000,2339:20000,2340:80000} {} {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):1200000,(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:1500,9051:8102,5202:480000,2320:100000,2339:20000,2340:80000} {} {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):1300000,(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:[(6000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:100000,3802:20000,3803:2000,9051:8102,5202:500000,2320:100000,2339:20000,2340:80000} {} {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):1200000,(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:80000,3802:20000,3803:3000,9051:9259,5202:520000,2320:100000,2339:20000,2340:80000} {} {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):1300000,(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:[(6000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:80000,3802:20000,3803:3500,9051:9259,5202:540000,2320:100000,2339:20000,2340:80000} {} {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):1300000,(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:[(6000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:80000,3802:20000,3803:5000,9051:11574,5202:560000,2320:100000,2339:20000,2340:80000} {} {2:800000} {} {2:5} 25 800 1588 1962 [] [999,3904]
30303001 210 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:[(5000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:200000,2320:100000} {} {} {} {} 20 800 1123 1685 [] [1004]
30303002 210 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:[(5000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:200000,2320:100000} {} {} {} {} 20 800 1129 1694 [] [1004]
30303003 210 310 0 0 [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))] 30 {(5,4,107):1000000,(5,5,107):50000,(5,2,108):50000,(5,3,108):5000,(5,4,108):0} 1 {4:2,5:1} {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:200000,3802:20000,2320:100000} {} {} {} {} 20 800 1129 1694 [] [1004]
@@ -135,15 +138,17 @@
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:[(5000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:80000,2320:100000} {} {} {} {} 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:[(5000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:80000,2320:100000} {} {} {} {} 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):50000,(5,2,108):50000,(5,3,108):5000,(5,4,108):0} 1 {4:2,5:1} {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:80000,3802:5000,2320:100000} {} {} {} {} 20 800 1129 1694 [] [1004]
-30303004 1000 335 0 0 [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))] 30 {(5,4,107):1000000,(5,5,107):80000,(5,2,108):50000,(5,3,108):5000,(5,4,108):0} 1 {4:2,5:1} {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:80000,3802:8000,2320:100000} {} {} {} {} 20 800 1129 1694 [] [1004]
-30303005 1000 360 0 0 [(402547,0),(545880,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1000000,(6,5,107):50000,(6,2,108):50000,(6,3,108):5000,(6,4,108):0} 1 {4:2,5:1} {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:80000,3802:10000,9062:3472,2320:100000} {} {} {} {} 20 800 1356 1824 [] [1004]
-30303006 1000 385 0 0 [(402547,0),(545880,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1000000,(6,5,107):80000,(6,2,108):50000,(6,3,108):5000,(6,4,108):0} 1 {4:2,5:1} {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:80000,3802:12000,9062:6173,2320:100000} {} {} {} {} 20 800 1356 1824 [] [1004]
-30303007 1000 425 0 0 [(391956,0),(535289,(7,2,107)),(1000000,(7,3,107))] 30 {(7,4,107):1000000,(7,5,107):50000,(7,2,108):50000,(7,3,108):5000,(7,4,108):0} 1 {4:2,5:1} {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:80000,3802:20000,3803:500,9062:7330,2320:100000} {} {} {} {} 20 800 1588 1962 [] [1004]
-30303008 1000 340 0 0 [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))] 30 {(5,4,107):1000000,(5,5,107):90000,(5,2,108):50000,(5,3,108):5000,(5,4,108):0} 1 {4:2,5:1} {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:80000,3802:10000,2320:100000} {} {} {} {} 20 800 1588 1962 [] [1004]
-30303009 1000 350 0 0 [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))] 30 {(5,4,107):1000000,(5,5,107):100000,(5,2,108):50000,(5,3,108):5000,(5,4,108):0} 1 {4:2,5:1} {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:80000,3802:12000,9073:3472,2320:100000} {} {} {} {} 20 800 1356 1824 [] [1004]
-30303010 1000 400 0 0 [(402547,0),(545880,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1000000,(6,5,107):100000,(6,2,108):50000,(6,3,108):5000,(6,4,108):0} 1 {4:2,5:1} {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:80000,3802:20000,3803:500,9073:6173,2320:100000} {} {} {} {} 20 800 1356 1824 [] [1004]
-30303011 1000 450 0 0 [(391956,0),(535289,(7,2,107)),(1000000,(7,3,107))] 30 {(7,4,107):1000000,(7,5,107):100000,(7,2,108):50000,(7,3,108):5000,(7,4,108):0} 1 {4:2,5:1} {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:80000,3802:22000,3803:600,9073:7330,2320:100000} {} {} {} {} 20 800 1588 1962 [] [1004]
-30303012 1000 500 0 0 [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))] 30 {(8,4,107):1000000,(8,5,107):100000,(8,2,108):50000,(8,3,108):5000,(8,4,108):0} 1 {4:2,5:1} {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:80000,3802:24000,3803:700,9073:7330,2320:100000} {} {} {} {} 20 800 1588 1962 [] [1004]
+30303004 1000 335 0 0 [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))] 30 {(5,4,107):1000000,(5,5,107):80000,(5,2,108):50000,(5,3,108):5000,(5,4,108):0} 1 {4:2,5:1} {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:80000,3802:6000,2320:100000} {} {} {} {} 20 800 1129 1694 [] [1004]
+30303005 1000 360 0 0 [(402547,0),(545880,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1000000,(6,5,107):50000,(6,2,108):50000,(6,3,108):5000,(6,4,108):0} 1 {4:2,5:1} {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:80000,3802:7000,9062:3472,2320:100000} {} {} {} {} 20 800 1356 1824 [] [1004]
+30303006 1000 385 0 0 [(402547,0),(545880,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1000000,(6,5,107):80000,(6,2,108):50000,(6,3,108):5000,(6,4,108):0} 1 {4:2,5:1} {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:80000,3802:8000,9062:6173,2320:100000} {} {} {} {} 20 800 1356 1824 [] [1004]
+30303007 290 425 0 0 [(391956,0),(535289,(7,2,107)),(1000000,(7,3,107))] 30 {(7,4,107):1000000,(7,5,107):50000,(7,2,108):50000,(7,3,108):5000,(7,4,108):0} 1 {4:2,5:1} {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:80000,3802:10000,3803:5000,9062:7330,2320:100000} {} {} {} {} 20 800 1588 1962 [] [1004]
+30303007 1000 425 0 0 [(391956,0),(535289,(7,2,107)),(1000000,(7,3,107))] 30 {(7,4,107):1000000,(7,5,107):50000,(7,2,108):50000,(7,3,108):5000,(7,4,108):0} 1 {4:2,5:1} {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:80000,3802:10000,3803:500,9062:7330,2320:100000} {} {} {} {} 20 800 1588 1962 [] [1004]
+30303008 1000 340 0 0 [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))] 30 {(5,4,107):1000000,(5,5,107):90000,(5,2,108):50000,(5,3,108):5000,(5,4,108):0} 1 {4:2,5:1} {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:80000,3802:8000,2320:100000} {} {} {} {} 20 800 1588 1962 [] [1004]
+30303009 1000 350 0 0 [(406076,0),(549409,(5,2,107)),(1000000,(5,3,107))] 30 {(5,4,107):1000000,(5,5,107):100000,(5,2,108):50000,(5,3,108):5000,(5,4,108):0} 1 {4:2,5:1} {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:80000,3802:9000,9073:3472,2320:100000} {} {} {} {} 20 800 1356 1824 [] [1004]
+30303010 290 400 0 0 [(402547,0),(545880,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1000000,(6,5,107):100000,(6,2,108):50000,(6,3,108):5000,(6,4,108):0} 1 {4:2,5:1} {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:80000,3802:10000,3803:5000,9073:6173,2320:100000} {} {} {} {} 20 800 1356 1824 [] [1004]
+30303010 1000 400 0 0 [(402547,0),(545880,(6,2,107)),(1000000,(6,3,107))] 30 {(6,4,107):1000000,(6,5,107):100000,(6,2,108):50000,(6,3,108):5000,(6,4,108):0} 1 {4:2,5:1} {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:80000,3802:10000,3803:500,9073:6173,2320:100000} {} {} {} {} 20 800 1356 1824 [] [1004]
+30303011 1000 450 0 0 [(391956,0),(535289,(7,2,107)),(1000000,(7,3,107))] 30 {(7,4,107):1000000,(7,5,107):100000,(7,2,108):50000,(7,3,108):5000,(7,4,108):0} 1 {4:2,5:1} {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:80000,3802:10000,3803:600,9073:7330,2320:100000} {} {} {} {} 20 800 1588 1962 [] [1004]
+30303012 1000 500 0 0 [(388426,0),(531759,(8,2,107)),(1000000,(8,3,107))] 30 {(8,4,107):1000000,(8,5,107):100000,(8,2,108):50000,(8,3,108):5000,(8,4,108):0} 1 {4:2,5:1} {3:[(9250,0),(10000,1)],4:[(5000,1),(10000,2)],5:[(10000,2)]} [] [] {3801:80000,3802:10000,3803:700,9073:7330,2320:100000} {} {} {} {} 20 800 1588 1962 [] [1004]
31501001 0 0 0 0 [] 0 {} 0 {} {} [] [] {5301:1000000} {} {} {} {} 0 0 0 0 [] []
31501002 0 0 0 0 [] 0 {} 0 {} {} [] [] {5301:1000000} {} {} {} {} 0 0 0 0 [] []
31501003 0 0 0 0 [] 0 {} 0 {} {} [] [] {5301:1000000} {} {} {} {} 0 0 0 0 [] []
@@ -199,11 +204,11 @@
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,102):1000000,(3,5,102):0} 1 {4:2,5:1} {3:[(9600,0),(10000,1)],4:[(8000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:100000,3802:0,3803:0,4609:0,5202:0,9074:0,4184:1000000,4151: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,102):1000000,(4,5,102):5000} 1 {4:2,5:1} {3:[(9600,0),(10000,1)],4:[(8000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:100000,3802:5000,3803:0,4609:100000,5202:500000,9074:0,4184:1000000,4151:1000000} {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,102):1100000,(5,5,102):5000} 1 {4:2,5:1} {3:[(9600,0),(10000,1)],4:[(8000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:100000,3802:5000,3803:0,4609:100000,5202:520000,9074:8000,4184:1000000,4151:1000000} {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,102):1200000,(6,5,102):5000} 1 {4:2,5:1} {3:[(9600,0),(10000,1)],4:[(8000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:100000,3802:5000,3803:100,4609:100000,5202:540000,9074:8000,4184:1000000,4151:1000000} {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,102):1300000,(7,5,102):5000} 1 {4:2,5:1} {3:[(9600,0),(10000,1)],4:[(8000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:100000,3802:5000,3803:100,4609:100000,5202:560000,9074:8000,4184:1000000,4151:1000000} {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,102):1400000,(8,5,102):5000} 1 {4:2,5:1} {3:[(9600,0),(10000,1)],4:[(8000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:100000,3802:5000,3803:100,4609:100000,5202:580000,9074:8000,4184:1000000,4151:1000000} {4151:4,5202:1} {2:915416} {} {2:15} 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,102):1000000,(4,5,102):5000} 1 {4:2,5:1} {3:[(9600,0),(10000,1)],4:[(8000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:100000,3802:2000,3803:0,4609:100000,5202:500000,9074:0,4184:1000000,4151:1000000} {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,102):1100000,(5,5,102):5000} 1 {4:2,5:1} {3:[(9600,0),(10000,1)],4:[(8000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:100000,3802:2000,3803:0,4609:100000,5202:520000,9074:8000,4184:1000000,4151:1000000} {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,102):1200000,(6,5,102):5000} 1 {4:2,5:1} {3:[(9600,0),(10000,1)],4:[(8000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:100000,3802:2000,3803:100,4609:100000,5202:540000,9074:8000,4184:1000000,4151:1000000} {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,102):1300000,(7,5,102):5000} 1 {4:2,5:1} {3:[(9600,0),(10000,1)],4:[(8000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:100000,3802:2000,3803:100,4609:100000,5202:560000,9074:8000,4184:1000000,4151:1000000} {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,102):1400000,(8,5,102):5000} 1 {4:2,5:1} {3:[(9600,0),(10000,1)],4:[(8000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {3801:100000,3802:2000,3803:100,4609:100000,5202:580000,9074:8000,4184:1000000,4151:1000000} {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 [] []
@@ -217,13 +222,13 @@
20302007 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {1000:700000,2000:50000,2001:0,2002:0} {} {} 0 0 0 0 [] []
20302008 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {1000:700000,2000:50000,2001:0,2002:0} {} {} 0 0 0 0 [] []
20302009 0 0 0 0 [] 0 {} 0 {} {} [] [] {} {} {1000:700000,2000:50000,2001:0,2002:0} {} {} 0 0 0 0 [] []
-20303001 0 0 0 0 [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))] 20 {(6,4,102):1000000,(6,5,102):2000} 1 {4:2,5:1} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {} {} {1000:0,2000:1800000,2001:1000000,2002:200000,3001:50000,3002:0,3003:0} {} {} 25 800 1123 1685 [] [1144]
-20303002 0 0 0 0 [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))] 20 {(6,4,102):1000000,(6,5,102):2000} 1 {4:2,5:1} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {} {} {1000:0,2000:1750000,2001:1000000,2002:250000,3001:100000,3002:0,3003:0} {} {} 25 800 1123 1685 [] [1144]
-20303003 0 0 0 0 [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))] 20 {(6,4,102):1000000,(6,5,102):2000} 1 {4:2,5:1} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {} {} {1000:0,2000:1700000,2001:1000000,2002:300000,3001:112500,3002:37500,3003:0} {} {} 25 800 1129 1694 [] [1144]
-20303004 0 0 0 0 [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))] 20 {(6,4,102):1000000,(6,5,102):2000} 1 {4:2,5:1} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {} {} {1000:0,2000:1650000,2001:1000000,2002:350000,3001:150000,3002:50000,3003:0} {} {} 25 800 1129 1694 [] [1144]
-20303005 0 0 0 0 [(394309,0),(537642,(7,2,107)),(1000000,(7,3,107))] 20 {(7,4,102):1000000,(7,5,102):2000} 1 {4:2,5:1} {3:[(9600,0),(10000,1)],4:[(7000,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 [(394309,0),(537642,(7,2,107)),(1000000,(7,3,107))] 20 {(7,4,102):1000000,(7,5,102):2000} 1 {4:2,5:1} {3:[(9600,0),(10000,1)],4:[(7000,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 [(394309,0),(537642,(7,2,107)),(1000000,(7,3,107))] 20 {(7,4,102):1000000,(7,5,102):2000} 1 {4:2,5:1} {3:[(9600,0),(10000,1)],4:[(7000,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]
+20303001 0 0 0 0 [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))] 20 {(6,4,107):1000000,(6,5,107):2000} 1 {4:2,5:1} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {} {} {1000:0,2000:1800000,2001:1000000,2002:200000,3001:50000,3002:0,3003:0} {} {} 25 800 1123 1685 [] [1144]
+20303002 0 0 0 0 [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))] 20 {(6,4,107):1000000,(6,5,107):2000} 1 {4:2,5:1} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {} {} {1000:0,2000:1750000,2001:1000000,2002:250000,3001:100000,3002:0,3003:0} {} {} 25 800 1123 1685 [] [1144]
+20303003 0 0 0 0 [(394309,0),(537642,(6,2,107)),(1000000,(6,3,107))] 20 {(6,4,107):1000000,(6,5,107):2000} 1 {4:2,5:1} {3:[(9600,0),(10000,1)],4:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {} {} {1000:0,2000:1700000,2001:1000000,2002:300000,3001:112500,3002:37500,3003:0} {} {} 25 800 1129 1694 [] [1144]
+20303004 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:[(7000,1),(10000,2)],5:[(0,1),(10000,2)]} [] [] {} {} {1000:0,2000:1650000,2001:1000000,2002:350000,3001:150000,3002:50000,3003:0} {} {} 25 800 1129 1694 [] [1144]
+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:[(7000,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:[(7000,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:[(7000,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]
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index 32a22a1..8b01bb8 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -436,20 +436,20 @@
20203007 2 0 荒漠巨兽 405 0 69721 69721 0 22 0 0 10000 42694 0 1 0 0 0 0 0 3 3000 2765386 51 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 78954133 16 10000 0 0 5 0 0 186 1 1
20302001 14 0 小宝箱 1 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 0 0 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 214 0 1
20302002 14 0 大宝箱 1 0 1 1 1 0 0 0 0 0 0 0 0 0 0 0 0 0 3000 0 0 0 300 0 0 0 0 0 0 0 0 0 0 0 10 2 1 0 0 0 0 0 0 0 214 0 1
-20302003 2 0 秘境守卫 260 0 4016 4016 0 10 0 0 0 1030 0 0 0 0 0 0 0 3 3000 1674985 34 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 6628003 0 0 0 0 1 435165 22 1 1 1
-20302004 2 0 食灵鱼 270 0 4327 4327 0 11 0 0 0 1042 0 0 0 0 0 0 0 3 3000 1771783 35 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 8675718 0 0 0 0 1 528050 25 1 1 1
-20302005 2 0 金甲蛮牛 280 0 4729 4729 0 12 0 0 0 1052 0 0 0 0 0 0 0 3 3000 1868581 36 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 12152033 0 0 0 0 1 539535 29 1 1 1
-20302006 2 0 灵鲛斗士 290 0 5235 5235 0 12 0 0 0 1059 0 0 0 0 0 0 0 3 3000 1965379 37 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 14581350 0 0 0 0 1 546410 33 1 1 1
-20302007 2 0 紫炎灵狮 300 0 5931 5931 0 13 0 0 0 1071 0 0 0 0 0 0 0 3 3000 2062177 38 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 17833603 0 0 0 0 1 602510 38 1 1 1
-20302008 2 0 金甲剑士 310 0 6891 6891 0 14 0 0 0 1234 0 0 0 0 0 0 0 3 3000 2158975 39 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 21140553 0 0 0 0 1 809985 22 1 1 1
-20302009 2 0 黄金战将 320 0 7225 7225 0 15 0 0 0 1247 0 0 0 0 0 0 0 3 3000 2255773 40 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 26177276 0 0 0 0 1 1036030 25 1 1 1
-20303001 2 0 残暴古熊王 265 0 12593 12593 0 10 0 0 10000 12579 0 1 0 0 0 0 0 3 3000 1674985 34 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 77326719 0 10000 0 0 5 0 0 186 1 1
-20303002 2 0 魅影蛛皇 275 0 14450 14450 0 11 0 0 10000 14264 0 1 0 0 0 0 0 3 3000 1771783 35 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 1216726 1 10000 0 0 5 0 0 186 1 1
-20303003 2 0 紫金貔貅 285 0 16750 16750 0 12 0 0 10000 16268 0 1 0 0 0 0 0 3 3000 1868581 36 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 41773740 1 10000 0 0 5 0 0 186 1 1
-20303004 2 0 双翼角兽 295 0 18534 18534 0 12 0 0 10000 17470 0 1 0 0 0 0 0 3 3000 1965379 37 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 70115766 1 10000 0 0 5 0 0 186 1 1
-20303005 2 0 金甲蛮狮 305 0 20941 20941 0 13 0 0 10000 19129 0 1 0 0 0 0 0 3 3000 2062177 38 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 8058726 2 10000 0 0 5 0 0 186 1 1
-20303006 2 0 麒麟瑞兽 315 0 24102 24102 0 14 0 0 10000 21153 0 1 0 0 0 0 0 3 3000 2158975 39 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 46639797 2 10000 0 0 5 0 0 186 1 1
-20303007 2 0 金色战神 325 0 25413 25413 0 15 0 0 10000 22209 0 1 0 0 0 0 0 3 3000 2255773 40 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 5401576 3 10000 0 0 5 0 0 186 1 1
+20302003 2 0 秘境守卫 260 0 3619 3619 0 9 0 0 0 876 0 0 0 0 0 0 0 3 3000 1626586 33 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 5968185 0 0 0 0 1 435165 22 1 1 1
+20302004 2 0 食灵鱼 275 0 4327 4327 0 11 0 0 0 1042 0 0 0 0 0 0 0 3 3000 1771783 35 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 8675718 0 0 0 0 1 528050 25 1 1 1
+20302005 2 0 金甲蛮牛 290 0 4978 4978 0 12 0 0 0 1057 0 0 0 0 0 0 0 3 3000 1916980 36 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 13271111 0 0 0 0 1 539535 29 1 1 1
+20302006 2 0 灵鲛斗士 310 0 6428 6428 0 14 0 0 0 1076 0 0 0 0 0 0 0 3 3000 2110576 39 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 19057705 0 0 0 0 1 546410 33 1 1 1
+20302007 2 0 紫炎灵狮 330 0 7397 7397 0 15 0 0 0 1255 0 0 0 0 0 0 0 3 3000 2304172 41 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 28706511 0 0 0 0 1 602510 38 1 1 1
+20302008 2 0 金甲剑士 350 0 8638 8638 0 16 0 0 0 1286 0 0 0 0 0 0 0 3 3000 2497768 43 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 41984861 0 0 0 0 1 809985 22 1 1 1
+20302009 2 0 黄金战将 370 0 11288 11288 0 17 0 0 0 1472 0 0 0 0 0 0 0 3 3000 2623036 46 0 300 2 6 0 0 0 0 0 0 0 0 0 10 2 58727535 0 0 0 0 1 1036030 25 1 1 1
+20303001 2 0 残暴古熊王 265 0 10995 10995 0 10 0 0 10000 10913 0 1 0 0 0 0 0 3 3000 1626586 33 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 69628847 0 10000 0 0 5 0 0 186 1 1
+20303002 2 0 魅影蛛皇 280 0 14450 14450 0 12 0 0 10000 14264 0 1 0 0 0 0 0 3 3000 1771783 35 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 1216726 1 10000 0 0 5 0 0 186 1 1
+20303003 2 0 紫金貔貅 295 0 17628 17628 0 13 0 0 10000 16875 0 1 0 0 0 0 0 3 3000 1916980 36 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 54829637 1 10000 0 0 5 0 0 186 1 1
+20303004 2 0 双翼角兽 315 0 22421 22421 0 15 0 0 10000 19702 0 1 0 0 0 0 0 3 3000 2110576 39 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 22339907 2 10000 0 0 5 0 0 186 1 1
+20303005 2 0 金甲蛮狮 335 0 26068 26068 0 16 0 0 10000 22745 0 1 0 0 0 0 0 3 3000 2304172 41 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 82753499 3 10000 0 0 5 0 0 186 1 1
+20303006 2 0 麒麟瑞兽 355 0 30242 30242 0 17 0 0 10000 25907 0 1 0 0 0 0 0 3 3000 2497768 43 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 87788088 5 10000 0 0 5 0 0 186 1 1
+20303007 2 0 金色战神 375 0 37054 37054 0 18 0 0 10000 30088 0 1 0 0 0 0 0 3 3000 2623036 46 0 300 2 6 23010 23030 0 0 0 0 0 0 0 10 2 80913031 8 10000 0 0 5 0 0 186 1 1
30102001 2 0 凶狼 50 0 100 100 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 3000 100 0 0 300 2 6 0 0 0 0 0 0 0 0 0 15 2 100 0 0 0 0 1 0 0 1 1 1
30102002 2 0 巨虎 50 0 100 100 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 3000 100 0 0 300 2 6 0 0 0 0 0 0 0 0 0 15 2 100 0 0 0 0 1 0 0 1 1 1
30102003 2 0 幼龙 50 0 100 100 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 3000 100 0 0 300 2 6 10005 0 0 0 0 0 0 0 0 15 2 100 0 0 0 0 1 0 0 198 1 1
diff --git a/db/PyMongoDataServer/SysDB/tagChinSkill.txt b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
index 5a36324..7e8b2a9 100644
--- a/db/PyMongoDataServer/SysDB/tagChinSkill.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinSkill.txt
@@ -630,8 +630,8 @@
46016 生灵之心 46016 2 2 0 12 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 550 2500 7 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 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
46020 无坚不摧 46020 1 2 0 12 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 550 2000 9 0 550 2000 10 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 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
46021 无坚不摧 46021 2 2 0 12 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 550 2500 9 0 550 2500 10 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 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-46025 血脉之力 46025 1 2 0 12 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 550 1400 13 0 550 1400 7 0 550 1400 9 0 550 1400 10 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-46026 血脉之力 46026 2 2 0 12 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 550 2000 13 0 550 2000 7 0 550 2000 9 0 550 2000 10 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+46025 血脉之力 46025 1 2 0 12 0 23 0 0 0 0 0 0 0 0 0 0 0 0 0 550 1400 13 0 550 1400 7 0 550 1400 9 0 550 1400 10 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+46026 血脉之力 46026 2 2 0 12 0 23 0 0 0 0 0 0 0 0 0 0 0 0 0 550 2000 13 0 550 2000 7 0 550 2000 9 0 550 2000 10 0 0 0 0 0 0 0 0 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
46030 坚不可摧 46030 1 2 0 12 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 550 3000 13 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 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
46031 坚不可摧 46031 2 2 0 12 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 550 4000 13 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 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
46035 不屈巨兽 46035 1 2 0 12 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 60 800 1 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 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
@@ -808,10 +808,10 @@
49180 旺盛 49180 1 1 0 5 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 510 307 6 1000 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 3598 0 0 0 0 0 0 0 0 0 0 0 0 0 0
49185 强攻 49185 1 1 0 5 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 511 3 7 500 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 8995 0 0 0 0 0 0 0 0 0 0 0 0 0 0
49190 必杀 49190 1 1 0 5 0 7 0 0 0 0 41 0 0 10000 0 0 0 0 0 4051 1500 0 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 31482 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-49195 霸天 49195 1 1 0 5 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 510 309 7 300 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 4267 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+49195 霸天 49195 1 1 0 5 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 510 309 7 500 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 4267 0 0 0 0 0 0 0 0 0 0 0 0 0 0
49200 游龙 49200 1 1 0 5 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 511 3 6 300 511 3 7 300 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 10667 0 0 0 0 0 0 0 0 0 0 0 0 0 0
49205 云痕 49205 1 1 0 5 0 16 0 0 0 0 10 0 0 20000 0 0 0 0 0 4023 10000 3000 0 13 2000 3 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 37334 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-49210 浩瀚 49210 1 1 0 5 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 510 308 6 1000 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 8197 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+49210 浩瀚 49210 1 1 0 5 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 510 308 7 500 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 8197 0 0 0 0 0 0 0 0 0 0 0 0 0 0
49215 玄翎 49215 1 1 0 5 0 20 0 0 0 0 0 0 0 0 0 0 0 0 0 511 4 6 300 511 4 7 300 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 20492 0 0 0 0 0 0 0 0 0 0 0 0 0 0
49220 玄极 49220 1 1 0 5 0 16 1 0 0 0 10 0 0 30000 0 0 0 0 0 4023 10000 10000 0 77 1000 1 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 71722 0 0 0 0 0 0 0 0 0 0 0 0 0 0
50000 金箍幻灭 50000 1 1 2 1 0 1 0 0 2 8 40 4 0 8000 0 0 0 0 0 1010 25000 0 0 1200 4 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 692 0 0 0 0 0 0 0 2 0 0 0 0 0 0
--
Gitblit v1.8.0