From 066b02c30544361b6a7ac1ced3861b72c7cad921 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期二, 28 八月 2018 15:47:12 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagTreasureUp.txt                                                            |   22 +-
 CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.pyc                                            |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc                                       |    0 
 db/PyMongoDataServer/PySysDB/tagResourcesBack.txt                                                         |    2 
 db/PyMongoDataServer/PySysDB/tagSuccess.txt                                                               |  223 +++++++++++++++++++-----------------
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc |    0 
 db/PyMongoDataServer/PySysDB/tagRealm.txt                                                                 |   18 +-
 db/PyMongoDataServer/SysDB/tagChinItem.txt                                                                |    6 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc                |    0 
 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt                                                            |    4 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt          |    3 
 db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt                                                           |   50 ++++----
 12 files changed, 173 insertions(+), 155 deletions(-)

diff --git a/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.pyc b/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.pyc
index 42bcfbb..206f140 100644
--- a/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.pyc
+++ b/CoreServerGroup/GameServer/Script/Player/PlayerFamilyParty.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
index c857cc7..2ad4076 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
@@ -23,6 +23,7 @@
 #	suppressValueFP			战力最终压制值, 由公式 SuppressValueFP_是否boss 计算得出,无压制默认值为0
 #	suppressRealm			境界压制差, 可为负数 PVP 攻击方境界所属组 - 防守方境界所属组  PVE 攻击方境界等级 - 防守方境界等级
 #	SuppressValueRealmRate	境界最终压制伤害增减比例, 由公式 SuppressValueRealmAdd (高境界打低境界伤害增加)及 SuppressValueRealmDec (低境界打高境界伤害减少)计算得出, 默认10000,PVP PVE都有效,宠物无效
+# suppressRealmHurtPer  境界压制加成百分比,存在负数, 配表获取
 #	isLuckyHit				是否会心一击		0否1是
 #	isSuperHit				是否暴击			0否1是
 #
@@ -64,6 +65,7 @@
 #   dMaxHP                  防守方生命上限
 #   PVPSuppressValueRealm   PVP境界压制 境界最终压制伤害增减比例, 由公式 PVPSuppressValueRealm (高境界打低境界伤害增加)及 SuppressValueRealmDec计算得出, 默认10000 PVE有效,宠物无效  大境界压制
 #   PVESuppressValueRealm    PVE境界压制 境界最终压制伤害增减比例, 由公式 PVESuppressValueRealm (高境界打低境界伤害增加)及 SuppressValueRealmDec计算得出, 默认10000 PVE有效,宠物无效 小境界压制
