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

---
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/MainLevel.txt |   18 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/NPC.txt       |  290 ++++++++++----------
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Skill.txt     |   23 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Skill.txt     |   23 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/NPC.txt       |  290 ++++++++++----------
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/MainLevel.txt |   18 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/NPCLineup.txt |   72 ++--
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/NPCLineup.txt |   72 ++--
 8 files changed, 404 insertions(+), 402 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 32b59cf..11f7024 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
@@ -1,14 +1,14 @@
 ChapterID	LevelNum	WaveLineupIDList1	WaveLineupIDList2	WaveLineupIDList3	WaveLineupIDList4	WaveLineupIDList5	WaveLineupIDList6	BossLineupIDList	AwardItemList	NPCLV	Difficulty
 1	1	1010101	1010102	1010103	1010104			1010109	[[5,2],[3,40]]	1	1
-1	2	1010201|1010202	1010203|1010204	1010205|1010206	1010207|1010208			1010209	[[5,10],[3,40]]	2	1
-1	3	1010301|1010302	1010303|1010304	1010305|1010306	1010307|1010308			1010309	[[5,2],[3,40]]	4	1
-1	4	1010401|1010402	1010403|1010404	1010405|1010406	1010407|1010408			1010409	[[5,2],[3,40]]	5	1
-1	5	1010501|1010502	1010503|1010504	1010505|1010506	1010507|1010508			1010509	[[5,2],[3,40],[4,10]]	7	1
-2	1	1020101|1020102	1020103|1020104	1020105|1020106	1020107|1020108			1020109	[[5,2],[3,40]]	9	1
-2	2	1020201|1020202	1020203|1020204	1020205|1020206	1020207|1020208			1020209	[[5,2],[3,40]]	10	1
-2	3	1020301|1020302	1020303|1020304	1020305|1020306	1020307|1020308			1020309	[[5,2],[3,40]]	12	1
-2	4	1020401|1020402	1020403|1020404	1020405|1020406	1020407|1020408			1020409	[[5,2],[3,40]]	14	1
-2	5	1020501|1020502	1020503|1020504	1020505|1020506	1020507|1020508			1020509	[[5,2],[3,40],[4,10]]	15	1
+1	2	1010201	1010202	1010203	1010204			1010209	[[5,10],[3,40]]	2	1
+1	3	1010301	1010302	1010303	1010304			1010309	[[5,2],[3,40]]	4	1
+1	4	1010401	1010402	1010403	1010404			1010409	[[5,2],[3,40]]	5	1
+1	5	1010501	1010502	1010503	1010504			1010509	[[5,2],[3,40],[4,10]]	7	1
+2	1	1020101	1020102	1020103	1020104			1020109	[[5,2],[3,40]]	9	1
+2	2	1020201	1020202	1020203	1020204			1020209	[[5,2],[3,40]]	10	1
+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
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 a7fd5ec..56da819 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
@@ -1,12 +1,12 @@
 NPCID	NPCName	RelatedHeroID	LV	BossType	Atk	Def	MaxHP	FinalDamPer	FinalDamPerDef	MissRate	MissRateDef	SuperHitRate	SuperHitRateDef	StunRate	StunRateDef	ComboRate	ComboRateDef	ParryRate	ParryRateDef	SuckHPPer	SuckHPPerDef	SpecAttrInfo
 10101011	黄巾刀兵	610001	1	0	9	0	13	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
 10101021	黄巾刀兵	610001	1	0	18	0	26	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-10101022	黄巾枪兵	610002	1	0	16	0	29	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+10101022	黄巾刀兵	610001	1	0	18	0	26	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
 10101031	黄巾刀兵	610001	1	0	27	0	39	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-10101032	黄巾枪兵	610002	1	0	25	0	43	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+10101032	黄巾刀兵	610001	1	0	27	0	39	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
 10101033	黄巾枪兵	610002	1	0	25	0	43	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
 10101041	黄巾刀兵	610001	1	0	36	0	52	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-10101042	黄巾刀兵	610001	1	0	36	0	52	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+10101042	黄巾枪兵	610002	1	0	33	0	58	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
 10101043	黄巾枪兵	610002	1	0	33	0	58	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
 10101051	黄巾盾兵	610003	1	0	24	0	63	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
 10101052	黄巾盾兵	610003	1	0	24	0	63	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
@@ -22,20 +22,20 @@
 10101083	黄巾刀兵	610001	1	0	73	0	105	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
 10101084	黄巾刀兵	610001	1	0	73	0	105	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
 10101091	黄巾刀兵	610001	1	0	46	0	66	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-10101092	黄巾弓手	610004	1	0	46	0	66	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+10101092	黄巾刀兵	610001	1	0	46	0	66	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
 10101093	庞德	510003	1	2	52	0	528	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
 10102011	黄巾刀兵	610001	2	0	54	0	77	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-10102012	黄巾弓手	610004	2	0	54	0	77	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-10102021	黄巾弓手	610004	2	0	54	0	77	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-10102022	黄巾弓手	610004	2	0	54	0	77	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-10102023	黄巾弓手	610004	2	0	54	0	77	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+10102012	黄巾刀兵	610001	2	0	54	0	77	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+10102021	黄巾枪兵	610002	2	0	49	0	85	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+10102022	黄巾刀兵	610001	2	0	54	0	77	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+10102023	黄巾刀兵	610001	2	0	54	0	77	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
 10102031	黄巾刀兵	610001	2	0	54	0	77	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-10102032	黄巾刀兵	610001	2	0	54	0	77	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-10102033	黄巾盾兵	610003	2	0	36	0	93	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-10102041	黄巾弓手	610004	2	0	68	0	97	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
-10102042	黄巾弓手	610004	2	0	68	0	97	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
-10102043	黄巾弓手	610004	2	0	68	0	97	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
-10102044	黄巾弓手	610004	2	0	68	0	97	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
+10102032	黄巾枪兵	610002	2	0	49	0	85	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+10102033	黄巾刀兵	610001	2	0	54	0	77	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+10102041	黄巾刀兵	610001	2	0	68	0	97	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10102042	黄巾刀兵	610001	2	0	68	0	97	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10102043	黄巾枪兵	610002	2	0	62	0	106	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10102044	黄巾枪兵	610002	2	0	62	0	106	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
 10102051	黄巾刀兵	610001	2	0	68	0	97	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10102052	黄巾刀兵	610001	2	0	68	0	97	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10102053	曹婴	510001	2	0	97	0	291	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
@@ -52,25 +52,25 @@
 10102083	黄巾刀兵	610001	2	0	81	0	116	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10102084	黄巾刀兵	610001	2	0	81	0	116	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10102085	庞德	510003	2	0	77	0	419	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10102091	黄巾盾兵	610003	2	0	63	0	163	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
-10102092	黄巾刀兵	610001	2	0	95	0	136	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10102093	黄巾刀兵	610001	2	0	95	0	136	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10102094	卞夫人	510004	2	2	163	0	907	0	0	1950	0	0	0	0	0	0	0	0	0	0	0	{}
-10103011	黄巾刀兵	610001	3	0	89	0	128	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10103012	黄巾盾兵	610003	3	0	59	0	154	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
+10102091	黄巾刀兵	610001	2	0	95	0	136	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10102092	黄巾枪兵	610002	2	0	87	0	149	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10102093	黄巾枪兵	610002	2	0	87	0	149	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10102094	潘璋	530001	2	2	163	0	907	0	0	0	0	1950	0	0	0	0	0	0	0	0	0	{}
+10103011	黄巾枪兵	610002	3	0	82	0	141	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10103012	黄巾刀兵	610001	3	0	89	0	128	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10103013	黄巾刀兵	610001	3	0	89	0	128	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10103021	黄巾刀兵	610001	3	0	89	0	128	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10103022	黄巾刀兵	610001	3	0	89	0	128	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10103022	黄巾弓手	610004	3	0	89	0	128	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
 10103023	庞德	510003	3	0	85	0	462	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
 10103024	乐进	510002	3	0	128	0	385	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
 10103031	黄巾刀兵	610001	3	0	107	0	154	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10103032	黄巾刀兵	610001	3	0	107	0	154	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10103033	黄巾弓手	610004	3	0	107	0	154	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
+10103033	庞德	510003	3	0	71	0	184	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
 10103034	黄巾弓手	610004	3	0	107	0	154	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
 10103035	乐进	510002	3	0	154	0	462	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10103041	黄巾枪兵	610002	3	0	98	0	169	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10103042	黄巾盾兵	610003	3	0	71	0	184	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
-10103043	黄巾枪兵	610002	3	0	98	0	169	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10103041	黄巾刀兵	610001	3	0	107	0	154	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10103042	黄巾刀兵	610001	3	0	107	0	154	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10103043	黄巾弓手	610004	3	0	107	0	154	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
 10103044	黄巾弓手	610004	3	0	107	0	154	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
 10103045	黄巾弓手	610004	3	0	107	0	154	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
 10103051	黄巾枪兵	610002	3	0	115	0	197	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
@@ -94,24 +94,24 @@
 10103085	王异	510010	4	0	191	0	574	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10103091	黄巾刀兵	610001	4	0	156	0	223	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10103092	黄巾刀兵	610001	4	0	156	0	223	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10103093	黄巾刀兵	610001	4	0	156	0	223	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10103094	黄巾刀兵	610001	4	0	156	0	223	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10103095	王异	510010	4	2	268	0	1489	0	0	0	0	1950	0	0	0	0	0	0	0	0	0	{}
+10103093	黄巾弓手	610004	4	0	156	0	223	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
+10103094	黄巾弓手	610004	4	0	156	0	223	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
+10103095	郭汜	540002	4	2	268	0	1489	0	0	0	0	0	0	0	0	0	0	0	0	1950	0	{}
 10104011	黄巾刀兵	610001	5	0	133	0	190	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10104012	黄巾刀兵	610001	5	0	133	0	190	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10104013	黄巾弓手	610004	5	0	133	0	190	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
-10104014	黄巾弓手	610004	5	0	133	0	190	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
-10104021	黄巾盾兵	610003	5	0	89	0	228	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
-10104022	黄巾刀兵	610001	5	0	133	0	190	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10104023	黄巾刀兵	610001	5	0	133	0	190	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10104024	庞德	510003	5	0	127	0	686	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10104031	黄巾盾兵	610003	5	0	89	0	228	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
-10104032	黄巾刀兵	610001	5	0	133	0	190	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10104033	庞德	510003	5	0	127	0	686	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10104034	乐进	510002	5	0	190	0	572	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10104041	黄巾盾兵	610003	5	0	106	0	274	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
-10104042	庞德	510003	5	0	152	0	824	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10104043	乐进	510002	5	0	228	0	686	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
+10104013	黄巾枪兵	610002	5	0	122	0	209	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10104014	黄巾枪兵	610002	5	0	122	0	209	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10104021	黄巾枪兵	610002	5	0	122	0	209	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10104022	黄巾弓手	610004	5	0	133	0	190	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
+10104023	黄巾弓手	610004	5	0	133	0	190	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
+10104024	纪灵	540001	5	0	190	0	572	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
+10104031	黄巾枪兵	610002	5	0	122	0	209	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10104032	黄巾枪兵	610002	5	0	122	0	209	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10104033	黄巾弓手	610004	5	0	190	0	572	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10104034	黄巾弓手	610004	5	0	190	0	572	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10104041	黄巾刀兵	610001	5	0	160	0	228	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10104042	黄巾弓手	610004	5	0	228	0	686	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10104043	黄巾枪兵	610002	5	0	209	0	755	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
 10104044	王异	510010	5	0	228	0	686	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10104051	黄巾刀兵	610001	5	0	160	0	228	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10104052	黄巾刀兵	610001	5	0	160	0	228	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
