From 63fb66d04f513717cdd60b33f0ae725c1ccbbecf Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期五, 12 九月 2025 17:44:31 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端(反击改为使用普攻,去除通用反击技能设定;武将特长支持;)

---
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.pyc                  |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Skill.txt      |    5 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc                    |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc                         |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Skill.txt      |    5 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc     |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.pyc                |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc  |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt |    6 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Hero.txt       |  130 +++++++++++++-------------
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.pyc                 |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/HeroBreak.txt  |    6 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/HeroBreak.txt  |    6 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Hero.txt       |  130 +++++++++++++-------------
 ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt |    6 
 15 files changed, 146 insertions(+), 148 deletions(-)

diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc
index 4110707..de2af6f 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.pyc
index 9205957..a4487bd 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.pyc
index d4fdc44..30d5c53 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
index f2f0aaf..b611ade 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
index bc95965..cee6f70 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc
index 94e3e9a..b5b8392 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.pyc
index 19ec8cb..e3790a1 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt
index ec1f661..5dfd181 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt
@@ -423,14 +423,14 @@
 MainBootyDrop	{7:5, 8:10,6:15, 5:50, 1:20}	{7:[50, 100], 8:[0, 5], 6:[0, 2], 5:[0, 1], 1:[5, 10]}			
 TreeLVUP	42	4|300	5	120	30
 TurnMax	15	20	{}		
-AngerXP	50	100	50	5	
+AngerXP	50	100	50	5	{"1":25, "2":25, "3":15, "4":15, "5":15, "6":5}
 MissCfg	int(min((dMissRate-aMissRateDef)*pow(0.7,missNum), 8000))				
-ParryCfg	0 if parryNum>2 else min(dParryRate-aParryRateDef, 8000)	[0, 0]	0.5		
+ParryCfg	0 if parryNum>2 else min(dParryRate-aParryRateDef, 8000)	[1]	0.5		
 ComboCfg	0 if comboNum>4 else int((aComboRate-dComboRateDef)*pow(0.5,comboNum))				
 SuperHitCfg	max(aSuperHitRate - dSuperHitRateDef, 0)				
 StunCfg	min(aStunRate - dStunRateDef, 8000)	200			
 SuckHPCfg	int(max(aSuckHPPer -dSuckHPPerDef, 0)/10000.0*hurtHP)				
