From 90656534ba30d687e5698590e786deb2ead5a8d2 Mon Sep 17 00:00:00 2001
From: cehua-TT <448191260@qq.com>
Date: 星期五, 21 九月 2018 20:45:59 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagLVAward.txt                                 |    6 +++---
 db/PyMongoDataServer/PySysDB/tagResourcesBack.txt                           |    2 +-
 db/PyMongoDataServer/PySysDB/tagTreasureSkill.txt                           |   12 ++++++------
 db/PyMongoDataServer/PySysDB/tagFBLine.txt                                  |   16 ++++++++--------
 CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc |    0 
 db/PyMongoDataServer/PySysDB/tagFuncConfig.txt                              |    6 +++---
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc
index f2fab52..6cef8c7 100644
--- a/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc
+++ b/CoreServerGroup/GameServer/Script/GameWorldLogic/GameWorldActionControl.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagFBLine.txt b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
index d094e87..2220283 100644
--- a/db/PyMongoDataServer/PySysDB/tagFBLine.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFBLine.txt
@@ -47,14 +47,14 @@
 31220	0	31220	110	0	0	0	0	0	0	0	0	[12,23]				
 31230	0	31230	0	0	0	0	0	0	0	0	0	[12,6]	[900,[30,20,10,9,8,7,6,5,4,3,2,1]]			
 31240	0	31240	0	0	0	4010	2	80	0	0	0	[32,16]	[5,1800,15,101]			
-51010	0	51010	155	500	0	0	0	0	0	0	0	[24,20,3]	[10,600,10]	[{5101011:1},{5101012:1},{5101013:1},{5101014:1}]	[135,33,33,33,33]	[793536, [141,30]]
-51010	1	51010	155	500	0	0	0	0	0	0	0	[70,19,3]	[10,600,10]	[{5101021:1},{5101022:1},{5101023:1},{5101024:1}]	[135,33,33,33,33]	[831840, [141,36], [142,9]]
-51010	2	51010	155	500	0	0	0	0	0	0	0	[126,9,3]	[10,600,10]	[{5101031:1, 5101032:1}]	[150,38,38,38,38]	[1017600, [141,9], [142,18], [143,3]]
-51010	3	51010	155	500	0	0	0	0	0	0	0	[30,62,3]	[10,600,10]	[{5101041:0, 5101042:1}]	[150,38,38,38,38]	[1169280, [142,36], [143,9]]
-51010	4	51010	155	500	0	0	0	0	0	0	0	[84,63,3]	[10,600,10]	[{5101051:1, 5101052:0}]	[150,38,38,38,38]	[1404720, [142,9], [143,18], [144,3]]
-51010	5	51010	155	500	0	0	0	0	0	0	0	[137,73,3]	[10,600,10]	[{5101061:0,5101063:0, 5101064:0, 5101065:0,  5101062:1}]	[150,38,38,38,38]	[1666080, [143,36], [144,9]]
-51010	6	51010	155	500	0	0	0	0	0	0	0	[14,114,3]	[10,600,10]	[{5101071:1, 5101072:0}]	[150,38,38,38,38]	[1953360, [144,45]]
-51010	7	51010	155	500	0	0	0	0	0	0	0	[71,111,3]	[10,600,10]	[{5101081:1}]	[150,38,38,38,38]	[2265840, [153,30]]
+51010	0	51010	155	500	0	0	0	0	0	0	0	[24,20,3]	[10,360,10]	[{5101011:1},{5101012:1},{5101013:1},{5101014:1}]	[135,33,33,33,33]	[793536, [141,30]]
+51010	1	51010	155	500	0	0	0	0	0	0	0	[70,19,3]	[10,360,10]	[{5101021:1},{5101022:1},{5101023:1},{5101024:1}]	[135,33,33,33,33]	[831840, [141,36], [142,9]]
+51010	2	51010	155	500	0	0	0	0	0	0	0	[126,9,3]	[10,360,10]	[{5101031:1, 5101032:1}]	[150,38,38,38,38]	[1017600, [141,9], [142,18], [143,3]]
+51010	3	51010	155	500	0	0	0	0	0	0	0	[30,62,3]	[10,360,10]	[{5101041:0, 5101042:1}]	[150,38,38,38,38]	[1169280, [142,36], [143,9]]
+51010	4	51010	155	500	0	0	0	0	0	0	0	[84,63,3]	[10,360,10]	[{5101051:1, 5101052:0}]	[150,38,38,38,38]	[1404720, [142,9], [143,18], [144,3]]
+51010	5	51010	155	500	0	0	0	0	0	0	0	[137,73,3]	[10,360,10]	[{5101061:0,5101063:0, 5101064:0, 5101065:0,  5101062:1}]	[150,38,38,38,38]	[1666080, [143,36], [144,9]]
+51010	6	51010	155	500	0	0	0	0	0	0	0	[14,114,3]	[10,360,10]	[{5101071:1, 5101072:0}]	[150,38,38,38,38]	[1953360, [144,45]]
+51010	7	51010	155	500	0	0	0	0	0	0	0	[71,111,3]	[10,360,10]	[{5101081:1}]	[150,38,38,38,38]	[2265840, [153,30]]
 60010	0	60010	105	500	0	0	0	0	0	0	0	[83,13]	[10,1800,50,10]	[[[(30601001,8)],[(30601002,12)],[(30603001,1)]], [101,102,103,104,105]]		{1:[[1131,1,1]],2:[[1131,2,1]],3:[[1131,3,1]],4:[[1131,4,1]],5:[[1131,5,1]]}
 60010	1	60010	150	500	0	0	0	0	0	0	0	[208,24]	[10,1800,50,10]	[[[(30601003,8)],[(30601004,10)],[(30601005,2)],[(30603002,1)]], [106,107,108,109,110]]		{1:[[1132,1,1]],2:[[1132,2,1]],3:[[1132,3,1]],4:[[1132,4,1]],5:[[1132,5,2]]}
 60010	2	60010	200	500	0	0	0	0	0	0	0	[317,21]	[10,1800,50,10]	[[[(30601006,8)],[(30601007,12)],[(30601008,2)],[(30603003,1)]], [111,112,113,114,115]]		{1:[[1133,1,1]],2:[[1133,2,1]],3:[[1133,3,1]],4:[[1133,4,1]],5:[[1133,5,2]]}
