From e85a1252b244c7fc28d8a4e777dcc01071006bc8 Mon Sep 17 00:00:00 2001
From: gwj <123123@qq.com>
Date: 星期一, 10 十一月 2025 17:50:18 +0800
Subject: [PATCH] 11111 主线副本怪物调整，怪物特点强化

---
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/MainLevel.txt |   36 +-
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/NPC.txt       |  322 +++++++++++-----------
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/NPC.txt       |  322 +++++++++++-----------
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/MainLevel.txt |   36 +-
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/NPCLineup.txt |   56 ++--
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/NPCLineup.txt |   56 ++--
 6 files changed, 414 insertions(+), 414 deletions(-)

diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/MainLevel.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/MainLevel.txt
index 11f7024..b04854a 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/MainLevel.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/MainLevel.txt
@@ -9,24 +9,24 @@
 2	3	1020301	1020302	1020303	1020304			1020309	[[5,2],[3,40]]	12	1
 2	4	1020401	1020402	1020403	1020404			1020409	[[5,2],[3,40]]	14	1
 2	5	1020501	1020502	1020503	1020504			1020509	[[5,2],[3,40],[4,10]]	15	1
-3	1	1030101|1030102	1030103|1030104	1030105|1030106	1030107|1030108			1030109	[[5,2],[3,40]]	16	1
-3	2	1030201|1030202	1030203|1030204	1030205|1030206	1030207|1030208			1030209	[[5,2],[3,40]]	17	1
-3	3	1030301|1030302	1030303|1030304	1030305|1030306	1030307|1030308			1030309	[[5,2],[3,40]]	19	1
-3	4	1030401|1030402	1030403|1030404	1030405|1030406	1030407|1030408			1030409	[[5,2],[3,40]]	21	1
-3	5	1030501|1030502	1030503|1030504	1030505|1030506	1030507|1030508			1030509	[[5,2],[3,40]]	22	1
-3	6	1030601|1030602	1030603|1030604	1030605|1030606	1030607|1030608			1030609	[[5,2],[3,40]]	24	1
-3	7	1030701|1030702	1030703|1030704	1030705|1030706	1030707|1030708			1030709	[[5,2],[3,40]]	26	1
-3	8	1030801|1030802	1030803|1030804	1030805|1030806	1030807|1030808			1030809	[[5,2],[3,40],[4,10]]	28	1
-4	1	1040101|1040102	1040103|1040104	1040105|1040106	1040107|1040108	1040109|1040110		1040111	[[5,2],[3,40]]	29	1
-4	2	1040201|1040202	1040203|1040204	1040205|1040206	1040207|1040208	1040209|1040210		1040211	[[5,2],[3,40]]	30	1
-4	3	1040301|1040302	1040303|1040304	1040305|1040306	1040307|1040308	1040309|1040310		1040311	[[5,2],[3,40]]	31	1
-4	4	1040401|1040402	1040403|1040404	1040405|1040406	1040407|1040408	1040409|1040410		1040411	[[5,2],[3,40]]	32	1
-4	5	1040501|1040502	1040503|1040504	1040505|1040506	1040507|1040508	1040509|1040510		1040511	[[5,2],[3,40]]	34	1
-4	6	1040601|1040602	1040603|1040604	1040605|1040606	1040607|1040608	1040609|1040610		1040611	[[5,2],[3,40]]	35	1
-4	7	1040701|1040702	1040703|1040704	1040705|1040706	1040707|1040708	1040709|1040710		1040711	[[5,2],[3,40]]	36	1
-4	8	1040801|1040802	1040803|1040804	1040805|1040806	1040807|1040808	1040809|1040810		1040811	[[5,2],[3,40]]	38	1
-4	9	1040901|1040902	1040903|1040904	1040905|1040906	1040907|1040908	1040909|1040910		1040911	[[5,2],[3,40]]	40	1
-4	10	1041001|1041002	1041003|1041004	1041005|1041006	1041007|1041008	1041009|1041010		1041011	[[5,2],[3,40],[4,10]]	42	1
+3	1	1030101	1030102	1030103	1030104			1030109	[[5,2],[3,40]]	16	1
+3	2	1030201	1030202	1030203	1030204			1030209	[[5,2],[3,40]]	17	1
+3	3	1030301	1030302	1030303	1030304			1030309	[[5,2],[3,40]]	19	1
+3	4	1030401	1030402	1030403	1030404			1030409	[[5,2],[3,40]]	21	1
+3	5	1030501	1030502	1030503	1030504			1030509	[[5,2],[3,40]]	22	1
+3	6	1030601	1030602	1030603	1030604			1030609	[[5,2],[3,40]]	24	1
+3	7	1030701	1030702	1030703	1030704			1030709	[[5,2],[3,40]]	26	1
+3	8	1030801	1030802	1030803	1030804			1030809	[[5,2],[3,40],[4,10]]	28	1
+4	1	1040101	1040102	1040103	1040104	1040105		1040111	[[5,2],[3,40]]	29	1
+4	2	1040201	1040202	1040203	1040204	1040205		1040211	[[5,2],[3,40]]	30	1
+4	3	1040301	1040302	1040303	1040304	1040305		1040311	[[5,2],[3,40]]	31	1
+4	4	1040401	1040402	1040403	1040404	1040405		1040411	[[5,2],[3,40]]	32	1
+4	5	1040501	1040502	1040503	1040504	1040505		1040511	[[5,2],[3,40]]	34	1
+4	6	1040601	1040602	1040603	1040604	1040605		1040611	[[5,2],[3,40]]	35	1
+4	7	1040701	1040702	1040703	1040704	1040705		1040711	[[5,2],[3,40]]	36	1
+4	8	1040801	1040802	1040803	1040804	1040805		1040811	[[5,2],[3,40]]	38	1
+4	9	1040901	1040902	1040903	1040904	1040905		1040911	[[5,2],[3,40]]	40	1
+4	10	1041001	1041002	1041003	1041004	1041005		1041011	[[5,2],[3,40],[4,10]]	42	1
 5	1	1050101|1050102	1050103|1050104	1050105|1050106	1050107|1050108	1050109|1050110	1050111|1050112	1050113	[[5,2],[3,40]]	43	1
 5	2	1050201|1050202	1050203|1050204	1050205|1050206	1050207|1050208	1050209|1050210	1050211|1050212	1050213	[[5,2],[3,40]]	44	1
 5	3	1050301|1050302	1050303|1050304	1050305|1050306	1050307|1050308	1050309|1050310	1050311|1050312	1050313	[[5,2],[3,40]]	45	1
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/NPC.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/NPC.txt
index 56da819..ec6e3d0 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/NPC.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/NPC.txt
@@ -395,21 +395,21 @@
 10205095	祝融	540007	15	2	2256	250	25080	0	0	0	0	1950	0	0	0	0	0	0	0	0	0	{}
 10301011	黄巾刀兵	610001	16	0	1555	88	4445	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10301012	黄巾刀兵	610001	16	0	1555	88	4445	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10301013	黄巾枪兵	610002	16	0	1426	88	4890	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10301014	黄巾枪兵	610002	16	0	1426	88	4890	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10301015	关兴	520005	16	0	1944	283	14671	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
+10301013	黄巾刀兵	610001	16	0	1555	88	4445	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10301014	黄巾刀兵	610001	16	0	1555	88	4445	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10301015	黄巾刀兵	610001	16	0	2222	266	13337	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10301021	黄巾枪兵	610002	16	0	1426	88	4890	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
 10301022	黄巾枪兵	610002	16	0	1426	88	4890	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10301023	庞德	510003	16	0	1481	333	16004	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10301024	乐进	510002	16	0	2222	266	13337	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10301031	黄巾刀兵	610001	16	0	1652	94	4723	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10301032	黄巾刀兵	610001	16	0	1652	94	4723	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10301033	黄巾枪兵	610002	16	0	1515	94	5195	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10301034	庞德	510003	16	0	1574	354	17005	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10301023	黄巾枪兵	610002	16	0	2037	266	14671	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10301024	黄巾枪兵	610002	16	0	2037	266	14671	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10301031	黄巾枪兵	610002	16	0	1515	94	5195	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10301032	黄巾枪兵	610002	16	0	1515	94	5195	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10301033	乐进	510002	16	0	1652	94	4723	0	0	0	0	0	0	0	0	0	0	0	0	750	0	{}
+10301034	曹婴	510001	16	0	2361	283	14170	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10301035	乐进	510002	16	0	2361	283	14170	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10301041	黄巾枪兵	610002	16	0	1515	94	5195	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10301042	黄巾枪兵	610002	16	0	1515	94	5195	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10301043	庞德	510003	16	0	1574	354	17005	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10301041	黄巾刀兵	610001	16	0	1652	94	4723	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10301042	关兴	520005	16	0	1446	100	5195	0	0	0	0	0	0	0	0	0	0	0	0	750	0	{}
+10301043	鲍三娘	520002	16	0	2361	283	14170	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
 10301044	乐进	510002	16	0	2361	283	14170	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
 10301045	王异	510010	16	0	2361	283	14170	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10301051	庞德	510003	16	0	1666	375	18005	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
@@ -432,31 +432,31 @@
 10301084	庞德	510003	16	0	1759	395	19005	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
 10301085	乐进	510002	16	0	2639	316	15838	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
 10301086	王异	510010	16	0	2639	316	15838	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10301091	庞德	510003	16	0	1852	416	20005	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10301092	乐进	510002	16	0	2778	333	16671	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10301093	王异	510010	16	0	2778	333	16671	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10301094	曹操	510014	16	0	2778	333	16671	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10301095	甘夫人	520006	16	2	3055	370	40752	0	0	0	0	0	0	1950	0	0	0	0	0	0	0	{}
-10302011	黄巾刀兵	610001	17	0	1672	95	4779	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10302012	黄巾刀兵	610001	17	0	1672	95	4779	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10301091	黄巾盾兵	610003	16	0	1852	416	20005	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10301092	黄巾盾兵	610003	16	0	1852	416	20005	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10301093	吴国太	530002	16	0	2546	333	18338	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10301094	司马徽	530006	16	0	2430	354	18338	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10301095	甘宁	530004	16	2	3333	370	37048	0	0	1950	0	0	0	0	0	0	0	0	0	0	0	{}
+10302011	黄巾枪兵	610002	17	0	1533	95	5257	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10302012	黄巾枪兵	610002	17	0	1533	95	5257	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
 10302013	黄巾弓手	610004	17	0	1911	159	7966	0	0	0	0	0	0	0	0	1050	0	0	0	0	0	{}
 10302014	黄巾弓手	610004	17	0	1911	159	7966	0	0	0	0	0	0	0	0	1050	0	0	0	0	0	{}
 10302015	庞德	510003	17	0	1592	358	17207	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10302021	黄巾枪兵	610002	17	0	1533	95	5257	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10302022	庞德	510003	17	0	1592	358	17207	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10302023	乐进	510002	17	0	2389	286	14339	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10302024	王异	510010	17	0	2389	286	14339	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10302021	潘璋	530001	17	0	1672	95	4779	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10302022	黄巾弓手	610004	17	0	2389	286	14339	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10302023	黄巾弓手	610004	17	0	2389	286	14339	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10302024	黄巾弓手	610004	17	0	2389	286	14339	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
 10302025	曹操	510014	17	0	2389	286	14339	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10302031	黄巾刀兵	610001	17	0	1777	101	5078	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10302032	庞德	510003	17	0	1692	380	18282	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10302033	乐进	510002	17	0	2538	304	15235	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10302034	王异	510010	17	0	2538	304	15235	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10302035	曹操	510014	17	0	2538	304	15235	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10302041	庞德	510003	17	0	1692	380	18282	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10302042	乐进	510002	17	0	2538	304	15235	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10302043	王异	510010	17	0	2538	304	15235	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10302044	曹操	510014	17	0	2538	304	15235	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10302045	甘夫人	520006	17	0	2327	304	16759	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
+10302032	黄巾刀兵	610001	17	0	2538	304	15235	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10302033	黄巾刀兵	610001	17	0	2538	304	15235	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10302034	司马徽	530006	17	0	2221	323	16759	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10302035	黄巾刀兵	610001	17	0	2538	304	15235	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10302041	黄巾盾兵	610003	17	0	1692	380	18282	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10302042	黄巾盾兵	610003	17	0	1692	380	18282	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10302043	郭汜	540002	17	0	2538	304	15235	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
+10302044	张宝	540004	17	0	2327	304	16759	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10302045	李傕	540003	17	0	2538	304	15235	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
 10302051	黄巾刀兵	610001	17	0	1881	107	5377	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10302052	黄巾刀兵	610001	17	0	1881	107	5377	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10302053	黄巾刀兵	610001	17	0	1881	107	5377	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