-HurtFormula	int((aAtk-dDef)*atkSkillPer*(1+aNormalSkillPer-dNormalSkillPerDef)*(1+aPMDamPer-dPMDamPerDef)*(1+aFinalDamPer-dFinalDamPerDef)*(max(1+aSuperDamPer-dSuperDamPerDef,1) if isSuperHit else 1))	int((aAtk-dDef)*atkSkillPer*(1+aAngerSkillPer-dAngerSkillPerDef)*(1+aPMDamPer-dPMDamPerDef)*(1+aFinalDamPer-dFinalDamPerDef+angerOverflow/100.0)*(max(1+aSuperDamPer-dSuperDamPerDef,1) if isSuperHit else 1))	int((aAtk-dDef)*(1+aFinalDamPer-dFinalDamPerDef)*(max(1+aSuperDamPer-dSuperDamPerDef,1) if isSuperHit else 1))	int((aAtk-dDef)*atkSkillPer*(1+aPMDamPer-dPMDamPerDef)*(1+aFinalDamPer-dFinalDamPerDef)*(max(1+aSuperDamPer-dSuperDamPerDef,1) if isSuperHit else 1))	
+HurtFormula	int((aAtk-dDef)*atkSkillPer*(1+aNormalSkillPer-dNormalSkillPerDef)*(1+aPMDamPer-dPMDamPerDef)*(1+aFinalDamPer-dFinalDamPerDef)*(max(1+aSuperDamPer-dSuperDamPerDef,1) if isSuperHit else 1))	int((aAtk-dDef)*atkSkillPer*(1+aAngerSkillPer-dAngerSkillPerDef)*(1+aPMDamPer-dPMDamPerDef)*(1+aFinalDamPer-dFinalDamPerDef+angerOverflow/100.0)*(max(1+aSuperDamPer-dSuperDamPerDef,1) if isSuperHit else 1))	0	int((aAtk-dDef)*atkSkillPer*(1+aPMDamPer-dPMDamPerDef)*(1+aFinalDamPer-dFinalDamPerDef)*(max(1+aSuperDamPer-dSuperDamPerDef,1) if isSuperHit else 1))	
 DOTFormula	int(aAtk*atkSkillPer*(1+aPMDamPer-dPMDamPerDef)*(1+aFinalDamPer-dFinalDamPerDef))				
 CureFormula	int(max((baseValue*skillPer)*(1+curePer-cureDefPer)*(1+angerOverflow/100.0), baseValue*0.05))				
 InvestCost	{}	{}	{"7":[101],"12":[102]} 	{}	{}
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Hero.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Hero.txt
index d53679d..41aad1c 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Hero.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Hero.txt
@@ -1,65 +1,65 @@
-HeroID	Name	Country	Quality	AtkDistType	Sex	SkinIDList	AtkSkillID	AngerSkillID	AtkInheritPer	DefInheritPer	HPInheritPer	BatAttrDict	FetterIDList	RecruitBySelf
-510001	鏇瑰┐	1	1	2	2	5100010	100101	100102	10500	7500	9000	{"23":1500}		0
-510002	涔愯繘	1	2	1	1	5100020	100201	100202	10500	8000	10000	{"31":1500}		0
-510003	搴炲痉	1	2	1	1	5100030	100301	100302	9500	8000	11000	{"29":1500}		0
-510004	鍗炲か浜�	1	3	2	2	5100040	100401	100402	11500	8500	10000	{"27":1500}		0
-510005	浜庣	1	3	1	1	5100050	100501	100502	10500	8000	11000	{"29":1500}		0
-510006	鏇硅蕉	1	3	2	2	5100060	100601	100602	11500	8500	10000	{"25":1500}	3	0
-510007	鏉庡吀	1	3	1	1	5100070	100701	100702	10000	8500	11500	{"21":1500}	3	0
-510008	钄℃枃濮�	1	4	2	2	5100080	100801	100802	11500	9000	11000	{"23":1500}	2	0
-510009	璐捐	1	4	2	1	5100090	100901	100902	12000	9000	10500	{"25":1500}		0
-510010	鐜嬪紓	1	4	1	2	5100100	101001	101002	11500	9000	11000	{"23":1500}		0
-510011	鐜嬪厓濮�	1	4	2	2	5100110	101101	101102	11500	9000	11000	{"21":1500}	2	0
-510012	鍙搁┈鎳�	1	5	2	1	5100120	101201	101202	12500	9500	11000	{"31":1500}		0
-510013	鐢勫畵	1	5	2	2	5100130	101301	101302	12000	9500	11500	{"21":1500}		0
-510014	鏇规搷	1	5	1	1	5100140	101401	101402	12000	9500	11500	{"23":1500}	1	0
-510015	鏇逛粊	1	5	1	1	5100150	101501	101502	11000	9500	12500	{"29":1500}	1	0
-510016	閮槈	1	5	2	1	5100160	101601	101602	12500	9500	11000	{"27":1500}		0
-520001	绯滅	2	1	2	1	5200010	200101	200102	10000	7500	9500	{"27":1500}		0
-520002	椴嶄笁濞�	2	2	1	2	5200020	200201	200202	10500	8000	10000	{"27":1500}		0
-520003	鍛ㄤ粨	2	2	1	1	5200030	200301	200302	9500	8000	11000	{"29":1500}		0
-520004	璇歌憶鏋�	2	3	2	2	5200040	200401	200402	11500	8500	10000	{"25":1500}		0
-520005	鍏冲叴	2	3	1	1	5200050	200501	200502	10500	8500	11000	{"31":1500}	6	0
-520006	鐢樺か浜�	2	3	2	2	5200060	200601	200602	11000	8500	10500	{"21":1500}		0
-520007	寮犳槦褰�	2	3	1	2	5200070	200701	200702	10000	8500	11500	{"29":1500}	6	0
-520008	鍏抽摱灞�	2	4	1	2	5200080	200801	200802	11500	9000	11000	{"27":1500}		0
-520009	搴炵粺	2	4	2	1	5200090	200901	200902	12000	9000	10500	{"25":1500}		0
-520010	璧典簯	2	4	1	1	5200100	201001	201002	11500	9000	11000	{"25":1500}		0
-520011	榛勬湀鑻�	2	4	2	2	5200110	201101	201102	11500	9000	11000	{"23":1500}	5	0
-520012	璇歌憶浜�	2	5	2	1	5200120	201201	201202	12500	9500	11000	{"25":1500}	5	0
-520013	鍒樺	2	5	1	1	5200130	201301	201302	11500	9500	12000	{"25":1500}	4	0
-520014	鍏崇窘	2	5	1	1	5200140	201401	201402	12000	9500	11500	{"23":1500}	4	0
-520015	寮犻	2	5	1	1	5200150	201501	201502	11000	9500	12500	{"25":1500}	4	0
-520016	椹秴	2	5	1	1	5200160	201601	201602	12000	9500	11500	{"23":1500}		0
-530001	娼樼拫	3	1	1	1	5300010	300101	300102	10000	7500	9500	{"23":1500}		0
-530002	鍚村浗澶�	3	2	2	2	5300020	300201	300202	10500	8000	10000	{"27":1500}		0
-530003	鍑岀粺	3	2	1	1	5300030	300301	300302	10500	8000	10000	{"31":1500}		0
-530004	鐢樺畞	3	3	1	1	5300040	300401	300402	11000	8500	10500	{"27":1500}	9	0
-530005	鏈辨	3	3	1	1	5300050	300501	300502	10500	8500	11000	{"21":1500}		0
-530006	鍙搁┈寰�	3	3	2	1	5300060	300601	300602	11000	8500	10500	{"27":1500}		0
-530007	涓佸	3	3	1	1	5300070	300701	300702	10000	8500	11500	{"29":1500}	9	0
-530008	瀛欓瞾鑲�	3	4	2	2	5300080	300801	300802	12000	9000	10500	{"27":1500}		0
-530009	瀛欑瓥	3	4	1	1	5300090	300901	300902	11500	9000	11000	{"23":1500}	8	0
-530010	瀛欏皻棣�	3	4	2	2	5300100	301001	301002	12000	9000	10500	{"23":1500}		0
-530011	澶т箶	3	4	1	2	5300110	301101	301102	11500	9000	11000	{"25":1500}	8	0
-530012	鍛ㄧ憸	3	5	2	1	5300120	301201	301202	12500	9500	11000	{"31":1500}	7	0
-530013	灏忎箶	3	5	2	2	5300130	301301	301302	12000	9500	11500	{"27":1500}	7	0
-530014	姝ョ粌甯�	3	5	1	2	5300140	301401	301402	12000	9500	11500	{"23":1500}		0
-530015	瀛欏潥	3	5	1	1	5300150	301501	301502	11000	9500	12500	{"27":1500}		0
-530016	闄嗛��	3	5	1	1	5300160	301601	301602	12000	9500	11500	{"25":1500}		0
-540001	绾伒	4	1	1	1	5400010	400101	400102	10000	7500	9500	{"21":1500}		0
-540002	閮睖	4	2	1	1	5400020	400201	400202	10500	8000	10000	{"31":1500}	13	0
-540003	鏉庡倳	4	2	1	1	5400030	400301	400302	10500	8000	10000	{"27":1500}	13	0
-540004	寮犲疂	4	3	2	1	5400040	400401	400402	11000	8500	10500	{"29":1500}		0
-540005	闊╅亗	4	3	1	1	5400050	400501	400502	11000	8500	10500	{"27":1500}		0
-540006	瀛熻幏	4	3	1	1	5400060	400601	400602	10000	8500	11500	{"29":1500}	12	0
-540007	绁濊瀺	4	3	2	2	5400070	400701	400702	11500	8500	10000	{"23":1500}	12	0
-540008	浣曞お鍚�	4	4	2	2	5400080	400801	400802	11500	9000	11000	{"31":1500}		0
-540009	钁g櫧	4	4	1	2	5400090	400901	400902	11500	9000	11000	{"31":1500}	11	0
-540010	鍗戝讥鍛�	4	4	1	2	5400100	401001	401002	11500	9000	11000	{"23":1500}		0
-540011	钁e崜	4	4	1	1	5400110	401101	401102	10500	9000	12000	{"31":1500}		0
-540012	璨傝潐	4	5	2	2	5400120	401201	401202	12500	9500	11000	{"31":1500}	10	0
-540013	鍚曠幉缁�	4	5	1	2	5400130	401301	401302	12000	9500	11500	{"31":1500}	11	0
-540014	鍚曞竷	4	5	1	1	5400140	401401	401402	11000	9500	12500	{"29":1500}	10	0
-540015	寮犺	4	5	2	1	5400150	401501	401502	12000	9500	11500	{"21":1500}		0
-540016	宸︽厛	4	5	2	1	5400160	401601	401602	12000	9500	11500	{"27":1500}		0
+HeroID	Name	Country	Quality	AtkDistType	Sex	SkinIDList	AtkSkillID	AngerSkillID	AtkInheritPer	DefInheritPer	HPInheritPer	BatAttrDict	FetterIDList	RecruitBySelf	Specialty
+510001	鏇瑰┐	1	1	2	2	5100010	100101	100102	10500	7500	9000	{"23":1500}		0	2
+510002	涔愯繘	1	2	1	1	5100020	100201	100202	10500	8000	10000	{"31":1500}		0	6
+510003	搴炲痉	1	2	1	1	5100030	100301	100302	9500	8000	11000	{"29":1500}		0	5
+510004	鍗炲か浜�	1	3	2	2	5100040	100401	100402	11500	8500	10000	{"27":1500}		0	4
+510005	浜庣	1	3	1	1	5100050	100501	100502	10500	8000	11000	{"29":1500}		0	5
+510006	鏇硅蕉	1	3	2	2	5100060	100601	100602	11500	8500	10000	{"25":1500}	3	0	3
+510007	鏉庡吀	1	3	1	1	5100070	100701	100702	10000	8500	11500	{"21":1500}	3	0	1
+510008	钄℃枃濮�	1	4	2	2	5100080	100801	100802	11500	9000	11000	{"23":1500}	2	0	2
+510009	璐捐	1	4	2	1	5100090	100901	100902	12000	9000	10500	{"25":1500}		0	3
+510010	鐜嬪紓	1	4	1	2	5100100	101001	101002	11500	9000	11000	{"23":1500}		0	2
+510011	鐜嬪厓濮�	1	4	2	2	5100110	101101	101102	11500	9000	11000	{"21":1500}	2	0	1
+510012	鍙搁┈鎳�	1	5	2	1	5100120	101201	101202	12500	9500	11000	{"31":1500}		0	6
+510013	鐢勫畵	1	5	2	2	5100130	101301	101302	12000	9500	11500	{"21":1500}		0	1
+510014	鏇规搷	1	5	1	1	5100140	101401	101402	12000	9500	11500	{"23":1500}	1	0	2
+510015	鏇逛粊	1	5	1	1	5100150	101501	101502	11000	9500	12500	{"29":1500}	1	0	5
+510016	閮槈	1	5	2	1	5100160	101601	101602	12500	9500	11000	{"27":1500}		0	4
+520001	绯滅	2	1	2	1	5200010	200101	200102	10000	7500	9500	{"27":1500}		0	4
+520002	椴嶄笁濞�	2	2	1	2	5200020	200201	200202	10500	8000	10000	{"27":1500}		0	4
+520003	鍛ㄤ粨	2	2	1	1	5200030	200301	200302	9500	8000	11000	{"29":1500}		0	5
+520004	璇歌憶鏋�	2	3	2	2	5200040	200401	200402	11500	8500	10000	{"25":1500}		0	3
+520005	鍏冲叴	2	3	1	1	5200050	200501	200502	10500	8500	11000	{"31":1500}	6	0	6
+520006	鐢樺か浜�	2	3	2	2	5200060	200601	200602	11000	8500	10500	{"21":1500}		0	1
+520007	寮犳槦褰�	2	3	1	2	5200070	200701	200702	10000	8500	11500	{"29":1500}	6	0	5
+520008	鍏抽摱灞�	2	4	1	2	5200080	200801	200802	11500	9000	11000	{"27":1500}		0	4
+520009	搴炵粺	2	4	2	1	5200090	200901	200902	12000	9000	10500	{"25":1500}		0	3
+520010	璧典簯	2	4	1	1	5200100	201001	201002	11500	9000	11000	{"25":1500}		0	3
+520011	榛勬湀鑻�	2	4	2	2	5200110	201101	201102	11500	9000	11000	{"23":1500}	5	0	2
+520012	璇歌憶浜�	2	5	2	1	5200120	201201	201202	12500	9500	11000	{"25":1500}	5	0	3
+520013	鍒樺	2	5	1	1	5200130	201301	201302	11500	9500	12000	{"25":1500}	4	0	3
+520014	鍏崇窘	2	5	1	1	5200140	201401	201402	12000	9500	11500	{"23":1500}	4	0	2
+520015	寮犻	2	5	1	1	5200150	201501	201502	11000	9500	12500	{"25":1500}	4	0	3
+520016	椹秴	2	5	1	1	5200160	201601	201602	12000	9500	11500	{"23":1500}		0	2
+530001	娼樼拫	3	1	1	1	5300010	300101	300102	10000	7500	9500	{"23":1500}		0	2
+530002	鍚村浗澶�	3	2	2	2	5300020	300201	300202	10500	8000	10000	{"27":1500}		0	4
+530003	鍑岀粺	3	2	1	1	5300030	300301	300302	10500	8000	10000	{"31":1500}		0	6
+530004	鐢樺畞	3	3	1	1	5300040	300401	300402	11000	8500	10500	{"27":1500}	9	0	4
+530005	鏈辨	3	3	1	1	5300050	300501	300502	10500	8500	11000	{"21":1500}		0	1
+530006	鍙搁┈寰�	3	3	2	1	5300060	300601	300602	11000	8500	10500	{"27":1500}		0	4
+530007	涓佸	3	3	1	1	5300070	300701	300702	10000	8500	11500	{"29":1500}	9	0	5
+530008	瀛欓瞾鑲�	3	4	2	2	5300080	300801	300802	12000	9000	10500	{"27":1500}		0	4
+530009	瀛欑瓥	3	4	1	1	5300090	300901	300902	11500	9000	11000	{"23":1500}	8	0	2
+530010	瀛欏皻棣�	3	4	2	2	5300100	301001	301002	12000	9000	10500	{"23":1500}		0	2
+530011	澶т箶	3	4	1	2	5300110	301101	301102	11500	9000	11000	{"25":1500}	8	0	3
+530012	鍛ㄧ憸	3	5	2	1	5300120	301201	301202	12500	9500	11000	{"31":1500}	7	0	6
+530013	灏忎箶	3	5	2	2	5300130	301301	301302	12000	9500	11500	{"27":1500}	7	0	4
+530014	姝ョ粌甯�	3	5	1	2	5300140	301401	301402	12000	9500	11500	{"23":1500}		0	2
+530015	瀛欏潥	3	5	1	1	5300150	301501	301502	11000	9500	12500	{"27":1500}		0	4
+530016	闄嗛��	3	5	1	1	5300160	301601	301602	12000	9500	11500	{"25":1500}		0	3
+540001	绾伒	4	1	1	1	5400010	400101	400102	10000	7500	9500	{"21":1500}		0	1
+540002	閮睖	4	2	1	1	5400020	400201	400202	10500	8000	10000	{"31":1500}	13	0	6
+540003	鏉庡倳	4	2	1	1	5400030	400301	400302	10500	8000	10000	{"27":1500}	13	0	4
+540004	寮犲疂	4	3	2	1	5400040	400401	400402	11000	8500	10500	{"29":1500}		0	5
+540005	闊╅亗	4	3	1	1	5400050	400501	400502	11000	8500	10500	{"27":1500}		0	4
+540006	瀛熻幏	4	3	1	1	5400060	400601	400602	10000	8500	11500	{"29":1500}	12	0	5
+540007	绁濊瀺	4	3	2	2	5400070	400701	400702	11500	8500	10000	{"23":1500}	12	0	2
+540008	浣曞お鍚�	4	4	2	2	5400080	400801	400802	11500	9000	11000	{"31":1500}		0	6
+540009	钁g櫧	4	4	1	2	5400090	400901	400902	11500	9000	11000	{"31":1500}	11	0	6
+540010	鍗戝讥鍛�	4	4	1	2	5400100	401001	401002	11500	9000	11000	{"23":1500}		0	2
+540011	钁e崜	4	4	1	1	5400110	401101	401102	10500	9000	12000	{"31":1500}		0	6
+540012	璨傝潐	4	5	2	2	5400120	401201	401202	12500	9500	11000	{"31":1500}	10	0	6
+540013	鍚曠幉缁�	4	5	1	2	5400130	401301	401302	12000	9500	11500	{"31":1500}	11	0	6
+540014	鍚曞竷	4	5	1	1	5400140	401401	401402	11000	9500	12500	{"29":1500}	10	0	5
+540015	寮犺	4	5	2	1	5400150	401501	401502	12000	9500	11500	{"21":1500}		0	1
+540016	宸︽厛	4	5	2	1	5400160	401601	401602	12000	9500	11500	{"27":1500}		0	4
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/HeroBreak.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/HeroBreak.txt
index a092b7d..6df4fbc 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/HeroBreak.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/HeroBreak.txt
@@ -1,7 +1,7 @@
 HeroID	BreakLV	AttrIDList	AttrValueList	SkillID
 510001	1	23	1000	0
 510001	2	59	1000	0