diff --git a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
index c6ed3fa..bdaac8a 100644
--- a/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
+++ b/db/PyMongoDataServer/PySysDB/tagFuncConfig.txt
@@ -247,7 +247,7 @@
 ItemTimeOut	{"4101":[4101,380,688],"4102":[4102,288,0],"4105":[4101,380,688]}				
 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|6_50	8351
+DogzAssist	3|6	5409	2|3|5	1_10|2_20|3_30|4_40|5_50|6_50	8352
 DogzFBRefreshCfg	{(101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150):[20302001,1,'30',30,30,30], (151,152,153,154,155,156,157,158,159,160):[20302002,1,'40',6,6,6], (161,162,163,164,165,166,167):[20302003,6,'30',42,42,42]}	20303001	[20302001, 20302003]		
 DogzFBCollect	{20302001:1,20302002:1}	{20302001:1,20302002:1}			
 XMZZBetCfg	{}				
@@ -266,9 +266,9 @@
 GoldInvestLVLimit	300				
 OfflinePostItem	181|4151|4002|4003|4008|4009|4005|4006|951|956|4501|4502				
 TreasureSet	{0:10,1:10}	{2330:[4313,4318,4333,4393,4383,4363,4353,4348,4358,4388,4378,4373],2331:[4314,4319,4334,4394,4384,4364,4354,4349,4359,4389,4379,4374],2332:[4315,4320,4335,4395,4385,4365,4355,4350,4360,4390,4380,4375]}			
-TreasureSet11	[1, 10]	[248, 1984]	[[982,1], [982, 8]]	[0, 0]	[10, 100]
+TreasureSet11	[1, 10]	[248, 1984]	[[982,1], [982, 10]]	[0, 0]	[10, 100]
 TreasureSet21	max(baseRate,int(min(curLuck,30)*2+min(max(curLuck-30,0),10)*4+min(max(curLuck-40,0),20)*10))	[1, 10]	1000		