@@ -131,28 +131,28 @@
 10104083	庞德	510003	5	0	178	0	961	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
 10104084	乐进	510002	5	0	267	0	801	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
 10104085	王异	510010	5	0	267	0	801	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10104091	黄巾盾兵	610003	5	0	142	0	366	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
-10104092	庞德	510003	5	0	203	0	1099	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10104093	乐进	510002	5	0	305	0	915	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10104094	王异	510010	5	2	366	0	2035	0	0	0	0	1950	0	0	0	0	0	0	0	0	0	{}
-10105011	黄巾盾兵	610003	6	0	187	0	481	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
-10105012	黄巾刀兵	610001	6	0	280	0	401	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10105013	黄巾盾兵	610003	6	0	187	0	481	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
+10104091	黄巾刀兵	610001	5	0	213	0	305	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10104092	黄巾刀兵	610001	5	0	305	0	915	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10104093	黄巾刀兵	610001	5	0	305	0	915	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10104094	李傕	540003	5	2	366	0	2035	0	0	1950	0	0	0	0	0	0	0	0	0	0	0	{}
+10105011	黄巾刀兵	610001	6	0	280	0	401	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10105012	黄巾枪兵	610002	6	0	257	0	441	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10105013	黄巾刀兵	610001	6	0	280	0	401	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10105014	黄巾弓手	610004	6	0	280	0	401	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
 10105015	黄巾弓手	610004	6	0	280	0	401	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
-10105021	黄巾盾兵	610003	6	0	187	0	481	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
-10105022	黄巾弓手	610004	6	0	280	0	401	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
-10105023	黄巾盾兵	610003	6	0	187	0	481	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
-10105024	乐进	510002	6	0	401	0	1204	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
+10105021	黄巾枪兵	610002	6	0	257	0	441	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10105022	黄巾枪兵	610002	6	0	257	0	441	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10105023	黄巾刀兵	610001	6	0	280	0	401	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10105024	黄巾刀兵	610001	6	0	401	0	1204	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10105025	王异	510010	6	0	401	0	1204	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10105031	庞德	510003	6	0	321	0	1734	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10105032	乐进	510002	6	0	481	0	1445	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10105033	王异	510010	6	0	481	0	1445	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10105031	黄巾枪兵	610002	6	0	441	0	1589	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10105032	李傕	540003	6	0	481	0	1445	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10105033	郭汜	540002	6	0	481	0	1445	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
 10105041	黄巾刀兵	610001	6	0	337	0	481	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10105042	黄巾盾兵	610003	6	0	224	0	578	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
+10105042	黄巾枪兵	610002	6	0	309	0	529	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
 10105043	黄巾刀兵	610001	6	0	337	0	481	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10105044	庞德	510003	6	0	321	0	1734	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10105045	乐进	510002	6	0	481	0	1445	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
+10105044	黄巾弓手	610004	6	0	481	0	1445	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10105045	黄巾弓手	610004	6	0	481	0	1445	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
 10105051	黄巾刀兵	610001	6	0	393	0	561	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10105052	黄巾刀兵	610001	6	0	393	0	561	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10105053	庞德	510003	6	0	374	0	2023	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
@@ -171,28 +171,28 @@
 10105083	庞德	510003	7	0	549	123	3955	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
 10105084	乐进	510002	7	0	824	99	3296	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
 10105085	王异	510010	7	0	824	99	3296	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10105091	黄巾枪兵	610002	7	0	587	36	1342	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10105092	黄巾枪兵	610002	7	0	587	36	1342	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10105093	庞德	510003	7	0	610	137	4394	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10105094	乐进	510002	7	0	915	110	3662	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10105095	王异	510010	7	2	1098	122	8138	0	0	0	0	1950	0	0	0	0	0	0	0	0	0	{}
+10105091	黄巾刀兵	610001	7	0	640	36	1220	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10105092	黄巾刀兵	610001	7	0	640	36	1220	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10105093	李傕	540003	7	0	915	110	3662	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10105094	郭汜	540002	7	0	915	110	3662	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
+10105095	张角	540015	7	2	961	130	8952	0	0	0	0	0	0	1950	0	0	0	0	0	0	0	{}
 10201011	黄巾盾兵	610003	8	0	383	41	1316	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
-10201012	黄巾盾兵	610003	8	0	383	41	1316	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
+10201012	黄巾弓手	610004	8	0	575	32	1096	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
 10201013	黄巾刀兵	610001	8	0	575	32	1096	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10201014	黄巾弓手	610004	8	0	575	32	1096	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
 10201021	黄巾刀兵	610001	8	0	611	34	1165	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10201022	黄巾刀兵	610001	8	0	611	34	1165	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10201023	庞德	510003	8	0	582	130	4195	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10201023	黄巾盾兵	610003	8	0	582	130	4195	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
 10201024	乐进	510002	8	0	874	104	3496	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10201031	黄巾枪兵	610002	8	0	593	36	1357	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10201032	黄巾弓手	610004	8	0	740	61	2056	0	0	0	0	0	0	0	0	1050	0	0	0	0	0	{}
-10201033	黄巾枪兵	610002	8	0	593	36	1357	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10201034	庞德	510003	8	0	617	138	4442	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10201035	乐进	510002	8	0	925	110	3702	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10201041	黄巾枪兵	610002	8	0	626	38	1432	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10201042	庞德	510003	8	0	651	146	4689	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10201043	乐进	510002	8	0	976	116	3907	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10201044	王异	510010	8	0	976	116	3907	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10201031	黄巾刀兵	610001	8	0	647	36	1234	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10201032	黄巾刀兵	610001	8	0	740	61	2056	0	0	0	0	1050	0	0	0	0	0	0	0	0	0	{}
+10201033	黄巾刀兵	610001	8	0	647	36	1234	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10201034	黄巾刀兵	610001	8	0	925	110	3702	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10201035	鲍三娘	520002	8	0	925	110	3702	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10201041	乐进	510002	8	0	683	38	1302	0	0	0	0	0	0	0	0	0	0	0	0	750	0	{}
+10201042	黄巾枪兵	610002	8	0	895	116	4298	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10201043	曹婴	510001	8	0	976	116	3907	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10201044	黄巾枪兵	610002	8	0	895	116	4298	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
 10201051	黄巾刀兵	610001	8	0	719	41	1371	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10201052	黄巾刀兵	610001	8	0	719	41	1371	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10201053	黄巾枪兵	610002	8	0	659	41	1508	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
@@ -213,28 +213,28 @@
 10201085	王异	510010	9	0	1084	129	4336	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10201091	黄巾刀兵	610001	9	0	912	76	2536	0	0	0	0	1050	0	0	0	0	0	0	0	0	0	{}
 10201092	黄巾刀兵	610001	9	0	912	76	2536	0	0	0	0	1050	0	0	0	0	0	0	0	0	0	{}
-10201093	庞德	510003	9	0	760	171	5477	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10201094	乐进	510002	9	0	1141	136	4564	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10201095	王异	510010	9	2	1369	152	10144	0	0	0	0	1950	0	0	0	0	0	0	0	0	0	{}
-10202011	黄巾盾兵	610003	10	0	497	53	2131	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
+10201093	黄巾弓手	610004	9	0	1141	136	4564	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10201094	黄巾弓手	610004	9	0	1141	136	4564	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10201095	韩遂	540005	9	2	1369	152	10144	0	0	1950	0	0	0	0	0	0	0	0	0	0	0	{}
+10202011	黄巾刀兵	610001	10	0	746	42	1776	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10202012	黄巾盾兵	610003	10	0	497	53	2131	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
-10202013	黄巾盾兵	610003	10	0	497	53	2131	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
-10202014	黄巾刀兵	610001	10	0	746	42	1776	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10202013	黄巾刀兵	610001	10	0	746	42	1776	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10202014	黄巾弓手	610004	10	0	746	42	1776	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
 10202015	黄巾刀兵	610001	10	0	746	42	1776	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10202021	黄巾刀兵	610001	10	0	746	42	1776	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10202022	黄巾刀兵	610001	10	0	746	42	1776	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10202023	黄巾弓手	610004	10	0	746	42	1776	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
+10202021	黄巾盾兵	610003	10	0	497	53	2131	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
+10202022	黄巾盾兵	610003	10	0	497	53	2131	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
+10202023	糜竺	520001	10	0	683	42	1954	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
 10202024	黄巾枪兵	610002	10	0	683	42	1954	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10202025	庞德	510003	10	0	710	159	6395	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10202031	黄巾刀兵	610001	10	0	746	42	1776	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10202032	黄巾刀兵	610001	10	0	746	42	1776	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10202033	庞德	510003	10	0	710	159	6395	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10202034	乐进	510002	10	0	1065	127	5329	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
+10202025	乐进	510002	10	0	1065	127	5329	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
+10202031	黄巾盾兵	610003	10	0	497	53	2131	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
+10202032	黄巾枪兵	610002	10	0	683	42	1954	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10202033	黄巾枪兵	610002	10	0	977	127	5862	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10202034	庞德	510003	10	0	710	159	6395	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
 10202041	黄巾刀兵	610001	10	0	790	45	1881	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10202042	黄巾刀兵	610001	10	0	790	45	1881	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10202043	黄巾弓手	610004	10	0	790	45	1881	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
+10202042	黄巾盾兵	610003	10	0	526	56	2257	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
+10202043	黄巾刀兵	610001	10	0	790	45	1881	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10202044	黄巾弓手	610004	10	0	790	45	1881	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
-10202045	庞德	510003	10	0	752	169	6771	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10202045	黄巾弓手	610004	10	0	1128	135	5643	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
 10202051	黄巾枪兵	610002	10	0	724	45	2069	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
 10202052	黄巾枪兵	610002	10	0	724	45	2069	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
 10202053	黄巾刀兵	610001	10	0	902	75	3135	0	0	0	0	1050	0	0	0	0	0	0	0	0	0	{}
@@ -258,28 +258,28 @@
 10202086	乐进	510002	10	0	1191	142	5956	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
 10202091	黄巾刀兵	610001	10	0	877	50	2090	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10202092	黄巾刀兵	610001	10	0	877	50	2090	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10202093	黄巾弓手	610004	10	0	877	50	2090	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
-10202094	黄巾弓手	610004	10	0	877	50	2090	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
+10202093	黄巾枪兵	610002	10	0	804	50	2299	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10202094	黄巾枪兵	610002	10	0	804	50	2299	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
 10202095	庞德	510003	10	0	836	188	7524	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10202096	乐进	510002	10	2	1504	167	13933	0	0	0	0	0	0	0	0	0	0	0	0	1950	0	{}
