From 4fb6fee22bd066b00f51906df7daf5b6ea6e5208 Mon Sep 17 00:00:00 2001
From: cehua_hzl <648597270@qq.com>
Date: 星期一, 19 十一月 2018 11:25:19 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt                    |    6 ++
 db/PyMongoDataServer/SysDB/tagEffectRefresh.txt                      |   12 ++--
 CoreServerGroup/GameServer/PySysDB/tagChinMap.txt                    |    2 
 db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt                         |    4 +
 CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt                    |    5 +
 db/PyMongoDataServer/SysDB/tagNPCRefresh.txt                         |   92 ++++++++++++++++++------------
 ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerSetting.txt |    2 
 db/PyMongoDataServer/SysDB/tagChinNPC.txt                            |    5 +
 CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt                   |    4 +
 db/PyMongoDataServer/SysDB/tagBornRefresh.txt                        |    2 
 db/PyMongoDataServer/SysDB/tagChinMap.txt                            |    2 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/MapID.txt        |    2 
 12 files changed, 91 insertions(+), 47 deletions(-)

diff --git a/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt b/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt
index 3fae2f2..1b666a2 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagBOSSInfo.txt
@@ -40,6 +40,10 @@
 30303010	31030	4500	[1,500]	40	5	2028	100	BOSS之家二层
 30303011	31030	5400	[1,500]	40	5	2029	100	BOSS之家二层
 30303012	31030	6300	[1,500]	40	5	2030	100	BOSS之家二层
+30303013	31031	3600	[1,500]	40	5	2050	100	BOSS之家三层
+30303014	31031	4500	[1,500]	40	5	2051	100	BOSS之家三层
+30303015	31031	5400	[1,500]	40	5	2052	100	BOSS之家三层
+30303016	31031	6300	[1,500]	40	5	2053	100	BOSS之家三层
 31503001	31150	1350	[1,500]	40	5	2031	100	古神禁地
 31503002	31150	1700	[1,500]	40	5	2032	100	古神禁地
 31503003	31150	2150	[1,500]	40	5	2033	100	古神禁地
diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinMap.txt b/CoreServerGroup/GameServer/PySysDB/tagChinMap.txt
index 6d08357..d6df32a 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagChinMap.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagChinMap.txt
@@ -36,4 +36,4 @@
 31250	守护副本	1	0
 52010	封魔坛	8	0
 52020	封魔坛	1	0
-31330	BOSS之家三层	8	0
+31031	BOSS之家三层	8	0
diff --git a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
index 1273cc1..3019097 100644
--- a/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
+++ b/CoreServerGroup/GameServer/PySysDB/tagChinNPC.txt
@@ -494,6 +494,7 @@
 30203005	麒麟之魂	230
 30301001	精英护卫	200
 30301002	精英护卫	230
+30301003	精英护卫	1
 30303001	天枢	160
 30303002	天璇	180
 30303003	天玑	210
@@ -506,6 +507,10 @@
 30303010	潮汐巨兽	300
 30303011	极炎巨兽	350
 30303012	白泽	400
+30303013	极冰之心	1
+30303014	潮汐巨兽	1
+30303015	极炎巨兽	1
+30303016	白泽	1
 30403001	仙魔之争NPC	90
 30403002	仙魔守卫	90
 30403003	仙魔守卫	90
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/MapID.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/MapID.txt
index aff7b9c..083f212 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/MapID.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Map/MapID.txt
@@ -11,7 +11,7 @@
 Map101_Dtzz	31010	仙魔之争	31010	0	0	0	100	1
 Map102_Bzjyc	31020	boss之家一层	31020	0	0	0	1	1
 Map103_Bzjec	31030	boss之家二层	31030	0	0	0	1	1
-Map133_Bzjsc	31330	boss之家三层	31330	0	0	0	1	1
+Map133_Bzjsc	31031	boss之家三层	31031	0	0	0	1	1
 Map104_Ljzs	31040	日常副本	31040	0	0	0	100	1
 Map107_Shgm	21070	深海古墓	21070	0	0	0	25	1
 Map108_Xjmj	31080	仙界秘境	31080	0	0	0	100	1
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerSetting.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerSetting.txt
index 810e7e1..87192bb 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerSetting.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerSetting.txt
@@ -37,4 +37,4 @@
 Map130_Kzly_21110	127.0.0.1	19001	1	500	500	250	500	30	1000	500	180	500	2000	500	2000	500	30000	3000	1000	200	500	500000	1000000	1	5000	0	127.0.0.1	16900	0	0	1	127.0.0.1	60005	0	0	60000	0	0	100	0	1:00:00	0
 Map011_Hgdg_10110	127.0.0.1	19001	1	500	500	250	500	30	1000	500	180	500	2000	500	2000	500	30000	3000	1000	200	500	500000	1000000	1	5000	0	127.0.0.1	16900	0	0	1	127.0.0.1	60005	0	0	60000	0	0	100	0	1:00:00	0
 Map010_Mzgc_10100	127.0.0.1	19001	1	500	500	250	500	30	1000	500	180	500	2000	500	2000	500	30000	3000	1000	200	500	500000	1000000	1	5000	0	127.0.0.1	16900	0	0	1	127.0.0.1	60005	0	0	60000	0	0	100	0	1:00:00	0