-TreasureSet12	[1, 10]	[98, 784]	[[983,1], [983, 8]]	[1440, 0]	[5, 50]
+TreasureSet12	[1, 10]	[98, 784]	[[983,1], [983, 10]]	[1440, 0]	[5, 50]
 TreasureSet22	min(500,int(baseRate+curLuck/3000.0*(100-baseRate)*max(1,curLuck/100.0)))	[1, 10]	1000		
 OpenServerRedPacketType	5				
 OSRAllMoneySys	[100,300,500,800,1000,1200,1500,1800]				
diff --git a/db/PyMongoDataServer/PySysDB/tagLVAward.txt b/db/PyMongoDataServer/PySysDB/tagLVAward.txt
index 899149c..a496403 100644
--- a/db/PyMongoDataServer/PySysDB/tagLVAward.txt
+++ b/db/PyMongoDataServer/PySysDB/tagLVAward.txt
@@ -2,10 +2,10 @@
 1	60	0	{"1":[[922,1],[4151,2],[911,1],[2,1]],"2":[[922,1],[4151,2],[911,1],[2,1]],"3":[[922,1],[4151,2],[911,1],[2,1]]}	2	[[4151,10]]
 2	80	0	{"1":[[3511,1],[1500,1],[2,1],[2107,1]],"2":[[3511,1],[1500,1],[2,1],[2107,1]],"3":[[3511,1],[1500,1],[2,1],[2107,1]]}	2	[[181,10]]
 3	100	0	{"1":[[4151,5],[1502,1],[4001,1],[2107,1]],"2":[[4151,5],[1502,1],[4001,1],[2107,1]],"3":[[4151,5],[1502,1],[4001,1],[2107,1]]}	2	[[194,1]]
-4	120	0	{"1":[[105,2],[102,5],[2107,3],[911,1]],"2":[[105,2],[102,5],[2107,3],[911,1]],"3":[[105,2],[102,5],[2107,3],[911,1]]}	2	[[1001,1]]
-5	150	0	{"1":[[1501,1],[3,1],[30,100],[923,1]],"2":[[1501,1],[3,1],[30,100],[923,1]],"3":[[1501,1],[3,1],[30,100],[923,1]]}	3	[[5,1]]
+4	120	0	{"1":[[105,2],[102,5],[141,10],[911,1]],"2":[[105,2],[102,5],[141,10],[911,1]],"3":[[105,2],[102,5],[141,10],[911,1]]}	2	[[1001,1]]
+5	150	0	{"1":[[1501,1],[142,20],[151,1],[30,100]],"2":[[1501,1],[142,20],[151,1],[30,100]],"3":[[1501,1],[142,20],[151,1],[30,100]]}	3	[[5,1]]
 6	180	0	{"1":[[3801,1],[181,5],[4151,5],[911,1]],"2":[[3801,1],[181,5],[4151,5],[911,1]],"3":[[3801,1],[181,5],[4151,5],[911,1]]}	3	[[199,1]]
 7	200	0	{"1":[[2241,1],[3503,1],[912,1],[181,10]],"2":[[2241,1],[3503,1],[912,1],[181,10]],"3":[[2241,1],[3503,1],[912,1],[181,10]]}	4	[[1002,1]]
-8	220	0	{"1":[[193,1],[3504,1],[923,1],[3,1]],"2":[[193,1],[3504,1],[923,1],[3,1]],"3":[[193,1],[3504,1],[923,1],[3,1]]}	4	[[142,50]]
+8	220	0	{"1":[[193,1],[3504,1],[923,1],[3,1]],"2":[[193,1],[3504,1],[923,1],[3,1]],"3":[[193,1],[3504,1],[923,1],[3,1]]}	4	[[144,80]]
 9	250	0	{"1":[[195,1],[5303,50],[3514,1],[4,1]],"2":[[195,1],[5303,50],[3514,1],[4,1]],"3":[[195,1],[5303,50],[3514,1],[4,1]]}	5	[[4606,1]]
 10	300	0	{"1":[[196,1],[3515,1],[143,30],[5,1]],"2":[[196,1],[3515,1],[143,30],[5,1]],"3":[[196,1],[3515,1],[143,30],[5,1]]}	5	[[3802,1]]