+10202096	孟获	540006	10	2	1003	209	16720	0	0	0	0	0	0	0	0	0	0	1950	0	0	0	{}
 10203011	黄巾刀兵	610001	11	0	856	48	2040	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10203012	黄巾刀兵	610001	11	0	856	48	2040	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10203013	黄巾刀兵	610001	11	0	856	48	2040	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10203014	黄巾刀兵	610001	11	0	856	48	2040	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10203015	庞德	510003	11	0	816	183	7346	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10203015	司马徽	530006	11	0	1071	156	6734	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
 10203021	黄巾盾兵	610003	11	0	606	65	2602	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
 10203022	黄巾盾兵	610003	11	0	606	65	2602	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
-10203023	庞德	510003	11	0	867	195	7806	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10203024	乐进	510002	11	0	1300	156	6505	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10203025	王异	510010	11	0	1300	156	6505	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10203031	黄巾盾兵	610003	11	0	642	68	2755	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
-10203032	黄巾盾兵	610003	11	0	642	68	2755	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
+10203023	黄巾枪兵	610002	11	0	1192	156	7155	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10203024	黄巾弓手	610004	11	0	1300	156	6505	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10203025	黄巾枪兵	610002	11	0	1192	156	7155	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10203031	黄巾刀兵	610001	11	0	963	55	2295	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10203032	黄巾刀兵	610001	11	0	963	55	2295	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10203033	庞德	510003	11	0	918	206	8265	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10203034	乐进	510002	11	0	1377	165	6887	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10203035	王异	510010	11	0	1377	165	6887	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10203041	黄巾刀兵	610001	11	0	1017	58	2423	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10203034	吴国太	530002	11	0	1262	165	7576	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10203035	糜竺	520001	11	0	1262	165	7576	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10203041	黄巾盾兵	610003	11	0	678	72	2908	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
 10203042	黄巾盾兵	610003	11	0	775	121	4846	0	0	0	0	0	0	0	0	0	0	1050	0	0	0	{}
-10203043	黄巾刀兵	610001	11	0	1017	58	2423	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10203043	黄巾盾兵	610003	11	0	678	72	2908	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
 10203044	黄巾弓手	610004	11	0	1017	58	2423	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
 10203045	黄巾弓手	610004	11	0	1017	58	2423	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
 10203046	王异	510010	11	0	1453	174	7270	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
@@ -303,27 +303,27 @@
 10203084	庞德	510003	12	0	1024	229	9223	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
 10203085	乐进	510002	12	0	1536	183	7686	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
 10203086	王异	510010	12	0	1536	183	7686	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10203091	黄巾枪兵	610002	12	0	1186	107	4944	0	0	1050	0	0	0	0	0	0	0	0	0	0	0	{}
-10203092	黄巾枪兵	610002	12	0	1186	107	4944	0	0	1050	0	0	0	0	0	0	0	0	0	0	0	{}
-10203093	庞德	510003	12	0	1078	242	9709	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10203094	乐进	510002	12	0	1617	193	8091	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10203095	王异	510010	12	2	1941	215	17980	0	0	0	0	1950	0	0	0	0	0	0	0	0	0	{}
-10204011	庞德	510003	13	0	909	204	8187	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10204012	乐进	510002	13	0	1364	163	6823	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
+10203091	黄巾盾兵	610003	12	0	862	134	5394	0	0	0	0	0	0	0	0	0	0	1050	0	0	0	{}
+10203092	李典	510007	12	0	862	134	5394	0	0	0	0	0	0	1050	0	0	0	0	0	0	0	{}
+10203093	黄巾弓手	610004	12	0	1617	193	8091	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10203094	黄巾弓手	610004	12	0	1617	193	8091	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10203095	卞夫人	510004	12	2	1941	215	17980	0	0	1950	0	0	0	0	0	0	0	0	0	0	0	{}
+10204011	黄巾盾兵	610003	13	0	909	204	8187	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10204012	黄巾弓手	610004	13	0	1364	163	6823	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
 10204013	王异	510010	13	0	1364	163	6823	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10204021	黄巾刀兵	610001	13	0	1014	57	2416	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10204022	黄巾刀兵	610001	13	0	1014	57	2416	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10204023	庞德	510003	13	0	966	217	8699	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10204024	乐进	510002	13	0	1449	173	7249	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10204031	庞德	510003	13	0	1023	230	9211	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10204021	黄巾枪兵	610002	13	0	930	57	2658	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10204022	黄巾枪兵	610002	13	0	930	57	2658	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10204023	黄巾枪兵	610002	13	0	1328	173	7974	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10204024	黄巾枪兵	610002	13	0	1328	173	7974	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10204031	黄巾盾兵	610003	13	0	1023	230	9211	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
 10204032	乐进	510002	13	0	1534	184	7676	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10204033	王异	510010	13	0	1534	184	7676	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10204034	曹操	510014	13	0	1534	184	7676	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10204041	黄巾刀兵	610001	13	0	1133	64	2700	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10204042	黄巾刀兵	610001	13	0	1133	64	2700	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10204043	庞德	510003	13	0	1079	242	9723	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10204044	乐进	510002	13	0	1619	194	8102	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10204045	王异	510010	13	0	1619	194	8102	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10204033	曹婴	510001	13	0	1534	184	7676	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10204034	糜竺	520001	13	0	1406	184	8443	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10204041	郭汜	540002	13	0	1133	64	2700	0	0	0	0	0	0	0	0	0	0	0	0	750	0	{}
+10204042	吴国太	530002	13	0	1039	64	2970	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10204043	黄巾刀兵	610001	13	0	1619	194	8102	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10204044	黄巾刀兵	610001	13	1	1619	194	8102	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10204045	黄巾刀兵	610001	13	0	1619	194	8102	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10204051	庞德	510003	13	0	1136	255	10234	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
 10204052	乐进	510002	13	0	1705	204	8529	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
 10204053	王异	510010	13	0	1705	204	8529	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
@@ -343,30 +343,30 @@
 10204083	乐进	510002	14	0	1703	203	8518	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
 10204084	王异	510010	14	0	1703	203	8518	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10204085	曹操	510014	14	0	1703	203	8518	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10204091	庞德	510003	14	0	1195	268	10760	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10204092	乐进	510002	14	0	1792	214	8967	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10204093	王异	510010	14	0	1792	214	8967	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10204094	曹操	510014	14	2	2151	238	19926	0	0	0	0	1950	0	0	0	0	0	0	0	0	0	{}
+10204091	黄巾盾兵	610003	14	0	1195	268	10760	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10204092	吴国太	530002	14	0	1643	214	9863	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10204093	糜竺	520001	14	0	1643	214	9863	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10204094	凌统	530003	14	2	2151	238	19926	0	0	0	0	0	0	0	0	0	0	0	0	1950	0	{}
 10205011	黄巾刀兵	610001	15	0	1053	60	3009	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10205012	黄巾刀兵	610001	15	0	1053	60	3009	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10205013	黄巾刀兵	610001	15	0	1053	60	3009	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10205014	黄巾弓手	610004	15	0	1053	60	3009	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
+10205014	黄巾枪兵	610002	15	1	965	60	3310	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
 10205015	黄巾刀兵	610001	15	0	1053	60	3009	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10205021	黄巾枪兵	610002	15	0	965	60	3310	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10205022	黄巾枪兵	610002	15	0	965	60	3310	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10205021	黄巾刀兵	610001	15	0	1053	60	3009	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10205022	黄巾盾兵	610003	15	0	702	75	3611	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
 10205023	黄巾刀兵	610001	15	0	1053	60	3009	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10205024	黄巾刀兵	610001	15	0	1053	60	3009	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10205025	庞德	510003	15	0	1002	225	10834	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10205031	黄巾刀兵	610001	15	0	1118	63	3197	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10205032	黄巾盾兵	610003	15	0	745	79	3837	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
-10205033	黄巾刀兵	610001	15	0	1118	63	3197	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10205034	庞德	510003	15	0	1065	239	11511	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10205035	乐进	510002	15	0	1598	191	9593	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
+10205024	李傕	540003	15	0	1053	60	3009	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10205025	朱桓	530005	15	0	1316	191	9931	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
+10205031	黄巾枪兵	610002	15	0	1025	63	3517	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10205032	黄巾刀兵	610001	15	1	1118	63	3197	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10205033	黄巾枪兵	610002	15	0	1025	63	3517	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10205034	黄巾枪兵	610002	15	0	1465	191	10552	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10205035	黄巾枪兵	610002	15	0	1465	191	10552	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
 10205041	黄巾刀兵	610001	15	0	1118	63	3197	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10205042	黄巾刀兵	610001	15	0	1118	63	3197	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10205043	黄巾弓手	610004	15	0	1118	63	3197	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
-10205044	庞德	510003	15	0	1065	239	11511	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10205045	乐进	510002	15	0	1598	191	9593	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
+10205043	韩遂	540005	15	0	1118	63	3197	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10205044	黄巾刀兵	610001	15	0	1598	191	9593	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10205045	黄巾刀兵	610001	15	0	1598	191	9593	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10205051	黄巾枪兵	610002	15	0	1085	67	3724	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
 10205052	黄巾枪兵	610002	15	0	1085	67	3724	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
 10205053	庞德	510003	15	0	1128	253	12188	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
@@ -388,11 +388,11 @@
 10205083	乐进	510002	15	0	1786	214	10721	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
 10205084	王异	510010	15	0	1786	214	10721	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10205085	曹操	510014	15	0	1786	214	10721	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10205091	庞德	510003	15	0	1253	281	13543	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10205092	乐进	510002	15	0	1880	225	11286	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10205093	王异	510010	15	0	1880	225	11286	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10205094	曹操	510014	15	0	1880	225	11286	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10205095	关兴	520005	15	2	1974	266	27588	0	0	0	0	0	0	0	0	0	0	0	0	1950	0	{}
+10205091	黄巾盾兵	610003	15	0	1253	281	13543	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10205092	黄巾盾兵	610003	15	0	1253	281	13543	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10205093	黄巾弓手	610004	15	1	1880	225	11286	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10205094	黄巾弓手	610004	15	1	1880	225	11286	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+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	{}
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 e7f8773..5ae6309 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
@@ -1,94 +1,94 @@
 LineupID	PosNPCID1	PosNPCID2	PosNPCID3	PosNPCID4	PosNPCID5	PosNPCID6	BossID	BossPosView	SkillIDExList	SkillExCnt
 1010101		10101011					0		1001	0
 1010102		10101021			10101022		0		1002	0
-1010103		10101031		10101032		10101032	0		1003	0
-1010104	10101042		10101042	10101043		10101043	0		1004	0
+1010103	10101031		10101032		10101033		0		1003	0
+1010104		10101041		10101042		10101043	0		1004	0
 1010105	10101051		10101052		10101053		0		1005	0
 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		1009	0
-1010201	10102011	10102011	10102012		10102012		0		1010	0
+1010109	10101092	10101093	10101092				10101093		1004	0
+1010201	10102011		10102012				0		1010	0
 1010202		10102021		10102022		10102023	0		1011	0