-510001	3	33	4000	0
+510001	3	45	4000	0
 510001	4	23	1000	0
 510001	5	0	0	100107
 510001	6	0	0	100108
@@ -208,7 +208,7 @@
 520014	4	23	1000	0
 520014	5	0	0	201407
 520014	6	0	0	201408
-520014	7	33	3000	0
+520014	7	45	3000	0
 520015	1	0	0	201503
 520015	2	62	1000	0
 520015	3	0	0	201505
@@ -229,7 +229,7 @@
 530001	4	23	1000	0
 530001	5	0	0	300107
 530001	6	0	0	300108
-530001	7	33	2000	0
+530001	7	45	2000	0
 530002	1	0	0	300203
 530002	2	64	1000	0
 530002	3	27	1000	0
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Skill.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Skill.txt
index de15b78..4fd9fc8 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Skill.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Skill.txt
@@ -1,5 +1,4 @@
 SkillID	SkillTypeID	SkillLV	SkillMaxLV	SkillName	FuncType	SkillType	HurtType	AtkType	TagAim	TagFriendly	TagAffect	TagCount	CalcType	SkillPer	SkillValue	HappenRate	EffectID1	EffectValues1	TriggerWay1	TriggerSrc1	EffectID2	EffectValues2	TriggerWay2	TriggerSrc2	EffectID3	EffectValues3	TriggerWay3	TriggerSrc3	CoolDownTime	IgnoreStates	BuffState	LastTime	LayerCnt	LayerMax	BuffRepeat	DieContinue	FightPower	SkillMotionName
