From c7b5afa53d0a9c92d100f7195bfd71205a94abd5 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期二, 19 八月 2025 10:39:05 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_resourcesout

---
 UI/HeroPosWin.prefab            |   45 
 Config/MainLevel.txt            |  126 
 UI/GMCmdPanel.prefab            |    2 
 Config/FightPowerRatio.txt      |   38 
 UI/GMInputWin.prefab            |    2 
 Config/HeroQualityAwake.txt     |    2 
 Config/NPCLineup.txt            |  421 +++++
 Config/HeroAwake.txt            |  700 +++++++++
 Config/Hero.txt                 |   88 
 Config/PlayerLV.txt             | 2006 ++++++++++++++--------------
 Config/FightPowerRatio.txt.meta |    7 
 Config/HeroQualityBreak.txt     |    2 
 Config/HeroBreak.txt            |  508 ++++++
 Config/PlayerProperty.txt       |   10 
 UI/HeroTrainWin.prefab          |   26 
 Config/FuncConfig.txt           |    2 
 Config/HeroFetter.txt           |   26 
 Config/Skill.txt                |   46 
 UI/EquipExchangeWin.prefab      |    6 
 19 files changed, 2,752 insertions(+), 1,311 deletions(-)

diff --git a/Config/FightPowerRatio.txt b/Config/FightPowerRatio.txt
new file mode 100644
index 0000000..794b3aa
--- /dev/null
+++ b/Config/FightPowerRatio.txt
@@ -0,0 +1,38 @@
+int	float	float	float	float	float	float	float	float	float	float	float	float	float	float	float	float	float	float	float	float	float	float	float
+LV	AtkRatio	MaxHPRatio	DefRatio	StunRateRatio	SuperHitRateRatio	ComboRateRatio	MissRateRatio	ParryRateRatio	SuckHPPerRatio	StunRateDefRatio	SuperHitRateDefRatio	ComboRateDefRatio	MissRateDefRatio	ParryRateDefRatio	SuckHPPerDefRatio	NormalSkillPerRatio	NormalSkillPerDefRatio	AngerSkillPerRatio	AngerSkillPerDefRatio	SuperDamPerRatio	SuperDamPerDefRatio	ShieldPerRatio	ShieldPerDefRatio
+瀹樿亴绛夌骇	鏀诲嚮	鐢熷懡	闃插尽	鍑绘檿	鏆村嚮	杩炲嚮	闂伩	鏍兼尅	鍚歌	鎶楀嚮鏅�	鎶楁毚鍑�	鎶楄繛鍑�	鎶楅棯閬�	鎶楁牸鎸�	鎶楀惛琛�	鏅敾澧炰激	鏅敾鍑忎激	鎬掓皵澧炰激	鎬掓皵鍑忎激	寮哄寲鏆翠激	寮卞寲鏆翠激	寮哄寲鎶ょ浘	寮卞寲鎶ょ浘
+1	20	4	100	3625	3625	3625	3625	3625	3625	2416	2416	2416	2416	2416	2416	3625	3625	3625	3625	3625	3625	3625	3625
+2	20	4	100	3625	3625	3625	3625	3625	3625	2416	2416	2416	2416	2416	2416	3625	3625	3625	3625	3625	3625	3625	3625
+3	19.9	3.95	100	3697	3697	3697	3697	3697	3697	2464	2464	2464	2464	2464	2464	3697	3697	3697	3697	3697	3697	3697	3697
+4	19.8	3.9	100	3770	3770	3770	3770	3770	3770	2513	2513	2513	2513	2513	2513	3770	3770	3770	3770	3770	3770	3770	3770
+5	19.7	3.85	100	3845	3845	3845	3845	3845	3845	2563	2563	2563	2563	2563	2563	3845	3845	3845	3845	3845	3845	3845	3845
+6	19.6	3.8	100	3921	3921	3921	3921	3921	3921	2614	2614	2614	2614	2614	2614	3921	3921	3921	3921	3921	3921	3921	3921
+7	19.5	3.75	100	3999	3999	3999	3999	3999	3999	2666	2666	2666	2666	2666	2666	3999	3999	3999	3999	3999	3999	3999	3999
+8	19.4	3.7	100	4078	4078	4078	4078	4078	4078	2718	2718	2718	2718	2718	2718	4078	4078	4078	4078	4078	4078	4078	4078
+9	19.3	3.65	100	4159	4159	4159	4159	4159	4159	2772	2772	2772	2772	2772	2772	4159	4159	4159	4159	4159	4159	4159	4159
+10	19.2	3.6	100	4242	4242	4242	4242	4242	4242	2828	2828	2828	2828	2828	2828	4242	4242	4242	4242	4242	4242	4242	4242
+11	19.1	3.68	100	4326	4326	4326	4326	4326	4326	2884	2884	2884	2884	2884	2884	4326	4326	4326	4326	4326	4326	4326	4326
+12	17.57	3.58	90	5969	5969	5969	5969	5969	5969	3979	3979	3979	3979	3979	3979	5969	5969	5969	5969	5969	5969	5969	5969
+13	16.16	3.48	81	8237	8237	8237	8237	8237	8237	5491	5491	5491	5491	5491	5491	8237	8237	8237	8237	8237	8237	8237	8237
+14	14.87	3.38	72.9	11367	11367	11367	11367	11367	11367	7578	7578	7578	7578	7578	7578	11367	11367	11367	11367	11367	11367	11367	11367
+15	13.68	3.28	65.61	15686	15686	15686	15686	15686	15686	10457	10457	10457	10457	10457	10457	15686	15686	15686	15686	15686	15686	15686	15686
+16	12.59	3.18	59.05	21646	21646	21646	21646	21646	21646	14430	14430	14430	14430	14430	14430	21646	21646	21646	21646	21646	21646	21646	21646
+17	11.58	3.08	53.15	29871	29871	29871	29871	29871	29871	19914	19914	19914	19914	19914	19914	29871	29871	29871	29871	29871	29871	29871	29871
+18	10.65	2.98	47.84	41221	41221	41221	41221	41221	41221	27480	27480	27480	27480	27480	27480	41221	41221	41221	41221	41221	41221	41221	41221
+19	9.8	2.88	43.06	56884	56884	56884	56884	56884	56884	37922	37922	37922	37922	37922	37922	56884	56884	56884	56884	56884	56884	56884	56884
+20	9.02	2.78	38.75	78499	78499	78499	78499	78499	78499	52332	52332	52332	52332	52332	52332	78499	78499	78499	78499	78499	78499	78499	78499
+21	8.3	2.68	34.88	108328	108328	108328	108328	108328	108328	72218	72218	72218	72218	72218	72218	108328	108328	108328	108328	108328	108328	108328	108328
+22	7.64	2.58	31.39	149492	149492	149492	149492	149492	149492	99661	99661	99661	99661	99661	99661	149492	149492	149492	149492	149492	149492	149492	149492
+23	7.03	2.48	28.25	206298	206298	206298	206298	206298	206298	137532	137532	137532	137532	137532	137532	206298	206298	206298	206298	206298	206298	206298	206298
+24	6.47	2.38	25.43	284691	284691	284691	284691	284691	284691	189794	189794	189794	189794	189794	189794	284691	284691	284691	284691	284691	284691	284691	284691
+25	5.95	2.28	22.89	392873	392873	392873	392873	392873	392873	261915	261915	261915	261915	261915	261915	392873	392873	392873	392873	392873	392873	392873	392873
+26	5.47	2.18	20.6	542164	542164	542164	542164	542164	542164	361442	361442	361442	361442	361442	361442	542164	542164	542164	542164	542164	542164	542164	542164
+27	5.03	2.08	18.54	748186	748186	748186	748186	748186	748186	498790	498790	498790	498790	498790	498790	748186	748186	748186	748186	748186	748186	748186	748186
+28	4.63	1.98	16.69	1032496	1032496	1032496	1032496	1032496	1032496	688330	688330	688330	688330	688330	688330	1032496	1032496	1032496	1032496	1032496	1032496	1032496	1032496
+29	4.26	1.88	15.02	1424844	1424844	1424844	1424844	1424844	1424844	949896	949896	949896	949896	949896	949896	1424844	1424844	1424844	1424844	1424844	1424844	1424844	1424844
+30	3.41	1.5	12.02	1966284	1966284	1966284	1966284	1966284	1966284	1310856	1310856	1310856	1310856	1310856	1310856	1966284	1966284	1966284	1966284	1966284	1966284	1966284	1966284
+31	2.73	1.2	9.62	2713471	2713471	2713471	2713471	2713471	2713471	1808980	1808980	1808980	1808980	1808980	1808980	2713471	2713471	2713471	2713471	2713471	2713471	2713471	2713471
+32	2.18	0.96	7.7	3744589	3744589	3744589	3744589	3744589	3744589	2496392	2496392	2496392	2496392	2496392	2496392	3744589	3744589	3744589	3744589	3744589	3744589	3744589	3744589
+33	1.74	0.77	6.16	5167532	5167532	5167532	5167532	5167532	5167532	3445021	3445021	3445021	3445021	3445021	3445021	5167532	5167532	5167532	5167532	5167532	5167532	5167532	5167532
+34	1.39	0.62	4.93	7131194	7131194	7131194	7131194	7131194	7131194	4754129	4754129	4754129	4754129	4754129	4754129	7131194	7131194	7131194	7131194	7131194	7131194	7131194	7131194
+35	1.11	0.5	3.94	9841047	9841047	9841047	9841047	9841047	9841047	6560698	6560698	6560698	6560698	6560698	6560698	9841047	9841047	9841047	9841047	9841047	9841047	9841047	9841047
diff --git a/Config/FightPowerRatio.txt.meta b/Config/FightPowerRatio.txt.meta
new file mode 100644
index 0000000..fecd5bb
--- /dev/null
+++ b/Config/FightPowerRatio.txt.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 4cd60e81988d1014690e34069470384e
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Config/FuncConfig.txt b/Config/FuncConfig.txt
index 8ceac16..020da78 100644
--- a/Config/FuncConfig.txt
+++ b/Config/FuncConfig.txt
@@ -16,7 +16,7 @@
 HeroStarTalent	4	10	3	5	
 HeroWash	181|20	182|20			
 HeroRebirth	1	2			
-HeroAttrFormula	(lvValue+equipValue+bookValue)*(1+lineupHaloPer+bookPer+lineupInitAddPer+lineupLVAddPer+lineupBreakLVAddPer+lineupStarAddPer)*(inheritPer+fetterPer+starTalentPer+breakLVPer+awakeTalentPer)+heroSelfValue	(lvValue+equipValue+bookValue)*inheritPer+(heroSelfValue+lineupHaloValue+starTalentValue+breakLVValue+awakeTalentValue)+fetterValue	Atk*10+Def+MaxHP+StunRate+StunRateDef+SuperHitRate+SuperHitRateDef+ComboRate+ComboRateDef+MissRate+MissRateDef+ParryRate+ParryRateDef+SuckHPPer+SuckHPPerDef+FinalDamPer+FinalDamPerDef+PhyDamPer+PhyDamPerDef+MagDamPer+MagDamPerDef+NormalSkillPer+NormalSkillPerDef+AngerSkillPer+AngerSkillPerDef+SuperDamPer+SuperDamPerDef+CurePer+CurePerDef+ShieldPer+ShieldPerDef+DOTPer+DOTPerDef		
+HeroAttrFormula	(lvValue+equipValue+bookValue)*(1+lineupHaloPer+bookPer+lineupInitAddPer+lineupLVAddPer+lineupBreakLVAddPer+lineupStarAddPer)*(inheritPer+fetterPer+starTalentPer+breakLVPer+awakeTalentPer)+heroSelfValue	(lvValue+equipValue+bookValue)+(heroSelfValue+lineupHaloValue+starTalentValue+breakLVValue+awakeTalentValue)+fetterValue	Atk*10+Def+MaxHP+StunRate+StunRateDef+SuperHitRate+SuperHitRateDef+ComboRate+ComboRateDef+MissRate+MissRateDef+ParryRate+ParryRateDef+SuckHPPer+SuckHPPerDef+FinalDamPer+FinalDamPerDef+PhyDamPer+PhyDamPerDef+MagDamPer+MagDamPerDef+NormalSkillPer+NormalSkillPerDef+AngerSkillPer+AngerSkillPerDef+SuperDamPer+SuperDamPerDef+CurePer+CurePerDef+ShieldPer+ShieldPerDef+DOTPer+DOTPerDef	SkillPower*OfficialLV	
 FuncLevelLimitClient	{"1":30}				
 DownReward	[(20,500,1),(2,1,1),(911,1,1)] 	20	[[150,50,0],[181,10,0],[4151,10,0],[3,1,0]]	1	1
 MessageLength	50	0	0	0	0
diff --git a/Config/Hero.txt b/Config/Hero.txt
index 7713cc0..6c81f18 100644
--- a/Config/Hero.txt
+++ b/Config/Hero.txt
@@ -1,4 +1,4 @@
-int	string	int	int	int	int	int[]	int	int	int	int	int	string	int[]	float	string
+int	string	int	int	int	int	int[]	int	int	int	int	int	Dictionary<int, int>	int[]	float	string
 HeroID	Name	Country	Quality	Class	Position	SkinIDList	AtkSkillID	AngerSkillID	AtkInheritPer	DefInheritPer	HPInheritPer	BatAttrDict	FetterIDList	UIScale	Desc
 姝﹀皢鐗╁搧ID	姝﹀皢鍚�	鍥藉	鑻遍泟鍝佽川	鑻遍泟鑱屼笟	鎺ㄨ崘浣嶇疆	鐨偆ID鍒楄〃	鏅敾鎶�鑳絀D	鎬掓皵鎶�鑳絀D	鏀诲嚮缁ф壙	闃插尽缁ф壙	鐢熷懡缁ф壙	鍏朵粬鎴樻枟灞炴�у瓧鍏�	鎵�灞炵殑缇佺粖鐨処D	UI鐣岄潰涓婄殑缂╂斁姣斾緥	鐗圭偣璇存槑
 510001	鏇瑰┐	1	1	2	1	5100010	100101	100102	10500	7500	9000	{}		0.8	鐖嗗彂鎺у埗
@@ -6,12 +6,12 @@
 510003	搴炲痉	1	2	1	1	5100030	100301	100302	9500	8000	11000	{}		0.8	鐖嗗彂鎺у埗
 510004	鍗炲か浜�	1	3	2	1	5100040	100401	100402	11500	8500	10000	{}		0.8	杩戞垬闂伩
 510005	浜庣	1	3	4	1	5100050	100501	100502	10500	8000	11000	{}		0.8	鐖嗗彂鎺у埗
-510006	鏇硅蕉	1	3	2	1	5100060	100601	100602	11500	8500	10000	{}		0.8	杩戞垬闂伩
-510007	鏉庡吀	1	3	1	1	5100070	100701	100702	10000	8500	11500	{}		0.8	鐖嗗彂鎺у埗
-510008	钄℃枃濮�	1	4	3	1	5100080	100801	100802	11500	9000	11000	{}		0.8	杩戞垬闂伩
+510006	鏇硅蕉	1	3	2	1	5100060	100601	100602	11500	8500	10000	{}	3	0.8	杩戞垬闂伩
+510007	鏉庡吀	1	3	1	1	5100070	100701	100702	10000	8500	11500	{}	3	0.8	鐖嗗彂鎺у埗
+510008	钄℃枃濮�	1	4	3	1	5100080	100801	100802	11500	9000	11000	{}	2	0.8	杩戞垬闂伩
 510009	璐捐	1	4	2	1	5100090	100901	100902	12000	9000	10500	{}		0.8	鐖嗗彂鎺у埗
 510010	鐜嬪紓	1	4	2	1	5100100	101001	101002	11500	9000	11000	{}		0.8	杩戞垬闂伩
-510011	鐜嬪厓濮�	1	4	4	1	5100110	101101	101102	11500	9000	11000	{}		0.8	鐖嗗彂鎺у埗
+510011	鐜嬪厓濮�	1	4	4	1	5100110	101101	101102	11500	9000	11000	{}	2	0.8	鐖嗗彂鎺у埗
 510012	鍙搁┈鎳�	1	5	2	1	5100120	101201	101202	12500	9500	11000	{}		0.8	杩戞垬闂伩
 510013	鐢勫畵	1	5	3	1	5100130	101301	101302	12000	9500	11500	{}		0.8	鐖嗗彂鎺у埗
 510014	鏇规搷	1	5	2	1	5100140	101401	101402	12000	9500	11500	{}	1	0.8	杩戞垬闂伩
@@ -21,47 +21,87 @@
 520002	椴嶄笁濞�	2	2	2	1	5200020	200201	200202	10500	8000	10000	{}		0.8	杩戞垬闂伩
 520003	鍛ㄤ粨	2	2	1	1	5200030	200301	200302	9500	8000	11000	{}		0.8	鐖嗗彂鎺у埗
 520004	璇歌憶鏋�	2	3	2	1	5200040	200401	200402	11500	8500	10000	{}		0.8	杩戞垬闂伩
-520005	鍏冲叴	2	3	4	1	5200050	200501	200502	10500	8500	11000	{}		0.8	鐖嗗彂鎺у埗
+520005	鍏冲叴	2	3	4	1	5200050	200501	200502	10500	8500	11000	{}	6	0.8	鐖嗗彂鎺у埗
 520006	鐢樺か浜�	2	3	3	1	5200060	200601	200602	11000	8500	10500	{}		0.8	杩戞垬闂伩
-520007	寮犳槦褰�	2	3	1	1	5200070	200701	200702	10000	8500	11500	{}		0.8	鐖嗗彂鎺у埗
+520007	寮犳槦褰�	2	3	1	1	5200070	200701	200702	10000	8500	11500	{}	6	0.8	鐖嗗彂鎺у埗
 520008	鍏抽摱灞�	2	4	2	1	5200080	200801	200802	11500	9000	11000	{}		0.8	杩戞垬闂伩
 520009	搴炵粺	2	4	2	1	5200090	200901	200902	12000	9000	10500	{}		0.8	鐖嗗彂鎺у埗
 520010	璧典簯	2	4	2	1	5200100	201001	201002	11500	9000	11000	{}		0.8	杩戞垬闂伩
-520011	榛勬湀鑻�	2	4	4	1	5200110	201101	201102	11500	9000	11000	{}		0.8	鐖嗗彂鎺у埗
-520012	璇歌憶浜�	2	5	2	1	5200120	201201	201202	12500	9500	11000	{}		0.8	杩戞垬闂伩
+520011	榛勬湀鑻�	2	4	4	1	5200110	201101	201102	11500	9000	11000	{}	5	0.8	鐖嗗彂鎺у埗
+520012	璇歌憶浜�	2	5	2	1	5200120	201201	201202	12500	9500	11000	{}	5	0.8	杩戞垬闂伩
 520013	鍒樺	2	5	3	1	5200130	201301	201302	11500	9500	12000	{}	4	0.8	鐖嗗彂鎺у埗
 520014	鍏崇窘	2	5	2	1	5200140	201401	201402	12000	9500	11500	{}	4	0.8	杩戞垬闂伩
 520015	寮犻	2	5	1	1	5200150	201501	201502	11000	9500	12500	{}	4	0.8	鐖嗗彂鎺у埗
-520016	椹秴	2	5	2	1	5200160	201601	201602	12000	9500	11500	{}	4	0.8	杩戞垬闂伩
+520016	椹秴	2	5	2	1	5200160	201601	201602	12000	9500	11500	{}		0.8	杩戞垬闂伩
 530001	娼樼拫	3	1	2	1	5300010	300101	300102	10000	7500	9500	{}		0.8	鐖嗗彂鎺у埗
 530002	鍚村浗澶�	3	2	3	1	5300020	300201	300202	10500	8000	10000	{}		0.8	杩戞垬闂伩
 530003	鍑岀粺	3	2	2	1	5300030	300301	300302	10500	8000	10000	{}		0.8	鐖嗗彂鎺у埗
-530004	鐢樺畞	3	3	2	1	5300040	300401	300402	11000	8500	10500	{}		0.8	杩戞垬闂伩
+530004	鐢樺畞	3	3	2	1	5300040	300401	300402	11000	8500	10500	{}	9	0.8	杩戞垬闂伩
 530005	鏈辨	3	3	4	1	5300050	300501	300502	10500	8500	11000	{}		0.8	鐖嗗彂鎺у埗
 530006	鍙搁┈寰�	3	3	4	1	5300060	300601	300602	11000	8500	10500	{}		0.8	杩戞垬闂伩
-530007	涓佸	3	3	1	1	5300070	300701	300702	10000	8500	11500	{}		0.8	鐖嗗彂鎺у埗
+530007	涓佸	3	3	1	1	5300070	300701	300702	10000	8500	11500	{}	9	0.8	鐖嗗彂鎺у埗
 530008	瀛欓瞾鑲�	3	4	2	1	5300080	300801	300802	12000	9000	10500	{}		0.8	杩戞垬闂伩
-530009	瀛欑瓥	3	4	2	1	5300090	300901	300902	11500	9000	11000	{}		0.8	鐖嗗彂鎺у埗
+530009	瀛欑瓥	3	4	2	1	5300090	300901	300902	11500	9000	11000	{}	8	0.8	鐖嗗彂鎺у埗
 530010	瀛欏皻棣�	3	4	2	1	5300100	301001	301002	12000	9000	10500	{}		0.8	杩戞垬闂伩
-530011	澶т箶	3	4	2	1	5300110	301101	301102	11500	9000	11000	{}		0.8	鐖嗗彂鎺у埗
-530012	鍛ㄧ憸	3	5	2	1	5300120	301201	301202	12500	9500	11000	{}		0.8	杩戞垬闂伩
-530013	灏忎箶	3	5	3	1	5300130	301301	301302	12000	9500	11500	{}		0.8	鐖嗗彂鎺у埗
+530011	澶т箶	3	4	2	1	5300110	301101	301102	11500	9000	11000	{}	8	0.8	鐖嗗彂鎺у埗
+530012	鍛ㄧ憸	3	5	2	1	5300120	301201	301202	12500	9500	11000	{}	7	0.8	杩戞垬闂伩
+530013	灏忎箶	3	5	3	1	5300130	301301	301302	12000	9500	11500	{}	7	0.8	鐖嗗彂鎺у埗
 530014	姝ョ粌甯�	3	5	2	1	5300140	301401	301402	12000	9500	11500	{}		0.8	杩戞垬闂伩
 530015	瀛欏潥	3	5	1	1	5300150	301501	301502	11000	9500	12500	{}		0.8	鐖嗗彂鎺у埗
 530016	闄嗛��	3	5	2	1	5300160	301601	301602	12000	9500	11500	{}		0.8	杩戞垬闂伩
 540001	绾伒	4	1	2	1	5400010	400101	400102	10000	7500	9500	{}		0.8	鐖嗗彂鎺у埗
-540002	閮睖	4	2	2	1	5400020	400201	400202	10500	8000	10000	{}		0.8	杩戞垬闂伩
-540003	鏉庡倳	4	2	2	1	5400030	400301	400302	10500	8000	10000	{}		0.8	鐖嗗彂鎺у埗
+540002	閮睖	4	2	2	1	5400020	400201	400202	10500	8000	10000	{}	13	0.8	杩戞垬闂伩
+540003	鏉庡倳	4	2	2	1	5400030	400301	400302	10500	8000	10000	{}	13	0.8	鐖嗗彂鎺у埗
 540004	寮犲疂	4	3	3	1	5400040	400401	400402	11000	8500	10500	{}		0.8	杩戞垬闂伩
 540005	闊╅亗	4	3	2	1	5400050	400501	400502	11000	8500	10500	{}		0.8	鐖嗗彂鎺у埗
-540006	瀛熻幏	4	3	1	1	5400060	400601	400602	10000	8500	11500	{}		0.8	杩戞垬闂伩
-540007	绁濊瀺	4	3	2	1	5400070	400701	400702	11500	8500	10000	{}		0.8	鐖嗗彂鎺у埗
+540006	瀛熻幏	4	3	1	1	5400060	400601	400602	10000	8500	11500	{}	12	0.8	杩戞垬闂伩
+540007	绁濊瀺	4	3	2	1	5400070	400701	400702	11500	8500	10000	{}	12	0.8	鐖嗗彂鎺у埗
 540008	浣曞お鍚�	4	4	4	1	5400080	400801	400802	11500	9000	11000	{}		0.8	杩戞垬闂伩
-540009	钁ｇ櫧	4	4	2	1	5400090	400901	400902	11500	9000	11000	{}		0.8	鐖嗗彂鎺у埗
+540009	钁ｇ櫧	4	4	2	1	5400090	400901	400902	11500	9000	11000	{}	11	0.8	鐖嗗彂鎺у埗
 540010	鍗戝讥鍛�	4	4	2	1	5400100	401001	401002	11500	9000	11000	{}		0.8	杩戞垬闂伩
 540011	钁ｅ崜	4	4	1	1	5400110	401101	401102	10500	9000	12000	{}		0.8	鐖嗗彂鎺у埗