-1010203		10102033		10102031		10102032	0		1012	0
+1010203	10102033		10102031		10102032		0		1012	0
 1010204	10102041		10102042	10102043		10102044	0		1013	0
 1010205	10102051		10102052		10102053		0		1014	0
 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		1018	0
-1010301	10103011	10103012	10103013				0		1019	0
-1010302	10103021		10103022	10103023		10103024	0		1020	0
-1010303	10103031		10103032	10103033	10103035	10103034	0		1021	0
-1010304	10103041	10103042	10103043	10103044		10103045	0		1022	0
+1010209		10102091		10102092	10102094	10102093	10102094		1013	0
+1010301		10103011		10103012		10103013	0		1019	0
+1010302		10103021			10103022		0		1020	0
+1010303	10103031		10103032		10103033		0		1021	0
+1010304	10103041		10103042	10103043		10103044	0		1022	0
 1010305	10103051		10103052	10103053		10103054	0		1023	0
 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		1003	0
+1010309	10103091		10103092	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
-1010404		10104041		10104042	10104043	10104044	0		1007	0
+1010404		10104041		10104042	10104043	10104042	0		1007	0
 1010405	10104051		10104052	10104053	10104055	10104054	0		1008	0
 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		10104091		10104092	10104094	10104093	10104094		1012	0
-1010501	10105011	10105012	10105013	10105014		10105015	0		1013	0
-1010502	10105021	10105022	10105023	10105024		10105025	0		1014	0
-1010503	10105031	10105032	10105033				0		1015	0
+1010409				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
 1010504	10105041	10105042	10105043	10105044		10105045	0		1016	0
 1010505	10105051		10105052	10105053		10105054	0		1017	0
 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	10105091		10105092	10105093	10105095	10105094	10105095		1021	0
-1020101	10201011		10201012	10201013		10201014	0		1022	0
-1020102		10201023		10201021	10201024	10201022	0		1023	0
-1020103	10201031	10201032	10201033	10201034		10201035	0		1024	0
+1010509				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
 1020104		10201041		10201042	10201043	10201044	0		1001	0
 1020105	10201051		10201052	10201053	10201055	10201054	0		1002	0
 1020106	10201061	10201063	10201062		10201064		0		1003	0
 1020107		10201073		10201071	10201074	10201072	0		1004	0
 1020108	10201081		10201082	10201083	10201084	10201085	0		1005	0
-1020109	10201091		10201092	10201093	10201095	10201094	10201095		1006	0
-1020201	10202011	10202012	10202013	10202014		10202015	0		1007	0
-1020202	10202021	10202025	10202022	10202023		10202024	0		1008	0
-1020203	10202031	10202033	10202032		10202034		0		1009	0
-1020204	10202041		10202042	10202043	10202045	10202044	0		1010	0
+1020109	10201091		10201092	10201093	10201095	10201094	10201095		1005	0
+1020201	10202011	10202012	10202013		10202014		0		1007	0
+1020202	10202021	10202025	10202022		10202023		0		1008	0
+1020203	10202031	10202034	10202031	10202032		10202033	0		1009	0
+1020204	10202041	10202042	10202043	10202045		10202044	0		1010	0
 1020205	10202051		10202052	10202054	10202053	10202055	0		1011	0
 1020206	10202061		10202062	10202064	10202063	10202065	0		1012	0
 1020207	10202071		10202072	10202073	10202074	10202075	0		1013	0
 1020208	10202081	10202082	10202083	10202085	10202084	10202086	0		1014	0
-1020209	10202091	10202095	10202092	10202093	10202096	10202094	10202096		1015	0
-1020301	10203011	10203015	10203012	10203013		10203014	0		1016	0
+1020209	10202091	10202096	10202092	10202093		10202094	10202096		1003	0
+1020301	10203011		10203012	10203013	10203015	10203014	0		1016	0
 1020302	10203021		10203022	10203023	10203024	10203025	0		1017	0
-1020303	10203031	10203033	10203032	10203034		10203035	0		1018	0
-1020304	10203041	10203042	10203043	10203044	10203046	10203045	0		1019	0
+1020303	10203031		10203032	10203034		10203035	0		1018	0
+1020304	10203041		10203043	10203044		10203045	0		1019	0
 1020305	10203051		10203052	10203053		10203054	0		1020	0
 1020306	10203061		10203062	10203063	10203064	10203065	0		1021	0
 1020307	10203073	10203074	10203075	10203071		10203072	0		1022	0
 1020308	10203081	10203082	10203083	10203084	10203085	10203086	0		1023	0
-1020309	10203091		10203092	10203093	10203095	10203094	10203095		1024	0
-1020401	10204011	10204012	10204013				0		1001	0
-1020402	10204021	10204023	10204022		10204024		0		1002	0
-1020403	10204031		10204032	10204033		10204034	0		1003	0
+1020309		10203092		10203093	10203095	10203094	10203095		1011	0
+1020401		10204011		10204012	10204012	10204012	0		1001	0
+1020402	10204021		10204022	10204023		10204024	0		1002	0
+1020403		10204031		10204033		10204034	0		1003	0
 1020404	10204043	10204044	10204045	10204041		10204042	0		1004	0
 1020405	10204051		10204052	10204053		10204054	0		1005	0
 1020406	10204061	10204062	10204063	10204064		10204065	0		1006	0
 1020407	10204071	10204073	10204072	10204074		10204075	0		1007	0
 1020408	10204082	10204081	10204083	10204084		10204085	0		1008	0
-1020409		10204091		10204092	10204094	10204093	10204094		1009	0
+1020409		10204091		10204092	10204094	10204093	10204094		1008	0
 1020501	10205011		10205012	10205013	10205014	10205015	0		1010	0
-1020502	10205021		10205022	10205023	10205025	10205024	0		1011	0
+1020502	10205021	10205022	10205023	10205025		10205024	0		1011	0
 1020503	10205031	10205032	10205033	10205034		10205035	0		1012	0
 1020504	10205041		10205042	10205044	10205043	10205045	0		1013	0
 1020505	10205051	10205053	10205052	10205054		10205055	0		1014	0
 1020506	10205061	10205065	10205062	10205063	10205066	10205064	0		1015	0
 1020507	10205071		10205072	10205074	10205073	10205075	0		1016	0
 1020508	10205082	10205081	10205083	10205084		10205085	0		1017	0
-1020509	10205091		10205092	10205093	10205095	10205094	10205095		1018	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
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Skill.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Skill.txt
index 89535c8..733a88c 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Skill.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Skill.txt
@@ -640,7 +640,7 @@
 4002240	4002240	1	1	神格																																			
 4003010	4003010	1	1	掠血	1	1	1	1	1	0	0	1	0	10000	0	0	10000	5010	40030101	13		0				0					0	3|1	0	0	0	0	0	0	0
 40030101	40030101	1	1	破甲	0	6	0	0	6	0	0	0	0	0	0	0	5000	17	2500|2			0				0					0			2	0	0	0	0	
-4003020	4003020	1	1	烈火焚城	2	1	1	1	1	0	0	1	0	40000	0	0	10000	5010	40030201	13		0				0					0	4|1	0	0	0	0	0	0	0
+4003020	4003020	1	1	烈火焚城	2	1	1	1	1	0	0	1	0	33000	0	0	10000	5010	40030201	13		0				0					0	4|1	0	0	0	0	0	0	0
 40030201	40030201	1	1	闪避	0	5	0	0	5	0	0	0	0	0	0	0	10000	27	2000|1			0				0					0		0	2	0	0	0	0	
 4003030	4003030	1	1	劫掠	3											0																							0
 4003050	4003050	1	1	狂袭	3											0																							0
@@ -807,17 +807,18 @@
 4016220	4016220	1	1	破境																																			
 4016230	4016230	1	1	镜花水月·狂																																			
 4016240	4016240	1	1	神格																																			
-6001010	6001010	1	1	劈砍	1	1	1	1	1	0	0	1	0	10000	0	0	10000	0														1|3							
-6001020	6001020	1	1	跳劈	2	1	2	1	4	0	0	2	0	15000	0	0	10000	0														1|4							
-6002010	6002010	1	1	刺击	1	1	2	1	1	0	0	1	0	8000	0	0	10000	0														1|3							
-6002020	6002020	1	1	鼓舞	2	5	0	1	0	1	0	6	0	0	0	0	10000	16	1000|1			0				0					0	1|4		2	1	5	3	0	
-6003010	6003010	1	1	重斩	1	1	1	1	1	0	0	1	0	8000	0	0	10000															1|3							
-6003020	6003020	1	1	刀盾连击	2	1	1	1	1	0	0	1	0	24000	0	0	10000	5010	60030201	13												1|4							
-60030201	60030201	1	1	护盾	0	5	0	1003	5	0	0	0	1	2000	0	0	10000	0				0				0					0	1|4	21	0	0	0	0	0	0
-6004010	6004010	1	1	弩箭	1	1	1	1	1	0	0	1	0	10000	0	0	10000															1|3							
-6004020	6004020	1	1	散射	2	1	1	1	2	0	0	3	0	10000	0	0	10000															1|4							
+6001010	6001010	1	1	劈砍	1	1	1	1	1	0	0	1	0	9000	0	0	10000	0														1|3							
+6001020	6001020	1	1	跳劈	2	1	2	1	4	0	0	2	0	14000	0	0	10000	0														1|4							
+6002010	6002010	1	1	刺击	1	1	2	1	1	0	0	1	0	6000	0	0	10000	0														1|3							
+6002020	6002020	1	1	鼓舞	2	5	0	1	0	1	0	2	0	0	0	0	10000	16	2000|1			0				0					0	1|4		2	1	5	3	0	
+6003010	6003010	1	1	重斩	1	1	1	1	1	0	0	1	0	7000	0	0	10000	5010	60030101	13												1|3							
+60030101	60030101	1	1	额外击晕	0	14	0	0	6	0	0	0	0	0	0	0	2000					0				0					0		3	1	0	0	0	0	0
+6003020	6003020	1	1	刀盾连击	2	1	1	1	1	0	0	1	0	20000	0	0	10000	5010	60030201	13												1|4							
+60030201	60030201	1	1	护盾	0	5	0	1003	5	0	0	0	1	3000	0	0	10000	0				0				0					0	1|4	21	0	0	0	0	0	0
+6004010	6004010	1	1	弩箭	1	1	1	1	1	0	0	1	0	11000	0	0	10000															1|3							
+6004020	6004020	1	1	散射	2	1	1	1	2	0	0	3	0	11000	0	0	10000															1|4							
 6005010	6005010	1	1	毒箭	1	1	2	1	3	0	0	1	0	10000	0	0	10000															1|3							
-60050101	60050101	1	1	中毒	0	4	2	1001	6	0	0	0	0	5000	0	0	10000	5001		4	2	0				0					0	1|3	5	3	1	3	4	0	0
+60050101	60050101	1	1	中毒	0	4	2	1001	6	0	0	0	0	5000	0	0	5000	5001		4	2	0				0					0	1|3	5	3	1	3	4	0	0
 6005020	6005020	1	1	瘟疫箭矢	2	1	2	1	3	0	0	1	0	25000	0	0	10000	6005	5000|[5]	8	3											1|4							
 6006010	6006010	1	1	狂砍	1	1	2	1	1	0	0	1	0	15000	0	0	10000															1|3							
 6006020	6006020	1	1	剔骨	2	1	2	1	2	0	0	3	0	15000	0	0	10000	5010	60060201	13												1|4							
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 32b59cf..11f7024 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
@@ -1,14 +1,14 @@
 ChapterID	LevelNum	WaveLineupIDList1	WaveLineupIDList2	WaveLineupIDList3	WaveLineupIDList4	WaveLineupIDList5	WaveLineupIDList6	BossLineupIDList	AwardItemList	NPCLV	Difficulty
 1	1	1010101	1010102	1010103	1010104			1010109	[[5,2],[3,40]]	1	1