-Map133_Bzjsc_31330	127.0.0.1	19001	1	500	500	250	500	30	1000	500	180	500	2000	500	2000	500	30000	3000	1000	200	500	500000	1000000	1	5000	0	127.0.0.1	16900	0	0	1	127.0.0.1	60005	0	0	60000	0	0	100	0	1:00:00	0
+Map133_Bzjsc_31031	127.0.0.1	19001	1	500	500	250	500	30	1000	500	180	500	2000	500	2000	500	30000	3000	1000	200	500	500000	1000000	1	5000	0	127.0.0.1	16900	0	0	1	127.0.0.1	60005	0	0	60000	0	0	100	0	1:00:00	0
diff --git a/db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt b/db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt
index 003d2d0..8a86537 100644
--- a/db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt
+++ b/db/PyMongoDataServer/PySysDB/tagBOSSInfo.txt
@@ -40,6 +40,10 @@
 30303010	31030	92	0	0	0	2028
 30303011	31030	93	0	0	0	2029
 30303012	31030	94	0	0	0	2030
+30303013	31031	90	0	0	0	2050
+30303014	31031	91	0	0	0	2051
+30303015	31031	92	0	0	0	2052
+30303016	31031	93	0	0	0	2053
 31503001	31150	90	0	0	0	2031
 31503002	31150	91	0	0	0	2032
 31503003	31150	92	0	0	0	2033
diff --git a/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt b/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt
index 03020db..f098505 100644
--- a/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt
+++ b/db/PyMongoDataServer/PySysDB/tagMapEventPoint.txt
@@ -161,3 +161,9 @@
 31030	30303010	0	0	0
 31030	30303011	0	0	0
 31030	30303012	0	0	0
+31031	30301003	220	240	1839
+31031	30303013	240	240	3266
+31031	30303014	250	250	3670
+31031	30303015	300	300	7971
+31031	30303016	350	350	15442
+31031	30303017	400	400	29763
diff --git a/db/PyMongoDataServer/SysDB/tagBornRefresh.txt b/db/PyMongoDataServer/SysDB/tagBornRefresh.txt
index d99640e..35ec8f2 100644
--- a/db/PyMongoDataServer/SysDB/tagBornRefresh.txt
+++ b/db/PyMongoDataServer/SysDB/tagBornRefresh.txt
@@ -33,4 +33,4 @@
 89740	10110	109	24	1	0
 100988	31030	55	14	2	0
 105295	10100	60	18	1	0
-108350	31330	97	42	1	0
+108493	31031	97	42	1	0
diff --git a/db/PyMongoDataServer/SysDB/tagChinMap.txt b/db/PyMongoDataServer/SysDB/tagChinMap.txt
index 7280b19..251a553 100644
--- a/db/PyMongoDataServer/SysDB/tagChinMap.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinMap.txt
@@ -36,4 +36,4 @@
 31250	守护副本	1	0	600000	1	1	0	0	0	0	0	0	0	1	1	10000	50	50	0	1	0	0	1
 52010	封魔坛	1	0	900000	8	0	0	0	0	0	0	0	0	1	1	10000	50	50	0	1	0	0	1
 52020	封魔坛	1	0	900000	1	1	0	0	0	0	0	0	0	1	1	10000	50	50	0	1	0	0	1
