From 703a2b503e4a67bcd520feacc71d789d5c8197e1 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期三, 06 八月 2025 18:31:31 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端（NPC、技能使用新表N.NPC表卡牌、J.技能表卡牌；重构战斗系统；优化战利品掉落；）
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Skill.txt | 19 ++
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/MainChapter.txt | 14 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Skill.txt | 19 ++
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt | 5
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/HeroFetter.txt | 8
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/MainChapter.txt | 14 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/NPC.txt | 13 +
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Hero.txt | 126 +++++++++--------
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Hero.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MainLevel.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt | 5
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/HeroFetter.txt | 8
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameObj.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/HeroLineupHalo.txt | 24 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ObjPool.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/NPC.txt | 13 +
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/TurnAttack.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.pyc | 0
/dev/null | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/HeroLineupHalo.txt | 24 +-
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldEvent.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerOnline.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Hero.txt | 126 +++++++++--------
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/MainLevel.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NetPackCommon.pyc | 0
38 files changed, 246 insertions(+), 172 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 516458c..1b6db21 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/AttackLogic/NormalNPC_Attack_NormalNPC.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_NormalNPC.pyc
deleted file mode 100644
index 6cb3f2d..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_NormalNPC.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_Pet.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_Pet.pyc
deleted file mode 100644
index e55e3eb..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_Pet.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_Player.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_Player.pyc
deleted file mode 100644
index c82c9f2..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_Player.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_SummonNPC.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_SummonNPC.pyc
deleted file mode 100644
index c248cb9..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/NormalNPC_Attack_SummonNPC.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_NormalNPC.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_NormalNPC.pyc
deleted file mode 100644
index 4974767..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_NormalNPC.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_Pet.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_Pet.pyc
deleted file mode 100644
index 5cebf83..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_Pet.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_Player.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_Player.pyc
deleted file mode 100644
index 30539e7..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_Player.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_SummonNPC.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_SummonNPC.pyc
deleted file mode 100644
index 0195ff9..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Pet_Attack_SummonNPC.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_NormalNPC.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_NormalNPC.pyc
deleted file mode 100644
index cdec5f5..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_NormalNPC.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_Pet.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_Pet.pyc
deleted file mode 100644
index 5a0ce40..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_Pet.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_Player.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_Player.pyc
deleted file mode 100644
index c3b9f9c..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_Player.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_SummonNPC.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_SummonNPC.pyc
deleted file mode 100644
index d5b3fc2..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/Player_Attack_SummonNPC.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/SummonNPC_Attack_NormalNPC.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/SummonNPC_Attack_NormalNPC.pyc
deleted file mode 100644
index 631caac..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/SummonNPC_Attack_NormalNPC.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/SummonNPC_Attack_Pet.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/SummonNPC_Attack_Pet.pyc
deleted file mode 100644
index 3450177..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/SummonNPC_Attack_Pet.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/SummonNPC_Attack_Player.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/SummonNPC_Attack_Player.pyc
deleted file mode 100644
index 6e2474c..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/SummonNPC_Attack_Player.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/SummonNPC_Attack_SummonNPC.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/SummonNPC_Attack_SummonNPC.pyc
deleted file mode 100644
index 19a5e1c..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/SummonNPC_Attack_SummonNPC.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.pyc
index 0babb62..8a5436b 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.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
new file mode 100644
index 0000000..9a13ff7
--- /dev/null
+++ 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 3f5ed49..eb45c7b 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 a43a176..cdfa01c 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/ChPyNetSendPack.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
index 1585a58..23acd9e 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Hero.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Hero.pyc
index 05d36e4..a52b918 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Hero.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/Hero.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/MainLevel.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/MainLevel.pyc
index ec70e3b..de40772 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/MainLevel.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GM/Commands/MainLevel.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameObj.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameObj.pyc
index 028bdfe..bee8a43 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameObj.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameObj.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.pyc
index 73ed5fd..730cf95 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBLogic.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MainLevel.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MainLevel.pyc
index 43af570..a9c43d5 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MainLevel.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/FBProcess/GameLogic_MainLevel.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldEvent.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldEvent.pyc
index ae8f038..e304225 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldEvent.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/GameWorldLogic/GameWorldEvent.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 d603eec..625f839 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/NPC/NPCCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc
index c417da3..3791c15 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NPC/NPCCommon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NetPackCommon.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NetPackCommon.pyc
index af80944..cfbbe64 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NetPackCommon.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/NetPackCommon.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ObjPool.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ObjPool.pyc
new file mode 100644
index 0000000..09d1bd3
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ObjPool.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
index 813fba4..b744bfc 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerControl.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerOnline.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerOnline.pyc
index 657f04a..619ce39 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerOnline.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerOnline.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.pyc
index a8d53ee..6565fb0 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/PyGameData.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 116d403..4f15a85 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/PySkillManager.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PySkillManager.pyc
deleted file mode 100644
index 1750b4f..0000000
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PySkillManager.pyc
+++ /dev/null
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc
index 68db94c..0ede422 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/SkillShell.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.pyc
new file mode 100644
index 0000000..b7e4cb8
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.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
new file mode 100644
index 0000000..ee8ab8f
--- /dev/null
+++ 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 e375129..0eb5486 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
@@ -443,15 +443,16 @@
ZhanchuiCost 2 2 1 1 1
Mainline 10 15 20
MainEquipDrop 5 42 [-3, 2] int(itemLV*attrStep*attrProportion*randfloat(0.9,1.1))
+MainBootyDrop {30:5, 6:10, 5:11, 1:12} {30:[100, 300], 6:[0, 1], 5:[0, 1], 1:[1, 10]}
TreeLVUP 42 480|300
AngerXP 50 100 50 5
-MissCfg int(min((dMiss-aHit)*pow(0.7,missNum), 8000))
+MissCfg int(min((dMissRate-aMissRateDef)*pow(0.7,missNum), 8000))
ParryCfg 0 [100, 0] 30
ComboCfg
SuperHitCfg
FaintCfg
SuckHPCfg
-HurtFormula int((aAtk-dDef)*atkSkillPer*(1+aFinalHurtPer-dFinalHurtReducePer+angerOverflow/100.0)) int((aAtk-dDef)*atkSkillPer*(1+aNormalAtkPer-dNormalAtkDefPer)*(1+aFinalHurtPer-dFinalHurtReducePer)) int((aAtk-dDef)*(1+aFinalHurtPer-dFinalHurtReducePer)) int((aAtk-dDef)*atkSkillPer*(1+aFinalHurtPer-dFinalHurtReducePer))
+HurtFormula int((aAtk-dDef)*atkSkillPer*(1+aNormalSkillPer-dNormalSkillPerDef)*(1+aPMDamPer-dPMDamPerDef)*(1+aFinalDamPer-dFinalDamPerDef)) int((aAtk-dDef)*atkSkillPer*(1+aAngerSkillPer-dAngerSkillPerDef)*(1+aPMDamPer-dPMDamPerDef)*(1+aFinalDamPer-dFinalDamPerDef+angerOverflow/100.0)) int((aAtk-dDef)*(1+aFinalDamPer-dFinalDamPerDef)) int((aAtk-dDef)*atkSkillPer*(1+aPMDamPer-dPMDamPerDef)*(1+aFinalDamPer-dFinalDamPerDef))
DOTFormula
CureFormula int(max((baseValue*skillPer)*(1+curePer-cureDefPer)*(1+angerOverflow/100.0), baseValue*0.05))
ShieldFormula
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 e360084..f6202d6 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,61 +1,65 @@
-HeroID Country Quality AtkDistType SkinIDList AtkSkillID AngerSkillID AtkInheritPer DefInheritPer HPInheritPer BatAttrDict FetterIDList
-510001 1 1 2 5100010 100101 100102 105 75 90 {}
-510002 1 2 1 5100020 100201 100202 105 80 100 {}
-510003 1 2 1 5100030 100301 100302 95 80 110 {}
-510004 1 3 2 5100040 100401 100402 115 85 100 {}
-510005 1 3 1 5100050 100501 100502 110 85 105 {}
-510006 1 3 2 5100060 100601 100602 115 85 100 {}
-510007 1 3 1 5100070 100701 100702 100 85 115 {}
-510008 1 4 2 5100080 100801 100802 115 90 110 {}
-510009 1 4 2 5100090 100901 100902 120 90 105 {}
-510010 1 4 1 5100100 101001 101002 115 90 110 {}
-510011 1 4 2 5100110 101101 101102 120 90 105 {}
-510012 1 5 2 5100120 101201 101202 125 95 110 {}
-510013 1 5 2 5100130 101301 101302 120 95 115 {}
-510014 1 5 1 5100140 101401 101402 120 95 115 {} 1
-510015 1 5 1 5100150 101501 101502 110 95 125 {} 1
-520001 2 1 2 5200010 200101 200102 100 75 95 {}
-520002 2 2 1 5200020 200201 200202 105 80 100 {}
-520003 2 2 1 5200030 200301 200302 95 80 110 {}
-520004 2 3 2 5200040 200401 200402 115 85 100 {}
-520005 2 3 1 5200050 200501 200502 110 85 105 {}
-520006 2 3 2 5200060 200601 200602 110 85 105 {}
-520007 2 3 1 5200070 200701 200702 100 85 115 {}
-520008 2 4 1 5200080 200801 200802 115 90 110 {}
-520009 2 4 2 5200090 200901 200902 120 90 105 {}
-520010 2 4 1 5200100 201001 201002 115 90 110 {}
-520011 2 4 2 5200110 201101 201102 120 90 105 {}
-520012 2 5 2 5200120 201201 201202 125 95 110 {}
-520013 2 5 1 5200130 201301 201302 115 95 120 {} 4
-520014 2 5 1 5200140 201401 201402 120 95 115 {} 4
-520015 2 5 1 5200150 201501 201502 110 95 125 {} 4
-530001 3 1 1 5300010 300101 300102 100 75 95 {}
-530002 3 2 2 5300020 300201 300202 105 80 100 {}
-530003 3 2 1 5300030 300301 300302 105 80 100 {}
-530004 3 3 1 5300040 300401 300402 110 85 105 {}
-530005 3 3 1 5300050 300501 300502 110 85 105 {}
-530006 3 3 2 5300060 300601 300602 110 85 105 {}
-530007 3 3 1 5300070 300701 300702 100 85 115 {}
-530008 3 4 2 5300080 300801 300802 120 90 105 {}
-530009 3 4 1 5300090 300901 300902 115 90 110 {}
-530010 3 4 2 5300100 301001 301002 120 90 105 {}
-530011 3 4 1 5300110 301101 301102 115 90 110 {}
-530012 3 5 2 5300120 301201 301202 125 95 110 {}
-530013 3 5 2 5300130 301301 301302 120 95 115 {}
-530014 3 5 1 5300140 301401 301402 120 95 115 {}
-530015 3 5 1 5300150 301501 301502 110 95 125 {}
-540001 4 1 1 5400010 400101 400102 100 75 95 {}
-540002 4 2 1 5400020 400201 400202 105 80 100 {}
-540003 4 2 1 5400030 400301 400302 105 80 100 {}
-540004 4 3 2 5400040 400401 400402 115 85 100 {}
-540005 4 3 1 5400050 400501 400502 110 85 105 {}
-540006 4 3 1 5400060 400601 400602 100 85 115 {}
-540007 4 3 2 5400070 400701 400702 115 85 100 {}
-540008 4 4 2 5400080 400801 400802 115 90 110 {}
-540009 4 4 1 5400090 400901 400902 115 90 110 {}
-540010 4 4 1 5400100 401001 401002 115 90 110 {}
-540011 4 4 1 5400110 401101 401102 105 90 120 {}
-540012 4 5 2 5400120 401201 401202 125 95 110 {}
-540013 4 5 1 5400130 401301 401302 120 95 115 {}
-540014 4 5 1 5400140 401401 401402 110 95 125 {}
-540015 4 5 2 5400150 401501 401502 125 95 110 {}
+HeroID Name Country Quality AtkDistType SkinIDList AtkSkillID AngerSkillID AtkInheritPer DefInheritPer HPInheritPer BatAttrDict FetterIDList
+510001 鏇瑰┐ 1 1 2 5100010 100101 100102 105 75 90 {}
+510002 涔愯繘 1 2 1 5100020 100201 100202 105 80 100 {}
+510003 搴炲痉 1 2 1 5100030 100301 100302 95 80 110 {}
+510004 鍗炲か浜� 1 3 2 5100040 100401 100402 115 85 100 {}
+510005 浜庣 1 3 1 5100050 100501 100502 105 80 110 {}
+510006 鏇硅蕉 1 3 2 5100060 100601 100602 115 85 100 {}
+510007 鏉庡吀 1 3 1 5100070 100701 100702 100 85 115 {}
+510008 钄℃枃濮� 1 4 2 5100080 100801 100802 115 90 110 {}
+510009 璐捐 1 4 2 5100090 100901 100902 120 90 105 {}
+510010 鐜嬪紓 1 4 1 5100100 101001 101002 115 90 110 {}
+510011 鐜嬪厓濮� 1 4 2 5100110 101101 101102 115 90 110 {}
+510012 鍙搁┈鎳� 1 5 2 5100120 101201 101202 125 95 110 {}
+510013 鐢勫畵 1 5 2 5100130 101301 101302 120 95 115 {}
+510014 鏇规搷 1 5 1 5100140 101401 101402 120 95 115 {} 1
+510015 鏇逛粊 1 5 1 5100150 101501 101502 110 95 125 {} 1
+510016 閮槈 1 5 2 5100160 101601 101602 125 95 110 {}
+520001 绯滅 2 1 2 5200010 200101 200102 100 75 95 {}
+520002 椴嶄笁濞� 2 2 1 5200020 200201 200202 105 80 100 {}
+520003 鍛ㄤ粨 2 2 1 5200030 200301 200302 95 80 110 {}
+520004 璇歌憶鏋� 2 3 2 5200040 200401 200402 115 85 100 {}
+520005 鍏冲叴 2 3 1 5200050 200501 200502 105 85 110 {}
+520006 鐢樺か浜� 2 3 2 5200060 200601 200602 110 85 105 {}
+520007 寮犳槦褰� 2 3 1 5200070 200701 200702 100 85 115 {}
+520008 鍏抽摱灞� 2 4 1 5200080 200801 200802 115 90 110 {}
+520009 搴炵粺 2 4 2 5200090 200901 200902 120 90 105 {}
+520010 璧典簯 2 4 1 5200100 201001 201002 115 90 110 {}
+520011 榛勬湀鑻� 2 4 2 5200110 201101 201102 115 90 110 {}
+520012 璇歌憶浜� 2 5 2 5200120 201201 201202 125 95 110 {}
+520013 鍒樺 2 5 1 5200130 201301 201302 115 95 120 {} 4
+520014 鍏崇窘 2 5 1 5200140 201401 201402 120 95 115 {} 4
+520015 寮犻 2 5 1 5200150 201501 201502 110 95 125 {} 4
+520016 椹秴 2 5 1 5200160 201601 201602 120 95 115 {} 4
+530001 娼樼拫 3 1 1 5300010 300101 300102 100 75 95 {}
+530002 鍚村浗澶� 3 2 2 5300020 300201 300202 105 80 100 {}
+530003 鍑岀粺 3 2 1 5300030 300301 300302 105 80 100 {}
+530004 鐢樺畞 3 3 1 5300040 300401 300402 110 85 105 {}
+530005 鏈辨 3 3 1 5300050 300501 300502 105 85 110 {}
+530006 鍙搁┈寰� 3 3 2 5300060 300601 300602 110 85 105 {}
+530007 涓佸 3 3 1 5300070 300701 300702 100 85 115 {}
+530008 瀛欓瞾鑲� 3 4 2 5300080 300801 300802 120 90 105 {}
+530009 瀛欑瓥 3 4 1 5300090 300901 300902 115 90 110 {}
+530010 瀛欏皻棣� 3 4 2 5300100 301001 301002 120 90 105 {}
+530011 澶т箶 3 4 1 5300110 301101 301102 115 90 110 {}
+530012 鍛ㄧ憸 3 5 2 5300120 301201 301202 125 95 110 {}
+530013 灏忎箶 3 5 2 5300130 301301 301302 120 95 115 {}
+530014 姝ョ粌甯� 3 5 1 5300140 301401 301402 120 95 115 {}
+530015 瀛欏潥 3 5 1 5300150 301501 301502 110 95 125 {}
+530016 闄嗛�� 3 5 1 5300160 301601 301602 120 95 115 {}
+540001 绾伒 4 1 1 5400010 400101 400102 100 75 95 {}
+540002 閮睖 4 2 1 5400020 400201 400202 105 80 100 {}
+540003 鏉庡倳 4 2 1 5400030 400301 400302 105 80 100 {}
+540004 寮犲疂 4 3 2 5400040 400401 400402 110 85 105 {}
+540005 闊╅亗 4 3 1 5400050 400501 400502 110 85 105 {}
+540006 瀛熻幏 4 3 1 5400060 400601 400602 100 85 115 {}
+540007 绁濊瀺 4 3 2 5400070 400701 400702 115 85 100 {}
+540008 浣曞お鍚� 4 4 2 5400080 400801 400802 115 90 110 {}
+540009 钁ｇ櫧 4 4 1 5400090 400901 400902 115 90 110 {}
+540010 鍗戝讥鍛� 4 4 1 5400100 401001 401002 115 90 110 {}
+540011 钁ｅ崜 4 4 1 5400110 401101 401102 105 90 120 {}
+540012 璨傝潐 4 5 2 5400120 401201 401202 125 95 110 {}
+540013 鍚曠幉缁� 4 5 1 5400130 401301 401302 120 95 115 {}
+540014 鍚曞竷 4 5 1 5400140 401401 401402 110 95 125 {}
+540015 寮犺 4 5 2 5400150 401501 401502 120 95 115 {}
+540016 宸︽厛 4 5 2 5400160 401601 401602 120 95 115 {}
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/HeroFetter.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/HeroFetter.txt
index d9b0667..a1f375c 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/HeroFetter.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/HeroFetter.txt
@@ -1,14 +1,14 @@
FetterID HeroIDList AttrIDList AttrValueList
1 510015|510014 17|18 2000|2000
-2 510008|510011 1 10
+2 510011|510008 1 10
3 510006|510007 1 10
4 520013|520014|520015 16|18 1000|1000
5 520012|520011 1 10
-6 520005|520007 1 10
+6 520007|520005 1 10
7 530012|530013 1 10
8 530009|530011 1 10
9 530004|530007 1 10
-10 540012|540014 1 10
-11 540015|540008 1 10
+10 540014|540012 1 10
+11 540013|540009 1 10
12 540006|540007 1 10
13 540003|540002 1 10
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/HeroLineupHalo.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/HeroLineupHalo.txt
index 9d68840..6f3e6f2 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/HeroLineupHalo.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/HeroLineupHalo.txt
@@ -1,13 +1,13 @@
Country NeedHeroCount AttrIDList AttrValueList
-1 3 16|18 1000|1000
-1 4 16|18 1500|1500
-1 5 16|18 2000|2000
-2 3 16|18 1000|1000
-2 4 16|18 1500|1500
-2 5 16|18 2000|2000
-3 3 16|18 1000|1000
-3 4 16|18 1500|1500
-3 5 16|18 2000|2000
-4 3 16|18 1000|1000
-4 4 16|18 1500|1500
-4 5 16|18 2000|2000
+1 4 16|18 1000|1000
+1 5 16|18 1500|1500
+1 6 16|18 2000|2000
+2 4 16|18 1000|1000
+2 5 16|18 1500|1500
+2 6 16|18 2000|2000
+3 4 16|18 1000|1000
+3 5 16|18 1500|1500
+3 6 16|18 2000|2000
+4 4 16|18 1000|1000
+4 5 16|18 1500|1500
+4 6 16|18 2000|2000
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/MainChapter.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/MainChapter.txt
index 61ca7cf..e431fe3 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/MainChapter.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/MainChapter.txt
@@ -1,7 +1,7 @@
-ChapterID DailyBootyUpperList BootyWeightList
-1 [[30,50000]] [[100, 0, 0, 0], [100, 30, 100, 200]]
-2 [[30,60000], [6,10]] [[100, 0, 0, 0], [100, 30, 100, 200], [30, 30, 200, 300], [25, 6, 1, 1]]
-3 [[30,70000], [6,12], [5,10]] [[100, 0, 0, 0], [100, 30, 100, 200], [30, 30, 200, 300], [25, 6, 1, 1], [25, 5, 1, 1]]
-4 [[30,80000], [6,17], [5,12], [1,100]] [[100, 0, 0, 0], [100, 30, 100, 200], [30, 30, 200, 300], [25, 6, 1, 1], [25, 5, 1, 1], [15, 1, 10, 15]]
-5 [[30,100000], [6,20], [5,15], [1,150]] [[100, 0, 0, 0], [100, 30, 100, 200], [30, 30, 200, 300], [25, 6, 1, 1], [25, 5, 1, 1], [15, 1, 10, 15]]
-6 [[30,200000], [6,25], [5,20], [1,200]] [[100, 0, 0, 0], [100, 30, 100, 200], [30, 30, 200, 300], [25, 6, 1, 1], [25, 5, 1, 1], [15, 1, 10, 15]]
+ChapterID DailyBootyUpperList
+1 [[30,50000]]
+2 [[30,60000], [6,10]]
+3 [[30,70000], [6,12], [5,10]]
+4 [[30,80000], [6,17], [5,12], [1,100]]
+5 [[30,100000], [6,20], [5,15], [1,150]]
+6 [[30,200000], [6,25], [5,20], [1,200]]
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/NPC.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/NPC.txt
new file mode 100644
index 0000000..f7f6395
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/NPC.txt
@@ -0,0 +1,13 @@
+NPCID NPCName Country AtkDistType LV Atk Def MaxHP SkillIDList FinalDamPer FinalDamPerDef MissRate MissRateDef SuperHitRate SuperHitRateDef StunRate StunRateDef ComboRate ComboRateDef ParryRate ParryRateDef SuckHPPer SuckHPPerDef SpecAttrInfo
+10101001 机关傀儡 0 0 1 1000000 100000 200000000 [100101, 100102] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
+10101002 大耳妖狸 0 0 2 2000000 200000 300000000 [100101, 100102] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
+20103001 蜘蛛女皇 0 2 10 10000000 1000000 1000000000 [100101, 100102] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
+20103002 嗜海狂鲨 0 1 11 10000000 1000000 1000000000 [200101, 200102] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
+20103003 古墓石巨人 0 1 12 10000000 1000000 1000000000 [100101, 100102] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
+20103004 残暴海怪 0 2 13 10000000 1000000 1000000000 [200101, 200102] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
+20103005 寒冰古妖 0 1 14 10000000 1000000 1000000000 [100101, 100102] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
+20103006 翻水妖龙 0 1 15 10000000 1000000 1000000000 [200101, 200102] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
+20103007 深海之王 0 0 16 10000000 1000000 1000000000 [100101, 100102] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
+20203005 荒漠匪首 0 1 17 10000000 1000000 1000000000 [200101, 200102] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
+20203006 迷幻之灵 0 2 18 10000000 1000000 1000000000 [100101, 100102] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
+20203007 荒漠巨兽 0 1 19 10000000 1000000 1000000000 [200101, 200102] 0 0 0 0 0 0 0 0 0 0 0 0 0 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
new file mode 100644
index 0000000..da95628
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Skill.txt
@@ -0,0 +1,19 @@
+SkillID SkillTypeID SkillMaxLV SkillName FuncType SkillType HurtType AtkType TagAim TagFriendly TagAffect TagCount HappenRate LastTime CoolDownTime Priority EffectID1 EffectValues1 EffectID2 EffectValues2 EffectID3 EffectValues3 ConnSkill EnhanceSkillList FightPower
+100 100 1 通用反击 4 1 1 1 0 0 0 1 10000 0 0 0 1010 10000 0 0 0 0
+200 200 1 眩晕 0 14 0 0 6 0 0 0 10000 1 0 0 4012 7
+100101 100101 1 曹婴普技 1 1 1 1 0 0 1 1 10000 0 0 0 1010 10000 0 0 0 0
+100102 100102 1 曹婴怒技 2 1 1 1 4 0 0 2 10000 0 0 0 1010 21000 0 0 0 0
+100301 100301 1 庞德普技 1 1 1 1 1 0 0 1 10000 0 0 0 1010 10500 0 0 0 0
+100302 100302 1 庞德怒技 2 1 1 1 2 0 0 3 10000 0 0 0 1010 15000 0 0 0 1003021 0
+1003021 1003021 1 卸甲 0 6 0 0 6 0 0 0 5000 2 0 0 17 5000|2 0 0 0
+200101 200101 1 糜竺普技 1 1 1 1 1 0 0 1 10000 0 0 0 1010 10500 0 0 0 0
+200102 200102 1 糜竺怒技 2 2 1 2 0 1 1 2 10000 0 0 0 1000 21000|0 0 0 0 0
+300101 300101 1 潘璋普技 1 1 1 1 1 0 0 1 10000 0 0 0 1010 7000 0 0 0 3001011 0
+3001011 3001011 1 灼烧 0 4 1 0 6 0 0 0 10000 2 0 0 1034 7500 5001 0 4012 13 0 0
+300102 300102 1 潘璋怒技 2 1 1 1 1 0 0 1 10000 0 0 0 1010 30000 0 0 0 3001021 0
+3001021 3001021 1 额外怒气 0 0 0 6 5 0 0 0 10000 0 0 0 1001 0|10|1 0 0 0 0
+400101 400101 1 纪灵普技 1 1 1 1 1 0 0 1 10000 0 0 0 1010 12000 0 0 0 0
+400102 400102 1 纪灵怒技 2 1 1 1 2 0 0 0 10000 0 0 0 1010 13000 0 0 0 4001021 0
+4001021 4001021 1 额外击晕 0 14 0 0 6 0 0 0 2000 1 0 0 4012 7 0 0 0
+400201 400201 1 郭汜普技 1 1 2 1 3 0 0 1 10000 0 0 0 1010 10000 0 0 0 0
+400202 400202 1 郭汜怒技 2 1 2 1 3 0 0 2 10000 0 0 0 1010 22000 0 0 0 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 e375129..0eb5486 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
@@ -443,15 +443,16 @@
ZhanchuiCost 2 2 1 1 1
Mainline 10 15 20
MainEquipDrop 5 42 [-3, 2] int(itemLV*attrStep*attrProportion*randfloat(0.9,1.1))
+MainBootyDrop {30:5, 6:10, 5:11, 1:12} {30:[100, 300], 6:[0, 1], 5:[0, 1], 1:[1, 10]}
TreeLVUP 42 480|300
AngerXP 50 100 50 5
-MissCfg int(min((dMiss-aHit)*pow(0.7,missNum), 8000))
+MissCfg int(min((dMissRate-aMissRateDef)*pow(0.7,missNum), 8000))
ParryCfg 0 [100, 0] 30
ComboCfg
SuperHitCfg
FaintCfg
SuckHPCfg
-HurtFormula int((aAtk-dDef)*atkSkillPer*(1+aFinalHurtPer-dFinalHurtReducePer+angerOverflow/100.0)) int((aAtk-dDef)*atkSkillPer*(1+aNormalAtkPer-dNormalAtkDefPer)*(1+aFinalHurtPer-dFinalHurtReducePer)) int((aAtk-dDef)*(1+aFinalHurtPer-dFinalHurtReducePer)) int((aAtk-dDef)*atkSkillPer*(1+aFinalHurtPer-dFinalHurtReducePer))
+HurtFormula int((aAtk-dDef)*atkSkillPer*(1+aNormalSkillPer-dNormalSkillPerDef)*(1+aPMDamPer-dPMDamPerDef)*(1+aFinalDamPer-dFinalDamPerDef)) int((aAtk-dDef)*atkSkillPer*(1+aAngerSkillPer-dAngerSkillPerDef)*(1+aPMDamPer-dPMDamPerDef)*(1+aFinalDamPer-dFinalDamPerDef+angerOverflow/100.0)) int((aAtk-dDef)*(1+aFinalDamPer-dFinalDamPerDef)) int((aAtk-dDef)*atkSkillPer*(1+aPMDamPer-dPMDamPerDef)*(1+aFinalDamPer-dFinalDamPerDef))
DOTFormula
CureFormula int(max((baseValue*skillPer)*(1+curePer-cureDefPer)*(1+angerOverflow/100.0), baseValue*0.05))
ShieldFormula
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 e360084..f6202d6 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,61 +1,65 @@
-HeroID Country Quality AtkDistType SkinIDList AtkSkillID AngerSkillID AtkInheritPer DefInheritPer HPInheritPer BatAttrDict FetterIDList
-510001 1 1 2 5100010 100101 100102 105 75 90 {}
-510002 1 2 1 5100020 100201 100202 105 80 100 {}
-510003 1 2 1 5100030 100301 100302 95 80 110 {}
-510004 1 3 2 5100040 100401 100402 115 85 100 {}
-510005 1 3 1 5100050 100501 100502 110 85 105 {}
-510006 1 3 2 5100060 100601 100602 115 85 100 {}
-510007 1 3 1 5100070 100701 100702 100 85 115 {}
-510008 1 4 2 5100080 100801 100802 115 90 110 {}
-510009 1 4 2 5100090 100901 100902 120 90 105 {}
-510010 1 4 1 5100100 101001 101002 115 90 110 {}
-510011 1 4 2 5100110 101101 101102 120 90 105 {}
-510012 1 5 2 5100120 101201 101202 125 95 110 {}
-510013 1 5 2 5100130 101301 101302 120 95 115 {}
-510014 1 5 1 5100140 101401 101402 120 95 115 {} 1
-510015 1 5 1 5100150 101501 101502 110 95 125 {} 1
-520001 2 1 2 5200010 200101 200102 100 75 95 {}
-520002 2 2 1 5200020 200201 200202 105 80 100 {}
-520003 2 2 1 5200030 200301 200302 95 80 110 {}
-520004 2 3 2 5200040 200401 200402 115 85 100 {}
-520005 2 3 1 5200050 200501 200502 110 85 105 {}
-520006 2 3 2 5200060 200601 200602 110 85 105 {}
-520007 2 3 1 5200070 200701 200702 100 85 115 {}
-520008 2 4 1 5200080 200801 200802 115 90 110 {}
-520009 2 4 2 5200090 200901 200902 120 90 105 {}
-520010 2 4 1 5200100 201001 201002 115 90 110 {}
-520011 2 4 2 5200110 201101 201102 120 90 105 {}
-520012 2 5 2 5200120 201201 201202 125 95 110 {}
-520013 2 5 1 5200130 201301 201302 115 95 120 {} 4
-520014 2 5 1 5200140 201401 201402 120 95 115 {} 4
-520015 2 5 1 5200150 201501 201502 110 95 125 {} 4
-530001 3 1 1 5300010 300101 300102 100 75 95 {}
-530002 3 2 2 5300020 300201 300202 105 80 100 {}
-530003 3 2 1 5300030 300301 300302 105 80 100 {}
-530004 3 3 1 5300040 300401 300402 110 85 105 {}
-530005 3 3 1 5300050 300501 300502 110 85 105 {}
-530006 3 3 2 5300060 300601 300602 110 85 105 {}
-530007 3 3 1 5300070 300701 300702 100 85 115 {}
-530008 3 4 2 5300080 300801 300802 120 90 105 {}
-530009 3 4 1 5300090 300901 300902 115 90 110 {}
-530010 3 4 2 5300100 301001 301002 120 90 105 {}
-530011 3 4 1 5300110 301101 301102 115 90 110 {}
-530012 3 5 2 5300120 301201 301202 125 95 110 {}
-530013 3 5 2 5300130 301301 301302 120 95 115 {}
-530014 3 5 1 5300140 301401 301402 120 95 115 {}
-530015 3 5 1 5300150 301501 301502 110 95 125 {}
-540001 4 1 1 5400010 400101 400102 100 75 95 {}
-540002 4 2 1 5400020 400201 400202 105 80 100 {}
-540003 4 2 1 5400030 400301 400302 105 80 100 {}
-540004 4 3 2 5400040 400401 400402 115 85 100 {}
-540005 4 3 1 5400050 400501 400502 110 85 105 {}
-540006 4 3 1 5400060 400601 400602 100 85 115 {}
-540007 4 3 2 5400070 400701 400702 115 85 100 {}
-540008 4 4 2 5400080 400801 400802 115 90 110 {}
-540009 4 4 1 5400090 400901 400902 115 90 110 {}
-540010 4 4 1 5400100 401001 401002 115 90 110 {}
-540011 4 4 1 5400110 401101 401102 105 90 120 {}
-540012 4 5 2 5400120 401201 401202 125 95 110 {}
-540013 4 5 1 5400130 401301 401302 120 95 115 {}
-540014 4 5 1 5400140 401401 401402 110 95 125 {}
-540015 4 5 2 5400150 401501 401502 125 95 110 {}
+HeroID Name Country Quality AtkDistType SkinIDList AtkSkillID AngerSkillID AtkInheritPer DefInheritPer HPInheritPer BatAttrDict FetterIDList
+510001 鏇瑰┐ 1 1 2 5100010 100101 100102 105 75 90 {}
+510002 涔愯繘 1 2 1 5100020 100201 100202 105 80 100 {}
+510003 搴炲痉 1 2 1 5100030 100301 100302 95 80 110 {}
+510004 鍗炲か浜� 1 3 2 5100040 100401 100402 115 85 100 {}
+510005 浜庣 1 3 1 5100050 100501 100502 105 80 110 {}
+510006 鏇硅蕉 1 3 2 5100060 100601 100602 115 85 100 {}
+510007 鏉庡吀 1 3 1 5100070 100701 100702 100 85 115 {}
+510008 钄℃枃濮� 1 4 2 5100080 100801 100802 115 90 110 {}
+510009 璐捐 1 4 2 5100090 100901 100902 120 90 105 {}
+510010 鐜嬪紓 1 4 1 5100100 101001 101002 115 90 110 {}
+510011 鐜嬪厓濮� 1 4 2 5100110 101101 101102 115 90 110 {}
+510012 鍙搁┈鎳� 1 5 2 5100120 101201 101202 125 95 110 {}
+510013 鐢勫畵 1 5 2 5100130 101301 101302 120 95 115 {}
+510014 鏇规搷 1 5 1 5100140 101401 101402 120 95 115 {} 1
+510015 鏇逛粊 1 5 1 5100150 101501 101502 110 95 125 {} 1
+510016 閮槈 1 5 2 5100160 101601 101602 125 95 110 {}
+520001 绯滅 2 1 2 5200010 200101 200102 100 75 95 {}
+520002 椴嶄笁濞� 2 2 1 5200020 200201 200202 105 80 100 {}
+520003 鍛ㄤ粨 2 2 1 5200030 200301 200302 95 80 110 {}
+520004 璇歌憶鏋� 2 3 2 5200040 200401 200402 115 85 100 {}
+520005 鍏冲叴 2 3 1 5200050 200501 200502 105 85 110 {}
+520006 鐢樺か浜� 2 3 2 5200060 200601 200602 110 85 105 {}
+520007 寮犳槦褰� 2 3 1 5200070 200701 200702 100 85 115 {}
+520008 鍏抽摱灞� 2 4 1 5200080 200801 200802 115 90 110 {}
+520009 搴炵粺 2 4 2 5200090 200901 200902 120 90 105 {}
+520010 璧典簯 2 4 1 5200100 201001 201002 115 90 110 {}
+520011 榛勬湀鑻� 2 4 2 5200110 201101 201102 115 90 110 {}
+520012 璇歌憶浜� 2 5 2 5200120 201201 201202 125 95 110 {}
+520013 鍒樺 2 5 1 5200130 201301 201302 115 95 120 {} 4
+520014 鍏崇窘 2 5 1 5200140 201401 201402 120 95 115 {} 4
+520015 寮犻 2 5 1 5200150 201501 201502 110 95 125 {} 4
+520016 椹秴 2 5 1 5200160 201601 201602 120 95 115 {} 4
+530001 娼樼拫 3 1 1 5300010 300101 300102 100 75 95 {}
+530002 鍚村浗澶� 3 2 2 5300020 300201 300202 105 80 100 {}
+530003 鍑岀粺 3 2 1 5300030 300301 300302 105 80 100 {}
+530004 鐢樺畞 3 3 1 5300040 300401 300402 110 85 105 {}
+530005 鏈辨 3 3 1 5300050 300501 300502 105 85 110 {}
+530006 鍙搁┈寰� 3 3 2 5300060 300601 300602 110 85 105 {}
+530007 涓佸 3 3 1 5300070 300701 300702 100 85 115 {}
+530008 瀛欓瞾鑲� 3 4 2 5300080 300801 300802 120 90 105 {}
+530009 瀛欑瓥 3 4 1 5300090 300901 300902 115 90 110 {}
+530010 瀛欏皻棣� 3 4 2 5300100 301001 301002 120 90 105 {}
+530011 澶т箶 3 4 1 5300110 301101 301102 115 90 110 {}
+530012 鍛ㄧ憸 3 5 2 5300120 301201 301202 125 95 110 {}
+530013 灏忎箶 3 5 2 5300130 301301 301302 120 95 115 {}
+530014 姝ョ粌甯� 3 5 1 5300140 301401 301402 120 95 115 {}
+530015 瀛欏潥 3 5 1 5300150 301501 301502 110 95 125 {}
+530016 闄嗛�� 3 5 1 5300160 301601 301602 120 95 115 {}
+540001 绾伒 4 1 1 5400010 400101 400102 100 75 95 {}
+540002 閮睖 4 2 1 5400020 400201 400202 105 80 100 {}
+540003 鏉庡倳 4 2 1 5400030 400301 400302 105 80 100 {}
+540004 寮犲疂 4 3 2 5400040 400401 400402 110 85 105 {}
+540005 闊╅亗 4 3 1 5400050 400501 400502 110 85 105 {}
+540006 瀛熻幏 4 3 1 5400060 400601 400602 100 85 115 {}
+540007 绁濊瀺 4 3 2 5400070 400701 400702 115 85 100 {}
+540008 浣曞お鍚� 4 4 2 5400080 400801 400802 115 90 110 {}
+540009 钁ｇ櫧 4 4 1 5400090 400901 400902 115 90 110 {}
+540010 鍗戝讥鍛� 4 4 1 5400100 401001 401002 115 90 110 {}
+540011 钁ｅ崜 4 4 1 5400110 401101 401102 105 90 120 {}
+540012 璨傝潐 4 5 2 5400120 401201 401202 125 95 110 {}
+540013 鍚曠幉缁� 4 5 1 5400130 401301 401302 120 95 115 {}
+540014 鍚曞竷 4 5 1 5400140 401401 401402 110 95 125 {}
+540015 寮犺 4 5 2 5400150 401501 401502 120 95 115 {}
+540016 宸︽厛 4 5 2 5400160 401601 401602 120 95 115 {}
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/HeroFetter.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/HeroFetter.txt
index d9b0667..a1f375c 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/HeroFetter.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/HeroFetter.txt
@@ -1,14 +1,14 @@
FetterID HeroIDList AttrIDList AttrValueList
1 510015|510014 17|18 2000|2000
-2 510008|510011 1 10
+2 510011|510008 1 10
3 510006|510007 1 10
4 520013|520014|520015 16|18 1000|1000
5 520012|520011 1 10
-6 520005|520007 1 10
+6 520007|520005 1 10
7 530012|530013 1 10
8 530009|530011 1 10
9 530004|530007 1 10
-10 540012|540014 1 10
-11 540015|540008 1 10
+10 540014|540012 1 10
+11 540013|540009 1 10
12 540006|540007 1 10
13 540003|540002 1 10
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/HeroLineupHalo.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/HeroLineupHalo.txt
index 9d68840..6f3e6f2 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/HeroLineupHalo.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/HeroLineupHalo.txt
@@ -1,13 +1,13 @@
Country NeedHeroCount AttrIDList AttrValueList
-1 3 16|18 1000|1000
-1 4 16|18 1500|1500
-1 5 16|18 2000|2000
-2 3 16|18 1000|1000
-2 4 16|18 1500|1500
-2 5 16|18 2000|2000
-3 3 16|18 1000|1000
-3 4 16|18 1500|1500
-3 5 16|18 2000|2000
-4 3 16|18 1000|1000
-4 4 16|18 1500|1500
-4 5 16|18 2000|2000
+1 4 16|18 1000|1000
+1 5 16|18 1500|1500
+1 6 16|18 2000|2000
+2 4 16|18 1000|1000
+2 5 16|18 1500|1500
+2 6 16|18 2000|2000
+3 4 16|18 1000|1000
+3 5 16|18 1500|1500
+3 6 16|18 2000|2000
+4 4 16|18 1000|1000
+4 5 16|18 1500|1500
+4 6 16|18 2000|2000
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/MainChapter.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/MainChapter.txt
index 61ca7cf..e431fe3 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/MainChapter.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/MainChapter.txt
@@ -1,7 +1,7 @@
-ChapterID DailyBootyUpperList BootyWeightList
-1 [[30,50000]] [[100, 0, 0, 0], [100, 30, 100, 200]]
-2 [[30,60000], [6,10]] [[100, 0, 0, 0], [100, 30, 100, 200], [30, 30, 200, 300], [25, 6, 1, 1]]
-3 [[30,70000], [6,12], [5,10]] [[100, 0, 0, 0], [100, 30, 100, 200], [30, 30, 200, 300], [25, 6, 1, 1], [25, 5, 1, 1]]
-4 [[30,80000], [6,17], [5,12], [1,100]] [[100, 0, 0, 0], [100, 30, 100, 200], [30, 30, 200, 300], [25, 6, 1, 1], [25, 5, 1, 1], [15, 1, 10, 15]]
-5 [[30,100000], [6,20], [5,15], [1,150]] [[100, 0, 0, 0], [100, 30, 100, 200], [30, 30, 200, 300], [25, 6, 1, 1], [25, 5, 1, 1], [15, 1, 10, 15]]
-6 [[30,200000], [6,25], [5,20], [1,200]] [[100, 0, 0, 0], [100, 30, 100, 200], [30, 30, 200, 300], [25, 6, 1, 1], [25, 5, 1, 1], [15, 1, 10, 15]]
+ChapterID DailyBootyUpperList
+1 [[30,50000]]
+2 [[30,60000], [6,10]]
+3 [[30,70000], [6,12], [5,10]]
+4 [[30,80000], [6,17], [5,12], [1,100]]
+5 [[30,100000], [6,20], [5,15], [1,150]]
+6 [[30,200000], [6,25], [5,20], [1,200]]
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/NPC.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/NPC.txt
new file mode 100644
index 0000000..f7f6395
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/NPC.txt
@@ -0,0 +1,13 @@
+NPCID NPCName Country AtkDistType LV Atk Def MaxHP SkillIDList FinalDamPer FinalDamPerDef MissRate MissRateDef SuperHitRate SuperHitRateDef StunRate StunRateDef ComboRate ComboRateDef ParryRate ParryRateDef SuckHPPer SuckHPPerDef SpecAttrInfo
+10101001 机关傀儡 0 0 1 1000000 100000 200000000 [100101, 100102] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
+10101002 大耳妖狸 0 0 2 2000000 200000 300000000 [100101, 100102] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
+20103001 蜘蛛女皇 0 2 10 10000000 1000000 1000000000 [100101, 100102] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
+20103002 嗜海狂鲨 0 1 11 10000000 1000000 1000000000 [200101, 200102] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
+20103003 古墓石巨人 0 1 12 10000000 1000000 1000000000 [100101, 100102] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
+20103004 残暴海怪 0 2 13 10000000 1000000 1000000000 [200101, 200102] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
+20103005 寒冰古妖 0 1 14 10000000 1000000 1000000000 [100101, 100102] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
+20103006 翻水妖龙 0 1 15 10000000 1000000 1000000000 [200101, 200102] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
+20103007 深海之王 0 0 16 10000000 1000000 1000000000 [100101, 100102] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
+20203005 荒漠匪首 0 1 17 10000000 1000000 1000000000 [200101, 200102] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
+20203006 迷幻之灵 0 2 18 10000000 1000000 1000000000 [100101, 100102] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
+20203007 荒漠巨兽 0 1 19 10000000 1000000 1000000000 [200101, 200102] 0 0 0 0 0 0 0 0 0 0 0 0 0 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
new file mode 100644
index 0000000..da95628
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Skill.txt
@@ -0,0 +1,19 @@
+SkillID SkillTypeID SkillMaxLV SkillName FuncType SkillType HurtType AtkType TagAim TagFriendly TagAffect TagCount HappenRate LastTime CoolDownTime Priority EffectID1 EffectValues1 EffectID2 EffectValues2 EffectID3 EffectValues3 ConnSkill EnhanceSkillList FightPower
+100 100 1 通用反击 4 1 1 1 0 0 0 1 10000 0 0 0 1010 10000 0 0 0 0
+200 200 1 眩晕 0 14 0 0 6 0 0 0 10000 1 0 0 4012 7
+100101 100101 1 曹婴普技 1 1 1 1 0 0 1 1 10000 0 0 0 1010 10000 0 0 0 0
+100102 100102 1 曹婴怒技 2 1 1 1 4 0 0 2 10000 0 0 0 1010 21000 0 0 0 0
+100301 100301 1 庞德普技 1 1 1 1 1 0 0 1 10000 0 0 0 1010 10500 0 0 0 0
+100302 100302 1 庞德怒技 2 1 1 1 2 0 0 3 10000 0 0 0 1010 15000 0 0 0 1003021 0
+1003021 1003021 1 卸甲 0 6 0 0 6 0 0 0 5000 2 0 0 17 5000|2 0 0 0
+200101 200101 1 糜竺普技 1 1 1 1 1 0 0 1 10000 0 0 0 1010 10500 0 0 0 0
+200102 200102 1 糜竺怒技 2 2 1 2 0 1 1 2 10000 0 0 0 1000 21000|0 0 0 0 0
+300101 300101 1 潘璋普技 1 1 1 1 1 0 0 1 10000 0 0 0 1010 7000 0 0 0 3001011 0
+3001011 3001011 1 灼烧 0 4 1 0 6 0 0 0 10000 2 0 0 1034 7500 5001 0 4012 13 0 0
+300102 300102 1 潘璋怒技 2 1 1 1 1 0 0 1 10000 0 0 0 1010 30000 0 0 0 3001021 0
+3001021 3001021 1 额外怒气 0 0 0 6 5 0 0 0 10000 0 0 0 1001 0|10|1 0 0 0 0
+400101 400101 1 纪灵普技 1 1 1 1 1 0 0 1 10000 0 0 0 1010 12000 0 0 0 0
+400102 400102 1 纪灵怒技 2 1 1 1 2 0 0 0 10000 0 0 0 1010 13000 0 0 0 4001021 0
+4001021 4001021 1 额外击晕 0 14 0 0 6 0 0 0 2000 1 0 0 4012 7 0 0 0
+400201 400201 1 郭汜普技 1 1 2 1 3 0 0 1 10000 0 0 0 1010 10000 0 0 0 0
+400202 400202 1 郭汜怒技 2 1 2 1 3 0 0 2 10000 0 0 0 1010 22000 0 0 0 0
--
Gitblit v1.8.0