diff --git a/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt b/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
index f886904..fc7e21d 100644
--- a/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
+++ b/db/PyMongoDataServer/PySysDB/tagResourcesBack.txt
@@ -9,6 +9,6 @@
 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,extraData),0)*+max(min(2,extraData)-1,0)*1269657+max(min(3,extraData)-2,0)*2600601+max(min(4,extraData)-3,0)*4228761+max(min(5,extraData)-4,0)*6099609+max(min(6,extraData)-5,0)*8347161+max(min(7,extraData)-6,0)*11012889+max(min(8,extraData)-7,0)*14138265"},{"ItemID":141,"ItemCount":"max(min(1,extraData),0)*24+max(min(2,extraData)-1,0)*28+max(min(3,extraData)-2,0)*7"},{"ItemID":142,"ItemCount":"max(min(2,extraData),0)*7+max(min(3,extraData)-2,0)*14+max(min(4,extraData)-3,0)*28+max(min(5,extraData)-4,0)*7"},{"ItemID":143,"ItemCount":"max(min(3,extraData),0)*2+max(min(4,extraData)-2,0)*7+max(min(5,extraData)-3,0)*14+max(min(6,extraData)-4,0)*28"},{"ItemID":144,"ItemCount":"max(min(5,extraData),0)*2+max(min(6,extraData)-1,0)*7+max(min(7,extraData)-2,0)*36"},{"ItemID":153,"ItemCount":"max(min(8,extraData)-7,0)*24"}]}	33000	{"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":29,"ItemCount":"max(min(1,extraData),0)*+max(min(2,extraData)-1,0)*1269657+max(min(3,extraData)-2,0)*2600601+max(min(4,extraData)-3,0)*4228761+max(min(5,extraData)-4,0)*6099609+max(min(6,extraData)-5,0)*8347161+max(min(7,extraData)-6,0)*11012889+max(min(8,extraData)-7,0)*14138265"},{"ItemID":141,"ItemCount":"max(min(1,extraData),0)*16+max(min(2,extraData)-1,0)*19+max(min(3,extraData)-2,0)*4"},{"ItemID":142,"ItemCount":"max(min(2,extraData),0)*4+max(min(3,extraData)-2,0)*9+max(min(4,extraData)-3,0)*19+max(min(5,extraData)-4,0)*4"},{"ItemID":143,"ItemCount":"max(min(3,extraData),0)*1+max(min(4,extraData)-2,0)*4+max(min(5,extraData)-3,0)*9+max(min(6,extraData)-4,0)*19"},{"ItemID":144,"ItemCount":"max(min(5,extraData),0)*1+max(min(6,extraData)-1,0)*4+max(min(7,extraData)-2,0)*24"},{"ItemID":153,"ItemCount":"max(min(8,extraData)-7,0)*16"}]}