-540012	璨傝潐	4	5	2	1	5400120	401201	401202	12500	9500	11000	{}		0.8	杩戞垬闂伩
-540013	鍚曠幉缁�	4	5	2	1	5400130	401301	401302	12000	9500	11500	{}		0.8	鐖嗗彂鎺у埗
-540014	鍚曞竷	4	5	1	1	5400140	401401	401402	11000	9500	12500	{}		0.8	杩戞垬闂伩
+540012	璨傝潐	4	5	2	1	5400120	401201	401202	12500	9500	11000	{}	10	0.8	杩戞垬闂伩
+540013	鍚曠幉缁�	4	5	2	1	5400130	401301	401302	12000	9500	11500	{}	11	0.8	鐖嗗彂鎺у埗
+540014	鍚曞竷	4	5	1	1	5400140	401401	401402	11000	9500	12500	{}	10	0.8	杩戞垬闂伩
 540015	寮犺	4	5	4	1	5400150	401501	401502	12000	9500	11500	{}		0.8	鐖嗗彂鎺у埗
 540016	宸︽厛	4	5	3	1	5400160	401601	401602	12000	9500	11500	{}		0.8	杩戞垬闂伩
+550001	榄忓叺1	1	1	1	1	610001	500101	500102	10500	7500	9000	{}		0.8	杩戞垬闂伩
+550002	榄忓叺2	1	2	2	1	610002	500102	500103	10500	8000	10000	{}		0.8	杩戞垬闂伩
+550003	榄忓叺3	1	3	3	1	610003	500103	500104	9500	8000	11000	{}		0.8	杩戞垬闂伩
+550004	榄忓叺4	1	4	4	2	610004	500104	500105	11500	8500	10000	{}		0.8	杩戞垬闂伩
+550005	榄忓叺5	1	5	1	2	610005	500105	500106	10500	8000	11000	{}		0.8	杩戞垬闂伩
+550006	榄忓叺6	1	1	2	1	610006	500106	500107	11500	8500	10000	{}		0.8	杩戞垬闂伩
+550007	榄忓叺7	1	2	3	1	610007	500107	500108	10000	8500	11500	{}		0.8	杩戞垬闂伩
+550008	榄忓叺8	1	3	4	1	610008	500108	500109	11500	9000	11000	{}		0.8	杩戞垬闂伩
+550009	榄忓叺9	1	4	1	2	610009	500109	500110	12000	9000	10500	{}		0.8	杩戞垬闂伩
+550010	榄忓叺10	1	5	2	2	610010	500110	500111	11500	9000	11000	{}		0.8	杩戞垬闂伩
+560001	铚�鍏�1	2	1	3	1	620001	600101	600102	10500	7500	9000	{}		0.8	杩戞垬闂伩
+560002	铚�鍏�2	2	2	4	1	620002	600102	600103	10500	8000	10000	{}		0.8	杩戞垬闂伩
+560003	铚�鍏�3	2	3	1	1	620003	600103	600104	9500	8000	11000	{}		0.8	杩戞垬闂伩
+560004	铚�鍏�4	2	4	2	2	620004	600104	600105	11500	8500	10000	{}		0.8	杩戞垬闂伩
+560005	铚�鍏�5	2	5	3	2	620005	600105	600106	10500	8000	11000	{}		0.8	杩戞垬闂伩
+560006	铚�鍏�6	2	1	4	1	620006	600106	600107	11500	8500	10000	{}		0.8	杩戞垬闂伩
+560007	铚�鍏�7	2	2	1	1	620007	600107	600108	10000	8500	11500	{}		0.8	杩戞垬闂伩
+560008	铚�鍏�8	2	3	2	1	620008	600108	600109	11500	9000	11000	{}		0.8	杩戞垬闂伩
+560009	铚�鍏�9	2	4	3	2	620009	600109	600110	12000	9000	10500	{}		0.8	杩戞垬闂伩
+560010	铚�鍏�10	2	5	4	2	620010	600110	600111	11500	9000	11000	{}		0.8	杩戞垬闂伩
+570001	鍚村叺1	3	1	1	1	630001	700101	700102	10500	7500	9000	{}		0.8	杩戞垬闂伩
+570002	鍚村叺2	3	2	2	1	630002	700102	700103	10500	8000	10000	{}		0.8	杩戞垬闂伩
+570003	鍚村叺3	3	3	3	1	630003	700103	700104	9500	8000	11000	{}		0.8	杩戞垬闂伩
+570004	鍚村叺4	3	4	4	2	630004	700104	700105	11500	8500	10000	{}		0.8	杩戞垬闂伩
+570005	鍚村叺5	3	5	1	2	630005	700105	700106	10500	8000	11000	{}		0.8	杩戞垬闂伩
+570006	鍚村叺6	3	1	2	1	630006	700106	700107	11500	8500	10000	{}		0.8	杩戞垬闂伩
+570007	鍚村叺7	3	2	3	1	630007	700107	700108	10000	8500	11500	{}		0.8	杩戞垬闂伩
+570008	鍚村叺8	3	3	4	1	630008	700108	700109	11500	9000	11000	{}		0.8	杩戞垬闂伩
+570009	鍚村叺9	3	4	1	2	630009	700109	700110	12000	9000	10500	{}		0.8	杩戞垬闂伩
+570010	鍚村叺10	3	5	2	2	630010	700110	700111	11500	9000	11000	{}		0.8	杩戞垬闂伩
+580001	缇ゅ叺1	4	1	3	1	640001	800101	800102	10500	7500	9000	{}		0.8	杩戞垬闂伩
+580002	缇ゅ叺2	4	2	4	1	640002	800102	800103	10500	8000	10000	{}		0.8	杩戞垬闂伩
+580003	缇ゅ叺3	4	3	1	1	640003	800103	800104	9500	8000	11000	{}		0.8	杩戞垬闂伩
+580004	缇ゅ叺4	4	4	2	2	640004	800104	800105	11500	8500	10000	{}		0.8	杩戞垬闂伩
+580005	缇ゅ叺5	4	5	3	2	640005	800105	800106	10500	8000	11000	{}		0.8	杩戞垬闂伩
+580006	缇ゅ叺6	4	1	4	1	640006	800106	800107	11500	8500	10000	{}		0.8	杩戞垬闂伩
+580007	缇ゅ叺7	4	2	1	1	640007	800107	800108	10000	8500	11500	{}		0.8	杩戞垬闂伩
+580008	缇ゅ叺8	4	3	2	1	640008	800108	800109	11500	9000	11000	{}		0.8	杩戞垬闂伩
+580009	缇ゅ叺9	4	4	3	2	640009	800109	800110	12000	9000	10500	{}		0.8	杩戞垬闂伩
+580010	缇ゅ叺10	4	5	4	2	640010	800110	800111	11500	9000	11000	{}		0.8	杩戞垬闂伩
diff --git a/Config/HeroAwake.txt b/Config/HeroAwake.txt
index 9d1e6c1..dc088ca 100644
--- a/Config/HeroAwake.txt
+++ b/Config/HeroAwake.txt
@@ -1,63 +1,643 @@
 int	int	int	int[]	int[]	int	int	int
 TalentAwakeID	HeroID	AwakeLV	AttrIDList	AttrValueList	SkillID	UnlockTalentSlot	AddStarUpper
 瑙夐啋澶╄祴ID	姝﹀皢鐗╁搧ID	瑙夐啋绛夌骇	灞炴�D鍒楄〃	灞炴�у�煎垪琛�	婵�娲绘妧鑳絀D	瑙ｉ攣绗瑇妲戒綅	澧炲姞鏄熺骇涓婇檺