-31330	BOSS之家三层	1	0	0	8	0	0	0	0	0	0	0	0	0	0	10000	50	50	0	1	0	5	35
+31031	BOSS之家三层	1	0	0	8	0	0	0	0	0	0	0	0	0	0	10000	50	50	0	1	0	5	35
diff --git a/db/PyMongoDataServer/SysDB/tagChinNPC.txt b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
index e5c5df2..16f59d3 100644
--- a/db/PyMongoDataServer/SysDB/tagChinNPC.txt
+++ b/db/PyMongoDataServer/SysDB/tagChinNPC.txt
@@ -494,6 +494,7 @@
 30203005	2	0	麒麟之魂	230	0	39303	39303	0	0	0	0	10000	49458	0	0	0	0	0	0	0	0	2000	999638	64	0	300	2	3	0	0	0	0	0	0	0	0	0	40	2	11645471	0	0	0	0	3	0	0	1	1	1
 30301001	2	0	精英护卫	200	0	1503	1503	0	6	0	0	10000	25	0	0	780	0	0	0	0	1	3000	634880	0	0	300	2	6	23010	0	0	0	0	0	0	0	0	10	2	34243	0	0	0	0	1	48352	7	1	1	1
 30301002	2	0	精英护卫	230	0	1839	1839	0	8	0	0	10000	55	0	0	780	0	0	0	0	1	3000	738321	0	0	300	2	6	23010	0	0	0	0	0	0	0	0	10	2	51163	0	0	0	0	1	83079	13	1	1	1
+30301003	2	0	精英护卫	1	0	3	3	3	1	0	0	3	3	3	0	0	0	0	0	0	0	0	3	3	0	300	2	6	23010	0	0	0	0	0	0	0	0	10	2	3	3	0	0	0	1	0	0	1	1	1
 30303001	2	0	天枢	160	0	2524	2524	0	4	0	0	10000	3100	0	1	0	0	0	0	0	3	3000	444132	22	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	5799139	0	10000	0	0	5	0	0	186	1	1
 30303002	2	0	天璇	180	0	3754	3754	0	5	0	0	10000	4847	0	1	0	0	0	0	0	3	3000	501072	25	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	8527731	0	10000	0	0	5	0	0	186	1	1
 30303003	2	0	天玑	210	0	6200	6200	0	6	0	0	10000	7908	0	1	0	0	0	0	0	3	3000	597186	31	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	23982232	0	10000	0	0	5	0	0	186	1	1
@@ -506,6 +507,10 @@
 30303010	2	0	潮汐巨兽	300	0	22498	22498	0	13	0	0	10000	18455	0	1	0	0	0	0	0	3	3000	1365193	93	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	57905998	3	10000	0	0	5	0	0	186	1	1
 30303011	2	0	极炎巨兽	350	0	33098	33098	0	17	0	0	10000	30106	0	1	0	0	0	0	0	3	3000	1655663	116	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	23040341	8	10000	0	0	5	0	0	186	1	1
 30303012	2	0	白泽	400	0	56742	56742	0	22	0	0	10000	49103	0	1	0	0	0	0	0	3	3000	1989837	143	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	27378150	15	10000	0	0	5	0	0	186	1	1
+30303013	2	0	极冰之心	1	0	3	3	3	1	0	0	3	3	3	1	0	0	0	0	0	0	0	3	3	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	3	3	10000	0	0	5	0	0	186	1	1
+30303014	2	0	潮汐巨兽	1	0	3	3	3	1	0	0	3	3	3	1	0	0	0	0	0	0	0	3	3	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	3	3	10000	0	0	5	0	0	186	1	1
+30303015	2	0	极炎巨兽	1	0	3	3	3	1	0	0	3	3	3	1	0	0	0	0	0	0	0	3	3	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	3	3	10000	0	0	5	0	0	186	1	1
+30303016	2	0	白泽	1	0	3	3	3	1	0	0	3	3	3	1	0	0	0	0	0	0	0	3	3	0	300	2	6	23010	23030	0	0	0	0	0	0	0	10	2	3	3	10000	0	0	5	0	0	186	1	1
 30403001	2	0	仙魔之争NPC	90	0	341	361	53	0	0	0	10000	102	0	0	0	0	0	0	0	0	2000	128115	13	0	200	2	6	0	0	0	0	0	0	0	0	0	40	1	586760	0	10000	0	0	5	0	0	186	1	1
 30403002	2	0	仙魔守卫	90	0	341	361	53	0	0	0	10000	102	0	0	0	0	0	0	0	0	2000	128115	13	0	200	2	6	0	0	0	0	0	0	0	0	0	40	1	586760	0	10000	0	0	5	0	0	186	1	1
 30403003	2	0	仙魔守卫	90	0	341	361	53	0	0	0	10000	102	0	0	0	0	0	0	0	0	2000	128115	13	0	200	2	6	0	0	0	0	0	0	0	0	0	40	1	586760	0	10000	0	0	5	0	0	186	1	1