@@ -478,33 +478,33 @@
 10302083	王异	510010	17	0	2837	340	17028	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10302084	曹操	510014	17	0	2837	340	17028	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10302085	甘夫人	520006	17	0	2601	340	18730	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
-10302091	黄巾盾兵	610003	17	0	1792	348	16729	0	0	0	0	0	0	0	0	0	0	1350	0	0	0	{}
-10302092	黄巾盾兵	610003	17	0	1792	348	16729	0	0	0	0	0	0	0	0	0	0	1350	0	0	0	{}
-10302093	庞德	510003	17	0	1991	448	21509	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10302094	乐进	510002	17	0	2986	358	17924	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10302095	王异	510010	17	2	3584	398	39832	0	0	0	0	1950	0	0	0	0	0	0	0	0	0	{}
+10302091	黄巾刀兵	610001	17	0	2688	278	13941	0	0	0	0	1350	0	0	0	0	0	0	0	0	0	{}
+10302092	黄巾刀兵	610001	17	0	2688	278	13941	0	0	0	0	1350	0	0	0	0	0	0	0	0	0	{}
+10302093	潘璋	530001	17	0	2986	358	17924	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10302094	凌统	530003	17	0	2986	358	17924	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
+10302095	朱桓	530005	17	2	3136	423	43815	0	0	0	0	0	0	1950	0	0	0	0	0	0	0	{}
 10303011	黄巾枪兵	610002	18	0	1640	102	5625	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
 10303012	黄巾盾兵	610003	18	0	1193	127	6136	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
 10303013	黄巾枪兵	610002	18	0	1640	102	5625	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10303014	黄巾刀兵	610001	18	0	2300	238	11932	0	0	0	0	1350	0	0	0	0	0	0	0	0	0	{}
+10303014	黄巾弓手	610004	18	0	2300	238	11932	0	0	0	0	0	0	0	0	1350	0	0	0	0	0	{}
 10303015	庞德	510003	18	0	1704	383	18410	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
 10303016	乐进	510002	18	0	2556	306	15341	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
 10303021	黄巾盾兵	610003	18	0	1267	135	6520	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
-10303022	庞德	510003	18	0	1810	406	19560	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10303023	乐进	510002	18	0	2716	325	16300	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10303024	王异	510010	18	0	2716	325	16300	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10303025	曹操	510014	18	0	2716	325	16300	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10303022	黄巾枪兵	610002	18	0	2489	325	17930	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10303023	黄巾枪兵	610002	18	0	2489	325	17930	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10303024	庞德	510003	18	0	1810	406	19560	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10303025	潘璋	530001	18	0	2716	325	16300	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10303031	黄巾枪兵	610002	18	0	1845	114	6328	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
 10303032	黄巾枪兵	610002	18	0	1845	114	6328	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10303033	庞德	510003	18	0	1917	430	20711	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10303034	乐进	510002	18	0	2876	344	17259	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10303035	王异	510010	18	0	2876	344	17259	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10303036	曹操	510014	18	0	2876	344	17259	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10303041	庞德	510003	18	0	2023	454	21862	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10303042	乐进	510002	18	0	3035	363	18218	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10303043	王异	510010	18	0	3035	363	18218	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10303044	曹操	510014	18	0	3035	363	18218	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10303045	甘夫人	520006	18	0	2782	363	20040	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
+10303033	黄巾弓手	610004	18	0	2876	344	17259	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10303034	黄巾弓手	610004	18	0	2876	344	17259	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10303035	曹婴	510001	18	0	2876	344	17259	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10303036	黄巾弓手	610004	18	0	2876	344	17259	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10303041	黄巾盾兵	610003	18	0	2023	454	21862	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10303042	黄巾盾兵	610003	18	0	2023	454	21862	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10303043	黄巾弓手	610004	18	0	3035	363	18218	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10303044	甘夫人	520006	18	0	2782	363	20040	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
+10303045	黄巾弓手	610004	18	0	3035	363	18218	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
 10303051	黄巾枪兵	610002	18	0	2343	212	11719	0	0	1050	0	0	0	0	0	0	0	0	0	0	0	{}
 10303052	黄巾枪兵	610002	18	0	2343	212	11719	0	0	1050	0	0	0	0	0	0	0	0	0	0	0	{}
 10303053	庞德	510003	18	0	2130	478	23012	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
@@ -529,31 +529,31 @@
 10303086	甘夫人	520006	19	0	2964	387	21349	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
 10303091	黄巾枪兵	610002	19	0	2184	136	7491	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
 10303092	黄巾枪兵	610002	19	0	2184	136	7491	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10303093	庞德	510003	19	1	2383	567	29964	0	0	0	0	0	0	0	0	0	0	1650	0	0	0	{}
-10303094	乐进	510002	19	0	3404	408	20430	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10303095	王异	510010	19	0	3404	408	20430	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10303096	曹操	510014	19	2	4085	453	45400	0	0	0	0	1950	0	0	0	0	0	0	0	0	0	{}
+10303093	甘宁	530004	19	1	3574	453	24970	0	0	1650	0	0	0	0	0	0	0	0	0	0	0	{}
+10303094	黄巾弓手	610004	19	0	3404	408	20430	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10303095	黄巾弓手	610004	19	0	3404	408	20430	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10303096	丁奉	530007	19	2	2723	567	54480	0	0	0	0	0	0	0	0	0	0	1950	0	0	0	{}
 10304011	黄巾刀兵	610001	20	0	2023	115	5782	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10304012	黄巾盾兵	610003	20	0	1348	144	6938	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
 10304013	黄巾刀兵	610001	20	0	2023	115	5782	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10304014	黄巾刀兵	610001	20	0	2023	115	5782	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10304014	瘟疫毒弓	610005	20	0	1770	122	6360	0	0	0	0	0	0	750	0	0	0	0	0	0	0	{}
 10304015	黄巾弓手	610004	20	0	2023	115	5782	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
 10304016	黄巾刀兵	610001	20	0	2023	115	5782	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10304021	黄巾盾兵	610003	20	0	1842	358	17201	0	0	0	0	0	0	0	0	0	0	1350	0	0	0	{}
-10304022	庞德	510003	20	0	2047	460	22116	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10304023	乐进	510002	20	0	3071	368	18430	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10304024	王异	510010	20	0	3071	368	18430	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10304025	曹操	510014	20	0	3071	368	18430	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10304031	黄巾刀兵	610001	20	0	2276	130	6504	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10304032	黄巾刀兵	610001	20	0	2276	130	6504	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10304033	庞德	510003	20	0	2167	487	23417	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10304034	乐进	510002	20	0	3251	390	19514	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10304035	王异	510010	20	0	3251	390	19514	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10304041	黄巾刀兵	610001	20	0	2402	137	6866	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10304042	黄巾刀兵	610001	20	0	2402	137	6866	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10304043	庞德	510003	20	0	2288	514	24718	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10304044	乐进	510002	20	0	3432	411	20598	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10304045	王异	510010	20	0	3432	411	20598	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10304022	黄巾盾兵	610003	20	0	2047	460	22116	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10304023	瘟疫毒弓	610005	20	0	2687	391	20273	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
+10304024	曹轶	510006	20	0	3071	368	18430	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10304025	瘟疫毒弓	610005	20	0	2687	391	20273	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
+10304031	黄巾弓手	610004	20	0	2276	130	6504	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
+10304032	黄巾弓手	610004	20	0	2276	130	6504	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
+10304033	周仓	520003	20	0	2167	487	23417	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10304034	庞德	510003	20	0	2167	487	23417	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10304035	司马徽	530006	20	0	2845	414	21465	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10304041	黄巾盾兵	610003	20	0	1601	171	8239	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
+10304042	黄巾盾兵	610003	20	0	1601	171	8239	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
+10304043	瘟疫毒弓	610005	20	0	3003	437	22658	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
+10304044	瘟疫毒弓	610005	20	0	3003	437	22658	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
+10304045	瘟疫毒弓	610005	20	0	3003	437	22658	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
 10304051	黄巾刀兵	610001	20	0	2529	144	7227	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10304052	黄巾刀兵	610001	20	0	2529	144	7227	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10304053	庞德	510003	20	0	2408	541	26019	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
@@ -577,31 +577,31 @@
 10304084	乐进	510002	21	0	3630	435	21788	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
 10304085	王异	510010	21	0	3630	435	21788	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10304086	曹操	510014	21	0	3630	435	21788	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10304091	庞德	510003	21	0	2548	573	27522	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10304092	乐进	510002	21	0	3822	458	22935	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10304093	王异	510010	21	0	3822	458	22935	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10304094	曹操	510014	21	0	3822	458	22935	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10304091	鲍三娘	520002	21	0	3822	458	22935	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10304092	周仓	520003	21	0	2548	573	27522	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10304093	黄巾弓手	610004	21	0	3822	458	22935	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10304094	黄巾弓手	610004	21	0	3822	458	22935	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
 10304095	甘夫人	520006	21	2	4204	509	56064	0	0	0	0	0	0	1950	0	0	0	0	0	0	0	{}
 10305011	黄巾刀兵	610001	22	0	2257	129	6450	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10305012	黄巾刀兵	610001	22	0	2257	129	6450	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10305013	黄巾刀兵	610001	22	0	2257	129	6450	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10305014	黄巾刀兵	610001	22	0	2257	129	6450	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10305015	庞德	510003	22	0	2149	483	23220	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10305021	黄巾刀兵	610001	22	0	2257	129	6450	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10305022	庞德	510003	22	0	2149	483	23220	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10305023	乐进	510002	22	0	3224	387	19350	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10305024	王异	510010	22	0	3224	387	19350	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10305025	曹操	510014	22	0	3224	387	19350	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10305015	郭汜	540002	22	0	3224	387	19350	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
+10305021	黄巾盾兵	610003	22	0	1504	161	7740	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
+10305022	黄巾刀兵	610001	22	0	3224	387	19350	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10305023	黄巾刀兵	610001	22	0	3224	387	19350	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10305024	纪灵	540001	22	0	3224	387	19350	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
+10305025	李傕	540003	22	0	3224	387	19350	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
 10305031	黄巾刀兵	610001	22	0	3083	319	15991	0	0	0	0	1350	0	0	0	0	0	0	0	0	0	{}
-10305032	庞德	510003	22	0	2284	514	24672	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10305033	乐进	510002	22	0	3426	411	20560	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10305034	王异	510010	22	0	3426	411	20560	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10305035	曹操	510014	22	0	3426	411	20560	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10305041	庞德	510003	22	0	2284	514	24672	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10305032	黄巾刀兵	610001	22	0	3426	411	20560	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10305033	黄巾枪兵	610002	22	0	3140	411	22616	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10305034	凌统	530003	22	0	3426	411	20560	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
+10305035	黄巾枪兵	610002	22	0	3140	411	22616	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10305041	黄巾盾兵	610003	22	0	2284	514	24672	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
 10305042	乐进	510002	22	0	3426	411	20560	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10305043	王异	510010	22	0	3426	411	20560	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10305044	曹操	510014	22	0	3426	411	20560	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10305045	甘夫人	520006	22	0	3140	411	22616	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
+10305043	瘟疫毒弓	610005	22	0	2997	436	22616	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
+10305044	丁奉	530007	22	0	2284	514	24672	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10305045	瘟疫毒弓	610005	22	0	2997	436	22616	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
 10305051	黄巾刀兵	610001	22	0	2539	145	7256	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10305052	黄巾刀兵	610001	22	0	2539	145	7256	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10305053	黄巾弓手	610004	22	0	2902	241	12094	0	0	0	0	0	0	0	0	1050	0	0	0	0	0	{}
@@ -627,30 +627,30 @@
 10305086	甘夫人	520006	22	0	3510	459	25276	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
 10305091	黄巾刀兵	610001	22	0	3224	268	13438	0	0	0	0	1050	0	0	0	0	0	0	0	0	0	{}
 10305092	黄巾刀兵	610001	22	0	3224	268	13438	0	0	0	0	1050	0	0	0	0	0	0	0	0	0	{}