-1	510013	1	6	1000	0	0	0
-2	510013	2	7	1000	0	5	10
-3	510013	3	8	10000	0	0	0
-4	510013	4	16	1000	0	6	10
-5	510013	5	17	1000	0	0	0
-6	510013	6	18	1000	0	7	10
-7	510013	7	37	5000	0	0	0
-8	510013	8	38	5000	0	8	10
-9	510013	9	39	5000	0	0	0
-10	510013	10	40	5000	0	0	0
-11	510014	1	6	1000	0	0	0
-12	510014	2	7	1000	0	5	10
-13	510014	3	8	10000	0	0	0
-14	510014	4	16	1000	0	6	10
-15	510014	5	17	1000	0	0	0
-16	510014	6	18	1000	0	7	10
-17	510014	7	37	5000	0	0	0
-18	510014	8	38	5000	0	8	10
-19	510014	9	39	5000	0	0	0
-20	510014	10	40	5000	0	0	0
-21	510015	1	6	1000	0	0	0
-22	510015	2	7	1000	0	5	10
-23	510015	3	8	10000	0	0	0
-24	510015	4	16	1000	0	6	10
-25	510015	5	17	1000	0	0	0
-26	510015	6	18	1000	0	7	10
-27	510015	7	37	5000	0	0	0
-28	510015	8	38	5000	0	8	10
-29	510015	9	39	5000	0	0	0
-30	510015	10	40	5000	0	0	0
-31	520013	1	6	1000	0	0	0
-32	520013	2	7	1000	0	5	10
-33	520013	3	8	10000	0	0	0
-34	520013	4	16	1000	0	6	10
-35	520013	5	17	1000	0	0	0
-36	520013	6	18	1000	0	7	10
-37	520013	7	37	5000	0	0	0
-38	520013	8	38	5000	0	8	10
-39	520013	9	39	5000	0	0	0
-40	520013	10	40	5000	0	0	0
-41	520014	1	6	1000	0	0	0
-42	520014	2	7	1000	0	5	10
-43	520014	3	8	10000	0	0	0
-44	520014	4	16	1000	0	6	10
-45	520014	5	17	1000	0	0	0
-46	520014	6	18	1000	0	7	10
-47	520014	7	37	5000	0	0	0
-48	520014	8	38	5000	0	8	10
-49	520014	9	39	5000	0	0	0
-50	520014	10	40	5000	0	0	0
-51	520015	1	6	1000	0	0	0
-52	520015	2	7	1000	0	5	10
-53	520015	3	8	10000	0	0	0
-54	520015	4	16	1000	0	6	10
-55	520015	5	17	1000	0	0	0
-56	520015	6	18	1000	0	7	10
-57	520015	7	37	5000	0	0	0
-58	520015	8	38	5000	0	8	10
-59	520015	9	39	5000	0	0	0
-60	520015	10	40	5000	0	0	0
+100101	510001	10	6	1000	0	0	0
+100102	510001	20	7	1000	0	5	10
+100103	510001	30	8	10000	0	0	0
+100104	510001	40	16	1000	0	6	10
+100105	510001	50	17	1000	0	0	0
+100106	510001	60	18	1000	0	7	10
+100107	510001	70	37	5000	0	0	0
+100108	510001	80	38	5000	0	8	10
+100109	510001	90	39	5000	0	0	0
+100110	510001	100	40	5000	0	0	0
+100201	510002	10	6	1000	0	0	0
+100202	510002	20	7	1000	0	5	10
+100203	510002	30	8	10000	0	0	0
+100204	510002	40	16	1000	0	6	10
+100205	510002	50	17	1000	0	0	0
+100206	510002	60	18	1000	0	7	10
+100207	510002	70	37	5000	0	0	0
+100208	510002	80	38	5000	0	8	10
+100209	510002	90	39	5000	0	0	0
+100210	510002	100	40	5000	0	0	0
+100301	510003	10	6	1000	0	0	0
+100302	510003	20	7	1000	0	5	10
+100303	510003	30	8	10000	0	0	0
+100304	510003	40	16	1000	0	6	10
+100305	510003	50	17	1000	0	0	0
+100306	510003	60	18	1000	0	7	10
+100307	510003	70	37	5000	0	0	0
+100308	510003	80	38	5000	0	8	10
+100309	510003	90	39	5000	0	0	0
+100310	510003	100	40	5000	0	0	0
+100401	510004	10	6	1000	0	0	0
+100402	510004	20	7	1000	0	5	10
+100403	510004	30	8	10000	0	0	0
+100404	510004	40	16	1000	0	6	10
+100405	510004	50	17	1000	0	0	0
+100406	510004	60	18	1000	0	7	10
+100407	510004	70	37	5000	0	0	0
+100408	510004	80	38	5000	0	8	10
+100409	510004	90	39	5000	0	0	0
+100410	510004	100	40	5000	0	0	0
+100501	510005	10	6	1000	0	0	0
+100502	510005	20	7	1000	0	5	10
+100503	510005	30	8	10000	0	0	0
+100504	510005	40	16	1000	0	6	10
+100505	510005	50	17	1000	0	0	0
+100506	510005	60	18	1000	0	7	10
+100507	510005	70	37	5000	0	0	0
+100508	510005	80	38	5000	0	8	10
+100509	510005	90	39	5000	0	0	0
+100510	510005	100	40	5000	0	0	0
+100601	510006	10	6	1000	0	0	0
+100602	510006	20	7	1000	0	5	10
+100603	510006	30	8	10000	0	0	0
+100604	510006	40	16	1000	0	6	10
+100605	510006	50	17	1000	0	0	0
+100606	510006	60	18	1000	0	7	10
+100607	510006	70	37	5000	0	0	0
+100608	510006	80	38	5000	0	8	10
+100609	510006	90	39	5000	0	0	0
+100610	510006	100	40	5000	0	0	0
+100701	510007	10	6	1000	0	0	0
+100702	510007	20	7	1000	0	5	10
+100703	510007	30	8	10000	0	0	0
+100704	510007	40	16	1000	0	6	10
+100705	510007	50	17	1000	0	0	0
+100706	510007	60	18	1000	0	7	10
+100707	510007	70	37	5000	0	0	0
+100708	510007	80	38	5000	0	8	10
+100709	510007	90	39	5000	0	0	0
+100710	510007	100	40	5000	0	0	0
+100801	510008	10	6	1000	0	0	0
+100802	510008	20	7	1000	0	5	10
+100803	510008	30	8	10000	0	0	0
+100804	510008	40	16	1000	0	6	10
+100805	510008	50	17	1000	0	0	0
+100806	510008	60	18	1000	0	7	10
+100807	510008	70	37	5000	0	0	0
+100808	510008	80	38	5000	0	8	10
+100809	510008	90	39	5000	0	0	0
+100810	510008	100	40	5000	0	0	0
+100901	510009	10	6	1000	0	0	0
+100902	510009	20	7	1000	0	5	10
+100903	510009	30	8	10000	0	0	0
+100904	510009	40	16	1000	0	6	10
+100905	510009	50	17	1000	0	0	0
+100906	510009	60	18	1000	0	7	10
+100907	510009	70	37	5000	0	0	0
+100908	510009	80	38	5000	0	8	10
+100909	510009	90	39	5000	0	0	0
+100910	510009	100	40	5000	0	0	0
+101001	510010	10	6	1000	0	0	0
+101002	510010	20	7	1000	0	5	10
+101003	510010	30	8	10000	0	0	0
+101004	510010	40	16	1000	0	6	10
+101005	510010	50	17	1000	0	0	0
+101006	510010	60	18	1000	0	7	10
+101007	510010	70	37	5000	0	0	0
+101008	510010	80	38	5000	0	8	10
+101009	510010	90	39	5000	0	0	0
+101010	510010	100	40	5000	0	0	0
+101101	510011	10	6	1000	0	0	0
+101102	510011	20	7	1000	0	5	10
+101103	510011	30	8	10000	0	0	0
+101104	510011	40	16	1000	0	6	10
+101105	510011	50	17	1000	0	0	0
+101106	510011	60	18	1000	0	7	10
+101107	510011	70	37	5000	0	0	0
+101108	510011	80	38	5000	0	8	10
+101109	510011	90	39	5000	0	0	0
+101110	510011	100	40	5000	0	0	0
+101201	510012	10	6	1000	0	0	0
+101202	510012	20	7	1000	0	5	10
+101203	510012	30	8	10000	0	0	0
+101204	510012	40	16	1000	0	6	10
+101205	510012	50	17	1000	0	0	0
+101206	510012	60	18	1000	0	7	10
+101207	510012	70	37	5000	0	0	0
+101208	510012	80	38	5000	0	8	10
+101209	510012	90	39	5000	0	0	0
+101210	510012	100	40	5000	0	0	0
+101301	510013	10	6	1000	0	0	0
+101302	510013	20	7	1000	0	5	10
+101303	510013	30	8	10000	0	0	0
+101304	510013	40	16	1000	0	6	10
+101305	510013	50	17	1000	0	0	0
+101306	510013	60	18	1000	0	7	10
+101307	510013	70	37	5000	0	0	0
+101308	510013	80	38	5000	0	8	10
+101309	510013	90	39	5000	0	0	0
+101310	510013	100	40	5000	0	0	0
+101401	510014	10	6	1000	0	0	0
+101402	510014	20	7	1000	0	5	10
+101403	510014	30	8	10000	0	0	0
+101404	510014	40	16	1000	0	6	10
+101405	510014	50	17	1000	0	0	0
+101406	510014	60	18	1000	0	7	10
+101407	510014	70	37	5000	0	0	0
+101408	510014	80	38	5000	0	8	10
+101409	510014	90	39	5000	0	0	0
+101410	510014	100	40	5000	0	0	0
+101501	510015	10	6	1000	0	0	0
+101502	510015	20	7	1000	0	5	10
+101503	510015	30	8	10000	0	0	0
+101504	510015	40	16	1000	0	6	10
+101505	510015	50	17	1000	0	0	0
+101506	510015	60	18	1000	0	7	10
+101507	510015	70	37	5000	0	0	0
+101508	510015	80	38	5000	0	8	10
+101509	510015	90	39	5000	0	0	0
+101510	510015	100	40	5000	0	0	0
+101601	510016	10	6	1000	0	0	0
+101602	510016	20	7	1000	0	5	10
+101603	510016	30	8	10000	0	0	0
+101604	510016	40	16	1000	0	6	10
+101605	510016	50	17	1000	0	0	0
+101606	510016	60	18	1000	0	7	10
+101607	510016	70	37	5000	0	0	0
+101608	510016	80	38	5000	0	8	10
+101609	510016	90	39	5000	0	0	0
+101610	510016	100	40	5000	0	0	0
+200101	520001	10	6	1000	0	0	0
+200102	520001	20	7	1000	0	5	10
+200103	520001	30	8	10000	0	0	0
+200104	520001	40	16	1000	0	6	10
+200105	520001	50	17	1000	0	0	0
+200106	520001	60	18	1000	0	7	10
+200107	520001	70	37	5000	0	0	0
+200108	520001	80	38	5000	0	8	10
+200109	520001	90	39	5000	0	0	0
+200110	520001	100	40	5000	0	0	0
+200201	520002	10	6	1000	0	0	0
+200202	520002	20	7	1000	0	5	10
+200203	520002	30	8	10000	0	0	0
+200204	520002	40	16	1000	0	6	10
+200205	520002	50	17	1000	0	0	0
+200206	520002	60	18	1000	0	7	10
+200207	520002	70	37	5000	0	0	0
+200208	520002	80	38	5000	0	8	10
+200209	520002	90	39	5000	0	0	0
+200210	520002	100	40	5000	0	0	0
+200301	520003	10	6	1000	0	0	0
+200302	520003	20	7	1000	0	5	10
+200303	520003	30	8	10000	0	0	0
+200304	520003	40	16	1000	0	6	10
+200305	520003	50	17	1000	0	0	0
+200306	520003	60	18	1000	0	7	10
+200307	520003	70	37	5000	0	0	0
+200308	520003	80	38	5000	0	8	10
+200309	520003	90	39	5000	0	0	0
+200310	520003	100	40	5000	0	0	0
+200401	520004	10	6	1000	0	0	0
+200402	520004	20	7	1000	0	5	10
+200403	520004	30	8	10000	0	0	0
+200404	520004	40	16	1000	0	6	10
+200405	520004	50	17	1000	0	0	0
+200406	520004	60	18	1000	0	7	10
+200407	520004	70	37	5000	0	0	0
+200408	520004	80	38	5000	0	8	10
+200409	520004	90	39	5000	0	0	0
+200410	520004	100	40	5000	0	0	0
+200501	520005	10	6	1000	0	0	0
+200502	520005	20	7	1000	0	5	10
+200503	520005	30	8	10000	0	0	0
+200504	520005	40	16	1000	0	6	10
+200505	520005	50	17	1000	0	0	0
+200506	520005	60	18	1000	0	7	10
+200507	520005	70	37	5000	0	0	0
+200508	520005	80	38	5000	0	8	10
+200509	520005	90	39	5000	0	0	0
+200510	520005	100	40	5000	0	0	0
+200601	520006	10	6	1000	0	0	0
+200602	520006	20	7	1000	0	5	10
+200603	520006	30	8	10000	0	0	0
+200604	520006	40	16	1000	0	6	10
+200605	520006	50	17	1000	0	0	0
+200606	520006	60	18	1000	0	7	10
+200607	520006	70	37	5000	0	0	0
+200608	520006	80	38	5000	0	8	10
+200609	520006	90	39	5000	0	0	0
+200610	520006	100	40	5000	0	0	0
+200701	520007	10	6	1000	0	0	0
+200702	520007	20	7	1000	0	5	10
+200703	520007	30	8	10000	0	0	0
+200704	520007	40	16	1000	0	6	10
+200705	520007	50	17	1000	0	0	0
+200706	520007	60	18	1000	0	7	10
+200707	520007	70	37	5000	0	0	0
+200708	520007	80	38	5000	0	8	10
+200709	520007	90	39	5000	0	0	0
+200710	520007	100	40	5000	0	0	0
+200801	520008	10	6	1000	0	0	0
+200802	520008	20	7	1000	0	5	10
+200803	520008	30	8	10000	0	0	0
+200804	520008	40	16	1000	0	6	10
+200805	520008	50	17	1000	0	0	0
+200806	520008	60	18	1000	0	7	10
+200807	520008	70	37	5000	0	0	0
+200808	520008	80	38	5000	0	8	10
+200809	520008	90	39	5000	0	0	0
+200810	520008	100	40	5000	0	0	0
+200901	520009	10	6	1000	0	0	0
+200902	520009	20	7	1000	0	5	10
+200903	520009	30	8	10000	0	0	0
+200904	520009	40	16	1000	0	6	10
+200905	520009	50	17	1000	0	0	0
+200906	520009	60	18	1000	0	7	10
+200907	520009	70	37	5000	0	0	0
+200908	520009	80	38	5000	0	8	10
+200909	520009	90	39	5000	0	0	0
+200910	520009	100	40	5000	0	0	0
+201001	520010	10	6	1000	0	0	0
+201002	520010	20	7	1000	0	5	10
+201003	520010	30	8	10000	0	0	0
+201004	520010	40	16	1000	0	6	10
+201005	520010	50	17	1000	0	0	0
+201006	520010	60	18	1000	0	7	10
+201007	520010	70	37	5000	0	0	0
+201008	520010	80	38	5000	0	8	10
+201009	520010	90	39	5000	0	0	0
+201010	520010	100	40	5000	0	0	0
+201101	520011	10	6	1000	0	0	0
+201102	520011	20	7	1000	0	5	10
+201103	520011	30	8	10000	0	0	0
+201104	520011	40	16	1000	0	6	10
+201105	520011	50	17	1000	0	0	0
+201106	520011	60	18	1000	0	7	10
+201107	520011	70	37	5000	0	0	0
+201108	520011	80	38	5000	0	8	10
+201109	520011	90	39	5000	0	0	0
+201110	520011	100	40	5000	0	0	0
+201201	520012	10	6	1000	0	0	0
+201202	520012	20	7	1000	0	5	10
+201203	520012	30	8	10000	0	0	0
+201204	520012	40	16	1000	0	6	10
+201205	520012	50	17	1000	0	0	0
+201206	520012	60	18	1000	0	7	10
+201207	520012	70	37	5000	0	0	0
+201208	520012	80	38	5000	0	8	10
+201209	520012	90	39	5000	0	0	0
+201210	520012	100	40	5000	0	0	0
+201301	520013	10	6	1000	0	0	0
+201302	520013	20	7	1000	0	5	10
+201303	520013	30	8	10000	0	0	0
+201304	520013	40	16	1000	0	6	10
+201305	520013	50	17	1000	0	0	0
+201306	520013	60	18	1000	0	7	10
+201307	520013	70	37	5000	0	0	0
+201308	520013	80	38	5000	0	8	10
+201309	520013	90	39	5000	0	0	0
+201310	520013	100	40	5000	0	0	0
+201401	520014	10	6	1000	0	0	0
+201402	520014	20	7	1000	0	5	10
+201403	520014	30	8	10000	0	0	0
+201404	520014	40	16	1000	0	6	10
+201405	520014	50	17	1000	0	0	0
+201406	520014	60	18	1000	0	7	10
+201407	520014	70	37	5000	0	0	0
+201408	520014	80	38	5000	0	8	10
+201409	520014	90	39	5000	0	0	0
+201410	520014	100	40	5000	0	0	0
+201501	520015	10	6	1000	0	0	0
+201502	520015	20	7	1000	0	5	10
+201503	520015	30	8	10000	0	0	0
+201504	520015	40	16	1000	0	6	10
+201505	520015	50	17	1000	0	0	0
+201506	520015	60	18	1000	0	7	10
+201507	520015	70	37	5000	0	0	0
+201508	520015	80	38	5000	0	8	10
+201509	520015	90	39	5000	0	0	0
+201510	520015	100	40	5000	0	0	0
+201601	520016	10	6	1000	0	0	0
+201602	520016	20	7	1000	0	5	10
+201603	520016	30	8	10000	0	0	0
+201604	520016	40	16	1000	0	6	10
+201605	520016	50	17	1000	0	0	0
+201606	520016	60	18	1000	0	7	10
+201607	520016	70	37	5000	0	0	0
+201608	520016	80	38	5000	0	8	10
+201609	520016	90	39	5000	0	0	0
+201610	520016	100	40	5000	0	0	0
+300101	530001	10	6	1000	0	0	0
+300102	530001	20	7	1000	0	5	10
+300103	530001	30	8	10000	0	0	0
+300104	530001	40	16	1000	0	6	10
+300105	530001	50	17	1000	0	0	0
+300106	530001	60	18	1000	0	7	10
+300107	530001	70	37	5000	0	0	0
+300108	530001	80	38	5000	0	8	10
+300109	530001	90	39	5000	0	0	0
+300110	530001	100	40	5000	0	0	0
+300201	530002	10	6	1000	0	0	0
+300202	530002	20	7	1000	0	5	10
+300203	530002	30	8	10000	0	0	0
+300204	530002	40	16	1000	0	6	10
+300205	530002	50	17	1000	0	0	0
+300206	530002	60	18	1000	0	7	10
+300207	530002	70	37	5000	0	0	0
+300208	530002	80	38	5000	0	8	10
+300209	530002	90	39	5000	0	0	0
+300210	530002	100	40	5000	0	0	0
+300301	530003	10	6	1000	0	0	0
+300302	530003	20	7	1000	0	5	10
+300303	530003	30	8	10000	0	0	0
+300304	530003	40	16	1000	0	6	10
+300305	530003	50	17	1000	0	0	0
+300306	530003	60	18	1000	0	7	10
+300307	530003	70	37	5000	0	0	0
+300308	530003	80	38	5000	0	8	10
+300309	530003	90	39	5000	0	0	0
+300310	530003	100	40	5000	0	0	0
+300401	530004	10	6	1000	0	0	0
+300402	530004	20	7	1000	0	5	10
+300403	530004	30	8	10000	0	0	0
+300404	530004	40	16	1000	0	6	10
+300405	530004	50	17	1000	0	0	0
+300406	530004	60	18	1000	0	7	10
+300407	530004	70	37	5000	0	0	0
+300408	530004	80	38	5000	0	8	10
+300409	530004	90	39	5000	0	0	0
+300410	530004	100	40	5000	0	0	0
+300501	530005	10	6	1000	0	0	0
+300502	530005	20	7	1000	0	5	10
+300503	530005	30	8	10000	0	0	0
+300504	530005	40	16	1000	0	6	10
+300505	530005	50	17	1000	0	0	0
+300506	530005	60	18	1000	0	7	10
+300507	530005	70	37	5000	0	0	0
+300508	530005	80	38	5000	0	8	10
+300509	530005	90	39	5000	0	0	0
+300510	530005	100	40	5000	0	0	0
+300601	530006	10	6	1000	0	0	0
+300602	530006	20	7	1000	0	5	10
+300603	530006	30	8	10000	0	0	0
+300604	530006	40	16	1000	0	6	10
+300605	530006	50	17	1000	0	0	0
+300606	530006	60	18	1000	0	7	10
+300607	530006	70	37	5000	0	0	0
+300608	530006	80	38	5000	0	8	10
+300609	530006	90	39	5000	0	0	0
+300610	530006	100	40	5000	0	0	0
+300701	530007	10	6	1000	0	0	0
+300702	530007	20	7	1000	0	5	10
+300703	530007	30	8	10000	0	0	0
+300704	530007	40	16	1000	0	6	10
+300705	530007	50	17	1000	0	0	0
+300706	530007	60	18	1000	0	7	10
+300707	530007	70	37	5000	0	0	0
+300708	530007	80	38	5000	0	8	10
+300709	530007	90	39	5000	0	0	0
+300710	530007	100	40	5000	0	0	0
+300801	530008	10	6	1000	0	0	0
+300802	530008	20	7	1000	0	5	10
+300803	530008	30	8	10000	0	0	0
+300804	530008	40	16	1000	0	6	10
+300805	530008	50	17	1000	0	0	0
+300806	530008	60	18	1000	0	7	10
+300807	530008	70	37	5000	0	0	0
+300808	530008	80	38	5000	0	8	10
+300809	530008	90	39	5000	0	0	0
+300810	530008	100	40	5000	0	0	0
+300901	530009	10	6	1000	0	0	0
+300902	530009	20	7	1000	0	5	10
+300903	530009	30	8	10000	0	0	0
+300904	530009	40	16	1000	0	6	10
+300905	530009	50	17	1000	0	0	0
+300906	530009	60	18	1000	0	7	10
+300907	530009	70	37	5000	0	0	0
+300908	530009	80	38	5000	0	8	10
+300909	530009	90	39	5000	0	0	0
+300910	530009	100	40	5000	0	0	0
+301001	530010	10	6	1000	0	0	0
+301002	530010	20	7	1000	0	5	10
+301003	530010	30	8	10000	0	0	0
+301004	530010	40	16	1000	0	6	10
+301005	530010	50	17	1000	0	0	0
+301006	530010	60	18	1000	0	7	10
+301007	530010	70	37	5000	0	0	0
+301008	530010	80	38	5000	0	8	10
+301009	530010	90	39	5000	0	0	0
+301010	530010	100	40	5000	0	0	0
+301101	530011	10	6	1000	0	0	0
+301102	530011	20	7	1000	0	5	10
+301103	530011	30	8	10000	0	0	0
+301104	530011	40	16	1000	0	6	10
+301105	530011	50	17	1000	0	0	0
+301106	530011	60	18	1000	0	7	10
+301107	530011	70	37	5000	0	0	0
+301108	530011	80	38	5000	0	8	10
+301109	530011	90	39	5000	0	0	0
+301110	530011	100	40	5000	0	0	0
+301201	530012	10	6	1000	0	0	0
+301202	530012	20	7	1000	0	5	10
+301203	530012	30	8	10000	0	0	0
+301204	530012	40	16	1000	0	6	10
+301205	530012	50	17	1000	0	0	0
+301206	530012	60	18	1000	0	7	10
+301207	530012	70	37	5000	0	0	0
+301208	530012	80	38	5000	0	8	10
+301209	530012	90	39	5000	0	0	0
+301210	530012	100	40	5000	0	0	0
+301301	530013	10	6	1000	0	0	0
+301302	530013	20	7	1000	0	5	10
+301303	530013	30	8	10000	0	0	0
+301304	530013	40	16	1000	0	6	10
+301305	530013	50	17	1000	0	0	0
+301306	530013	60	18	1000	0	7	10
+301307	530013	70	37	5000	0	0	0
+301308	530013	80	38	5000	0	8	10
+301309	530013	90	39	5000	0	0	0
+301310	530013	100	40	5000	0	0	0
+301401	530014	10	6	1000	0	0	0
+301402	530014	20	7	1000	0	5	10
+301403	530014	30	8	10000	0	0	0
+301404	530014	40	16	1000	0	6	10
+301405	530014	50	17	1000	0	0	0
+301406	530014	60	18	1000	0	7	10
+301407	530014	70	37	5000	0	0	0
+301408	530014	80	38	5000	0	8	10
+301409	530014	90	39	5000	0	0	0
+301410	530014	100	40	5000	0	0	0
+301501	530015	10	6	1000	0	0	0
+301502	530015	20	7	1000	0	5	10
+301503	530015	30	8	10000	0	0	0
+301504	530015	40	16	1000	0	6	10
+301505	530015	50	17	1000	0	0	0
+301506	530015	60	18	1000	0	7	10
+301507	530015	70	37	5000	0	0	0
+301508	530015	80	38	5000	0	8	10
+301509	530015	90	39	5000	0	0	0
+301510	530015	100	40	5000	0	0	0
+301601	530016	10	6	1000	0	0	0
+301602	530016	20	7	1000	0	5	10
+301603	530016	30	8	10000	0	0	0
+301604	530016	40	16	1000	0	6	10
+301605	530016	50	17	1000	0	0	0
+301606	530016	60	18	1000	0	7	10
+301607	530016	70	37	5000	0	0	0
+301608	530016	80	38	5000	0	8	10
+301609	530016	90	39	5000	0	0	0
+301610	530016	100	40	5000	0	0	0
+400101	540001	10	6	1000	0	0	0
+400102	540001	20	7	1000	0	5	10
+400103	540001	30	8	10000	0	0	0
+400104	540001	40	16	1000	0	6	10
+400105	540001	50	17	1000	0	0	0
+400106	540001	60	18	1000	0	7	10
+400107	540001	70	37	5000	0	0	0
+400108	540001	80	38	5000	0	8	10
+400109	540001	90	39	5000	0	0	0
+400110	540001	100	40	5000	0	0	0
+400201	540002	10	6	1000	0	0	0
+400202	540002	20	7	1000	0	5	10
+400203	540002	30	8	10000	0	0	0
+400204	540002	40	16	1000	0	6	10
+400205	540002	50	17	1000	0	0	0
+400206	540002	60	18	1000	0	7	10
+400207	540002	70	37	5000	0	0	0
+400208	540002	80	38	5000	0	8	10
+400209	540002	90	39	5000	0	0	0
+400210	540002	100	40	5000	0	0	0
+400301	540003	10	6	1000	0	0	0
+400302	540003	20	7	1000	0	5	10
+400303	540003	30	8	10000	0	0	0
+400304	540003	40	16	1000	0	6	10
+400305	540003	50	17	1000	0	0	0
+400306	540003	60	18	1000	0	7	10
+400307	540003	70	37	5000	0	0	0
+400308	540003	80	38	5000	0	8	10
+400309	540003	90	39	5000	0	0	0
+400310	540003	100	40	5000	0	0	0
+400401	540004	10	6	1000	0	0	0
+400402	540004	20	7	1000	0	5	10
+400403	540004	30	8	10000	0	0	0
+400404	540004	40	16	1000	0	6	10
+400405	540004	50	17	1000	0	0	0
+400406	540004	60	18	1000	0	7	10
+400407	540004	70	37	5000	0	0	0
+400408	540004	80	38	5000	0	8	10
+400409	540004	90	39	5000	0	0	0
+400410	540004	100	40	5000	0	0	0
+400501	540005	10	6	1000	0	0	0
+400502	540005	20	7	1000	0	5	10
+400503	540005	30	8	10000	0	0	0
+400504	540005	40	16	1000	0	6	10
+400505	540005	50	17	1000	0	0	0
+400506	540005	60	18	1000	0	7	10
+400507	540005	70	37	5000	0	0	0
+400508	540005	80	38	5000	0	8	10
+400509	540005	90	39	5000	0	0	0
+400510	540005	100	40	5000	0	0	0
+400601	540006	10	6	1000	0	0	0
+400602	540006	20	7	1000	0	5	10
+400603	540006	30	8	10000	0	0	0
+400604	540006	40	16	1000	0	6	10
+400605	540006	50	17	1000	0	0	0
+400606	540006	60	18	1000	0	7	10
+400607	540006	70	37	5000	0	0	0
+400608	540006	80	38	5000	0	8	10
+400609	540006	90	39	5000	0	0	0
+400610	540006	100	40	5000	0	0	0
+400701	540007	10	6	1000	0	0	0
+400702	540007	20	7	1000	0	5	10
+400703	540007	30	8	10000	0	0	0
+400704	540007	40	16	1000	0	6	10
+400705	540007	50	17	1000	0	0	0
+400706	540007	60	18	1000	0	7	10
+400707	540007	70	37	5000	0	0	0
+400708	540007	80	38	5000	0	8	10
+400709	540007	90	39	5000	0	0	0
+400710	540007	100	40	5000	0	0	0
+400801	540008	10	6	1000	0	0	0
+400802	540008	20	7	1000	0	5	10
+400803	540008	30	8	10000	0	0	0
+400804	540008	40	16	1000	0	6	10
+400805	540008	50	17	1000	0	0	0
+400806	540008	60	18	1000	0	7	10
+400807	540008	70	37	5000	0	0	0
+400808	540008	80	38	5000	0	8	10
+400809	540008	90	39	5000	0	0	0
+400810	540008	100	40	5000	0	0	0
+400901	540009	10	6	1000	0	0	0
+400902	540009	20	7	1000	0	5	10
+400903	540009	30	8	10000	0	0	0
+400904	540009	40	16	1000	0	6	10
+400905	540009	50	17	1000	0	0	0
+400906	540009	60	18	1000	0	7	10
+400907	540009	70	37	5000	0	0	0
+400908	540009	80	38	5000	0	8	10
+400909	540009	90	39	5000	0	0	0
+400910	540009	100	40	5000	0	0	0
+401001	540010	10	6	1000	0	0	0
+401002	540010	20	7	1000	0	5	10
+401003	540010	30	8	10000	0	0	0
+401004	540010	40	16	1000	0	6	10
+401005	540010	50	17	1000	0	0	0
+401006	540010	60	18	1000	0	7	10
+401007	540010	70	37	5000	0	0	0
+401008	540010	80	38	5000	0	8	10
+401009	540010	90	39	5000	0	0	0
+401010	540010	100	40	5000	0	0	0
+401101	540011	10	6	1000	0	0	0
+401102	540011	20	7	1000	0	5	10
+401103	540011	30	8	10000	0	0	0
+401104	540011	40	16	1000	0	6	10
+401105	540011	50	17	1000	0	0	0
+401106	540011	60	18	1000	0	7	10
+401107	540011	70	37	5000	0	0	0
+401108	540011	80	38	5000	0	8	10
+401109	540011	90	39	5000	0	0	0
+401110	540011	100	40	5000	0	0	0
+401201	540012	10	6	1000	0	0	0
+401202	540012	20	7	1000	0	5	10
+401203	540012	30	8	10000	0	0	0
+401204	540012	40	16	1000	0	6	10
+401205	540012	50	17	1000	0	0	0
+401206	540012	60	18	1000	0	7	10
+401207	540012	70	37	5000	0	0	0
+401208	540012	80	38	5000	0	8	10
+401209	540012	90	39	5000	0	0	0
+401210	540012	100	40	5000	0	0	0
+401301	540013	10	6	1000	0	0	0
+401302	540013	20	7	1000	0	5	10
+401303	540013	30	8	10000	0	0	0
+401304	540013	40	16	1000	0	6	10
+401305	540013	50	17	1000	0	0	0
+401306	540013	60	18	1000	0	7	10
+401307	540013	70	37	5000	0	0	0
+401308	540013	80	38	5000	0	8	10
+401309	540013	90	39	5000	0	0	0
+401310	540013	100	40	5000	0	0	0
+401401	540014	10	6	1000	0	0	0
+401402	540014	20	7	1000	0	5	10
+401403	540014	30	8	10000	0	0	0
+401404	540014	40	16	1000	0	6	10
+401405	540014	50	17	1000	0	0	0
+401406	540014	60	18	1000	0	7	10
+401407	540014	70	37	5000	0	0	0
+401408	540014	80	38	5000	0	8	10
+401409	540014	90	39	5000	0	0	0
+401410	540014	100	40	5000	0	0	0
+401501	540015	10	6	1000	0	0	0
+401502	540015	20	7	1000	0	5	10
+401503	540015	30	8	10000	0	0	0
+401504	540015	40	16	1000	0	6	10
+401505	540015	50	17	1000	0	0	0
+401506	540015	60	18	1000	0	7	10
+401507	540015	70	37	5000	0	0	0
+401508	540015	80	38	5000	0	8	10
+401509	540015	90	39	5000	0	0	0
+401510	540015	100	40	5000	0	0	0
+401601	540016	10	6	1000	0	0	0
+401602	540016	20	7	1000	0	5	10
+401603	540016	30	8	10000	0	0	0
+401604	540016	40	16	1000	0	6	10
+401605	540016	50	17	1000	0	0	0
+401606	540016	60	18	1000	0	7	10
+401607	540016	70	37	5000	0	0	0
+401608	540016	80	38	5000	0	8	10
+401609	540016	90	39	5000	0	0	0
+401610	540016	100	40	5000	0	0	0
diff --git a/Config/HeroBreak.txt b/Config/HeroBreak.txt
index 4290aa2..d3710a1 100644
--- a/Config/HeroBreak.txt
+++ b/Config/HeroBreak.txt
@@ -1,63 +1,451 @@
 int	int	int	int[]	int[]	int
 BreakID	HeroID	BreakLV	AttrIDList	AttrValueList	SkillID
 姝﹀皢绐佺牬ID	姝﹀皢鐗╁搧ID	绐佺牬绛夌骇	灞炴�D鍒楄〃	灞炴�у�煎垪琛�	婵�娲绘妧鑳絀D