-1	2	1010201|1010202	1010203|1010204	1010205|1010206	1010207|1010208			1010209	[[5,10],[3,40]]	2	1
-1	3	1010301|1010302	1010303|1010304	1010305|1010306	1010307|1010308			1010309	[[5,2],[3,40]]	4	1
-1	4	1010401|1010402	1010403|1010404	1010405|1010406	1010407|1010408			1010409	[[5,2],[3,40]]	5	1
-1	5	1010501|1010502	1010503|1010504	1010505|1010506	1010507|1010508			1010509	[[5,2],[3,40],[4,10]]	7	1
-2	1	1020101|1020102	1020103|1020104	1020105|1020106	1020107|1020108			1020109	[[5,2],[3,40]]	9	1
-2	2	1020201|1020202	1020203|1020204	1020205|1020206	1020207|1020208			1020209	[[5,2],[3,40]]	10	1
-2	3	1020301|1020302	1020303|1020304	1020305|1020306	1020307|1020308			1020309	[[5,2],[3,40]]	12	1
-2	4	1020401|1020402	1020403|1020404	1020405|1020406	1020407|1020408			1020409	[[5,2],[3,40]]	14	1
-2	5	1020501|1020502	1020503|1020504	1020505|1020506	1020507|1020508			1020509	[[5,2],[3,40],[4,10]]	15	1
+1	2	1010201	1010202	1010203	1010204			1010209	[[5,10],[3,40]]	2	1
+1	3	1010301	1010302	1010303	1010304			1010309	[[5,2],[3,40]]	4	1
+1	4	1010401	1010402	1010403	1010404			1010409	[[5,2],[3,40]]	5	1
+1	5	1010501	1010502	1010503	1010504			1010509	[[5,2],[3,40],[4,10]]	7	1
+2	1	1020101	1020102	1020103	1020104			1020109	[[5,2],[3,40]]	9	1
+2	2	1020201	1020202	1020203	1020204			1020209	[[5,2],[3,40]]	10	1
+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
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 a7fd5ec..56da819 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
@@ -1,12 +1,12 @@
 NPCID	NPCName	RelatedHeroID	LV	BossType	Atk	Def	MaxHP	FinalDamPer	FinalDamPerDef	MissRate	MissRateDef	SuperHitRate	SuperHitRateDef	StunRate	StunRateDef	ComboRate	ComboRateDef	ParryRate	ParryRateDef	SuckHPPer	SuckHPPerDef	SpecAttrInfo
 10101011	黄巾刀兵	610001	1	0	9	0	13	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
 10101021	黄巾刀兵	610001	1	0	18	0	26	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-10101022	黄巾枪兵	610002	1	0	16	0	29	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+10101022	黄巾刀兵	610001	1	0	18	0	26	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
 10101031	黄巾刀兵	610001	1	0	27	0	39	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-10101032	黄巾枪兵	610002	1	0	25	0	43	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+10101032	黄巾刀兵	610001	1	0	27	0	39	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
 10101033	黄巾枪兵	610002	1	0	25	0	43	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
 10101041	黄巾刀兵	610001	1	0	36	0	52	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-10101042	黄巾刀兵	610001	1	0	36	0	52	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+10101042	黄巾枪兵	610002	1	0	33	0	58	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
 10101043	黄巾枪兵	610002	1	0	33	0	58	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
 10101051	黄巾盾兵	610003	1	0	24	0	63	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
 10101052	黄巾盾兵	610003	1	0	24	0	63	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
@@ -22,20 +22,20 @@
 10101083	黄巾刀兵	610001	1	0	73	0	105	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
 10101084	黄巾刀兵	610001	1	0	73	0	105	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
 10101091	黄巾刀兵	610001	1	0	46	0	66	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-10101092	黄巾弓手	610004	1	0	46	0	66	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+10101092	黄巾刀兵	610001	1	0	46	0	66	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
 10101093	庞德	510003	1	2	52	0	528	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
 10102011	黄巾刀兵	610001	2	0	54	0	77	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-10102012	黄巾弓手	610004	2	0	54	0	77	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-10102021	黄巾弓手	610004	2	0	54	0	77	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-10102022	黄巾弓手	610004	2	0	54	0	77	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-10102023	黄巾弓手	610004	2	0	54	0	77	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+10102012	黄巾刀兵	610001	2	0	54	0	77	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+10102021	黄巾枪兵	610002	2	0	49	0	85	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+10102022	黄巾刀兵	610001	2	0	54	0	77	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+10102023	黄巾刀兵	610001	2	0	54	0	77	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
 10102031	黄巾刀兵	610001	2	0	54	0	77	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-10102032	黄巾刀兵	610001	2	0	54	0	77	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-10102033	黄巾盾兵	610003	2	0	36	0	93	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-10102041	黄巾弓手	610004	2	0	68	0	97	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
-10102042	黄巾弓手	610004	2	0	68	0	97	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
-10102043	黄巾弓手	610004	2	0	68	0	97	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
-10102044	黄巾弓手	610004	2	0	68	0	97	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
+10102032	黄巾枪兵	610002	2	0	49	0	85	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+10102033	黄巾刀兵	610001	2	0	54	0	77	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+10102041	黄巾刀兵	610001	2	0	68	0	97	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10102042	黄巾刀兵	610001	2	0	68	0	97	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10102043	黄巾枪兵	610002	2	0	62	0	106	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10102044	黄巾枪兵	610002	2	0	62	0	106	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
 10102051	黄巾刀兵	610001	2	0	68	0	97	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10102052	黄巾刀兵	610001	2	0	68	0	97	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10102053	曹婴	510001	2	0	97	0	291	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
@@ -52,25 +52,25 @@
 10102083	黄巾刀兵	610001	2	0	81	0	116	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10102084	黄巾刀兵	610001	2	0	81	0	116	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10102085	庞德	510003	2	0	77	0	419	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10102091	黄巾盾兵	610003	2	0	63	0	163	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
-10102092	黄巾刀兵	610001	2	0	95	0	136	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10102093	黄巾刀兵	610001	2	0	95	0	136	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10102094	卞夫人	510004	2	2	163	0	907	0	0	1950	0	0	0	0	0	0	0	0	0	0	0	{}
-10103011	黄巾刀兵	610001	3	0	89	0	128	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10103012	黄巾盾兵	610003	3	0	59	0	154	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
+10102091	黄巾刀兵	610001	2	0	95	0	136	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10102092	黄巾枪兵	610002	2	0	87	0	149	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10102093	黄巾枪兵	610002	2	0	87	0	149	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10102094	潘璋	530001	2	2	163	0	907	0	0	0	0	1950	0	0	0	0	0	0	0	0	0	{}
+10103011	黄巾枪兵	610002	3	0	82	0	141	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10103012	黄巾刀兵	610001	3	0	89	0	128	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10103013	黄巾刀兵	610001	3	0	89	0	128	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10103021	黄巾刀兵	610001	3	0	89	0	128	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10103022	黄巾刀兵	610001	3	0	89	0	128	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10103022	黄巾弓手	610004	3	0	89	0	128	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
 10103023	庞德	510003	3	0	85	0	462	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
 10103024	乐进	510002	3	0	128	0	385	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
 10103031	黄巾刀兵	610001	3	0	107	0	154	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10103032	黄巾刀兵	610001	3	0	107	0	154	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10103033	黄巾弓手	610004	3	0	107	0	154	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
+10103033	庞德	510003	3	0	71	0	184	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
 10103034	黄巾弓手	610004	3	0	107	0	154	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
 10103035	乐进	510002	3	0	154	0	462	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10103041	黄巾枪兵	610002	3	0	98	0	169	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10103042	黄巾盾兵	610003	3	0	71	0	184	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
-10103043	黄巾枪兵	610002	3	0	98	0	169	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10103041	黄巾刀兵	610001	3	0	107	0	154	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10103042	黄巾刀兵	610001	3	0	107	0	154	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10103043	黄巾弓手	610004	3	0	107	0	154	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
 10103044	黄巾弓手	610004	3	0	107	0	154	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
 10103045	黄巾弓手	610004	3	0	107	0	154	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
 10103051	黄巾枪兵	610002	3	0	115	0	197	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
@@ -94,24 +94,24 @@
 10103085	王异	510010	4	0	191	0	574	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10103091	黄巾刀兵	610001	4	0	156	0	223	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10103092	黄巾刀兵	610001	4	0	156	0	223	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10103093	黄巾刀兵	610001	4	0	156	0	223	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10103094	黄巾刀兵	610001	4	0	156	0	223	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10103095	王异	510010	4	2	268	0	1489	0	0	0	0	1950	0	0	0	0	0	0	0	0	0	{}
+10103093	黄巾弓手	610004	4	0	156	0	223	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
+10103094	黄巾弓手	610004	4	0	156	0	223	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
+10103095	郭汜	540002	4	2	268	0	1489	0	0	0	0	0	0	0	0	0	0	0	0	1950	0	{}
 10104011	黄巾刀兵	610001	5	0	133	0	190	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10104012	黄巾刀兵	610001	5	0	133	0	190	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10104013	黄巾弓手	610004	5	0	133	0	190	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
-10104014	黄巾弓手	610004	5	0	133	0	190	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
-10104021	黄巾盾兵	610003	5	0	89	0	228	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
-10104022	黄巾刀兵	610001	5	0	133	0	190	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10104023	黄巾刀兵	610001	5	0	133	0	190	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10104024	庞德	510003	5	0	127	0	686	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10104031	黄巾盾兵	610003	5	0	89	0	228	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
-10104032	黄巾刀兵	610001	5	0	133	0	190	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10104033	庞德	510003	5	0	127	0	686	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10104034	乐进	510002	5	0	190	0	572	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10104041	黄巾盾兵	610003	5	0	106	0	274	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
-10104042	庞德	510003	5	0	152	0	824	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10104043	乐进	510002	5	0	228	0	686	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
+10104013	黄巾枪兵	610002	5	0	122	0	209	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10104014	黄巾枪兵	610002	5	0	122	0	209	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10104021	黄巾枪兵	610002	5	0	122	0	209	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10104022	黄巾弓手	610004	5	0	133	0	190	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
+10104023	黄巾弓手	610004	5	0	133	0	190	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
+10104024	纪灵	540001	5	0	190	0	572	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
+10104031	黄巾枪兵	610002	5	0	122	0	209	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10104032	黄巾枪兵	610002	5	0	122	0	209	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10104033	黄巾弓手	610004	5	0	190	0	572	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10104034	黄巾弓手	610004	5	0	190	0	572	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10104041	黄巾刀兵	610001	5	0	160	0	228	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10104042	黄巾弓手	610004	5	0	228	0	686	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10104043	黄巾枪兵	610002	5	0	209	0	755	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
 10104044	王异	510010	5	0	228	0	686	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10104051	黄巾刀兵	610001	5	0	160	0	228	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10104052	黄巾刀兵	610001	5	0	160	0	228	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
