From c31b505ee02a8254cdac99e6df9be0cb953887bb Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期六, 18 八月 2018 18:12:55 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc                     |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc                       |    0 
 db/PyMongoDataServer/PySysDB/tagTreasureUp.txt                                               |  130 +++----
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/SetMWSoul.pyc             |    0 
 db/PyMongoDataServer/PySysDB/tagSuccess.txt                                                  |  482 ++++++++++++++----------------
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.pyc                      |    0 
 db/PyMongoDataServer/SysDB/tagChinItem.txt                                                   |   28 
 CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt                                         |   32 +-
 CoreServerGroup/GameServer/PySysDB/tagFuncConfig.txt                                         |    1 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc                   |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc                  |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintFightPower.pyc       |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc              |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc        |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc                          |    0 
 db/PyMongoDataServer/PySysDB/tagResourcesBack.txt                                            |   18 
 db/PyMongoDataServer/PySysDB/tagTrialExchange.txt                                            |   12 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc                     |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc          |    0 
 db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt                                               |   32 +-
 db/PyMongoDataServer/PySysDB/tagRealm.txt                                                    |   42 +-
 ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini                                |    6 
 db/PyMongoDataServer/PySysDB/tagTreasure.txt                                                 |    2 
 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt                                               |    1 
 CoreServerGroup/GameServer/Script/ShareDefine.pyc                                            |    0 
 db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt                                              |   76 ++--
 db/PyMongoDataServer/SysDB/tagChinSkill.txt                                                  |    4 
 db/PyMongoDataServer/PySysDB/tagDailyQuest.txt                                               |   34 +-
 db/PyMongoDataServer/PySysDB/tagTreasurePrivilege.txt                                        |   23 
 CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc                                        |    0 
 db/PyMongoDataServer/SysDB/tagChinNPC.txt                                                    |   14 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSignDay.pyc              |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc |    0 
 33 files changed, 451 insertions(+), 486 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 0439d27..5a732f5 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagFuncOpenLV.txt
@@ -11,13 +11,13 @@
 15	65	0	0
 16	135	0	0
 20	110	0	0
-21	0	10701	0
-22	110	0	0
-23	90	0	0
+21	115	0	0
+22	155	0	0
+23	155	0	0
 24	2	0	0
 28	800	0	0
-34	70	0	0
-36	200	10901	0
+34	0	0	0
+36	0	10901	0
 40	2	0	0
 60	112	0	0
 61	30	0	0
@@ -32,28 +32,28 @@
 79	2	0	0
 80	36	0	0
 81	28	0	0
-82	190	0	0
+82	0	10801	0
 83	250	0	0
 84	110	0	0
 85	60	0	0
-86	82	0	0
+86	0	0	0
 87	0	30100	0
 88	105	0	0
 89	110	0	0
-90	180	0	0
-91	240	11001	0
+90	155	0	0
+91	0	11001	0
 92	205	0	0
-93	260	0	0
+93	0	10903	0
 94	16	0	0
 95	39	0	0
-96	43	0	0
-97	0	10802	0
+96	800	0	0
+97	0	10703	0
 98	110	0	0
-99	160	0	0
+99	150	0	0
 100	100	0	0
 101	110	0	0
 102	100	0	0
-103	190	0	0
+103	160	0	0
 104	0	0	0
 105	0	0	0
 106	0	10200	0
@@ -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
@@ -87,4 +87,4 @@
 135	110	0	0
 136	250	0	0
 137	200	0	0
-138	280	0	0
+138	0	11003	0
diff --git a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
index 70bf901..174c643 100644
--- a/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
+++ b/CoreServerGroup/GameServer/Script/ChPyNetSendPack.pyc
Binary files differ
diff --git a/CoreServerGroup/GameServer/Script/ShareDefine.pyc b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
index f34b35b..af1f76a 100644
--- a/CoreServerGroup/GameServer/Script/ShareDefine.pyc
+++ b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
index 7c9271e..23580fe 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/PyNetPack.ini
@@ -1075,7 +1075,7 @@
 Writer = xdh
 Releaser = xdh
 RegType = 0
-RegisterPackCount = 5
+RegisterPackCount = 6
 
 PacketCMD_1=0xA5
 PacketSubCMD_1=0x0D
@@ -1097,6 +1097,10 @@
 PacketSubCMD_5=0x16
 PacketCallFunc_5=SaveMagicWeaponState
 
+PacketCMD_6=0xA5
+PacketSubCMD_6=0x12
+PacketCallFunc_6=OnActiveMWSoul
+
 ;副本
 [FBCommon]
 ScriptName = GameWorldLogic\FBProcess\FBCommon.py
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index 16977c0..d2e37ef 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/ChPyNetSendPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
index d153c1e..65d06e3 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc
index b1faaa4..23d1ee4 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventShell.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc
index c6db973..aec7439 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Event/EventSrc/QuestRunner.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintFightPower.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintFightPower.pyc
index 90ef4d3..8c27342 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintFightPower.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/PrintFightPower.pyc
Binary files differ
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/GameWorldLogic/FBProcess/FBCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc
index 54d3b04..6cae20b 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/FBCommon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
index 2b79444..e3ae538 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.pyc
index 43f71f6..c672d09 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Item/ChEquip.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 e1c9676..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/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
index 8a0299d..a497186 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc
index c687688..301008f 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerMagicWeapon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSignDay.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSignDay.pyc
index bbf7dec..52b2ae8 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSignDay.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerSignDay.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 d73bc80..91ca63c 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/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt b/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt
index 1a80dae..5f26af9 100644
--- a/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt
+++ b/db/PyMongoDataServer/PySysDB/tagDailyQuest.txt
@@ -1,26 +1,26 @@
 ID	RelatedType	RelatedID	UnLockFuncID	OnceActivityTime	OnceActivity	TotalActiveValue
-1	1	1	34	1	1	20
-2	2	31140	83	1	15	0
-3	2	31230	84	1	20	20
+1	1	1	34	1	3	60
+2	2	31140	83	1	20	0
+3	2	31230	84	1	30	30
 4	1	6	87	1	1	0
-5	2	31190	85	1	10	0
-6	2	31080	86	1	25	0
-7	2	31170	89	1	50	50
+5	2	31190	85	1	15	0
+6	2	31080	86	1	30	0
+7	2	31170	89	1	100	100
 8	2	31180	98	1	30	30
-9	2	60010	88	1	15	30
+9	2	60010	88	1	20	60
 10	2	31160	101	1	30	30
-11	2	51010	103	1	15	20
-12	1	7	114	1	1	10
+11	2	51010	103	1	20	40
+12	1	7	114	1	2	20
 13	2	31220	111	1	50	50
 14	2	31010	74	1	10	30
 15	1	8	61	1	5	0
-16	1	9	21	1	15	0
-17	1	10	76	1	5	0
-18	1	2	16	1	2	140
-19	1	11	80	1	5	0
+16	1	9	21	1	30	0
+17	1	10	76	1	10	0
+18	1	2	16	1	4	280
+19	1	11	80	1	15	0
 21	1	13	80	1	10	0
-22	1	14	0	1	10	0
+22	1	14	0	1	20	0
 23	1	15	88	1	10	30
-24	1	16	23	1	30	0
-25	2	31240	20	1	50	0
-26	2	31150	92	1	25	0
+24	1	16	23	1	20	0
+25	2	31240	20	1	30	0
+26	2	31150	92	1	30	0
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 1fb729b..6aecef4 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -242,6 +242,7 @@
 OutOfPrintValue	int(maxOOPValue*min(1,(0.001 + 0.05*(lv/350.0) + 0.1*pow((lv/350.0), 2) +0.15*pow((lv/350.0), 3) + 0.699*pow((lv/350.0), 4))))				
 BossStoneDelayTime	1500				
 DogzAssist	3|10	3511	2|3|4|5	1_10|2_20|3_30|4_40|5_50	
+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
 XMZZRobot	[30403002,30403003]	30403001			
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
index 03a1bac..76b6742 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncOpenLV.txt
@@ -11,13 +11,13 @@
 15	65	0	0	0
 16	135	0	0	0
 20	110	0	0	0
-21	0	10701	0	0
-22	110	0	0	0
-23	90	0	0	0
+21	115	0	0	0
+22	155	0	0	0
+23	155	0	0	0
 24	2	0	0	0
 28	800	0	0	0
-34	70	0	0	104060
-36	200	10901	0	0
+34	0	0	0	104060
+36	0	10901	0	0
 40	2	0	0	0
 60	112	0	0	0
 61	30	0	0	0
@@ -32,28 +32,28 @@
 79	2	0	0	0
 80	36	0	0	0
 81	28	0	0	0
-82	190	0	0	0
+82	0	10801	0	0
 83	250	0	0	0
 84	110	0	0	0
 85	60	0	0	0
-86	82	0	0	104080
+86	0	0	0	104080
 87	0	30100	0	0
 88	105	0	0	0
 89	110	0	0	0