-1	510013	1	6	1000	0
-2	510013	2	7	1000	0
-3	510013	3	8	10000	0
-4	510013	4	16	1000	0
-5	510013	5	17	1000	0
-6	510013	6	18	1000	0
-7	510013	7	41	5000	0
-8	510013	8	42	5000	0
-9	510013	9	43	5000	0
-10	510013	10	44	5000	0
-11	510014	1	6	1000	0
-12	510014	2	7	1000	0
-13	510014	3	8	10000	0
-14	510014	4	16	1000	0
-15	510014	5	17	1000	0
-16	510014	6	18	1000	0
-17	510014	7	41	5000	0
-18	510014	8	42	5000	0
-19	510014	9	43	5000	0
-20	510014	10	44	5000	0
-21	510015	1	6	1000	0
-22	510015	2	7	1000	0
-23	510015	3	8	10000	0
-24	510015	4	16	1000	0
-25	510015	5	17	1000	0
-26	510015	6	18	1000	0
-27	510015	7	41	5000	0
-28	510015	8	42	5000	0
-29	510015	9	43	5000	0
-30	510015	10	44	5000	0
-31	520013	1	6	1000	0
-32	520013	2	7	1000	0
-33	520013	3	8	10000	0
-34	520013	4	16	1000	0
-35	520013	5	17	1000	0
-36	520013	6	18	1000	0
-37	520013	7	41	5000	0
-38	520013	8	42	5000	0
-39	520013	9	43	5000	0
-40	520013	10	44	5000	0
-41	520014	1	6	1000	0
-42	520014	2	7	1000	0
-43	520014	3	8	10000	0
-44	520014	4	16	1000	0
-45	520014	5	17	1000	0
-46	520014	6	18	1000	0
-47	520014	7	41	5000	0
-48	520014	8	42	5000	0
-49	520014	9	43	5000	0
-50	520014	10	44	5000	0
-51	520015	1	6	1000	0
-52	520015	2	7	1000	0
-53	520015	3	8	10000	0
-54	520015	4	16	1000	0
-55	520015	5	17	1000	0
-56	520015	6	18	1000	0
-57	520015	7	41	5000	0
-58	520015	8	42	5000	0
-59	520015	9	43	5000	0
-60	520015	10	44	5000	0
+100101	510001	10	23	1000	0
+100102	510001	20	59	1000	0
+100103	510001	30	33	4000	0
+100104	510001	50	23	1000	0
+100105	510001	60	0	0	100107
+100106	510001	80	0	0	100108
+100107	510001	100	0	0	100109
+100201	510002	10	0	0	100203
+100202	510002	20	59	1000	0
+100203	510002	30	0	0	100205
+100204	510002	50	31	1000	0
+100205	510002	70	0	0	100207
+100206	510002	90	0	0	100208
+100207	510002	120	0	0	100209
+100301	510003	10	22	4000	0
+100302	510003	20	60	1000	0
+100303	510003	30	0	0	100305
+100304	510003	50	29	1000	0
+100305	510003	70	0	0	100307
+100306	510003	90	0	0	100308
+100307	510003	120	29	2000	0
+100401	510004	10	0	0	100403
+100402	510004	20	59	1000	0
+100403	510004	30	0	0	100405
+100404	510004	50	27	1000	0
+100405	510004	70	0	0	100407
+100406	510004	90	0	0	100408
+100407	510004	120	0	0	100409
+100501	510005	10	0	0	100503
+100502	510005	20	59	1000	0
+100503	510005	30	0	0	100505
+100504	510005	50	29	1000	0
+100505	510005	70	0	0	100507
+100506	510005	90	0	0	100508
+100507	510005	120	0	0	100509
+100601	510006	10	0	0	100603
+100602	510006	20	59	1000	0
+100603	510006	30	0	0	100605
+100604	510006	50	25	1000	0
+100605	510006	70	0	0	100607
+100606	510006	90	0	0	100608
+100607	510006	120	0	0	100609
+100701	510007	10	0	0	100703
+100702	510007	20	60	1000	0
+100703	510007	30	0	0	100705
+100704	510007	50	21	1000	0
+100705	510007	70	0	0	100707
+100706	510007	90	0	0	100708
+100707	510007	120	0	0	100709
+100801	510008	10	0	0	100803
+100802	510008	20	60	1000	0
+100803	510008	30	0	0	100805
+100804	510008	50	0	0	100806
+100805	510008	70	0	0	100807
+100806	510008	90	0	0	100808
+100807	510008	120	51	1000	100809
+100901	510009	10	0	0	100903
+100902	510009	20	59	1000	0
+100903	510009	30	0	0	100905
+100904	510009	50	25	1000	100906
+100905	510009	70	0	0	100907
+100906	510009	90	0	0	100908
+100907	510009	120	0	0	100909
+101001	510010	10	0	0	101003
+101002	510010	20	59	1000	0
+101003	510010	30	0	0	101005
+101004	510010	50	23	1000	0
+101005	510010	70	0	0	101007
+101006	510010	90	0	0	101008
+101007	510010	120	0	0	101009
+101101	510011	10	0	0	101103
+101102	510011	20	59	1000	0
+101103	510011	30	0	0	101105
+101104	510011	50	21	1000	0
+101105	510011	70	0	0	101107
+101106	510011	90	0	0	101108
+101107	510011	120	0	0	101109
+101201	510012	10	0	0	101203
+101202	510012	20	59	1000	0
+101203	510012	30	0	0	101205
+101204	510012	50	31	1000	0
+101205	510012	70	0	0	101207
+101206	510012	90	0	0	101208
+101207	510012	120	0	0	101209
+101301	510013	10	0	0	101303
+101302	510013	20	60	1000	0
+101303	510013	30	0	0	101305
+101304	510013	50	21	1000	0
+101305	510013	70	0	0	101307
+101306	510013	90	0	0	101308
+101307	510013	120	51	1000	0
+101401	510014	10	0	0	101403
+101402	510014	20	59	1000	0
+101403	510014	30	0	0	101405
+101404	510014	50	23	1000	0
+101405	510014	70	0	0	101407
+101406	510014	90	0	0	101408
+101407	510014	120	0	0	101409
+101501	510015	10	0	0	101503
+101502	510015	20	60	1000	0
+101503	510015	30	0	0	101505
+101504	510015	50	29	1000	0
+101505	510015	70	0	0	101507
+101506	510015	90	0	0	101508
+101507	510015	120	53	2000	0
+101601	510016	10	0	0	101603
+101602	510016	20	59	1000	0
+101603	510016	30	0	0	101605
+101604	510016	50	27	1000	0
+101605	510016	70	0	0	101607
+101606	510016	90	0	0	101608
+101607	510016	120	0	0	101609
+200101	520001	10	0	0	200103
+200102	520001	20	62	1000	0
+200103	520001	30	0	0	200105
+200104	520001	50	27	1000	0
+200105	520001	70	17	1000	200107
+200106	520001	90	0	0	200108
+200107	520001	120	51	1000	0
+200201	520002	10	0	0	200203
+200202	520002	20	61	1000	0
+200203	520002	30	0	0	200205
+200204	520002	50	27	1000	0
+200205	520002	70	0	0	200207
+200206	520002	90	0	0	200208
+200207	520002	120	0	0	200209
+200301	520003	10	0	0	200303
+200302	520003	20	62	1000	0
+200303	520003	30	0	0	200305
+200304	520003	50	29	1000	0
+200305	520003	70	0	0	200307
+200306	520003	90	0	0	200308
+200307	520003	120	53	2000	0
+200401	520004	10	0	0	200403
+200402	520004	20	61	1000	0
+200403	520004	30	0	0	200405
+200404	520004	50	25	1000	0
+200405	520004	70	0	0	200407
+200406	520004	90	0	0	200408
+200407	520004	120	0	0	200409
+200501	520005	10	0	0	200503
+200502	520005	20	61	1000	0
+200503	520005	30	0	0	200505
+200504	520005	50	31	1000	0
+200505	520005	70	0	0	200507
+200506	520005	90	0	0	200508
+200507	520005	120	6	1000	0
+200601	520006	10	0	0	200603
+200602	520006	20	62	1000	0
+200603	520006	30	0	0	200605
+200604	520006	50	21	1000	0
+200605	520006	70	0	0	200607
+200606	520006	90	0	0	200608
+200607	520006	120	51	1000	200609
+200701	520007	10	0	0	200703
+200702	520007	20	62	1000	0
+200703	520007	30	0	0	200705
+200704	520007	50	29	1000	200706
+200705	520007	70	0	0	200707
+200706	520007	90	0	0	200708
+200707	520007	120	0	0	200709
+200801	520008	10	0	0	200803
+200802	520008	20	61	1000	0
+200803	520008	30	0	0	200805
+200804	520008	50	27	1000	0
+200805	520008	70	0	0	200807
+200806	520008	90	0	0	200808
+200807	520008	120	0	0	200809
+200901	520009	10	0	0	200903
+200902	520009	20	61	1000	0
+200903	520009	30	0	0	200905
+200904	520009	50	25	1000	0
+200905	520009	70	0	0	200907
+200906	520009	90	0	0	200908
+200907	520009	120	0	0	200909
+201001	520010	10	0	0	201003
+201002	520010	20	61	1000	0
+201003	520010	30	0	0	201005
+201004	520010	50	23	1000	0
+201005	520010	70	0	0	201007
+201006	520010	90	0	0	201008
+201007	520010	120	0	0	201009
+201101	520011	10	0	0	201103
+201102	520011	20	61	1000	0
+201103	520011	30	0	0	201105
+201104	520011	50	25	1000	0
+201105	520011	70	0	0	201107
+201106	520011	90	0	0	201108
+201107	520011	120	0	0	201109
+201201	520012	10	0	0	201203
+201202	520012	20	61	1000	0
+201203	520012	30	0	0	201205
+201204	520012	50	25	1000	0
+201205	520012	70	0	0	201207
+201206	520012	90	0	0	201208
+201207	520012	120	0	0	201209
+201301	520013	10	0	0	201303
+201302	520013	20	62	1000	0
+201303	520013	30	0	0	201305
+201304	520013	50	25	1000	0
+201305	520013	70	0	0	201307
+201306	520013	90	0	0	201308
+201307	520013	120	51	1000	201309
+201401	520014	10	0	0	201403
+201402	520014	20	61	1000	0
+201403	520014	30	0	0	201405
+201404	520014	50	23	1000	0
+201405	520014	70	0	0	201407
+201406	520014	90	0	0	201408
+201407	520014	120	33	3000	0
+201501	520015	10	0	0	201503
+201502	520015	20	62	1000	0
+201503	520015	30	0	0	201505
+201504	520015	50	25	1000	0
+201505	520015	70	0	0	201507
+201506	520015	90	0	0	201508
+201507	520015	120	51	2000	0
+201601	520016	10	0	0	201603
+201602	520016	20	61	1000	0
+201603	520016	30	0	0	201605
+201604	520016	50	23	1000	0
+201605	520016	70	0	0	201607
+201606	520016	90	0	0	201608
+201607	520016	120	0	0	201609
+300101	530001	10	0	0	300103
+300102	530001	20	63	1000	0
+300103	530001	30	0	0	300105
+300104	530001	50	23	1000	0
+300105	530001	70	0	0	300107
+300106	530001	90	0	0	300108
+300107	530001	120	33	2000	0
+300201	530002	10	0	0	300203
+300202	530002	20	64	1000	0
+300203	530002	30	27	1000	0
+300204	530002	50	27	1000	300206
+300205	530002	70	0	0	300207
+300206	530002	90	0	0	300208
+300207	530002	120	51	1000	0
+300301	530003	10	0	0	300303
+300302	530003	20	63	1000	0
+300303	530003	30	0	0	300305
+300304	530003	50	31	1000	0
+300305	530003	70	0	0	300307
+300306	530003	90	0	0	300308
+300307	530003	120	0	0	300309
+300401	530004	10	0	0	300403
+300402	530004	20	63	1000	0
+300403	530004	30	0	0	300405
+300404	530004	50	27	1000	0
+300405	530004	70	0	0	300407
+300406	530004	90	0	0	300408
+300407	530004	120	0	0	300409
+300501	530005	10	0	0	300503
+300502	530005	20	63	1000	0
+300503	530005	30	0	0	300505
+300504	530005	50	21	1000	0
+300505	530005	70	0	0	300507
+300506	530005	90	0	0	300508
+300507	530005	120	0	0	300509
+300601	530006	10	0	0	300603
+300602	530006	20	63	1000	0
+300603	530006	30	0	0	300605
+300604	530006	50	27	1000	0
+300605	530006	70	0	0	300607
+300606	530006	90	0	0	300608
+300607	530006	120	0	0	300609
+300701	530007	10	0	0	300703
+300702	530007	20	64	1000	0
+300703	530007	30	0	0	300705
+300704	530007	50	29	1000	0
+300705	530007	70	0	0	300707
+300706	530007	90	0	0	300708
+300707	530007	120	8	1000	300709
+300801	530008	10	0	0	300803
+300802	530008	20	64	1000	0
+300803	530008	30	0	0	300805
+300804	530008	50	27	1000	0
+300805	530008	70	0	0	300807
+300806	530008	90	0	0	300808
+300807	530008	120	0	0	300809
+300901	530009	10	0	0	300903
+300902	530009	20	63	1000	0
+300903	530009	30	0	0	300905
+300904	530009	50	29	1000	0
+300905	530009	70	0	0	300907
+300906	530009	90	0	0	300908
+300907	530009	120	6	1000	0
+301001	530010	10	0	0	301003
+301002	530010	20	63	1000	0
+301003	530010	30	0	0	301005
+301004	530010	50	23	1000	301006
+301005	530010	70	0	0	301007
+301006	530010	90	0	0	301008
+301007	530010	120	0	0	301009
+301101	530011	10	0	0	301103
+301102	530011	20	63	1000	0
+301103	530011	30	0	0	301105
+301104	530011	50	25	1000	0
+301105	530011	70	0	0	301107
+301106	530011	90	0	0	301108
+301107	530011	120	6	1000	0
+301201	530012	10	0	0	301203
+301202	530012	20	63	1000	0
+301203	530012	30	0	0	301205
+301204	530012	50	31	1000	0
+301205	530012	70	0	0	301207
+301206	530012	90	0	0	301208
+301207	530012	120	0	0	301209
+301301	530013	10	0	0	301303
+301302	530013	20	64	1000	0
+301303	530013	30	0	0	301305
+301304	530013	50	27	1000	301306
+301305	530013	70	0	0	301307
+301306	530013	90	0	0	301308
+301307	530013	120	0	0	301309
+301401	530014	10	0	0	301403
+301402	530014	20	63	1000	0
+301403	530014	30	0	0	301405
+301404	530014	50	23	1000	0
+301405	530014	70	0	0	301407
+301406	530014	90	0	0	301408
+301407	530014	120	0	0	301409
+301501	530015	10	0	0	301503
+301502	530015	20	64	1000	0
+301503	530015	30	0	0	301505
+301504	530015	50	27	1000	0
+301505	530015	70	0	0	301507
+301506	530015	90	0	0	301508
+301507	530015	120	0	0	301509
+301601	530016	10	0	0	301603
+301602	530016	20	63	1000	0
+301603	530016	30	0	0	301605
+301604	530016	50	25	1000	0
+301605	530016	70	0	0	301607
+301606	530016	90	0	0	301608
+301607	530016	120	0	0	301609
+400101	540001	10	0	0	400101
+400102	540001	20	57	1000	0
+400103	540001	30	0	0	400103
+400104	540001	50	21	1000	0
+400105	540001	70	0	0	400105
+400106	540001	90	0	0	400106
+400107	540001	120	0	0	400107
+400201	540002	10	0	0	400111
+400202	540002	20	57	1000	0
+400203	540002	30	0	0	400113
+400204	540002	50	31	1000	0
+400205	540002	70	31	1000	0
+400206	540002	90	0	0	400116
+400207	540002	120	0	0	400117
+400301	540003	10	0	0	400121
+400302	540003	20	57	1000	0
+400303	540003	30	0	0	400123
+400304	540003	50	27	1000	0
+400305	540003	70	0	0	400125
+400306	540003	90	0	0	400126
+400307	540003	120	0	0	400127
+400401	540004	10	0	0	400131
+400402	540004	20	58	1000	0
+400403	540004	30	0	0	400133
+400404	540004	50	29	1500	0
+400405	540004	70	0	0	400135
+400406	540004	90	0	0	400136
+400407	540004	120	0	0	400137
+400501	540005	10	0	0	400141
+400502	540005	20	57	1000	0
+400503	540005	30	0	0	400143
+400504	540005	50	27	1000	0
+400505	540005	70	0	0	400145
+400506	540005	90	0	0	400146
+400507	540005	120	0	0	400147
+400601	540006	10	0	0	400151
+400602	540006	20	58	1000	0
+400603	540006	30	0	0	400153
+400604	540006	50	29	1500	0
+400605	540006	70	29	1500	400155
+400606	540006	90	0	0	400156
+400607	540006	120	0	0	400157
+400701	540007	10	0	0	400161
+400702	540007	20	57	1000	0
+400703	540007	30	0	0	400163
+400704	540007	50	23	1000	0
+400705	540007	70	0	0	400165
+400706	540007	90	0	0	400166
+400707	540007	120	0	0	400167
+400801	540008	10	0	0	400171
+400802	540008	20	57	1000	0
+400803	540008	30	0	0	400173
+400804	540008	50	31	1000	0
+400805	540008	70	0	0	400175
+400806	540008	90	0	0	400176
+400807	540008	120	0	0	400177
+400901	540009	10	0	0	400181
+400902	540009	20	57	1000	0
+400903	540009	30	0	0	400183
+400904	540009	50	31	1000	0
+400905	540009	70	0	0	400185
+400906	540009	90	0	0	400186
+400907	540009	120	0	0	400187
+401001	540010	10	0	0	400191
+401002	540010	20	57	1000	0
+401003	540010	30	0	0	400193
+401004	540010	50	23	1000	0
+401005	540010	70	0	0	400195
+401006	540010	90	0	0	400196
+401007	540010	120	0	0	400197
+401101	540011	10	0	0	400201
+401102	540011	20	58	1000	0
+401103	540011	30	0	0	400203
+401104	540011	50	31	1000	0
+401105	540011	70	0	0	400205
+401106	540011	90	0	0	400206
+401107	540011	120	8	1000	0
+401201	540012	10	0	0	400211
+401202	540012	20	57	1000	0
+401203	540012	30	0	0	400213
+401204	540012	50	31	1000	0
+401205	540012	70	0	0	400215
+401206	540012	90	0	0	400216
+401207	540012	120	0	0	400217
+401301	540013	10	0	0	400221
+401302	540013	20	57	1000	0
+401303	540013	30	0	0	400223
+401304	540013	50	31	1000	0
+401305	540013	70	0	0	400225
+401306	540013	90	0	0	400226
+401307	540013	120	0	0	400227
+401401	540014	10	0	0	400231
+401402	540014	20	58	1000	0
+401403	540014	30	0	0	400233
+401404	540014	50	29	1000	400234
+401405	540014	70	0	0	400235
+401406	540014	90	0	0	400236
+401407	540014	120	0	0	400237
+401501	540015	10	0	0	400241
+401502	540015	20	57	1000	0
+401503	540015	30	0	0	400243
+401504	540015	50	21	1000	0
+401505	540015	70	0	0	400245
+401506	540015	90	0	0	400246
+401507	540015	120	0	0	400247
+401601	540016	10	0	0	400251
+401602	540016	20	58	1000	0
+401603	540016	30	0	0	400253
+401604	540016	50	0	0	400254
+401605	540016	70	0	0	400255
+401606	540016	90	0	0	400256
+401607	540016	120	0	0	400257
diff --git a/Config/HeroFetter.txt b/Config/HeroFetter.txt
index 96f3fc2..4f4b0e4 100644
--- a/Config/HeroFetter.txt
+++ b/Config/HeroFetter.txt
@@ -1,16 +1,16 @@
 int	string	int[]	int[]	int[]
 FetterID	FetterName	HeroIDList	AttrIDList	AttrValueList
 缇佺粖ID	缇佺粖鍚嶇О	姝﹀皢ID缁勫悎鍒楄〃	灞炴�D鍒楄〃	灞炴�у�煎垪琛�
-1	榄忔鍚岃鈥嬧��	510015|510014	17|18	2000|2000
-2	鍏板彴鍙岀挧	510011|510008	1	10
-3	涔濇笂瀵掓辰	510006|510007	1	10
-4	妗冨洯缁撲箟	520013|520014|520015	16|18	1000|1000
-5	鏈ㄩ涪鏍栨ⅶ	520012|520011	1	10
-6	灏嗘槦鎵跨儓	520007|520005	1	10
-7	椤炬洸楦句喀	530012|530013	1	10
-8	鍚存睙浠欎荆鈥嬧��	530009|530011	1	10
-9	姹熶笢鑻辫豹	530004|530007	1	10
-10	澶╀笅鏃犲弻	540014|540012	1	10
-11	涔变笘琛�鑴�	540013|540009	1	10
-12	鍗楄崚鍏界伀	540006|540007	1	10
-13	瑗垮噳鍔儸鈥嬧��	540003|540002	1	10
+1	榄忔鍚岃鈥嬧��	510015|510014	8	1500|1500
+2	鍏板彴鍙岀挧	510011|510008	6	1000|1000
+3	涔濇笂瀵掓辰	510006|510007	6	1000|1000
+4	妗冨洯缁撲箟	520013|520014|520015	6	1200|1200|1200
+5	鏈ㄩ涪鏍栨ⅶ	520012|520011	6	1200|1200
+6	灏嗘槦鎵跨儓	520007|520005	8	1000|1000
+7	椤炬洸楦句喀	530012|530013	6	1500|1500
+8	鍚存睙浠欎荆鈥嬧��	530009|530011	6	1000|1000
+9	姹熶笢鑻辫豹	530004|530007	8	1000|1000
+10	澶╀笅鏃犲弻	540014|540012	8	1500|1500
+11	涔变笘琛�鑴�	540013|540009	6	1200|1200
+12	鍗楄崚鍏界伀	540006|540007	6	1000|1000
+13	瑗垮噳鍔儸鈥嬧��	540003|540002	6	1000|1000
diff --git a/Config/HeroQualityAwake.txt b/Config/HeroQualityAwake.txt
index cccf343..c18b21e 100644
--- a/Config/HeroQualityAwake.txt
+++ b/Config/HeroQualityAwake.txt
@@ -1,6 +1,6 @@
 int	int	int	int[]	int
 QualityAwakeID	Quality	AwakeLV	UPCostItem	RebirthCostMoney
-鍝佽川瑙夐啋ID	鑻遍泟鍝佽川	瑙夐啋绛夌骇	瑙夐啋鍒颁笅绾ф秷鑰楅亾鍏�	閲嶇敓娑堣�楄揣甯�
+鍞竴ID	鑻遍泟鍝佽川	瑙夐啋绛夌骇	瑙夐啋鍒颁笅绾ф秷鑰楅亾鍏�	閲嶇敓娑堣�楄揣甯�
 10000	1	0	9|10	0
 10001	1	1	9|20	100
 10002	1	2	9|30	200
diff --git a/Config/HeroQualityBreak.txt b/Config/HeroQualityBreak.txt
index 95bceb0..6fd7978 100644
--- a/Config/HeroQualityBreak.txt
+++ b/Config/HeroQualityBreak.txt
@@ -1,6 +1,6 @@
 int	int	int	int	int[]
 QualityBreankID	Quality	BreakLV	LVMax	UPCostItem
-鍝佽川绐佺牬ID	鑻遍泟鍝佽川	绐佺牬绛夌骇	绛夌骇涓婇檺	绐佺牬鍒颁笅绾ф秷鑰楅亾鍏�
+鍞竴ID	鑻遍泟鍝佽川	绐佺牬绛夌骇	绛夌骇涓婇檺	绐佺牬鍒颁笅绾ф秷鑰楅亾鍏�
 1	1	0	20	8|10
 2	1	1	40	8|20
 3	1	2	60	8|30
diff --git a/Config/MainLevel.txt b/Config/MainLevel.txt
index 7b8a2c2..5217e6a 100644
--- a/Config/MainLevel.txt
+++ b/Config/MainLevel.txt
@@ -1,63 +1,63 @@
-int	int	int	int[]	int[]	int[]	int[]	int[]	int[]	int[]	int[][]	int[][]
-LevelID	ChapterID	LevelNum	WaveLineupIDList1	WaveLineupIDList2	WaveLineupIDList3	WaveLineupIDList4	WaveLineupIDList5	WaveLineupIDList6	BossLineupIDList	AwardItemList	StageLevel
-鍏冲崱ID	绔犺妭ID	绔犺妭鍏冲崱缂栧彿	娉�1闃靛ID鍒楄〃	娉�2闃靛ID鍒楄〃	娉�3闃靛ID鍒楄〃	娉�4闃靛ID鍒楄〃	娉�5闃靛ID鍒楄〃	娉�6闃靛ID鍒楄〃	Boss娉㈤樀瀹笽D鍒楄〃	杩囧叧濂栧姳鍒楄〃	鍏冲崱绛夌骇
-101	1	1	1000001	1000002	1000003	1000004			1000010	[[5,2],[30,1]]	1
-102	1	2	1000002	1000003	1000004	1000005			1000011	[[5,2],[30,1]]	2
-103	1	3	1000003	1000004	1000005	1000006			1000012	[[5,2],[30,1]]	3
-104	1	4	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006			1000013	[[5,2],[30,1]]	4
-105	1	5	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006			1000014	[[5,2],[30,1]]	5
-106	1	6	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000015	[[5,2],[30,1]]	6
-107	1	7	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000016	[[5,2],[30,1]]	7
-108	1	8	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000017	[[5,2],[30,1]]	8
-109	1	9	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000018	[[5,2],[30,1]]	9
-110	1	10	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000019	[[5,2],[30,1]]	10
-201	2	1	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006			1000009|1000010	[[5,2],[30,1]]	11
-202	2	2	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006			1000009|1000011	[[5,2],[30,1]]	12
-203	2	3	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006			1000009|1000012	[[5,2],[30,1]]	13
-204	2	4	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000013	[[5,2],[30,1]]	14
-205	2	5	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000014	[[5,2],[30,1]]	15
-206	2	6	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000015	[[5,2],[30,1]]	16
-207	2	7	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000016	[[5,2],[30,1]]	17
-208	2	8	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000017	[[5,2],[30,1]]	18
-209	2	9	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000018	[[5,2],[30,1]]	19
-210	2	10	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000019	[[5,2],[30,1]]	20
-301	3	1	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006			1000009|1000010	[[5,2],[30,1]]	21
-302	3	2	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006			1000009|1000011	[[5,2],[30,1]]	22
-303	3	3	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006			1000009|1000012	[[5,2],[30,1]]	23
-304	3	4	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000013	[[5,2],[30,1]]	24
-305	3	5	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000014	[[5,2],[30,1]]	25
-306	3	6	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000015	[[5,2],[30,1]]	26
-307	3	7	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000016	[[5,2],[30,1]]	27
-308	3	8	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000017	[[5,2],[30,1]]	28
-309	3	9	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000018	[[5,2],[30,1]]	29
-310	3	10	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000019	[[5,2],[30,1]]	30
-401	4	1	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006			1000009|1000010	[[5,2],[30,1]]	31
-402	4	2	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006			1000009|1000011	[[5,2],[30,1]]	32
-403	4	3	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006			1000009|1000012	[[5,2],[30,1]]	33
-404	4	4	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000013	[[5,2],[30,1]]	34
-405	4	5	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000014	[[5,2],[30,1]]	35
-406	4	6	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000015	[[5,2],[30,1]]	36
-407	4	7	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000016	[[5,2],[30,1]]	37
-408	4	8	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000017	[[5,2],[30,1]]	38
-409	4	9	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000018	[[5,2],[30,1]]	39
-410	4	10	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000019	[[5,2],[30,1]]	40
-501	5	1	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006			1000009|1000010	[[5,2],[30,1]]	41
-502	5	2	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006			1000009|1000011	[[5,2],[30,1]]	42
-503	5	3	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006			1000009|1000012	[[5,2],[30,1]]	43
-504	5	4	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000013	[[5,2],[30,1]]	44
-505	5	5	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000014	[[5,2],[30,1]]	45
-506	5	6	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000015	[[5,2],[30,1]]	46
-507	5	7	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000016	[[5,2],[30,1]]	47
-508	5	8	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000017	[[5,2],[30,1]]	48
-509	5	9	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000018	[[5,2],[30,1]]	49
-510	5	10	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000019	[[5,2],[30,1]]	50
-601	6	1	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006			1000009|1000010	[[5,2],[30,1]]	51
-602	6	2	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006			1000009|1000011	[[5,2],[30,1]]	52
-603	6	3	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006			1000009|1000012	[[5,2],[30,1]]	53
-604	6	4	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000013	[[5,2],[30,1]]	54
-605	6	5	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000014	[[5,2],[30,1]]	55
-606	6	6	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000015	[[5,2],[30,1]]	56
-607	6	7	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000016	[[5,2],[30,1]]	57
-608	6	8	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000017	[[5,2],[30,1]]	58
-609	6	9	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000018	[[5,2],[30,1]]	59
-610	6	10	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000019	[[5,2],[30,1]]	60
+int	int	int	int[]	int[]	int[]	int[]	int[]	int[]	int[]	int[][]
+LevelID	ChapterID	LevelNum	WaveLineupIDList1	WaveLineupIDList2	WaveLineupIDList3	WaveLineupIDList4	WaveLineupIDList5	WaveLineupIDList6	BossLineupIDList	AwardItemList
+鍏冲崱ID	绔犺妭ID	绔犺妭鍏冲崱缂栧彿	娉�1闃靛ID鍒楄〃	娉�2闃靛ID鍒楄〃	娉�3闃靛ID鍒楄〃	娉�4闃靛ID鍒楄〃	娉�5闃靛ID鍒楄〃	娉�6闃靛ID鍒楄〃	Boss娉㈤樀瀹笽D鍒楄〃	杩囧叧濂栧姳鍒楄〃
+101	1	1	1000001	1000002	1000003	1000004			1000010	[[5,2],[30,1]]
+102	1	2	1000002	1000003	1000004	1000005			1000011	[[5,2],[30,1]]
+103	1	3	1000003	1000004	1000005	1000006			1000012	[[5,2],[30,1]]
+104	1	4	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006			1000013	[[5,2],[30,1]]
+105	1	5	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006			1000014	[[5,2],[30,1]]
+106	1	6	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000015	[[5,2],[30,1]]
+107	1	7	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000016	[[5,2],[30,1]]
+108	1	8	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000017	[[5,2],[30,1]]
+109	1	9	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000018	[[5,2],[30,1]]
+110	1	10	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000019	[[5,2],[30,1]]
+201	2	1	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006			1000009|1000010	[[5,2],[30,1]]
+202	2	2	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006			1000009|1000011	[[5,2],[30,1]]
+203	2	3	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006			1000009|1000012	[[5,2],[30,1]]
+204	2	4	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000013	[[5,2],[30,1]]
+205	2	5	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000014	[[5,2],[30,1]]
+206	2	6	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000015	[[5,2],[30,1]]
+207	2	7	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000016	[[5,2],[30,1]]
+208	2	8	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000017	[[5,2],[30,1]]
+209	2	9	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000018	[[5,2],[30,1]]
+210	2	10	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000019	[[5,2],[30,1]]
+301	3	1	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006			1000009|1000010	[[5,2],[30,1]]
+302	3	2	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006			1000009|1000011	[[5,2],[30,1]]
+303	3	3	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006			1000009|1000012	[[5,2],[30,1]]
+304	3	4	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000013	[[5,2],[30,1]]
+305	3	5	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000014	[[5,2],[30,1]]
+306	3	6	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000015	[[5,2],[30,1]]
+307	3	7	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000016	[[5,2],[30,1]]
+308	3	8	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000017	[[5,2],[30,1]]
+309	3	9	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000018	[[5,2],[30,1]]
+310	3	10	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000019	[[5,2],[30,1]]
+401	4	1	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006			1000009|1000010	[[5,2],[30,1]]
+402	4	2	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006			1000009|1000011	[[5,2],[30,1]]
+403	4	3	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006			1000009|1000012	[[5,2],[30,1]]
+404	4	4	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000013	[[5,2],[30,1]]
+405	4	5	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000014	[[5,2],[30,1]]
+406	4	6	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000015	[[5,2],[30,1]]
+407	4	7	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000016	[[5,2],[30,1]]
+408	4	8	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000017	[[5,2],[30,1]]
+409	4	9	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000018	[[5,2],[30,1]]
+410	4	10	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000019	[[5,2],[30,1]]
+501	5	1	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006			1000009|1000010	[[5,2],[30,1]]
+502	5	2	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006			1000009|1000011	[[5,2],[30,1]]
+503	5	3	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006			1000009|1000012	[[5,2],[30,1]]
+504	5	4	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000013	[[5,2],[30,1]]
+505	5	5	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000014	[[5,2],[30,1]]
+506	5	6	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000015	[[5,2],[30,1]]
+507	5	7	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000016	[[5,2],[30,1]]
+508	5	8	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000017	[[5,2],[30,1]]
+509	5	9	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000018	[[5,2],[30,1]]
+510	5	10	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000019	[[5,2],[30,1]]
+601	6	1	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006			1000009|1000010	[[5,2],[30,1]]
+602	6	2	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006			1000009|1000011	[[5,2],[30,1]]
+603	6	3	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006			1000009|1000012	[[5,2],[30,1]]
+604	6	4	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000013	[[5,2],[30,1]]
+605	6	5	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000014	[[5,2],[30,1]]
+606	6	6	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000015	[[5,2],[30,1]]
+607	6	7	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000016	[[5,2],[30,1]]
+608	6	8	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000017	[[5,2],[30,1]]
+609	6	9	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000018	[[5,2],[30,1]]
+610	6	10	1000001|1000002|1000003	1000002|1000003|1000004	1000004|1000005|1000006	1000004|1000005|1000006	1000006|1000007|1000008	1000007|1000008|1000009	1000009|1000019	[[5,2],[30,1]]
diff --git a/Config/NPCLineup.txt b/Config/NPCLineup.txt
index cf78af8..2c15a71 100644
--- a/Config/NPCLineup.txt
+++ b/Config/NPCLineup.txt
@@ -1,22 +1,405 @@
 int	int	int	int	int	int	int	int	int
 LineupID	PosNPCID1	PosNPCID2	PosNPCID3	PosNPCID4	PosNPCID5	PosNPCID6	PosNPCID7	BossID
 闃靛ID	1鍙蜂綅NPCID	2鍙蜂綅NPCID	3鍙蜂綅NPCID	4鍙蜂綅NPCID	5鍙蜂綅NPCID	6鍙蜂綅NPCID	7鍙蜂綅NPCID	鏈樀瀹圭殑BossID
