From 26a6b88c278a53933388a710e7470b452e6bb8df Mon Sep 17 00:00:00 2001
From: cehua_hzl <648597270@qq.com>
Date: 星期四, 23 八月 2018 21:51:03 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt                                          |  289 ++++++++++++++++++++++-------------------
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc                     |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc                        |    0 
 db/PyMongoDataServer/PySysDB/tagTreasureSkill.txt                                          |  118 ++++++++--------
 db/PyMongoDataServer/PySysDB/tagRealm.txt                                                  |    2 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAttrFruit.pyc          |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AICommon.pyc              |    0 
 CoreServerGroup/GameServer/Script/ShareDefine.pyc                                          |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip                              |    0 
 10 files changed, 215 insertions(+), 194 deletions(-)

diff --git a/CoreServerGroup/GameServer/Script/ShareDefine.pyc b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
index f996d1e..12f9125 100644
--- a/CoreServerGroup/GameServer/Script/ShareDefine.pyc
+++ b/CoreServerGroup/GameServer/Script/ShareDefine.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
index 102e645..8684dc7 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/QUESTDATA.zip
Binary files differ
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 ac9403e..51f3177 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 4464482..b124259 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/NPC/NPCAI/AICommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AICommon.pyc
index 690fa9b..8a783a2 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AICommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCAI/AICommon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAttrFruit.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAttrFruit.pyc
index ffb74f2..198c81b 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAttrFruit.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerAttrFruit.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
index 194ba2a..abca724 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ShareDefine.pyc
Binary files differ
diff --git a/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt b/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt
index 9344f22..091825c 100644
--- a/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt
+++ b/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt
@@ -1,134 +1,155 @@
-MapID	NPCID	LowLV	HighestLV	Defense
-10010	10101001	2	6	6
-10010	10101002	4	8	6
-10010	10101003	6	10	15
-10010	10101004	8	12	31
-10010	10101005	10	15	31
-10010	10102001	13	18	33
-10010	10103001	0	0	0
-10020	10201001	15	20	66
-10020	10201002	18	22	67
-10020	10201003	21	24	73
-10020	10201004	24	27	85
-10020	10201005	27	30	87
-10020	10202001	30	32	99
-10020	10203001	0	0	0
-10030	10301001	32	41	117
-10030	10301002	38	44	122
-10030	10301003	41	47	125
-10030	10301004	44	50	128
-10030	10301005	47	52	129
-10030	10302001	50	55	142
-10030	10303001	0	0	0
-10040	10401001	55	70	269
-10040	10401002	70	90	311
-10040	10401003	80	100	356
-10040	10401004	90	110	410
-10040	10401005	100	120	488
-10040	10402001	110	130	587
-10040	10403001	0	0	0
-10050	10501001	120	140	681
-10050	10501002	130	150	799
-10050	10501003	140	160	886
-10050	10501004	150	170	974
-10050	10501005	160	180	1080
-10050	10502001	170	190	1176
-10050	10503001	0	0	0
-10060	10601001	180	200	1313
-10060	10601002	190	210	1503
-10060	10601003	200	220	1660
-10060	10601004	210	230	1839
-10060	10601005	220	240	2080
-10060	10602001	230	250	2330
-10060	10603001	0	0	0
-10070	10701001	240	260	2696
-10070	10701002	250	270	3038
-10070	10701003	260	280	3388
-10070	10701004	270	290	3904
-10070	10701005	280	300	4455
-10070	10702001	290	310	5324
-10070	10703001	0	0	0
-10080	10801001	300	320	5740
-10080	10801002	310	330	6177
-10080	10801003	320	340	6697
-10080	10801004	330	350	8223
-10080	10801005	340	360	12124
-10080	10802001	340	360	14548
-10080	10803001	0	0	0
-10090	10901001	300	320	13922
-10090	10901002	310	330	17009
-10090	10901003	320	340	18869
-10090	10901004	330	350	20697
-10090	10901005	340	360	23406
-10090	10902001	340	360	28087
-10090	10903001	0	0	0
-10110	11101001	300	320	13922
-10110	11101002	310	330	17009
-10110	11101003	320	340	18869
-10110	11101004	330	350	20697
-10110	11101005	340	360	23406
-10110	11102001	340	360	28087
-10110	11103001	0	0	0
-21070	20102001	110	130	767
-21070	20102002	120	140	867
-21070	20102003	160	180	1336
-21070	20102004	170	190	1507
-21070	20102005	220	240	2470
-21070	20102006	230	250	2797
-21070	20103001	0	0	0
-21070	20103002	0	0	0
-21070	20103003	0	0	0
-21070	20103004	0	0	0
-21070	20103005	0	0	0
-21070	20103006	0	0	0
-21070	20103007	0	0	0
-21100	20202001	230	250	2797
-21100	20202002	240	260	3447
-21100	20202003	280	300	4824
-21100	20202004	290	310	5805
-21100	20202005	330	350	7814
-21100	20202006	340	360	9667
-21100	20202007	380	400	17422
-21100	20203001	0	0	0
-21100	20203002	0	0	0
-21100	20203003	0	0	0
-21100	20203004	0	0	0
-21100	20203005	0	0	0
-21100	20203006	0	0	0
-21100	20203007	0	0	0
-21110	20302001	110	130	767
-21110	20302002	120	140	867
-21110	20302003	160	180	1336
-21110	20302004	170	190	1507
-21110	20302005	220	240	2470
-21110	20302006	230	250	2797
-21110	20303001	0	0	0
-21110	20303002	0	0	0
-21110	20303003	0	0	0
-21110	20303004	0	0	0
-21110	20303005	0	0	0
-21110	20303006	0	0	0
-21110	20303007	0	0	0
-31150	31501001	180	200	1059
-31150	31501002	210	230	1985
-31150	31501003	240	260	2343
-31150	31501004	270	290	3109
-31150	31501005	300	320	3954
-31150	31501006	320	340	5305
-31150	31501007	350	370	7444
-31150	31501008	390	410	9348
-31150	31501009	420	440	12550
-31020	30301001	190	210	1950
-31020	30303001	190	190	2005
-31020	30303002	200	200	2155
-31020	30303003	240	240	3168
-31020	30303004	250	250	3670
-31020	30303005	290	290	6763
-31020	30303006	300	300	7971
-31020	30303007	350	350	15442
-31030	30301002	230	250	2924
-31030	30303008	240	240	3266
-31030	30303009	250	250	3670
-31030	30303010	300	300	7971
-31030	30303011	350	350	15442
-31030	30303012	400	400	29763
+MapID	NPCID	LowLV	HighestLV	Defense
+10010	10101001	2	6	6
+10010	10101002	4	8	6
+10010	10101003	6	10	15
+10010	10101004	8	12	31
+10010	10101005	10	15	31
+10010	10102001	13	18	33
+10010	10103001	0	0	0
+10020	10201001	15	20	66
+10020	10201002	18	22	67
+10020	10201003	21	24	73
+10020	10201004	24	27	85
+10020	10201005	27	30	87
+10020	10202001	30	32	99
+10020	10203001	0	0	0
+10030	10301001	32	41	117
+10030	10301002	38	44	122
+10030	10301003	41	47	125
+10030	10301004	44	50	128
+10030	10301005	47	52	129
+10030	10302001	50	55	142
+10030	10303001	0	0	0
+10040	10401001	55	70	269
+10040	10401002	70	90	311
+10040	10401003	80	100	356
+10040	10401004	90	110	410
+10040	10401005	100	120	488
+10040	10402001	110	130	587
+10040	10403001	0	0	0
+10050	10501001	120	140	681
+10050	10501002	130	150	799
+10050	10501003	140	160	886
+10050	10501004	150	170	974
+10050	10501005	160	180	1080
+10050	10502001	170	190	1176
+10050	10503001	0	0	0
+10060	10601001	180	200	1313
+10060	10601002	190	210	1503
+10060	10601003	200	220	1660
+10060	10601004	210	230	1839
+10060	10601005	220	240	2080
+10060	10602001	230	250	2330
+10060	10603001	0	0	0
+10070	10701001	240	260	2696
+10070	10701002	250	270	3038
+10070	10701003	260	280	3388
+10070	10701004	270	290	3904
+10070	10701005	280	300	4455
+10070	10702001	290	310	5324
+10070	10703001	0	0	0
+10080	10801001	300	320	5740
+10080	10801002	310	330	6177
+10080	10801003	320	340	6697
+10080	10801004	330	350	8223
+10080	10801005	340	360	12124
+10080	10802001	340	360	14548
+10080	10803001	0	0	0
+10090	10901001	300	320	13922
+10090	10901002	310	330	17009
+10090	10901003	320	340	18869
+10090	10901004	330	350	20697
+10090	10901005	340	360	23406
+10090	10902001	340	360	28087
+10090	10903001	0	0	0
+10110	11101001	300	320	13922
+10110	11101002	310	330	17009
+10110	11101003	320	340	18869
+10110	11101004	330	350	20697
+10110	11101005	340	360	23406
+10110	11102001	340	360	28087
+10110	11103001	0	0	0
+21070	20102001	110	130	767
+21070	20102002	120	140	867
+21070	20102003	160	180	1336
+21070	20102004	170	190	1507
+21070	20102005	220	240	2470
+21070	20102006	230	250	2797
+21070	20103001	0	0	0
+21070	20103002	0	0	0
+21070	20103003	0	0	0
+21070	20103004	0	0	0
+21070	20103005	0	0	0
+21070	20103006	0	0	0
+21070	20103007	0	0	0
+21100	20202001	230	250	2797
+21100	20202002	240	260	3447
+21100	20202003	280	300	4824
+21100	20202004	290	310	5805
+21100	20202005	330	350	7814
+21100	20202006	340	360	9667
+21100	20202007	380	400	17422
+21100	20203001	0	0	0
+21100	20203002	0	0	0
+21100	20203003	0	0	0
+21100	20203004	0	0	0
+21100	20203005	0	0	0
+21100	20203006	0	0	0
+21100	20203007	0	0	0
+21110	20302001	110	130	767
+21110	20302002	120	140	867
+21110	20302003	160	180	1336
+21110	20302004	170	190	1507
+21110	20302005	220	240	2470
+21110	20302006	230	250	2797
+21110	20303001	0	0	0
+21110	20303002	0	0	0
+21110	20303003	0	0	0
+21110	20303004	0	0	0
+21110	20303005	0	0	0
+21110	20303006	0	0	0
+21110	20303007	0	0	0
+31150	31501001	180	200	1059
+31150	31501002	210	230	1985
+31150	31501003	240	260	2343
+31150	31501004	270	290	3109
+31150	31501005	300	320	3954
+31150	31501006	320	340	5305
+31150	31501007	350	370	7444
+31150	31501008	390	410	9348
+31150	31501009	420	440	12550
+31150	31503001	0	0	0
+31150	31503002	0	0	0
+31150	31503003	0	0	0
+31150	31503004	0	0	0
+31150	31503005	0	0	0
+31150	31503006	0	0	0
+31150	31503007	0	0	0
+31150	31503008	0	0	0
+31150	31503009	0	0	0
+31020	30301001	190	210	1950
+31020	30303001	190	190	2005
+31020	30303002	200	200	2155
+31020	30303003	240	240	3168
+31020	30303004	250	250	3670
+31020	30303005	290	290	6763
+31020	30303006	300	300	7971
+31020	30303007	350	350	15442
+31030	30301002	230	250	2924
+31030	30303008	240	240	3266
+31030	30303009	250	250	3670
+31030	30303010	300	300	7971
+31030	30303011	350	350	15442
+31030	30303012	400	400	29763
+31020	30303001	0	0	0
+31020	30303002	0	0	0
+31020	30303003	0	0	0
+31020	30303004	0	0	0
+31020	30303005	0	0	0
+31020	30303006	0	0	0
+31020	30303007	0	0	0
+31030	30303008	0	0	0
+31030	30303009	0	0	0
+31030	30303010	0	0	0
+31030	30303011	0	0	0
+31030	30303012	0	0	0
diff --git a/db/PyMongoDataServer/PySysDB/tagRealm.txt b/db/PyMongoDataServer/PySysDB/tagRealm.txt
index 25feac9..7ea1216 100644
--- a/db/PyMongoDataServer/PySysDB/tagRealm.txt
+++ b/db/PyMongoDataServer/PySysDB/tagRealm.txt
@@ -1,6 +1,6 @@
 Lv	IsBigRealm	NeedPoint	NeedGood	NeedNum	NeedActiveTreasure	AddAttrType	AddAttrNum	BossID	SitTime	TeamAward
 0	0	450	0	0	0	6|7	0|0	61103000	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
