From e65f21b99f1731822459eaf3f6dc0a959cbbb1ed Mon Sep 17 00:00:00 2001
From: gwj <123123@qq.com>
Date: 星期五, 14 十一月 2025 17:51:10 +0800
Subject: [PATCH] 1111 武将特性,小怪国家,npc

---
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/NPC.txt |  570 ++++++++++++++++++++++++++++----------------------------
 1 files changed, 285 insertions(+), 285 deletions(-)

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 75f6393..a610df1 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
@@ -21,8 +21,8 @@
 10101082	屠夫	610006	1	0	49	0	126	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
 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	黄巾刀兵	610001	1	0	46	0	66	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+10101091	魏国刀兵	610013	1	0	46	0	66	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+10101092	魏国刀兵	610013	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	黄巾刀兵	610001	2	0	54	0	77	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
@@ -63,8 +63,8 @@
 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	{}
+10103031	魏国刀兵	610013	3	0	107	0	154	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10103032	魏国刀兵	610013	3	0	107	0	154	0	0	0	0	750	0	0	0	0	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	{}
@@ -92,10 +92,10 @@
 10103083	庞德	510003	4	0	127	0	689	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
 10103084	乐进	510002	4	0	191	0	574	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
 10103085	王异	510010	4	0	191	0	574	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10103091	黄巾弩手	610004	4	0	156	0	223	0	0	0	0	0	0	0	0	750	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	黄巾弩手	610004	4	0	156	0	223	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
-10103094	黄巾弩手	610004	5	0	186	0	267	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
+10103091	蜀国弩手	610021	4	0	156	0	223	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
+10103092	蜀国刀兵	610018	4	0	156	0	223	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10103093	蜀国弩手	610021	4	0	156	0	223	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
+10103094	蜀国弩手	610021	5	0	186	0	267	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
 10103095	张星彩	520007	4	2	178	0	1787	0	0	0	0	0	0	0	0	0	0	1950	0	0	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	{}
@@ -184,15 +184,15 @@
 10201022	黄巾刀兵	610001	8	0	611	34	1165	0	0	0	0	750	0	0	0	0	0	0	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	黄巾刀兵	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	{}
+10201031	蜀国刀兵	610018	8	0	647	36	1234	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10201032	蜀国刀兵	610018	8	0	740	61	2056	0	0	0	0	1050	0	0	0	0	0	0	0	0	0	{}
+10201033	蜀国刀兵	610018	8	0	647	36	1234	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10201034	蜀国刀兵	610018	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	{}
+10201042	魏国枪兵	610014	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	{}
+10201044	魏国枪兵	610014	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	{}
@@ -221,14 +221,14 @@
 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	黄巾盾兵	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	{}
+10202021	蜀国盾兵	610020	10	0	497	53	2131	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
+10202022	蜀国盾兵	610020	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	{}
+10202024	魏国枪兵	610014	10	0	683	42	1954	0	0	750	0	0	0	0	0	0	0	0	0	0	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	{}
+10202031	魏国盾兵	610015	10	0	497	53	2131	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
+10202032	魏国枪兵	610014	10	0	683	42	1954	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10202033	魏国枪兵	610014	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	黄巾盾兵	610003	10	0	526	56	2257	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
@@ -262,18 +262,18 @@
 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	孟获	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	{}
+10203011	吴国刀兵	610023	11	0	856	48	2040	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10203012	吴国刀兵	610023	11	0	856	48	2040	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10203013	吴国刀兵	610023	11	0	856	48	2040	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10203014	吴国刀兵	610023	11	0	856	48	2040	0	0	0	0	750	0	0	0	0	0	0	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	黄巾枪兵	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	{}
+10203031	蜀国刀兵	610018	11	0	963	55	2295	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10203032	吴国刀兵	610023	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	吴国太	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	{}
@@ -303,19 +303,19 @@
 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	黄巾盾兵	610003	12	0	862	134	5394	0	0	0	0	0	0	0	0	0	0	1050	0	0	0	{}
+10203091	魏国盾兵	610015	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	{}
+10203093	魏国弩手	610016	12	0	1617	193	8091	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10203094	魏国弩手	610016	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	黄巾枪兵	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	{}
+10204021	蜀国枪兵	610019	13	0	930	57	2658	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10204022	蜀国枪兵	610019	13	0	930	57	2658	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10204023	蜀国枪兵	610019	13	0	1328	173	7974	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10204024	蜀国枪兵	610019	13	0	1328	173	7974	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10204031	魏国盾兵	610015	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	曹婴	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	{}
@@ -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	黄巾盾兵	610003	14	0	1195	268	10760	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10204091	吴国盾兵	610025	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	黄巾枪兵	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	黄巾刀兵	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	{}
+10205011	魏国刀兵	610013	15	0	1053	60	3009	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10205012	魏国刀兵	610013	15	0	1053	60	3009	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10205013	魏国刀兵	610013	15	0	1053	60	3009	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10205014	魏国枪兵	610014	15	1	965	60	3310	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10205015	魏国刀兵	610013	15	0	1053	60	3009	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10205021	魏国刀兵	610013	15	0	1053	60	3009	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10205022	魏国盾兵	610015	15	0	702	75	3611	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
+10205023	魏国刀兵	610013	15	0	1053	60	3009	0	0	0	0	750	0	0	0	0	0	0	0	0	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	{}
+10205031	魏国枪兵	610014	15	0	1025	63	3517	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10205032	魏国刀兵	610013	15	1	1118	63	3197	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10205033	魏国枪兵	610014	15	0	1025	63	3517	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10205034	魏国枪兵	610014	15	0	1465	191	10552	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10205035	魏国枪兵	610014	15	0	1465	191	10552	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10205041	魏国刀兵	610013	15	0	1118	63	3197	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10205042	魏国刀兵	610013	15	0	1118	63	3197	0	0	0	0	750	0	0	0	0	0	0	0	0	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	{}
+10205044	魏国刀兵	610013	15	0	1598	191	9593	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10205045	魏国刀兵	610013	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,27 +388,27 @@
 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	黄巾盾兵	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	王元姬	510011	15	2	1974	266	27588	0	0	0	0	0	0	1950	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	黄巾刀兵	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	黄巾枪兵	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	{}