-1000001	510006	510006	510006	0	0	0	0	0
-1000002	510006	510006	510006	0	0	0	0	0
-1000003	510006	510006	510006	0	0	0	0	0
-1000004	510006	510006	510006	0	510006	510006	0	510006
-1000005	510006	510006	510006	510006	510006	510006	0	510006
-1000006	510006	510006	510006	510006	510006	510006	0	510006
-1000007	510006	510006	510006	510006	510006	510006	0	510006
-1000008	510006	510006	510006	510006	510006	510006	0	510006
-1000009	510006	510006	510006	510006	510006	510006	0	510006
-1000010	0	0	0	510006	510006	510006	510006	510006
-1000011	0	0	0	510006	510006	510006	510006	510006
-1000012	0	0	0	510006	510006	510006	510006	510006
-1000013	0	0	0	510006	0	0	510006	510006
-1000014	0	0	0	0	0	0	510006	510006
-1000015	0	0	0	0	0	0	510006	510006
-1000016	0	0	0	0	0	0	510006	510006
-1000017	510006	0	510006	0	510006	0	0	510006
-1000018	510006	1	510006	0	510006	0	0	510006
-1000019	510006	2	510006	0	510006	0	0	510006
+1000001		510006						0
+1000002	510006		510006					0
+1000003		510006			510006			0
+1000004		510006		510006		510006		0
+1000005	510006		510006		510006			0
+1000006	510006	510006	510006					0
+1000007				510006	510006	510006		0
+1000008	510006	510006	510006		510006			0
+1000009	510006		510006		510015			510015
+1000010	510006		510006					0
+1000011		510006		510006		510006		0
+1000012		510010		510006		510006		0
+1000013		510006		510006	510006	510006		0
+1000014	510006		510006		510010			0
+1000015	510006	510006	510006		510006			0
+1000016		510006		510006	510010	510006		0
+1000017	510006		510006	510006	510010	510006		0
+1000018		510006		510006	510010	510006		510010
+1000019	510006	510006	510006					0
+1000020	510006		510006	510010		510010		0
+1000021	510006		510006	510006	510010	510006		0
+1000022	510006	510006	510006	510006		510006		0
+1000023	510006		510006	510010		510010		0
+1000024	510006	510006	510006	510010		510010		0
+1000025	510006		510006	510006	510006	510006		0
+1000026	510006	510010	510006	510010		510010		0
+1000027	510006		510006	510006	510010	510006		510010
+1000028	510006		510006	510006		510006		0
+1000029		510006		510006	510010	510006		0
+1000030	510006		510006	510010		510010		0
+1000031		510006		510010	510010	510010		0
+1000032	510006		510006	510006	510010	510006		0
+1000033	510006	510010	510006		510010			0
+1000034	510006	510010	510006		510010			0
+1000035	510006		510006	510010	510010	510010		0
+1000036		510006		510010	510010	510010		510010
+1000037	510006	510006	510006	510006		510006		0
+1000038	510006	510006	510006	510010		510010		0
+1000039	510006	510006	510006	510010		510010		0
+1000040	510010	510010	510010					0
+1000041	510006		510006	510010		510010		0
+1000042	510006	510006	510006	510010		510010		0
+1000043	510006		510006	510010		510010		0
+1000044	510006	510010	510006	510010		510010		0
+1000045	510006		510006	510010	510010	510010		510010
+1000046		510006						0
+1000047	510006		510006					0
+1000048		510006			510006			0
+1000049		510006		510006		510006		0
+1000050	510006		510006		510006			0
+1000051	510006	510006	510006					0
+1000052				510006	510006	510006		0
+1000053	510006	510006	510006		510006			0
+1000054	510006		510006		510015			510015
+1000055	510006		510006					0
+1000056		510006		510006		510006		0
+1000057		510010		510006		510006		0
+1000058		510006		510006	510006	510006		0
+1000059	510006		510006		510010			0
+1000060	510006	510006	510006		510006			0
+1000061		510006		510006	510010	510006		0
+1000062	510006		510006	510006	510010	510006		0
+1000063		510006		510006	510010	510006		510010
+1000064	510006	510006	510006					0
+1000065	510006		510006	510010		510010		0
+1000066	510006		510006	510006	510010	510006		0
+1000067	510006	510006	510006	510006		510006		0
+1000068	510006		510006	510010		510010		0
+1000069	510006	510006	510006	510010		510010		0
+1000070	510006		510006	510006	510006	510006		0
+1000071	510006	510010	510006	510010		510010		0
+1000072	510006		510006	510006	510010	510006		510010
+1000073	510006		510006	510006		510006		0
+1000074		510006		510006	510010	510006		0
+1000075	510006		510006	510010		510010		0
+1000076		510006		510010	510010	510010		0
+1000077	510006		510006	510006	510010	510006		0
+1000078	510006	510010	510006		510010			0
+1000079	510006	510010	510006		510010			0
+1000080	510006		510006	510010	510010	510010		0
+1000081		510006		510010	510010	510010		510010
+1000082	510006	510006	510006	510006		510006		0
+1000083	510006	510006	510006	510010		510010		0
+1000084	510006	510006	510006	510010		510010		0
+1000085	510010	510010	510010					0
+1000086	510006		510006	510010		510010		0
+1000087	510006	510006	510006	510010		510010		0
+1000088	510006		510006	510010		510010		0
+1000089	510006	510010	510006	510010		510010		0
+1000090	510006		510006	510010	510010	510010		510010
+1000091		510006						0
+1000092	510006		510006					0
+1000093		510006			510006			0
+1000094		510006		510006		510006		0
+1000095	510006		510006		510006			0
+1000096	510006	510006	510006					0
+1000097				510006	510006	510006		0
+1000098	510006	510006	510006		510006			0
+1000099	510006		510006		510015			510015
+1000100	510006		510006					0
+1000101		510006		510006		510006		0
+1000102		510010		510006		510006		0
+1000103		510006		510006	510006	510006		0
+1000104	510006		510006		510010			0
+1000105	510006	510006	510006		510006			0
+1000106		510006		510006	510010	510006		0
+1000107	510006		510006	510006	510010	510006		0
+1000108		510006		510006	510010	510006		510010
+1000109	510006	510006	510006					0
+1000110	510006		510006	510010		510010		0
+1000111	510006		510006	510006	510010	510006		0
+1000112	510006	510006	510006	510006		510006		0
+1000113	510006		510006	510010		510010		0
+1000114	510006	510006	510006	510010		510010		0
+1000115	510006		510006	510006	510006	510006		0
+1000116	510006	510010	510006	510010		510010		0
+1000117	510006		510006	510006	510010	510006		510010
+1000118	510006		510006	510006		510006		0
+1000119		510006		510006	510010	510006		0
+1000120	510006		510006	510010		510010		0
+1000121		510006		510010	510010	510010		0
+1000122	510006		510006	510006	510010	510006		0
+1000123	510006	510010	510006		510010			0
+1000124	510006	510010	510006		510010			0
+1000125	510006		510006	510010	510010	510010		0
+1000126		510006		510010	510010	510010		510010
+1000127	510006	510006	510006	510006		510006		0
+1000128	510006	510006	510006	510010		510010		0
+1000129	510006	510006	510006	510010		510010		0
+1000130	510010	510010	510010					0
+1000131	510006		510006	510010		510010		0
+1000132	510006	510006	510006	510010		510010		0
+1000133	510006		510006	510010		510010		0
+1000134	510006	510010	510006	510010		510010		0
+1000135	510006		510006	510010	510010	510010		510010
+1000136								0
+1000137								0
+1000138								0
+1000139								0
+1000140								0
+1000141								0
+1000142								0
+1000143								0
+1000144								510006
+1000145								0
+1000146								0
+1000147								0
+1000148								0
+1000149								0
+1000150								0
+1000151								0
+1000152								0
+1000153								510006
+1000154								0
+1000155								0
+1000156								0
+1000157								0
+1000158								0
+1000159								0
+1000160								0
+1000161								0
+1000162								510006
+1000163								0
+1000164								0
+1000165								0
+1000166								0
+1000167								0
+1000168								0
+1000169								0
+1000170								0
+1000171								0
+1000172								0
+1000173								510006
+1000174								0
+1000175								0
+1000176								0
+1000177								0
+1000178								0
+1000179								0
+1000180								0
+1000181								0
+1000182								0
+1000183								0
+1000184								510006
+1000185								0
+1000186								0
+1000187								0
+1000188								0
+1000189								0
+1000190								0
+1000191								0
+1000192								0
+1000193								0
+1000194								0
+1000195								510006
+1000196								0
+1000197								0
+1000198								0
+1000199								0
+1000200								0
+1000201								0
+1000202								0
+1000203								0
+1000204								0
+1000205								0
+1000206								510006
+1000207								0
+1000208								0
+1000209								0
+1000210								0
+1000211								0
+1000212								0
+1000213								0
+1000214								0
+1000215								0
+1000216								0
+1000217								510006
+1000218								0
+1000219								0
+1000220								0
+1000221								0
+1000222								0
+1000223								0
+1000224								0
+1000225								0
+1000226								0
+1000227								0
+1000228								510006
+1000229								0
+1000230								0
+1000231								0
+1000232								0
+1000233								0
+1000234								0
+1000235								0
+1000236								0
+1000237								0
+1000238								0
+1000239								510006
+1000240								0
+1000241								0
+1000242								0
+1000243								0
+1000244								0
+1000245								0
+1000246								0
+1000247								0
+1000248								0
+1000249								0
+1000250								510006
+1000251								0
+1000252								0
+1000253								0
+1000254								0
+1000255								0
+1000256								0
+1000257								0
+1000258								0
+1000259								0
+1000260								0
+1000261								510006
+1000262								0
+1000263								0
+1000264								0
+1000265								0
+1000266								0
+1000267								0
+1000268								0
+1000269								0
+1000270								0
+1000271								0
+1000272								510006
+1000273								0
+1000274								0
+1000275								0
+1000276								0
+1000277								0
+1000278								0
+1000279								0
+1000280								0
+1000281								0
+1000282								0
+1000283								0
+1000284								0
+1000285								510006
+1000286								0
+1000287								0
+1000288								0
+1000289								0
+1000290								0
+1000291								0
+1000292								0
+1000293								0
+1000294								0
+1000295								0
+1000296								0
+1000297								0
+1000298								510006
+1000299								0
+1000300								0
+1000301								0
+1000302								0
+1000303								0
+1000304								0
+1000305								0
+1000306								0
+1000307								0
+1000308								0
+1000309								0
+1000310								0
+1000311								510006
+1000312								0
+1000313								0
+1000314								0
+1000315								0
+1000316								0
+1000317								0
+1000318								0
+1000319								0
+1000320								0
+1000321								0
+1000322								0
+1000323								0
+1000324								510006
+1000325								0
+1000326								0
+1000327								0
+1000328								0
+1000329								0
+1000330								0
+1000331								0
+1000332								0
+1000333								0
+1000334								0
+1000335								0
+1000336								0
+1000337								510006
+1000338								0
+1000339								0
+1000340								0
+1000341								0
+1000342								0
+1000343								0
+1000344								0
+1000345								0
+1000346								0
+1000347								0
+1000348								0
+1000349								0
+1000350								510006
+1000351								0
+1000352								0
+1000353								0
+1000354								0
+1000355								0
+1000356								0
+1000357								0
+1000358								0
+1000359								0
+1000360								0
+1000361								0
+1000362								0
+1000363								510006
+1000364								0
+1000365								0
+1000366								0
+1000367								0
+1000368								0
+1000369								0
+1000370								0
+1000371								0
+1000372								0
+1000373								0
+1000374								0
+1000375								0
+1000376								510006
+1000377								0
+1000378								0
+1000379								0
+1000380								0
+1000381								0
+1000382								0
+1000383								0
+1000384								0
+1000385								0
+1000386								0
+1000387								0
+1000388								0
+1000389								510006
+1000390								0
+1000391								0
+1000392								0
+1000393								0
+1000394								0
+1000395								0
+1000396								0
+1000397								0
+1000398								0
+1000399								0
+1000400								0
+1000401								0
+1000402								510006
diff --git a/Config/PlayerLV.txt b/Config/PlayerLV.txt
index e747f23..45b0624 100644
--- a/Config/PlayerLV.txt
+++ b/Config/PlayerLV.txt
@@ -1,1003 +1,1003 @@
-int	long
-LV	EXP
-绛夌骇	鍗囧埌涓嬩竴绾ф墍闇�缁忛獙
-1	100
-2	110
-3	120
-4	130
-5	140
-6	170
-7	190
-8	210
-9	230
-10	250
-11	220
-12	240
-13	260
-14	280
-15	300
-16	150
-17	170
-18	190
-19	210
-20	230
-21	250
-22	270
-23	220
-24	240
-25	260
-26	280
-27	300
-28	320
-29	340
-30	300
-31	320
-32	340
-33	360
-34	380
-35	400
-36	360
-37	390
-38	420
-39	450
-40	480
-41	510
-42	540
-43	540
-44	570
-45	600
-46	630
-47	660
-48	690
-49	720
-50	750
-51	780
-52	810
-53	840
-54	870
-55	900
-56	690
-57	730
-58	770
-59	810
-60	850
-61	890
-62	930
-63	970
-64	1010
-65	1050
-66	1090
-67	1130
-68	1170
-69	1210
-70	970
-71	1010
-72	1050
-73	1090
-74	1130
-75	1170
-76	1210
-77	1250
-78	1290
-79	1330
-80	1370
-81	1410
-82	1450
-83	1490
-84	1270
-85	1310
-86	1350
-87	1390
-88	1430
-89	1470
-90	1510
-91	1550
-92	1590
-93	1630
-94	1670
-95	1710
-96	1450
-97	1490
-98	1530
-99	1570
-100	1610
-101	1650
-102	1690
-103	1730
-104	1770
-105	1810
-106	1850
-107	1890
-108	1930
-109	1970
-110	2010
-111	2050
-112	2090
-113	2130
-114	2170
-115	2210
-116	2140
-117	2180
-118	2220
-119	2260
-120	2300
-121	2340
-122	2380
-123	2420
-124	2460
-125	2500
-126	2540
-127	2580
-128	2620
-129	2660
-130	2700
-131	2740
-132	2780
-133	2820
-134	2860
-135	2900
-136	2940
-137	2980
-138	3020
-139	3060
-140	3100
-141	3140
-142	3180
-143	3220
-144	3260
-145	3300
-146	3340
-147	3380
-148	3420
-149	3460
-150	3500
-151	3540
-152	3580
-153	3620
-154	3660
-155	3700
-156	3050
-157	3100
-158	3150
-159	3200
-160	3250
-161	3300
-162	3350
-163	3400
-164	3450
-165	3500
-166	3550
-167	3600
-168	3650
-169	3700
-170	3750
-171	3800
-172	3850
-173	3900
-174	3950
-175	4000
-176	4050
-177	4100
-178	4150
-179	4200
-180	4250
-181	4300
-182	4350
-183	4390
-184	4440
-185	4490
-186	4540
-187	4590
-188	4640
-189	4690
-190	4740
-191	4790
-192	4840
-193	4890
-194	4940
-195	4990
-196	5040
-197	5090
-198	5140
-199	5190
-200	5240
-201	5290
-202	5340
-203	5390
-204	5440
-205	5490
-206	5540
-207	5590
-208	5640
-209	5690
-210	5760
-211	5810
-212	5860
-213	5910
-214	5960
-215	6010
-216	6060
-217	6110
-218	6160
-219	6210
-220	6260
-221	6310
-222	6360
-223	6410
-224	6460
-225	6510
-226	6560
-227	6610
-228	6660
-229	6710
-230	6760
-231	6810
-232	6860
-233	6910
-234	6960
-235	7010
-236	5190
-237	5250
-238	5310
-239	5370
-240	5430
-241	5490
-242	5550
-243	5610
-244	5670
-245	5730
-246	5790
-247	5850
-248	5910
-249	5970
-250	6030
-251	6090
-252	6150
-253	6210
-254	6270
-255	6330
-256	6390
-257	6450
-258	6510
-259	6570
-260	6630
-261	6690
-262	6750
-263	6810
-264	6870
-265	6930
-266	6990
-267	7050
-268	7110
-269	7170
-270	6360
-271	6420
-272	6480
-273	6540
-274	6600
-275	6660
-276	6720
-277	6780
-278	6840
-279	6900
-280	6960
-281	7020
-282	7080
-283	7140
-284	7200
-285	7260
-286	7320
-287	7380
-288	7440
-289	7500
-290	7560
-291	7620
-292	7680
-293	7740
-294	7800
-295	7860
-296	7920
-297	7980
-298	8040
-299	8100
-300	8160
-301	8220
-302	8280
-303	8340
-304	8130
-305	8190
-306	8250
-307	8310
-308	8370
-309	8430
-310	8490
-311	8550
-312	8610
-313	8670
-314	8730
-315	8790
-316	8850
-317	8910
-318	8970
-319	9030
-320	9090
-321	9150
-322	9210
-323	9270
-324	9330
-325	9390
-326	9450
-327	9510
-328	9570
-329	9630
-330	9690
-331	9750
-332	9810
-333	9870
-334	9930
-335	9990
-336	8640
-337	8710
-338	8780
-339	8850
-340	8920
-341	8990
-342	9060
-343	9130
-344	9200
-345	9270
-346	9340
-347	9410
-348	9480
-349	9550
-350	9620
-351	9690
-352	9760
-353	9830
-354	9900
-355	9970
-356	10040
-357	10110
-358	10180
-359	10250
-360	10320
-361	10390
-362	10460
-363	10530
-364	10600
-365	10670
-366	10740
-367	10810
-368	10880
-369	10950
-370	11020
-371	11090
-372	11160
-373	11230
-374	11300
-375	11370
-376	10640
-377	10710
-378	10780
-379	10850
-380	10920
-381	10990
-382	11060
-383	11130
-384	11200
-385	11270
-386	11340
-387	11410
-388	11480
-389	11550
-390	11620
-391	11690
-392	11760
-393	11830
-394	11900
-395	11970
-396	12040
-397	12110
-398	12180
-399	12250
-400	12320
-401	12390
-402	12460
-403	12530
-404	12600
-405	12670
-406	12740
-407	12810
-408	12880
-409	12950
-410	13020
-411	13090
-412	13160
-413	13230
-414	13300
-415	13370
-416	12640
-417	12710
-418	12780
-419	12850
-420	12920
-421	12990
-422	13060
-423	13130
-424	13200
-425	13270
-426	13340
-427	13410
-428	13480
-429	13550
-430	13620
-431	13690
-432	13760
-433	13830
-434	13900
-435	13970
-436	14040
-437	14110
-438	14180
-439	14250
-440	14320
-441	14390
-442	14460
-443	14530
-444	14600
-445	14670
-446	14740
-447	14810
-448	14880
-449	14950
-450	15020
-451	15090
-452	15160
-453	15230
-454	15300
-455	15370
-456	14970
-457	15050
-458	15130
-459	15210
-460	15290
-461	15370
-462	15450
-463	15530
-464	15610
-465	15690
-466	15770
-467	15850
-468	15930
-469	16010
-470	16090
-471	16170
-472	16250
-473	16330
-474	16410
-475	16490
-476	16570
-477	16650
-478	16730
-479	16810
-480	16890
-481	16970
-482	17050
-483	17130
-484	17210
-485	17290
-486	17370
-487	17450
-488	17530
-489	17610
-490	17690
-491	17770
-492	17850
-493	17930
-494	18010
-495	18090
-496	18170
-497	18250
-498	18330
-499	18410
-500	18490
-501	18570
-502	18650
-503	17730
-504	17810
-505	17890
-506	17970
-507	18050
-508	18130
-509	18210
-510	18290
-511	18370
-512	18450
-513	18530
-514	18610
-515	18690
-516	18770
-517	18850
-518	18930
-519	19010
-520	19090
-521	19170
-522	19250
-523	19330
-524	19410
-525	19490
-526	19570
-527	19650
-528	19730
-529	19810
-530	19890
-531	19970
-532	20050
-533	20130
-534	20210
-535	20290
-536	20370
-537	20450
-538	20530
-539	20610
-540	20690
-541	20770
-542	20850
-543	20930
-544	21010
-545	21090
-546	21170
-547	21250
-548	21330
-549	21410
-550	20320
-551	20400
-552	20480
-553	20560
-554	20640
-555	20720
-556	20800
-557	20880
-558	20960
-559	21040
-560	21120
-561	21200
-562	21280
-563	21360
-564	21440
-565	21520
-566	21600
-567	21680
-568	21760
-569	21840
-570	21920
-571	22000
-572	22080
-573	22160
-574	22240
-575	22320
-576	22400
-577	22480
-578	22560
-579	22640
-580	22720
-581	22800
-582	22880
-583	22960
-584	23040
-585	23120
-586	23200
-587	23280
-588	23360
-589	23440
-590	23520
-591	23600
-592	23680
-593	23760
-594	23840
-595	23920
-596	28730
-597	28820
-598	28910
-599	29000
-600	29090
-601	29180
-602	29270
-603	29360
-604	29450
-605	29540
-606	29630
-607	29720
-608	29810
-609	29900
-610	29990
-611	30080
-612	30170
-613	30260
-614	30350
-615	30440
-616	30530
-617	30620
-618	30710
-619	30800
-620	30890
-621	30980
-622	31070
-623	31160
-624	31250
-625	31340
-626	31430
-627	31520
-628	31610
-629	31700
-630	31790
-631	31880
-632	31970
-633	32060
-634	32150
-635	32240
-636	32330
-637	32420
-638	32510
-639	32600
-640	32690
-641	32780
-642	32870
-643	32960
-644	33050
-645	33140
-646	33230
-647	33320
-648	33410
-649	33500
-650	32800
-651	32890
-652	32980
-653	33070
-654	33160
-655	33250
-656	33340
-657	33430
-658	33520
-659	33610
-660	33700
-661	33790
-662	33880
-663	33970
-664	34060
-665	34150
-666	34240
-667	34330
-668	34420
-669	34510
-670	34600
-671	34690
-672	34780
-673	34870
-674	34960
-675	35050
-676	35140
-677	35230
-678	35320
-679	35410
-680	35500
-681	35590
-682	35680
-683	35770
-684	35860
-685	35950
-686	36040
-687	36130
-688	36220
-689	36310
-690	36400
-691	36490
-692	36580
-693	36670
-694	36760
-695	36850
-696	36940
-697	37030
-698	37120
-699	37210
-700	37300
-701	37390
-702	37480
-703	37570
-704	38670
-705	38760
-706	38850
-707	38940
-708	39030
-709	39120
-710	39210
-711	39300
-712	39390
-713	39480
-714	39570
-715	39660
-716	39750
-717	39840
-718	39930
-719	40020
-720	40110
-721	40200
-722	40290
-723	40380
-724	40470
-725	40560
-726	40650
-727	40740
-728	40830
-729	40920
-730	41010
-731	41100
-732	41190
-733	41280
-734	41370
-735	41460
-736	41550
-737	41640
-738	41730
-739	41820
-740	41910
-741	42000
-742	42090
-743	42180
-744	42270
-745	42360
-746	42450
-747	42540
-748	42630
-749	42720
-750	42810
-751	42900
-752	42990
-753	43080
-754	43170
-755	43260
-756	26720
-757	26820
-758	26920
-759	27020
-760	27120
-761	27220
-762	27320
-763	27420
-764	27520
-765	27620
-766	27720
-767	27820
-768	27920
-769	28020
-770	28120
-771	28220
-772	28320
-773	28420
-774	28520
-775	28620
-776	28720
-777	28820
-778	28920
-779	29020
-780	29120
-781	29220
-782	29320
-783	29420
-784	29520
-785	29620
-786	29720
-787	29820
-788	29920
-789	30020
-790	30120
-791	30220
-792	30320
-793	30420
-794	30520
-795	30620
-796	30720
-797	30820
-798	30920
-799	31020
-800	31120
-801	31220
-802	31320
-803	31420
-804	31520
-805	31620
-806	31720
-807	31820
-808	31920
-809	32020
-810	32120
-811	32220
-812	32320
-813	32420
-814	32520
-815	32620
-816	32050
-817	32150
-818	32250
-819	32350
-820	32450
-821	32550
-822	32650
-823	32750
-824	32850
-825	32950
-826	33050
-827	33150
-828	33250
-829	33350
-830	33450
-831	33550
-832	33650
-833	33750
-834	33850
-835	33950
-836	34050
-837	34150
-838	34250
-839	34350
-840	34450
-841	34550
-842	34650
-843	34750
-844	34850
-845	34950
-846	35050
-847	35150
-848	35250
-849	35350
-850	35450
-851	35550
-852	35650
-853	35750
-854	35850
-855	35950
-856	36050
-857	36150
-858	36250
-859	36350
-860	36450
-861	36550
-862	36650
-863	36750
-864	36850
-865	36950
-866	37050
-867	37150
-868	37250
-869	37350
-870	37450
-871	37550
-872	37650
-873	37750
-874	37850
-875	37950
-876	37550
-877	37650
-878	37750
-879	37850
-880	37950
-881	38050
-882	38150
-883	38250
-884	38350
-885	38450
-886	38550
-887	38650
-888	38750
-889	38850
-890	38950
-891	39050
-892	39150
-893	39250
-894	39350
-895	39450
-896	39550
-897	39650
-898	39750
-899	39850
-900	39950
-901	40050
-902	40150
-903	40250
-904	40350
-905	40450
-906	40550
-907	40650
-908	40750
-909	40850
-910	40950
-911	41050
-912	41150
-913	41250
-914	41350
-915	41450
-916	41550
-917	41650
-918	41750
-919	41850
-920	41950
-921	42050
-922	42150
-923	42250
-924	42350
-925	42450
-926	42550
-927	42650
-928	42750
-929	42850
-930	42950
-931	43050
-932	43150
-933	43250
-934	43350
-935	43450
-936	25280
-937	25365
-938	25450
-939	25535
-940	25620
-941	25705
-942	25790
-943	25875
-944	25960
-945	26045
-946	26130
-947	26215
-948	26300
-949	26385
-950	26470
-951	26555
-952	26640
-953	26725
-954	26810
-955	26895
-956	26980
-957	27065
-958	27150
-959	27235
-960	27320
-961	27405
-962	27490
-963	27575
-964	27660
-965	27745
-966	27830
-967	27915
-968	28000
-969	28085
-970	28170
-971	28255
-972	28340
-973	28425
-974	28510
-975	28595
-976	28680
-977	28765
-978	28850
-979	28935
-980	29020
-981	29105
-982	29190
-983	29275
-984	29360
-985	29445
-986	29530
-987	29615
-988	29700
-989	29785
-990	29870
-991	29955
-992	30040
-993	30125
-994	30210
-995	30295
-996	30380
-997	30465
-998	30550
-999	30635
-1000	0
+int	long	int	int	int
+LV	EXP	MaxHP	Atk	Def
+绛夌骇	鍗囧埌涓嬩竴绾ф墍闇�缁忛獙	鐢熷懡	鏀诲嚮	闃插尽
+1	100	80	10	2
+2	110	160	20	4
+3	120	240	30	6
+4	130	320	40	8
+5	140	400	50	10
+6	170	480	60	12
+7	190	560	70	14
+8	210	640	80	16
+9	230	720	90	18
+10	250	800	100	20
+11	220	880	110	22
+12	240	960	120	24
+13	260	1040	130	26
+14	280	1120	140	28
+15	300	1200	150	30
+16	150	1280	160	32
+17	170	1360	170	34
+18	190	1440	180	36
+19	210	1520	190	38
+20	230	1600	200	40
+21	250	1680	210	42
+22	270	1760	220	44
+23	220	1840	230	46
+24	240	1920	240	48
+25	260	2000	250	50
+26	280	2080	260	52
+27	300	2160	270	54
+28	320	2240	280	56
+29	340	2320	290	58
+30	300	2400	300	60
+31	320	2480	310	62
+32	340	2560	320	64
+33	360	2640	330	66
+34	380	2720	340	68
+35	400	2800	350	70
+36	360	2880	360	72
+37	390	2960	370	74
+38	420	3040	380	76
+39	450	3120	390	78
+40	480	3200	400	80
+41	510	3280	410	82
+42	540	3360	420	84
+43	540	3440	430	86
+44	570	3520	440	88
+45	600	3600	450	90
+46	630	3680	460	92
+47	660	3760	470	94
+48	690	3840	480	96
+49	720	3920	490	98
+50	750	4000	500	100
+51	780	4080	510	102
+52	810	4160	520	104
+53	840	4240	530	106
+54	870	4320	540	108
+55	900	4400	550	110
+56	690	4480	560	112
+57	730	4560	570	114
+58	770	4640	580	116
+59	810	4720	590	118
+60	850	4800	600	120
+61	890	4880	610	122
+62	930	4960	620	124
+63	970	5040	630	126
+64	1010	5120	640	128
+65	1050	5200	650	130
+66	1090	5280	660	132
+67	1130	5360	670	134
+68	1170	5440	680	136
+69	1210	5520	690	138
+70	970	5600	700	140
+71	1010	5680	710	142
+72	1050	5760	720	144
+73	1090	5840	730	146
+74	1130	5920	740	148
+75	1170	6000	750	150
+76	1210	6080	760	152
+77	1250	6160	770	154
+78	1290	6240	780	156
+79	1330	6320	790	158
+80	1370	6400	800	160
+81	1410	6480	810	162
+82	1450	6560	820	164
+83	1490	6640	830	166
+84	1270	6720	840	168
+85	1310	6800	850	170
+86	1350	6880	860	172
+87	1390	6960	870	174
+88	1430	7040	880	176
+89	1470	7120	890	178
+90	1510	7200	900	180
+91	1550	7280	910	182
+92	1590	7360	920	184
+93	1630	7440	930	186
+94	1670	7520	940	188
+95	1710	7600	950	190
+96	1450	7680	960	192
+97	1490	7760	970	194
+98	1530	7840	980	196
+99	1570	7920	990	198
+100	1610	8000	1000	200
+101	1650	8080	1010	202
+102	1690	8160	1020	204
+103	1730	8240	1030	206
+104	1770	8320	1040	208
+105	1810	8400	1050	210
+106	1850	8480	1060	212
+107	1890	8560	1070	214
+108	1930	8640	1080	216
+109	1970	8720	1090	218
+110	2010	8800	1100	220
+111	2050	8880	1110	222
+112	2090	8960	1120	224
+113	2130	9040	1130	226
+114	2170	9120	1140	228
+115	2210	9200	1150	230
+116	2140	9280	1160	232
+117	2180	9360	1170	234
+118	2220	9440	1180	236
+119	2260	9520	1190	238
+120	2300	9600	1200	240
+121	2340	9680	1210	242
+122	2380	9760	1220	244
+123	2420	9840	1230	246
+124	2460	9920	1240	248
+125	2500	10000	1250	250
+126	2540	10080	1260	252
+127	2580	10160	1270	254
+128	2620	10240	1280	256
+129	2660	10320	1290	258
+130	2700	10400	1300	260
+131	2740	10480	1310	262
+132	2780	10560	1320	264
+133	2820	10640	1330	266
+134	2860	10720	1340	268
+135	2900	10800	1350	270
+136	2940	10880	1360	272
+137	2980	10960	1370	274
+138	3020	11040	1380	276
+139	3060	11120	1390	278
+140	3100	11200	1400	280
+141	3140	11280	1410	282
+142	3180	11360	1420	284
+143	3220	11440	1430	286
+144	3260	11520	1440	288
+145	3300	11600	1450	290
+146	3340	11680	1460	292
+147	3380	11760	1470	294
+148	3420	11840	1480	296
+149	3460	11920	1490	298
+150	3500	12000	1500	300
+151	3540	12080	1510	302
+152	3580	12160	1520	304
+153	3620	12240	1530	306
+154	3660	12320	1540	308
+155	3700	12400	1550	310
+156	3050	12480	1560	312
+157	3100	12560	1570	314
+158	3150	12640	1580	316
+159	3200	12720	1590	318
+160	3250	12800	1600	320
+161	3300	12880	1610	322
+162	3350	12960	1620	324
+163	3400	13040	1630	326
+164	3450	13120	1640	328
+165	3500	13200	1650	330
+166	3550	13280	1660	332
+167	3600	13360	1670	334
+168	3650	13440	1680	336
+169	3700	13520	1690	338
+170	3750	13600	1700	340
+171	3800	13680	1710	342
+172	3850	13760	1720	344
+173	3900	13840	1730	346
+174	3950	13920	1740	348
+175	4000	14000	1750	350
+176	4050	14080	1760	352
+177	4100	14160	1770	354
+178	4150	14240	1780	356
+179	4200	14320	1790	358
+180	4250	14400	1800	360
+181	4300	14480	1810	362
+182	4350	14560	1820	364
+183	4390	14640	1830	366
+184	4440	14720	1840	368
+185	4490	14800	1850	370
+186	4540	14880	1860	372
+187	4590	14960	1870	374
+188	4640	15040	1880	376
+189	4690	15120	1890	378
+190	4740	15200	1900	380
+191	4790	15280	1910	382
+192	4840	15360	1920	384
+193	4890	15440	1930	386
+194	4940	15520	1940	388
+195	4990	15600	1950	390
+196	5040	15680	1960	392
+197	5090	15760	1970	394
+198	5140	15840	1980	396
+199	5190	15920	1990	398
+200	5240	16000	2000	400
+201	5290	16080	2010	402
+202	5340	16160	2020	404
+203	5390	16240	2030	406
+204	5440	16320	2040	408
+205	5490	16400	2050	410
+206	5540	16480	2060	412
+207	5590	16560	2070	414
+208	5640	16640	2080	416
+209	5690	16720	2090	418
+210	5760	16800	2100	420
+211	5810	16880	2110	422
+212	5860	16960	2120	424
+213	5910	17040	2130	426
+214	5960	17120	2140	428
+215	6010	17200	2150	430
+216	6060	17280	2160	432
+217	6110	17360	2170	434
+218	6160	17440	2180	436
+219	6210	17520	2190	438
+220	6260	17600	2200	440
+221	6310	17680	2210	442
+222	6360	17760	2220	444
+223	6410	17840	2230	446
+224	6460	17920	2240	448
+225	6510	18000	2250	450
+226	6560	18080	2260	452
+227	6610	18160	2270	454
+228	6660	18240	2280	456
+229	6710	18320	2290	458
+230	6760	18400	2300	460
+231	6810	18480	2310	462
+232	6860	18560	2320	464
+233	6910	18640	2330	466
+234	6960	18720	2340	468
+235	7010	18800	2350	470
+236	5190	18880	2360	472
+237	5250	18960	2370	474
+238	5310	19040	2380	476
+239	5370	19120	2390	478
+240	5430	19200	2400	480
+241	5490	19280	2410	482
+242	5550	19360	2420	484
+243	5610	19440	2430	486
+244	5670	19520	2440	488
+245	5730	19600	2450	490
+246	5790	19680	2460	492
+247	5850	19760	2470	494
+248	5910	19840	2480	496
+249	5970	19920	2490	498
+250	6030	20000	2500	500
+251	6090	20080	2510	502
+252	6150	20160	2520	504
+253	6210	20240	2530	506
+254	6270	20320	2540	508
+255	6330	20400	2550	510
+256	6390	20480	2560	512
+257	6450	20560	2570	514
+258	6510	20640	2580	516
+259	6570	20720	2590	518
+260	6630	20800	2600	520
+261	6690	20880	2610	522
+262	6750	20960	2620	524
+263	6810	21040	2630	526
+264	6870	21120	2640	528
+265	6930	21200	2650	530
+266	6990	21280	2660	532
+267	7050	21360	2670	534
+268	7110	21440	2680	536
+269	7170	21520	2690	538
+270	6360	21600	2700	540
+271	6420	21680	2710	542
+272	6480	21760	2720	544
+273	6540	21840	2730	546
+274	6600	21920	2740	548
+275	6660	22000	2750	550
+276	6720	22080	2760	552
+277	6780	22160	2770	554
+278	6840	22240	2780	556
+279	6900	22320	2790	558
+280	6960	22400	2800	560
+281	7020	22480	2810	562
+282	7080	22560	2820	564
+283	7140	22640	2830	566
+284	7200	22720	2840	568
+285	7260	22800	2850	570
+286	7320	22880	2860	572
+287	7380	22960	2870	574
+288	7440	23040	2880	576
+289	7500	23120	2890	578
+290	7560	23200	2900	580
+291	7620	23280	2910	582
+292	7680	23360	2920	584
+293	7740	23440	2930	586
+294	7800	23520	2940	588
+295	7860	23600	2950	590
+296	7920	23680	2960	592
+297	7980	23760	2970	594
+298	8040	23840	2980	596
+299	8100	23920	2990	598
+300	8160	24000	3000	600
+301	8220	24080	3010	602
+302	8280	24160	3020	604
+303	8340	24240	3030	606
+304	8130	24320	3040	608
+305	8190	24400	3050	610
+306	8250	24480	3060	612
+307	8310	24560	3070	614
+308	8370	24640	3080	616
+309	8430	24720	3090	618
+310	8490	24800	3100	620
+311	8550	24880	3110	622
+312	8610	24960	3120	624
+313	8670	25040	3130	626
+314	8730	25120	3140	628
+315	8790	25200	3150	630
+316	8850	25280	3160	632
+317	8910	25360	3170	634
+318	8970	25440	3180	636
+319	9030	25520	3190	638
+320	9090	25600	3200	640
+321	9150	25680	3210	642
+322	9210	25760	3220	644
+323	9270	25840	3230	646
+324	9330	25920	3240	648
+325	9390	26000	3250	650
+326	9450	26080	3260	652
+327	9510	26160	3270	654
+328	9570	26240	3280	656
+329	9630	26320	3290	658
+330	9690	26400	3300	660
+331	9750	26480	3310	662
+332	9810	26560	3320	664
+333	9870	26640	3330	666
+334	9930	26720	3340	668
+335	9990	26800	3350	670
+336	8640	26880	3360	672
+337	8710	26960	3370	674
+338	8780	27040	3380	676
+339	8850	27120	3390	678
+340	8920	27200	3400	680
+341	8990	27280	3410	682
+342	9060	27360	3420	684
+343	9130	27440	3430	686
+344	9200	27520	3440	688
+345	9270	27600	3450	690
+346	9340	27680	3460	692
+347	9410	27760	3470	694
+348	9480	27840	3480	696
+349	9550	27920	3490	698
+350	9620	28000	3500	700
+351	9690	28080	3510	702
+352	9760	28160	3520	704
+353	9830	28240	3530	706
+354	9900	28320	3540	708
+355	9970	28400	3550	710
+356	10040	28480	3560	712
+357	10110	28560	3570	714
+358	10180	28640	3580	716
+359	10250	28720	3590	718
+360	10320	28800	3600	720
+361	10390	28880	3610	722
+362	10460	28960	3620	724
+363	10530	29040	3630	726
+364	10600	29120	3640	728
+365	10670	29200	3650	730
+366	10740	29280	3660	732
+367	10810	29360	3670	734
+368	10880	29440	3680	736
+369	10950	29520	3690	738
+370	11020	29600	3700	740
+371	11090	29680	3710	742
+372	11160	29760	3720	744
+373	11230	29840	3730	746
+374	11300	29920	3740	748
+375	11370	30000	3750	750
+376	10640	30080	3760	752
+377	10710	30160	3770	754
+378	10780	30240	3780	756
+379	10850	30320	3790	758
+380	10920	30400	3800	760
+381	10990	30480	3810	762
+382	11060	30560	3820	764
+383	11130	30640	3830	766
+384	11200	30720	3840	768
+385	11270	30800	3850	770
+386	11340	30880	3860	772
+387	11410	30960	3870	774
+388	11480	31040	3880	776
+389	11550	31120	3890	778
+390	11620	31200	3900	780
+391	11690	31280	3910	782
+392	11760	31360	3920	784
+393	11830	31440	3930	786
+394	11900	31520	3940	788
+395	11970	31600	3950	790
+396	12040	31680	3960	792
+397	12110	31760	3970	794
+398	12180	31840	3980	796
+399	12250	31920	3990	798
+400	12320	32000	4000	800
+401	12390	32080	4010	802
+402	12460	32160	4020	804
+403	12530	32240	4030	806
+404	12600	32320	4040	808
+405	12670	32400	4050	810
+406	12740	32480	4060	812
+407	12810	32560	4070	814
+408	12880	32640	4080	816
+409	12950	32720	4090	818
+410	13020	32800	4100	820
+411	13090	32880	4110	822
+412	13160	32960	4120	824
+413	13230	33040	4130	826
+414	13300	33120	4140	828
+415	13370	33200	4150	830
+416	12640	33280	4160	832
+417	12710	33360	4170	834
+418	12780	33440	4180	836
+419	12850	33520	4190	838
+420	12920	33600	4200	840
+421	12990	33680	4210	842
+422	13060	33760	4220	844
+423	13130	33840	4230	846
+424	13200	33920	4240	848
+425	13270	34000	4250	850
+426	13340	34080	4260	852
+427	13410	34160	4270	854
+428	13480	34240	4280	856
+429	13550	34320	4290	858
+430	13620	34400	4300	860
+431	13690	34480	4310	862
+432	13760	34560	4320	864
+433	13830	34640	4330	866
+434	13900	34720	4340	868
+435	13970	34800	4350	870
+436	14040	34880	4360	872
+437	14110	34960	4370	874
+438	14180	35040	4380	876
+439	14250	35120	4390	878
+440	14320	35200	4400	880
+441	14390	35280	4410	882
+442	14460	35360	4420	884
+443	14530	35440	4430	886
+444	14600	35520	4440	888
+445	14670	35600	4450	890
+446	14740	35680	4460	892
+447	14810	35760	4470	894
+448	14880	35840	4480	896
+449	14950	35920	4490	898
+450	15020	36000	4500	900
+451	15090	36080	4510	902
+452	15160	36160	4520	904
+453	15230	36240	4530	906
+454	15300	36320	4540	908
+455	15370	36400	4550	910
+456	14970	36480	4560	912
+457	15050	36560	4570	914
+458	15130	36640	4580	916
+459	15210	36720	4590	918
+460	15290	36800	4600	920
+461	15370	36880	4610	922
+462	15450	36960	4620	924
+463	15530	37040	4630	926
+464	15610	37120	4640	928
+465	15690	37200	4650	930
+466	15770	37280	4660	932
+467	15850	37360	4670	934
+468	15930	37440	4680	936
+469	16010	37520	4690	938
+470	16090	37600	4700	940
+471	16170	37680	4710	942
+472	16250	37760	4720	944
+473	16330	37840	4730	946
+474	16410	37920	4740	948
+475	16490	38000	4750	950
+476	16570	38080	4760	952
+477	16650	38160	4770	954
+478	16730	38240	4780	956
+479	16810	38320	4790	958
+480	16890	38400	4800	960
+481	16970	38480	4810	962
+482	17050	38560	4820	964
+483	17130	38640	4830	966
+484	17210	38720	4840	968
+485	17290	38800	4850	970
+486	17370	38880	4860	972
+487	17450	38960	4870	974
+488	17530	39040	4880	976
+489	17610	39120	4890	978
+490	17690	39200	4900	980
+491	17770	39280	4910	982
+492	17850	39360	4920	984
+493	17930	39440	4930	986
+494	18010	39520	4940	988
+495	18090	39600	4950	990
+496	18170	39680	4960	992
+497	18250	39760	4970	994
+498	18330	39840	4980	996
+499	18410	39920	4990	998
+500	18490	40000	5000	1000
+501	18570	40080	5010	1002
+502	18650	40160	5020	1004
+503	17730	40240	5030	1006
+504	17810	40320	5040	1008
+505	17890	40400	5050	1010
+506	17970	40480	5060	1012
+507	18050	40560	5070	1014
+508	18130	40640	5080	1016
+509	18210	40720	5090	1018
+510	18290	40800	5100	1020
+511	18370	40880	5110	1022
+512	18450	40960	5120	1024
+513	18530	41040	5130	1026
+514	18610	41120	5140	1028
+515	18690	41200	5150	1030
+516	18770	41280	5160	1032
+517	18850	41360	5170	1034
+518	18930	41440	5180	1036
+519	19010	41520	5190	1038
+520	19090	41600	5200	1040
+521	19170	41680	5210	1042
+522	19250	41760	5220	1044
+523	19330	41840	5230	1046
+524	19410	41920	5240	1048
+525	19490	42000	5250	1050
+526	19570	42080	5260	1052
+527	19650	42160	5270	1054
+528	19730	42240	5280	1056
+529	19810	42320	5290	1058
+530	19890	42400	5300	1060
+531	19970	42480	5310	1062
+532	20050	42560	5320	1064
+533	20130	42640	5330	1066
+534	20210	42720	5340	1068
+535	20290	42800	5350	1070
+536	20370	42880	5360	1072
+537	20450	42960	5370	1074
+538	20530	43040	5380	1076
+539	20610	43120	5390	1078
+540	20690	43200	5400	1080
+541	20770	43280	5410	1082
+542	20850	43360	5420	1084
+543	20930	43440	5430	1086
+544	21010	43520	5440	1088
+545	21090	43600	5450	1090
+546	21170	43680	5460	1092
+547	21250	43760	5470	1094
+548	21330	43840	5480	1096
+549	21410	43920	5490	1098
+550	20320	44000	5500	1100
+551	20400	44080	5510	1102
+552	20480	44160	5520	1104
+553	20560	44240	5530	1106
+554	20640	44320	5540	1108
+555	20720	44400	5550	1110
+556	20800	44480	5560	1112
+557	20880	44560	5570	1114
+558	20960	44640	5580	1116
+559	21040	44720	5590	1118
+560	21120	44800	5600	1120
+561	21200	44880	5610	1122
+562	21280	44960	5620	1124
+563	21360	45040	5630	1126
+564	21440	45120	5640	1128
+565	21520	45200	5650	1130
+566	21600	45280	5660	1132
+567	21680	45360	5670	1134
+568	21760	45440	5680	1136
+569	21840	45520	5690	1138
+570	21920	45600	5700	1140
+571	22000	45680	5710	1142
+572	22080	45760	5720	1144
+573	22160	45840	5730	1146
+574	22240	45920	5740	1148
+575	22320	46000	5750	1150
+576	22400	46080	5760	1152
+577	22480	46160	5770	1154
+578	22560	46240	5780	1156
+579	22640	46320	5790	1158
+580	22720	46400	5800	1160
+581	22800	46480	5810	1162
+582	22880	46560	5820	1164
+583	22960	46640	5830	1166
+584	23040	46720	5840	1168
+585	23120	46800	5850	1170
+586	23200	46880	5860	1172
+587	23280	46960	5870	1174
+588	23360	47040	5880	1176
+589	23440	47120	5890	1178
+590	23520	47200	5900	1180
+591	23600	47280	5910	1182
+592	23680	47360	5920	1184
+593	23760	47440	5930	1186
+594	23840	47520	5940	1188
+595	23920	47600	5950	1190
+596	28730	47680	5960	1192
+597	28820	47760	5970	1194
+598	28910	47840	5980	1196
+599	29000	47920	5990	1198
+600	29090	48000	6000	1200
+601	29180	48080	6010	1202
+602	29270	48160	6020	1204
+603	29360	48240	6030	1206
+604	29450	48320	6040	1208
+605	29540	48400	6050	1210
+606	29630	48480	6060	1212
+607	29720	48560	6070	1214
+608	29810	48640	6080	1216
+609	29900	48720	6090	1218
+610	29990	48800	6100	1220
+611	30080	48880	6110	1222
+612	30170	48960	6120	1224
+613	30260	49040	6130	1226
+614	30350	49120	6140	1228
+615	30440	49200	6150	1230
+616	30530	49280	6160	1232
+617	30620	49360	6170	1234
+618	30710	49440	6180	1236
+619	30800	49520	6190	1238
+620	30890	49600	6200	1240
+621	30980	49680	6210	1242
+622	31070	49760	6220	1244
+623	31160	49840	6230	1246
+624	31250	49920	6240	1248
+625	31340	50000	6250	1250
+626	31430	50080	6260	1252
+627	31520	50160	6270	1254
+628	31610	50240	6280	1256
+629	31700	50320	6290	1258
+630	31790	50400	6300	1260
+631	31880	50480	6310	1262
+632	31970	50560	6320	1264
+633	32060	50640	6330	1266
+634	32150	50720	6340	1268
+635	32240	50800	6350	1270
+636	32330	50880	6360	1272
+637	32420	50960	6370	1274
+638	32510	51040	6380	1276
+639	32600	51120	6390	1278
+640	32690	51200	6400	1280
+641	32780	51280	6410	1282
+642	32870	51360	6420	1284
+643	32960	51440	6430	1286
+644	33050	51520	6440	1288
+645	33140	51600	6450	1290
+646	33230	51680	6460	1292
+647	33320	51760	6470	1294
+648	33410	51840	6480	1296
+649	33500	51920	6490	1298
+650	32800	52000	6500	1300
+651	32890	52080	6510	1302
+652	32980	52160	6520	1304
+653	33070	52240	6530	1306
+654	33160	52320	6540	1308
+655	33250	52400	6550	1310
+656	33340	52480	6560	1312
+657	33430	52560	6570	1314
+658	33520	52640	6580	1316
+659	33610	52720	6590	1318
+660	33700	52800	6600	1320
+661	33790	52880	6610	1322
+662	33880	52960	6620	1324
+663	33970	53040	6630	1326
+664	34060	53120	6640	1328
+665	34150	53200	6650	1330
+666	34240	53280	6660	1332
+667	34330	53360	6670	1334
+668	34420	53440	6680	1336
+669	34510	53520	6690	1338
+670	34600	53600	6700	1340
+671	34690	53680	6710	1342
+672	34780	53760	6720	1344
+673	34870	53840	6730	1346
+674	34960	53920	6740	1348
+675	35050	54000	6750	1350
+676	35140	54080	6760	1352
+677	35230	54160	6770	1354
+678	35320	54240	6780	1356
+679	35410	54320	6790	1358
+680	35500	54400	6800	1360
+681	35590	54480	6810	1362
+682	35680	54560	6820	1364
+683	35770	54640	6830	1366
+684	35860	54720	6840	1368
+685	35950	54800	6850	1370
+686	36040	54880	6860	1372
+687	36130	54960	6870	1374
+688	36220	55040	6880	1376
+689	36310	55120	6890	1378
+690	36400	55200	6900	1380
+691	36490	55280	6910	1382
+692	36580	55360	6920	1384
+693	36670	55440	6930	1386
+694	36760	55520	6940	1388
+695	36850	55600	6950	1390
+696	36940	55680	6960	1392
+697	37030	55760	6970	1394
+698	37120	55840	6980	1396
+699	37210	55920	6990	1398
+700	37300	56000	7000	1400
+701	37390	56080	7010	1402
+702	37480	56160	7020	1404
+703	37570	56240	7030	1406
+704	38670	56320	7040	1408
+705	38760	56400	7050	1410
+706	38850	56480	7060	1412
+707	38940	56560	7070	1414
+708	39030	56640	7080	1416
+709	39120	56720	7090	1418
+710	39210	56800	7100	1420
+711	39300	56880	7110	1422
+712	39390	56960	7120	1424
+713	39480	57040	7130	1426
+714	39570	57120	7140	1428
+715	39660	57200	7150	1430
+716	39750	57280	7160	1432
+717	39840	57360	7170	1434
+718	39930	57440	7180	1436
+719	40020	57520	7190	1438
+720	40110	57600	7200	1440
+721	40200	57680	7210	1442
+722	40290	57760	7220	1444
+723	40380	57840	7230	1446
+724	40470	57920	7240	1448
+725	40560	58000	7250	1450
+726	40650	58080	7260	1452
+727	40740	58160	7270	1454
+728	40830	58240	7280	1456
+729	40920	58320	7290	1458
+730	41010	58400	7300	1460
+731	41100	58480	7310	1462
+732	41190	58560	7320	1464
+733	41280	58640	7330	1466
+734	41370	58720	7340	1468
+735	41460	58800	7350	1470
+736	41550	58880	7360	1472
+737	41640	58960	7370	1474
+738	41730	59040	7380	1476
+739	41820	59120	7390	1478
+740	41910	59200	7400	1480
+741	42000	59280	7410	1482
+742	42090	59360	7420	1484
+743	42180	59440	7430	1486
+744	42270	59520	7440	1488
+745	42360	59600	7450	1490
+746	42450	59680	7460	1492
+747	42540	59760	7470	1494
+748	42630	59840	7480	1496
+749	42720	59920	7490	1498
+750	42810	60000	7500	1500
+751	42900	60080	7510	1502
+752	42990	60160	7520	1504
+753	43080	60240	7530	1506
+754	43170	60320	7540	1508
+755	43260	60400	7550	1510
+756	26720	60480	7560	1512
+757	26820	60560	7570	1514
+758	26920	60640	7580	1516
+759	27020	60720	7590	1518
+760	27120	60800	7600	1520
+761	27220	60880	7610	1522
+762	27320	60960	7620	1524
+763	27420	61040	7630	1526
+764	27520	61120	7640	1528
+765	27620	61200	7650	1530
+766	27720	61280	7660	1532
+767	27820	61360	7670	1534
+768	27920	61440	7680	1536
+769	28020	61520	7690	1538
+770	28120	61600	7700	1540
+771	28220	61680	7710	1542
+772	28320	61760	7720	1544
+773	28420	61840	7730	1546
+774	28520	61920	7740	1548
+775	28620	62000	7750	1550
+776	28720	62080	7760	1552
+777	28820	62160	7770	1554
+778	28920	62240	7780	1556
+779	29020	62320	7790	1558
+780	29120	62400	7800	1560
+781	29220	62480	7810	1562
+782	29320	62560	7820	1564
+783	29420	62640	7830	1566
+784	29520	62720	7840	1568
+785	29620	62800	7850	1570
+786	29720	62880	7860	1572
+787	29820	62960	7870	1574
+788	29920	63040	7880	1576
+789	30020	63120	7890	1578
+790	30120	63200	7900	1580
+791	30220	63280	7910	1582
+792	30320	63360	7920	1584
+793	30420	63440	7930	1586
+794	30520	63520	7940	1588
+795	30620	63600	7950	1590
+796	30720	63680	7960	1592
+797	30820	63760	7970	1594
+798	30920	63840	7980	1596
+799	31020	63920	7990	1598
+800	31120	64000	8000	1600
+801	31220	64080	8010	1602
+802	31320	64160	8020	1604
+803	31420	64240	8030	1606
+804	31520	64320	8040	1608
+805	31620	64400	8050	1610
+806	31720	64480	8060	1612
+807	31820	64560	8070	1614
+808	31920	64640	8080	1616
+809	32020	64720	8090	1618
+810	32120	64800	8100	1620
+811	32220	64880	8110	1622
+812	32320	64960	8120	1624
+813	32420	65040	8130	1626
+814	32520	65120	8140	1628
+815	32620	65200	8150	1630
+816	32050	65280	8160	1632
+817	32150	65360	8170	1634
+818	32250	65440	8180	1636
+819	32350	65520	8190	1638
+820	32450	65600	8200	1640
+821	32550	65680	8210	1642
+822	32650	65760	8220	1644
+823	32750	65840	8230	1646
+824	32850	65920	8240	1648
+825	32950	66000	8250	1650
+826	33050	66080	8260	1652
+827	33150	66160	8270	1654
+828	33250	66240	8280	1656
+829	33350	66320	8290	1658
+830	33450	66400	8300	1660
+831	33550	66480	8310	1662
+832	33650	66560	8320	1664
+833	33750	66640	8330	1666
+834	33850	66720	8340	1668
+835	33950	66800	8350	1670
+836	34050	66880	8360	1672
+837	34150	66960	8370	1674
+838	34250	67040	8380	1676
+839	34350	67120	8390	1678
+840	34450	67200	8400	1680
+841	34550	67280	8410	1682
+842	34650	67360	8420	1684
+843	34750	67440	8430	1686
+844	34850	67520	8440	1688
+845	34950	67600	8450	1690
+846	35050	67680	8460	1692
+847	35150	67760	8470	1694
+848	35250	67840	8480	1696
+849	35350	67920	8490	1698
+850	35450	68000	8500	1700
+851	35550	68080	8510	1702
+852	35650	68160	8520	1704
+853	35750	68240	8530	1706
+854	35850	68320	8540	1708
+855	35950	68400	8550	1710
+856	36050	68480	8560	1712
+857	36150	68560	8570	1714
+858	36250	68640	8580	1716
+859	36350	68720	8590	1718
+860	36450	68800	8600	1720
+861	36550	68880	8610	1722
+862	36650	68960	8620	1724
+863	36750	69040	8630	1726
+864	36850	69120	8640	1728
+865	36950	69200	8650	1730
+866	37050	69280	8660	1732
+867	37150	69360	8670	1734
+868	37250	69440	8680	1736
+869	37350	69520	8690	1738
+870	37450	69600	8700	1740
+871	37550	69680	8710	1742
+872	37650	69760	8720	1744
+873	37750	69840	8730	1746
+874	37850	69920	8740	1748
+875	37950	70000	8750	1750
+876	37550	70080	8760	1752
+877	37650	70160	8770	1754
+878	37750	70240	8780	1756
+879	37850	70320	8790	1758
+880	37950	70400	8800	1760
+881	38050	70480	8810	1762
+882	38150	70560	8820	1764
+883	38250	70640	8830	1766
+884	38350	70720	8840	1768
+885	38450	70800	8850	1770
+886	38550	70880	8860	1772
+887	38650	70960	8870	1774
+888	38750	71040	8880	1776
+889	38850	71120	8890	1778
+890	38950	71200	8900	1780
+891	39050	71280	8910	1782
+892	39150	71360	8920	1784
+893	39250	71440	8930	1786
+894	39350	71520	8940	1788
+895	39450	71600	8950	1790
+896	39550	71680	8960	1792
+897	39650	71760	8970	1794
+898	39750	71840	8980	1796
+899	39850	71920	8990	1798
+900	39950	72000	9000	1800
+901	40050	72080	9010	1802
+902	40150	72160	9020	1804
+903	40250	72240	9030	1806
+904	40350	72320	9040	1808
+905	40450	72400	9050	1810
+906	40550	72480	9060	1812
+907	40650	72560	9070	1814
+908	40750	72640	9080	1816
+909	40850	72720	9090	1818
+910	40950	72800	9100	1820
+911	41050	72880	9110	1822
+912	41150	72960	9120	1824
+913	41250	73040	9130	1826
+914	41350	73120	9140	1828
+915	41450	73200	9150	1830
+916	41550	73280	9160	1832
+917	41650	73360	9170	1834
+918	41750	73440	9180	1836
+919	41850	73520	9190	1838
+920	41950	73600	9200	1840
+921	42050	73680	9210	1842
+922	42150	73760	9220	1844
+923	42250	73840	9230	1846
+924	42350	73920	9240	1848
+925	42450	74000	9250	1850
+926	42550	74080	9260	1852
+927	42650	74160	9270	1854
+928	42750	74240	9280	1856
+929	42850	74320	9290	1858
+930	42950	74400	9300	1860
+931	43050	74480	9310	1862
+932	43150	74560	9320	1864
+933	43250	74640	9330	1866
+934	43350	74720	9340	1868
+935	43450	74800	9350	1870
+936	25280	74880	9360	1872
+937	25365	74960	9370	1874
+938	25450	75040	9380	1876
+939	25535	75120	9390	1878
+940	25620	75200	9400	1880
+941	25705	75280	9410	1882
+942	25790	75360	9420	1884
+943	25875	75440	9430	1886
+944	25960	75520	9440	1888
+945	26045	75600	9450	1890
+946	26130	75680	9460	1892
+947	26215	75760	9470	1894
+948	26300	75840	9480	1896
+949	26385	75920	9490	1898
+950	26470	76000	9500	1900
+951	26555	76080	9510	1902
+952	26640	76160	9520	1904
+953	26725	76240	9530	1906
+954	26810	76320	9540	1908
+955	26895	76400	9550	1910
+956	26980	76480	9560	1912
+957	27065	76560	9570	1914
+958	27150	76640	9580	1916
+959	27235	76720	9590	1918
+960	27320	76800	9600	1920
+961	27405	76880	9610	1922
+962	27490	76960	9620	1924
+963	27575	77040	9630	1926
+964	27660	77120	9640	1928
+965	27745	77200	9650	1930
+966	27830	77280	9660	1932
+967	27915	77360	9670	1934
+968	28000	77440	9680	1936
+969	28085	77520	9690	1938
+970	28170	77600	9700	1940
+971	28255	77680	9710	1942
+972	28340	77760	9720	1944
+973	28425	77840	9730	1946
+974	28510	77920	9740	1948
+975	28595	78000	9750	1950
+976	28680	78080	9760	1952
+977	28765	78160	9770	1954
+978	28850	78240	9780	1956
+979	28935	78320	9790	1958
+980	29020	78400	9800	1960
+981	29105	78480	9810	1962
+982	29190	78560	9820	1964
+983	29275	78640	9830	1966
+984	29360	78720	9840	1968
+985	29445	78800	9850	1970
+986	29530	78880	9860	1972
+987	29615	78960	9870	1974
+988	29700	79040	9880	1976
+989	29785	79120	9890	1978
+990	29870	79200	9900	1980
+991	29955	79280	9910	1982
+992	30040	79360	9920	1984
+993	30125	79440	9930	1986
+994	30210	79520	9940	1988
+995	30295	79600	9950	1990
+996	30380	79680	9960	1992
+997	30465	79760	9970	1994
+998	30550	79840	9980	1996
+999	30635	79920	9990	1998
+1000	0	80000	10000	2000
diff --git a/Config/PlayerProperty.txt b/Config/PlayerProperty.txt
index 63302dd..056a0aa 100644
--- a/Config/PlayerProperty.txt
+++ b/Config/PlayerProperty.txt
@@ -24,6 +24,8 @@
 30	鎶楁牸鎸�	鎶楁牸鎸�	1	2	3	10	鍑忓皯琚鏂规牸鎸℃鐜�	ParryRateDef
 31	鍚歌	鍚歌	1	2	2	11	閫犳垚浼ゅ鏃舵寜鍚歌姣旂巼鍥炲鐢熷懡	SuckHPPer
 32	鎶楀惛琛�	鎶楀惛琛�	1	2	3	12	鍑忓皯琚鏂瑰惛琛�鐧惧垎姣�	SuckHPPerDef