-1	0	580	0	0	0	6|7	4700|230	61103001	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
+1	0	540	0	0	0	6|7	4700|230	61103001	{"1":0,"2":0,"3":0,"4":0,"5":0}	0
 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
diff --git a/db/PyMongoDataServer/PySysDB/tagTreasureSkill.txt b/db/PyMongoDataServer/PySysDB/tagTreasureSkill.txt
index 2568511..49c726b 100644
--- a/db/PyMongoDataServer/PySysDB/tagTreasureSkill.txt
+++ b/db/PyMongoDataServer/PySysDB/tagTreasureSkill.txt
@@ -4,73 +4,73 @@
 1	3	99980	10000	141|142|143|144	0|0|0|0	10000|10000|10000|10000
 1	4	142911	1500	141|142|143|144	1|1|1|1	8000|8000|8000|8000
 1	5	158649	1500	141|142|143|144	2|2|2|2	8000|8000|8000|8000
-1	6	191896	1500	141|142|143|144	4|4|4|4	8000|8000|8000|8000
+1	6	191896	1500	141|142|143|144	3|3|3|3	8000|8000|8000|8000
 1	7	210569	1500	141|142|143|144	4|4|4|4	8000|8000|8000|8000
 1	8	249072	1500	141|142|143|144	5|5|5|5	8000|8000|8000|8000