+10205091	魏国盾兵	610015	15	0	1253	281	13543	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10205092	魏国盾兵	610015	15	0	1253	281	13543	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10205093	魏国弩手	610016	15	1	1880	225	11286	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10205094	魏国弩手	610016	15	1	1880	225	11286	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10205095	王元姬	510011	15	2	2256	250	25080	0	0	0	0	0	0	1950	0	0	0	0	0	0	0	{}
+10301011	魏国刀兵	610013	16	0	1555	88	4445	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10301012	魏国刀兵	610013	16	0	1555	88	4445	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10301013	魏国刀兵	610013	16	0	1555	88	4445	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10301014	魏国刀兵	610013	16	0	1555	88	4445	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10301015	魏国刀兵	610013	16	0	2222	266	13337	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10301021	魏国枪兵	610014	16	0	1426	88	4890	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10301022	魏国枪兵	610014	16	0	1426	88	4890	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10301023	魏国枪兵	610014	16	0	2037	266	14671	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10301024	魏国枪兵	610014	16	0	2037	266	14671	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10301031	魏国枪兵	610014	16	0	1515	94	5195	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10301032	魏国枪兵	610014	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	黄巾刀兵	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	{}
+10301041	蜀国刀兵	610018	16	0	1652	94	4723	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10301042	关兴	520005	16	0	1652	94	4723	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	{}
@@ -432,26 +432,26 @@
 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	黄巾盾兵	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	{}
+10301091	吴国盾兵	610025	16	0	1852	416	20005	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10301092	吴国盾兵	610025	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	{}
+10302011	吴国枪兵	610024	17	0	1533	95	5257	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10302012	吴国枪兵	610024	17	0	1533	95	5257	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10302013	吴国弩手	610026	17	0	1911	159	7966	0	0	0	0	0	0	0	0	1050	0	0	0	0	0	{}
+10302014	吴国弩手	610026	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	潘璋	530001	17	0	1672	95	4779	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10302022	凌统	530003	17	0	2389	286	14339	0	0	0	0	0	0	0	0	0	0	0	0	1500	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	黄巾弩手	610004	17	0	2389	286	14339	0	0	0	0	0	0	0	0	1500	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	黄巾刀兵	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	{}
+10302023	吴国弩手	610026	17	0	2389	286	14339	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10302024	吴国弩手	610026	17	0	2389	286	14339	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10302025	吴国弩手	610026	17	0	2389	286	14339	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10302031	吴国刀兵	610023	17	0	1777	101	5078	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10302032	吴国刀兵	610023	17	0	2538	304	15235	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10302033	吴国刀兵	610023	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	{}
+10302035	吴国刀兵	610023	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	{}
@@ -478,34 +478,34 @@
 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	黄巾刀兵	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	{}
+10302091	吴国刀兵	610023	17	0	2688	278	13941	0	0	0	0	1350	0	0	0	0	0	0	0	0	0	{}
+10302092	吴国刀兵	610023	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	黄巾弩手	610004	18	0	2300	238	11932	0	0	0	0	0	0	0	0	1350	0	0	0	0	0	{}
+10303011	魏国枪兵	610014	18	0	1640	102	5625	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10303012	魏国盾兵	610015	18	0	1193	127	6136	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
+10303013	魏国枪兵	610014	18	0	1640	102	5625	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10303014	魏国弩手	610016	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	黄巾枪兵	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	{}
+10303021	魏国盾兵	610015	18	0	1267	135	6520	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
+10303022	魏国枪兵	610014	18	0	2489	325	17930	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10303023	魏国枪兵	610014	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	黄巾弩手	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	{}
+10303031	魏国枪兵	610014	18	0	1845	114	6328	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10303032	魏国枪兵	610014	18	0	1845	114	6328	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10303033	魏国弩手	610016	18	0	2876	344	17259	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10303034	魏国弩手	610016	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	{}
+10303036	魏国弩手	610016	18	0	2876	344	17259	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10303041	蜀国盾兵	610020	18	0	2023	454	21862	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10303042	蜀国盾兵	610020	18	0	2023	454	21862	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10303043	蜀国弩手	610021	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	{}
+10303045	蜀国弩手	610021	18	0	3035	363	18218	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10303051	蜀国枪兵	610019	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	{}
 10303054	乐进	510002	18	0	3195	383	19177	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
@@ -527,11 +527,11 @@
 10303084	王异	510010	19	0	3234	387	19408	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10303085	曹操	510014	19	0	3234	387	19408	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 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	{}
+10303091	吴国枪兵	610024	19	0	2184	136	7491	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10303092	吴国枪兵	610024	19	0	2184	136	7491	0	0	750	0	0	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	{}
+10303094	吴国弩手	610026	19	0	3404	408	20430	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10303095	吴国弩手	610026	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	{}
@@ -539,13 +539,13 @@
 10304014	瘟疫毒弓	610005	20	0	1770	122	6360	0	0	0	0	0	0	0	0	750	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	黄巾盾兵	610003	20	0	2047	460	22116	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10304021	魏国盾兵	610015	20	0	1842	358	17201	0	0	0	0	0	0	0	0	0	0	1350	0	0	0	{}
+10304022	魏国盾兵	610015	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	0	0	1500	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	0	0	1500	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	{}
+10304025	魏国毒弓	610017	20	0	2687	391	20273	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10304031	魏国弩手	610016	20	0	2276	130	6504	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
+10304032	魏国弩手	610016	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	{}
@@ -579,8 +579,8 @@
 10304086	曹操	510014	21	0	3630	435	21788	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	{}
+10304093	蜀国弩手	610021	21	0	3822	458	22935	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10304094	蜀国弩手	610021	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	{}
@@ -592,16 +592,16 @@
 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	黄巾刀兵	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	{}
+10305031	吴国刀兵	610023	22	0	3083	319	15991	0	0	0	0	1350	0	0	0	0	0	0	0	0	0	{}
+10305032	吴国刀兵	610023	22	0	3426	411	20560	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10305033	吴国枪兵	610024	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	{}
+10305035	吴国枪兵	610024	22	0	3140	411	22616	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10305041	吴国盾兵	610025	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	瘟疫毒弓	610005	22	0	2997	436	22616	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10305043	吴国毒弓	610027	22	0	2997	436	22616	0	0	0	0	0	0	0	0	1500	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	0	0	1500	0	0	0	0	0	{}
+10305045	吴国毒弓	610027	22	0	2997	436	22616	0	0	0	0	0	0	0	0	1500	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	{}
@@ -625,15 +625,15 @@
 10305084	王异	510010	22	0	3829	459	22978	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10305085	曹操	510014	22	0	3829	459	22978	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 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	{}