@@ -131,28 +131,28 @@
 10104083	庞德	510003	5	0	178	0	961	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
 10104084	乐进	510002	5	0	267	0	801	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
 10104085	王异	510010	5	0	267	0	801	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10104091	黄巾盾兵	610003	5	0	142	0	366	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
-10104092	庞德	510003	5	0	203	0	1099	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10104093	乐进	510002	5	0	305	0	915	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10104094	王异	510010	5	2	366	0	2035	0	0	0	0	1950	0	0	0	0	0	0	0	0	0	{}
-10105011	黄巾盾兵	610003	6	0	187	0	481	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
-10105012	黄巾刀兵	610001	6	0	280	0	401	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10105013	黄巾盾兵	610003	6	0	187	0	481	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
+10104091	黄巾刀兵	610001	5	0	213	0	305	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10104092	黄巾刀兵	610001	5	0	305	0	915	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10104093	黄巾刀兵	610001	5	0	305	0	915	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10104094	李傕	540003	5	2	366	0	2035	0	0	1950	0	0	0	0	0	0	0	0	0	0	0	{}
+10105011	黄巾刀兵	610001	6	0	280	0	401	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10105012	黄巾枪兵	610002	6	0	257	0	441	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10105013	黄巾刀兵	610001	6	0	280	0	401	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10105014	黄巾弓手	610004	6	0	280	0	401	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
 10105015	黄巾弓手	610004	6	0	280	0	401	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
-10105021	黄巾盾兵	610003	6	0	187	0	481	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
-10105022	黄巾弓手	610004	6	0	280	0	401	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
-10105023	黄巾盾兵	610003	6	0	187	0	481	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
-10105024	乐进	510002	6	0	401	0	1204	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
+10105021	黄巾枪兵	610002	6	0	257	0	441	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10105022	黄巾枪兵	610002	6	0	257	0	441	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10105023	黄巾刀兵	610001	6	0	280	0	401	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10105024	黄巾刀兵	610001	6	0	401	0	1204	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10105025	王异	510010	6	0	401	0	1204	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10105031	庞德	510003	6	0	321	0	1734	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10105032	乐进	510002	6	0	481	0	1445	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10105033	王异	510010	6	0	481	0	1445	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10105031	黄巾枪兵	610002	6	0	441	0	1589	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10105032	李傕	540003	6	0	481	0	1445	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10105033	郭汜	540002	6	0	481	0	1445	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
 10105041	黄巾刀兵	610001	6	0	337	0	481	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10105042	黄巾盾兵	610003	6	0	224	0	578	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
+10105042	黄巾枪兵	610002	6	0	309	0	529	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
 10105043	黄巾刀兵	610001	6	0	337	0	481	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10105044	庞德	510003	6	0	321	0	1734	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10105045	乐进	510002	6	0	481	0	1445	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
+10105044	黄巾弓手	610004	6	0	481	0	1445	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10105045	黄巾弓手	610004	6	0	481	0	1445	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
 10105051	黄巾刀兵	610001	6	0	393	0	561	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10105052	黄巾刀兵	610001	6	0	393	0	561	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10105053	庞德	510003	6	0	374	0	2023	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
@@ -171,28 +171,28 @@
 10105083	庞德	510003	7	0	549	123	3955	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
 10105084	乐进	510002	7	0	824	99	3296	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
 10105085	王异	510010	7	0	824	99	3296	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10105091	黄巾枪兵	610002	7	0	587	36	1342	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10105092	黄巾枪兵	610002	7	0	587	36	1342	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10105093	庞德	510003	7	0	610	137	4394	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10105094	乐进	510002	7	0	915	110	3662	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10105095	王异	510010	7	2	1098	122	8138	0	0	0	0	1950	0	0	0	0	0	0	0	0	0	{}
+10105091	黄巾刀兵	610001	7	0	640	36	1220	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10105092	黄巾刀兵	610001	7	0	640	36	1220	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10105093	李傕	540003	7	0	915	110	3662	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10105094	郭汜	540002	7	0	915	110	3662	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
+10105095	张角	540015	7	2	961	130	8952	0	0	0	0	0	0	1950	0	0	0	0	0	0	0	{}
 10201011	黄巾盾兵	610003	8	0	383	41	1316	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
-10201012	黄巾盾兵	610003	8	0	383	41	1316	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
+10201012	黄巾弓手	610004	8	0	575	32	1096	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
 10201013	黄巾刀兵	610001	8	0	575	32	1096	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10201014	黄巾弓手	610004	8	0	575	32	1096	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
 10201021	黄巾刀兵	610001	8	0	611	34	1165	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10201022	黄巾刀兵	610001	8	0	611	34	1165	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10201023	庞德	510003	8	0	582	130	4195	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10201023	黄巾盾兵	610003	8	0	582	130	4195	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
 10201024	乐进	510002	8	0	874	104	3496	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10201031	黄巾枪兵	610002	8	0	593	36	1357	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10201032	黄巾弓手	610004	8	0	740	61	2056	0	0	0	0	0	0	0	0	1050	0	0	0	0	0	{}
-10201033	黄巾枪兵	610002	8	0	593	36	1357	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10201034	庞德	510003	8	0	617	138	4442	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10201035	乐进	510002	8	0	925	110	3702	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10201041	黄巾枪兵	610002	8	0	626	38	1432	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10201042	庞德	510003	8	0	651	146	4689	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10201043	乐进	510002	8	0	976	116	3907	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10201044	王异	510010	8	0	976	116	3907	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10201031	黄巾刀兵	610001	8	0	647	36	1234	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10201032	黄巾刀兵	610001	8	0	740	61	2056	0	0	0	0	1050	0	0	0	0	0	0	0	0	0	{}
+10201033	黄巾刀兵	610001	8	0	647	36	1234	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10201034	黄巾刀兵	610001	8	0	925	110	3702	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10201035	鲍三娘	520002	8	0	925	110	3702	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10201041	乐进	510002	8	0	683	38	1302	0	0	0	0	0	0	0	0	0	0	0	0	750	0	{}
+10201042	黄巾枪兵	610002	8	0	895	116	4298	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10201043	曹婴	510001	8	0	976	116	3907	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10201044	黄巾枪兵	610002	8	0	895	116	4298	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
 10201051	黄巾刀兵	610001	8	0	719	41	1371	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10201052	黄巾刀兵	610001	8	0	719	41	1371	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10201053	黄巾枪兵	610002	8	0	659	41	1508	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
@@ -213,28 +213,28 @@
 10201085	王异	510010	9	0	1084	129	4336	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10201091	黄巾刀兵	610001	9	0	912	76	2536	0	0	0	0	1050	0	0	0	0	0	0	0	0	0	{}
 10201092	黄巾刀兵	610001	9	0	912	76	2536	0	0	0	0	1050	0	0	0	0	0	0	0	0	0	{}
-10201093	庞德	510003	9	0	760	171	5477	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10201094	乐进	510002	9	0	1141	136	4564	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10201095	王异	510010	9	2	1369	152	10144	0	0	0	0	1950	0	0	0	0	0	0	0	0	0	{}
-10202011	黄巾盾兵	610003	10	0	497	53	2131	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
+10201093	黄巾弓手	610004	9	0	1141	136	4564	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10201094	黄巾弓手	610004	9	0	1141	136	4564	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10201095	韩遂	540005	9	2	1369	152	10144	0	0	1950	0	0	0	0	0	0	0	0	0	0	0	{}
+10202011	黄巾刀兵	610001	10	0	746	42	1776	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10202012	黄巾盾兵	610003	10	0	497	53	2131	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
-10202013	黄巾盾兵	610003	10	0	497	53	2131	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
-10202014	黄巾刀兵	610001	10	0	746	42	1776	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10202013	黄巾刀兵	610001	10	0	746	42	1776	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10202014	黄巾弓手	610004	10	0	746	42	1776	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
 10202015	黄巾刀兵	610001	10	0	746	42	1776	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10202021	黄巾刀兵	610001	10	0	746	42	1776	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10202022	黄巾刀兵	610001	10	0	746	42	1776	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10202023	黄巾弓手	610004	10	0	746	42	1776	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
+10202021	黄巾盾兵	610003	10	0	497	53	2131	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
+10202022	黄巾盾兵	610003	10	0	497	53	2131	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
+10202023	糜竺	520001	10	0	683	42	1954	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
 10202024	黄巾枪兵	610002	10	0	683	42	1954	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10202025	庞德	510003	10	0	710	159	6395	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10202031	黄巾刀兵	610001	10	0	746	42	1776	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10202032	黄巾刀兵	610001	10	0	746	42	1776	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10202033	庞德	510003	10	0	710	159	6395	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10202034	乐进	510002	10	0	1065	127	5329	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
+10202025	乐进	510002	10	0	1065	127	5329	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
+10202031	黄巾盾兵	610003	10	0	497	53	2131	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
+10202032	黄巾枪兵	610002	10	0	683	42	1954	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10202033	黄巾枪兵	610002	10	0	977	127	5862	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10202034	庞德	510003	10	0	710	159	6395	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
 10202041	黄巾刀兵	610001	10	0	790	45	1881	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10202042	黄巾刀兵	610001	10	0	790	45	1881	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10202043	黄巾弓手	610004	10	0	790	45	1881	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
+10202042	黄巾盾兵	610003	10	0	526	56	2257	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
+10202043	黄巾刀兵	610001	10	0	790	45	1881	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10202044	黄巾弓手	610004	10	0	790	45	1881	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
-10202045	庞德	510003	10	0	752	169	6771	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10202045	黄巾弓手	610004	10	0	1128	135	5643	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
 10202051	黄巾枪兵	610002	10	0	724	45	2069	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
 10202052	黄巾枪兵	610002	10	0	724	45	2069	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
 10202053	黄巾刀兵	610001	10	0	902	75	3135	0	0	0	0	1050	0	0	0	0	0	0	0	0	0	{}
@@ -258,28 +258,28 @@
 10202086	乐进	510002	10	0	1191	142	5956	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
 10202091	黄巾刀兵	610001	10	0	877	50	2090	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10202092	黄巾刀兵	610001	10	0	877	50	2090	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10202093	黄巾弓手	610004	10	0	877	50	2090	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
-10202094	黄巾弓手	610004	10	0	877	50	2090	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
+10202093	黄巾枪兵	610002	10	0	804	50	2299	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10202094	黄巾枪兵	610002	10	0	804	50	2299	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
 10202095	庞德	510003	10	0	836	188	7524	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10202096	乐进	510002	10	2	1504	167	13933	0	0	0	0	0	0	0	0	0	0	0	0	1950	0	{}