-100	100	1	1	通用反击	4	1	1	1	0	0	0	1	0	10000	0	10000	0				0				0				0			0	0	0	0	0	0	
 200	200	1	1	击晕	0	14	0	0	6	0	0	0	0	0	0	10000	0				0				0				0		3	1	0	0	0	0	0	
 201	201	1	1	击晕	0	14	0	0	6	0	0	0	0	0	0	2000	0				0				0				0		3	1	0	0	0	0	0	
 300	300	1	1	冰冻	0	14	1	0	6	0	0	0	0	0	0	10000	0				0				0				0		1	1	0	0	0	0	0	
@@ -43,7 +42,7 @@
 100207	100207	1	1	折冲	3	9	0	0	5	1	0	0	0	18500	0	10000	0				0				0				0	0			0	0	0	0	0	
 100208	100208	1	1	怒气	3	1	0	6	5	1	0	0				10000																					0	
 100209	100209	1	1	升变	3	5	0	0	5	1	0	0				10000																					0	
-100301	100301	1	1	狂落	1	1	1	1	1	0	0	1	0	10500	0	10000	0				0				0				0		0	0	0	0	0	0	0	attack
+100301	100301	1	1	斩鞍	1	1	1	1	1	0	0	1	0	10500	0	10000	0				0				0				0		0	0	0	0	0	0	0	attack
 100302	100302	1	1	狂骨裂阵	2	1	1	1	2	0	0	3	0	15000	0	10000	5010	1003021	13		0				0				0		0	0	0	0	0	0	0	angerskill
 1003021	1003021	1	1	狂骨裂阵	0	6	0	0	6	0	0	0	0	0	0	4000	29	4000|1			0				0				0		0	2	0	0	0	0	0	
 100305	100305	1	1	白马浴血	3	9	0	0	5	1	0	0				10000																					0	
@@ -158,7 +157,7 @@
 101608	101608	1	1	怒气	3	1	0	6	5	1	0	0				10000																					0	
 101609	101609	1	1	升变	3																																0	
 200101	200101	1	1	济世	1	1	2	1	1	0	0	1	0	10500	0	10000	0				0				0				0		0	0	0	0	0	0	0	attack