diff --git a/db/PyMongoDataServer/SysDB/tagEffectRefresh.txt b/db/PyMongoDataServer/SysDB/tagEffectRefresh.txt
index 9dfa8cd..84f3d61 100644
--- a/db/PyMongoDataServer/SysDB/tagEffectRefresh.txt
+++ b/db/PyMongoDataServer/SysDB/tagEffectRefresh.txt
@@ -96,9 +96,9 @@
 105307	10100	61	11	13	20011	0
 105309	10100	62	97	15	20008	0
 105311	10100	62	97	15	20010	0
-108372	31330	71	123	15	20010	0
-108374	31330	17	69	15	20008	0
-108376	31330	70	18	15	20008	0
-108378	31330	118	70	15	20008	0
-108380	31330	98	38	10	20011	0
-108382	31330	70	72	80	20010	0
+108515	31031	71	123	15	20010	0
+108517	31031	17	69	15	20008	0
+108519	31031	70	18	15	20008	0
+108521	31031	118	70	15	20008	0
+108523	31031	98	38	10	20011	0
+108525	31031	70	72	80	20010	0
diff --git a/db/PyMongoDataServer/SysDB/tagNPCRefresh.txt b/db/PyMongoDataServer/SysDB/tagNPCRefresh.txt
index bc7f7f2..d6d3f34 100644
--- a/db/PyMongoDataServer/SysDB/tagNPCRefresh.txt
+++ b/db/PyMongoDataServer/SysDB/tagNPCRefresh.txt
@@ -255,14 +255,14 @@
 27892	10601002	10060	0	[53,15,1,8]	1	1	0	2500	0	0	1		5	5	0	0
 27894	10601002	10060	0	[51,10,1,8]	1	1	0	2500	0	0	1		5	5	0	0
 18951	10702001	10070	0	[66,180,1,15]	1	1	0	2500	0	0	1		5	5	0	0
-85358	20102006	21070	0	[108,107,1,10]	1	1	0	60000	0	0	1		5	5	0	0
-85360	20102006	21070	0	[106,106,1,10]	1	1	0	60000	0	0	1		5	5	0	0
-85362	20102006	21070	0	[108,104,1,10]	1	1	0	60000	0	0	1		5	5	0	0
-85364	20102006	21070	0	[110,106,1,10]	1	1	0	60000	0	0	1		5	5	0	0
+85338	20102003	21070	0	[8,75,1,10]	1	1	0	60000	0	0	1		5	5	0	0
+85340	20102003	21070	0	[8,73,1,10]	1	1	0	60000	0	0	1		5	5	0	0
+85342	20102004	21070	0	[139,73,1,10]	1	1	0	60000	0	0	1		5	5	0	0
+85344	20102004	21070	0	[137,71,1,10]	1	1	0	60000	0	0	1		5	5	0	0
 952	0	31180	0	[73,63,10,30]	1	1	0	0	0	0	1		5	5	0	102
 1410	0	31180	0	[71,17,10,30]	1	1	0	0	0	0	1		5	5	0	101
 1411	0	31180	0	[22,51,1,30]	1	1	0	0	0	0	1		5	5	0	103
-95461	0	21070	0	[75,71,0,14]	1	1	0	0	0	0	1		5	5	0	99
+85346	20102004	21070	0	[141,71,1,10]	1	1	0	60000	0	0	1		5	5	0	0
 76705	10301002	10030	0	[58,71,1,15]	1	1	0	1800	0	0	1		5	5	0	0
 75697	10109005	10010	0	[101,111,0,15]	1	1	0	0	0	0	1		5	5	128	0
 80183	10901001	10090	0	[169,31,0,15]	1	1	0	3000	0	0	1		5	5	0	0
@@ -284,6 +284,7 @@
 34545	10801001	10080	0	[114,81,1,15]	1	1	0	2500	0	0	1		5	5	0	0
 80288	10901005	10090	0	[73,136,0,15]	1	1	0	3000	0	0	1		5	5	0	0
 18953	10701001	10070	0	[32,11,1,15]	1	1	0	2500	0	0	1		5	5	0	0
+85360	20102006	21070	0	[106,106,1,10]	1	1	0	60000	0	0	1		5	5	0	0
 81020	0	31150	0	[154,193,0,12]	1	1	0	0	0	0	1		5	5	0	95
 76715	10301003	10030	0	[101,72,1,15]	1	1	0	1800	0	0	1		5	5	0	0
 19031	10701003	10070	0	[58,60,1,15]	1	1	0	2500	0	0	1		5	5	0	0
@@ -307,6 +308,7 @@
 34622	10801005	10080	0	[17,33,1,15]	1	1	0	2500	0	0	1		5	5	0	0
 75649	10102001	10010	0	[77,11,1,15]	1	1	0	1800	0	0	1		5	5	0	0
 75651	10102001	10010	0	[87,13,1,15]	1	1	0	1800	0	0	1		5	5	0	0
