From 1c58e98589247f62b3da53b7d0f79d603c68a7c6 Mon Sep 17 00:00:00 2001
From: cehua_wcy <781813756@qq.com>
Date: 星期三, 31 十月 2018 14:16:56 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagChests.txt                    |    6 ++++++
 db/PyMongoDataServer/PySysDB/tagResourcesBack.txt             |   26 +++++++++++++-------------
 db/PyMongoDataServer/PySysDB/tagChestsAward.txt               |    6 ++++++
 db/PyMongoDataServer/SysDB/tagChinItem.txt                    |    2 +-
 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt                |    4 ++--
 ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip |    0 
 6 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
index 6a8f844..0aa032d 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagChests.txt b/db/PyMongoDataServer/PySysDB/tagChests.txt
index 9d963c3..5f23a42 100644
--- a/db/PyMongoDataServer/PySysDB/tagChests.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChests.txt
@@ -185,3 +185,9 @@
 2395	0	0	0	1	0
 2396	0	0	280	1	1
 2397	0	0	0	1	0
+2398	0	0	0	1	0
+2399	0	0	0	1	0
+2400	0	0	0	1	0
+2401	0	0	0	1	0
+2402	0	0	0	1	0
+2403	0	0	0	1	0
diff --git a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
index f289ff9..101655c 100644
--- a/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagChestsAward.txt
@@ -182,3 +182,9 @@
 2395				[[100,[3803,1]],[250,[5408,1]],[260,[5409,1]],[280,[4607,1]],[380,[4606,1]],[480,[4608,1]],[630,[3506,1]],[780,[3516,1]],[1380,[4305,5]],[1680,[5303,60]],[3180,[8353,6]],[4800,[2324,2]],[6200,[3503,1]],[7600,[3513,1]],[7900,[143,30]],[8200,[144,20]],[8500,[153,10]],[10000,[4151,8]]]	1							[3803,5408,5409,4607,4606,4608,3506,3516]
 2396			4184_2|1147_15|952_3|913_1									[913]
 2397				[[11800,[8209,1]],[13600,[8222,1]],[15400,[8235,1]],[17200,[8248,1]],[19000,[8261,1]],[19200,[8210,1]],[19400,[8223,1]],[19600,[8236,1]],[19800,[8249,1]],[20000,[8262,1]]]	1							