+11	11	0	25	50	{"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":29,"ItemCount":"max(min(1,extraData),0)*+max(min(2,extraData)-1,0)*634828+max(min(3,extraData)-2,0)*665472+max(min(4,extraData)-3,0)*814080+max(min(5,extraData)-4,0)*935424+max(min(6,extraData)-5,0)*1123776+max(min(7,extraData)-6,0)*1332864+max(min(8,extraData)-7,0)*1562688"},{"ItemID":141,"ItemCount":"max(min(1,extraData),0)*24+max(min(2,extraData)-1,0)*28+max(min(3,extraData)-2,0)*7"},{"ItemID":142,"ItemCount":"max(min(2,extraData),0)*7+max(min(3,extraData)-2,0)*14+max(min(4,extraData)-3,0)*28+max(min(5,extraData)-4,0)*7"},{"ItemID":143,"ItemCount":"max(min(3,extraData),0)*2+max(min(4,extraData)-2,0)*7+max(min(5,extraData)-3,0)*14+max(min(6,extraData)-4,0)*28"},{"ItemID":144,"ItemCount":"max(min(5,extraData),0)*2+max(min(6,extraData)-1,0)*7+max(min(7,extraData)-2,0)*36"},{"ItemID":153,"ItemCount":"max(min(8,extraData)-7,0)*24"}]}	33000	{"item":[{"ItemID":24,"ItemCount":"20"},{"ItemID":29,"ItemCount":"max(min(1,extraData),0)*+max(min(2,extraData)-1,0)*634828+max(min(3,extraData)-2,0)*665472+max(min(4,extraData)-3,0)*814080+max(min(5,extraData)-4,0)*935424+max(min(6,extraData)-5,0)*1123776+max(min(7,extraData)-6,0)*1332864+max(min(8,extraData)-7,0)*1562688"},{"ItemID":141,"ItemCount":"max(min(1,extraData),0)*16+max(min(2,extraData)-1,0)*19+max(min(3,extraData)-2,0)*4"},{"ItemID":142,"ItemCount":"max(min(2,extraData),0)*4+max(min(3,extraData)-2,0)*9+max(min(4,extraData)-3,0)*19+max(min(5,extraData)-4,0)*4"},{"ItemID":143,"ItemCount":"max(min(3,extraData),0)*1+max(min(4,extraData)-2,0)*4+max(min(5,extraData)-3,0)*9+max(min(6,extraData)-4,0)*19"},{"ItemID":144,"ItemCount":"max(min(5,extraData),0)*1+max(min(6,extraData)-1,0)*4+max(min(7,extraData)-2,0)*24"},{"ItemID":153,"ItemCount":"max(min(8,extraData)-7,0)*16"}]}
 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)+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(4,dataEx)-3,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(4,dataEx)-3,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(4,dataEx)-3,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(4,dataEx)-3,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(4,dataEx)-3,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(4,dataEx)-3,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/tagTreasureSkill.txt b/db/PyMongoDataServer/PySysDB/tagTreasureSkill.txt
index a63b53a..426c9f4 100644
--- a/db/PyMongoDataServer/PySysDB/tagTreasureSkill.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTreasureSkill.txt
@@ -18,17 +18,17 @@
 1	17	1575753	0	143|144|153	16|16|16	8000|8000|8000
 1	18	1829907	0	143|144|153	20|20|20	8000|8000|8000
 1	19	2084060	0	143|144|153	23|23|23	8000|8000|8000
-1	20	2719445	0	144|153	24|24|24	8000|8000
+1	20	2719445	0	144|153	24|24	8000|8000
 1	21	3354829	0	144|153	30|30	8000|8000
 1	22	3990213	0	144|153	36|36	8000|8000
 1	23	4625597	0	144|153	42|42	8000|8000
 1	24	5260982	0	144|153	48|48	8000|8000
 1	25	5896366	0	144|153	61|61	8000|8000
-2	1	51329	0	142|143|144|153	2|2|2	8000|8000|8000|8000
-2	2	102657	0	142|143|144|153	3|3|3	8000|8000|8000|8000
-2	3	153986	0	142|143|144|153	5|5|5	8000|8000|8000|8000
-2	4	205314	0	142|143|144|153	6|6|6	8000|8000|8000|8000
-2	5	256643	0	142|143|144|153	7|7|7	8000|8000|8000|8000
+2	1	51329	0	142|143|144|153	2|2|2|2	8000|8000|8000|8000
+2	2	102657	0	142|143|144|153	3|3|3|3	8000|8000|8000|8000
+2	3	153986	0	142|143|144|153	5|5|5|5	8000|8000|8000|8000
+2	4	205314	0	142|143|144|153	6|6|6|6	8000|8000|8000|8000
+2	5	256643	0	142|143|144|153	7|7|7|7	8000|8000|8000|8000
 2	6	427738	0	143|144|153	7|7|7	8000|8000|8000
 2	7	598833	0	143|144|153	10|10|10	8000|8000|8000
 2	8	769928	0	143|144|153	13|13|13	8000|8000|8000

--
Gitblit v1.8.0