-1	9	269795	1500	141|142|143|144	7|7|7|7	8000|8000|8000|8000
+1	9	269795	1500	141|142|143|144	6|6|6|6	8000|8000|8000|8000
 1	10	512473	1500	141|142|143|144	7|7|7|7	8000|8000|8000|8000
-1	11	583019	1500	141|142|143|144	9|9|9|9	8000|8000|8000|8000
-1	12	658325	1500	141|142|143|144	11|11|11|11	8000|8000|8000|8000
+1	11	583019	1500	141|142|143|144	8|8|8|8	8000|8000|8000|8000
+1	12	658325	1500	141|142|143|144	10|10|10|10	8000|8000|8000|8000
 1	13	828443	1500	141|142|143|144	11|11|11|11	8000|8000|8000|8000
-1	14	877109	1500	141|142|143|144	14|14|14|14	8000|8000|8000|8000
-1	15	977697	1500	141|142|143|144	16|16|16|16	8000|8000|8000|8000
-1	16	1591679	1000	141|142|143|144	15|15|15|15	1100|6000|6000|6000
-1	17	1732645	1000	141|142|143|144	17|17|17|17	1100|6000|6000|6000
-1	18	1879975	1000	141|142|143|144	19|19|19|19	1100|6000|6000|6000
-1	19	1950011	1000	141|142|143|144	20|20|20|20	1100|6000|6000|6000
-1	20	2300866	1000	141|142|143|144	23|23|23|23	1100|6000|6000|6000
-1	21	2000561	500	141|142|143|144	18|18|18|18	600|800|6000|6000
-1	22	2175469	500	141|142|143|144	19|19|19|19	600|800|6000|6000
-1	23	2258250	500	141|142|143|144	25|25|25|25	600|800|6000|6000
-1	24	2445834	500	141|142|143|144	26|26|26|26	600|800|6000|6000
-1	25	2888102	500	141|142|143|144	34|34|34|34	600|800|6000|6000
+1	14	877109	1500	141|142|143|144	13|13|13|13	8000|8000|8000|8000
+1	15	977697	1500	141|142|143|144	14|14|14|14	8000|8000|8000|8000
+1	16	1591679	1000	141|142|143|144	14|14|14|14	1100|6000|6000|6000
+1	17	1732645	1000	141|142|143|144	16|16|16|16	1100|6000|6000|6000
+1	18	1879975	1000	141|142|143|144	17|17|17|17	1100|6000|6000|6000
+1	19	1950011	1000	141|142|143|144	18|18|18|18	1100|6000|6000|6000
+1	20	2300866	1000	141|142|143|144	20|20|20|20	1100|6000|6000|6000
+1	21	2000561	500	141|142|143|144	21|21|21|21	600|800|6000|6000
+1	22	2175469	500	141|142|143|144	22|22|22|22	600|800|6000|6000
+1	23	2258250	500	141|142|143|144	24|24|24|24	600|800|6000|6000
+1	24	2445834	500	141|142|143|144	29|29|29|29	600|800|6000|6000
+1	25	2888102	500	141|142|143|144	30|30|30|30	600|800|6000|6000
 2	1	731188	1000	141|142|143|144	3|3|3|3	1100|8000|8000|8000
 2	2	912493	1000	141|142|143|144	4|4|4|4	1100|8000|8000|8000