+10305091	蜀国刀兵	610018	22	0	3224	268	13438	0	0	0	0	1050	0	0	0	0	0	0	0	0	0	{}
+10305092	蜀国刀兵	610018	22	0	3224	268	13438	0	0	0	0	1050	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	{}
+10305096	关兴	520005	22	2	4836	537	53752	0	0	0	0	0	0	0	0	0	0	0	0	1950	0	{}
+10306011	吴国刀兵	610023	23	0	2573	146	7354	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10306012	吴国盾兵	610025	23	0	1715	183	8825	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
+10306013	吴国刀兵	610023	23	0	2573	146	7354	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10306014	瘟疫毒弓	610005	23	0	2573	260	13482	0	0	0	0	0	0	0	0	1050	0	0	0	0	0	{}
 10306015	瘟疫毒弓	610005	23	0	2573	260	13482	0	0	0	0	0	0	0	0	1050	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	{}
@@ -648,9 +648,9 @@
 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	{}
+10306043	魏国弩手	610016	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	{}
+10306045	魏国弩手	610016	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,28 +674,28 @@
 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	黄巾盾兵	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	{}
+10306091	魏国盾兵	610015	24	0	3192	717	34491	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10306092	魏国盾兵	610015	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	{}
+10307011	魏国盾兵	610015	25	0	1861	199	9577	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
+10307012	魏国盾兵	610015	25	0	1861	199	9577	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
+10307013	魏国枪兵	610014	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	{}
+10307021	魏国盾兵	610015	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	{}
+10307023	魏国盾兵	610015	25	0	2826	634	30528	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10307024	魏国弩手	610016	25	0	4239	507	25440	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10307025	魏国弩手	610016	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	黄巾弩手	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	{}
+10307034	魏国弩手	610016	25	0	4488	537	26936	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10307035	魏国弩手	610016	25	0	4488	537	26936	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10307041	蜀国盾兵	610020	25	0	3158	709	34119	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10307042	蜀国盾兵	610020	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	司马徽	530006	25	0	4145	603	31276	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
@@ -722,8 +722,8 @@
 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	黄巾盾兵	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	{}
+10307091	吴国盾兵	610025	26	0	2767	432	20757	0	0	0	0	0	0	0	0	0	0	1050	0	0	0	{}
+10307092	吴国盾兵	610025	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	甘宁	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	{}
@@ -734,18 +734,18 @@
 10308014	瘟疫毒弓	610005	27	0	3774	549	28481	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
 10308015	瘟疫毒弓	610005	27	0	3774	549	28481	0	0	0	0	0	0	0	0	1500	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	黄巾枪兵	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	{}
+10308021	蜀国枪兵	610019	27	0	2941	183	10087	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10308022	蜀国枪兵	610019	27	0	2941	183	10087	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10308023	蜀国枪兵	610019	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	{}
+10308031	魏国刀兵	610013	27	0	3397	193	9709	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10308032	魏国盾兵	610015	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	{}
+10308041	魏国刀兵	610013	27	0	4610	477	23914	0	0	0	0	1350	0	0	0	0	0	0	0	0	0	{}
+10308042	魏国盾兵	610015	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	{}
@@ -779,26 +779,26 @@
 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	瘟疫毒弓	610005	29	0	3255	329	17057	0	0	0	0	0	0	0	0	1050	0	0	0	0	0	{}
-10401014	瘟疫毒弓	610005	29	0	3255	329	17057	0	0	0	0	0	0	0	0	1050	0	0	0	0	0	{}
-10401021	黄巾刀兵	610001	29	0	3255	185	9303	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10401011	魏国刀兵	610013	29	0	3255	185	9303	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10401012	魏国刀兵	610013	29	0	3255	185	9303	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10401013	魏国毒弓	610017	29	0	3255	329	17057	0	0	0	0	0	0	0	0	1050	0	0	0	0	0	{}
+10401014	魏国毒弓	610017	29	0	3255	329	17057	0	0	0	0	0	0	0	0	1050	0	0	0	0	0	{}
+10401021	魏国刀兵	610013	29	0	3255	185	9303	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10401022	乐进	510002	29	0	3255	185	9303	0	0	0	0	0	0	0	0	0	0	0	0	750	0	{}
 10401023	曹婴	510001	29	1	4883	619	34114	0	0	0	0	1650	0	0	0	0	0	0	0	0	0	{}
 10401024	乐进	510002	29	0	4651	557	27911	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10401031	黄巾盾兵	610003	29	0	2306	246	11862	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
-10401032	黄巾刀兵	610001	29	0	3953	329	16475	0	0	0	0	1050	0	0	0	0	0	0	0	0	0	{}
+10401031	魏国盾兵	610015	29	0	2306	246	11862	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
+10401032	魏国刀兵	610013	29	0	3953	329	16475	0	0	0	0	1050	0	0	0	0	0	0	0	0	0	{}
 10401033	曹轶	510006	29	0	3459	197	9885	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
 10401034	庞德	510003	29	0	3294	740	35587	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
 10401035	乐进	510002	29	0	4941	592	29655	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
 10401041	李典	510007	29	0	2635	411	19770	0	0	0	0	0	0	1050	0	0	0	0	0	0	0	{}
-10401042	黄巾弩手	610004	29	0	4941	592	29655	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10401042	魏国弩手	610016	29	0	4941	592	29655	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
 10401043	卞夫人	510004	29	0	4941	592	29655	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
-10401044	黄巾弩手	610004	29	0	4941	592	29655	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
-10401051	黄巾盾兵	610003	29	0	2441	261	12560	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
+10401044	魏国弩手	610016	29	0	4941	592	29655	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10401051	魏国盾兵	610015	29	0	2441	261	12560	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
 10401052	曹婴	510001	29	0	3662	209	10466	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10401053	贾诩	510009	29	0	3662	209	10466	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
+10401053	贾诩	510009	29	0	3204	222	11513	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
 10401054	曹轶	510006	29	0	3662	209	10466	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
 10401055	刘备	520013	29	0	4796	627	34540	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
 10401061	黄巾枪兵	610002	29	0	3357	209	11513	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
@@ -826,33 +826,33 @@
 10401104	甘夫人	520006	29	0	5063	662	36459	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
 10401105	何太后	540008	29	0	4832	703	36459	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
 10401106	刘备	520013	29	0	5063	662	36459	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