-200102	200102	1	1	千金一掷	2	1	1	2	0	0	1	2	0	21000	0	10000	0				0				0				0		0	0	0	0	0	0	0	angerSkill
+200102	200102	1	1	千金一掷	2	1	1	1	0	0	0	2	0	21000	0	10000	0				0				0				0		0	0	0	0	0	0	0	angerSkill
 200103	200103	1	1	倾囊	3	2																															0	
 200105	200105	1	1	仁德	3	5																															0	
 200107	200107	1	1	流芳	3																																0	
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt
index ec1f661..5dfd181 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt
@@ -423,14 +423,14 @@
 MainBootyDrop	{7:5, 8:10,6:15, 5:50, 1:20}	{7:[50, 100], 8:[0, 5], 6:[0, 2], 5:[0, 1], 1:[5, 10]}			
 TreeLVUP	42	4|300	5	120	30
 TurnMax	15	20	{}		
-AngerXP	50	100	50	5	
+AngerXP	50	100	50	5	{"1":25, "2":25, "3":15, "4":15, "5":15, "6":5}
 MissCfg	int(min((dMissRate-aMissRateDef)*pow(0.7,missNum), 8000))				
-ParryCfg	0 if parryNum>2 else min(dParryRate-aParryRateDef, 8000)	[0, 0]	0.5		
+ParryCfg	0 if parryNum>2 else min(dParryRate-aParryRateDef, 8000)	[1]	0.5		
 ComboCfg	0 if comboNum>4 else int((aComboRate-dComboRateDef)*pow(0.5,comboNum))				
 SuperHitCfg	max(aSuperHitRate - dSuperHitRateDef, 0)				
 StunCfg	min(aStunRate - dStunRateDef, 8000)	200			
 SuckHPCfg	int(max(aSuckHPPer -dSuckHPPerDef, 0)/10000.0*hurtHP)				