+10202096	孟获	540006	10	2	1003	209	16720	0	0	0	0	0	0	0	0	0	0	1950	0	0	0	{}
 10203011	黄巾刀兵	610001	11	0	856	48	2040	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10203012	黄巾刀兵	610001	11	0	856	48	2040	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10203013	黄巾刀兵	610001	11	0	856	48	2040	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10203014	黄巾刀兵	610001	11	0	856	48	2040	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10203015	庞德	510003	11	0	816	183	7346	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10203015	司马徽	530006	11	0	1071	156	6734	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
 10203021	黄巾盾兵	610003	11	0	606	65	2602	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
 10203022	黄巾盾兵	610003	11	0	606	65	2602	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
-10203023	庞德	510003	11	0	867	195	7806	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10203024	乐进	510002	11	0	1300	156	6505	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10203025	王异	510010	11	0	1300	156	6505	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10203031	黄巾盾兵	610003	11	0	642	68	2755	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
-10203032	黄巾盾兵	610003	11	0	642	68	2755	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
+10203023	黄巾枪兵	610002	11	0	1192	156	7155	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10203024	黄巾弓手	610004	11	0	1300	156	6505	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10203025	黄巾枪兵	610002	11	0	1192	156	7155	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10203031	黄巾刀兵	610001	11	0	963	55	2295	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10203032	黄巾刀兵	610001	11	0	963	55	2295	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10203033	庞德	510003	11	0	918	206	8265	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10203034	乐进	510002	11	0	1377	165	6887	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10203035	王异	510010	11	0	1377	165	6887	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10203041	黄巾刀兵	610001	11	0	1017	58	2423	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10203034	吴国太	530002	11	0	1262	165	7576	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10203035	糜竺	520001	11	0	1262	165	7576	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10203041	黄巾盾兵	610003	11	0	678	72	2908	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
 10203042	黄巾盾兵	610003	11	0	775	121	4846	0	0	0	0	0	0	0	0	0	0	1050	0	0	0	{}
-10203043	黄巾刀兵	610001	11	0	1017	58	2423	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10203043	黄巾盾兵	610003	11	0	678	72	2908	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
 10203044	黄巾弓手	610004	11	0	1017	58	2423	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
 10203045	黄巾弓手	610004	11	0	1017	58	2423	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
 10203046	王异	510010	11	0	1453	174	7270	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
@@ -303,27 +303,27 @@
 10203084	庞德	510003	12	0	1024	229	9223	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
 10203085	乐进	510002	12	0	1536	183	7686	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
 10203086	王异	510010	12	0	1536	183	7686	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10203091	黄巾枪兵	610002	12	0	1186	107	4944	0	0	1050	0	0	0	0	0	0	0	0	0	0	0	{}
-10203092	黄巾枪兵	610002	12	0	1186	107	4944	0	0	1050	0	0	0	0	0	0	0	0	0	0	0	{}
-10203093	庞德	510003	12	0	1078	242	9709	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10203094	乐进	510002	12	0	1617	193	8091	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10203095	王异	510010	12	2	1941	215	17980	0	0	0	0	1950	0	0	0	0	0	0	0	0	0	{}
-10204011	庞德	510003	13	0	909	204	8187	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10204012	乐进	510002	13	0	1364	163	6823	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
+10203091	黄巾盾兵	610003	12	0	862	134	5394	0	0	0	0	0	0	0	0	0	0	1050	0	0	0	{}
+10203092	李典	510007	12	0	862	134	5394	0	0	0	0	0	0	1050	0	0	0	0	0	0	0	{}
+10203093	黄巾弓手	610004	12	0	1617	193	8091	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10203094	黄巾弓手	610004	12	0	1617	193	8091	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10203095	卞夫人	510004	12	2	1941	215	17980	0	0	1950	0	0	0	0	0	0	0	0	0	0	0	{}
+10204011	黄巾盾兵	610003	13	0	909	204	8187	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10204012	黄巾弓手	610004	13	0	1364	163	6823	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
 10204013	王异	510010	13	0	1364	163	6823	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10204021	黄巾刀兵	610001	13	0	1014	57	2416	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10204022	黄巾刀兵	610001	13	0	1014	57	2416	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10204023	庞德	510003	13	0	966	217	8699	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10204024	乐进	510002	13	0	1449	173	7249	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10204031	庞德	510003	13	0	1023	230	9211	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10204021	黄巾枪兵	610002	13	0	930	57	2658	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10204022	黄巾枪兵	610002	13	0	930	57	2658	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10204023	黄巾枪兵	610002	13	0	1328	173	7974	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10204024	黄巾枪兵	610002	13	0	1328	173	7974	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10204031	黄巾盾兵	610003	13	0	1023	230	9211	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
 10204032	乐进	510002	13	0	1534	184	7676	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10204033	王异	510010	13	0	1534	184	7676	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10204034	曹操	510014	13	0	1534	184	7676	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10204041	黄巾刀兵	610001	13	0	1133	64	2700	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10204042	黄巾刀兵	610001	13	0	1133	64	2700	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10204043	庞德	510003	13	0	1079	242	9723	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10204044	乐进	510002	13	0	1619	194	8102	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10204045	王异	510010	13	0	1619	194	8102	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10204033	曹婴	510001	13	0	1534	184	7676	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10204034	糜竺	520001	13	0	1406	184	8443	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10204041	郭汜	540002	13	0	1133	64	2700	0	0	0	0	0	0	0	0	0	0	0	0	750	0	{}
+10204042	吴国太	530002	13	0	1039	64	2970	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10204043	黄巾刀兵	610001	13	0	1619	194	8102	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10204044	黄巾刀兵	610001	13	1	1619	194	8102	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10204045	黄巾刀兵	610001	13	0	1619	194	8102	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10204051	庞德	510003	13	0	1136	255	10234	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
 10204052	乐进	510002	13	0	1705	204	8529	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
 10204053	王异	510010	13	0	1705	204	8529	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
@@ -343,30 +343,30 @@
 10204083	乐进	510002	14	0	1703	203	8518	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
 10204084	王异	510010	14	0	1703	203	8518	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10204085	曹操	510014	14	0	1703	203	8518	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10204091	庞德	510003	14	0	1195	268	10760	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10204092	乐进	510002	14	0	1792	214	8967	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10204093	王异	510010	14	0	1792	214	8967	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10204094	曹操	510014	14	2	2151	238	19926	0	0	0	0	1950	0	0	0	0	0	0	0	0	0	{}
+10204091	黄巾盾兵	610003	14	0	1195	268	10760	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10204092	吴国太	530002	14	0	1643	214	9863	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10204093	糜竺	520001	14	0	1643	214	9863	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10204094	凌统	530003	14	2	2151	238	19926	0	0	0	0	0	0	0	0	0	0	0	0	1950	0	{}
 10205011	黄巾刀兵	610001	15	0	1053	60	3009	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10205012	黄巾刀兵	610001	15	0	1053	60	3009	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10205013	黄巾刀兵	610001	15	0	1053	60	3009	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10205014	黄巾弓手	610004	15	0	1053	60	3009	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
+10205014	黄巾枪兵	610002	15	1	965	60	3310	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
 10205015	黄巾刀兵	610001	15	0	1053	60	3009	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10205021	黄巾枪兵	610002	15	0	965	60	3310	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10205022	黄巾枪兵	610002	15	0	965	60	3310	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10205021	黄巾刀兵	610001	15	0	1053	60	3009	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10205022	黄巾盾兵	610003	15	0	702	75	3611	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
 10205023	黄巾刀兵	610001	15	0	1053	60	3009	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10205024	黄巾刀兵	610001	15	0	1053	60	3009	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10205025	庞德	510003	15	0	1002	225	10834	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10205031	黄巾刀兵	610001	15	0	1118	63	3197	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10205032	黄巾盾兵	610003	15	0	745	79	3837	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
-10205033	黄巾刀兵	610001	15	0	1118	63	3197	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10205034	庞德	510003	15	0	1065	239	11511	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10205035	乐进	510002	15	0	1598	191	9593	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
+10205024	李傕	540003	15	0	1053	60	3009	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10205025	朱桓	530005	15	0	1316	191	9931	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
+10205031	黄巾枪兵	610002	15	0	1025	63	3517	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10205032	黄巾刀兵	610001	15	1	1118	63	3197	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10205033	黄巾枪兵	610002	15	0	1025	63	3517	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10205034	黄巾枪兵	610002	15	0	1465	191	10552	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10205035	黄巾枪兵	610002	15	0	1465	191	10552	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
 10205041	黄巾刀兵	610001	15	0	1118	63	3197	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10205042	黄巾刀兵	610001	15	0	1118	63	3197	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10205043	黄巾弓手	610004	15	0	1118	63	3197	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
-10205044	庞德	510003	15	0	1065	239	11511	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10205045	乐进	510002	15	0	1598	191	9593	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
+10205043	韩遂	540005	15	0	1118	63	3197	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10205044	黄巾刀兵	610001	15	0	1598	191	9593	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10205045	黄巾刀兵	610001	15	0	1598	191	9593	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10205051	黄巾枪兵	610002	15	0	1085	67	3724	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
 10205052	黄巾枪兵	610002	15	0	1085	67	3724	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
 10205053	庞德	510003	15	0	1128	253	12188	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
@@ -388,11 +388,11 @@
 10205083	乐进	510002	15	0	1786	214	10721	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
 10205084	王异	510010	15	0	1786	214	10721	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10205085	曹操	510014	15	0	1786	214	10721	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10205091	庞德	510003	15	0	1253	281	13543	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10205092	乐进	510002	15	0	1880	225	11286	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10205093	王异	510010	15	0	1880	225	11286	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10205094	曹操	510014	15	0	1880	225	11286	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10205095	关兴	520005	15	2	1974	266	27588	0	0	0	0	0	0	0	0	0	0	0	0	1950	0	{}
+10205091	黄巾盾兵	610003	15	0	1253	281	13543	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10205092	黄巾盾兵	610003	15	0	1253	281	13543	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10205093	黄巾弓手	610004	15	1	1880	225	11286	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10205094	黄巾弓手	610004	15	1	1880	225	11286	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+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	{}
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 e7f8773..5ae6309 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
@@ -1,94 +1,94 @@
 LineupID	PosNPCID1	PosNPCID2	PosNPCID3	PosNPCID4	PosNPCID5	PosNPCID6	BossID	BossPosView	SkillIDExList	SkillExCnt
 1010101		10101011					0		1001	0
 1010102		10101021			10101022		0		1002	0
-1010103		10101031		10101032		10101032	0		1003	0
-1010104	10101042		10101042	10101043		10101043	0		1004	0
+1010103	10101031		10101032		10101033		0		1003	0
+1010104		10101041		10101042		10101043	0		1004	0
 1010105	10101051		10101052		10101053		0		1005	0
 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		1009	0
-1010201	10102011	10102011	10102012		10102012		0		1010	0
+1010109	10101092	10101093	10101092				10101093		1004	0
+1010201	10102011		10102012				0		1010	0
 1010202		10102021		10102022		10102023	0		1011	0
-1010203		10102033		10102031		10102032	0		1012	0
+1010203	10102033		10102031		10102032		0		1012	0
 1010204	10102041		10102042	10102043		10102044	0		1013	0
 1010205	10102051		10102052		10102053		0		1014	0
 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		1018	0