-10401111	黄巾枪兵	610002	29	0	4263	387	21321	0	0	1050	0	0	0	0	0	0	0	0	0	0	0	{}
-10401112	黄巾枪兵	610002	29	0	4263	387	21321	0	0	1050	0	0	0	0	0	0	0	0	0	0	0	{}
+10401111	魏国枪兵	610014	29	0	4263	387	21321	0	0	1050	0	0	0	0	0	0	0	0	0	0	0	{}
+10401112	魏国枪兵	610014	29	0	4263	387	21321	0	0	1050	0	0	0	0	0	0	0	0	0	0	0	{}
 10401113	卞夫人	510004	29	0	5814	696	34889	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
 10401114	于禁	510005	29	0	5087	740	38378	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
 10401115	王异	510010	29	2	6976	774	77532	0	0	0	0	1950	0	0	0	0	0	0	0	0	0	{}
-10402011	黄巾刀兵	610001	30	0	3621	206	10348	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10402012	黄巾盾兵	610003	30	0	2414	258	12418	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
-10402013	黄巾刀兵	610001	30	0	3621	206	10348	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10402014	瘟疫毒弓	610005	30	0	3168	219	11383	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
-10402015	瘟疫毒弓	610005	30	0	3168	219	11383	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
-10402021	黄巾刀兵	610001	30	0	3621	206	10348	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10402022	黄巾刀兵	610001	30	0	3621	206	10348	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10402011	魏国刀兵	610013	30	0	3621	206	10348	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10402012	魏国盾兵	610015	30	0	2414	258	12418	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
+10402013	魏国刀兵	610013	30	0	3621	206	10348	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10402014	魏国毒弓	610017	30	0	3168	219	11383	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
+10402015	魏国毒弓	610017	30	0	3168	219	11383	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
+10402021	魏国刀兵	610013	30	0	3621	206	10348	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10402022	魏国刀兵	610013	30	0	3621	206	10348	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10402023	蔡文姬	510008	30	0	3319	206	11383	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10402024	黄巾刀兵	610001	30	0	3621	206	10348	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10402024	魏国刀兵	610013	30	0	3621	206	10348	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10402025	于禁	510005	30	0	4526	659	34151	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10402031	黄巾刀兵	610001	30	0	3847	219	10995	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10402032	黄巾枪兵	610002	30	0	3527	219	12095	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10402031	魏国刀兵	610013	30	0	3847	219	10995	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10402032	魏国枪兵	610014	30	0	3527	219	12095	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
 10402033	蔡文姬	510008	30	0	5038	659	36285	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10402034	卞夫人	510004	30	0	5496	659	32986	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
 10402041	庞德	510003	30	0	2931	457	21991	0	0	0	0	0	0	0	0	0	0	1050	0	0	0	{}
 10402042	李典	510007	30	0	2931	457	21991	0	0	0	0	0	0	1050	0	0	0	0	0	0	0	{}
-10402043	瘟疫毒弓	610005	30	0	3366	233	12095	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
-10402044	瘟疫毒弓	610005	30	0	3366	233	12095	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
+10402043	魏国毒弓	610017	30	0	3366	233	12095	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
+10402044	魏国毒弓	610017	30	0	3366	233	12095	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
 10402045	于禁	510005	30	1	5050	778	44348	0	0	0	0	0	0	0	0	0	0	1650	0	0	0	{}
-10402051	黄巾刀兵	610001	30	0	4074	232	11642	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10402052	黄巾刀兵	610001	30	0	4074	232	11642	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10402053	黄巾枪兵	610002	30	0	3734	232	12806	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10402051	魏国刀兵	610013	30	0	4074	232	11642	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10402052	魏国刀兵	610013	30	0	4074	232	11642	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10402053	魏国枪兵	610014	30	0	3734	232	12806	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
 10402054	甘夫人	520006	30	0	5335	697	38419	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
 10402055	何太后	540008	30	0	5092	741	38419	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
 10402061	黄巾枪兵	610002	30	0	3734	232	12806	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
@@ -881,12 +881,12 @@
 10402103	王异	510010	30	0	6143	736	36867	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10402104	甘夫人	520006	30	0	5631	736	40554	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
 10402105	何太后	540008	30	0	5375	782	40554	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10402111	黄巾刀兵	610001	30	0	4526	258	12936	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10402112	黄巾刀兵	610001	30	0	4526	258	12936	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10402111	魏国刀兵	610013	30	0	4526	258	12936	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10402112	魏国刀兵	610013	30	0	4526	258	12936	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10402113	曹轶	510006	30	0	4526	258	12936	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
 10402114	蔡文姬	510008	30	0	4149	258	14229	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10402115	于禁	510005	30	1	5941	915	52175	0	0	0	0	0	0	0	0	0	0	1650	0	0	0	{}
-10402116	贾诩	510009	30	2	7760	861	86240	0	0	0	0	0	0	0	0	1950	0	0	0	0	0	{}
+10402116	贾诩	510009	30	2	6790	915	94864	0	0	0	0	0	0	0	0	1950	0	0	0	0	0	{}
 10403011	黄巾盾兵	610003	31	0	2503	268	12878	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
 10403012	黄巾盾兵	610003	31	0	2503	268	12878	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
 10403013	黄巾刀兵	610001	31	0	3755	214	10731	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
@@ -943,19 +943,19 @@
 10403113	张宝	540004	31	0	6146	804	44268	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
 10403114	李傕	540003	31	0	6705	804	40244	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
 10403115	董白	540009	31	2	8046	893	89432	0	0	0	0	0	0	0	0	0	0	0	0	1950	0	{}
-10404011	黄巾枪兵	610002	32	0	3567	222	12233	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10404012	黄巾枪兵	610002	32	0	3567	222	12233	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10404013	黄巾刀兵	610001	32	0	3892	222	11121	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10404014	黄巾刀兵	610001	32	0	3892	222	11121	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10404011	魏国枪兵	610014	32	0	3567	222	12233	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10404012	魏国枪兵	610014	32	0	3567	222	12233	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10404013	魏国刀兵	610013	32	0	3892	222	11121	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10404014	魏国刀兵	610013	32	0	3892	222	11121	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10404015	王异	510010	32	0	5560	666	33364	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10404021	于禁	510005	32	0	3405	236	12233	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
 10404022	乐进	510002	32	0	5560	666	33364	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10404023	黄巾刀兵	610001	32	0	5560	666	33364	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