+2398	0			[[1600,[10453,1]],[3200,[10454,1]],[4800,[10455,1]],[6400,[10456,1]],[8000,[10457,1]],[8400,[10473,1]],[8800,[10474,1]],[9200,[10475,1]],[9600,[10476,1]],[10000,[10477,1]]]	1				[[10453,20453,30453],[10454,20454,30454],[10455,20455,30455],[10456,20456,30456],[10457,20457,30457],[10473,20473,30473],[10474,20474,30474],[10475,20475,30475],[10476,20476,30476],[10477,20477,30477]]			
+2399	0			[[1600,[10553,1]],[3200,[10554,1]],[4800,[10555,1]],[6400,[10556,1]],[8000,[10557,1]],[8400,[10573,1]],[8800,[10574,1]],[9200,[10575,1]],[9600,[10576,1]],[10000,[10577,1]]]	1				[[10553,20553,30553],[10554,20554,30554],[10555,20555,30555],[10556,20556,30556],[10557,20557,30557],[10573,20573,30573],[10574,20574,30574],[10575,20575,30575],[10576,20576,30576],[10577,20577,30577]]			
+2400	0			[[1600,[10653,1]],[3200,[10654,1]],[4800,[10655,1]],[6400,[10656,1]],[8000,[10657,1]],[8400,[10673,1]],[8800,[10674,1]],[9200,[10675,1]],[9600,[10676,1]],[10000,[10677,1]]]	1				[[10653,20653,30653],[10654,20654,30654],[10655,20655,30655],[10656,20656,30656],[10657,20657,30657],[10673,20673,30673],[10674,20674,30674],[10675,20675,30675],[10676,20676,30676],[10677,20677,30677]]			
+2401	0			[[1600,[10753,1]],[3200,[10754,1]],[4800,[10755,1]],[6400,[10756,1]],[8000,[10757,1]],[8400,[10773,1]],[8800,[10774,1]],[9200,[10775,1]],[9600,[10776,1]],[10000,[10777,1]]]	1				[[10753,20753,30753],[10754,20754,30754],[10755,20755,30755],[10756,20756,30756],[10757,20757,30757],[10773,20773,30773],[10774,20774,30774],[10775,20775,30775],[10776,20776,30776],[10777,20777,30777]]			
+2402	0			[[1600,[10853,1]],[3200,[10854,1]],[4800,[10855,1]],[6400,[10856,1]],[8000,[10857,1]],[8400,[10873,1]],[8800,[10874,1]],[9200,[10875,1]],[9600,[10876,1]],[10000,[10877,1]]]	1				[[10853,20853,30853],[10854,20854,30854],[10855,20855,30855],[10856,20856,30856],[10857,20857,30857],[10873,20873,30873],[10874,20874,30874],[10875,20875,30875],[10876,20876,30876],[10877,20877,30877]]			
+2403	0			[[1600,[10953,1]],[3200,[10954,1]],[4800,[10955,1]],[6400,[10956,1]],[8000,[10957,1]],[8400,[10973,1]],[8800,[10974,1]],[9200,[10975,1]],[9600,[10976,1]],[10000,[10977,1]]]	1				[[10953,20953,30953],[10954,20954,30954],[10955,20955,30955],[10956,20956,30956],[10957,20957,30957],[10973,20973,30973],[10974,20974,30974],[10975,20975,30975],[10976,20976,30976],[10977,20977,30977]]			
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index 22d7441..3775425 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -150,8 +150,8 @@
 FamilyMatchPersonalScore	12	12	{0:20, 30909004:40}	16	10
 FamilyMatchPlayTime	[60,1140,30]				
 FamilyMatchRankReward	{1:[[28,100,1,0],[26,59400,1,0]],4:[[28,80,1,0],[26,49500,1,0]],10:[[28,70,1,0],[26,39600,1,0]],20:[[28,60,1,0],[26,29700,1,0]],21:[[28,50,1,0],[26,19800,1,0]]}	[40,50,60,80,100]	[[103,5,1],[26,13200,1]]		
-FamilyMatchRankOneReward	{215:[[2299,1,0]],265:[[2279,1,0]],315:[[2281,1,0]],365:[[2283,1,0]],415:[[2285,1,0]]}				
-FamilyMatchSRankOneReward	{215:[[2300,1,0]],265:[[2280,1,0]],315:[[2282,1,0]],365:[[2284,1,0]],415:[[2286,1,0]]}				
+FamilyMatchRankOneReward	{215:[[2299,1,0]],265:[[2279,1,0]],315:[[2281,1,0]],365:[[2283,1,0]],415:[[2285,1,0]]}	{215:[[2398,1,0]],265:[[2399,1,0]],315:[[2400,1,0]],365:[[2401,1,0]],415:[[2402,1,0]]}			
+FamilyMatchSRankOneReward	{215:[[2300,1,0]],265:[[2280,1,0]],315:[[2282,1,0]],365:[[2284,1,0]],415:[[2286,1,0]]}	{215:[[2398,1,0]],265:[[2399,1,0]],315:[[2400,1,0]],365:[[2401,1,0]],415:[[2402,1,0]]}			
 FamilyMatchDayReward	[[914,1,1],[911,1,1],[2213,1,1]]	11|12	41		
 WingLV	{"5":1,"6":2,"8":3,"10":4,"12":5}				
 WingLegendAttrCount	{5:1,6:1,8:1,10:2,12:2}		0	0	0