+#   EVPSuppressValueRealm    EVP境界压制 境界最终压制伤害增减比例, 由公式 EVPSuppressValueRealm (高境界打低境界伤害增加)及 SuppressValueRealmDec计算得出, 默认10000 PVE有效,宠物无效 小境界压制
 (
 
 {
@@ -74,6 +76,7 @@
 	"SuppressValueFP_1":"min(max(suppressFightPower*1.0/suppressNPCFightPower-0,0),0.05)*5+min(max(suppressFightPower*1.0/suppressNPCFightPower-0.05,0),0.15)*8+min(max(suppressFightPower*1.0/suppressNPCFightPower-0.2,0),1)*10",
 	"PVPSuppressValueRealm":"min(max(5000, 10000+max(suppressRealm,-6)*1000),15000)",
 	"PVESuppressValueRealm":"min(max(5000, 10000+max(suppressRealm,-6)*1000),15000)",
+	"EVPSuppressValueRealm":"min(max(5000, 10000+max(suppressRealm,-6)*1000),15000)",
 	
 	#常规公式-通用
 	"PVP_1"	:"int(SuppressValueRealmRate/10000.0*max((((max((aMaxAtk if isLuckyHit else (aMinAtk + (aMaxAtk - aMinAtk)*rand))- dDef*(1-max(aIgnoreDefRate - dIgnoreDefRateReduce,0)/10000.0),0))*(1+(aLuckyHit/10000.0 if isLuckyHit else 0))+ (aSuperHit*max(1-dSuperHitReduce/10000.0,0) if isSuperHit else 0)+ max(aIceAtkSuperHit*aIceAtk - dIceDef, 0))*(atkSkillPer+max(aSkillAtkRate-dSkillAtkRateReduce,0)/10000.0)*(1+(aDamagePer+aDamagePerPVP)/10000.0)*(1-min(dDamReduce,8000)/10000.0)*(1-min(dDamagePerPVPReduce,8000)/10000.0)*(1-min(dDamChanceDef,8000)/10000.0)+max(aFinalHurt+aOnlyFinalHurt-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0),(aMinAtk+aMaxAtk)/2*0.05 + (aMinAtk+aMaxAtk)/2*0.1*rand))",
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc
index 88d0c5a..9f1235d 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index f34437f..a90494a 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/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc
index 332a875..72d3340 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_FamilyParty.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 676a787..4dbea51 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -81,7 +81,7 @@
 ReduceSitTimeItemID	4503	4504	2|1		
 CollectSitItemLostHP	maxHP*1/100+1333				
 BigRealmSitTime	12|14	18|20			
-RealmGroup	2|5|7|9|12|15|18|21|24|27|28				
+RealmGroup	2|5|7|9|12|15|18|21|24|27|28	{1:1500, 2:1500,3:4500,4:1500,5:2500}	{1:1500, 2:1500,3:4500,4:1500,5:2500}		
 BugleItem	2050	0	0	0	0
 PetUpItem	4151				
 SignConsumption	10				
@@ -113,7 +113,7 @@
 JobItemDropSets	{2:[5012,5022],5:[4611,4612,4613,4614,4615],1000:[8201,8214,8227,8240,8253],2000:[8202,8215,8228,8241,8254],2001:[8203,8216,8229,8242,8255],2002:[8204,8217,8230,8243,8256],3001:[8205,8218,8231,8244,8257],3002:[8205,8218,8231,8244,8257],3003:[8205,8218,8231,8244,8257],4001:[8208,8221,8234,8247,8260],4002:[8209,8222,8235,8248,8261],4003:[8210,8223,8236,8249,8262],5002:[8211,8224,8237,8250,8263],5003:[8212,8225,8238,8251,8264],6003:[8213,8226,8239,8252,8265]}				
 EquipDropPartSets	{102:[1,2],105:[3,4,5,6,7],107:[1,2,3,4,5,6,7],108:[8],204:[4],205:[5],206:[6]}				
 FamilyBOSSDropRule	6000+grade*800	min(2*playerCount,50)			
-FBGradeEquipDropRate	{}	{}	{30603001:{1:[[1019,1],[1134,3]], 2:[[1018,1],[1134,4]], 3:[[1017,1],[1134,5]], 4:[[1016,1],[1131,3],[1134,5]], 5:[[1015,1],[1131,6],[1134,5]]},30603002:{1:[[1019,1],[1135,3]], 2:[[1018,1],[1135,4]], 3:[[1017,1],[1132,4],[1135,5]], 4:[[1016,1],[1132,6],[1135,5]], 5:[[1015,1],[1132,8],[1135,5]]},30603003:{1:[[1019,1],[1136,3]], 2:[[1018,1],[1136,4]], 3:[[1017,1],[1133,4],[1136,5]], 4:[[1016,1],[1133,6],[1136,5]], 5:[[1015,1],[1133,8],[1136,5]]}}		
+FBGradeEquipDropRate	{}	{}	{30603001:{1:[[1019,1],[1134,3]], 2:[[1018,1],[1134,4]], 3:[[1017,1],[1131,4],[1134,5]], 4:[[1016,1],[1131,6],[1134,5]], 5:[[1015,1],[1131,8],[1134,5]]},30603002:{1:[[1019,1],[1135,3]], 2:[[1018,1],[1135,4]], 3:[[1017,1],[1132,4],[1135,5]], 4:[[1016,1],[1132,6],[1135,5]], 5:[[1015,1],[1132,8],[1135,5]]},30603003:{1:[[1019,1],[1136,3]], 2:[[1018,1],[1136,4]], 3:[[1017,1],[1133,4],[1136,5]], 4:[[1016,1],[1133,6],[1136,5]], 5:[[1015,1],[1133,8],[1136,5]]}}		
 MutexDrop	[[3803,3802,3801]]	0	0	0	0
 EquipWashMaxLV	1_2|2_2|3_3|4_6|5_8|6_10|7_10|8_10|9_10|10_10|11_10|12_10|13_10|14_10|15_10|16_10|17_10	0	0	0	0
 EquipWashGroup1	1|2	0	0	0	0
diff --git a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
index 56f5cdf..8062b0b 100644
--- a/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
+++ b/db/PyMongoDataServer/PySysDB/tagNPCDropItem.txt
@@ -52,7 +52,7 @@
 10303001	0	160	2	0	[]	0	{}	0	{}	{}	[1,3,3,[(10000,1)],107]	[]	{}	{}	{}	{}	{}	25	800	915	1372	[1,1,1,[1014]]	[]
 10403001	210	205	2	0	[(411960,0),(555293,(3,2,107)),(1000000,(3,3,107))]	30	{(3,4,107):1000000,(3,5,107):0,(3,2,108):100000,(3,3,108):10000,(3,4,108):5000}	1	{4:4,5:2}	{3:[(9600,0),(10000,1)],4:[(8000,1),(10000,2)],5:[(0,1),(10000,2)]}	[1,3,4,[(8000,1),(10000,2)],107]	[]	{2320:100000,2339:83333,2340:166666}	{}	{}	{}	{}	25	800	1077	1615	[]	[1005]
 10503001	210	300	2	0	[(409607,0),(552940,(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)]}	[]	[]	{3801:300000,3802:20833,2320:100000,2339:166666,2340:166666}	{}	{}	{}	{}	25	800	1115	1673	[]	[999]
-10603001	210	350	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,9051:3472,2320:100000,222:8000,2339:166666,2340:166666}	{}	{}	{}	{}	25	800	1123	1685	[]	[999]
+10603001	210	350	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,9051:3472,2320:100000,2339:166666,2340:166666}	{}	{}	{}	{}	25	800	1123	1685	[]	[999]
 10403001	1000	205	2	0	[(411960,0),(555293,(3,2,107)),(1000000,(3,3,107))]	30	{(3,4,107):1000000,(3,5,107):0,(3,2,108):100000,(3,3,108):10000,(3,4,108):5000}	1	{4:4,5:2}	{3:[(9600,0),(10000,1)],4:[(8000,1),(10000,2)],5:[(0,1),(10000,2)]}	[1,3,4,[(8000,1),(10000,2)],107]	[]	{2320:100000,2339:83333,2340:166666}	{}	{}	{}	{}	25	800	1077	1615	[]	[999]
 10503001	1000	300	2	0	[(409607,0),(552940,(4,2,107)),(1000000,(4,3,107))]	30	{(4,4,107):1330000,(4,5,107):80000,(4,2,108):100000,(4,3,108):20000,(4,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:20833,2320:100000,2339:83333,2340:166666}	{}	{}	{}	{}	25	800	1115	1673	[]	[999]
 10603001	1000	350	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,9051:3472,2320:100000,2339:83333,2340:166666}	{}	{}	{}	{}	25	800	1123	1685	[]	[999]