-HurtFormula	int((aAtk-dDef)*atkSkillPer*(1+aNormalSkillPer-dNormalSkillPerDef)*(1+aPMDamPer-dPMDamPerDef)*(1+aFinalDamPer-dFinalDamPerDef)*(max(1+aSuperDamPer-dSuperDamPerDef,1) if isSuperHit else 1))	int((aAtk-dDef)*atkSkillPer*(1+aAngerSkillPer-dAngerSkillPerDef)*(1+aPMDamPer-dPMDamPerDef)*(1+aFinalDamPer-dFinalDamPerDef+angerOverflow/100.0)*(max(1+aSuperDamPer-dSuperDamPerDef,1) if isSuperHit else 1))	int((aAtk-dDef)*(1+aFinalDamPer-dFinalDamPerDef)*(max(1+aSuperDamPer-dSuperDamPerDef,1) if isSuperHit else 1))	int((aAtk-dDef)*atkSkillPer*(1+aPMDamPer-dPMDamPerDef)*(1+aFinalDamPer-dFinalDamPerDef)*(max(1+aSuperDamPer-dSuperDamPerDef,1) if isSuperHit else 1))	
+HurtFormula	int((aAtk-dDef)*atkSkillPer*(1+aNormalSkillPer-dNormalSkillPerDef)*(1+aPMDamPer-dPMDamPerDef)*(1+aFinalDamPer-dFinalDamPerDef)*(max(1+aSuperDamPer-dSuperDamPerDef,1) if isSuperHit else 1))	int((aAtk-dDef)*atkSkillPer*(1+aAngerSkillPer-dAngerSkillPerDef)*(1+aPMDamPer-dPMDamPerDef)*(1+aFinalDamPer-dFinalDamPerDef+angerOverflow/100.0)*(max(1+aSuperDamPer-dSuperDamPerDef,1) if isSuperHit else 1))	0	int((aAtk-dDef)*atkSkillPer*(1+aPMDamPer-dPMDamPerDef)*(1+aFinalDamPer-dFinalDamPerDef)*(max(1+aSuperDamPer-dSuperDamPerDef,1) if isSuperHit else 1))	
 DOTFormula	int(aAtk*atkSkillPer*(1+aPMDamPer-dPMDamPerDef)*(1+aFinalDamPer-dFinalDamPerDef))				
 CureFormula	int(max((baseValue*skillPer)*(1+curePer-cureDefPer)*(1+angerOverflow/100.0), baseValue*0.05))				
 InvestCost	{}	{}	{"7":[101],"12":[102]} 	{}	{}
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Hero.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Hero.txt
index d53679d..41aad1c 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Hero.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Hero.txt
@@ -1,65 +1,65 @@
-HeroID	Name	Country	Quality	AtkDistType	Sex	SkinIDList	AtkSkillID	AngerSkillID	AtkInheritPer	DefInheritPer	HPInheritPer	BatAttrDict	FetterIDList	RecruitBySelf
-510001	鏇瑰┐	1	1	2	2	5100010	100101	100102	10500	7500	9000	{"23":1500}		0
-510002	涔愯繘	1	2	1	1	5100020	100201	100202	10500	8000	10000	{"31":1500}		0
-510003	搴炲痉	1	2	1	1	5100030	100301	100302	9500	8000	11000	{"29":1500}		0
-510004	鍗炲か浜�	1	3	2	2	5100040	100401	100402	11500	8500	10000	{"27":1500}		0
-510005	浜庣	1	3	1	1	5100050	100501	100502	10500	8000	11000	{"29":1500}		0
-510006	鏇硅蕉	1	3	2	2	5100060	100601	100602	11500	8500	10000	{"25":1500}	3	0
-510007	鏉庡吀	1	3	1	1	5100070	100701	100702	10000	8500	11500	{"21":1500}	3	0
-510008	钄℃枃濮�	1	4	2	2	5100080	100801	100802	11500	9000	11000	{"23":1500}	2	0
-510009	璐捐	1	4	2	1	5100090	100901	100902	12000	9000	10500	{"25":1500}		0
-510010	鐜嬪紓	1	4	1	2	5100100	101001	101002	11500	9000	11000	{"23":1500}		0
-510011	鐜嬪厓濮�	1	4	2	2	5100110	101101	101102	11500	9000	11000	{"21":1500}	2	0
-510012	鍙搁┈鎳�	1	5	2	1	5100120	101201	101202	12500	9500	11000	{"31":1500}		0
-510013	鐢勫畵	1	5	2	2	5100130	101301	101302	12000	9500	11500	{"21":1500}		0
-510014	鏇规搷	1	5	1	1	5100140	101401	101402	12000	9500	11500	{"23":1500}	1	0
-510015	鏇逛粊	1	5	1	1	5100150	101501	101502	11000	9500	12500	{"29":1500}	1	0
-510016	閮槈	1	5	2	1	5100160	101601	101602	12500	9500	11000	{"27":1500}		0
-520001	绯滅	2	1	2	1	5200010	200101	200102	10000	7500	9500	{"27":1500}		0
-520002	椴嶄笁濞�	2	2	1	2	5200020	200201	200202	10500	8000	10000	{"27":1500}		0
-520003	鍛ㄤ粨	2	2	1	1	5200030	200301	200302	9500	8000	11000	{"29":1500}		0
-520004	璇歌憶鏋�	2	3	2	2	5200040	200401	200402	11500	8500	10000	{"25":1500}		0
-520005	鍏冲叴	2	3	1	1	5200050	200501	200502	10500	8500	11000	{"31":1500}	6	0
-520006	鐢樺か浜�	2	3	2	2	5200060	200601	200602	11000	8500	10500	{"21":1500}		0
-520007	寮犳槦褰�	2	3	1	2	5200070	200701	200702	10000	8500	11500	{"29":1500}	6	0
-520008	鍏抽摱灞�	2	4	1	2	5200080	200801	200802	11500	9000	11000	{"27":1500}		0
-520009	搴炵粺	2	4	2	1	5200090	200901	200902	12000	9000	10500	{"25":1500}		0
-520010	璧典簯	2	4	1	1	5200100	201001	201002	11500	9000	11000	{"25":1500}		0
-520011	榛勬湀鑻�	2	4	2	2	5200110	201101	201102	11500	9000	11000	{"23":1500}	5	0
-520012	璇歌憶浜�	2	5	2	1	5200120	201201	201202	12500	9500	11000	{"25":1500}	5	0
-520013	鍒樺	2	5	1	1	5200130	201301	201302	11500	9500	12000	{"25":1500}	4	0
-520014	鍏崇窘	2	5	1	1	5200140	201401	201402	12000	9500	11500	{"23":1500}	4	0
-520015	寮犻	2	5	1	1	5200150	201501	201502	11000	9500	12500	{"25":1500}	4	0
-520016	椹秴	2	5	1	1	5200160	201601	201602	12000	9500	11500	{"23":1500}		0
-530001	娼樼拫	3	1	1	1	5300010	300101	300102	10000	7500	9500	{"23":1500}		0
-530002	鍚村浗澶�	3	2	2	2	5300020	300201	300202	10500	8000	10000	{"27":1500}		0
-530003	鍑岀粺	3	2	1	1	5300030	300301	300302	10500	8000	10000	{"31":1500}		0
-530004	鐢樺畞	3	3	1	1	5300040	300401	300402	11000	8500	10500	{"27":1500}	9	0
-530005	鏈辨	3	3	1	1	5300050	300501	300502	10500	8500	11000	{"21":1500}		0
-530006	鍙搁┈寰�	3	3	2	1	5300060	300601	300602	11000	8500	10500	{"27":1500}		0
-530007	涓佸	3	3	1	1	5300070	300701	300702	10000	8500	11500	{"29":1500}	9	0
-530008	瀛欓瞾鑲�	3	4	2	2	5300080	300801	300802	12000	9000	10500	{"27":1500}		0
-530009	瀛欑瓥	3	4	1	1	5300090	300901	300902	11500	9000	11000	{"23":1500}	8	0
-530010	瀛欏皻棣�	3	4	2	2	5300100	301001	301002	12000	9000	10500	{"23":1500}		0
-530011	澶т箶	3	4	1	2	5300110	301101	301102	11500	9000	11000	{"25":1500}	8	0
-530012	鍛ㄧ憸	3	5	2	1	5300120	301201	301202	12500	9500	11000	{"31":1500}	7	0
-530013	灏忎箶	3	5	2	2	5300130	301301	301302	12000	9500	11500	{"27":1500}	7	0
-530014	姝ョ粌甯�	3	5	1	2	5300140	301401	301402	12000	9500	11500	{"23":1500}		0
-530015	瀛欏潥	3	5	1	1	5300150	301501	301502	11000	9500	12500	{"27":1500}		0
-530016	闄嗛��	3	5	1	1	5300160	301601	301602	12000	9500	11500	{"25":1500}		0
-540001	绾伒	4	1	1	1	5400010	400101	400102	10000	7500	9500	{"21":1500}		0
-540002	閮睖	4	2	1	1	5400020	400201	400202	10500	8000	10000	{"31":1500}	13	0
-540003	鏉庡倳	4	2	1	1	5400030	400301	400302	10500	8000	10000	{"27":1500}	13	0
-540004	寮犲疂	4	3	2	1	5400040	400401	400402	11000	8500	10500	{"29":1500}		0
-540005	闊╅亗	4	3	1	1	5400050	400501	400502	11000	8500	10500	{"27":1500}		0
-540006	瀛熻幏	4	3	1	1	5400060	400601	400602	10000	8500	11500	{"29":1500}	12	0
-540007	绁濊瀺	4	3	2	2	5400070	400701	400702	11500	8500	10000	{"23":1500}	12	0
-540008	浣曞お鍚�	4	4	2	2	5400080	400801	400802	11500	9000	11000	{"31":1500}		0
-540009	钁g櫧	4	4	1	2	5400090	400901	400902	11500	9000	11000	{"31":1500}	11	0
-540010	鍗戝讥鍛�	4	4	1	2	5400100	401001	401002	11500	9000	11000	{"23":1500}		0
-540011	钁e崜	4	4	1	1	5400110	401101	401102	10500	9000	12000	{"31":1500}		0
-540012	璨傝潐	4	5	2	2	5400120	401201	401202	12500	9500	11000	{"31":1500}	10	0
-540013	鍚曠幉缁�	4	5	1	2	5400130	401301	401302	12000	9500	11500	{"31":1500}	11	0
-540014	鍚曞竷	4	5	1	1	5400140	401401	401402	11000	9500	12500	{"29":1500}	10	0
-540015	寮犺	4	5	2	1	5400150	401501	401502	12000	9500	11500	{"21":1500}		0
-540016	宸︽厛	4	5	2	1	5400160	401601	401602	12000	9500	11500	{"27":1500}		0
+HeroID	Name	Country	Quality	AtkDistType	Sex	SkinIDList	AtkSkillID	AngerSkillID	AtkInheritPer	DefInheritPer	HPInheritPer	BatAttrDict	FetterIDList	RecruitBySelf	Specialty
+510001	鏇瑰┐	1	1	2	2	5100010	100101	100102	10500	7500	9000	{"23":1500}		0	2
+510002	涔愯繘	1	2	1	1	5100020	100201	100202	10500	8000	10000	{"31":1500}		0	6
+510003	搴炲痉	1	2	1	1	5100030	100301	100302	9500	8000	11000	{"29":1500}		0	5
+510004	鍗炲か浜�	1	3	2	2	5100040	100401	100402	11500	8500	10000	{"27":1500}		0	4
+510005	浜庣	1	3	1	1	5100050	100501	100502	10500	8000	11000	{"29":1500}		0	5
+510006	鏇硅蕉	1	3	2	2	5100060	100601	100602	11500	8500	10000	{"25":1500}	3	0	3
+510007	鏉庡吀	1	3	1	1	5100070	100701	100702	10000	8500	11500	{"21":1500}	3	0	1
+510008	钄℃枃濮�	1	4	2	2	5100080	100801	100802	11500	9000	11000	{"23":1500}	2	0	2
+510009	璐捐	1	4	2	1	5100090	100901	100902	12000	9000	10500	{"25":1500}		0	3
+510010	鐜嬪紓	1	4	1	2	5100100	101001	101002	11500	9000	11000	{"23":1500}		0	2
+510011	鐜嬪厓濮�	1	4	2	2	5100110	101101	101102	11500	9000	11000	{"21":1500}	2	0	1
+510012	鍙搁┈鎳�	1	5	2	1	5100120	101201	101202	12500	9500	11000	{"31":1500}		0	6
+510013	鐢勫畵	1	5	2	2	5100130	101301	101302	12000	9500	11500	{"21":1500}		0	1
+510014	鏇规搷	1	5	1	1	5100140	101401	101402	12000	9500	11500	{"23":1500}	1	0	2
+510015	鏇逛粊	1	5	1	1	5100150	101501	101502	11000	9500	12500	{"29":1500}	1	0	5
+510016	閮槈	1	5	2	1	5100160	101601	101602	12500	9500	11000	{"27":1500}		0	4
+520001	绯滅	2	1	2	1	5200010	200101	200102	10000	7500	9500	{"27":1500}		0	4
+520002	椴嶄笁濞�	2	2	1	2	5200020	200201	200202	10500	8000	10000	{"27":1500}		0	4
+520003	鍛ㄤ粨	2	2	1	1	5200030	200301	200302	9500	8000	11000	{"29":1500}		0	5
+520004	璇歌憶鏋�	2	3	2	2	5200040	200401	200402	11500	8500	10000	{"25":1500}		0	3
+520005	鍏冲叴	2	3	1	1	5200050	200501	200502	10500	8500	11000	{"31":1500}	6	0	6
+520006	鐢樺か浜�	2	3	2	2	5200060	200601	200602	11000	8500	10500	{"21":1500}		0	1
+520007	寮犳槦褰�	2	3	1	2	5200070	200701	200702	10000	8500	11500	{"29":1500}	6	0	5
+520008	鍏抽摱灞�	2	4	1	2	5200080	200801	200802	11500	9000	11000	{"27":1500}		0	4
+520009	搴炵粺	2	4	2	1	5200090	200901	200902	12000	9000	10500	{"25":1500}		0	3
+520010	璧典簯	2	4	1	1	5200100	201001	201002	11500	9000	11000	{"25":1500}		0	3
+520011	榛勬湀鑻�	2	4	2	2	5200110	201101	201102	11500	9000	11000	{"23":1500}	5	0	2
+520012	璇歌憶浜�	2	5	2	1	5200120	201201	201202	12500	9500	11000	{"25":1500}	5	0	3
+520013	鍒樺	2	5	1	1	5200130	201301	201302	11500	9500	12000	{"25":1500}	4	0	3
+520014	鍏崇窘	2	5	1	1	5200140	201401	201402	12000	9500	11500	{"23":1500}	4	0	2
+520015	寮犻	2	5	1	1	5200150	201501	201502	11000	9500	12500	{"25":1500}	4	0	3
+520016	椹秴	2	5	1	1	5200160	201601	201602	12000	9500	11500	{"23":1500}		0	2
+530001	娼樼拫	3	1	1	1	5300010	300101	300102	10000	7500	9500	{"23":1500}		0	2
+530002	鍚村浗澶�	3	2	2	2	5300020	300201	300202	10500	8000	10000	{"27":1500}		0	4
+530003	鍑岀粺	3	2	1	1	5300030	300301	300302	10500	8000	10000	{"31":1500}		0	6
+530004	鐢樺畞	3	3	1	1	5300040	300401	300402	11000	8500	10500	{"27":1500}	9	0	4
+530005	鏈辨	3	3	1	1	5300050	300501	300502	10500	8500	11000	{"21":1500}		0	1
+530006	鍙搁┈寰�	3	3	2	1	5300060	300601	300602	11000	8500	10500	{"27":1500}		0	4
+530007	涓佸	3	3	1	1	5300070	300701	300702	10000	8500	11500	{"29":1500}	9	0	5
+530008	瀛欓瞾鑲�	3	4	2	2	5300080	300801	300802	12000	9000	10500	{"27":1500}		0	4
+530009	瀛欑瓥	3	4	1	1	5300090	300901	300902	11500	9000	11000	{"23":1500}	8	0	2
+530010	瀛欏皻棣�	3	4	2	2	5300100	301001	301002	12000	9000	10500	{"23":1500}		0	2
+530011	澶т箶	3	4	1	2	5300110	301101	301102	11500	9000	11000	{"25":1500}	8	0	3
+530012	鍛ㄧ憸	3	5	2	1	5300120	301201	301202	12500	9500	11000	{"31":1500}	7	0	6
+530013	灏忎箶	3	5	2	2	5300130	301301	301302	12000	9500	11500	{"27":1500}	7	0	4
+530014	姝ョ粌甯�	3	5	1	2	5300140	301401	301402	12000	9500	11500	{"23":1500}		0	2
+530015	瀛欏潥	3	5	1	1	5300150	301501	301502	11000	9500	12500	{"27":1500}		0	4
+530016	闄嗛��	3	5	1	1	5300160	301601	301602	12000	9500	11500	{"25":1500}		0	3
+540001	绾伒	4	1	1	1	5400010	400101	400102	10000	7500	9500	{"21":1500}		0	1
+540002	閮睖	4	2	1	1	5400020	400201	400202	10500	8000	10000	{"31":1500}	13	0	6
+540003	鏉庡倳	4	2	1	1	5400030	400301	400302	10500	8000	10000	{"27":1500}	13	0	4
+540004	寮犲疂	4	3	2	1	5400040	400401	400402	11000	8500	10500	{"29":1500}		0	5
+540005	闊╅亗	4	3	1	1	5400050	400501	400502	11000	8500	10500	{"27":1500}		0	4
+540006	瀛熻幏	4	3	1	1	5400060	400601	400602	10000	8500	11500	{"29":1500}	12	0	5
+540007	绁濊瀺	4	3	2	2	5400070	400701	400702	11500	8500	10000	{"23":1500}	12	0	2
+540008	浣曞お鍚�	4	4	2	2	5400080	400801	400802	11500	9000	11000	{"31":1500}		0	6
+540009	钁g櫧	4	4	1	2	5400090	400901	400902	11500	9000	11000	{"31":1500}	11	0	6
+540010	鍗戝讥鍛�	4	4	1	2	5400100	401001	401002	11500	9000	11000	{"23":1500}		0	2
+540011	钁e崜	4	4	1	1	5400110	401101	401102	10500	9000	12000	{"31":1500}		0	6
+540012	璨傝潐	4	5	2	2	5400120	401201	401202	12500	9500	11000	{"31":1500}	10	0	6
+540013	鍚曠幉缁�	4	5	1	2	5400130	401301	401302	12000	9500	11500	{"31":1500}	11	0	6
+540014	鍚曞竷	4	5	1	1	5400140	401401	401402	11000	9500	12500	{"29":1500}	10	0	5
+540015	寮犺	4	5	2	1	5400150	401501	401502	12000	9500	11500	{"21":1500}		0	1
+540016	宸︽厛	4	5	2	1	5400160	401601	401602	12000	9500	11500	{"27":1500}		0	4
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/HeroBreak.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/HeroBreak.txt
index a092b7d..6df4fbc 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/HeroBreak.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/HeroBreak.txt
@@ -1,7 +1,7 @@
 HeroID	BreakLV	AttrIDList	AttrValueList	SkillID
 510001	1	23	1000	0
 510001	2	59	1000	0