+10404023	魏国刀兵	610013	32	0	5560	666	33364	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10404024	曹婴	510001	32	0	5560	666	33364	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10404025	曹轶	510006	32	0	5560	666	33364	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
-10404031	王元姬	510011	32	0	3618	250	12998	0	0	0	0	0	0	750	0	0	0	0	0	0	0	{}
-10404032	黄巾盾兵	610003	32	0	3938	885	42540	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10404033	黄巾盾兵	610003	32	0	3938	885	42540	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10404031	王元姬	510011	32	0	4135	236	11816	0	0	0	0	0	0	750	0	0	0	0	0	0	0	{}
+10404032	魏国盾兵	610015	32	0	3938	885	42540	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10404033	魏国盾兵	610015	32	0	3938	885	42540	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
 10404034	瘟疫毒弓	610005	32	0	5169	752	38995	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
 10404035	瘟疫毒弓	610005	32	0	5169	752	38995	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
 10404041	李典	510007	32	0	3938	885	42540	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
@@ -963,13 +963,13 @@
 10404043	甘夫人	520006	32	0	5415	708	38995	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
 10404044	卞夫人	510004	32	0	5907	708	35450	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
 10404045	吴国太	530002	32	0	5415	708	38995	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
-10404051	黄巾盾兵	610003	32	0	3336	520	25023	0	0	0	0	0	0	0	0	0	0	1050	0	0	0	{}
+10404051	吴国盾兵	610025	32	0	3336	520	25023	0	0	0	0	0	0	0	0	0	0	1050	0	0	0	{}
 10404052	李傕	540003	32	0	5004	416	20853	0	0	1050	0	0	0	0	0	0	0	0	0	0	0	{}
 10404053	乐进	510002	32	0	4378	249	12511	0	0	0	0	0	0	0	0	0	0	0	0	750	0	{}
 10404054	王异	510010	32	0	4378	249	12511	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10404055	孙策	530009	32	1	6568	833	45876	0	0	0	0	1650	0	0	0	0	0	0	0	0	0	{}
-10404061	黄巾刀兵	610001	32	0	4378	249	12511	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10404062	黄巾刀兵	610001	32	0	4378	249	12511	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10404061	魏国刀兵	610013	32	0	4378	249	12511	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10404062	魏国刀兵	610013	32	0	4378	249	12511	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10404063	庞德	510003	32	0	4170	937	45042	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
 10404064	乐进	510002	32	0	6255	749	37535	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
 10404065	王异	510010	32	0	6255	749	37535	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
@@ -1002,18 +1002,18 @@
 10404114	曹婴	510001	32	0	6950	833	41706	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10404115	曹轶	510006	32	0	6950	833	41706	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
 10404116	蔡文姬	510008	32	2	7645	925	101948	0	0	0	0	1950	0	0	0	0	0	0	0	0	0	{}
-10405011	黄巾枪兵	610002	33	0	3694	230	12670	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10405012	黄巾刀兵	610001	33	0	4030	230	11518	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10405013	黄巾枪兵	610002	33	0	3694	230	12670	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10405014	黄巾刀兵	610001	33	0	4030	230	11518	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10405015	黄巾刀兵	610001	33	0	4030	230	11518	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10405016	黄巾刀兵	610001	33	0	4030	230	11518	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10405011	吴国枪兵	610024	33	0	3694	230	12670	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10405012	吴国刀兵	610023	33	0	4030	230	11518	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10405013	吴国枪兵	610024	33	0	3694	230	12670	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10405014	吴国刀兵	610023	33	0	4030	230	11518	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10405015	吴国刀兵	610023	33	0	4030	230	11518	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10405016	吴国刀兵	610023	33	0	4030	230	11518	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10405021	甘宁	530004	33	0	6117	733	36714	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
 10405022	凌统	530003	33	0	6117	733	36714	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10405023	黄巾盾兵	610003	33	0	4078	917	44057	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10405023	吴国盾兵	610025	33	0	4078	917	44057	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
 10405024	吴国太	530002	33	0	5608	733	40386	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
-10405025	黄巾盾兵	610003	33	0	4078	917	44057	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10405031	黄巾刀兵	610001	33	0	4534	258	12958	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10405025	吴国盾兵	610025	33	0	4078	917	44057	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10405031	吴国刀兵	610023	33	0	4534	258	12958	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10405032	司马徽	530006	33	0	3967	275	14253	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
 10405033	朱桓	530005	33	0	5668	825	42761	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
 10405034	潘璋	530001	33	0	6477	776	38874	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
@@ -1023,14 +1023,14 @@
 10405043	孙尚香	530010	33	0	6837	820	41034	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10405044	大乔	530011	33	0	6837	820	41034	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
 10405045	孙鲁育	530008	33	0	6267	820	45137	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
-10405051	黄巾刀兵	610001	33	0	5038	287	14397	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10405052	黄巾刀兵	610001	33	0	5038	287	14397	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10405051	吴国刀兵	610023	33	0	5038	287	14397	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10405052	吴国刀兵	610023	33	0	5038	287	14397	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10405053	庞德	510003	33	0	4798	1079	51832	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
 10405054	乐进	510002	33	0	7197	863	43193	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
 10405055	王异	510010	33	0	7197	863	43193	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10405056	甘夫人	520006	33	0	6597	863	47513	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
-10405061	黄巾盾兵	610003	34	0	3575	694	33380	0	0	0	0	0	0	0	0	0	0	1350	0	0	0	{}
-10405062	黄巾枪兵	610002	34	0	4916	555	30598	0	0	1350	0	0	0	0	0	0	0	0	0	0	0	{}
+10405061	吴国盾兵	610025	34	0	3575	694	33380	0	0	0	0	0	0	0	0	0	0	1350	0	0	0	{}
+10405062	吴国枪兵	610024	34	0	4916	555	30598	0	0	1350	0	0	0	0	0	0	0	0	0	0	0	{}
 10405063	庞德	510003	34	0	3973	893	42917	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
 10405064	乐进	510002	34	0	5959	714	35764	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
 10405065	王异	510010	34	0	5959	714	35764	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
@@ -1061,35 +1061,35 @@
 10405114	孙鲁育	530008	34	0	6828	893	49176	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
 10405115	大乔	530011	34	0	7449	893	44705	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
 10405116	孙尚香	530010	34	2	8939	992	99346	0	0	0	0	1950	0	0	0	0	0	0	0	0	0	{}