diff --git a/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt b/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
index 3867918..4cc2ef5 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":"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":"16000"}]}	50000	{"exp":"9900*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":26,"ItemCount":"8800"}]}
-5	5	0	15	30	{"exp":"1440*reExp", "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	{"exp":"990*reExp", "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":105,"ItemCount":"2"},{"ItemID":102,"ItemCount":"4"}]}	150000	{"exp":"6600*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":104,"ItemCount":"6"},{"ItemID":102,"ItemCount":"2"}]}
-8	14	0	8	0	{"exp":"4000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":105,"ItemCount":"2"}]}	50000	{"exp":"2200*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":105,"ItemCount":"1"}]}
-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"},{"ItemID":26,"ItemCount":"33000"}]}	167000	{"exp":"39600*reExp", "item":[{"ItemID":24,"ItemCount":"100"},{"ItemID":26,"ItemCount":"18150"}]}
-11	11	0	25	50	{"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":29,"ItemCount":"max(min(1,max((extraData-2),1)),0)*634828+max(min(2,max((extraData-2),1))-1,0)*665472+max(min(3,max((extraData-2),1))-2,0)*814080+max(min(4,max((extraData-2),1))-3,0)*935424+max(min(5,max((extraData-2),1))-4,0)*1123776+max(min(6,max((extraData-2),1))-5,0)*1332864+max(min(7,max((extraData-2),1))-6,0)*1562688+max(min(8,max((extraData-2),1))-7,0)*1812672"},{"ItemID":141,"ItemCount":"max(min(1,max((extraData-2),1)),0)*24+max(min(2,max((extraData-2),1))-1,0)*20+max(min(3,max((extraData-2),1))-2,0)*7"},{"ItemID":142,"ItemCount":"max(min(2,max((extraData-2),1))-1,0)*3+max(min(3,max((extraData-2),1))-2,0)*9+max(min(4,max((extraData-2),1))-3,0)*12+max(min(5,max((extraData-2),1))-4,0)*4"},{"ItemID":143,"ItemCount":"max(min(3,max((extraData-2),1))-2,0)*2+max(min(4,max((extraData-2),1))-3,0)*4+max(min(5,max((extraData-2),1))-4,0)*8+max(min(6,max((extraData-2),1))-5,0)*9"},{"ItemID":144,"ItemCount":"max(min(5,max((extraData-2),1))-4,0)*3+max(min(6,max((extraData-2),1))-5,0)*4+max(min(7,max((extraData-2),1))-6,0)*8"},{"ItemID":153,"ItemCount":"max(min(8,max((extraData-2),1))-7,0)*8"}]}	33000	{"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":29,"ItemCount":"max(min(1,max((extraData-2),1)),0)*436444+max(min(2,max((extraData-2),1))-1,0)*457512+max(min(3,max((extraData-2),1))-2,0)*559680+max(min(4,max((extraData-2),1))-3,0)*643104+max(min(5,max((extraData-2),1))-4,0)*772596+max(min(6,max((extraData-2),1))-5,0)*916344+max(min(7,max((extraData-2),1))-6,0)*1074348+max(min(8,max((extraData-2),1))-7,0)*1246212"},{"ItemID":141,"ItemCount":"max(min(1,max((extraData-2),1)),0)*17+max(min(2,max((extraData-2),1))-1,0)*13+max(min(3,max((extraData-2),1))-2,0)*4"},{"ItemID":142,"ItemCount":"max(min(2,max((extraData-2),1))-1,0)*2+max(min(3,max((extraData-2),1))-2,0)*6+max(min(4,max((extraData-2),1))-3,0)*8+max(min(5,max((extraData-2),1))-4,0)*3"},{"ItemID":143,"ItemCount":"max(min(3,max((extraData-2),1))-2,0)*1+max(min(4,max((extraData-2),1))-3,0)*2+max(min(5,max((extraData-2),1))-4,0)*5+max(min(6,max((extraData-2),1))-5,0)*6"},{"ItemID":144,"ItemCount":"max(min(5,max((extraData-2),1))-4,0)*2+max(min(6,max((extraData-2),1))-5,0)*3+max(min(7,max((extraData-2),1))-6,0)*5"},{"ItemID":153,"ItemCount":"max(min(8,max((extraData-2),1))-7,0)*5"}]}
-12	9	0	25	0	{"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":1021,"ItemCount":"1"},{"ItemID":1131,"ItemCount":"(3*max(min(3,dataEx)-2,0)+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(3,dataEx)-2,0)+2*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":"(3*max(min(3,dataEx)-2,0)+2*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":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+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":1135,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0)+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":1136,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,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":"(2*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)+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)+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(4,dataEx)-3,0)+max(min(5,dataEx)-4,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(4,dataEx)-3,0)+max(min(5,dataEx)-4,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(4,dataEx)-3,0)+max(min(5,dataEx)-4,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":"12"}], "money":"500000"}	200000	{"exp":"1650*reExp", "item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":2211,"ItemCount":"8"}]}
+1	0	0	5	0	{"exp":"tjgExp"}	0	{"exp":"tjgExp*80/100"}
+2	1	0	2	0	{"exp":"1080*reExp", "item":[{"ItemID":24,"ItemCount":"2"}], "money":"100000"}	0	{"exp":"864*reExp","item":[{"ItemID":24,"ItemCount":"2"}],"money":"55000"}
+3	2	0	20	40	{"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":5303,"ItemCount":"40"}]}	0	{"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":"16000"}]}	0	{"exp":"14400*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":26,"ItemCount":"8800"}]}
+5	5	0	15	30	{"exp":"1800*reExp", "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"}]}	0	{"exp":"1440*reExp", "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"}]}	0	{"exp":"17280*reExp", "item":[{"ItemID":24,"ItemCount":"30"}]}
+7	10	0	25	0	{"exp":"12000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":105,"ItemCount":"2"},{"ItemID":102,"ItemCount":"4"}]}	0	{"exp":"9600*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":104,"ItemCount":"6"},{"ItemID":102,"ItemCount":"2"}]}
+8	14	0	8	0	{"exp":"4000*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":105,"ItemCount":"2"}]}	0	{"exp":"3200*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":105,"ItemCount":"1"}]}
+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"}]}	0	{"exp":"9600*reExp", "item":[{"ItemID":24,"ItemCount":"30"},{"ItemID":181,"ItemCount":"4"},{"ItemID":102,"ItemCount":"4"}]}
+10	7	0	50	0	{"exp":"120000*reExp", "item":[{"ItemID":24,"ItemCount":"100"},{"ItemID":26,"ItemCount":"33000"}]}	0	{"exp":"96000*reExp", "item":[{"ItemID":24,"ItemCount":"100"},{"ItemID":26,"ItemCount":"18150"}]}
+11	11	0	25	50	{"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":29,"ItemCount":"max(min(1,max((extraData-2),1)),0)*634828+max(min(2,max((extraData-2),1))-1,0)*665472+max(min(3,max((extraData-2),1))-2,0)*814080+max(min(4,max((extraData-2),1))-3,0)*935424+max(min(5,max((extraData-2),1))-4,0)*1123776+max(min(6,max((extraData-2),1))-5,0)*1332864+max(min(7,max((extraData-2),1))-6,0)*1562688+max(min(8,max((extraData-2),1))-7,0)*1812672"},{"ItemID":141,"ItemCount":"max(min(1,max((extraData-2),1)),0)*24+max(min(2,max((extraData-2),1))-1,0)*20+max(min(3,max((extraData-2),1))-2,0)*7"},{"ItemID":142,"ItemCount":"max(min(2,max((extraData-2),1))-1,0)*3+max(min(3,max((extraData-2),1))-2,0)*9+max(min(4,max((extraData-2),1))-3,0)*12+max(min(5,max((extraData-2),1))-4,0)*4"},{"ItemID":143,"ItemCount":"max(min(3,max((extraData-2),1))-2,0)*2+max(min(4,max((extraData-2),1))-3,0)*4+max(min(5,max((extraData-2),1))-4,0)*8+max(min(6,max((extraData-2),1))-5,0)*9"},{"ItemID":144,"ItemCount":"max(min(5,max((extraData-2),1))-4,0)*3+max(min(6,max((extraData-2),1))-5,0)*4+max(min(7,max((extraData-2),1))-6,0)*8"},{"ItemID":153,"ItemCount":"max(min(8,max((extraData-2),1))-7,0)*8"}]}	0	{"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":29,"ItemCount":"max(min(1,max((extraData-2),1)),0)*436444+max(min(2,max((extraData-2),1))-1,0)*457512+max(min(3,max((extraData-2),1))-2,0)*559680+max(min(4,max((extraData-2),1))-3,0)*643104+max(min(5,max((extraData-2),1))-4,0)*772596+max(min(6,max((extraData-2),1))-5,0)*916344+max(min(7,max((extraData-2),1))-6,0)*1074348+max(min(8,max((extraData-2),1))-7,0)*1246212"},{"ItemID":141,"ItemCount":"max(min(1,max((extraData-2),1)),0)*17+max(min(2,max((extraData-2),1))-1,0)*13+max(min(3,max((extraData-2),1))-2,0)*4"},{"ItemID":142,"ItemCount":"max(min(2,max((extraData-2),1))-1,0)*2+max(min(3,max((extraData-2),1))-2,0)*6+max(min(4,max((extraData-2),1))-3,0)*8+max(min(5,max((extraData-2),1))-4,0)*3"},{"ItemID":143,"ItemCount":"max(min(3,max((extraData-2),1))-2,0)*1+max(min(4,max((extraData-2),1))-3,0)*2+max(min(5,max((extraData-2),1))-4,0)*5+max(min(6,max((extraData-2),1))-5,0)*6"},{"ItemID":144,"ItemCount":"max(min(5,max((extraData-2),1))-4,0)*2+max(min(6,max((extraData-2),1))-5,0)*3+max(min(7,max((extraData-2),1))-6,0)*5"},{"ItemID":153,"ItemCount":"max(min(8,max((extraData-2),1))-7,0)*5"}]}
+12	9	0	25	0	{"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":1021,"ItemCount":"1"},{"ItemID":1131,"ItemCount":"(3*max(min(3,dataEx)-2,0)+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(3,dataEx)-2,0)+2*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":"(3*max(min(3,dataEx)-2,0)+2*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":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+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":1135,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0)+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":1136,"ItemCount":"(2*max(min(1,dataEx),0)+max(min(2,dataEx)-1,0)+max(min(3,dataEx)-2,0)+max(min(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"}]}	0	{"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":1020,"ItemCount":"1"},{"ItemID":1131,"ItemCount":"(2*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)+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)+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(4,dataEx)-3,0)+max(min(5,dataEx)-4,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(4,dataEx)-3,0)+max(min(5,dataEx)-4,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(4,dataEx)-3,0)+max(min(5,dataEx)-4,0))*(max(min(3,extraData)-2,0)-max(min(4,extraData)-3,0))"}]}
+13	12	0	20	0	{"exp":"1800*reExp", "item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":2211,"ItemCount":"12"}], "money":"500000"}	0	{"exp":"1440*reExp", "item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":2211,"ItemCount":"8"}]}
diff --git a/db/PyMongoDataServer/SysDB/tagChinItem.txt b/db/PyMongoDataServer/SysDB/tagChinItem.txt
index 878923e..eca4134 100644
--- a/db/PyMongoDataServer/SysDB/tagChinItem.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinItem.txt
@@ -516,7 +516,7 @@
 2395	1	0	烟花	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	60	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
 2396	1	0	庆典礼包	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	280	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
 2397	1	0	神兽橙装宝箱	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	150	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
-2398	1	0	联赛4阶红2宝箱	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	368	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
+2398	1	0	联赛4阶2星宝箱	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	368	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
 2399	1	0	联赛5阶2星宝箱	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	368	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
 2400	1	0	联赛6阶2星宝箱	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	418	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
 2401	1	0	联赛7阶2星宝箱	81	0	0	0	0	999	1	1	1	0	1	0	0	1	0	0	1	468	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

--
Gitblit v1.8.0