-10305093	庞德	510003	22	1	2821	672	35476	0	0	0	0	0	0	0	0	0	0	1650	0	0	0	{}
-10305094	乐进	510002	22	0	4030	483	24188	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10305095	王异	510010	22	0	4030	483	24188	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10305096	曹操	510014	22	2	4836	537	53752	0	0	0	0	1950	0	0	0	0	0	0	0	0	0	{}
+10305093	周仓	520003	22	1	2821	672	35476	0	0	0	0	0	0	0	0	0	0	1650	0	0	0	{}
+10305094	诸葛果	520004	22	0	4030	483	24188	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10305095	黄月英	520011	22	0	3526	514	26607	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10305096	关兴	520005	22	2	4232	571	59127	0	0	0	0	0	0	0	0	0	0	0	0	1950	0	{}
 10306011	黄巾刀兵	610001	23	0	2573	146	7354	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10306012	黄巾盾兵	610003	23	0	1715	183	8825	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
 10306013	黄巾刀兵	610001	23	0	2573	146	7354	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10306014	黄巾枪兵	610002	23	0	2695	244	13482	0	0	1050	0	0	0	0	0	0	0	0	0	0	0	{}
-10306015	黄巾枪兵	610002	23	0	2695	244	13482	0	0	1050	0	0	0	0	0	0	0	0	0	0	0	{}
-10306016	庞德	510003	23	0	2450	550	26475	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10306021	黄巾枪兵	610002	23	0	2506	156	8595	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10306022	庞德	510003	23	0	2603	585	28130	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10306023	乐进	510002	23	0	3905	468	23441	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10306024	王异	510010	23	0	3905	468	23441	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10306014	瘟疫毒弓	610005	23	0	2573	260	13482	0	0	0	0	0	0	1050	0	0	0	0	0	0	0	{}
+10306015	瘟疫毒弓	610005	23	0	2573	260	13482	0	0	0	0	0	0	1050	0	0	0	0	0	0	0	{}
+10306016	吴国太	530002	23	0	3369	440	24269	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10306021	潘璋	530001	23	0	2733	156	7813	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10306022	甘宁	530004	23	0	3905	468	23441	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10306023	凌统	530003	23	0	3905	468	23441	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
+10306024	朱桓	530005	23	0	3417	497	25786	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
 10306025	曹操	510014	23	0	3905	468	23441	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10306031	庞德	510003	23	0	2756	619	29784	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10306032	乐进	510002	23	0	4135	495	24820	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10306033	王异	510010	23	0	4135	495	24820	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10306034	曹操	510014	23	0	4135	495	24820	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10306041	黄巾刀兵	610001	23	0	3055	174	8733	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10306042	黄巾刀兵	610001	23	0	3055	174	8733	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10306043	庞德	510003	23	0	2910	654	31439	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10306044	乐进	510002	23	0	4365	523	26199	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10306045	王异	510010	23	0	4365	523	26199	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10306031	周仓	520003	23	0	2756	619	29784	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10306032	庞德	510003	23	0	2756	619	29784	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10306033	黄巾刀兵	610001	23	0	4135	495	24820	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10306034	孟获	540006	23	0	2756	619	29784	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10306041	乐进	510002	23	0	3055	174	8733	0	0	0	0	0	0	0	0	0	0	0	0	750	0	{}
+10306042	潘璋	530001	23	0	3055	174	8733	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10306043	黄巾弓手	610004	23	0	4365	523	26199	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10306044	蔡文姬	510008	23	0	4001	523	28819	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10306045	黄巾弓手	610004	23	0	4365	523	26199	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
 10306051	黄巾刀兵	610001	23	0	3216	183	9192	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10306052	黄巾刀兵	610001	23	0	3216	183	9192	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10306053	庞德	510003	23	0	3063	688	33094	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
@@ -674,31 +674,31 @@
 10306084	王异	510010	24	0	4549	545	27306	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10306085	甘夫人	520006	24	0	4170	545	30036	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
 10306086	何太后	540008	24	0	3981	579	30036	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10306091	庞德	510003	24	0	3192	717	34491	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10306092	乐进	510002	24	0	4789	573	28743	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10306093	王异	510010	24	0	4789	573	28743	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10306094	甘夫人	520006	24	0	4390	573	31617	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
-10306095	何太后	540008	24	2	5028	677	70261	0	0	0	0	0	0	0	0	0	0	0	0	1950	0	{}
-10307011	黄巾枪兵	610002	25	0	2560	159	8779	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10307012	黄巾枪兵	610002	25	0	2560	159	8779	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10307013	黄巾弓手	610004	25	0	2792	159	7981	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
-10307014	庞德	510003	25	0	2659	597	28732	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10307015	乐进	510002	25	0	3989	478	23943	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10307021	庞德	510003	25	0	2826	634	30528	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10307022	乐进	510002	25	0	4239	507	25440	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10307023	王异	510010	25	0	4239	507	25440	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10307024	甘夫人	520006	25	0	3885	507	27984	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
-10307025	何太后	540008	25	0	3709	539	27984	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10307031	黄巾盾兵	610003	25	0	2393	373	17957	0	0	0	0	0	0	0	0	0	0	1050	0	0	0	{}
-10307032	黄巾盾兵	610003	25	0	2393	373	17957	0	0	0	0	0	0	0	0	0	0	1050	0	0	0	{}
+10306091	黄巾盾兵	610003	24	0	3192	717	34491	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10306092	黄巾盾兵	610003	24	0	3192	717	34491	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10306093	甘宁	530004	24	0	4789	573	28743	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10306094	朱桓	530005	24	0	4190	609	31617	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
+10306095	于禁	510005	24	2	5028	677	70261	0	0	0	0	0	0	0	0	0	0	1950	0	0	0	{}
+10307011	黄巾盾兵	610003	25	0	1861	199	9577	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
+10307012	黄巾盾兵	610003	25	0	1861	199	9577	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
+10307013	黄巾枪兵	610002	25	0	2560	159	8779	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10307014	曹婴	510001	25	0	3989	478	23943	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10307015	糜竺	520001	25	0	3657	478	26337	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10307021	黄巾盾兵	610003	25	0	2826	634	30528	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10307022	李典	510007	25	0	2826	634	30528	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
+10307023	黄巾盾兵	610003	25	0	2826	634	30528	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10307024	黄巾弓手	610004	25	0	4239	507	25440	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10307025	黄巾弓手	610004	25	0	4239	507	25440	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10307031	潘璋	530001	25	0	3590	298	14964	0	0	0	0	1050	0	0	0	0	0	0	0	0	0	{}
+10307032	乐进	510002	25	0	3590	298	14964	0	0	0	0	0	0	0	0	0	0	0	0	1050	0	{}
 10307033	庞德	510003	25	0	2992	672	32323	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10307034	乐进	510002	25	0	4488	537	26936	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10307035	王异	510010	25	0	4488	537	26936	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10307041	庞德	510003	25	0	3158	709	34119	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10307042	乐进	510002	25	0	4737	567	28433	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10307043	王异	510010	25	0	4737	567	28433	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10307034	黄巾弓手	610004	25	0	4488	537	26936	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10307035	黄巾弓手	610004	25	0	4488	537	26936	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10307041	黄巾盾兵	610003	25	0	3158	709	34119	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10307042	黄巾盾兵	610003	25	0	3158	709	34119	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10307043	诸葛果	520004	25	0	4737	567	28433	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
 10307044	甘夫人	520006	25	0	4343	567	31276	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
-10307045	何太后	540008	25	0	4145	603	31276	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
+10307045	司马徽	530006	25	0	4145	603	31276	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
 10307051	黄巾刀兵	610001	25	0	3491	199	9976	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10307052	黄巾刀兵	610001	25	0	3491	199	9976	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10307053	庞德	510003	25	0	3324	747	35915	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
@@ -722,33 +722,33 @@
 10307084	王异	510010	26	0	4929	590	29579	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10307085	甘夫人	520006	26	0	4518	590	32537	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
 10307086	何太后	540008	26	0	4313	627	32537	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10307091	黄巾刀兵	610001	26	0	4151	345	17298	0	0	0	0	1050	0	0	0	0	0	0	0	0	0	{}
-10307092	黄巾刀兵	610001	26	0	4151	345	17298	0	0	0	0	1050	0	0	0	0	0	0	0	0	0	{}
+10307091	黄巾盾兵	610003	26	0	2767	432	20757	0	0	0	0	0	0	0	0	0	0	1050	0	0	0	{}
+10307092	黄巾盾兵	610003	26	0	2767	432	20757	0	0	0	0	0	0	0	0	0	0	1050	0	0	0	{}
 10307093	乐进	510002	26	1	5448	691	38055	0	0	0	0	0	0	0	0	0	0	0	0	1650	0	{}
-10307094	王异	510010	26	0	5188	622	31136	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10307095	甘夫人	520006	26	0	4756	622	34250	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
-10307096	何太后	540008	26	2	5448	734	76111	0	0	0	0	0	0	0	0	0	0	0	0	1950	0	{}
+10307094	甘宁	530004	26	0	5188	622	31136	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10307095	司马徽	530006	26	0	4540	660	34250	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10307096	大乔	530011	26	2	6226	691	69192	0	0	0	0	0	0	0	0	1950	0	0	0	0	0	{}
 10308011	黄巾枪兵	610002	27	0	2768	172	9493	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10308012	黄巾盾兵	610003	27	0	2588	502	24166	0	0	0	0	0	0	0	0	0	0	1350	0	0	0	{}
-10308013	黄巾枪兵	610002	27	0	2768	172	9493	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10308014	王异	510010	27	0	4314	517	25892	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10308015	甘夫人	520006	27	0	3954	517	28481	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
+10308012	黄巾枪兵	610002	27	0	3559	402	22152	0	0	1350	0	0	0	0	0	0	0	0	0	0	0	{}
+10308013	瘟疫毒弓	610005	27	0	2642	183	9493	0	0	0	0	0	0	750	0	0	0	0	0	0	0	{}
+10308014	瘟疫毒弓	610005	27	0	3774	549	28481	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
+10308015	瘟疫毒弓	610005	27	0	3774	549	28481	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
 10308016	何太后	540008	27	0	3774	549	28481	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10308021	黄巾刀兵	610001	27	0	3208	183	9170	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10308022	黄巾盾兵	610003	27	0	2139	228	11004	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
-10308023	黄巾刀兵	610001	27	0	3208	183	9170	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10308024	甘夫人	520006	27	0	4201	549	30262	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
-10308025	何太后	540008	27	0	4010	583	30262	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10308031	黄巾枪兵	610002	27	0	3114	193	10680	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10308032	乐进	510002	27	0	4853	581	29129	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10308033	王异	510010	27	0	4853	581	29129	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10308034	甘夫人	520006	27	0	4449	581	32042	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
-10308035	何太后	540008	27	0	4246	618	32042	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10308041	黄巾弓手	610004	27	0	4610	477	23914	0	0	0	0	0	0	0	0	1350	0	0	0	0	0	{}
-10308042	黄巾弓手	610004	27	0	4610	477	23914	0	0	0	0	0	0	0	0	1350	0	0	0	0	0	{}
-10308043	王异	510010	27	0	5123	614	30747	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10308044	甘夫人	520006	27	0	4696	614	33822	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
-10308045	何太后	540008	27	0	4482	652	33822	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
+10308021	黄巾枪兵	610002	27	0	2941	183	10087	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10308022	黄巾枪兵	610002	27	0	2941	183	10087	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10308023	黄巾枪兵	610002	27	0	2941	183	10087	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10308024	糜竺	520001	27	0	4201	549	30262	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10308025	卞夫人	510004	27	0	4583	549	27510	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10308031	黄巾刀兵	610001	27	0	3397	193	9709	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10308032	黄巾盾兵	610003	27	0	3235	727	34955	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10308033	曹轶	510006	27	0	4853	581	29129	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10308034	卞夫人	510004	27	0	4853	581	29129	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10308035	曹婴	510001	27	0	4853	581	29129	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10308041	黄巾刀兵	610001	27	0	4610	477	23914	0	0	0	0	1350	0	0	0	0	0	0	0	0	0	{}
+10308042	黄巾盾兵	610003	27	0	3073	597	28697	0	0	0	0	0	0	0	0	0	0	1350	0	0	0	{}
+10308043	甘夫人	520006	27	0	4696	614	33822	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
+10308044	曹轶	510006	27	0	5123	614	30747	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10308045	吴国太	530002	27	0	4696	614	33822	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
 10308051	黄巾刀兵	610001	27	0	3774	215	10788	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10308052	黄巾刀兵	610001	27	0	3774	215	10788	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10308053	乐进	510002	27	0	5392	646	32365	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