-90	180	0	0	0
-91	240	11001	0	0
+90	155	0	0	0
+91	0	11001	0	0
 92	205	0	0	0
-93	260	0	0	0
+93	0	10903	0	0
 94	16	0	0	0
 95	39	0	0	0
-96	43	0	0	0
-97	0	10802	0	0
+96	800	0	0	0
+97	0	10703	0	0
 98	110	0	0	0
-99	160	0	0	0
+99	150	0	0	0
 100	100	0	0	0
 101	110	0	0	0
 102	100	0	0	0
-103	190	0	0	0
+103	160	0	0	0
 104	0	0	0	101010
 105	0	0	0	101100
 106	0	10200	0	0
@@ -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
@@ -87,4 +87,4 @@
 135	110	0	0	0
 136	250	0	0	0
 137	200	0	0	0
-138	280	0	0	0
+138	0	11003	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/tagRealm.txt b/db/PyMongoDataServer/PySysDB/tagRealm.txt
index 4945dc1..52ad271 100644
--- a/db/PyMongoDataServer/PySysDB/tagRealm.txt
+++ b/db/PyMongoDataServer/PySysDB/tagRealm.txt
@@ -1,23 +1,23 @@
 Lv	IsBigRealm	NeedPoint	NeedGood	NeedNum	NeedActiveTreasure	AddAttrType	AddAttrNum	BossID	SitTime	TeamAward
-0	0	300	0	0	0	6|7	0|0	61103000	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
-1	0	360	0	0	0	6|7	4700|230	61103001	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
-2	1	900	0	0	0	6|7	9900|490	61203001	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(105,1,1),(102,3,1)]}
-3	0	1000	0	0	0	6|7|19	18700|940|1000	61103002	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
-4	1	1400	0	0	0	6|7|19	25100|1260|1000	61203002	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(105,3,1),(103,1,1)]}
-5	0	1280	0	0	0	6|7|19	35900|1800|3000	61103003	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
-6	1	2090	0	0	0	6|7|19	43900|2200|3000	61203003	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(105,3,1),(103,1,1)]}
-7	0	1400	0	0	0	6|7|19|18	57400|2870|3000|2000	61103004	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
-8	1	2980	0	0	0	6|7|19|18	67300|3360|3000|2000	61203004	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(106,1,1),(103,3,1)]}
-9	0	2380	0	0	0	6|7|19|18	83900|4200|3000|5000	61103005	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
-10	0	3570	0	0	0	6|7|19|18	96100|4810|3000|5000	61103006	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
-11	1	7140	0	0	0	6|7|19|18	109800|5490|3000|5000	61203005	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(106,1,1),(103,3,1)]}
-12	0	4170	0	0	0	6|7|19|18|49	132500|6630|3000|5000|3000	61103007	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
-13	0	4760	0	0	0	6|7|19|18|49	149200|7460|3000|5000|3000	61103008	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
-14	1	9520	0	0	0	6|7|19|18|49	167700|8390|3000|5000|3000	61203006	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(106,2,1),(103,5,1)]}
-15	0	5360	0	0	0	6|7|19|18|49	198300|9920|7000|5000|3000	61103009	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
-16	0	5950	0	0	0	6|7|19|18|49	220700|11030|7000|5000|3000	61103010	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
-17	1	11890	0	0	0	6|7|19|18|49	245300|12260|7000|5000|3000	61203007	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(106,2,1),(103,5,1)]}
-18	0	6540	0	0	0	6|7|19|18|49|20	285800|14290|7000|5000|3000|2000	61103011	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
-19	0	7140	0	0	0	6|7|19|18|49|20	315400|15770|7000|5000|3000|2000	61103012	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
-20	1	14270	0	0	0	6|7|19|18|49|20	347800|17390|7000|5000|3000|2000	61203008	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(106,2,1),(103,5,1)]}
+0	0	450	0	0	0	6|7	0|0	61103000	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
+1	0	650	0	0	0	6|7	4700|230	61103001	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
+2	1	1130	0	0	0	6|7	9900|490	61203001	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(105,1,1),(102,3,1)]}
+3	0	1150	0	0	0	6|7|19	18700|940|1000	61103002	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
+4	1	1410	0	0	0	6|7|19	25100|1260|1000	61203002	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(105,3,1),(103,1,1)]}
+5	0	1160	0	0	0	6|7|19	35900|1800|3000	61103003	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
+6	1	1270	0	0	0	6|7|19	43900|2200|3000	61203003	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(105,3,1),(103,1,1)]}
+7	0	1410	0	0	0	6|7|19|18	57400|2870|3000|2000	61103004	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
+8	1	2250	0	0	0	6|7|19|18	67300|3360|3000|2000	61203004	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(106,1,1),(103,3,1)]}
+9	0	1800	0	0	0	6|7|19|18	83900|4200|3000|5000	61103005	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
+10	0	2670	0	0	0	6|7|19|18	96100|4810|3000|5000	61103006	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
+11	1	4890	0	0	0	6|7|19|18	109800|5490|3000|5000	61203005	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(106,1,1),(103,3,1)]}
+12	0	3710	0	0	0	6|7|19|18|49	132500|6630|3000|5000|3000	61103007	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
+13	0	4410	0	0	0	6|7|19|18|49	149200|7460|3000|5000|3000	61103008	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
+14	1	8420	0	0	0	6|7|19|18|49	167700|8390|3000|5000|3000	61203006	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(106,2,1),(103,5,1)]}
+15	0	4910	0	0	0	6|7|19|18|49	198300|9920|7000|5000|3000	61103009	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
+16	0	5620	0	0	0	6|7|19|18|49	220700|11030|7000|5000|3000	61103010	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
+17	1	11230	0	0	0	6|7|19|18|49	245300|12260|7000|5000|3000	61203007	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(106,2,1),(103,5,1)]}
+18	0	6320	0	0	0	6|7|19|18|49|20	285800|14290|7000|5000|3000|2000	61103011	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
+19	0	7020	0	0	0	6|7|19|18|49|20	315400|15770|7000|5000|3000|2000	61103012	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
+20	1	14040	0	0	0	6|7|19|18|49|20	347800|17390|7000|5000|3000|2000	61203008	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(106,2,1),(103,5,1)]}
 21	0	8320	0	0	0	6|7|19|18|49|20	400600|20030|7000|10000|3000|2000	61103013	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
diff --git a/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt b/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
index bebd0b2..13d9c86 100644
--- a/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
+++ b/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
@@ -1,14 +1,14 @@
 ID	RelatedID	CanBackTimes	NormalCostJade	VipCostJade	JadeReward	CostCopper	CopperReward
 1	0	0	5	0	{"exp":"tjgExp"}	100000	{"exp":"tjgExp*55/100"}
-2	1	0	2	0	{"exp":"1125*reExp", "item":[{"ItemID":24,"ItemCount":"1"}], "money":"100000"}	6700	{"exp":"618*reExp","item":[{"ItemID":24,"ItemCount":"1"}],"money":"55000"}
-3	2	0	20	40	{"item":[{"ItemID":24,"ItemCount":"15"},{"ItemID":5303,"ItemCount":"40"}]}	67000	{"item":[{"ItemID":24,"ItemCount":"15"},{"ItemID":5303,"ItemCount":"22"}]}
-4	3	0	15	0	{"exp":"18000*reExp", "item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":26,"ItemCount":"2000"}]}	50000	{"exp":"9900*reExp", "item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":26,"ItemCount":"1000"}]}
-5	5	0	15	30	{"item":[{"ItemID":24,"ItemCount":"10"},{"ItemID":4151,"ItemCount":"max(min(1,extraData),0)*2+max(min(2,extraData)-1,0)*2+max(min(3,extraData)-2,0)*2+max(min(4,extraData)-3,0)*2+max(min(5,extraData)-4,0)*3+max(min(6,extraData)-5,0)*2"}]}	60000	{"item":[{"ItemID":24,"ItemCount":"10"},{"ItemID":4151,"ItemCount":"max(min(1,extraData),0)+max(min(2,extraData)-1,0)+max(min(3,extraData)-2,0)+max(min(4,extraData)-3,0)+max(min(5,extraData)-4,0)*2+max(min(6,extraData)-5,0)"}]}
-6	6	1	15	50	{"exp":"21600*reExp*expRate", "item":[{"ItemID":24,"ItemCount":"25"}]}	83000	{"exp":"12474*reExp", "item":[{"ItemID":24,"ItemCount":"25"}]}
+2	1	0	2	0	{"exp":"1125*reExp", "item":[{"ItemID":24,"ItemCount":"2"}], "money":"100000"}	6700	{"exp":"618*reExp","item":[{"ItemID":24,"ItemCount":"2"}],"money":"55000"}
+3	2	0	20	40	{"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":5303,"ItemCount":"40"}]}	67000	{"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":5303,"ItemCount":"22"}]}
+4	3	0	15	0	{"exp":"18000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":26,"ItemCount":"2000"}]}	50000	{"exp":"9900*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":26,"ItemCount":"1000"}]}
+5	5	0	15	30	{"item":[{"ItemID":24,"ItemCount":"15"},{"ItemID":4151,"ItemCount":"max(min(1,extraData),0)*2+max(min(2,extraData)-1,0)*2+max(min(3,extraData)-2,0)*2+max(min(4,extraData)-3,0)*2+max(min(5,extraData)-4,0)*3+max(min(6,extraData)-5,0)*2"}]}	60000	{"item":[{"ItemID":24,"ItemCount":"15"},{"ItemID":4151,"ItemCount":"max(min(1,extraData),0)+max(min(2,extraData)-1,0)+max(min(3,extraData)-2,0)+max(min(4,extraData)-3,0)+max(min(5,extraData)-4,0)*2+max(min(6,extraData)-5,0)"}]}
+6	6	1	15	50	{"exp":"21600*reExp*expRate", "item":[{"ItemID":24,"ItemCount":"30"}]}	83000	{"exp":"12474*reExp", "item":[{"ItemID":24,"ItemCount":"30"}]}
 7	10	0	25	0	{"exp":"12000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":103,"ItemCount":"1"},{"ItemID":105,"ItemCount":"1"},{"ItemID":104,"ItemCount":"4"}]}	150000	{"exp":"6600*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":102,"ItemCount":"2"},{"ItemID":104,"ItemCount":"5"}]}
 8	14	0	8	0	{"exp":"4000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":105,"ItemCount":"1"}]}	50000	{"exp":"2200*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":104,"ItemCount":"3"}]}
 9	8	0	25	0	{"exp":"12000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":103,"ItemCount":"1"},{"ItemID":102,"ItemCount":"2"}]}	150000	{"exp":"6600*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":102,"ItemCount":"4"}]}