@@ -94,32 +94,32 @@
 20202007	0	460	1	0	[(974945,0),(981945,(8,1,107)),(996667,(8,2,107)),(1000000,(8,3,107))]	1	{}	0	{}	{3:[(9600,0),(10000,1)]}	[]	[]	{951:208,4002:583,4003:583,4501:0,4008:208,4009:208,4005:417,4006:417,4502:0,956:528}	{}	{2:500000}	{}	{2:1}	1	800	1588	1962	[]	[]
 20103001	210	225	2	0	[(411960,0),(555293,(3,2,107)),(1000000,(3,3,107))]	30	{(3,4,107):1000000,(3,2,108):100000,(3,3,108):20000,(3,4,108):10000}	1	{4:4,5:2}	{3:[(9600,0),(10000,1)],4:[(7500,1),(10000,2)],5:[(0,1),(10000,2)]}	[1,3,4,[(10000,2)],107]	[]	{2320:100000,2339:166666,2340:166666}	{}	{}	{}	{}	25	800	1077	1615	[]	[1005]
 20103002	210	245	2	0	[(411960,0),(555293,(3,2,107)),(1000000,(3,3,107))]	30	{(3,4,107):1000000,(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]	[]	{3801:300000,2320:100000,2339:166666,2340:166666}	{}	{}	{}	{}	25	800	1077	1615	[]	[1005]
-20103003	210	260	2	0	[(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))]	30	{(4,4,107):1000000,(4,5,107):80000,(4,2,108):100000,(4,3,108):20000,(4,4,108):10000}	1	{4:4,5:2}	{3:[(9600,0),(10000,1)],4:[(6000,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:166666}	{}	{}	{}	{}	25	800	1115	1673	[]	[999]
-20103004	210	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)]}	[]	[3,4,4,[(3000,1),(10000,2)],107]	{3801:300000,5202:420000,2320:100000,4209:8680,4250:23148,2339:166666,2340:166666}	{}	{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:166666}	{}	{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:166666}	{}	{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:166666}	{}	{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:166666}	{}	{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:166666}	{}	{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:166666}	{}	{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:166666}	{}	{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:166666}	{}	{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:166666}	{}	{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:166666}	{}	{2:800000}	{}	{2:5}	25	800	1588	1962	[]	[999]
+20103003	210	260	2	0	[(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))]	30	{(4,4,107):1000000,(4,5,107):80000,(4,2,108):100000,(4,3,108):20000,(4,4,108):10000}	1	{4:4,5:2}	{3:[(9600,0),(10000,1)],4:[(6000,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,2339:166666,2340:166666}	{}	{}	{}	{}	25	800	1115	1673	[]	[999]
+20103004	210	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)]}	[]	[3,4,4,[(3000,1),(10000,2)],107]	{3801:300000,5202:420000,2320:100000,2339:166666,2340:166666}	{}	{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,2339:166666,2340:166666}	{}	{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,2339:166666,2340:166666}	{}	{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,2339:166666,2340:166666}	{}	{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,2339:166666,2340:166666}	{}	{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,2339:166666,2340:166666}	{}	{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,2339:166666,2340:166666}	{}	{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,2339:166666,2340:166666}	{}	{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,2339:166666,2340:166666}	{}	{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,2339:166666,2340:166666}	{}	{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,2339:166666,2340:166666}	{}	{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):1000000,(3,2,108):100000,(3,3,108):20000,(3,4,108):10000}	1	{4:4,5:2}	{3:[(9600,0),(10000,1)],4:[(7500,1),(10000,2)],5:[(0,1),(10000,2)]}	[1,3,4,[(10000,2)],107]	[]	{2320:100000,2339:83333,2340:166666}	{}	{}	{}	{}	25	800	1077	1615	[]	[999]
 20103002	1000	245	2	0	[(411960,0),(555293,(3,2,107)),(1000000,(3,3,107))]	30	{(3,4,107):1000000,(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]	[]	{3801:300000,2320:100000,2339:83333,2340:166666}	{}	{}	{}	{}	25	800	1077	1615	[]	[999]
-20103003	1000	260	2	0	[(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))]	30	{(4,4,107):1000000,(4,5,107):80000,(4,2,108):100000,(4,3,108):20000,(4,4,108):10000}	1	{4:4,5:2}	{3:[(9600,0),(10000,1)],4:[(6000,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:166666}	{}	{}	{}	{}	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)]}	[]	[3,4,4,[(3000,1),(10000,2)],107]	{3801:300000,5202:420000,2320:100000,4209:1736,4250:8680,2339:83333,2340:166666}	{}	{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:166666}	{}	{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:166666}	{}	{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:166666}	{}	{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:166666}	{}	{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:166666}	{}	{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:166666}	{}	{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:166666}	{}	{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:166666}	{}	{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:166666}	{}	{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:166666}	{}	{2:800000}	{}	{2:5}	25	800	1588	1962	[]	[999]
+20103003	1000	260	2	0	[(410784,0),(554117,(4,2,107)),(1000000,(4,3,107))]	30	{(4,4,107):1000000,(4,5,107):80000,(4,2,108):100000,(4,3,108):20000,(4,4,108):10000}	1	{4:4,5:2}	{3:[(9600,0),(10000,1)],4:[(6000,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,2339:83333,2340:166666}	{}	{}	{}	{}	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)]}	[]	[3,4,4,[(3000,1),(10000,2)],107]	{3801:300000,5202:420000,2320:100000,2339:83333,2340:166666}	{}	{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,2339:83333,2340:166666}	{}	{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,2339:83333,2340:166666}	{}	{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,2339:83333,2340:166666}	{}	{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,2339:83333,2340:166666}	{}	{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,2339:83333,2340:166666}	{}	{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,2339:83333,2340:166666}	{}	{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,2339:83333,2340:166666}	{}	{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,2339:83333,2340:166666}	{}	{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,2339:83333,2340:166666}	{}	{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,2339:83333,2340:166666}	{}	{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):1000000,(4,5,107):100000}	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):1000000,(4,5,107):100000}	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]
diff --git a/db/PyMongoDataServer/PySysDB/tagRealm.txt b/db/PyMongoDataServer/PySysDB/tagRealm.txt
index 7ea1216..d578f68 100644
--- a/db/PyMongoDataServer/PySysDB/tagRealm.txt
+++ b/db/PyMongoDataServer/PySysDB/tagRealm.txt
@@ -4,16 +4,16 @@
 2	1	600	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	800	0	0	0	6|7|19	18700|940|1000	61103002	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
 4	0	950	0	0	0	6|7|19	25100|1260|1000	61103003	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