-10406011	黄巾枪兵	610002	35	0	3955	246	13564	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10406012	黄巾盾兵	610003	35	0	2877	307	14798	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
-10406013	黄巾枪兵	610002	35	0	3955	246	13564	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10406014	黄巾弩手	610004	35	0	4315	246	12331	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
+10406011	吴国枪兵	610024	35	0	3955	246	13564	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10406012	吴国盾兵	610025	35	0	2877	307	14798	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
+10406013	吴国枪兵	610024	35	0	3955	246	13564	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10406014	吴国弩手	610026	35	0	4315	246	12331	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
 10406015	凌统	530003	35	0	6165	739	36995	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
 10406016	潘璋	530001	35	0	6165	739	36995	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10406021	黄巾刀兵	610001	35	0	4315	246	12331	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10406021	吴国刀兵	610023	35	0	4315	246	12331	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10406022	丁奉	530007	35	0	4110	923	44394	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
 10406023	吴国太	530002	35	0	5651	739	40694	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
 10406024	司马徽	530006	35	0	5394	785	40694	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
 10406025	朱桓	530005	35	0	5394	785	40694	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
-10406031	黄巾枪兵	610002	35	0	4203	261	14412	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10406032	黄巾枪兵	610002	35	0	4203	261	14412	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10406031	吴国枪兵	610024	35	0	4203	261	14412	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10406032	吴国枪兵	610024	35	0	4203	261	14412	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
 10406033	甘宁	530004	35	0	6550	785	39307	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
 10406034	朱桓	530005	35	0	5731	834	43237	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
 10406035	凌统	530003	35	1	6877	872	48042	0	0	0	0	0	0	0	0	0	0	0	0	1650	0	{}
 10406036	甘夫人	520006	35	0	6004	785	43237	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
-10406041	黄巾盾兵	610003	35	0	4366	981	47168	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10406041	吴国盾兵	610025	35	0	4366	981	47168	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
 10406042	丁奉	530007	35	0	4366	981	47168	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10406043	黄巾弩手	610004	35	0	6550	785	39307	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10406043	吴国弩手	610026	35	0	6550	785	39307	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
 10406044	黄月英	520011	35	0	5731	834	43237	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10406045	黄巾弩手	610004	35	0	6550	785	39307	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
-10406051	黄巾枪兵	610002	35	0	4450	277	15260	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
-10406052	黄巾枪兵	610002	35	0	4450	277	15260	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10406045	吴国弩手	610026	35	0	6550	785	39307	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10406051	吴国枪兵	610024	35	0	4450	277	15260	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10406052	吴国枪兵	610024	35	0	4450	277	15260	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
 10406053	周仓	520003	35	0	4623	1039	49943	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
 10406054	孙策	530009	35	0	6935	831	41619	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10406055	鲍三娘	520002	35	0	6935	831	41619	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
-10406061	黄巾枪兵	610002	35	0	5086	461	25434	0	0	1050	0	0	0	0	0	0	0	0	0	0	0	{}
-10406062	黄巾刀兵	610001	35	0	5548	461	23121	0	0	0	0	1050	0	0	0	0	0	0	0	0	0	{}
+10406061	吴国枪兵	610024	35	0	5086	461	25434	0	0	1050	0	0	0	0	0	0	0	0	0	0	0	{}
+10406062	吴国刀兵	610023	35	0	5548	461	23121	0	0	0	0	1050	0	0	0	0	0	0	0	0	0	{}
 10406063	庞德	510003	35	0	4623	1039	49943	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
 10406064	乐进	510002	35	0	6935	831	41619	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
 10406065	王异	510010	35	0	6935	831	41619	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
@@ -1148,7 +1148,7 @@
 10407053	黄巾盾兵	610003	36	0	5030	1131	54336	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
 10407054	于禁	510005	36	0	6602	961	49808	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
 10407055	甘宁	530004	36	0	7545	905	45280	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
-10407056	贾诩	510009	36	0	7545	905	45280	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10407056	贾诩	510009	36	0	6602	961	49808	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
 10407061	黄巾枪兵	610002	36	0	5533	502	27671	0	0	1050	0	0	0	0	0	0	0	0	0	0	0	{}
 10407062	黄巾枪兵	610002	36	0	5533	502	27671	0	0	1050	0	0	0	0	0	0	0	0	0	0	0	{}
 10407063	庞德	510003	36	0	5030	1131	54336	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
@@ -1178,41 +1178,41 @@
 10407104	王异	510010	36	0	7965	955	47796	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10407105	甘夫人	520006	36	1	7666	1061	64259	0	0	0	0	0	0	1650	0	0	0	0	0	0	0	{}
 10407106	诸葛亮	520012	36	0	7965	955	47796	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
-10407111	瘟疫毒弓	610005	36	0	5135	356	18447	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
-10407112	瘟疫毒弓	610005	36	0	5135	356	18447	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
+10407111	吴国毒弓	610027	36	0	5135	356	18447	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
+10407112	吴国毒弓	610027	36	0	5135	356	18447	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
 10407113	李傕	540003	36	1	8803	1117	61492	0	0	1650	0	0	0	0	0	0	0	0	0	0	0	{}
 10407114	董卓	540011	36	0	5589	1257	60374	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
 10407115	韩遂	540005	36	1	8803	1117	61492	0	0	1650	0	0	0	0	0	0	0	0	0	0	0	{}
 10407116	卑弥呼	540010	36	2	10061	1117	111804	0	0	0	0	1950	0	0	0	0	0	0	0	0	0	{}
-10408011	黄巾盾兵	610003	37	0	3224	345	16585	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
-10408012	黄巾刀兵	610001	37	0	4837	276	13821	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10408013	黄巾盾兵	610003	37	0	3224	345	16585	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
-10408014	黄巾枪兵	610002	37	0	4433	276	15203	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10408011	吴国盾兵	610025	37	0	3224	345	16585	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
+10408012	吴国刀兵	610023	37	0	4837	276	13821	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10408013	吴国盾兵	610025	37	0	3224	345	16585	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
+10408014	吴国枪兵	610024	37	0	4433	276	15203	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
 10408015	孙尚香	530010	37	0	6910	828	41464	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10408016	乐进	510002	37	0	6910	828	41464	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10408021	黄巾枪兵	610002	37	0	6730	880	48461	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10408021	吴国枪兵	610024	37	0	6730	880	48461	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
 10408022	丁奉	530007	37	0	4894	1100	52867	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10408023	黄巾枪兵	610002	37	0	6730	880	48461	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10408023	吴国枪兵	610024	37	0	6730	880	48461	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
 10408024	甘宁	530004	37	0	7341	880	44056	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
 10408025	朱桓	530005	37	0	6424	935	48461	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
 10408031	甘宁	530004	37	0	7773	932	46647	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
 10408032	李典	510007	37	0	5182	1165	55977	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
 10408033	潘璋	530001	37	0	7773	932	46647	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
-10408034	黄巾枪兵	610002	37	0	7126	932	51312	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
+10408034	吴国枪兵	610024	37	0	7126	932	51312	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
 10408035	司马徽	530006	37	0	6802	990	51312	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