@@ -773,12 +773,12 @@
 10308084	甘夫人	520006	28	0	4878	638	35129	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
 10308085	何太后	540008	28	1	4889	753	42936	0	0	0	0	0	0	0	0	0	0	0	0	1650	0	{}
 10308086	刘备	520013	28	0	4878	638	35129	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
-10308091	庞德	510003	28	0	3734	839	40340	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10308092	乐进	510002	28	1	5881	746	41087	0	0	0	0	0	0	0	0	0	0	0	0	1650	0	{}
-10308093	王异	510010	28	0	5601	671	33616	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10308094	甘夫人	520006	28	0	5134	671	36978	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
-10308095	何太后	540008	28	0	4901	713	36978	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10308096	刘备	520013	28	2	6161	746	82174	0	0	0	0	0	0	0	0	1950	0	0	0	0	0	{}
+10308091	李典	510007	28	0	3734	839	40340	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
+10308092	黄巾刀兵	610001	28	1	5881	746	41087	0	0	0	0	1650	0	0	0	0	0	0	0	0	0	{}
+10308093	乐进	510002	28	0	5601	671	33616	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
+10308094	曹轶	510006	28	0	5601	671	33616	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10308095	曹婴	510001	28	0	5601	671	33616	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10308096	何太后	540008	28	2	5881	793	82174	0	0	0	0	0	0	0	0	0	0	0	0	1950	0	{}
 10401011	黄巾刀兵	610001	29	0	3255	185	9303	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10401012	黄巾刀兵	610001	29	0	3255	185	9303	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10401013	黄巾弓手	610004	29	0	3720	309	15506	0	0	0	0	0	0	0	0	1050	0	0	0	0	0	{}
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/NPCLineup.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/NPCLineup.txt
index 5ae6309..aa890d3 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/NPCLineup.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/NPCLineup.txt
@@ -7,7 +7,7 @@
 1010106	10101061	10101062	10101063				0		1006	0
 1010107	10101071	10101072	10101073				0		1007	0
 1010108	10101081	10101082	10101083		10101084		0		1008	0
-1010109	10101092	10101093	10101092				10101093		1004	0
+1010109	10101092		10101092		10101093		10101093		1004	0
 1010201	10102011		10102012				0		1010	0
 1010202		10102021		10102022		10102023	0		1011	0
 1010203	10102033		10102031		10102032		0		1012	0
@@ -16,7 +16,7 @@
 1010206	10102061	10102062	10102063		10102064		0		1015	0
 1010207		10102071		10102072	10102074	10102073	0		1016	0
 1010208	10102081		10102082	10102083	10102085	10102084	0		1017	0
-1010209		10102091		10102092	10102094	10102093	10102094		1013	0
+1010209	10102092	10102091	10102093		10102094		10102094		1013	0
 1010301		10103011		10103012		10103013	0		1019	0
 1010302		10103021			10103022		0		1020	0
 1010303	10103031		10103032		10103033		0		1021	0
@@ -25,7 +25,7 @@
 1010306	10103061	10103062	10103063	10103064		10103065	0		1024	0
 1010307	10103071		10103072	10103073	10103074	10103075	0		1001	0
 1010308	10103081	10103083	10103082	10103084		10103085	0		1002	0
-1010309	10103091		10103092	10103093	10103095	10103094	10103095		1008	0
+1010309		10103091		10103093	10103095	10103094	10103095		1008	0
 1010401	10104011		10104012	10104013		10104014	0		1004	0
 1010402		10104021		10104022	10104024	10104023	0		1005	0
 1010403	10104031		10104032	10104033		10104034	0		1006	0
@@ -34,7 +34,7 @@
 1010406	10104061	10104063	10104062		10104064		0		1009	0
 1010407		10104073		10104071	10104074	10104072	0		1010	0
 1010408	10104081		10104082	10104083	10104084	10104085	0		1011	0
-1010409				10104092	10104094	10104093	10104094		1003	0
+1010409	10104091		10104091	10104092	10104094	10104093	10104094		1003	0
 1010501	10105011	10105012	10105013		10105014		0		1013	0
 1010502	10105021		10105022	10105023		10105024	0		1014	0
 1010503	10105031		10105031	10105032		10105033	0		1015	0
@@ -43,7 +43,7 @@
 1010506	10105061	10105062	10105063	10105064		10105065	0		1018	0
 1010507	10105071		10105072	10105073		10105074	0		1019	0
 1010508	10105081	10105083	10105082	10105084		10105085	0		1020	0
-1010509				10105093	10105095	10105094	10105095		1006	0
+1010509	10105091		10105091	10105093	10105095	10105094	10105095		1006	0
 1020101		10201011			10201012		0		1022	0
 1020102	10201021	10201023	10201022				0		1023	0
 1020103	10201031		10201032	10201033	10201035	10201034	0		1024	0
@@ -90,35 +90,35 @@
 1020508	10205082	10205081	10205083	10205084		10205085	0		1017	0
 1020509	10205091		10205092	10205093	10205095	10205094	10205095		1005	0
 1030101	10301011		10301012	10301013	10301015	10301014	0		1019	0
-1030102	10301021	10301023	10301022		10301024		0		1020	0
-1030103	10301031		10301032	10301034	10301033	10301035	0		1021	0
-1030104	10301041		10301042	10301043	10301044	10301045	0		1022	0
+1030102	10301021	10301023	10301022	10301024		10301024	0		1020	0
+1030103	10301031		10301032	10301033		10301034	0		1021	0
+1030104	10301041	10301041	10301041	10301042		10301043	0		1022	0
 1030105		10301051		10301052	10301053	10301054	0		1023	0
 1030106	10301061		10301062	10301063	10301064	10301065	0		1024	0
 1030107	10301071		10301072	10301073	10301074	10301075	0		1001	0
 1030108	10301081	10301082	10301083	10301084	10301085	10301086	0		1002	0
-1030109	10301091		10301092	10301093	10301095	10301094	10301095		1003	0
-1030201	10302011		10302012	10302013	10302015	10302014	0		1004	0
-1030202	10302021		10302023	10302024		10302025	0		1005	0
-1030203	10302032		10302033	10302034	10302031	10302035	0		1006	0
+1030109	10301091	10301095	10301092	10301093		10301094	10301095		1003	0
+1030201	10302011		10302012	10302013		10302014	0		1004	0
+1030202	10302021		10302022	10302023	10302024	10302025	0		1005	0
+1030203	10302031		10302032	10302033	10302034	10302035	0		1006	0
 1030204	10302041		10302042	10302043	10302044	10302045	0		1007	0
 1030205	10302051		10302052	10302053	10302055	10302054	0		1008	0
 1030206	10302061	10302063	10302062	10302064	10302065	10302066	0		1009	0
 1030207	10302071		10302072	10302073	10302074	10302075	0		1010	0
 1030208	10302081		10302082	10302083	10302084	10302085	0		1011	0
 1030209	10302091		10302092	10302093	10302095	10302094	10302095		1012	0
-1030301	10303011	10303012	10303013	10303015	10303014	10303016	0		1013	0
+1030301	10303011		10303013	10303015	10303014	10303016	0		1013	0
 1030302	10303022	10303021	10303023	10303024		10303025	0		1014	0
-1030303	10303031	10303033	10303032	10303034	10303035	10303036	0		1015	0
+1030303	10303031		10303032	10303034	10303035	10303036	0		1015	0
 1030304	10303041		10303042	10303043	10303044	10303045	0		1016	0
 1030305	10303051		10303052	10303053	10303054	10303055	0		1017	0
 1030306	10303061		10303062	10303063	10303064	10303065	0		1018	0
 1030307	10303071	10303072	10303073	10303074	10303075	10303076	0		1019	0
 1030308	10303082	10303081	10303083	10303084	10303085	10303086	0		1020	0
 1030309	10303091	10303093	10303092	10303094	10303096	10303095	10303096		1021	0
-1030401	10304011	10304012	10304013	10304014	10304015	10304016	0		1022	0
-1030402	10304022	10304021	10304023	10304024		10304025	0		1023	0
-1030403	10304033		10304034	10304031	10304035	10304032	0		1024	0
+1030401	10304011	10304012	10304013		10304014		0		1022	0
+1030402	10304021		10304022	10304023	10304024	10304025	0		1023	0
+1030403	10304033		10304034	10304032	10304035	10304032	0		1024	0
 1030404	10304041		10304042	10304043	10304044	10304045	0		1001	0
 1030405	10304053	10304054	10304055	10304051	10304056	10304052	0		1002	0
 1030406	10304061	10304063	10304062	10304064	10304065	10304066	0		1003	0
@@ -127,18 +127,18 @@
 1030409	10304091		10304092	10304093	10304095	10304094	10304095		1006	0
 1030501	10305011		10305012	10305013	10305015	10305014	0		1007	0
 1030502	10305022	10305021	10305023	10305024		10305025	0		1008	0
-1030503	10305032	10305031	10305033	10305034		10305035	0		1009	0
-1030504	10305041		10305042	10305043	10305044	10305045	0		1010	0
+1030503	10305031		10305032	10305033	10305034	10305035	0		1009	0
+1030504	10305041	10305041	10305041	10305043	10305044	10305045	0		1010	0
 1030505	10305051	10305055	10305052	10305053	10305056	10305054	0		1011	0
 1030506	10305061		10305062	10305063	10305064	10305065	0		1012	0
 1030507	10305072	10305071	10305073	10305074	10305075	10305076	0		1013	0
 1030508	10305082	10305081	10305083	10305084	10305085	10305086	0		1014	0
 1030509	10305091	10305093	10305092	10305094	10305096	10305095	10305096		1015	0
-1030601	10306011	10306012	10306013	10306014	10306016	10306015	0		1016	0
-1030602	10306022	10306021	10306023	10306024		10306025	0		1017	0
-1030603		10306031		10306032	10306033	10306034	0		1018	0
+1030601	10306011		10306013	10306014	10306016	10306015	0		1016	0
+1030602	10306021		10306022	10306023		10306024	0		1017	0
+1030603	10306031		10306032	10306033	10306034	10306033	0		1018	0
 1030604	10306041		10306042	10306043	10306044	10306045	0		1019	0
-1030605	10306053	10306054	10306055	10306051	10306056	10306052	0		1020	0
+1030605	10306051		10306052	10306053	10306054	10306055	0		1020	0
 1030606	10306061	10306063	10306062	10306064	10306065	10306066	0		1021	0
 1030607	10306071		10306072	10306073	10306074	10306075	0		1022	0
 1030608	10306082	10306081	10306083	10306084	10306085	10306086	0		1023	0
@@ -151,16 +151,16 @@
 1030706	10307061	10307063	10307062	10307064	10307065	10307066	0		1006	0
 1030707	10307071		10307072	10307073	10307074	10307075	0		1007	0
 1030708	10307082	10307081	10307083	10307084	10307085	10307086	0		1008	0
-1030709	10307091	10307093	10307092	10307094	10307096	10307095	10307096		1009	0
-1030801	10308011	10308012	10308013	10308014	10308015	10308016	0		1010	0
+1030709	10307091		10307092	10307094	10307096	10307095	10307096		1009	0
+1030801	10308011		10308012	10308013	10308014	10308015	0		1010	0
 1030802	10308021	10308022	10308023	10308024		10308025	0		1011	0
-1030803	10308032	10308031	10308033	10308034		10308035	0		1012	0
-1030804	10308041		10308042	10308043	10308044	10308045	0		1013	0
+1030803	10308031	10308032	10308031	10308033	10308034	10308035	0		1012	0
+1030804	10308041	10308042	10308041	10308043	10308044	10308045	0		1013	0
 1030805	10308051	10308053	10308052	10308054	10308055	10308056	0		1014	0
 1030806	10308061	10308065	10308062	10308063	10308066	10308064	0		1015	0
 1030807	10308072	10308071	10308073	10308074	10308075	10308076	0		1016	0
 1030808	10308081	10308082	10308083	10308084	10308085	10308086	0		1017	0