-10	7	0	50	0	{"exp":"72000*reExp", "item":[{"ItemID":24,"ItemCount":"50"}]}	167000	{"exp":"39600*reExp", "item":[{"ItemID":24,"ItemCount":"50"}]}
-11	11	0	15	0	{"item":[{"ItemID":24,"ItemCount":"15"},{"ItemID":29,"ItemCount":"max(min(1,extraData),0)*424500+max(min(2,extraData)-1,0)*536000+max(min(3,extraData)-2,0)*665000+max(min(4,extraData)-3,0)*812000+max(min(5,extraData)-4,0)*975500+max(min(6,extraData)-5,0)*1157000+max(min(7,extraData)-6,0)*1356500+max(min(8,extraData)-7,0)*1573500"},{"ItemID":141,"ItemCount":"max(min(1,extraData),0)*5+max(min(2,extraData)-1,0)*10+max(min(3,extraData)-2,0)*15"},{"ItemID":142,"ItemCount":"max(min(4,extraData)-3,0)*10+max(min(5,extraData)-4,0)*15"},{"ItemID":143,"ItemCount":"max(min(6,extraData)-5,0)*10+max(min(extraData,7)-6,0)*15"},{"ItemID":144,"ItemCount":"max(min(8,extraData)-7,0)*15"}]}	33000	{"item":[{"ItemID":24,"ItemCount":"15"},{"ItemID":29,"ItemCount":"max(min(1,extraData),0)*254700+max(min(2,extraData)-1,0)*321600+max(min(3,extraData)-2,0)*399000+max(min(4,extraData)-3,0)*487200+max(min(5,extraData)-4,0)*585300+max(min(6,extraData)-5,0)*694200+max(min(7,extraData)-6,0)*813900+max(min(8,extraData)-7,0)*944100"},{"ItemID":141,"ItemCount":"max(min(1,extraData),0)*3+max(min(2,extraData)-1,0)*6+max(min(3,extraData)-2,0)*9"},{"ItemID":142,"ItemCount":"max(min(4,extraData)-3,0)*6+max(min(5,extraData)-4,0)*9"},{"ItemID":143,"ItemCount":"max(min(6,extraData)-5,0)*6+max(min(extraData,7)-6,0)*9"},{"ItemID":144,"ItemCount":"max(min(8,extraData)-7,0)*6"}]}
-12	9	0	25	0	{"item":[{"ItemID":24,"ItemCount":"15"},{"ItemID":1021,"ItemCount":"1"},{"ItemID":1131,"ItemCount":"(2*max(min(4,dataEx)-3,0)+2*max(min(5,dataEx)-4,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1132,"ItemCount":"(3*max(min(4,dataEx)-3,0)+3*max(min(5,dataEx)-4,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1133,"ItemCount":"(3*max(min(4,dataEx)-3,0)+3*max(min(5,dataEx)-4,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"},{"ItemID":1134,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1135,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1136,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"}]}	200000	{"item":[{"ItemID":24,"ItemCount":"15"},{"ItemID":1020,"ItemCount":"1"},{"ItemID":1131,"ItemCount":"(max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1132,"ItemCount":"(max(min(4,dataEx)-3,0)+2*max(min(5,dataEx)-4,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1133,"ItemCount":"(max(min(4,dataEx)-3,0)+2*max(min(5,dataEx)-4,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"},{"ItemID":1134,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1135,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1136,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"}]}
-13	12	0	20	0	{"exp":"3000*reExp", "item":[{"ItemID":24,"ItemCount":"10"},{"ItemID":2211,"ItemCount":"6"}], "money":"500000"}	200000	{"exp":"1650*reExp", "item":[{"ItemID":24,"ItemCount":"10"},{"ItemID":2211,"ItemCount":"3"}]}
+10	7	0	50	0	{"exp":"72000*reExp", "item":[{"ItemID":24,"ItemCount":"100"}]}	167000	{"exp":"39600*reExp", "item":[{"ItemID":24,"ItemCount":"100"}]}
+11	11	0	15	0	{"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":29,"ItemCount":"max(min(1,extraData),0)*424500+max(min(2,extraData)-1,0)*536000+max(min(3,extraData)-2,0)*665000+max(min(4,extraData)-3,0)*812000+max(min(5,extraData)-4,0)*975500+max(min(6,extraData)-5,0)*1157000+max(min(7,extraData)-6,0)*1356500+max(min(8,extraData)-7,0)*1573500"},{"ItemID":141,"ItemCount":"max(min(1,extraData),0)*5+max(min(2,extraData)-1,0)*10+max(min(3,extraData)-2,0)*15"},{"ItemID":142,"ItemCount":"max(min(4,extraData)-3,0)*10+max(min(5,extraData)-4,0)*15"},{"ItemID":143,"ItemCount":"max(min(6,extraData)-5,0)*10+max(min(extraData,7)-6,0)*15"},{"ItemID":144,"ItemCount":"max(min(8,extraData)-7,0)*15"}]}	33000	{"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":29,"ItemCount":"max(min(1,extraData),0)*254700+max(min(2,extraData)-1,0)*321600+max(min(3,extraData)-2,0)*399000+max(min(4,extraData)-3,0)*487200+max(min(5,extraData)-4,0)*585300+max(min(6,extraData)-5,0)*694200+max(min(7,extraData)-6,0)*813900+max(min(8,extraData)-7,0)*944100"},{"ItemID":141,"ItemCount":"max(min(1,extraData),0)*3+max(min(2,extraData)-1,0)*6+max(min(3,extraData)-2,0)*9"},{"ItemID":142,"ItemCount":"max(min(4,extraData)-3,0)*6+max(min(5,extraData)-4,0)*9"},{"ItemID":143,"ItemCount":"max(min(6,extraData)-5,0)*6+max(min(extraData,7)-6,0)*9"},{"ItemID":144,"ItemCount":"max(min(8,extraData)-7,0)*6"}]}
+12	9	0	25	0	{"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":1021,"ItemCount":"1"},{"ItemID":1131,"ItemCount":"(2*max(min(4,dataEx)-3,0)+2*max(min(5,dataEx)-4,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1132,"ItemCount":"(3*max(min(4,dataEx)-3,0)+3*max(min(5,dataEx)-4,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1133,"ItemCount":"(3*max(min(4,dataEx)-3,0)+3*max(min(5,dataEx)-4,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"},{"ItemID":1134,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1135,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1136,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"}]}	200000	{"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":1020,"ItemCount":"1"},{"ItemID":1131,"ItemCount":"(max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1132,"ItemCount":"(max(min(4,dataEx)-3,0)+2*max(min(5,dataEx)-4,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1133,"ItemCount":"(max(min(4,dataEx)-3,0)+2*max(min(5,dataEx)-4,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"},{"ItemID":1134,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1135,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1136,"ItemCount":"(max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"}]}
+13	12	0	20	0	{"exp":"3000*reExp", "item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":2211,"ItemCount":"6"}], "money":"500000"}	200000	{"exp":"1650*reExp", "item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":2211,"ItemCount":"3"}]}
diff --git a/db/PyMongoDataServer/PySysDB/tagSuccess.txt b/db/PyMongoDataServer/PySysDB/tagSuccess.txt
index 9470627..e85085b 100644
--- a/db/PyMongoDataServer/PySysDB/tagSuccess.txt
+++ b/db/PyMongoDataServer/PySysDB/tagSuccess.txt
@@ -1,287 +1,228 @@
 ID	Type	NeedCnt	Condition	PreSuccess	AwardItemList	Money	Exp	AwardAttribute	RedPacketID	MagicWeaponID	MagicWeaponExp
 1	3	1	1000	0			0		0	101	0
 2	3	1	1000	0			0		0	101	0
-6	27	7	15	0		2_20	0		0	101	20
-7	3	1	4002	0		2_20	0		0	101	20
 11	1	10	0	0		2_10	0		0	102	10
 12	39	1	1|1	0		2_10	0		0	102	10
 16	39	4	1|1	0		2_10	0		0	102	10
 17	26	10	0	0		2_10	0		0	102	10
-21	6	2	0	0		2_20	0		0	102	20
-22	39	1	4|4	0		2_20	0		0	102	20
 41	39	6	1|1	0		2_10	0		0	103	10
 42	1	25	0	0		2_10	0		0	103	10
 46	36	1	60203001	0		2_10	0		0	103	10
 47	39	3	1|2	0		2_10	0		0	103	10
 48	1	30	0	0		2_10	0		0	103	10
 49	26	20	0	0		2_10	0		0	103	10
-51	81	20	52010	0		2_20	0		0	103	20
-52	105	5	0	0		2_20	0		0	103	20
-53	39	3	4|4	0		2_20	0		0	103	20
-55	48	25	0	0		2_10	0		0	103	10
-56	48	30	0	0		2_10	0		0	103	10
 71	36	28	10202001	0		2_10	0		0	104	10
 72	42	1	102	0		2_10	0		0	104	10
 73	39	5	1|2	0		2_10	0		0	104	10
 74	42	1	104	0		2_10	0		0	104	10
 75	44	1	2	0		2_10	0		0	104	10
-76	45	60	0	0		2_20	0		0	104	20
-77	121	2	0	0		2_20	0		0	104	20
-78	42	1	502	0		2_20	0		0	104	20
-80	6	3	0	0		2_10	0		0	104	10
-81	48	35	0	0		2_10	0		0	104	10
-82	7	10	0	0		2_10	0		0	104	10
-83	48	40	0	0		2_10	0		0	104	10
 101	42	1	106	0		2_10	0		0	105	10
 102	36	40	10301003	0		2_10	0		0	105	10
 103	60	1	1	0		2_10	0		0	105	10
 105	49	1	1	0		2_10	0		0	105	10
-106	58	1	50106001|3	0		2_10	0		0	105	10
+106	58	1	50106001|4	0		2_10	0		0	105	10
 107	58	1	50106001|10	0		2_10	0		0	105	10
 108	49	1	2	0		2_10	0		0	105	10
-109	58	1	50106102|10	0		2_20	0		0	105	20
-110	39	7	4|4	0		2_20	0		0	105	20
-112	6	5	0	0		2_10	0		0	105	10
-113	7	12	0	0		2_10	0		0	105	10
-114	48	45	0	0		2_10	0		0	105	10
-115	46	15	0	0		2_10	0		0	105	10
-116	48	50	0	0		2_10	0		0	105	10
-201	1	70	0	0		2_10	0		0	106	10
-202	39	1	2|3	0		2_10	0		0	106	10
-216	114	300	0	0		2_10	0		0	106	10
-217	50	1	0	0		2_10	0		0	106	10
-218	3	1	4000	0		2_10	0		0	106	10
-231	114	660	0	0		2_10	0		0	106	10
-232	50	2	0	0		2_10	0		0	106	10
-233	46	1	0	0		2_10	0		0	106	10
-234	39	3	3|3	0		2_10	0		0	106	10
-246	33	1	305|0	0		2_10	0		0	106	10
-249	5	10	0	0		2_10	0		0	106	10
-250	7	3	0	0		2_10	0		0	106	10
-251	42	1	202	0		2_10	0		0	106	10
-252	54	1	1|1|1	0		2_10	0		0	106	10
-261	10	1	201|10	0		2_20	0		0	106	20
-262	39	1	4|5	0		2_20	0		0	106	20
-264	6	7	0	0		2_10	0		0	106	10
-265	91	5	50005|55005|60005	0		2_10	0		0	106	10
-266	91	10	50005|55005|60005	0		2_10	0		0	106	10
-267	91	5	50105|55105|60105	0		2_10	0		0	106	10
-268	91	10	50105|55105|60105	0		2_10	0		0	106	10
-269	48	55	0	0		2_10	0		0	106	10
-270	48	60	0	0		2_10	0		0	106	10
-271	48	65	0	0		2_10	0		0	106	10
-272	7	14	0	0		2_10	0		0	106	10
-273	7	16	0	0		2_10	0		0	106	10
-274	46	17	0	0		2_10	0		0	106	10
-275	46	19	0	0		2_10	0		0	106	10
-276	46	21	0	0		2_10	0		0	106	10
-277	48	70	0	0		2_10	0		0	106	10
-278	48	75	0	0		2_10	0		0	106	10
-279	48	80	0	0		2_10	0		0	106	10
-301	36	1	60203006	0		2_10	0		0	107	10
+201	1	1	0	0		2_10	0		0	106	10
+202	36	36	60203003	0		2_10	0		0	106	10
+203	3	3	4000	0		2_10	0		0	106	10
+221	114	114	0	0		2_10	0		0	106	10
+222	50	50	0	0		2_10	0		0	106	10
+223	46	46	0	0		2_10	0		0	106	10
+224	39	39	3|3	0		2_10	0		0	106	10
+225	5	5	0	0		2_10	0		0	106	10
+241	33	33	305|0	0		2_10	0		0	106	10
+242	7	7	0	0		2_10	0		0	106	10
+243	5	5	0	0		2_10	0		0	106	10
+244	42	42	202	0		2_10	0		0	106	10
+245	114	114	0	0		2_10	0		0	106	10
+246	50	50	0	0		2_10	0		0	106	10
+247	54	54	1|1|1	0		2_10	0		0	106	10
+248	39	39	3|4	0		2_10	0		0	106	10
+249	36	36	60203006	0		2_10	0		0	106	10
+301	46	2	0	0		2_10	0		0	107	10
 302	7	4	0	0		2_10	0		0	107	10
-316	50	3	0	0		2_10	0		0	107	10
-317	46	3	0	0		2_10	0		0	107	10
-318	42	1	204	0		2_10	0		0	107	10
-319	33	1	306|0	0		2_10	0		0	107	10
-320	4	3	0	0		2_10	0		0	107	10
-321	4	5	0	0		2_10	0		0	107	10
-322	7	5	0	0		2_10	0		0	107	10
-332	2	20	0	0		2_10	0		0	107	10
-333	115	1	0	0		2_10	0		0	107	10
-334	94	1	4706	0		2_10	0		0	107	10
-335	36	1	60203007	0		2_10	0		0	107	10
-336	26	140	0	0		2_10	0		0	107	10
-337	6	1	0	0		2_10	0		0	107	10
-338	94	3	4706	0		2_10	0		0	107	10
-339	94	1	4707	0		2_10	0		0	107	10
+303	4	2	0	0		2_10	0		0	107	10
+304	39	2	3|4	0		2_10	0		0	107	10
+305	42	1	204	0		2_10	0		0	107	10
+321	33	1	306|0	0		2_10	0		0	107	10
+322	26	120	0	0		2_10	0		0	107	10
+323	7	6	0	0		2_10	0		0	107	10
+324	4	4	0	0		2_10	0		0	107	10
+325	36	1	60203007	0		2_10	0		0	107	10
+326	10	1	100|4	0		2_10	0		0	107	10
+327	94	1	4706	0		2_10	0		0	107	10
+328	94	3	4706	0		2_10	0		0	107	10
+329	94	1	4707	0		2_10	0		0	107	10
+330	2	20	0	0		2_10	0		0	107	10
+341	50	3	0	0		2_10	0		0	107	10
+342	94	5	4706	0		2_10	0		0	107	10
+343	94	3	4707	0		2_10	0		0	107	10
+344	6	1	0	0		2_10	0		0	107	10
+345	26	140	0	0		2_10	0		0	107	10
 346	49	1	3	0		2_10	0		0	107	10
-347	54	1	1|1|2	0		2_10	0		0	107	10
-348	42	1	208	0		2_10	0		0	107	10
-349	46	6	0	0		2_10	0		0	107	10
-350	42	1	304	0		2_10	0		0	107	10
-351	36	1	60203008	0		2_10	0		0	107	10
-352	94	5	4706	0		2_10	0		0	107	10
-353	94	3	4707	0		2_10	0		0	107	10
-361	28	15	0	0		2_20	0		0	107	20
-362	39	3	4|5	0		2_20	0		0	107	20
-364	28	18	0	0		2_20	0		0	107	20
-365	91	15	50005|55005|60005	0		2_10	0		0	107	10
-366	91	15	50105|55105|60105	0		2_10	0		0	107	10
-367	48	90	0	0		2_10	0		0	107	10
-368	48	95	0	0		2_10	0		0	107	10
-369	48	100	0	0		2_10	0		0	107	10
-370	7	20	0	0		2_10	0		0	107	10
-371	7	22	0	0		2_10	0		0	107	10
-372	46	23	0	0		2_10	0		0	107	10
-373	46	25	0	0		2_10	0		0	107	10
-374	46	27	0	0		2_10	0		0	107	10
-375	48	105	0	0		2_10	0		0	107	10
-376	48	110	0	0		2_10	0		0	107	10
-401	62	1	6	0		2_10	0		0	108	10
-402	48	20	0	0		2_10	0		0	108	10
-403	2	80	0	0		2_10	0		0	108	10
-404	42	1	308	0		2_10	0		0	108	10
-405	50	4	0	0		2_10	0		0	108	10
-416	26	160	0	0		2_10	0		0	108	10
-417	5	40	0	0		2_10	0		0	108	10
-418	4	9	0	0		2_10	0		0	108	10
-419	7	7	0	0		2_10	0		0	108	10
-420	46	9	0	0		2_10	0		0	108	10
-421	36	1	60203009	0		2_10	0		0	108	10
-422	42	1	404	0		2_10	0		0	108	10
-423	94	1	4708	0		2_10	0		0	108	10
-431	50	5	0	0		2_10	0		0	108	10
-432	69	1	3711|3721	0		2_10	0		0	108	10
-433	111	1	0	0		2_10	0		0	108	10
-434	42	1	408	0		2_10	0		0	108	10
-435	26	200	0	0		2_10	0		0	108	10
-436	94	5	4707	0		2_10	0		0	108	10
-446	33	1	307|0	0		2_10	0		0	108	10
-447	46	12	0	0		2_10	0		0	108	10
-448	5	60	0	0		2_10	0		0	108	10
-449	49	1	4	0		2_10	0		0	108	10
-450	54	1	1|1|3	0		2_10	0		0	108	10
-451	94	3	4708	0		2_10	0		0	108	10
-461	111	3	0	0		2_20	0		0	108	20
-462	39	5	4|5	0		2_20	0		0	108	20
-463	126	24	3	0		2_20	0		0	108	20
-464	91	10	50035|55035|60035	0		2_10	0		0	108	10
-465	91	10	50135|55135|60135	0		2_10	0		0	108	10
-466	48	130	0	0		2_10	0		0	108	10
-467	48	135	0	0		2_10	0		0	108	10
-468	48	140	0	0		2_10	0		0	108	10
-469	48	145	0	0		2_10	0		0	108	10
-470	7	24	0	0		2_10	0		0	108	10
-471	7	26	0	0		2_10	0		0	108	10
-472	7	28	0	0		2_10	0		0	108	10
-473	7	30	0	0		2_10	0		0	108	10
-474	46	30	0	0		2_10	0		0	108	10
-475	46	32	0	0		2_10	0		0	108	10
-476	46	34	0	0		2_10	0		0	108	10
-477	46	36	0	0		2_10	0		0	108	10
-478	48	150	0	0		2_10	0		0	108	10
-479	48	155	0	0		2_10	0		0	108	10
-480	48	160	0	0		2_10	0		0	108	10
+347	42	1	208	0		2_10	0		0	107	10
+348	4	6	0	0		2_10	0		0	107	10
+349	10	1	100|10	0		2_10	0		0	107	10
+350	48	12	0	0		2_10	0		0	107	10
+351	39	1	4|4	0		2_10	0		0	107	10
+352	2	40	0	0		2_10	0		0	107	10
+353	54	1	1|1|2	0		2_10	0		0	107	10
+361	50	4	0	0		2_10	0		0	107	10
+362	69	1	3711|3721	0		2_10	0		0	107	10
+363	58	1	50106002|4	0		2_10	0		0	107	10
+364	81	20	52010	0		2_10	0		0	107	10
+365	36	1	60203008	0		2_10	0		0	107	10
+366	48	15	0	0		2_10	0		0	107	10
+367	111	1	0	0		2_10	0		0	108	10
+368	2	60	0	0		2_10	0		0	107	10
+369	42	1	304	0		2_10	0		0	107	10
+370	39	3	4|4	0		2_10	0		0	107	10
+371	46	4	0	0		2_10	0		0	107	10
+401	26	160	0	0		2_10	0		0	108	10
+402	48	18	0	0		2_10	0		0	108	10
+403	48	21	0	0		2_10	0		0	108	10
+404	94	5	4707	0		2_10	0		0	108	10
+405	2	80	0	0		2_10	0		0	108	10
+406	58	1	50106001|15	0		2_10	0		0	108	10
+407	42	1	308	0		2_10	0		0	108	10
+421	50	5	0	0		2_10	0		0	108	10
+422	121	1	0	0		2_10	0		0	108	10
+423	121	2	0	0		2_10	0		0	108	10
+424	63	1	1	0		2_10	0		0	108	10
+425	58	1	50106001|20	0		2_10	0		0	108	10
+426	94	1	4708	0		2_10	0		0	108	10
+427	10	1	100|15	0		2_10	0		0	108	10
+428	10	1	100|20	0		2_10	0		0	108	10
+429	10	1	201|4	0		2_10	0		0	108	10
+430	5	40	0	0		2_10	0		0	108	10
+431	4	8	0	0		2_10	0		0	108	10
+432	4	10	0	0		2_10	0		0	108	10
+433	7	8	0	0		2_10	0		0	108	10
+434	39	5	4|4	0		2_10	0		0	108	10
+441	33	1	307|0	0		2_10	0		0	108	10
+442	94	3	4708	0		2_10	0		0	108	10
+443	42	1	404	0		2_10	0		0	108	10
+444	46	6	0	0		2_10	0		0	108	10
+445	46	8	0	0		2_10	0		0	108	10
+446	62	1	6	0		2_10	0		0	108	10
+447	48	24	0	0		2_10	0		0	108	10
+448	36	1	60203009	0		2_10	0		0	108	10
+449	58	1	50106002|10	0		2_10	0		0	108	10
+450	58	1	50106102|4	0		2_10	0		0	108	10
+451	10	1	201|10	0		2_10	0		0	108	10
+452	10	1	101|4	0		2_10	0		0	108	10
+453	111	3	0	0		2_10	0		0	108	10
+454	26	180	0	0		2_10	0		0	108	10
+461	50	6	0	0		2_10	0		0	108	10
+462	26	200	0	0		2_10	0		0	108	10
+463	42	1	408	0		2_10	0		0	108	10
+464	46	10	0	0		2_10	0		0	108	10
+465	46	12	0	0		2_10	0		0	108	10
+466	5	60	0	0		2_10	0		0	108	10
+467	49	1	4	0		2_10	0		0	108	10
+468	63	1	2	0		2_10	0		0	108	10
+469	54	1	1|1|3	0		2_10	0		0	108	10
+470	39	1	5|4	0		2_10	0		0	108	10
 501	116	20	5012|5022	0		2_10	0		0	109	10
-502	69	1	4007	0		2_10	0		0	109	10
-503	42	1	504	0		2_10	0		0	109	10
-516	50	6	0	0		2_10	0		0	109	10
-517	92	5	1|1|1	0		2_10	0		0	109	10
-518	42	1	508	0		2_10	0		0	109	10
-519	62	1	20	0		2_10	0		0	109	10
-520	63	1	1	0		2_10	0		0	109	10
-521	94	1	4709	0		2_10	0		0	109	10
-522	36	1	60203010	0		2_10	0		0	109	10
-531	36	1	60203011	0		2_10	0		0	109	10
-532	92	5	2|1|1	0		2_10	0		0	109	10
-533	62	1	30	0		2_10	0		0	109	10
-534	42	1	604	0		2_10	0		0	109	10
-535	49	1	5	0		2_10	0		0	109	10
-536	63	1	2	0		2_10	0		0	109	10
-537	94	5	4708	0		2_10	0		0	109	10
-546	50	7	0	0		2_10	0		0	109	10
-547	92	5	3|1|1	0		2_10	0		0	109	10
-548	62	1	40	0		2_10	0		0	109	10
-549	26	240	0	0		2_10	0		0	109	10
-550	92	2	1|2|1	0		2_10	0		0	109	10
-551	63	1	3	0		2_10	0		0	109	10
-552	94	3	4709	0		2_10	0		0	109	10
-561	92	5	2|2|1	0		2_20	0		0	109	20
-562	92	5	6|1|1	0		2_20	0		0	109	20
-563	82	1	5|3|1	0		2_20	0		0	109	20
-564	126	30	3	0		2_20	0		0	109	20
-565	26	400	0	0		2_10	0		0	109	10
-566	91	10	50065|55065|60065	0		2_10	0		0	109	10
-567	91	10	50165|55165|60165	0		2_10	0		0	109	10
-568	48	190	0	0		2_10	0		0	109	10
-569	48	195	0	0		2_10	0		0	109	10
-570	48	200	0	0		2_10	0		0	109	10
-571	48	205	0	0		2_10	0		0	109	10
-572	48	210	0	0		2_10	0		0	109	10
-573	7	34	0	0		2_10	0		0	109	10
-574	7	36	0	0		2_10	0		0	109	10
-575	7	38	0	0		2_10	0		0	109	10
-576	7	40	0	0		2_10	0		0	109	10
-577	7	42	0	0		2_10	0		0	109	10
-578	46	44	0	0		2_10	0		0	109	10
-579	46	46	0	0		2_10	0		0	109	10
-580	46	48	0	0		2_10	0		0	109	10
-581	46	50	0	0		2_10	0		0	109	10
-582	46	52	0	0		2_10	0		0	109	10
-583	46	54	0	0		2_10	0		0	109	10
-584	48	215	0	0		2_10	0		0	109	10
-585	48	220	0	0		2_10	0		0	109	10
-586	48	225	0	0		2_10	0		0	109	10
-587	48	230	0	0		2_10	0		0	109	10
+502	26	220	0	0		2_10	0		0	109	10
+503	10	1	101|10	0		2_10	0		0	109	10
+504	69	1	4007	0		2_10	0		0	109	10
+505	36	1	60203010	0		2_10	0		0	109	10
+521	50	7	0	0		2_10	0		0	109	10
+522	50	8	0	0		2_10	0		0	109	10
+523	58	1	50106102|10	0		2_10	0		0	109	10
+524	94	5	4708	0		2_10	0		0	109	10
+525	94	2	4709	0		2_10	0		0	109	10
+526	94	4	4709	0		2_10	0		0	109	10
+527	63	1	3	0		2_10	0		0	109	10
+528	42	1	504	0		2_10	0		0	109	10
+529	92	5	1|1|1	0		2_10	0		0	109	10
+530	62	1	20	0		2_10	0		0	109	10
+531	42	1	508	0		2_10	0		0	109	10
+532	26	240	0	0		2_10	0		0	109	10
+533	26	260	0	0		2_10	0		0	109	10
+534	33	1	308|0	0		2_10	0		0	109	10
+541	50	9	0	0		2_10	0		0	109	10
+542	26	280	0	0		2_10	0		0	109	10
+543	36	1	60203011	0		2_10	0		0	109	10
+544	10	1	101|15	0		2_10	0		0	109	10
+545	10	1	101|20	0		2_10	0		0	109	10
+546	58	1	50106002|15	0		2_10	0		0	109	10
+547	58	1	50106002|20	0		2_10	0		0	109	10
+548	94	6	4709	0		2_10	0		0	109	10
+549	63	1	4	0		2_10	0		0	109	10
+550	62	1	30	0		2_10	0		0	109	10
+551	92	5	2|1|1	0		2_10	0		0	109	10
+561	50	10	0	0		2_10	0		0	109	10
+562	94	2	4710	0		2_10	0		0	109	10
+563	92	5	3|1|1	0		2_10	0		0	109	10
+564	42	1	604	0		2_10	0		0	109	10
+565	62	1	40	0		2_10	0		0	109	10
+566	49	1	5	0		2_10	0		0	109	10
+567	26	300	0	0		2_10	0		0	109	10
+568	124	1	1|5|2	0		2_10	0		0	109	10
+569	92	2	1|2|1	0		2_10	0		0	109	10
 601	69	1	4004	0		2_10	0		0	110	10
 602	125	2	0	0		2_10	0		0	110	10
-616	50	8	0	0		2_10	0		0	110	10
-617	70	1	2	0		2_10	0		0	110	10
-618	71	1	2	0		2_10	0		0	110	10
-619	125	4	0	0		2_10	0		0	110	10
-620	125	6	0	0		2_10	0		0	110	10
-621	36	1	60203012	0		2_10	0		0	110	10
-622	62	1	56	0		2_10	0		0	110	10
-623	26	280	0	0		2_10	0		0	110	10
-624	42	1	608	0		2_10	0		0	110	10
-625	63	1	4	0		2_10	0		0	110	10
-626	94	6	4709	0		2_10	0		0	110	10
-631	50	9	0	0		2_10	0		0	110	10
-632	70	1	4	0		2_10	0		0	110	10
-633	71	1	4	0		2_10	0		0	110	10
-634	26	320	0	0		2_10	0		0	110	10
-635	125	8	0	0		2_10	0		0	110	10
-636	125	10	0	0		2_10	0		0	110	10
-637	36	1	60203013	0		2_10	0		0	110	10
-638	62	1	86	0		2_10	0		0	110	10
-639	42	1	704	0		2_10	0		0	110	10
-641	92	5	4|1|1	0		2_10	0		0	110	10
-642	124	1	1|5|2	0		2_10	0		0	110	10
-643	63	1	5	0		2_10	0		0	110	10
-644	94	1	4710	0		2_10	0		0	110	10
-646	50	10	0	0		2_10	0		0	110	10
-647	70	1	6	0		2_10	0		0	110	10
-648	26	360	0	0		2_10	0		0	110	10
-649	42	1	708	0		2_10	0		0	110	10
-650	49	1	6	0		2_10	0		0	110	10
-651	62	1	98	0		2_10	0		0	110	10
-652	92	5	5|1|1	0		2_10	0		0	110	10
-653	124	1	1|5|3	0		2_10	0		0	110	10
-654	50	11	0	0		2_10	0		0	110	10
-655	63	1	6	0		2_10	0		0	110	10
-656	94	8	4709	0		2_10	0		0	110	10
-661	71	1	6	0		2_20	0		0	110	20
-662	82	3	5|3|1	0		2_20	0		0	110	20
-663	83	1	5|3|1	0		2_20	0		0	110	20
-664	126	40	3	0		2_20	0		0	110	20
-665	91	15	50065|55065|60065	0		2_10	0		0	110	10
-666	91	15	50165|55165|60165	0		2_10	0		0	110	10
-667	48	310	0	0		2_10	0		0	110	10
-668	48	315	0	0		2_10	0		0	110	10
-669	48	320	0	0		2_10	0		0	110	10
-670	48	325	0	0		2_10	0		0	110	10
-671	48	330	0	0		2_10	0		0	110	10
-672	7	54	0	0		2_10	0		0	110	10
-673	7	56	0	0		2_10	0		0	110	10
-674	7	58	0	0		2_10	0		0	110	10
-675	7	60	0	0		2_10	0		0	110	10
-676	7	62	0	0		2_10	0		0	110	10
-677	46	74	0	0		2_10	0		0	110	10
-678	46	76	0	0		2_10	0		0	110	10
-679	46	78	0	0		2_10	0		0	110	10
-680	46	80	0	0		2_10	0		0	110	10
-682	125	34	0	0		2_10	0		0	110	10
-683	125	36	0	0		2_10	0		0	110	10
-684	125	38	0	0		2_10	0		0	110	10
-685	125	40	0	0		2_10	0		0	110	10
-686	125	42	0	0		2_10	0		0	110	10
-687	46	82	0	0		2_10	0		0	110	10
-688	46	84	0	0		2_10	0		0	110	10
-689	48	335	0	0		2_10	0		0	110	10
-690	48	340	0	0		2_10	0		0	110	10
-691	48	345	0	0		2_10	0		0	110	10
-692	48	350	0	0		2_10	0		0	110	10
+603	10	1	201|15	0		2_10	0		0	110	10
+604	36	1	60203012	0		2_10	0		0	110	10
+605	94	4	4710	0		2_10	0		0	110	10
+606	26	320	0	0		2_10	0		0	110	10
+621	50	11	0	0		2_10	0		0	110	10
+622	70	1	2	0		2_10	0		0	110	10
+623	26	340	0	0		2_10	0		0	110	10
+624	62	1	56	0		2_10	0		0	110	10
+625	63	1	5	0		2_10	0		0	110	10
+626	10	1	201|20	0		2_10	0		0	110	10
+627	58	1	50106102|15	0		2_10	0		0	109	10
+628	58	1	50106102|20	0		2_10	0		0	109	10
+629	125	4	0	0		2_10	0		0	110	10
+630	125	6	0	0		2_10	0		0	110	10
+631	94	6	4710	0		2_10	0		0	110	10
+632	94	8	4710	0		2_10	0		0	110	10
+633	42	1	608	0		2_10	0		0	110	10
+634	92	3	1|2|1	0		2_10	0		0	110	10
+635	71	1	2	0		2_10	0		0	110	10
+641	50	12	0	0		2_10	0		0	110	10
+642	70	1	3	0		2_10	0		0	110	10
+643	70	1	4	0		2_10	0		0	110	10
+644	36	1	60203013	0		2_10	0		0	110	10
+645	62	1	86	0		2_10	0		0	110	10
+646	63	1	6	0		2_10	0		0	110	10
+647	125	8	0	0		2_10	0		0	110	10
+648	125	10	0	0		2_10	0		0	110	10
+649	125	12	0	0		2_10	0		0	110	10
+650	125	14	0	0		2_10	0		0	110	10
+651	94	2	4711	0		2_10	0		0	110	10
+652	94	4	4711	0		2_10	0		0	110	10
+653	26	360	0	0		2_10	0		0	110	10
+654	42	1	704	0		2_10	0		0	110	10
+655	42	1	708	0		2_10	0		0	110	10
+656	92	5	4|1|1	0		2_10	0		0	110	10
+657	63	1	7	0		2_10	0		0	110	10
+658	92	5	1|2|1	0		2_10	0		0	110	10
+659	71	1	3	0		2_10	0		0	110	10
+660	71	1	4	0		2_10	0		0	110	10
+671	50	13	0	0		2_10	0		0	110	10
+672	50	14	0	0		2_10	0		0	110	10
+673	70	1	5	0		2_10	0		0	110	10
+674	70	1	6	0		2_10	0		0	110	10
+675	62	1	98	0		2_10	0		0	110	10
+676	125	16	0	0		2_10	0		0	110	10
+677	125	18	0	0		2_10	0		0	110	10
+678	125	20	0	0		2_10	0		0	110	10
+679	94	6	4711	0		2_10	0		0	110	10
+680	94	8	4711	0		2_10	0		0	110	10
+681	94	10	4711	0		2_10	0		0	110	10
+682	49	1	6	0		2_10	0		0	110	10
+683	42	1	804	0		2_10	0		0	110	10
+684	42	1	808	0		2_10	0		0	110	10
+685	26	380	0	0		2_10	0		0	110	10
+686	26	400	0	0		2_10	0		0	110	10
+687	92	5	5|1|1	0		2_10	0		0	110	10
+688	63	1	8	0		2_10	0		0	110	10
+689	124	1	1|5|3	0		2_10	0		0	110	10
 701	1	70	0	0	0	0	0		0		
 702	1	100	0	0	0	0	0		0		
 703	1	125	0	0	0	0	0		0		
@@ -297,7 +238,6 @@
 713	1	340	0	0	0	0	0		0		
 714	1	360	0	0	0	0	0		0		
 715	1	380	0	0	0	0	0		0		
-751	3	1	20510	0	0	0	0		0		
 752	3	1	20511	0	0	0	1		0		
 753	3	1	20512	0	0	0	1		0		
 754	3	1	20513	0	0	0	1		0		
@@ -400,3 +340,33 @@
 984	119	64000	0		2302_1		0		0		
 985	119	72000	0		2303_1		0		0		
 986	119	80000	0		2302_1		0		0		
+1001	50	4	0				0		0		
+1002	50	4	0				0		0		
+1003	50	5	0				0		0		
+1004	50	6	0				0		0		
+1005	50	7	0				0		0		
+1006	50	8	0				0		0		
+1007	50	9	0				0		0		
+1008	50	10	0				0		0		
+1009	50	11	0				0		0		
+1010	50	12	0				0		0		
+1021	33	1	204|0				0		0		
+1022	27	7	25				0		0		
+1023	105	20	0				0		0		
+1024	45	80	0				0		0		
+1025	58	1	50106102|20				0		0		
+1026	10	1	201|20				0		0		
+1027	111	5	0				0		0		
+1028	63	7	0				0		0		
+1029	92	5	1|2|1				0		0		
+1030	71	5	0				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/PySysDB/tagTreasure.txt b/db/PyMongoDataServer/PySysDB/tagTreasure.txt
index ef067e8..b7d6817 100644
--- a/db/PyMongoDataServer/PySysDB/tagTreasure.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTreasure.txt
@@ -23,7 +23,7 @@
 212	2	211	712|842		
 213	2	212	713|843		
 214	2	213	714|844		
-301	3	0	751|752|753|754|755|756		
+301	3	0	752|753|754|755|756		
 302	3	0	761		
 303	3	0	762		
 304	3	0	763		
diff --git a/db/PyMongoDataServer/PySysDB/tagTreasurePrivilege.txt b/db/PyMongoDataServer/PySysDB/tagTreasurePrivilege.txt
index 618ddc0..6cb453d 100644
--- a/db/PyMongoDataServer/PySysDB/tagTreasurePrivilege.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTreasurePrivilege.txt
@@ -1,12 +1,11 @@
-PrivilegeID	EffectValue	singleValue	maxValue	attr	itemAward
-1	0			{"6":10000,"7":200}	
-2	0	3	180	{"7":50}	
-3	0				
-4	10000				
-5	0	4	0	{"7":100}	
-6	0	1	0	{"6":12000}	
-7	0	2	100	{"26":300}	
-8	0			{"86":5000}	
-9	0			{"87":5000}	
-10	0	0	0		[[5303,50,1]]
-11				{"7":100}	
+PrivilegeID	EffectValue	singleValue	maxValue	attr	itemAward	successList
+1	0			{"6":10000,"7":200}		1001|1021|1041
+2	0	3	180	{"7":50}		1002|1022|1042
+3	0					1003|1023|1043
+4	10000					1004|1024|1044
+5	0	4	0	{"7":100}		1005|1025|1045
+6	0	1	0	{"6":12000}		1006|1026|1046
+7	0	5	450	{"26":200}		1007|1027|1047
+8	0			{"86":5000}		1008|1028|1048
+9	0			{"87":5000}		1009|1029|1049
+10	0	0	0		[[5303,50,1]]	1010|1030|1050
diff --git a/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt b/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt
index 079b24b..f5a5567 100644
--- a/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt
@@ -1,70 +1,60 @@
-MWID	LV	NeedExp	AddAttr	UnLockSkill	Privilege
-101	0	0		50000|55000|60000	
-101	1	40			1
-102	0	0			
-102	1	20			
-102	2	20		50100|55100|60100	
-102	3	40			3
-103	0	0			
-103	1	20			
-103	2	40		50400|55400|60400	
-103	3	80			2
-104	0	0			
-104	1	20			
-104	2	30		150|250|350	
-104	3	100			4
-105	0	0			
-105	1	20			
-105	2	30		50200|55200|60200	
-105	3	20	6_10000		
-105	4	90			6
-106	0	0			
-106	1	20			
-106	2	30	7_300		
-106	3	40	6_12000		
-106	4	50		50300|55300|60300	
-106	5	200			5
-107	0	0			
-107	1	20			
-107	2	70	7_500		
-107	3	80	6_15000		
-107	4	80		50500|55500|60500	
-107	5	180			7
-108	0	0			
-108	1	50	6_18000		
-108	2	80			
-108	3	60	7_500		
-108	4	60		50600|55600|60600	
-108	5	230			8
-109	0	0			
-109	1	50			
-109	2	50	7_500		
-109	3	70	6_18000		
-109	4	70		50700|55700|60700	
-109	5	310			9
-110	0	0			
-110	1	50			
-110	2	80	6_20000		
-110	3	120	7_500		
-110	4	120		50800|55800|60800	
-110	5	350			10
-201	0	0		50900|55900|60900	
-202	0	0		50901|55901|60901	
-203	0	0		50902|55902|60902	
-204	0	0		50903|55903|60903	
-205	0	0		50904|55904|60904	
-206	0	0		50905|55905|60905	
-207	0	0		50906|55906|60906	
-208	0	0		50907|55907|60907	
-209	0	0		50908|55908|60908	
-210	0	0		50909|55909|60909	
-211	0	0		50910|55910|60910	
-212	0	0		50911|55911|60911	
-213	0	0		50912|55912|60912	
-214	0	0		50913|55913|60913	
-302	0	0		47100|47100|47100	
-304	0	0			11
-305	0	0	46_3000		
-306	0	0	19_2000		
-307	0	0	60_3000		
-308	0	0	18_2000		
+MWID	LV	NeedExp	AddAttr	UnLockSkill	ActiveMWID	ItemAward
+101	0	0		50000|55000|60000		
+102	0	0				
+102	1	20				
+102	2	20		50100|55100|60100		
+103	0	0				
+103	1	20				
+103	2	40		50400|55400|60400		
+104	0	0				
+104	1	20				
+104	2	30		150|250|350		
+105	0	0				
+105	1	20				
+105	2	30		50200|55200|60200		
+105	3	20	6_10000			
+106	0	0				
+106	1	30				
+106	2	50	7_300			
+106	4	90		50300|55300|60300		
+107	0	0				
+107	1	50			301	
+107	2	100	6_15000			
+107	3	130				
+107	4	110		50500|55500|60500		
+108	0	0				
+108	1	70				
+108	2	140	7_500			
+108	3	140				
+108	4	100		50600|55600|60600		
+109	0	0				
+109	1	50				
+109	2	140	6_20000			
+109	3	110				
+109	4	90		50700|55700|60700		
+110	0	0				
+110	1	60				
+110	2	150	7_800			
+110	3	200				
+110	4	190		50800|55800|60800		
+201	0	0		50900|55900|60900		
+202	0	0		50901|55901|60901		
+203	0	0		50902|55902|60902		
+204	0	0		50903|55903|60903		
+205	0	0		50904|55904|60904		
+206	0	0		50905|55905|60905		
+207	0	0		50906|55906|60906		
+208	0	0		50907|55907|60907		
+209	0	0		50908|55908|60908		
+210	0	0		50909|55909|60909		
+211	0	0		50910|55910|60910		
+212	0	0		50911|55911|60911		
+213	0	0		50912|55912|60912		
+214	0	0		50913|55913|60913		
+301	0	0				
+302	0	0		47100|47100|47100		
+304	0	0				
+305	0	0	46_3000			
+306	0	0	19_2000			
+307	0	0	60_3000			
+308	0	0	18_2000			
diff --git a/db/PyMongoDataServer/PySysDB/tagTrialExchange.txt b/db/PyMongoDataServer/PySysDB/tagTrialExchange.txt
index eb6eaf0..b4b84d4 100644
--- a/db/PyMongoDataServer/PySysDB/tagTrialExchange.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTrialExchange.txt
@@ -1,19 +1,19 @@
 id	exchangeItemID	exchangeItemCount	exchangeItemIsBind	tokenId	tokenCount
 1	2333	1	0	1131	12
 2	10344	1	0	1134	6
-3	10345	1	0	1134	5
+3	10346	1	0	1134	5
 4	10343	1	0	1134	4
 5	10347	1	0	1134	3
-6	10346	1	0	1134	2
+6	10345	1	0	1134	2
 7	2335	1	0	1132	12
 8	10444	1	0	1135	6
-9	10445	1	0	1135	5
+9	10446	1	0	1135	5
 10	10443	1	0	1135	4
 11	10447	1	0	1135	3
-12	10446	1	0	1135	2
+12	10445	1	0	1135	2
 13	2337	1	0	1133	12
 14	10544	1	0	1136	6
-15	10545	1	0	1136	5
+15	10546	1	0	1136	5
 16	10543	1	0	1136	4
 17	10547	1	0	1136	3
-18	10546	1	0	1136	2
+18	10545	1	0	1136	2
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index 189e09b..56e9437 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -1241,13 +1241,13 @@
 10445	4	0	奔雷虎符	105	5	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	2896	0	0	0	0	6	1486	0	0	8	92	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	3	0	4	1	0	0	0	0	0	0	0	0	0	0	0	0	104	0	0	0	0	0
 10446	4	0	奔雷腿甲	106	6	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	3808	0	0	0	0	6	2744	0	0	8	171	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	3	0	4	1	0	0	0	0	0	0	0	0	0	0	0	0	104	0	0	0	0	0
 10447	4	0	奔雷铁鞋	107	7	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	3768	0	0	0	0	6	1829	0	0	8	114	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	3	0	4	1	0	0	0	0	0	0	0	0	0	0	0	0	104	0	0	0	0	0
-10451	4	0	烈阳	101	1	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	4800	0	0	0	0	67	411	0	0	68	763	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	3	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-10452	4	0	白驹	102	2	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	4744	0	0	0	0	67	274	0	0	68	508	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	3	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-10453	4	0	奔雷缨冠	103	3	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	3784	0	0	0	0	6	2287	0	0	8	142	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	3	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	104	0	0	0	0	0
-10454	4	0	奔雷战袍	104	4	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	3824	0	0	0	0	6	3087	0	0	8	192	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	3	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	104	0	0	0	0	0
-10455	4	0	奔雷虎符	105	5	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	2896	0	0	0	0	6	1486	0	0	8	92	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	3	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	104	0	0	0	0	0
-10456	4	0	奔雷腿甲	106	6	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	3808	0	0	0	0	6	2744	0	0	8	171	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	3	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	104	0	0	0	0	0
-10457	4	0	奔雷铁鞋	107	7	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	3768	0	0	0	0	6	1829	0	0	8	114	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	3	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	104	0	0	0	0	0
+10451	4	0	烈阳	101	1	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	4800	0	0	0	0	67	411	0	0	68	763	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	4	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+10452	4	0	白驹	102	2	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	4744	0	0	0	0	67	274	0	0	68	508	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	4	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+10453	4	0	奔雷缨冠	103	3	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	3784	0	0	0	0	6	2287	0	0	8	142	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	4	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	104	0	0	0	0	0
+10454	4	0	奔雷战袍	104	4	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	3824	0	0	0	0	6	3087	0	0	8	192	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	4	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	104	0	0	0	0	0
+10455	4	0	奔雷虎符	105	5	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	2896	0	0	0	0	6	1486	0	0	8	92	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	4	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	104	0	0	0	0	0
+10456	4	0	奔雷腿甲	106	6	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	3808	0	0	0	0	6	2744	0	0	8	171	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	4	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	104	0	0	0	0	0
+10457	4	0	奔雷铁鞋	107	7	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	3768	0	0	0	0	6	1829	0	0	8	114	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	4	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	104	0	0	0	0	0
 10461	4	0	烈阳	101	1	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	1590	0	12384	0	0	0	0	67	692	0	0	68	1284	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	4	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 10462	4	0	白驹	102	2	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	1590	0	12256	0	0	0	0	67	461	0	0	68	855	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	4	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 10463	4	0	奔雷缨冠	103	3	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	1590	0	9776	0	0	0	0	6	4122	0	0	8	229	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	101	4	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	104	0	0	0	0	0
@@ -1943,13 +1943,13 @@
 20445	4	0	青云长绦	105	5	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	2896	0	0	0	0	6	1283	0	0	8	92	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	3	0	4	1	0	0	0	0	0	0	0	0	0	0	0	0	204	0	0	0	0	0
 20446	4	0	青云朱裳	106	6	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	3808	0	0	0	0	6	2370	0	0	8	171	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	3	0	4	1	0	0	0	0	0	0	0	0	0	0	0	0	204	0	0	0	0	0
 20447	4	0	青云云靴	107	7	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	3768	0	0	0	0	6	1580	0	0	8	114	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	3	0	4	1	0	0	0	0	0	0	0	0	0	0	0	0	204	0	0	0	0	0
-20451	4	0	云雾缭绕	101	1	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	4800	0	0	0	0	67	436	0	0	68	810	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	3	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-20452	4	0	沉星	102	2	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	4744	0	0	0	0	67	291	0	0	68	540	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	3	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-20453	4	0	青云发簪	103	3	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	3784	0	0	0	0	6	1975	0	0	8	142	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	3	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	204	0	0	0	0	0
-20454	4	0	青云道袍	104	4	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	3824	0	0	0	0	6	2666	0	0	8	192	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	3	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	204	0	0	0	0	0
-20455	4	0	青云长绦	105	5	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	2896	0	0	0	0	6	1283	0	0	8	92	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	3	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	204	0	0	0	0	0
-20456	4	0	青云朱裳	106	6	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	3808	0	0	0	0	6	2370	0	0	8	171	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	3	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	204	0	0	0	0	0
-20457	4	0	青云云靴	107	7	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	3768	0	0	0	0	6	1580	0	0	8	114	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	3	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	204	0	0	0	0	0
+20451	4	0	云雾缭绕	101	1	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	4800	0	0	0	0	67	436	0	0	68	810	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	4	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+20452	4	0	沉星	102	2	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	4744	0	0	0	0	67	291	0	0	68	540	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	4	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+20453	4	0	青云发簪	103	3	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	3784	0	0	0	0	6	1975	0	0	8	142	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	4	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	204	0	0	0	0	0
+20454	4	0	青云道袍	104	4	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	3824	0	0	0	0	6	2666	0	0	8	192	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	4	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	204	0	0	0	0	0
+20455	4	0	青云长绦	105	5	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	2896	0	0	0	0	6	1283	0	0	8	92	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	4	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	204	0	0	0	0	0
+20456	4	0	青云朱裳	106	6	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	3808	0	0	0	0	6	2370	0	0	8	171	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	4	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	204	0	0	0	0	0
+20457	4	0	青云云靴	107	7	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	318	0	3768	0	0	0	0	6	1580	0	0	8	114	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	4	0	4	2	0	0	0	0	0	0	0	0	0	0	0	0	204	0	0	0	0	0
 20461	4	0	云雾缭绕	101	1	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	1590	0	12384	0	0	0	0	67	727	0	0	68	1351	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	4	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 20462	4	0	沉星	102	2	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	1590	0	12256	0	0	0	0	67	485	0	0	68	901	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	4	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 20463	4	0	青云发簪	103	3	1	0	0	1	1	1	1	0	1	0	0	0	0	0	1	1590	0	9776	0	0	0	0	6	3664	0	0	8	229	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	201	4	0	5	1	0	0	0	0	0	0	0	0	0	0	0	0	204	0	0	0	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