-2	3	960592	1000	141|142|143|144	6|6|6|6	1100|8000|8000|8000
-2	4	1066466	1000	141|142|143|144	9|9|9|9	1100|8000|8000|8000
-2	5	1118527	1000	141|142|143|144	12|12|12|12	1100|8000|8000|8000
-2	6	1231684	1000	141|142|143|144	20|20|20|20	1100|8000|8000|8000
+2	3	960592	1000	141|142|143|144	5|5|5|5	1100|8000|8000|8000
+2	4	1066466	1000	141|142|143|144	8|8|8|8	1100|8000|8000|8000
+2	5	1118527	1000	141|142|143|144	11|11|11|11	1100|8000|8000|8000
+2	6	1231684	1000	141|142|143|144	18|18|18|18	1100|8000|8000|8000
 2	7	1287743	1000	141|142|143|144	23|23|23|23	1100|8000|8000|8000
-2	8	1558742	1000	141|142|143|144	28|28|28|28	1100|8000|8000|8000
+2	8	1558742	1000	141|142|143|144	26|26|26|26	1100|8000|8000|8000
 2	9	1995084	500	141|142|143|144	17|17|17|17	600|800|8000|8000
-2	10	2066440	500	141|142|143|144	21|21|21|21	600|800|8000|8000
-2	11	2420842	500	141|142|143|144	22|22|22|22	600|800|8000|8000
-2	12	2499064	500	141|142|143|144	35|35|35|35	600|800|8000|8000
-2	13	2691975	500	141|142|143|144	29|29|29|29	600|800|8000|8000
-2	14	2776143	500	141|142|143|144	38|38|38|38	600|800|8000|8000
-2	15	3258801	500	141|142|143|144	40|40|40|40	600|800|8000|8000
-2	16	4937953	300	141|142|143|144	14|14|14|14	400|600|800|6000
-2	17	5798862	300	141|142|143|144	17|17|17|17	400|600|800|6000
+2	10	2066440	500	141|142|143|144	20|20|20|20	600|800|8000|8000
+2	11	2420842	500	141|142|143|144	25|25|25|25	600|800|8000|8000
+2	12	2499064	500	141|142|143|144	28|28|28|28	600|800|8000|8000
+2	13	2691975	500	141|142|143|144	35|35|35|35	600|800|8000|8000
+2	14	2776143	500	141|142|143|144	37|37|37|37	600|800|8000|8000
+2	15	3258801	500	141|142|143|144	43|43|43|43	600|800|8000|8000
+2	16	4937953	300	141|142|143|144	13|13|13|13	400|600|800|6000
+2	17	5798862	300	141|142|143|144	15|15|15|15	400|600|800|6000
 2	18	6734879	300	141|142|143|144	21|21|21|21	400|600|800|6000