-1030809	10308091	10308092	10308093	10308094	10308096	10308095	10308096		1018	0
+1030809	10308091		10308093	10308094	10308096	10308095	10308096		1018	0
 1040101	10401011		10401012	10401013		10401014	0		1001|1024	0
 1040102		10401023		10401021	10401024	10401022	0		1002|1023	0
 1040103	10401031	10401032	10401033		10401035		0		1003|1022	0
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/MainLevel.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/MainLevel.txt
index 11f7024..b04854a 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/MainLevel.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/MainLevel.txt
@@ -9,24 +9,24 @@
 2	3	1020301	1020302	1020303	1020304			1020309	[[5,2],[3,40]]	12	1
 2	4	1020401	1020402	1020403	1020404			1020409	[[5,2],[3,40]]	14	1
 2	5	1020501	1020502	1020503	1020504			1020509	[[5,2],[3,40],[4,10]]	15	1
-3	1	1030101|1030102	1030103|1030104	1030105|1030106	1030107|1030108			1030109	[[5,2],[3,40]]	16	1
-3	2	1030201|1030202	1030203|1030204	1030205|1030206	1030207|1030208			1030209	[[5,2],[3,40]]	17	1
-3	3	1030301|1030302	1030303|1030304	1030305|1030306	1030307|1030308			1030309	[[5,2],[3,40]]	19	1
-3	4	1030401|1030402	1030403|1030404	1030405|1030406	1030407|1030408			1030409	[[5,2],[3,40]]	21	1
-3	5	1030501|1030502	1030503|1030504	1030505|1030506	1030507|1030508			1030509	[[5,2],[3,40]]	22	1
-3	6	1030601|1030602	1030603|1030604	1030605|1030606	1030607|1030608			1030609	[[5,2],[3,40]]	24	1
-3	7	1030701|1030702	1030703|1030704	1030705|1030706	1030707|1030708			1030709	[[5,2],[3,40]]	26	1
-3	8	1030801|1030802	1030803|1030804	1030805|1030806	1030807|1030808			1030809	[[5,2],[3,40],[4,10]]	28	1
-4	1	1040101|1040102	1040103|1040104	1040105|1040106	1040107|1040108	1040109|1040110		1040111	[[5,2],[3,40]]	29	1
-4	2	1040201|1040202	1040203|1040204	1040205|1040206	1040207|1040208	1040209|1040210		1040211	[[5,2],[3,40]]	30	1
-4	3	1040301|1040302	1040303|1040304	1040305|1040306	1040307|1040308	1040309|1040310		1040311	[[5,2],[3,40]]	31	1
-4	4	1040401|1040402	1040403|1040404	1040405|1040406	1040407|1040408	1040409|1040410		1040411	[[5,2],[3,40]]	32	1
-4	5	1040501|1040502	1040503|1040504	1040505|1040506	1040507|1040508	1040509|1040510		1040511	[[5,2],[3,40]]	34	1
-4	6	1040601|1040602	1040603|1040604	1040605|1040606	1040607|1040608	1040609|1040610		1040611	[[5,2],[3,40]]	35	1
-4	7	1040701|1040702	1040703|1040704	1040705|1040706	1040707|1040708	1040709|1040710		1040711	[[5,2],[3,40]]	36	1
-4	8	1040801|1040802	1040803|1040804	1040805|1040806	1040807|1040808	1040809|1040810		1040811	[[5,2],[3,40]]	38	1
-4	9	1040901|1040902	1040903|1040904	1040905|1040906	1040907|1040908	1040909|1040910		1040911	[[5,2],[3,40]]	40	1
-4	10	1041001|1041002	1041003|1041004	1041005|1041006	1041007|1041008	1041009|1041010		1041011	[[5,2],[3,40],[4,10]]	42	1
+3	1	1030101	1030102	1030103	1030104			1030109	[[5,2],[3,40]]	16	1
+3	2	1030201	1030202	1030203	1030204			1030209	[[5,2],[3,40]]	17	1
+3	3	1030301	1030302	1030303	1030304			1030309	[[5,2],[3,40]]	19	1
+3	4	1030401	1030402	1030403	1030404			1030409	[[5,2],[3,40]]	21	1
+3	5	1030501	1030502	1030503	1030504			1030509	[[5,2],[3,40]]	22	1
+3	6	1030601	1030602	1030603	1030604			1030609	[[5,2],[3,40]]	24	1
+3	7	1030701	1030702	1030703	1030704			1030709	[[5,2],[3,40]]	26	1
+3	8	1030801	1030802	1030803	1030804			1030809	[[5,2],[3,40],[4,10]]	28	1
+4	1	1040101	1040102	1040103	1040104	1040105		1040111	[[5,2],[3,40]]	29	1
+4	2	1040201	1040202	1040203	1040204	1040205		1040211	[[5,2],[3,40]]	30	1
+4	3	1040301	1040302	1040303	1040304	1040305		1040311	[[5,2],[3,40]]	31	1
+4	4	1040401	1040402	1040403	1040404	1040405		1040411	[[5,2],[3,40]]	32	1
+4	5	1040501	1040502	1040503	1040504	1040505		1040511	[[5,2],[3,40]]	34	1
+4	6	1040601	1040602	1040603	1040604	1040605		1040611	[[5,2],[3,40]]	35	1
+4	7	1040701	1040702	1040703	1040704	1040705		1040711	[[5,2],[3,40]]	36	1
+4	8	1040801	1040802	1040803	1040804	1040805		1040811	[[5,2],[3,40]]	38	1
+4	9	1040901	1040902	1040903	1040904	1040905		1040911	[[5,2],[3,40]]	40	1
+4	10	1041001	1041002	1041003	1041004	1041005		1041011	[[5,2],[3,40],[4,10]]	42	1
 5	1	1050101|1050102	1050103|1050104	1050105|1050106	1050107|1050108	1050109|1050110	1050111|1050112	1050113	[[5,2],[3,40]]	43	1
 5	2	1050201|1050202	1050203|1050204	1050205|1050206	1050207|1050208	1050209|1050210	1050211|1050212	1050213	[[5,2],[3,40]]	44	1
 5	3	1050301|1050302	1050303|1050304	1050305|1050306	1050307|1050308	1050309|1050310	1050311|1050312	1050313	[[5,2],[3,40]]	45	1
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/NPC.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/NPC.txt
index 56da819..ec6e3d0 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/NPC.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/NPC.txt
@@ -395,21 +395,21 @@
 10205095	祝融	540007	15	2	2256	250	25080	0	0	0	0	1950	0	0	0	0	0	0	0	0	0	{}
 10301011	黄巾刀兵	610001	16	0	1555	88	4445	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10301012	黄巾刀兵	610001	16	0	1555	88	4445	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10301013	黄巾枪兵	610002	16	0	1426	88	4890	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10301014	黄巾枪兵	610002	16	0	1426	88	4890	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10301015	关兴	520005	16	0	1944	283	14671	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
+10301013	黄巾刀兵	610001	16	0	1555	88	4445	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10301014	黄巾刀兵	610001	16	0	1555	88	4445	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10301015	黄巾刀兵	610001	16	0	2222	266	13337	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10301021	黄巾枪兵	610002	16	0	1426	88	4890	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
 10301022	黄巾枪兵	610002	16	0	1426	88	4890	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10301023	庞德	510003	16	0	1481	333	16004	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10301024	乐进	510002	16	0	2222	266	13337	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10301031	黄巾刀兵	610001	16	0	1652	94	4723	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10301032	黄巾刀兵	610001	16	0	1652	94	4723	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10301033	黄巾枪兵	610002	16	0	1515	94	5195	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10301034	庞德	510003	16	0	1574	354	17005	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10301023	黄巾枪兵	610002	16	0	2037	266	14671	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10301024	黄巾枪兵	610002	16	0	2037	266	14671	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10301031	黄巾枪兵	610002	16	0	1515	94	5195	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10301032	黄巾枪兵	610002	16	0	1515	94	5195	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10301033	乐进	510002	16	0	1652	94	4723	0	0	0	0	0	0	0	0	0	0	0	0	750	0	{}
+10301034	曹婴	510001	16	0	2361	283	14170	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10301035	乐进	510002	16	0	2361	283	14170	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10301041	黄巾枪兵	610002	16	0	1515	94	5195	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10301042	黄巾枪兵	610002	16	0	1515	94	5195	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10301043	庞德	510003	16	0	1574	354	17005	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10301041	黄巾刀兵	610001	16	0	1652	94	4723	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10301042	关兴	520005	16	0	1446	100	5195	0	0	0	0	0	0	0	0	0	0	0	0	750	0	{}
+10301043	鲍三娘	520002	16	0	2361	283	14170	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
 10301044	乐进	510002	16	0	2361	283	14170	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
 10301045	王异	510010	16	0	2361	283	14170	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10301051	庞德	510003	16	0	1666	375	18005	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
@@ -432,31 +432,31 @@
 10301084	庞德	510003	16	0	1759	395	19005	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
 10301085	乐进	510002	16	0	2639	316	15838	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
 10301086	王异	510010	16	0	2639	316	15838	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10301091	庞德	510003	16	0	1852	416	20005	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10301092	乐进	510002	16	0	2778	333	16671	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10301093	王异	510010	16	0	2778	333	16671	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10301094	曹操	510014	16	0	2778	333	16671	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10301095	甘夫人	520006	16	2	3055	370	40752	0	0	0	0	0	0	1950	0	0	0	0	0	0	0	{}
-10302011	黄巾刀兵	610001	17	0	1672	95	4779	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10302012	黄巾刀兵	610001	17	0	1672	95	4779	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10301091	黄巾盾兵	610003	16	0	1852	416	20005	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10301092	黄巾盾兵	610003	16	0	1852	416	20005	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10301093	吴国太	530002	16	0	2546	333	18338	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10301094	司马徽	530006	16	0	2430	354	18338	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10301095	甘宁	530004	16	2	3333	370	37048	0	0	1950	0	0	0	0	0	0	0	0	0	0	0	{}
+10302011	黄巾枪兵	610002	17	0	1533	95	5257	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10302012	黄巾枪兵	610002	17	0	1533	95	5257	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
 10302013	黄巾弓手	610004	17	0	1911	159	7966	0	0	0	0	0	0	0	0	1050	0	0	0	0	0	{}
 10302014	黄巾弓手	610004	17	0	1911	159	7966	0	0	0	0	0	0	0	0	1050	0	0	0	0	0	{}
 10302015	庞德	510003	17	0	1592	358	17207	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10302021	黄巾枪兵	610002	17	0	1533	95	5257	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10302022	庞德	510003	17	0	1592	358	17207	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10302023	乐进	510002	17	0	2389	286	14339	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10302024	王异	510010	17	0	2389	286	14339	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10302021	潘璋	530001	17	0	1672	95	4779	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10302022	黄巾弓手	610004	17	0	2389	286	14339	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10302023	黄巾弓手	610004	17	0	2389	286	14339	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10302024	黄巾弓手	610004	17	0	2389	286	14339	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
 10302025	曹操	510014	17	0	2389	286	14339	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10302031	黄巾刀兵	610001	17	0	1777	101	5078	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10302032	庞德	510003	17	0	1692	380	18282	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10302033	乐进	510002	17	0	2538	304	15235	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10302034	王异	510010	17	0	2538	304	15235	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10302035	曹操	510014	17	0	2538	304	15235	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10302041	庞德	510003	17	0	1692	380	18282	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10302042	乐进	510002	17	0	2538	304	15235	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10302043	王异	510010	17	0	2538	304	15235	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10302044	曹操	510014	17	0	2538	304	15235	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10302045	甘夫人	520006	17	0	2327	304	16759	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
+10302032	黄巾刀兵	610001	17	0	2538	304	15235	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10302033	黄巾刀兵	610001	17	0	2538	304	15235	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10302034	司马徽	530006	17	0	2221	323	16759	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10302035	黄巾刀兵	610001	17	0	2538	304	15235	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10302041	黄巾盾兵	610003	17	0	1692	380	18282	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10302042	黄巾盾兵	610003	17	0	1692	380	18282	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10302043	郭汜	540002	17	0	2538	304	15235	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
+10302044	张宝	540004	17	0	2327	304	16759	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10302045	李傕	540003	17	0	2538	304	15235	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
 10302051	黄巾刀兵	610001	17	0	1881	107	5377	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10302052	黄巾刀兵	610001	17	0	1881	107	5377	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10302053	黄巾刀兵	610001	17	0	1881	107	5377	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