+33	鏆村嚮浼ゅ	鏆村嚮浼ゅ	1	2	2	13	澧炲姞鏆村嚮鏃堕�犳垚鐨勪激瀹崇櫨鍒嗘瘮	SuperHitHurtRate
+34	鎶楁毚浼�	鎶楁毚浼�	1	2	3	14	鍑忓皯鏆村嚮鏃堕�犳垚鐨勪激瀹崇櫨鍒嗘瘮	SuperHitHurtRateDef
 35	鏈�缁堝浼�	鏈�缁堝浼�	1	2	4	1	鎻愰珮鏈�缁堥�犳垚鐨勪激瀹�	FinalDamPer
 36	鏈�缁堝噺浼�	鏈�缁堝噺浼�	1	2	4	2	鍑忓厤鏈�缁堝彈鍒扮殑浼ゅ	FinalDamPerDef
 37	鐗╃悊澧炰激	鐗╃悊澧炰激	1	2	4	3	鎻愰珮鏈�缁堥�犳垚鐨勭墿鐞嗕激瀹�	PhyDamPer
@@ -42,3 +44,11 @@
 54	寮卞寲鎶ょ浘	寮卞寲鎶ょ浘	1	2	4	16	寮卞寲瀵规柟鑾峰緱鎶ょ浘鏃剁殑寮哄害	ShieldPerDef
 55	鎸佺画澧炰激	鎸佺画澧炰激	1	2	4	17	鎻愰珮鏈�缁堥�犳垚鐨勬寔缁激瀹�(涓瘨銆佺噧鐑с�佹祦琛�)	DOTPer
 56	鎸佺画鍑忎激	鎸佺画鍑忎激	1	2	4	18	鍑忓厤鏈�缁堝彈鍒扮殑鎸佺画浼ゅ(涓瘨銆佺噧鐑с�佹祦琛�)	DOTPerDef