+85304	90	21070	0	[15,36,0,12]	1	1	0	0	0	0	1		5	5	0	90
 75653	10102001	10010	0	[83,19,1,12]	1	1	0	1800	0	0	1		5	5	0	0
 75655	10102001	10010	0	[79,8,1,15]	1	1	0	1800	0	0	1		5	5	0	0
 76165	10201002	10020	0	[138,20,1,16]	1	1	0	1800	0	0	1		5	5	0	0
@@ -471,14 +473,20 @@
 100889	30301001	31020	0	[71,51,1,10]	2	1	0	2500	0	0	1		5	5	0	0
 89782	11101001	10110	0	[115,68,1,15]	1	1	0	3000	0	0	1		5	5	0	0
 34598	10801004	10080	0	[25,85,1,15]	1	1	0	2500	0	0	1		5	5	0	0
-85340	20102003	21070	0	[8,73,1,10]	1	1	0	60000	0	0	1		5	5	0	0
-85342	20102004	21070	0	[139,73,1,10]	1	1	0	60000	0	0	1		5	5	0	0
-85344	20102004	21070	0	[137,71,1,10]	1	1	0	60000	0	0	1		5	5	0	0
+85362	20102006	21070	0	[108,104,1,10]	1	1	0	60000	0	0	1		5	5	0	0
+85364	20102006	21070	0	[110,106,1,10]	1	1	0	60000	0	0	1		5	5	0	0
+95461	0	21070	0	[75,71,0,14]	1	1	0	0	0	0	1		5	5	0	99
 18755	10701005	10070	0	[102,141,1,15]	1	1	0	2500	0	0	1		5	5	0	0
 18757	10701002	10070	0	[18,62,1,15]	1	1	0	2500	0	0	1		5	5	0	0
 18759	10702001	10070	0	[58,181,1,15]	1	1	0	2500	0	0	1		5	5	0	0
 75571	10101004	10010	0	[108,51,1,10]	1	1	0	1800	0	0	1		5	5	0	0
 75755	10101001	10010	0	[202,101,1,15]	1	1	0	1800	0	0	1		5	5	0	0
+85314	95	21070	0	[139,105,0,13]	1	1	0	0	0	0	1		5	5	0	95
+85316	96	21070	0	[76,113,0,15]	1	1	0	0	0	0	1		5	5	0	96
+85318	20102001	21070	0	[46,36,1,10]	1	1	0	60000	0	0	1		5	5	0	0
+85320	20102001	21070	0	[49,39,1,10]	1	1	0	60000	0	0	1		5	5	0	0
+85322	20102001	21070	0	[49,36,1,10]	1	1	0	60000	0	0	1		5	5	0	0
+85324	20102001	21070	0	[46,38,1,10]	1	1	0	60000	0	0	1		5	5	0	0
 76091	10201002	10020	0	[147,28,1,16]	1	1	0	1800	0	0	1		5	5	0	0
 80215	10901003	10090	0	[118,74,0,15]	1	1	0	3000	0	0	1		5	5	0	0
 80216	10901003	10090	0	[117,77,0,15]	1	1	0	3000	0	0	1		5	5	0	0
@@ -589,14 +597,19 @@
 108426	0	31160	0	[67,89,0,15]	1	1	0	0	0	0	1		5	5	0	116
 108427	0	31160	0	[100,61,0,100]	1	1	0	0	0	0	1		5	5	0	113
 108428	0	31160	0	[65,134,0,15]	1	1	0	0	0	0	1		5	5	0	114
+108542	30301003	31031	0	[66,70,0,15]	1	1	0	3000	0	0	1		5	5	0	0
+108543	30301003	31031	0	[69,65,0,15]	1	1	0	3000	0	0	1		5	5	0	0
 34587	10801003	10080	0	[55,104,1,15]	1	1	0	2500	0	0	1		5	5	0	0
 34588	10801003	10080	0	[57,106,1,15]	1	1	0	2500	0	0	1		5	5	0	0
-85330	20102002	21070	0	[108,37,1,10]	1	1	0	60000	0	0	1		5	5	0	0
-85332	20102002	21070	0	[111,37,1,10]	1	1	0	60000	0	0	1		5	5	0	0
-85334	20102003	21070	0	[10,75,1,10]	1	1	0	60000	0	0	1		5	5	0	0
-85336	20102003	21070	0	[10,73,1,10]	1	1	0	60000	0	0	1		5	5	0	0
-85338	20102003	21070	0	[8,75,1,10]	1	1	0	60000	0	0	1		5	5	0	0
 81048	0	31150	0	[144,120,0,12]	1	1	0	0	0	0	1		5	5	0	91