@@ -478,33 +478,33 @@
 10302083	王异	510010	17	0	2837	340	17028	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10302084	曹操	510014	17	0	2837	340	17028	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10302085	甘夫人	520006	17	0	2601	340	18730	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
-10302091	黄巾盾兵	610003	17	0	1792	348	16729	0	0	0	0	0	0	0	0	0	0	1350	0	0	0	{}
-10302092	黄巾盾兵	610003	17	0	1792	348	16729	0	0	0	0	0	0	0	0	0	0	1350	0	0	0	{}
-10302093	庞德	510003	17	0	1991	448	21509	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10302094	乐进	510002	17	0	2986	358	17924	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10302095	王异	510010	17	2	3584	398	39832	0	0	0	0	1950	0	0	0	0	0	0	0	0	0	{}
+10302091	黄巾刀兵	610001	17	0	2688	278	13941	0	0	0	0	1350	0	0	0	0	0	0	0	0	0	{}
+10302092	黄巾刀兵	610001	17	0	2688	278	13941	0	0	0	0	1350	0	0	0	0	0	0	0	0	0	{}
+10302093	潘璋	530001	17	0	2986	358	17924	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10302094	凌统	530003	17	0	2986	358	17924	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
+10302095	朱桓	530005	17	2	3136	423	43815	0	0	0	0	0	0	1950	0	0	0	0	0	0	0	{}
 10303011	黄巾枪兵	610002	18	0	1640	102	5625	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
 10303012	黄巾盾兵	610003	18	0	1193	127	6136	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
 10303013	黄巾枪兵	610002	18	0	1640	102	5625	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10303014	黄巾刀兵	610001	18	0	2300	238	11932	0	0	0	0	1350	0	0	0	0	0	0	0	0	0	{}
+10303014	黄巾弓手	610004	18	0	2300	238	11932	0	0	0	0	0	0	0	0	1350	0	0	0	0	0	{}
 10303015	庞德	510003	18	0	1704	383	18410	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
 10303016	乐进	510002	18	0	2556	306	15341	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
 10303021	黄巾盾兵	610003	18	0	1267	135	6520	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
-10303022	庞德	510003	18	0	1810	406	19560	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10303023	乐进	510002	18	0	2716	325	16300	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10303024	王异	510010	18	0	2716	325	16300	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10303025	曹操	510014	18	0	2716	325	16300	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10303022	黄巾枪兵	610002	18	0	2489	325	17930	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10303023	黄巾枪兵	610002	18	0	2489	325	17930	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10303024	庞德	510003	18	0	1810	406	19560	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10303025	潘璋	530001	18	0	2716	325	16300	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10303031	黄巾枪兵	610002	18	0	1845	114	6328	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
 10303032	黄巾枪兵	610002	18	0	1845	114	6328	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10303033	庞德	510003	18	0	1917	430	20711	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10303034	乐进	510002	18	0	2876	344	17259	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10303035	王异	510010	18	0	2876	344	17259	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10303036	曹操	510014	18	0	2876	344	17259	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10303041	庞德	510003	18	0	2023	454	21862	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10303042	乐进	510002	18	0	3035	363	18218	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10303043	王异	510010	18	0	3035	363	18218	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10303044	曹操	510014	18	0	3035	363	18218	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10303045	甘夫人	520006	18	0	2782	363	20040	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
+10303033	黄巾弓手	610004	18	0	2876	344	17259	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10303034	黄巾弓手	610004	18	0	2876	344	17259	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10303035	曹婴	510001	18	0	2876	344	17259	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10303036	黄巾弓手	610004	18	0	2876	344	17259	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10303041	黄巾盾兵	610003	18	0	2023	454	21862	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10303042	黄巾盾兵	610003	18	0	2023	454	21862	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10303043	黄巾弓手	610004	18	0	3035	363	18218	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10303044	甘夫人	520006	18	0	2782	363	20040	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
+10303045	黄巾弓手	610004	18	0	3035	363	18218	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
 10303051	黄巾枪兵	610002	18	0	2343	212	11719	0	0	1050	0	0	0	0	0	0	0	0	0	0	0	{}
 10303052	黄巾枪兵	610002	18	0	2343	212	11719	0	0	1050	0	0	0	0	0	0	0	0	0	0	0	{}
 10303053	庞德	510003	18	0	2130	478	23012	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
@@ -529,31 +529,31 @@
 10303086	甘夫人	520006	19	0	2964	387	21349	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
 10303091	黄巾枪兵	610002	19	0	2184	136	7491	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
 10303092	黄巾枪兵	610002	19	0	2184	136	7491	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10303093	庞德	510003	19	1	2383	567	29964	0	0	0	0	0	0	0	0	0	0	1650	0	0	0	{}
-10303094	乐进	510002	19	0	3404	408	20430	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10303095	王异	510010	19	0	3404	408	20430	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10303096	曹操	510014	19	2	4085	453	45400	0	0	0	0	1950	0	0	0	0	0	0	0	0	0	{}
+10303093	甘宁	530004	19	1	3574	453	24970	0	0	1650	0	0	0	0	0	0	0	0	0	0	0	{}
+10303094	黄巾弓手	610004	19	0	3404	408	20430	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10303095	黄巾弓手	610004	19	0	3404	408	20430	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10303096	丁奉	530007	19	2	2723	567	54480	0	0	0	0	0	0	0	0	0	0	1950	0	0	0	{}
 10304011	黄巾刀兵	610001	20	0	2023	115	5782	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10304012	黄巾盾兵	610003	20	0	1348	144	6938	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
 10304013	黄巾刀兵	610001	20	0	2023	115	5782	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10304014	黄巾刀兵	610001	20	0	2023	115	5782	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10304014	瘟疫毒弓	610005	20	0	1770	122	6360	0	0	0	0	0	0	750	0	0	0	0	0	0	0	{}
 10304015	黄巾弓手	610004	20	0	2023	115	5782	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
 10304016	黄巾刀兵	610001	20	0	2023	115	5782	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10304021	黄巾盾兵	610003	20	0	1842	358	17201	0	0	0	0	0	0	0	0	0	0	1350	0	0	0	{}
-10304022	庞德	510003	20	0	2047	460	22116	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10304023	乐进	510002	20	0	3071	368	18430	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10304024	王异	510010	20	0	3071	368	18430	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10304025	曹操	510014	20	0	3071	368	18430	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10304031	黄巾刀兵	610001	20	0	2276	130	6504	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10304032	黄巾刀兵	610001	20	0	2276	130	6504	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10304033	庞德	510003	20	0	2167	487	23417	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10304034	乐进	510002	20	0	3251	390	19514	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10304035	王异	510010	20	0	3251	390	19514	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10304041	黄巾刀兵	610001	20	0	2402	137	6866	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10304042	黄巾刀兵	610001	20	0	2402	137	6866	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10304043	庞德	510003	20	0	2288	514	24718	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10304044	乐进	510002	20	0	3432	411	20598	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10304045	王异	510010	20	0	3432	411	20598	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10304022	黄巾盾兵	610003	20	0	2047	460	22116	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10304023	瘟疫毒弓	610005	20	0	2687	391	20273	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
+10304024	曹轶	510006	20	0	3071	368	18430	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10304025	瘟疫毒弓	610005	20	0	2687	391	20273	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
+10304031	黄巾弓手	610004	20	0	2276	130	6504	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
+10304032	黄巾弓手	610004	20	0	2276	130	6504	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
+10304033	周仓	520003	20	0	2167	487	23417	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10304034	庞德	510003	20	0	2167	487	23417	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10304035	司马徽	530006	20	0	2845	414	21465	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10304041	黄巾盾兵	610003	20	0	1601	171	8239	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
+10304042	黄巾盾兵	610003	20	0	1601	171	8239	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
+10304043	瘟疫毒弓	610005	20	0	3003	437	22658	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
+10304044	瘟疫毒弓	610005	20	0	3003	437	22658	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
+10304045	瘟疫毒弓	610005	20	0	3003	437	22658	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
 10304051	黄巾刀兵	610001	20	0	2529	144	7227	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10304052	黄巾刀兵	610001	20	0	2529	144	7227	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10304053	庞德	510003	20	0	2408	541	26019	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
@@ -577,31 +577,31 @@
 10304084	乐进	510002	21	0	3630	435	21788	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
 10304085	王异	510010	21	0	3630	435	21788	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10304086	曹操	510014	21	0	3630	435	21788	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10304091	庞德	510003	21	0	2548	573	27522	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10304092	乐进	510002	21	0	3822	458	22935	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10304093	王异	510010	21	0	3822	458	22935	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10304094	曹操	510014	21	0	3822	458	22935	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10304091	鲍三娘	520002	21	0	3822	458	22935	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10304092	周仓	520003	21	0	2548	573	27522	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10304093	黄巾弓手	610004	21	0	3822	458	22935	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10304094	黄巾弓手	610004	21	0	3822	458	22935	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
 10304095	甘夫人	520006	21	2	4204	509	56064	0	0	0	0	0	0	1950	0	0	0	0	0	0	0	{}
 10305011	黄巾刀兵	610001	22	0	2257	129	6450	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10305012	黄巾刀兵	610001	22	0	2257	129	6450	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10305013	黄巾刀兵	610001	22	0	2257	129	6450	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10305014	黄巾刀兵	610001	22	0	2257	129	6450	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10305015	庞德	510003	22	0	2149	483	23220	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10305021	黄巾刀兵	610001	22	0	2257	129	6450	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10305022	庞德	510003	22	0	2149	483	23220	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10305023	乐进	510002	22	0	3224	387	19350	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10305024	王异	510010	22	0	3224	387	19350	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10305025	曹操	510014	22	0	3224	387	19350	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10305015	郭汜	540002	22	0	3224	387	19350	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
+10305021	黄巾盾兵	610003	22	0	1504	161	7740	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
+10305022	黄巾刀兵	610001	22	0	3224	387	19350	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10305023	黄巾刀兵	610001	22	0	3224	387	19350	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10305024	纪灵	540001	22	0	3224	387	19350	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
+10305025	李傕	540003	22	0	3224	387	19350	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
 10305031	黄巾刀兵	610001	22	0	3083	319	15991	0	0	0	0	1350	0	0	0	0	0	0	0	0	0	{}
-10305032	庞德	510003	22	0	2284	514	24672	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10305033	乐进	510002	22	0	3426	411	20560	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10305034	王异	510010	22	0	3426	411	20560	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10305035	曹操	510014	22	0	3426	411	20560	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10305041	庞德	510003	22	0	2284	514	24672	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10305032	黄巾刀兵	610001	22	0	3426	411	20560	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10305033	黄巾枪兵	610002	22	0	3140	411	22616	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10305034	凌统	530003	22	0	3426	411	20560	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
+10305035	黄巾枪兵	610002	22	0	3140	411	22616	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10305041	黄巾盾兵	610003	22	0	2284	514	24672	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
 10305042	乐进	510002	22	0	3426	411	20560	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10305043	王异	510010	22	0	3426	411	20560	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10305044	曹操	510014	22	0	3426	411	20560	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10305045	甘夫人	520006	22	0	3140	411	22616	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
+10305043	瘟疫毒弓	610005	22	0	2997	436	22616	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
+10305044	丁奉	530007	22	0	2284	514	24672	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10305045	瘟疫毒弓	610005	22	0	2997	436	22616	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
 10305051	黄巾刀兵	610001	22	0	2539	145	7256	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10305052	黄巾刀兵	610001	22	0	2539	145	7256	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10305053	黄巾弓手	610004	22	0	2902	241	12094	0	0	0	0	0	0	0	0	1050	0	0	0	0	0	{}
@@ -627,30 +627,30 @@
 10305086	甘夫人	520006	22	0	3510	459	25276	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
 10305091	黄巾刀兵	610001	22	0	3224	268	13438	0	0	0	0	1050	0	0	0	0	0	0	0	0	0	{}
 10305092	黄巾刀兵	610001	22	0	3224	268	13438	0	0	0	0	1050	0	0	0	0	0	0	0	0	0	{}