-510001	3	33	4000	0
+510001	3	45	4000	0
 510001	4	23	1000	0
 510001	5	0	0	100107
 510001	6	0	0	100108
@@ -208,7 +208,7 @@
 520014	4	23	1000	0
 520014	5	0	0	201407
 520014	6	0	0	201408
-520014	7	33	3000	0
+520014	7	45	3000	0
 520015	1	0	0	201503
 520015	2	62	1000	0
 520015	3	0	0	201505
@@ -229,7 +229,7 @@
 530001	4	23	1000	0
 530001	5	0	0	300107
 530001	6	0	0	300108
-530001	7	33	2000	0
+530001	7	45	2000	0
 530002	1	0	0	300203
 530002	2	64	1000	0
 530002	3	27	1000	0
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Skill.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Skill.txt
index de15b78..4fd9fc8 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Skill.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Skill.txt
@@ -1,5 +1,4 @@
 SkillID	SkillTypeID	SkillLV	SkillMaxLV	SkillName	FuncType	SkillType	HurtType	AtkType	TagAim	TagFriendly	TagAffect	TagCount	CalcType	SkillPer	SkillValue	HappenRate	EffectID1	EffectValues1	TriggerWay1	TriggerSrc1	EffectID2	EffectValues2	TriggerWay2	TriggerSrc2	EffectID3	EffectValues3	TriggerWay3	TriggerSrc3	CoolDownTime	IgnoreStates	BuffState	LastTime	LayerCnt	LayerMax	BuffRepeat	DieContinue	FightPower	SkillMotionName