+108495	0	31031	0	[71,17,0,15]	1	1	0	0	0	0	1		5	5	0	90
+108497	0	31031	0	[17,70,0,15]	1	1	0	0	0	0	1		5	5	0	91
+108499	0	31031	0	[70,124,0,15]	1	1	0	0	0	0	1		5	5	0	92
+108501	0	31031	0	[118,70,0,15]	1	1	0	0	0	0	1		5	5	0	93
+108527	30301003	31031	0	[76,66,0,15]	1	1	0	3000	0	0	1		5	5	0	0
+108529	30301003	31031	0	[76,68,0,15]	1	1	0	3000	0	0	1		5	5	0	0
+108530	30301003	31031	0	[78,69,0,15]	1	1	0	3000	0	0	1		5	5	0	0
+108531	30301003	31031	0	[78,67,0,15]	1	1	0	3000	0	0	1		5	5	0	0
 13236	10501002	10050	0	[36,16,1,16]	1	1	0	2500	0	0	1		5	5	0	0
 13238	10501004	10050	0	[33,92,1,12]	1	1	0	2500	0	0	1		5	5	0	0
 13240	10501003	10050	0	[15,58,1,16]	1	1	0	2500	0	0	1		5	5	0	0
@@ -633,6 +646,10 @@
 76037	10203001	10020	0	[19,54,1,14]	1	1	0	5000	0	0	1		5	5	50	0
 76039	10201005	10020	0	[125,141,1,16]	1	1	0	1800	0	0	1		5	5	0	0
 76041	10201001	10020	0	[191,36,1,16]	1	1	0	1800	0	0	1		5	5	0	0
+85306	91	21070	0	[138,39,0,12]	1	1	0	0	0	0	1		5	5	0	91
+85308	92	21070	0	[42,74,0,13]	1	1	0	0	0	0	1		5	5	0	92
+85310	93	21070	0	[106,69,0,14]	1	1	0	0	0	0	1		5	5	0	93
+85312	94	21070	0	[14,105,0,14]	1	1	0	0	0	0	1		5	5	0	94
 76049	10202001	10020	0	[51,119,1,16]	1	1	0	1800	0	0	1		5	5	0	0
 76051	10202001	10020	0	[48,114,1,16]	1	1	0	1800	0	0	1		5	5	0	0
 18971	10702001	10070	0	[74,168,1,15]	1	1	0	2500	0	0	1		5	5	0	0
@@ -676,19 +693,8 @@
 68424	0	60010	0	[236,96,6,15]	1	1	0	0	0	0	1		5	5	0	128
 68425	0	60010	0	[243,95,6,15]	1	1	0	0	0	0	1		5	5	0	129
 68426	0	60010	0	[239,129,1,15]	1	1	0	0	0	0	1		5	5	0	130
-85308	92	21070	0	[42,74,0,13]	1	1	0	0	0	0	1		5	5	0	92
-85310	93	21070	0	[106,69,0,14]	1	1	0	0	0	0	1		5	5	0	93
-85312	94	21070	0	[14,105,0,14]	1	1	0	0	0	0	1		5	5	0	94
-85314	95	21070	0	[139,105,0,13]	1	1	0	0	0	0	1		5	5	0	95
-85316	96	21070	0	[76,113,0,15]	1	1	0	0	0	0	1		5	5	0	96
-85346	20102004	21070	0	[141,71,1,10]	1	1	0	60000	0	0	1		5	5	0	0
 80253	10901004	10090	0	[74,92,0,15]	1	1	0	3000	0	0	1		5	5	0	0
-85348	20102004	21070	0	[139,70,1,10]	2	2	0	60000	0	0	1		5	5	0	0
 18735	10702001	10070	0	[56,183,1,15]	1	1	0	2500	0	0	1		5	5	0	0
-85350	20102005	21070	0	[44,105,1,10]	1	1	0	60000	0	0	1		5	5	0	0
-85352	20102005	21070	0	[42,107,1,10]	1	1	0	60000	0	0	1		5	5	0	0
-85354	20102005	21070	0	[46,107,1,10]	1	1	0	60000	0	0	1		5	5	0	0
-85356	20102005	21070	0	[44,109,1,10]	1	1	0	60000	0	0	1		5	5	0	0
 27800	10601004	10060	0	[11,99,1,15]	1	1	0	2500	0	0	1		5	5	0	0
 18905	10701004	10070	0	[61,110,1,15]	1	1	0	2500	0	0	1		5	5	0	0
 18907	10701005	10070	0	[108,148,1,15]	1	1	0	2500	0	0	1		5	5	0	0