-10305093	庞德	510003	22	1	2821	672	35476	0	0	0	0	0	0	0	0	0	0	1650	0	0	0	{}
-10305094	乐进	510002	22	0	4030	483	24188	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10305095	王异	510010	22	0	4030	483	24188	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10305096	曹操	510014	22	2	4836	537	53752	0	0	0	0	1950	0	0	0	0	0	0	0	0	0	{}
+10305093	周仓	520003	22	1	2821	672	35476	0	0	0	0	0	0	0	0	0	0	1650	0	0	0	{}
+10305094	诸葛果	520004	22	0	4030	483	24188	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10305095	黄月英	520011	22	0	3526	514	26607	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10305096	关兴	520005	22	2	4232	571	59127	0	0	0	0	0	0	0	0	0	0	0	0	1950	0	{}
 10306011	黄巾刀兵	610001	23	0	2573	146	7354	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10306012	黄巾盾兵	610003	23	0	1715	183	8825	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
 10306013	黄巾刀兵	610001	23	0	2573	146	7354	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10306014	黄巾枪兵	610002	23	0	2695	244	13482	0	0	1050	0	0	0	0	0	0	0	0	0	0	0	{}
-10306015	黄巾枪兵	610002	23	0	2695	244	13482	0	0	1050	0	0	0	0	0	0	0	0	0	0	0	{}
-10306016	庞德	510003	23	0	2450	550	26475	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10306021	黄巾枪兵	610002	23	0	2506	156	8595	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10306022	庞德	510003	23	0	2603	585	28130	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10306023	乐进	510002	23	0	3905	468	23441	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10306024	王异	510010	23	0	3905	468	23441	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10306014	瘟疫毒弓	610005	23	0	2573	260	13482	0	0	0	0	0	0	1050	0	0	0	0	0	0	0	{}
+10306015	瘟疫毒弓	610005	23	0	2573	260	13482	0	0	0	0	0	0	1050	0	0	0	0	0	0	0	{}
+10306016	吴国太	530002	23	0	3369	440	24269	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10306021	潘璋	530001	23	0	2733	156	7813	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10306022	甘宁	530004	23	0	3905	468	23441	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10306023	凌统	530003	23	0	3905	468	23441	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
+10306024	朱桓	530005	23	0	3417	497	25786	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
 10306025	曹操	510014	23	0	3905	468	23441	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10306031	庞德	510003	23	0	2756	619	29784	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10306032	乐进	510002	23	0	4135	495	24820	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10306033	王异	510010	23	0	4135	495	24820	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10306034	曹操	510014	23	0	4135	495	24820	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10306041	黄巾刀兵	610001	23	0	3055	174	8733	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10306042	黄巾刀兵	610001	23	0	3055	174	8733	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10306043	庞德	510003	23	0	2910	654	31439	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10306044	乐进	510002	23	0	4365	523	26199	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10306045	王异	510010	23	0	4365	523	26199	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10306031	周仓	520003	23	0	2756	619	29784	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10306032	庞德	510003	23	0	2756	619	29784	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10306033	黄巾刀兵	610001	23	0	4135	495	24820	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10306034	孟获	540006	23	0	2756	619	29784	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10306041	乐进	510002	23	0	3055	174	8733	0	0	0	0	0	0	0	0	0	0	0	0	750	0	{}
+10306042	潘璋	530001	23	0	3055	174	8733	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10306043	黄巾弓手	610004	23	0	4365	523	26199	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10306044	蔡文姬	510008	23	0	4001	523	28819	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10306045	黄巾弓手	610004	23	0	4365	523	26199	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
 10306051	黄巾刀兵	610001	23	0	3216	183	9192	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10306052	黄巾刀兵	610001	23	0	3216	183	9192	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10306053	庞德	510003	23	0	3063	688	33094	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
@@ -674,31 +674,31 @@
 10306084	王异	510010	24	0	4549	545	27306	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10306085	甘夫人	520006	24	0	4170	545	30036	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
 10306086	何太后	540008	24	0	3981	579	30036	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10306091	庞德	510003	24	0	3192	717	34491	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10306092	乐进	510002	24	0	4789	573	28743	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10306093	王异	510010	24	0	4789	573	28743	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10306094	甘夫人	520006	24	0	4390	573	31617	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
-10306095	何太后	540008	24	2	5028	677	70261	0	0	0	0	0	0	0	0	0	0	0	0	1950	0	{}
-10307011	黄巾枪兵	610002	25	0	2560	159	8779	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10307012	黄巾枪兵	610002	25	0	2560	159	8779	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10307013	黄巾弓手	610004	25	0	2792	159	7981	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
-10307014	庞德	510003	25	0	2659	597	28732	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10307015	乐进	510002	25	0	3989	478	23943	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10307021	庞德	510003	25	0	2826	634	30528	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10307022	乐进	510002	25	0	4239	507	25440	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10307023	王异	510010	25	0	4239	507	25440	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10307024	甘夫人	520006	25	0	3885	507	27984	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
-10307025	何太后	540008	25	0	3709	539	27984	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10307031	黄巾盾兵	610003	25	0	2393	373	17957	0	0	0	0	0	0	0	0	0	0	1050	0	0	0	{}
-10307032	黄巾盾兵	610003	25	0	2393	373	17957	0	0	0	0	0	0	0	0	0	0	1050	0	0	0	{}
+10306091	黄巾盾兵	610003	24	0	3192	717	34491	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10306092	黄巾盾兵	610003	24	0	3192	717	34491	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10306093	甘宁	530004	24	0	4789	573	28743	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10306094	朱桓	530005	24	0	4190	609	31617	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
+10306095	于禁	510005	24	2	5028	677	70261	0	0	0	0	0	0	0	0	0	0	1950	0	0	0	{}
+10307011	黄巾盾兵	610003	25	0	1861	199	9577	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
+10307012	黄巾盾兵	610003	25	0	1861	199	9577	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
+10307013	黄巾枪兵	610002	25	0	2560	159	8779	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10307014	曹婴	510001	25	0	3989	478	23943	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10307015	糜竺	520001	25	0	3657	478	26337	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10307021	黄巾盾兵	610003	25	0	2826	634	30528	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10307022	李典	510007	25	0	2826	634	30528	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
+10307023	黄巾盾兵	610003	25	0	2826	634	30528	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10307024	黄巾弓手	610004	25	0	4239	507	25440	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10307025	黄巾弓手	610004	25	0	4239	507	25440	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10307031	潘璋	530001	25	0	3590	298	14964	0	0	0	0	1050	0	0	0	0	0	0	0	0	0	{}
+10307032	乐进	510002	25	0	3590	298	14964	0	0	0	0	0	0	0	0	0	0	0	0	1050	0	{}
 10307033	庞德	510003	25	0	2992	672	32323	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10307034	乐进	510002	25	0	4488	537	26936	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10307035	王异	510010	25	0	4488	537	26936	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10307041	庞德	510003	25	0	3158	709	34119	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10307042	乐进	510002	25	0	4737	567	28433	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10307043	王异	510010	25	0	4737	567	28433	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10307034	黄巾弓手	610004	25	0	4488	537	26936	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10307035	黄巾弓手	610004	25	0	4488	537	26936	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10307041	黄巾盾兵	610003	25	0	3158	709	34119	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10307042	黄巾盾兵	610003	25	0	3158	709	34119	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10307043	诸葛果	520004	25	0	4737	567	28433	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
 10307044	甘夫人	520006	25	0	4343	567	31276	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
-10307045	何太后	540008	25	0	4145	603	31276	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
+10307045	司马徽	530006	25	0	4145	603	31276	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
 10307051	黄巾刀兵	610001	25	0	3491	199	9976	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10307052	黄巾刀兵	610001	25	0	3491	199	9976	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10307053	庞德	510003	25	0	3324	747	35915	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
@@ -722,33 +722,33 @@
 10307084	王异	510010	26	0	4929	590	29579	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10307085	甘夫人	520006	26	0	4518	590	32537	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
 10307086	何太后	540008	26	0	4313	627	32537	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10307091	黄巾刀兵	610001	26	0	4151	345	17298	0	0	0	0	1050	0	0	0	0	0	0	0	0	0	{}
-10307092	黄巾刀兵	610001	26	0	4151	345	17298	0	0	0	0	1050	0	0	0	0	0	0	0	0	0	{}
+10307091	黄巾盾兵	610003	26	0	2767	432	20757	0	0	0	0	0	0	0	0	0	0	1050	0	0	0	{}
+10307092	黄巾盾兵	610003	26	0	2767	432	20757	0	0	0	0	0	0	0	0	0	0	1050	0	0	0	{}
 10307093	乐进	510002	26	1	5448	691	38055	0	0	0	0	0	0	0	0	0	0	0	0	1650	0	{}
-10307094	王异	510010	26	0	5188	622	31136	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10307095	甘夫人	520006	26	0	4756	622	34250	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
-10307096	何太后	540008	26	2	5448	734	76111	0	0	0	0	0	0	0	0	0	0	0	0	1950	0	{}
+10307094	甘宁	530004	26	0	5188	622	31136	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10307095	司马徽	530006	26	0	4540	660	34250	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10307096	大乔	530011	26	2	6226	691	69192	0	0	0	0	0	0	0	0	1950	0	0	0	0	0	{}
 10308011	黄巾枪兵	610002	27	0	2768	172	9493	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10308012	黄巾盾兵	610003	27	0	2588	502	24166	0	0	0	0	0	0	0	0	0	0	1350	0	0	0	{}
-10308013	黄巾枪兵	610002	27	0	2768	172	9493	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10308014	王异	510010	27	0	4314	517	25892	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10308015	甘夫人	520006	27	0	3954	517	28481	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
+10308012	黄巾枪兵	610002	27	0	3559	402	22152	0	0	1350	0	0	0	0	0	0	0	0	0	0	0	{}
+10308013	瘟疫毒弓	610005	27	0	2642	183	9493	0	0	0	0	0	0	750	0	0	0	0	0	0	0	{}
+10308014	瘟疫毒弓	610005	27	0	3774	549	28481	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
+10308015	瘟疫毒弓	610005	27	0	3774	549	28481	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
 10308016	何太后	540008	27	0	3774	549	28481	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10308021	黄巾刀兵	610001	27	0	3208	183	9170	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10308022	黄巾盾兵	610003	27	0	2139	228	11004	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
-10308023	黄巾刀兵	610001	27	0	3208	183	9170	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10308024	甘夫人	520006	27	0	4201	549	30262	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
-10308025	何太后	540008	27	0	4010	583	30262	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10308031	黄巾枪兵	610002	27	0	3114	193	10680	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10308032	乐进	510002	27	0	4853	581	29129	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10308033	王异	510010	27	0	4853	581	29129	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10308034	甘夫人	520006	27	0	4449	581	32042	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
-10308035	何太后	540008	27	0	4246	618	32042	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10308041	黄巾弓手	610004	27	0	4610	477	23914	0	0	0	0	0	0	0	0	1350	0	0	0	0	0	{}
-10308042	黄巾弓手	610004	27	0	4610	477	23914	0	0	0	0	0	0	0	0	1350	0	0	0	0	0	{}
-10308043	王异	510010	27	0	5123	614	30747	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10308044	甘夫人	520006	27	0	4696	614	33822	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
-10308045	何太后	540008	27	0	4482	652	33822	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
+10308021	黄巾枪兵	610002	27	0	2941	183	10087	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10308022	黄巾枪兵	610002	27	0	2941	183	10087	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10308023	黄巾枪兵	610002	27	0	2941	183	10087	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10308024	糜竺	520001	27	0	4201	549	30262	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10308025	卞夫人	510004	27	0	4583	549	27510	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10308031	黄巾刀兵	610001	27	0	3397	193	9709	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10308032	黄巾盾兵	610003	27	0	3235	727	34955	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10308033	曹轶	510006	27	0	4853	581	29129	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10308034	卞夫人	510004	27	0	4853	581	29129	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10308035	曹婴	510001	27	0	4853	581	29129	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10308041	黄巾刀兵	610001	27	0	4610	477	23914	0	0	0	0	1350	0	0	0	0	0	0	0	0	0	{}
+10308042	黄巾盾兵	610003	27	0	3073	597	28697	0	0	0	0	0	0	0	0	0	0	1350	0	0	0	{}
+10308043	甘夫人	520006	27	0	4696	614	33822	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
+10308044	曹轶	510006	27	0	5123	614	30747	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10308045	吴国太	530002	27	0	4696	614	33822	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
 10308051	黄巾刀兵	610001	27	0	3774	215	10788	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10308052	黄巾刀兵	610001	27	0	3774	215	10788	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10308053	乐进	510002	27	0	5392	646	32365	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