-100	100	1	1	通用反击	4	1	1	1	0	0	0	1	0	10000	0	10000	0				0				0				0			0	0	0	0	0	0	
 200	200	1	1	击晕	0	14	0	0	6	0	0	0	0	0	0	10000	0				0				0				0		3	1	0	0	0	0	0	
 201	201	1	1	击晕	0	14	0	0	6	0	0	0	0	0	0	2000	0				0				0				0		3	1	0	0	0	0	0	
 300	300	1	1	冰冻	0	14	1	0	6	0	0	0	0	0	0	10000	0				0				0				0		1	1	0	0	0	0	0	
@@ -43,7 +42,7 @@
 100207	100207	1	1	折冲	3	9	0	0	5	1	0	0	0	18500	0	10000	0				0				0				0	0			0	0	0	0	0	
 100208	100208	1	1	怒气	3	1	0	6	5	1	0	0				10000																					0	
 100209	100209	1	1	升变	3	5	0	0	5	1	0	0				10000																					0	
-100301	100301	1	1	狂落	1	1	1	1	1	0	0	1	0	10500	0	10000	0				0				0				0		0	0	0	0	0	0	0	attack
+100301	100301	1	1	斩鞍	1	1	1	1	1	0	0	1	0	10500	0	10000	0				0				0				0		0	0	0	0	0	0	0	attack
 100302	100302	1	1	狂骨裂阵	2	1	1	1	2	0	0	3	0	15000	0	10000	5010	1003021	13		0				0				0		0	0	0	0	0	0	0	angerskill
 1003021	1003021	1	1	狂骨裂阵	0	6	0	0	6	0	0	0	0	0	0	4000	29	4000|1			0				0				0		0	2	0	0	0	0	0	
 100305	100305	1	1	白马浴血	3	9	0	0	5	1	0	0				10000																					0	
@@ -158,7 +157,7 @@
 101608	101608	1	1	怒气	3	1	0	6	5	1	0	0				10000																					0	
 101609	101609	1	1	升变	3																																0	
 200101	200101	1	1	济世	1	1	2	1	1	0	0	1	0	10500	0	10000	0				0				0				0		0	0	0	0	0	0	0	attack
-200102	200102	1	1	千金一掷	2	1	1	2	0	0	1	2	0	21000	0	10000	0				0				0				0		0	0	0	0	0	0	0	angerSkill
+200102	200102	1	1	千金一掷	2	1	1	1	0	0	0	2	0	21000	0	10000	0				0				0				0		0	0	0	0	0	0	0	angerSkill
 200103	200103	1	1	倾囊	3	2																															0	
 200105	200105	1	1	仁德	3	5																															0	
 200107	200107	1	1	流芳	3																																0	

--
Gitblit v1.8.0