-10408041	瘟疫毒弓	610005	37	0	5744	580	30090	0	0	0	0	0	0	0	0	1050	0	0	0	0	0	{}
-10408042	瘟疫毒弓	610005	37	0	5744	580	30090	0	0	0	0	0	0	0	0	1050	0	0	0	0	0	{}
+10408041	吴国毒弓	610027	37	0	5744	580	30090	0	0	0	0	0	0	0	0	1050	0	0	0	0	0	{}
+10408042	吴国毒弓	610027	37	0	5744	580	30090	0	0	0	0	0	0	0	0	1050	0	0	0	0	0	{}
 10408043	潘璋	530001	37	0	8205	984	49239	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10408044	丁奉	530007	37	1	5744	1367	72217	0	0	0	0	0	0	0	0	0	0	1650	0	0	0	{}
 10408045	乐进	510002	37	0	8205	984	49239	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10408051	黄巾弩手	610004	37	0	6046	345	17277	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
-10408052	黄巾弩手	610004	37	0	6046	345	17277	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
+10408051	魏国弩手	610016	37	0	6046	345	17277	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
+10408052	魏国弩手	610016	37	0	6046	345	17277	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
 10408053	于禁	510005	37	0	7557	1100	57014	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
 10408054	李典	510007	37	0	5758	1295	62197	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
 10408055	李傕	540003	37	0	8637	1036	51831	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
 10408056	卞夫人	510004	37	0	8637	1036	51831	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
-10408061	黄巾盾兵	610003	38	0	3320	355	17078	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
-10408062	黄巾枪兵	610002	38	0	4565	284	15655	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
+10408061	吴国盾兵	610025	38	0	3320	355	17078	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
+10408062	吴国枪兵	610024	38	0	4565	284	15655	0	0	750	0	0	0	0	0	0	0	0	0	0	0	{}
 10408063	乐进	510002	38	0	7115	853	42697	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
 10408064	王异	510010	38	0	7115	853	42697	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10408065	甘夫人	520006	38	0	6522	853	46967	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
@@ -1252,21 +1252,21 @@
 10409014	李傕	540003	39	0	7323	878	43948	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
 10409015	祝融	540007	39	0	7323	878	43948	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10409016	郭汜	540002	39	0	7323	878	43948	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
-10409021	黄巾刀兵	610001	39	0	5447	311	15564	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10409022	黄巾刀兵	610001	39	0	5447	311	15564	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
-10409023	黄巾刀兵	610001	39	0	5447	311	15564	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10409021	蜀国刀兵	610018	39	0	5447	311	15564	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10409022	蜀国刀兵	610018	39	0	5447	311	15564	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
+10409023	蜀国刀兵	610018	39	0	5447	311	15564	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10409024	黄月英	520011	39	0	6808	991	51364	0	0	0	0	1500	0	0	0	0	0	0	0	0	0	{}
 10409025	关银屏	520008	39	0	7781	933	46694	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
 10409031	乐进	510002	39	0	6591	549	27467	0	0	0	0	0	0	0	0	0	0	0	0	1050	0	{}
 10409032	王异	510010	39	0	5767	329	16480	0	0	0	0	750	0	0	0	0	0	0	0	0	0	{}
 10409033	庞德	510003	39	0	4394	686	32961	0	0	0	0	0	0	0	0	0	0	1050	0	0	0	{}
-10409034	瘟疫毒弓	610005	39	0	7209	1049	54385	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10409034	魏国毒弓	610017	39	0	7209	1049	54385	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
 10409035	曹轶	510006	39	0	8239	988	49441	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
 10409041	黄巾盾兵	610003	39	0	4058	434	20875	0	0	0	0	0	0	0	0	0	0	750	0	0	0	{}
 10409042	董白	540009	39	0	8697	1043	52188	0	0	0	0	0	0	0	0	0	0	0	0	1500	0	{}
 10409043	赵云	520010	39	0	8697	1043	52188	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
 10409044	张宝	540004	39	0	7972	1043	57407	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10409045	庞统	520009	39	0	8697	1043	52188	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
+10409045	庞统	520009	39	0	7609	1108	57407	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
 10409046	甘夫人	520006	39	0	7972	1043	57407	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
 10409051	黄巾刀兵	610001	39	0	8239	854	42727	0	0	0	0	1350	0	0	0	0	0	0	0	0	0	{}
 10409052	黄巾盾兵	610003	39	0	5492	1067	51272	0	0	0	0	0	0	0	0	0	0	1350	0	0	0	{}
@@ -1321,15 +1321,15 @@
 10410024	司马徽	530006	41	0	7205	1049	54347	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
 10410025	甘夫人	520006	41	0	7548	987	54347	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
 10410026	甘夫人	520006	41	0	7548	987	54347	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
-10410031	黄巾弩手	610004	41	0	6103	348	17437	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
+10410031	魏国弩手	610016	41	0	6103	348	17437	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
 10410032	庞德	510003	41	0	5812	1307	62775	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
 10410033	甘宁	530004	41	0	8718	1045	52313	0	0	1500	0	0	0	0	0	0	0	0	0	0	0	{}
 10410034	于禁	510005	41	0	7628	1111	57544	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10410035	王元姬	510011	41	0	7628	1111	57544	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
-10410041	关兴	520005	41	0	7247	912	47243	0	0	0	0	0	0	0	0	0	0	0	0	1350	0	{}
+10410035	王元姬	510011	41	0	8718	1045	52313	0	0	0	0	0	0	1500	0	0	0	0	0	0	0	{}
+10410041	关兴	520005	41	0	8282	858	42948	0	0	0	0	0	0	0	0	0	0	0	0	1350	0	{}
 10410042	甘夫人	520006	41	0	7592	858	47243	0	0	0	0	0	0	1350	0	0	0	0	0	0	0	{}
-10410043	黄巾盾兵	610003	41	0	6135	1379	66263	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
-10410044	黄巾盾兵	610003	41	0	6135	1379	66263	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10410043	蜀国盾兵	610020	41	0	6135	1379	66263	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
+10410044	蜀国盾兵	610020	41	0	6135	1379	66263	0	0	0	0	0	0	0	0	0	0	1500	0	0	0	{}
 10410045	诸葛果	520004	41	0	9203	1103	55219	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
 10410046	大乔	530011	41	0	9203	1103	55219	0	0	0	0	0	0	0	0	1500	0	0	0	0	0	{}
 10410051	黄巾弩手	610004	41	0	6781	387	19375	0	0	0	0	0	0	0	0	750	0	0	0	0	0	{}