+57	瀵归瓘澧炰激	瀵归瓘澧炰激	1	2	4	19	鎻愰珮瀵归瓘闃佃惀姝﹀皢閫犳垚鐨勪激瀹�	WeiFinalDamPer
+58	瀵归瓘鍑忎激	瀵归瓘鍑忎激	1	2	4	20	鍑忓厤鍙楀埌榄忛樀钀ユ灏嗛�犳垚鐨勪激瀹�	WeiFinalDamPerDef
+59	瀵硅渶澧炰激	瀵硅渶澧炰激	1	2	4	21	鎻愰珮瀵硅渶闃佃惀姝﹀皢閫犳垚鐨勪激瀹�	ShuFinalDamPer
+60	瀵硅渶鍑忎激	瀵硅渶鍑忎激	1	2	4	22	鍑忓厤鍙楀埌铚�闃佃惀姝﹀皢閫犳垚鐨勪激瀹�	ShuFinalDamPerDef
+61	瀵瑰惔澧炰激	瀵瑰惔澧炰激	1	2	4	23	鎻愰珮瀵瑰惔闃佃惀姝﹀皢閫犳垚鐨勪激瀹�	WuFinalDamPer
+62	瀵瑰惔鍑忎激	瀵瑰惔鍑忎激	1	2	4	24	鍑忓厤鍙楀埌鍚撮樀钀ユ灏嗛�犳垚鐨勪激瀹�	WuFinalDamPerDef
+63	瀵圭兢澧炰激	瀵圭兢澧炰激	1	2	4	25	鎻愰珮瀵圭兢闃佃惀姝﹀皢閫犳垚鐨勪激瀹�	QunFinalDamPer
+64	瀵圭兢鍑忎激	瀵圭兢鍑忎激	1	2	4	26	鍑忓厤鍙楀埌缇ら樀钀ユ灏嗛�犳垚鐨勪激瀹�	QunFinalDamPerDef
diff --git a/Config/Skill.txt b/Config/Skill.txt
index 0a97c87..8cc82d0 100644
--- a/Config/Skill.txt
+++ b/Config/Skill.txt
@@ -1,23 +1,23 @@
-int	int	int	string	string	int	int	int	int	int	int	int	int	int	int	int	int	int	int[]	int	int[]	int	int[]	int	int[]	int	int	int[]	int	int	int	int	float	int[][]	int	int	int	int	int	int	string	int	int	int	string	int
-SkillID	SkillTypeID	SkillMaxLV	SkillName	Description	FuncType	SkillType	HurtType	AtkType	TagAim	TagFriendly	TagAffect	TagCount	HappenRate	LastTime	CoolDownTime	Priority	EffectID1	EffectValues1	EffectID2	EffectValues2	EffectID3	EffectValues3	ConnSkill	EnhanceSkillList	FightPower	StartupFrames	ActiveFrames	RecoveryFrames	LoopCount	CastPosition	CastIndexNum	CastDistance	DamageDivide	BulletEffectId	BulletPos	BulletPath	BulletFlyTime	ExplosionEffectId	ExplosionPos	SkillMotionName	EffectId	EffectPos	EffectType	IconName	ExplosionEffect2
-鎶�鑳絀D	鎶�鑳絋ypeID	鏈�楂樼瓑绾�	鎶�鑳藉悕绉�	鎶�鑳芥弿杩�	鎸夊姛鑳藉垎绫�	鎶�鑳界被鍨�	浼ゅ绫诲瀷	閲婃斁鏂瑰紡	鐩爣鑼冨洿	鐩爣鍙嬪ソ	鐩爣缁嗗垎	鐩爣涓暟	姒傜巼	鎸佺画鏃堕棿	鍐峰嵈鏃堕棿	浼樺厛绾�	鏁堟灉ID1	鏁堟灉鍊煎垪琛�1	鏁堟灉ID2	鏁堟灉鍊煎垪琛�2	鏁堟灉ID3	鏁堟灉鍊煎垪琛�3	鍏宠仈鎶�鑳�	棰濆鎶�鑳絀D鍒楄〃	鎶�鑳芥垬鍔�	鍓嶆憞甯ф暟	涓憞甯ф暟	鍚庢憞甯ф暟	涓憞閲嶅娆℃暟	鏂芥硶浣嶇疆	CastPosition鏁屾垜鐨勬墿灞�	鏂芥硶璺濈	浼ゅ鍒嗗竷	瀛愬脊鐗规晥id	瀛愬脊缁戠偣	瀛愬脊杞ㄨ抗	瀛愬脊椋炶鏃堕棿	鐖嗙偢鐗规晥id	鐖嗙偢缁戠偣	鎶�鑳藉姩浣滃悕	鏂芥硶鐗规晥	鏂芥硶鐗规晥缁戠偣	鏂芥硶鐗规晥鐨勭被鍨�	鎶�鑳藉浘鏍�	鐖嗙偢鐗规晥2
-100	100	1	閫氱敤鍙嶅嚮	閫犳垚鏀诲嚮鍔�100%鐗╃悊浼ゅ	4	1	1	1	0	0	0	1	10000	0	0	0	1010	10000	0		0		0		0																				
-200	200	1	鐪╂檿	閫氱敤鐪╂檿1鍥炲悎	0	14	0	0	6	0	0	0	10000	1	0	0	4012	7																											
-100101	100101	1	鏇瑰┐鏅妧	瀵硅閲忔渶浣庣殑鐩爣閫犳垚鏀诲嚮鍔�100%鐗╃悊浼ゅ	1	1	1	1	0	0	1	1	10000	0	0	0	1010	10000	0		0		0		0																				
-100102	100102	1	鏇瑰┐鎬掓妧	瀵圭旱鎺�2涓洰鏍囬�犳垚鏀诲嚮鍔�210%鐨勭墿鐞嗕激瀹�	2	1	1	1	4	0	0	2	10000	0	0	0	1010	21000	0		0		0		0																				
-100301	100301	1	搴炲痉鏅妧	瀵瑰崟浣撶洰鏍囬�犳垚105%鐗╃悊浼ゅ	1	1	1	1	1	0	0	1	10000	0	0	0	1010	10500	0		0		0		0																				
-100302	100302	1	搴炲痉鎬掓妧	瀵瑰墠鎺�3涓洰鏍囬�犳垚鏀诲嚮鍔�150%鐗╃悊浼ゅ锛�50%姒傜巼闄勫姞鍗哥敳锛岄檷浣庣洰鏍�50%闃插尽锛屾寔缁�2鍥炲悎	2	1	1	1	2	0	0	3	10000	0	0	0	1010	15000	0		0		0	1003021	0																				
-1003021	1003021	1	鍗哥敳	闄嶄綆闃插尽50%锛屾寔缁�2鍥炲悎	0	6	0	0	6	0	0	0	5000	2	0	0	17	5000|2			0		0		0																				
-200101	200101	1	绯滅鏅妧	瀵瑰崟浣撶洰鏍囬�犳垚鏀诲嚮鍔�105%鐨勭墿鐞嗕激瀹�	1	1	1	1	1	0	0	1	10000	0	0	0	1010	10500	0		0		0		0																				
-200102	200102	1	绯滅鎬掓妧	娌荤枟琛�閲忔渶浣�2涓洰鏍囨敾鍑诲姏210%鐢熷懡鍊�	2	2	1	2	0	1	1	2	10000	0	0	0	1000	21000|0	0		0		0		0																				
-300101	300101	1	娼樼拫鏅妧	瀵圭洰鏍囬�犳垚70%浼ゅ锛�50%姒傜巼闄勫甫鐏肩儳锛屾瘡鍥炲悎閫犳垚鏀诲嚮鍔�75%浼ゅ锛屾寔缁�2鍥炲悎	1	1	1	1	1	0	0	1	10000	0	0	0	1010	7000	0		0		0	3001011	0																				
-3001011	3001011	1	鐏肩儳	姣忓洖鍚堥�犳垚鏀诲嚮鍔�75%鐏肩儳浼ゅ锛屾寔缁�2鍥炲悎	0	4	1	0	6	0	0	0	10000	2	0	0	1034	7500	5001	0	4012	13	0		0																				
-300102	300102	1	娼樼拫鎬掓妧	瀵圭洰鏍囬�犳垚浼�300%浼ゅ锛岄澶栬幏寰�10鐐规�掓皵	2	1	1	1	1	0	0	1	10000	0	0	0	1010	30000	0		0		0	3001021	0																				
-3001021	3001021	1	棰濆鎬掓皵	棰濆鑾峰緱10鐐规�掓皵	0	0	0	6	5	0	0	0	10000	0	0	0	1001	0|10|1	0		0		0		0																				
-400101	400101	1	绾伒鏅妧	瀵瑰崟浣撶洰鏍囬�犳垚鏀诲嚮鍔�120%鐗╃悊浼ゅ锛屾櫘鏀诲嚮鏅曟鐜囨彁鍗�10%	1	1	1	1	1	0	0	1	10000	0	0	0	1010	12000	0		0		0		0																				
-400102	400102	1	绾伒鎬掓妧	瀵瑰墠鎺掔洰鏍囬�犳垚鏀诲嚮鍔�130%鐗╃悊浼ゅ锛�20%姒傜巼閫犳垚鍑绘檿	2	1	1	1	2	0	0	0	10000	0	0	0	1010	13000	0		0		0	4001021	0																				
-4001021	4001021	1	棰濆鍑绘檿	20%姒傜巼閫犳垚鍑绘檿	0	14	0	0	6	0	0	0	2000	1	0	0	4012	7			0		0		0																				
-400201	400201	1	閮睖鏅妧	瀵瑰悗鎺掗殢鏈虹洰鏍囬�犳垚鏀诲嚮鍔�100%娉曟湳浼ゅ	1	1	2	1	3	0	0	1	10000	0	0	0	1010	10000	0		0		0		0																				
-400202	400202	1	閮睖鎬掓妧	瀵瑰悗鎺�2涓洰鏍囬�犳垚鏀诲嚮鍔�220%娉曟湳浼ゅ	2	1	2	1	3	0	0	2	10000	0	0	0	1010	22000	0		0		0		0																				
-100061	100061	1	鏇硅蕉鏅敾	瀵规晫鏂瑰悗鎺�1涓洰鏍囬�犳垚鏀诲嚮鍔�100%鐨勭墿鐞嗕激瀹筹紝鏀诲嚮鍐板喕鐩爣鏃讹紝杩炲嚮姒傜巼+30%	1	1	2	1	3	0	0	1	10000	0	0	0	1010	1000	0		0		0		0	8	[1]	11	0	8		9999	10000	100002	0,0	1	0.5	100003		attack					
-100062	100062	1	鏇硅蕉鎬掓皵	瀵规晫鏂瑰悗鎺�3鐩爣閫犳垚鏀诲嚮鍔�185%浼ゅ锛岃嫢鐩爣澶勪簬鍐板喕涓紝鏈浼ゅ鎻愬崌50%	2	1	2	1	3	0	0	3	10000	0	0	0	1010	18500	0		0		0		0	15	[1]	16	0	8		9999	18500		0,0	5	0.5	100004		angerSkill	100001				100005
+int	int	int	string	string	int	int	int	int	int	int	int	int	int	int	int	int	int	int[]	int	int[]	int	int[]	int	int[]	int	int	int	int	int	int	int	float	int[][]	int	int	int	int	int	int	string	int	int	int	string
+SkillID	SkillTypeID	SkillMaxLV	SkillName	Description	FuncType	SkillType	HurtType	AtkType	TagAim	TagFriendly	TagAffect	TagCount	HappenRate	LastTime	CoolDownTime	Priority	EffectID1	EffectValues1	EffectID2	EffectValues2	EffectID3	EffectValues3	ConnSkill	EnhanceSkillList	FightPower	StartupFrames	ActiveFrames	RecoveryFrames	LoopCount	CastPosition	CastIndexNum	CastDistance	DamageDivide	BulletEffectId	BulletPos	BulletPath	BulletFlyTime	ExplosionEffectId	ExplosionPos	SkillMotionName	EffectId	EffectPos	EffectType	IconName
+鎶�鑳絀D	鎶�鑳絋ypeID	鏈�楂樼瓑绾�	鎶�鑳藉悕绉�	鎶�鑳芥弿杩�	鎸夊姛鑳藉垎绫�	鎶�鑳界被鍨�	浼ゅ绫诲瀷	閲婃斁鏂瑰紡	鐩爣鑼冨洿	鐩爣鍙嬪ソ	鐩爣缁嗗垎	鐩爣涓暟	姒傜巼	鎸佺画鏃堕棿	鍐峰嵈鏃堕棿	浼樺厛绾�	鏁堟灉ID1	鏁堟灉鍊煎垪琛�1	鏁堟灉ID2	鏁堟灉鍊煎垪琛�2	鏁堟灉ID3	鏁堟灉鍊煎垪琛�3	鍏宠仈鎶�鑳�	棰濆鎶�鑳絀D鍒楄〃	鎶�鑳芥垬鍔�	鍓嶆憞甯ф暟	涓憞甯ф暟	鍚庢憞甯ф暟	涓憞閲嶅娆℃暟	鏂芥硶浣嶇疆	CastPosition鏁屾垜鐨勬墿灞�	鏂芥硶璺濈	浼ゅ鍒嗗竷	瀛愬脊鐗规晥id	瀛愬脊缁戠偣	瀛愬脊杞ㄨ抗	瀛愬脊椋炶鏃堕棿	鐖嗙偢鐗规晥id	鐖嗙偢缁戠偣	鎶�鑳藉姩浣滃悕	鏂芥硶鐗规晥	鏂芥硶鐗规晥缁戠偣	鏂芥硶鐗规晥鐨勭被鍨�	鎶�鑳藉浘鏍�
+100	100	1	閫氱敤鍙嶅嚮	閫犳垚鏀诲嚮鍔�100%鐗╃悊浼ゅ	4	1	1	1	0	0	0	1	10000	0	0	0	1010	10000	0		0		0		0																			
+200	200	1	鐪╂檿	閫氱敤鐪╂檿1鍥炲悎	0	14	0	0	6	0	0	0	10000	1	0	0	4012	7																										
+100101	100101	1	鏇瑰┐鏅妧	瀵硅閲忔渶浣庣殑鐩爣閫犳垚鏀诲嚮鍔�100%鐗╃悊浼ゅ	1	1	1	1	0	0	1	1	10000	0	0	0	1010	10000	0		0		0		0																			
+100102	100102	1	鏇瑰┐鎬掓妧	瀵圭旱鎺�2涓洰鏍囬�犳垚鏀诲嚮鍔�210%鐨勭墿鐞嗕激瀹�	2	1	1	1	4	0	0	2	10000	0	0	0	1010	21000	0		0		0		0																			
+100301	100301	1	搴炲痉鏅妧	瀵瑰崟浣撶洰鏍囬�犳垚105%鐗╃悊浼ゅ	1	1	1	1	1	0	0	1	10000	0	0	0	1010	10500	0		0		0		0																			
+100302	100302	1	搴炲痉鎬掓妧	瀵瑰墠鎺�3涓洰鏍囬�犳垚鏀诲嚮鍔�150%鐗╃悊浼ゅ锛�50%姒傜巼闄勫姞鍗哥敳锛岄檷浣庣洰鏍�50%闃插尽锛屾寔缁�2鍥炲悎	2	1	1	1	2	0	0	3	10000	0	0	0	1010	15000	0		0		0	1003021	0																			
+1003021	1003021	1	鍗哥敳	闄嶄綆闃插尽50%锛屾寔缁�2鍥炲悎	0	6	0	0	6	0	0	0	5000	2	0	0	17	5000|2			0		0		0																			
+200101	200101	1	绯滅鏅妧	瀵瑰崟浣撶洰鏍囬�犳垚鏀诲嚮鍔�105%鐨勭墿鐞嗕激瀹�	1	1	1	1	1	0	0	1	10000	0	0	0	1010	10500	0		0		0		0																			
+200102	200102	1	绯滅鎬掓妧	娌荤枟琛�閲忔渶浣�2涓洰鏍囨敾鍑诲姏210%鐢熷懡鍊�	2	2	1	2	0	1	1	2	10000	0	0	0	1000	21000|0	0		0		0		0																			
+300101	300101	1	娼樼拫鏅妧	瀵圭洰鏍囬�犳垚70%浼ゅ锛�50%姒傜巼闄勫甫鐏肩儳锛屾瘡鍥炲悎閫犳垚鏀诲嚮鍔�75%浼ゅ锛屾寔缁�2鍥炲悎	1	1	1	1	1	0	0	1	10000	0	0	0	1010	7000	0		0		0	3001011	0																			
+3001011	3001011	1	鐏肩儳	姣忓洖鍚堥�犳垚鏀诲嚮鍔�75%鐏肩儳浼ゅ锛屾寔缁�2鍥炲悎	0	4	1	0	6	0	0	0	10000	2	0	0	1034	7500	5001	0	4012	13	0		0																			
+300102	300102	1	娼樼拫鎬掓妧	瀵圭洰鏍囬�犳垚浼�300%浼ゅ锛岄澶栬幏寰�10鐐规�掓皵	2	1	1	1	1	0	0	1	10000	0	0	0	1010	30000	0		0		0	3001021	0																			
+3001021	3001021	1	棰濆鎬掓皵	棰濆鑾峰緱10鐐规�掓皵	0	0	0	6	5	0	0	0	10000	0	0	0	1001	0|10|1	0		0		0		0																			
+400101	400101	1	绾伒鏅妧	瀵瑰崟浣撶洰鏍囬�犳垚鏀诲嚮鍔�120%鐗╃悊浼ゅ锛屾櫘鏀诲嚮鏅曟鐜囨彁鍗�10%	1	1	1	1	1	0	0	1	10000	0	0	0	1010	12000	0		0		0		0																			
+400102	400102	1	绾伒鎬掓妧	瀵瑰墠鎺掔洰鏍囬�犳垚鏀诲嚮鍔�130%鐗╃悊浼ゅ锛�20%姒傜巼閫犳垚鍑绘檿	2	1	1	1	2	0	0	0	10000	0	0	0	1010	13000	0		0		0	4001021	0																			
+4001021	4001021	1	棰濆鍑绘檿	20%姒傜巼閫犳垚鍑绘檿	0	14	0	0	6	0	0	0	2000	1	0	0	4012	7			0		0		0																			
+400201	400201	1	閮睖鏅妧	瀵瑰悗鎺掗殢鏈虹洰鏍囬�犳垚鏀诲嚮鍔�100%娉曟湳浼ゅ	1	1	2	1	3	0	0	1	10000	0	0	0	1010	10000	0		0		0		0																			
+400202	400202	1	閮睖鎬掓妧	瀵瑰悗鎺�2涓洰鏍囬�犳垚鏀诲嚮鍔�220%娉曟湳浼ゅ	2	1	2	1	3	0	0	2	10000	0	0	0	1010	22000	0		0		0		0																			
+100061	100061	1	鏇硅蕉鏅敾	瀵规晫鏂瑰悗鎺�1涓洰鏍囬�犳垚鏀诲嚮鍔�100%鐨勭墿鐞嗕激瀹筹紝鏀诲嚮鍐板喕鐩爣鏃讹紝杩炲嚮姒傜巼+30%	1	1	2	1	3	0	0	1	10000	0	0	0	1010	1000	0		0		0		0	8	1	11	0	8		9999	10000		0,0	1	0.5			ResourcesOut\Hero\SpineRes\Wei_Caoyi\attack				
+100062	100062	1	鏇硅蕉鎬掓皵	瀵规晫鏂瑰悗鎺�3鐩爣閫犳垚鏀诲嚮鍔�185%浼ゅ锛岃嫢鐩爣澶勪簬鍐板喕涓紝鏈浼ゅ鎻愬崌50%	2	1	2	1	3	0	0	3	10000	0	0	0	1010	18500	0		0		0		0	15	1	16	0	8		9999	18500		0,0	5	0.5			ResourcesOut\Hero\SpineRes\Wei_Caoyi\angerSkill				
diff --git a/UI/EquipExchangeWin.prefab b/UI/EquipExchangeWin.prefab
index bcf6723..671ec74 100644
--- a/UI/EquipExchangeWin.prefab
+++ b/UI/EquipExchangeWin.prefab
@@ -1435,7 +1435,7 @@
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 552.5, y: -0}
+  m_AnchoredPosition: {x: 555.5, y: -0}
   m_SizeDelta: {x: 345, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &7974282558438864605
@@ -6174,7 +6174,7 @@
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 197.5, y: -0}
+  m_AnchoredPosition: {x: 194.5, y: -0}
   m_SizeDelta: {x: 345, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &3694811163816271872
@@ -8286,7 +8286,7 @@
     m_Top: 0
     m_Bottom: 0
   m_ChildAlignment: 1
-  m_Spacing: 10
+  m_Spacing: 16
   m_ChildForceExpandWidth: 0
   m_ChildForceExpandHeight: 0
   m_ChildControlWidth: 0
diff --git a/UI/GMCmdPanel.prefab b/UI/GMCmdPanel.prefab
index 0b83ec9..22b1c9f 100644
--- a/UI/GMCmdPanel.prefab
+++ b/UI/GMCmdPanel.prefab
@@ -158,7 +158,7 @@
   m_Script: {fileID: 11500000, guid: ff929f87c6e78854abe33d4a8466e7f1, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  uiLayer: 2
+  uiLayer: 4
   uiName: 
   isMainUI: 0
   supportParentChildRelation: 1
diff --git a/UI/GMInputWin.prefab b/UI/GMInputWin.prefab
index 20872f4..0121581 100644
--- a/UI/GMInputWin.prefab
+++ b/UI/GMInputWin.prefab
@@ -1630,7 +1630,7 @@
   m_Script: {fileID: 11500000, guid: 208776f2449bacf42b46433d1afd852e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  uiLayer: 2
+  uiLayer: 4
   uiName: 
   isMainUI: 0
   supportParentChildRelation: 1
diff --git a/UI/HeroPosWin.prefab b/UI/HeroPosWin.prefab
index 5b38e5a..da8e0d5 100644
--- a/UI/HeroPosWin.prefab
+++ b/UI/HeroPosWin.prefab
@@ -781,7 +781,7 @@
   m_Script: {fileID: 11500000, guid: 0952a679e87c6c743874501bacc08eb9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  OutlineColor: {r: 0.43529412, g: 0.26666668, b: 0.003921569, a: 0.5019608}
+  m_OutlineColor: {r: 0, g: 0, b: 0, a: 0.5}
   OutlineWidth: 10
 --- !u!1 &285428738614964184
 GameObject:
@@ -1621,7 +1621,7 @@
   m_Script: {fileID: 11500000, guid: 0952a679e87c6c743874501bacc08eb9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  OutlineColor: {r: 0, g: 0, b: 0, a: 0.5}
+  m_OutlineColor: {r: 0, g: 0, b: 0, a: 0.5}
   OutlineWidth: 10
 --- !u!1 &900276640307614373
 GameObject:
@@ -7953,7 +7953,7 @@
   m_Script: {fileID: 11500000, guid: 0952a679e87c6c743874501bacc08eb9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  OutlineColor: {r: 0, g: 0, b: 0, a: 0.5}
+  m_OutlineColor: {r: 0, g: 0, b: 0, a: 0.5}
   OutlineWidth: 10
 --- !u!1 &3762172888169075238
 GameObject:
@@ -9049,7 +9049,7 @@
   m_Script: {fileID: 11500000, guid: 0952a679e87c6c743874501bacc08eb9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  OutlineColor: {r: 0, g: 0, b: 0, a: 0.5}
+  m_OutlineColor: {r: 0, g: 0, b: 0, a: 0.5}
   OutlineWidth: 10
 --- !u!1 &4168785367479595914
 GameObject:
@@ -12248,7 +12248,7 @@
   m_Script: {fileID: 11500000, guid: 0952a679e87c6c743874501bacc08eb9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  OutlineColor: {r: 0, g: 0, b: 0, a: 0.5}
+  m_OutlineColor: {r: 0, g: 0, b: 0, a: 0.5}
   OutlineWidth: 10
 --- !u!1 &5397305338543573644
 GameObject:
@@ -12589,7 +12589,7 @@
   m_Script: {fileID: 11500000, guid: 0952a679e87c6c743874501bacc08eb9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  OutlineColor: {r: 0, g: 0, b: 0, a: 0.5}
+  m_OutlineColor: {r: 0, g: 0, b: 0, a: 0.5}
   OutlineWidth: 10
 --- !u!1 &5752520944767648123
 GameObject:
@@ -15651,7 +15651,7 @@
   m_Component:
   - component: {fileID: 8037943481534323411}
   - component: {fileID: 8734410280558074225}
-  - component: {fileID: 8140127756991812098}
+  - component: {fileID: 7966236984732646126}
   m_Layer: 5
   m_Name: posbg
   m_TagString: Untagged
@@ -15690,7 +15690,7 @@
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6970886456570962490}
   m_CullTransparentMesh: 1
---- !u!114 &8140127756991812098
+--- !u!114 &7966236984732646126
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -15699,29 +15699,24 @@
   m_GameObject: {fileID: 6970886456570962490}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5eec31867c0c74f4aa2eeade969eec0e, type: 3}
+  m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 0
+  m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: ffc11993ebd5fdf489f685b4c08f86e1, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
-  m_Gray: 0
-  m_IconKey: 
+  m_Texture: {fileID: 2800000, guid: ffc11993ebd5fdf489f685b4c08f86e1, type: 3}
+  m_UVRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
 --- !u!1 &6978800671454896934
 GameObject:
   m_ObjectHideFlags: 0
@@ -16506,7 +16501,7 @@
   m_Script: {fileID: 11500000, guid: 0952a679e87c6c743874501bacc08eb9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  OutlineColor: {r: 0, g: 0, b: 0, a: 0.5}
+  m_OutlineColor: {r: 0, g: 0, b: 0, a: 0.5}
   OutlineWidth: 10
 --- !u!1 &7167110045746304054
 GameObject:
@@ -17413,7 +17408,7 @@
   m_Script: {fileID: 11500000, guid: 0952a679e87c6c743874501bacc08eb9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  OutlineColor: {r: 0, g: 0, b: 0, a: 0.5}
+  m_OutlineColor: {r: 0, g: 0, b: 0, a: 0.5}
   OutlineWidth: 10
 --- !u!1 &7548910661010560968
 GameObject:
@@ -18782,7 +18777,7 @@
   m_Script: {fileID: 11500000, guid: 0952a679e87c6c743874501bacc08eb9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  OutlineColor: {r: 0, g: 0, b: 0, a: 0.5}
+  m_OutlineColor: {r: 0, g: 0, b: 0, a: 0.5}
   OutlineWidth: 10
 --- !u!1 &8263302836805584803
 GameObject:
diff --git a/UI/HeroTrainWin.prefab b/UI/HeroTrainWin.prefab
index 76fe76b..3a908ee 100644
--- a/UI/HeroTrainWin.prefab
+++ b/UI/HeroTrainWin.prefab
@@ -793,7 +793,7 @@
   m_Script: {fileID: 11500000, guid: 0952a679e87c6c743874501bacc08eb9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  OutlineColor: {r: 0, g: 0, b: 0, a: 0.5}
+  m_OutlineColor: {r: 0, g: 0, b: 0, a: 0.5}
   OutlineWidth: 2
 --- !u!1 &621508341938994298
 GameObject:
@@ -891,7 +891,7 @@
   m_Script: {fileID: 11500000, guid: 0952a679e87c6c743874501bacc08eb9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  OutlineColor: {r: 0, g: 0, b: 0, a: 0.5}
+  m_OutlineColor: {r: 0, g: 0, b: 0, a: 0.5}
   OutlineWidth: 10
 --- !u!1 &636113718762949486
 GameObject:
@@ -1329,7 +1329,7 @@
   m_Script: {fileID: 11500000, guid: 0952a679e87c6c743874501bacc08eb9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  OutlineColor: {r: 0.43529412, g: 0.26666668, b: 0.003921569, a: 0.5019608}
+  m_OutlineColor: {r: 0, g: 0, b: 0, a: 0.5}
   OutlineWidth: 10
 --- !u!1 &888144664238365205
 GameObject:
@@ -1845,7 +1845,7 @@
   m_Script: {fileID: 11500000, guid: 0952a679e87c6c743874501bacc08eb9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  OutlineColor: {r: 0, g: 0, b: 0, a: 0.5}
+  m_OutlineColor: {r: 0, g: 0, b: 0, a: 0.5}
   OutlineWidth: 2
 --- !u!1 &1231612664606817119
 GameObject:
@@ -3713,7 +3713,7 @@
   m_Script: {fileID: 11500000, guid: 0952a679e87c6c743874501bacc08eb9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  OutlineColor: {r: 0.2830189, g: 0.2830189, b: 0.2830189, a: 0.5}
+  m_OutlineColor: {r: 0, g: 0, b: 0, a: 0.5}
   OutlineWidth: 5
 --- !u!1 &2272862821933606989
 GameObject:
@@ -5147,7 +5147,7 @@
   m_Script: {fileID: 11500000, guid: 0952a679e87c6c743874501bacc08eb9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  OutlineColor: {r: 0.011075427, g: 0.5031446, b: 0.09768002, a: 0.5}
+  m_OutlineColor: {r: 0, g: 0, b: 0, a: 0.5}
   OutlineWidth: 10
 --- !u!1 &3126035246206930941
 GameObject:
@@ -5714,7 +5714,7 @@
   m_Script: {fileID: 11500000, guid: 0952a679e87c6c743874501bacc08eb9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  OutlineColor: {r: 0, g: 0, b: 0, a: 0.5}
+  m_OutlineColor: {r: 0, g: 0, b: 0, a: 0.5}
   OutlineWidth: 5
 --- !u!1 &3420931843827904140
 GameObject:
@@ -7396,7 +7396,7 @@
   m_Script: {fileID: 11500000, guid: 0952a679e87c6c743874501bacc08eb9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  OutlineColor: {r: 0, g: 0, b: 0, a: 0.5}
+  m_OutlineColor: {r: 0, g: 0, b: 0, a: 0.5}
   OutlineWidth: 10
 --- !u!1 &4281075963390499334
 GameObject:
@@ -8443,7 +8443,7 @@
   m_Script: {fileID: 11500000, guid: 0952a679e87c6c743874501bacc08eb9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  OutlineColor: {r: 0, g: 0, b: 0, a: 0.5}
+  m_OutlineColor: {r: 0, g: 0, b: 0, a: 0.5}
   OutlineWidth: 10
 --- !u!1 &4842538000468266750
 GameObject:
@@ -9321,7 +9321,7 @@
   m_Script: {fileID: 11500000, guid: 0952a679e87c6c743874501bacc08eb9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  OutlineColor: {r: 0, g: 0, b: 0, a: 0.5}
+  m_OutlineColor: {r: 0, g: 0, b: 0, a: 0.5}
   OutlineWidth: 2
 --- !u!1 &5535827359321763011
 GameObject:
@@ -13451,7 +13451,7 @@
   m_Script: {fileID: 11500000, guid: 0952a679e87c6c743874501bacc08eb9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  OutlineColor: {r: 0.1764706, g: 0.1764706, b: 0.1764706, a: 0.5019608}
+  m_OutlineColor: {r: 0, g: 0, b: 0, a: 0.5}
   OutlineWidth: 10
 --- !u!1 &8290766806886934754
 GameObject:
@@ -13605,8 +13605,8 @@
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 37.248688, y: 3}
-  m_SizeDelta: {x: 148.5963, y: 43}
+  m_AnchoredPosition: {x: 70.66589, y: 3}
+  m_SizeDelta: {x: 215.4307, y: 43}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1507688924204081866
 CanvasRenderer:

--
Gitblit v1.8.0