-2	19	7889366	300	141|142|143|144	24|24|24|24	400|600|800|6000
-2	20	8695163	300	141|142|143|144	24|24|24|24	400|600|800|6000
-2	21	9541900	300	141|142|143|144	28|28|28|28	400|600|800|6000
-2	22	10355743	300	141|142|143|144	31|31|31|31	400|600|800|6000
+2	19	7889366	300	141|142|143|144	22|22|22|22	400|600|800|6000
+2	20	8695163	300	141|142|143|144	25|25|25|25	400|600|800|6000
+2	21	9541900	300	141|142|143|144	26|26|26|26	400|600|800|6000
+2	22	10355743	300	141|142|143|144	28|28|28|28	400|600|800|6000
 2	23	11029496	300	141|142|143|144	34|34|34|34	400|600|800|6000
-2	24	11703248	300	141|142|143|144	39|39|39|39	400|600|800|6000
+2	24	11703248	300	141|142|143|144	36|36|36|36	400|600|800|6000
 2	25	12377001	300	141|142|143|144	43|43|43|43	400|600|800|6000
-3	1	840663	500	141|142|143|144	14|14|14|14	600|800|8000|8000
-3	2	902714	500	141|142|143|144	16|16|16|16	600|800|8000|8000
-3	3	1012188	500	141|142|143|144	21|21|21|21	600|800|8000|8000
-3	4	1078719	500	141|142|143|144	28|28|28|28	600|800|8000|8000
-3	5	1146159	500	141|142|143|144	30|30|30|30	600|800|8000|8000
-3	6	2303447	500	141|142|143|144	39|39|39|39	600|800|8000|8000
-3	7	2338531	500	141|142|143|144	42|42|42|42	600|800|8000|8000
-3	8	2703406	500	141|142|143|144	40|40|40|40	600|800|8000|8000
-3	9	3517383	300	141|142|143|144	17|17|17|17	400|600|800|8000
-3	10	4283005	300	141|142|143|144	20|20|20|20	400|600|800|8000
-3	11	4910626	300	141|142|143|144	24|24|24|24	400|600|800|8000
-3	12	5776034	300	141|142|143|144	27|27|27|27	400|600|800|8000
-3	13	6458234	300	141|142|143|144	33|33|33|33	400|600|800|8000
-3	14	7563019	300	141|142|143|144	36|36|36|36	400|600|800|8000
-3	15	8316268	300	141|142|143|144	34|34|34|34	400|600|800|8000
-3	16	9089116	300	141|142|143|144	43|43|43|43	400|600|800|6000
-3	17	9882849	300	141|142|143|144	49|49|49|49	400|600|800|6000
-3	18	10698799	300	141|142|143|144	52|52|52|52	400|600|800|6000
-3	19	11538341	300	141|142|143|144	51|51|51|51	400|600|800|6000
-3	20	12286910	300	141|142|143|144	66|66|66|66	400|600|800|6000
-3	21	12992746	300	141|142|143|144	75|75|75|75	400|600|800|6000
-3	22	13698581	300	141|142|143|144	70|70|70|70	400|600|800|6000
-3	23	14404417	300	141|142|143|144	84|84|84|84	400|600|800|6000
-3	24	15110253	300	141|142|143|144	89|89|89|89	400|600|800|6000
-3	25	15816089	300	141|142|143|144	92|92|92|92	400|600|800|6000
+3	1	840663	500	141|142|143|144	13|13|13|13	600|800|8000|8000
+3	2	902714	500	141|142|143|144	15|15|15|15	600|800|8000|8000
+3	3	1012188	500	141|142|143|144	20|20|20|20	600|800|8000|8000
+3	4	1078719	500	141|142|143|144	25|25|25|25	600|800|8000|8000
+3	5	1146159	500	141|142|143|144	31|31|31|31	600|800|8000|8000
+3	6	2303447	500	141|142|143|144	35|35|35|35	600|800|8000|8000
+3	7	2338531	500	141|142|143|144	40|40|40|40	600|800|8000|8000
+3	8	2703406	500	141|142|143|144	55|55|55|55	600|800|8000|8000
+3	9	3517383	300	141|142|143|144	15|15|15|15	400|600|800|8000
+3	10	4283005	300	141|142|143|144	18|18|18|18	400|600|800|8000
+3	11	4910626	300	141|142|143|144	21|21|21|21	400|600|800|8000
+3	12	5776034	300	141|142|143|144	28|28|28|28	400|600|800|8000
+3	13	6458234	300	141|142|143|144	31|31|31|31	400|600|800|8000
+3	14	7563019	300	141|142|143|144	33|33|33|33	400|600|800|8000
+3	15	8316268	300	141|142|143|144	36|36|36|36	400|600|800|8000
+3	16	9089116	300	141|142|143|144	40|40|40|40	400|600|800|6000
+3	17	9882849	300	141|142|143|144	45|45|45|45	400|600|800|6000
+3	18	10698799	300	141|142|143|144	48|48|48|48	400|600|800|6000
+3	19	11538341	300	141|142|143|144	53|53|53|53	400|600|800|6000
+3	20	12286910	300	141|142|143|144	61|61|61|61	400|600|800|6000
+3	21	12992746	300	141|142|143|144	69|69|69|69	400|600|800|6000
+3	22	13698581	300	141|142|143|144	73|73|73|73	400|600|800|6000
+3	23	14404417	300	141|142|143|144	78|78|78|78	400|600|800|6000
+3	24	15110253	300	141|142|143|144	82|82|82|82	400|600|800|6000
+3	25	15816089	300	141|142|143|144	97|97|97|97	400|600|800|6000

--
Gitblit v1.8.0