@@ -729,6 +735,12 @@
 80245	10901004	10090	0	[63,85,0,15]	1	1	0	3000	0	0	1		5	5	0	0
 80246	10901004	10090	0	[65,87,0,15]	1	1	0	3000	0	0	1		5	5	0	0
 80247	10901004	10090	0	[67,85,0,15]	1	1	0	3000	0	0	1		5	5	0	0
+85326	20102002	21070	0	[108,39,1,10]	1	1	0	60000	0	0	1		5	5	0	0
+85328	20102002	21070	0	[111,39,1,10]	1	1	0	60000	0	0	1		5	5	0	0
+85330	20102002	21070	0	[108,37,1,10]	1	1	0	60000	0	0	1		5	5	0	0
+85332	20102002	21070	0	[111,37,1,10]	1	1	0	60000	0	0	1		5	5	0	0
+85334	20102003	21070	0	[10,75,1,10]	1	1	0	60000	0	0	1		5	5	0	0
+85336	20102003	21070	0	[10,73,1,10]	1	1	0	60000	0	0	1		5	5	0	0
 77024	10401002	10040	0	[137,76,1,15]	1	1	0	1800	0	0	1		5	5	0	0
 76555	10302001	10030	0	[17,106,1,16]	1	1	0	1800	0	0	1		5	5	0	0
 76007	10201002	10020	0	[139,23,1,16]	1	1	0	1800	0	0	1		5	5	0	0
@@ -1420,10 +1432,10 @@
 34565	10801002	10080	0	[112,107,1,15]	1	1	0	2500	0	0	1		5	5	0	0
 34566	10801002	10080	0	[105,111,1,15]	1	1	0	2500	0	0	1		5	5	0	0
 34567	10801002	10080	0	[105,108,1,15]	1	1	0	2500	0	0	1		5	5	0	0
-108352	0	31330	0	[71,17,0,15]	1	1	0	0	0	0	1		5	5	0	90
-108354	0	31330	0	[17,70,0,15]	1	1	0	0	0	0	1		5	5	0	91
-108356	0	31330	0	[70,124,0,15]	1	1	0	0	0	0	1		5	5	0	92
-108358	0	31330	0	[118,70,0,15]	1	1	0	0	0	0	1		5	5	0	93
+108538	30301003	31031	0	[62,71,0,15]	1	1	0	3000	0	0	1		5	5	0	0
+108539	30301003	31031	0	[64,72,0,15]	1	1	0	3000	0	0	1		5	5	0	0
+108540	30301003	31031	0	[64,69,0,15]	1	1	0	3000	0	0	1		5	5	0	0
+108541	30301003	31031	0	[62,74,0,15]	1	1	0	3000	0	0	1		5	5	0	0
 80232	10901003	10090	0	[101,77,0,15]	1	1	0	3000	0	0	1		5	5	0	0
 80233	10901003	10090	0	[99,78,0,15]	1	1	0	3000	0	0	1		5	5	0	0
 80234	10901003	10090	0	[101,80,0,15]	1	1	0	3000	0	0	1		5	5	0	0
@@ -1703,8 +1715,6 @@
 101010	30301002	31030	0	[74,64,1,15]	1	1	0	2500	0	0	1		5	5	0	0
 77036	10401002	10040	0	[147,74,1,15]	1	1	0	1800	0	0	1		5	5	0	0
 101012	0	31030	0	[95,30,0,12]	1	1	0	0	0	0	1		5	5	0	90
-85304	90	21070	0	[15,36,0,12]	1	1	0	0	0	0	1		5	5	0	90
-85306	91	21070	0	[138,39,0,12]	1	1	0	0	0	0	1		5	5	0	91
 101016	30301002	31030	0	[73,61,1,15]	1	1	0	2500	0	0	1		5	5	0	0
 101018	30301002	31030	0	[72,64,1,15]	1	1	0	2500	0	0	1		5	5	0	0
 101020	30301002	31030	0	[75,61,1,15]	1	1	0	2500	0	0	1		5	5	0	0
@@ -1852,6 +1862,12 @@
 77218	10401001	10040	0	[151,20,1,15]	1	1	0	1800	0	0	1		5	5	0	0
 77220	10401001	10040	0	[164,12,1,15]	1	1	0	1800	0	0	1		5	5	0	0
 77222	10402001	10040	0	[97,138,1,15]	1	1	0	1800	0	0	1		5	5	0	0