-5	1	1410	0	0	0	6|7|19	32300|1620|1000	61203002	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(105,3,1),(103,1,1)]}
+5	1	1510	0	0	0	6|7|19	32300|1620|1000	61203002	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(105,3,1),(103,1,1)]}
 6	0	1160	0	0	0	6|7|19	44300|2220|3000	61103004	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
-7	1	1270	0	0	0	6|7|19	53300|2670|3000	61203003	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(105,3,1),(103,1,1)]}
-8	0	1410	0	0	0	6|7|19|18	68200|3410|3000|2000	61103005	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
-9	1	2250	0	0	0	6|7|19|18	79300|3970|3000|2000	61203004	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(106,1,1),(103,3,1)]}
-10	0	2340	0	0	0	6|7|19|18	97600|4880|3000|5000	61103006	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
-11	0	2670	0	0	0	6|7|19|18	111300|5560|3000|5000	61103007	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
-12	1	4890	0	0	0	6|7|19|18	126400|6320|3000|5000	61203005	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(106,1,1),(103,3,1)]}
-13	0	3710	0	0	0	6|7|19|18|49	151500|7570|3000|5000|3000	61103008	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
-14	0	4410	0	0	0	6|7|19|18|49	170000|8500|3000|5000|3000	61103009	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
+7	1	1250	0	0	0	6|7|19	53300|2670|3000	61203003	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(105,3,1),(103,1,1)]}
+8	0	1390	0	0	0	6|7|19|18	68200|3410|3000|2000	61103005	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
+9	1	2290	0	0	0	6|7|19|18	79300|3970|3000|2000	61203004	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(106,1,1),(103,3,1)]}
+10	0	2360	0	0	0	6|7|19|18	97600|4880|3000|5000	61103006	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
+11	0	2410	0	0	0	6|7|19|18	111300|5560|3000|5000	61103007	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
+12	1	4830	0	0	0	6|7|19|18	126400|6320|3000|5000	61203005	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(106,1,1),(103,3,1)]}
+13	0	3950	0	0	0	6|7|19|18|49	151500|7570|3000|5000|3000	61103008	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
+14	0	4650	0	0	0	6|7|19|18|49	170000|8500|3000|5000|3000	61103009	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
 15	1	8420	0	0	0	6|7|19|18|49	190400|9520|3000|5000|3000	61203006	{"1":0,"2":0,"3":0,"4":0,"5":0}	{0:[(106,2,1),(103,5,1)]}
 16	0	4910	0	0	0	6|7|19|18|49	224000|11200|7000|5000|3000	61103010	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
 17	0	5620	0	0	0	6|7|19|18|49	248600|12430|7000|5000|3000	61103011	{"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 2e71b60..ea3a728 100644
--- a/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
+++ b/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
@@ -10,5 +10,5 @@
 9	8	0	25	0	{"exp":"12000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":103,"ItemCount":"1"},{"ItemID":181,"ItemCount":"8"},{"ItemID":102,"ItemCount":"2"}]}	150000	{"exp":"6600*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":181,"ItemCount":"4"},{"ItemID":102,"ItemCount":"4"}]}
 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)+3*max(min(5,dataEx)-4,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1132,"ItemCount":"(3*max(min(3,dataEx)-2,0)+2*max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1133,"ItemCount":"(3*max(min(3,dataEx)-2,0)+2*max(min(4,dataEx)-3,0)+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)+3*max(min(5,dataEx)-4,0))*(max(min(1,extraData),0)-max(min(2,extraData)-1,0))"},{"ItemID":1132,"ItemCount":"(2*max(min(3,dataEx)-2,0)+2*max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1133,"ItemCount":"(2*max(min(3,dataEx)-2,0)+2*max(min(4,dataEx)-3,0)+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))"}]}