@@ -1374,18 +1374,18 @@
 10410114	张宝	540004	42	1	10041	1327	94940	0	0	0	0	0	0	0	0	0	0	1800	0	0	0	{}
 10410115	何太后	540008	42	1	9585	1410	94940	0	0	0	0	0	0	0	0	0	0	0	0	1800	0	{}
 10410116	吕布	540014	42	2	7967	1659	159340	0	0	0	0	0	0	0	0	0	0	1950	0	0	0	{}
-1011001	黄巾刀兵	610001	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-1011002	黄巾盾兵	610003	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-1011003	黄巾枪兵	610002	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-1011004	黄巾弩手	610004	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-1012001	黄巾刀兵	610001	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-1012002	黄巾盾兵	610003	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-1012003	黄巾枪兵	610002	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-1012004	黄巾弩手	610004	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-1013001	黄巾刀兵	610001	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-1013002	黄巾盾兵	610003	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-1013003	黄巾枪兵	610002	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-1013004	黄巾弩手	610004	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+1011001	魏国刀兵	610013	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+1011002	魏国盾兵	610015	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+1011003	魏国枪兵	610014	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+1011004	魏国弩手	610016	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+1012001	魏国刀兵	610013	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+1012002	魏国盾兵	610015	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+1012003	魏国枪兵	610014	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+1012004	魏国弩手	610016	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+1013001	魏国刀兵	610013	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+1013002	魏国盾兵	610015	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+1013003	魏国枪兵	610014	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+1013004	魏国弩手	610016	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
 1014001	曹婴	510001	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{"23":1500}
 1014002	乐进	510002	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{"31":1500}
 1014003	庞德	510003	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{"29":1500}
@@ -1450,23 +1450,23 @@
 1017014	曹操	510014	1	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{"23":1500}
 1017015	曹仁	510015	1	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{"29":1500}
 1017016	郭嘉	510016	1	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{"27":1500}
-1021001	黄巾刀兵	610001	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-1021002	黄巾盾兵	610003	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-1021003	黄巾枪兵	610002	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-1021004	黄巾弩手	610004	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-1022001	黄巾刀兵	610001	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-1022002	黄巾盾兵	610003	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-1022003	黄巾枪兵	610002	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-1022004	黄巾弩手	610004	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-1023001	黄巾刀兵	610001	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-1023002	黄巾盾兵	610003	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-1023003	黄巾枪兵	610002	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-1023004	黄巾弩手	610004	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+1021001	蜀国刀兵	610018	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+1021002	蜀国盾兵	610020	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+1021003	蜀国枪兵	610019	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+1021004	蜀国弩手	610021	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+1022001	蜀国刀兵	610018	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+1022002	蜀国盾兵	610020	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+1022003	蜀国枪兵	610019	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+1022004	蜀国弩手	610021	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+1023001	蜀国刀兵	610018	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+1023002	蜀国盾兵	610020	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+1023003	蜀国枪兵	610019	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+1023004	蜀国弩手	610021	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
 1024001	糜竺	520001	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{"27":1500}
 1024002	鲍三娘	520002	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{"27":1500}
 1024003	周仓	520003	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{"29":1500}
 1024004	诸葛果	520004	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{"25":1500}
-1024005	关兴	520005	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{"31":1500}
+1024005	关兴	520005	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{"25":1500}
 1024006	甘夫人	520006	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{"21":1500}
 1024007	张星彩	520007	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{"29":1500}
 1024008	关银屏	520008	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{"27":1500}
@@ -1482,7 +1482,7 @@
 1025002	鲍三娘	520002	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{"27":1500}
 1025003	周仓	520003	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{"29":1500}
 1025004	诸葛果	520004	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{"25":1500}
-1025005	关兴	520005	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{"31":1500}
+1025005	关兴	520005	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{"25":1500}
 1025006	甘夫人	520006	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{"21":1500}
 1025007	张星彩	520007	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{"29":1500}
 1025008	关银屏	520008	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{"27":1500}
@@ -1498,7 +1498,7 @@
 1026002	鲍三娘	520002	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{"27":1500}
 1026003	周仓	520003	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{"29":1500}
 1026004	诸葛果	520004	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{"25":1500}
-1026005	关兴	520005	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{"31":1500}
+1026005	关兴	520005	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{"25":1500}
 1026006	甘夫人	520006	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{"21":1500}
 1026007	张星彩	520007	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{"29":1500}
 1026008	关银屏	520008	1	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{"27":1500}
@@ -1514,7 +1514,7 @@
 1027002	鲍三娘	520002	1	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{"27":1500}
 1027003	周仓	520003	1	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{"29":1500}
 1027004	诸葛果	520004	1	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{"25":1500}
-1027005	关兴	520005	1	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{"31":1500}
+1027005	关兴	520005	1	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{"25":1500}
 1027006	甘夫人	520006	1	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{"21":1500}
 1027007	张星彩	520007	1	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{"29":1500}
 1027008	关银屏	520008	1	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{"27":1500}
@@ -1526,18 +1526,18 @@
 1027014	关羽	520014	1	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{"23":1500}
 1027015	张飞	520015	1	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{"25":1500}
 1027016	马超	520016	1	2	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{"23":1500}
-1031001	黄巾刀兵	610001	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-1031002	黄巾盾兵	610003	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-1031003	黄巾枪兵	610002	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-1031004	黄巾弩手	610004	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-1032001	黄巾刀兵	610001	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-1032002	黄巾盾兵	610003	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-1032003	黄巾枪兵	610002	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-1032004	黄巾弩手	610004	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-1033001	黄巾刀兵	610001	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-1033002	黄巾盾兵	610003	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-1033003	黄巾枪兵	610002	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
-1033004	黄巾弩手	610004	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+1031001	吴国刀兵	610023	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+1031002	吴国盾兵	610025	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+1031003	吴国枪兵	610024	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+1031004	吴国弩手	610026	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+1032001	吴国刀兵	610023	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+1032002	吴国盾兵	610025	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+1032003	吴国枪兵	610024	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+1032004	吴国弩手	610026	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+1033001	吴国刀兵	610023	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+1033002	吴国盾兵	610025	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+1033003	吴国枪兵	610024	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
+1033004	吴国弩手	610026	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{}
 1034001	潘璋	530001	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{"23":1500}
 1034002	吴国太	530002	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{"27":1500}
 1034003	凌统	530003	1	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	{"31":1500}

--
Gitblit v1.8.0