+85348	20102004	21070	0	[139,70,1,10]	2	2	0	60000	0	0	1		5	5	0	0
+85350	20102005	21070	0	[44,105,1,10]	1	1	0	60000	0	0	1		5	5	0	0
+85352	20102005	21070	0	[42,107,1,10]	1	1	0	60000	0	0	1		5	5	0	0
+85354	20102005	21070	0	[46,107,1,10]	1	1	0	60000	0	0	1		5	5	0	0
+85356	20102005	21070	0	[44,109,1,10]	1	1	0	60000	0	0	1		5	5	0	0
+85358	20102006	21070	0	[108,107,1,10]	1	1	0	60000	0	0	1		5	5	0	0
 34608	10801004	10080	0	[24,79,1,15]	1	1	0	2500	0	0	1		5	5	0	0
 34609	10801004	10080	0	[26,78,1,15]	1	1	0	2500	0	0	1		5	5	0	0
 76571	10302001	10030	0	[19,122,1,16]	1	1	0	1800	0	0	1		5	5	0	0
@@ -1873,6 +1889,10 @@
 75995	10201001	10020	0	[192,39,1,16]	1	1	0	1800	0	0	1		5	5	0	0
 76585	10304008	10030	0	[116,79,0,1]	1	1	0	0	0	0	1		5	5	156	0
 34596	10801004	10080	0	[23,89,1,15]	1	1	0	2500	0	0	1		5	5	0	0
+108544	30301003	31031	0	[71,65,0,15]	1	1	0	3000	0	0	1		5	5	0	0
+108545	30301003	31031	0	[69,67,0,15]	1	1	0	3000	0	0	1		5	5	0	0
+108546	30301003	31031	0	[71,67,0,15]	1	1	0	3000	0	0	1		5	5	0	0
+108547	30301003	31031	0	[67,64,0,15]	1	1	0	3000	0	0	1		5	5	0	0
 51407	30908001	31230	0	[9,40,0,1]	1	1	0	0	0	0	1		5	5	0	0
 76003	10201001	10020	0	[195,32,1,9]	1	1	0	1800	0	0	1		5	5	0	0
 51408	30908001	31230	0	[15,40,0,0]	1	1	0	0	0	0	1		5	5	0	0
@@ -1905,14 +1925,14 @@
 77016	10401003	10040	0	[207,86,1,15]	1	1	0	1800	0	0	1		5	5	0	0
 77018	10404100	10040	0	[174,35,0,15]	1	1	0	0	0	0	1		5	5	64	0
 77020	10402001	10040	0	[106,150,1,15]	1	1	0	1800	0	0	1		5	5	0	0
-85318	20102001	21070	0	[46,36,1,10]	1	1	0	60000	0	0	1		5	5	0	0
+108532	30301003	31031	0	[76,70,0,15]	1	1	0	3000	0	0	1		5	5	0	0
 13364	10501003	10050	0	[13,50,1,16]	1	1	0	2500	0	0	1		5	5	0	0
 13366	10501005	10050	0	[77,110,1,16]	1	1	0	2500	0	0	1		5	5	0	0
-85320	20102001	21070	0	[49,39,1,10]	1	1	0	60000	0	0	1		5	5	0	0
-85322	20102001	21070	0	[49,36,1,10]	1	1	0	60000	0	0	1		5	5	0	0
-85324	20102001	21070	0	[46,38,1,10]	1	1	0	60000	0	0	1		5	5	0	0
-85326	20102002	21070	0	[108,39,1,10]	1	1	0	60000	0	0	1		5	5	0	0
-85328	20102002	21070	0	[111,39,1,10]	1	1	0	60000	0	0	1		5	5	0	0
+108533	30301003	31031	0	[72,77,0,15]	1	1	0	3000	0	0	1		5	5	0	0
+108534	30301003	31031	0	[74,78,0,15]	1	1	0	3000	0	0	1		5	5	0	0
+108535	30301003	31031	0	[74,75,0,15]	1	1	0	3000	0	0	1		5	5	0	0
+108536	30301003	31031	0	[71,79,0,15]	1	1	0	3000	0	0	1		5	5	0	0
+108537	30301003	31031	0	[71,75,0,15]	1	1	0	3000	0	0	1		5	5	0	0
 13152	10502001	10050	0	[93,61,1,10]	1	1	0	2500	0	0	1		5	5	0	0
 18719	10701002	10070	0	[13,47,1,15]	1	1	0	2500	0	0	1		5	5	0	0
 76207	10201003	10020	0	[157,55,1,16]	1	1	0	1800	0	0	1		5	5	0	0

--
Gitblit v1.8.0