-1010301	10103011	10103012	10103013				0		1019	0
-1010302	10103021		10103022	10103023		10103024	0		1020	0
-1010303	10103031		10103032	10103033	10103035	10103034	0		1021	0
-1010304	10103041	10103042	10103043	10103044		10103045	0		1022	0
+1010209		10102091		10102092	10102094	10102093	10102094		1013	0
+1010301		10103011		10103012		10103013	0		1019	0
+1010302		10103021			10103022		0		1020	0
+1010303	10103031		10103032		10103033		0		1021	0
+1010304	10103041		10103042	10103043		10103044	0		1022	0
 1010305	10103051		10103052	10103053		10103054	0		1023	0
 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		1003	0
+1010309	10103091		10103092	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
-1010404		10104041		10104042	10104043	10104044	0		1007	0
+1010404		10104041		10104042	10104043	10104042	0		1007	0
 1010405	10104051		10104052	10104053	10104055	10104054	0		1008	0
 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		10104091		10104092	10104094	10104093	10104094		1012	0
-1010501	10105011	10105012	10105013	10105014		10105015	0		1013	0
-1010502	10105021	10105022	10105023	10105024		10105025	0		1014	0
-1010503	10105031	10105032	10105033				0		1015	0
+1010409				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
 1010504	10105041	10105042	10105043	10105044		10105045	0		1016	0
 1010505	10105051		10105052	10105053		10105054	0		1017	0
 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	10105091		10105092	10105093	10105095	10105094	10105095		1021	0
-1020101	10201011		10201012	10201013		10201014	0		1022	0
-1020102		10201023		10201021	10201024	10201022	0		1023	0
-1020103	10201031	10201032	10201033	10201034		10201035	0		1024	0
+1010509				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
 1020104		10201041		10201042	10201043	10201044	0		1001	0
 1020105	10201051		10201052	10201053	10201055	10201054	0		1002	0
 1020106	10201061	10201063	10201062		10201064		0		1003	0
 1020107		10201073		10201071	10201074	10201072	0		1004	0
 1020108	10201081		10201082	10201083	10201084	10201085	0		1005	0
-1020109	10201091		10201092	10201093	10201095	10201094	10201095		1006	0
-1020201	10202011	10202012	10202013	10202014		10202015	0		1007	0
-1020202	10202021	10202025	10202022	10202023		10202024	0		1008	0
-1020203	10202031	10202033	10202032		10202034		0		1009	0
-1020204	10202041		10202042	10202043	10202045	10202044	0		1010	0
+1020109	10201091		10201092	10201093	10201095	10201094	10201095		1005	0
+1020201	10202011	10202012	10202013		10202014		0		1007	0
+1020202	10202021	10202025	10202022		10202023		0		1008	0
+1020203	10202031	10202034	10202031	10202032		10202033	0		1009	0
+1020204	10202041	10202042	10202043	10202045		10202044	0		1010	0
 1020205	10202051		10202052	10202054	10202053	10202055	0		1011	0
 1020206	10202061		10202062	10202064	10202063	10202065	0		1012	0
 1020207	10202071		10202072	10202073	10202074	10202075	0		1013	0
 1020208	10202081	10202082	10202083	10202085	10202084	10202086	0		1014	0
-1020209	10202091	10202095	10202092	10202093	10202096	10202094	10202096		1015	0
-1020301	10203011	10203015	10203012	10203013		10203014	0		1016	0
+1020209	10202091	10202096	10202092	10202093		10202094	10202096		1003	0
+1020301	10203011		10203012	10203013	10203015	10203014	0		1016	0
 1020302	10203021		10203022	10203023	10203024	10203025	0		1017	0
-1020303	10203031	10203033	10203032	10203034		10203035	0		1018	0
-1020304	10203041	10203042	10203043	10203044	10203046	10203045	0		1019	0
+1020303	10203031		10203032	10203034		10203035	0		1018	0
+1020304	10203041		10203043	10203044		10203045	0		1019	0
 1020305	10203051		10203052	10203053		10203054	0		1020	0
 1020306	10203061		10203062	10203063	10203064	10203065	0		1021	0
 1020307	10203073	10203074	10203075	10203071		10203072	0		1022	0
 1020308	10203081	10203082	10203083	10203084	10203085	10203086	0		1023	0
-1020309	10203091		10203092	10203093	10203095	10203094	10203095		1024	0
-1020401	10204011	10204012	10204013				0		1001	0
-1020402	10204021	10204023	10204022		10204024		0		1002	0
-1020403	10204031		10204032	10204033		10204034	0		1003	0
+1020309		10203092		10203093	10203095	10203094	10203095		1011	0
+1020401		10204011		10204012	10204012	10204012	0		1001	0
+1020402	10204021		10204022	10204023		10204024	0		1002	0
+1020403		10204031		10204033		10204034	0		1003	0
 1020404	10204043	10204044	10204045	10204041		10204042	0		1004	0
 1020405	10204051		10204052	10204053		10204054	0		1005	0
 1020406	10204061	10204062	10204063	10204064		10204065	0		1006	0
 1020407	10204071	10204073	10204072	10204074		10204075	0		1007	0
 1020408	10204082	10204081	10204083	10204084		10204085	0		1008	0
-1020409		10204091		10204092	10204094	10204093	10204094		1009	0
+1020409		10204091		10204092	10204094	10204093	10204094		1008	0
 1020501	10205011		10205012	10205013	10205014	10205015	0		1010	0
-1020502	10205021		10205022	10205023	10205025	10205024	0		1011	0
+1020502	10205021	10205022	10205023	10205025		10205024	0		1011	0
 1020503	10205031	10205032	10205033	10205034		10205035	0		1012	0
 1020504	10205041		10205042	10205044	10205043	10205045	0		1013	0
 1020505	10205051	10205053	10205052	10205054		10205055	0		1014	0
 1020506	10205061	10205065	10205062	10205063	10205066	10205064	0		1015	0
 1020507	10205071		10205072	10205074	10205073	10205075	0		1016	0
 1020508	10205082	10205081	10205083	10205084		10205085	0		1017	0
-1020509	10205091		10205092	10205093	10205095	10205094	10205095		1018	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
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Skill.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Skill.txt
index 89535c8..733a88c 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Skill.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Skill.txt
@@ -640,7 +640,7 @@
 4002240	4002240	1	1	神格																																			
 4003010	4003010	1	1	掠血	1	1	1	1	1	0	0	1	0	10000	0	0	10000	5010	40030101	13		0				0					0	3|1	0	0	0	0	0	0	0
 40030101	40030101	1	1	破甲	0	6	0	0	6	0	0	0	0	0	0	0	5000	17	2500|2			0				0					0			2	0	0	0	0	
-4003020	4003020	1	1	烈火焚城	2	1	1	1	1	0	0	1	0	40000	0	0	10000	5010	40030201	13		0				0					0	4|1	0	0	0	0	0	0	0
+4003020	4003020	1	1	烈火焚城	2	1	1	1	1	0	0	1	0	33000	0	0	10000	5010	40030201	13		0				0					0	4|1	0	0	0	0	0	0	0
 40030201	40030201	1	1	闪避	0	5	0	0	5	0	0	0	0	0	0	0	10000	27	2000|1			0				0					0		0	2	0	0	0	0	
 4003030	4003030	1	1	劫掠	3											0																							0
 4003050	4003050	1	1	狂袭	3											0																							0
@@ -807,17 +807,18 @@
 4016220	4016220	1	1	破境																																			
 4016230	4016230	1	1	镜花水月·狂																																			
 4016240	4016240	1	1	神格																																			
-6001010	6001010	1	1	劈砍	1	1	1	1	1	0	0	1	0	10000	0	0	10000	0														1|3							
-6001020	6001020	1	1	跳劈	2	1	2	1	4	0	0	2	0	15000	0	0	10000	0														1|4							
-6002010	6002010	1	1	刺击	1	1	2	1	1	0	0	1	0	8000	0	0	10000	0														1|3							
-6002020	6002020	1	1	鼓舞	2	5	0	1	0	1	0	6	0	0	0	0	10000	16	1000|1			0				0					0	1|4		2	1	5	3	0	
-6003010	6003010	1	1	重斩	1	1	1	1	1	0	0	1	0	8000	0	0	10000															1|3							
-6003020	6003020	1	1	刀盾连击	2	1	1	1	1	0	0	1	0	24000	0	0	10000	5010	60030201	13												1|4							
-60030201	60030201	1	1	护盾	0	5	0	1003	5	0	0	0	1	2000	0	0	10000	0				0				0					0	1|4	21	0	0	0	0	0	0
-6004010	6004010	1	1	弩箭	1	1	1	1	1	0	0	1	0	10000	0	0	10000															1|3							
-6004020	6004020	1	1	散射	2	1	1	1	2	0	0	3	0	10000	0	0	10000															1|4							
+6001010	6001010	1	1	劈砍	1	1	1	1	1	0	0	1	0	9000	0	0	10000	0														1|3							
+6001020	6001020	1	1	跳劈	2	1	2	1	4	0	0	2	0	14000	0	0	10000	0														1|4							
+6002010	6002010	1	1	刺击	1	1	2	1	1	0	0	1	0	6000	0	0	10000	0														1|3							
+6002020	6002020	1	1	鼓舞	2	5	0	1	0	1	0	2	0	0	0	0	10000	16	2000|1			0				0					0	1|4		2	1	5	3	0	
+6003010	6003010	1	1	重斩	1	1	1	1	1	0	0	1	0	7000	0	0	10000	5010	60030101	13												1|3							
+60030101	60030101	1	1	额外击晕	0	14	0	0	6	0	0	0	0	0	0	0	2000					0				0					0		3	1	0	0	0	0	0
+6003020	6003020	1	1	刀盾连击	2	1	1	1	1	0	0	1	0	20000	0	0	10000	5010	60030201	13												1|4							
+60030201	60030201	1	1	护盾	0	5	0	1003	5	0	0	0	1	3000	0	0	10000	0				0				0					0	1|4	21	0	0	0	0	0	0
+6004010	6004010	1	1	弩箭	1	1	1	1	1	0	0	1	0	11000	0	0	10000															1|3							
+6004020	6004020	1	1	散射	2	1	1	1	2	0	0	3	0	11000	0	0	10000															1|4							
 6005010	6005010	1	1	毒箭	1	1	2	1	3	0	0	1	0	10000	0	0	10000															1|3							
-60050101	60050101	1	1	中毒	0	4	2	1001	6	0	0	0	0	5000	0	0	10000	5001		4	2	0				0					0	1|3	5	3	1	3	4	0	0
+60050101	60050101	1	1	中毒	0	4	2	1001	6	0	0	0	0	5000	0	0	5000	5001		4	2	0				0					0	1|3	5	3	1	3	4	0	0
 6005020	6005020	1	1	瘟疫箭矢	2	1	2	1	3	0	0	1	0	25000	0	0	10000	6005	5000|[5]	8	3											1|4							
 6006010	6006010	1	1	狂砍	1	1	2	1	1	0	0	1	0	15000	0	0	10000															1|3							
 6006020	6006020	1	1	剔骨	2	1	2	1	2	0	0	3	0	15000	0	0	10000	5010	60060201	13												1|4							

--
Gitblit v1.8.0