+12	9	0	25	0	{"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":1021,"ItemCount":"1"},{"ItemID":1131,"ItemCount":"(4*max(min(3,dataEx)-2,0)+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":"(3*max(min(3,dataEx)-2,0)+2*max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1133,"ItemCount":"(3*max(min(3,dataEx)-2,0)+2*max(min(4,dataEx)-3,0)+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":"(3*max(min(3,dataEx)-2,0)+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":"(2*max(min(3,dataEx)-2,0)+2*max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(2,extraData)-1,0)-max(min(3,extraData)-2,0))"},{"ItemID":1133,"ItemCount":"(2*max(min(3,dataEx)-2,0)+2*max(min(4,dataEx)-3,0)+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 2bfb046..2618a6e 100644
--- a/db/PyMongoDataServer/PySysDB/tagSuccess.txt
+++ b/db/PyMongoDataServer/PySysDB/tagSuccess.txt
@@ -56,28 +56,28 @@
 330	2	20	0	0		2_10	0		0	107	10
 341	50	4	0	0		2_10	0		0	107	10
 342	127	5	1	0		2_10	0		0	107	10
-343	127	6	2	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	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
+343	127	4	2	0		2_10	0		0	107	10
+344	127	6	2	0		2_10	0		0	107	10
+345	6	1	0	0		2_10	0		0	107	10
+346	26	140	0	0		2_10	0		0	107	10
+347	49	1	3	0		2_10	0		0	107	10
+348	42	1	208	0		2_10	0		0	107	10
+349	4	6	0	0		2_10	0		0	107	10
+350	10	1	100|10	0		2_10	0		0	107	10
+351	48	12	0	0		2_10	0		0	107	10
+352	39	1	4|4	0		2_10	0		0	107	10
+353	2	40	0	0		2_10	0		0	107	10
+354	54	1	1|1|2	0		2_10	0		0	107	10
 361	50	5	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	107	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
+363	81	20	52010	0		2_10	0		0	107	10
+364	36	1	60203008	0		2_10	0		0	107	10
+365	48	15	0	0		2_10	0		0	107	10
+366	111	1	0	0		2_10	0		0	107	10
+367	2	60	0	0		2_10	0		0	107	10
+368	42	1	304	0		2_10	0		0	107	10
+369	39	3	4|4	0		2_10	0		0	107	10
+370	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
@@ -86,33 +86,38 @@
 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	6	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	127	4	3	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
+422	91	5	50005|55005|60005	0		2_10	0		0	108	10
+423	91	5	50105|55105|60105	0		2_10	0		0	108	10
+424	91	5	50405|55405|60405	0		2_10	0		0	108	10
+425	121	1	0	0		2_10	0		0	108	10
+426	121	2	0	0		2_10	0		0	108	10
+427	63	1	1	0		2_10	0		0	108	10
+428	58	1	50106001|20	0		2_10	0		0	108	10
+429	127	4	3	0		2_10	0		0	108	10
+430	10	1	100|15	0		2_10	0		0	108	10
+431	10	1	100|20	0		2_10	0		0	108	10
+432	10	1	201|4	0		2_10	0		0	108	10
+433	5	40	0	0		2_10	0		0	108	10
+434	4	8	0	0		2_10	0		0	108	10
+435	4	10	0	0		2_10	0		0	108	10
+436	7	8	0	0		2_10	0		0	108	10
+437	39	5	4|4	0		2_10	0		0	108	10
 441	33	1	307|0	0		2_10	0		0	108	10
-442	127	12	3	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
+442	91	5	1005|2005|3005	0		2_10	0		0	108	10
+443	91	5	50205|55205|60205	0		2_10	0		0	108	10
+444	91	5	50305|55305|60305	0		2_10	0		0	108	10
+445	127	8	3	0		2_10	0		0	108	10
+446	127	12	3	0		2_10	0		0	108	10
+447	42	1	404	0		2_10	0		0	108	10
+448	46	6	0	0		2_10	0		0	108	10
+449	46	8	0	0		2_10	0		0	108	10
+450	62	1	6	0		2_10	0		0	108	10
+451	48	24	0	0		2_10	0		0	108	10
+452	36	1	60203009	0		2_10	0		0	108	10
+453	58	1	50106102|4	0		2_10	0		0	108	10
+454	10	1	201|10	0		2_10	0		0	108	10
+455	111	3	0	0		2_10	0		0	108	10
+456	26	180	0	0		2_10	0		0	108	10
 461	50	7	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
@@ -125,49 +130,52 @@
 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	26	220	0	0		2_10	0		0	109	10
-503	10	1	101|10	0		2_10	0		0	109	10
+503	91	5	50605|55605|60605	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	8	0	0		2_10	0		0	109	10
 522	50	9	0	0		2_10	0		0	109	10
 523	58	1	50106102|10	0		2_10	0		0	109	10
-524	127	20	3	0		2_10	0		0	109	10
-525	127	10	4	0		2_10	0		0	109	10
-526	127	20	4	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
+524	127	16	3	0		2_10	0		0	109	10
+525	127	20	3	0		2_10	0		0	109	10
+526	127	5	4	0		2_10	0		0	109	10
+527	127	10	4	0		2_10	0		0	109	10
+528	127	15	4	0		2_10	0		0	109	10
+529	127	20	4	0		2_10	0		0	109	10
+530	63	1	3	0		2_10	0		0	109	10
+531	42	1	504	0		2_10	0		0	109	10
+532	92	5	1|1|1	0		2_10	0		0	109	10
+533	62	1	20	0		2_10	0		0	109	10
+534	42	1	508	0		2_10	0		0	109	10
+535	26	240	0	0		2_10	0		0	109	10
+536	26	260	0	0		2_10	0		0	109	10
+537	33	1	308|0	0		2_10	0		0	109	10
 541	50	10	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	127	30	4	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
+544	127	25	4	0		2_10	0		0	109	10
+545	127	30	4	0		2_10	0		0	109	10
+546	63	1	4	0		2_10	0		0	109	10
+547	62	1	30	0		2_10	0		0	109	10
+548	92	5	2|1|1	0		2_10	0		0	109	10
 561	50	11	0	0		2_10	0		0	109	10
-562	127	12	5	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
+562	127	6	5	0		2_10	0		0	109	10
+563	127	12	5	0		2_10	0		0	109	10
+564	92	5	3|1|1	0		2_10	0		0	109	10
+565	42	1	604	0		2_10	0		0	109	10
+566	62	1	40	0		2_10	0		0	109	10
+567	49	1	5	0		2_10	0		0	109	10
+568	26	300	0	0		2_10	0		0	109	10
+569	124	1	1|5|2	0		2_10	0		0	109	10
+570	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
-603	10	1	201|15	0		2_10	0		0	110	10
-604	36	1	60203012	0		2_10	0		0	110	10
-605	127	24	5	0		2_10	0		0	110	10
-606	26	320	0	0		2_10	0		0	110	10
+603	91	15	50705|55705|60705	0		2_10	0		0	110	10
+604	10	1	201|15	0		2_10	0		0	110	10
+605	36	1	60203012	0		2_10	0		0	110	10
+606	127	18	5	0		2_10	0		0	110	10
+607	127	24	5	0		2_10	0		0	110	10
+608	26	320	0	0		2_10	0		0	110	10
 621	50	12	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
@@ -178,11 +186,13 @@
 628	58	1	50106102|20	0		2_10	0		0	110	10
 629	125	4	0	0		2_10	0		0	110	10
 630	125	6	0	0		2_10	0		0	110	10
-631	127	36	5	0		2_10	0		0	110	10
-632	127	48	5	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
+631	127	30	5	0		2_10	0		0	110	10
+632	127	36	5	0		2_10	0		0	110	10
+633	127	42	5	0		2_10	0		0	110	10
+634	127	48	5	0		2_10	0		0	110	10
+635	42	1	608	0		2_10	0		0	110	10
+636	92	3	1|2|1	0		2_10	0		0	110	10
+637	71	1	2	0		2_10	0		0	110	10
 641	50	13	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
@@ -193,16 +203,18 @@
 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	127	12	6	0		2_10	0		0	110	10
-652	127	24	6	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
+651	127	6	6	0		2_10	0		0	110	10
+652	127	12	6	0		2_10	0		0	110	10
+653	127	18	6	0		2_10	0		0	110	10
+654	127	24	6	0		2_10	0		0	110	10
+655	26	360	0	0		2_10	0		0	110	10
+656	42	1	704	0		2_10	0		0	110	10
+657	42	1	708	0		2_10	0		0	110	10
+658	92	5	4|1|1	0		2_10	0		0	110	10
+659	63	1	7	0		2_10	0		0	110	10
+660	92	5	1|2|1	0		2_10	0		0	110	10
+661	71	1	3	0		2_10	0		0	110	10
+662	71	1	4	0		2_10	0		0	110	10
 671	50	14	0	0		2_10	0		0	110	10
 672	50	15	0	0		2_10	0		0	110	10
 673	70	1	5	0		2_10	0		0	110	10
@@ -211,17 +223,20 @@
 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	127	36	6	0		2_10	0		0	110	10
-680	127	48	6	0		2_10	0		0	110	10
-681	127	60	6	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
+679	127	30	6	0		2_10	0		0	110	10
+680	127	36	6	0		2_10	0		0	110	10
+681	127	42	6	0		2_10	0		0	110	10
+682	127	48	6	0		2_10	0		0	110	10
+683	127	54	6	0		2_10	0		0	110	10
+684	127	60	6	0		2_10	0		0	110	10
+685	49	1	6	0		2_10	0		0	110	10
+686	42	1	804	0		2_10	0		0	110	10
+687	42	1	808	0		2_10	0		0	110	10
+688	26	380	0	0		2_10	0		0	110	10
+689	26	400	0	0		2_10	0		0	110	10
+690	92	5	5|1|1	0		2_10	0		0	110	10
+691	63	1	8	0		2_10	0		0	110	10
+692	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		
diff --git a/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt b/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt
index 7c774dd..a127e80 100644
--- a/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTreasureUp.txt
@@ -20,23 +20,23 @@
 107	0	0				
 107	1	50			301	
 107	2	110	6_15000			
-107	3	130				
-107	4	110		50500|55500|60500		
+107	3	140				
+107	4	100		50500|55500|60500		
 108	0	0				
 108	1	70				
-108	2	140	7_500			
-108	3	140				
+108	2	170	7_500			
+108	3	160				
 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		
+109	2	120	6_20000			
+109	3	130				
+109	4	100		50700|55700|60700		
 110	0	0				
-110	1	60				
-110	2	150	7_800			
-110	3	200				
-110	4	190		50800|55800|60800		
+110	1	80				
+110	2	170	7_800			
+110	3	220				
+110	4	220		50800|55800|60800		
 201	0	0		50900|55900|60900		
 202	0	0		50901|55901|60901		
 203	0	0		50902|55902|60902		
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index eac8ea3..8cb939e 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -312,7 +312,7 @@
 2200	1	0	生命神兵石宝箱	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	200	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 2201	1	0	攻击神兵石宝箱	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	200	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 2202	1	0	符印精华超值宝箱	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	160	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-2203	1	0	洗练宝箱	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	100	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+2203	1	0	洗炼宝箱	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	100	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 2204	1	0	潜力宝箱	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	800	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	5	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 2205	1	0	套装石宝箱	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	200	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 2206	1	0	超值铜钱礼包	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	400	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	20	0	0	0	0	0	0	0	0
@@ -444,8 +444,8 @@
 2340	1	0	坐骑养成礼包	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	120	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 2341	1	0	复活礼包	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	120	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 2342	1	0	随机材料袋	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	10	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-2343	1	0	坐骑丹礼包	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	10	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
-2344	1	0	高级坐骑丹礼包	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	10	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+2343	1	0	坐骑丹大礼包	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	10	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
+2344	1	0	坐骑丹豪华礼包	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	10	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	4	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 2345	1	0	攻击神兵石礼包	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	10	0	5	0	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	3	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 3501	1	0	1级生命翡翠	25	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	10	0	10	0	0	0	1	225	1	1	3502	6	190	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0
 3502	1	0	2级生命翡翠	25	0	0	0	0	999	1	1	1	0	1	0	0	0	0	0	1	30	0	10	0	0	0	1	225	1	2	3503	6	465	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0

--
Gitblit v1.8.0