@@ -773,12 +773,12 @@
 10308084	甘夫人	520006	28	0	4878	638	35129	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
 10308085	何太后	540008	28	1	4889	753	42936	0	0	0	0	0	0	0	0	0	0	0	0	1650	0	{}
 10308086	刘备	520013	28	0	4878	638	35129	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
-10308091	庞德	510003	28	0	3734	839	40340	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10308092	乐进	510002	28	1	5881	746	41087	0	0	0	0	0	0	0	0	0	0	0	0	1650	0	{}
-10308093	王异	510010	28	0	5601	671	33616	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10308094	甘夫人	520006	28	0	5134	671	36978	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
-10308095	何太后	540008	28	0	4901	713	36978	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10308096	刘备	520013	28	2	6161	746	82174	0	0	0	0	0	0	0	0	1950	0	0	0	0	0	{}
+10308091	李典	510007	28	0	3734	839	40340	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
+10308092	黄巾刀兵	610001	28	1	5881	746	41087	0	0	0	0	1650	0	0	0	0	0	0	0	0	0	{}
+10308093	乐进	510002	28	0	5601	671	33616	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
+10308094	曹轶	510006	28	0	5601	671	33616	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10308095	曹婴	510001	28	0	5601	671	33616	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10308096	何太后	540008	28	2	5881	793	82174	0	0	0	0	0	0	0	0	0	0	0	0	1950	0	{}
 10401011	黄巾刀兵	610001	29	0	3255	185	9303	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10401012	黄巾刀兵	610001	29	0	3255	185	9303	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10401013	黄巾弓手	610004	29	0	3720	309	15506	0	0	0	0	0	0	0	0	1050	0	0	0	0	0	{}
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/NPCLineup.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/NPCLineup.txt
index 5ae6309..aa890d3 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/NPCLineup.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/NPCLineup.txt
@@ -7,7 +7,7 @@
 1010106	10101061	10101062	10101063				0		1006	0
 1010107	10101071	10101072	10101073				0		1007	0
 1010108	10101081	10101082	10101083		10101084		0		1008	0
-1010109	10101092	10101093	10101092				10101093		1004	0
+1010109	10101092		10101092		10101093		10101093		1004	0
 1010201	10102011		10102012				0		1010	0
 1010202		10102021		10102022		10102023	0		1011	0
 1010203	10102033		10102031		10102032		0		1012	0
@@ -16,7 +16,7 @@
 1010206	10102061	10102062	10102063		10102064		0		1015	0
 1010207		10102071		10102072	10102074	10102073	0		1016	0
 1010208	10102081		10102082	10102083	10102085	10102084	0		1017	0
-1010209		10102091		10102092	10102094	10102093	10102094		1013	0
+1010209	10102092	10102091	10102093		10102094		10102094		1013	0
 1010301		10103011		10103012		10103013	0		1019	0
 1010302		10103021			10103022		0		1020	0
 1010303	10103031		10103032		10103033		0		1021	0
@@ -25,7 +25,7 @@
 1010306	10103061	10103062	10103063	10103064		10103065	0		1024	0
 1010307	10103071		10103072	10103073	10103074	10103075	0		1001	0
 1010308	10103081	10103083	10103082	10103084		10103085	0		1002	0
-1010309	10103091		10103092	10103093	10103095	10103094	10103095		1008	0
+1010309		10103091		10103093	10103095	10103094	10103095		1008	0
 1010401	10104011		10104012	10104013		10104014	0		1004	0
 1010402		10104021		10104022	10104024	10104023	0		1005	0
 1010403	10104031		10104032	10104033		10104034	0		1006	0
@@ -34,7 +34,7 @@
 1010406	10104061	10104063	10104062		10104064		0		1009	0
 1010407		10104073		10104071	10104074	10104072	0		1010	0
 1010408	10104081		10104082	10104083	10104084	10104085	0		1011	0
-1010409				10104092	10104094	10104093	10104094		1003	0
+1010409	10104091		10104091	10104092	10104094	10104093	10104094		1003	0
 1010501	10105011	10105012	10105013		10105014		0		1013	0
 1010502	10105021		10105022	10105023		10105024	0		1014	0
 1010503	10105031		10105031	10105032		10105033	0		1015	0
@@ -43,7 +43,7 @@
 1010506	10105061	10105062	10105063	10105064		10105065	0		1018	0
 1010507	10105071		10105072	10105073		10105074	0		1019	0
 1010508	10105081	10105083	10105082	10105084		10105085	0		1020	0
-1010509				10105093	10105095	10105094	10105095		1006	0
+1010509	10105091		10105091	10105093	10105095	10105094	10105095		1006	0
 1020101		10201011			10201012		0		1022	0
 1020102	10201021	10201023	10201022				0		1023	0
 1020103	10201031		10201032	10201033	10201035	10201034	0		1024	0
@@ -90,35 +90,35 @@
 1020508	10205082	10205081	10205083	10205084		10205085	0		1017	0
 1020509	10205091		10205092	10205093	10205095	10205094	10205095		1005	0
 1030101	10301011		10301012	10301013	10301015	10301014	0		1019	0
-1030102	10301021	10301023	10301022		10301024		0		1020	0
-1030103	10301031		10301032	10301034	10301033	10301035	0		1021	0
-1030104	10301041		10301042	10301043	10301044	10301045	0		1022	0
+1030102	10301021	10301023	10301022	10301024		10301024	0		1020	0
+1030103	10301031		10301032	10301033		10301034	0		1021	0
+1030104	10301041	10301041	10301041	10301042		10301043	0		1022	0
 1030105		10301051		10301052	10301053	10301054	0		1023	0
 1030106	10301061		10301062	10301063	10301064	10301065	0		1024	0
 1030107	10301071		10301072	10301073	10301074	10301075	0		1001	0
 1030108	10301081	10301082	10301083	10301084	10301085	10301086	0		1002	0
-1030109	10301091		10301092	10301093	10301095	10301094	10301095		1003	0
-1030201	10302011		10302012	10302013	10302015	10302014	0		1004	0
-1030202	10302021		10302023	10302024		10302025	0		1005	0
-1030203	10302032		10302033	10302034	10302031	10302035	0		1006	0
+1030109	10301091	10301095	10301092	10301093		10301094	10301095		1003	0
+1030201	10302011		10302012	10302013		10302014	0		1004	0
+1030202	10302021		10302022	10302023	10302024	10302025	0		1005	0
+1030203	10302031		10302032	10302033	10302034	10302035	0		1006	0
 1030204	10302041		10302042	10302043	10302044	10302045	0		1007	0
 1030205	10302051		10302052	10302053	10302055	10302054	0		1008	0
 1030206	10302061	10302063	10302062	10302064	10302065	10302066	0		1009	0
 1030207	10302071		10302072	10302073	10302074	10302075	0		1010	0
 1030208	10302081		10302082	10302083	10302084	10302085	0		1011	0
 1030209	10302091		10302092	10302093	10302095	10302094	10302095		1012	0
-1030301	10303011	10303012	10303013	10303015	10303014	10303016	0		1013	0
+1030301	10303011		10303013	10303015	10303014	10303016	0		1013	0
 1030302	10303022	10303021	10303023	10303024		10303025	0		1014	0
-1030303	10303031	10303033	10303032	10303034	10303035	10303036	0		1015	0
+1030303	10303031		10303032	10303034	10303035	10303036	0		1015	0
 1030304	10303041		10303042	10303043	10303044	10303045	0		1016	0
 1030305	10303051		10303052	10303053	10303054	10303055	0		1017	0
 1030306	10303061		10303062	10303063	10303064	10303065	0		1018	0
 1030307	10303071	10303072	10303073	10303074	10303075	10303076	0		1019	0
 1030308	10303082	10303081	10303083	10303084	10303085	10303086	0		1020	0
 1030309	10303091	10303093	10303092	10303094	10303096	10303095	10303096		1021	0
-1030401	10304011	10304012	10304013	10304014	10304015	10304016	0		1022	0
-1030402	10304022	10304021	10304023	10304024		10304025	0		1023	0
-1030403	10304033		10304034	10304031	10304035	10304032	0		1024	0
+1030401	10304011	10304012	10304013		10304014		0		1022	0
+1030402	10304021		10304022	10304023	10304024	10304025	0		1023	0
+1030403	10304033		10304034	10304032	10304035	10304032	0		1024	0
 1030404	10304041		10304042	10304043	10304044	10304045	0		1001	0
 1030405	10304053	10304054	10304055	10304051	10304056	10304052	0		1002	0
 1030406	10304061	10304063	10304062	10304064	10304065	10304066	0		1003	0
@@ -127,18 +127,18 @@
 1030409	10304091		10304092	10304093	10304095	10304094	10304095		1006	0
 1030501	10305011		10305012	10305013	10305015	10305014	0		1007	0
 1030502	10305022	10305021	10305023	10305024		10305025	0		1008	0
-1030503	10305032	10305031	10305033	10305034		10305035	0		1009	0
-1030504	10305041		10305042	10305043	10305044	10305045	0		1010	0
+1030503	10305031		10305032	10305033	10305034	10305035	0		1009	0
+1030504	10305041	10305041	10305041	10305043	10305044	10305045	0		1010	0
 1030505	10305051	10305055	10305052	10305053	10305056	10305054	0		1011	0
 1030506	10305061		10305062	10305063	10305064	10305065	0		1012	0
 1030507	10305072	10305071	10305073	10305074	10305075	10305076	0		1013	0
 1030508	10305082	10305081	10305083	10305084	10305085	10305086	0		1014	0
 1030509	10305091	10305093	10305092	10305094	10305096	10305095	10305096		1015	0
-1030601	10306011	10306012	10306013	10306014	10306016	10306015	0		1016	0
-1030602	10306022	10306021	10306023	10306024		10306025	0		1017	0
-1030603		10306031		10306032	10306033	10306034	0		1018	0
+1030601	10306011		10306013	10306014	10306016	10306015	0		1016	0
+1030602	10306021		10306022	10306023		10306024	0		1017	0
+1030603	10306031		10306032	10306033	10306034	10306033	0		1018	0
 1030604	10306041		10306042	10306043	10306044	10306045	0		1019	0
-1030605	10306053	10306054	10306055	10306051	10306056	10306052	0		1020	0
+1030605	10306051		10306052	10306053	10306054	10306055	0		1020	0
 1030606	10306061	10306063	10306062	10306064	10306065	10306066	0		1021	0
 1030607	10306071		10306072	10306073	10306074	10306075	0		1022	0
 1030608	10306082	10306081	10306083	10306084	10306085	10306086	0		1023	0
@@ -151,16 +151,16 @@
 1030706	10307061	10307063	10307062	10307064	10307065	10307066	0		1006	0
 1030707	10307071		10307072	10307073	10307074	10307075	0		1007	0
 1030708	10307082	10307081	10307083	10307084	10307085	10307086	0		1008	0
-1030709	10307091	10307093	10307092	10307094	10307096	10307095	10307096		1009	0
-1030801	10308011	10308012	10308013	10308014	10308015	10308016	0		1010	0
+1030709	10307091		10307092	10307094	10307096	10307095	10307096		1009	0
+1030801	10308011		10308012	10308013	10308014	10308015	0		1010	0
 1030802	10308021	10308022	10308023	10308024		10308025	0		1011	0
-1030803	10308032	10308031	10308033	10308034		10308035	0		1012	0
-1030804	10308041		10308042	10308043	10308044	10308045	0		1013	0
+1030803	10308031	10308032	10308031	10308033	10308034	10308035	0		1012	0
+1030804	10308041	10308042	10308041	10308043	10308044	10308045	0		1013	0
 1030805	10308051	10308053	10308052	10308054	10308055	10308056	0		1014	0
 1030806	10308061	10308065	10308062	10308063	10308066	10308064	0		1015	0
 1030807	10308072	10308071	10308073	10308074	10308075	10308076	0		1016	0
 1030808	10308081	10308082	10308083	10308084	10308085	10308086	0		1017	0
-1030809	10308091	10308092	10308093	10308094	10308096	10308095	10308096		1018	0
+1030809	10308091		10308093	10308094	10308096	10308095	10308096		1018	0
 1040101	10401011		10401012	10401013		10401014	0		1001|1024	0
 1040102		10401023		10401021	10401024	10401022	0		1002|1023	0
 1040103	10401031	10401032	10401033		10401035		0		1003|1022	0

--
Gitblit v1.8.0