From 3a055112431d7279f738f464c2cdf1bd19bd52a5 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期一, 25 八月 2025 14:10:09 +0800
Subject: [PATCH] 129 【战斗】战斗系统-服务端（技能触发来源触发逻辑优化；增加承伤盾支持，0428通知buff相关值；增加嘲讽支持，优化技能选择目标逻辑；增加连击、反击、格挡、暴击、通用击晕支持；）
---
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnSkill.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/Skill.txt | 48 +++++++++-------
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5001.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/Skill.txt | 48 +++++++++-------
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/NPC.txt | 24 ++++----
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/GameSkills/SkillCommon.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuffs/BuffAtkType_1003.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/Script/Skill/PassiveTrigger/PassiveEff_5010.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChPyNetSendPack.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/FuncConfig.txt | 13 ++--
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/NPC.txt | 24 ++++----
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuffs/BuffAtkType_1001.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BattleObj.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5011.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.pyc | 0
ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/FuncConfig.txt | 13 ++--
21 files changed, 90 insertions(+), 80 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 aeca801..f6dc10c 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 b226d88..beca967 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 3683577..6bf4589 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 1b3f79a..2a5d069 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 325d68b..7f193ae 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/IpyGameDataPY.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/IpyGameDataPY.pyc
index cd63081..ed45136 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 581dc6e..94e3e9a 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/PassiveTrigger/PassiveEff_5001.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5001.pyc
index 7e92b1f..91f0885 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5001.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5001.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5010.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5010.pyc
new file mode 100644
index 0000000..dfd2f23
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5010.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5011.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5011.pyc
new file mode 100644
index 0000000..cc62526
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/PassiveTrigger/PassiveEff_5011.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
index 2e92db3..d18941e 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuff.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuffs/BuffAtkType_1001.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuffs/BuffAtkType_1001.pyc
index 12bd57f..a00e7ce 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuffs/BuffAtkType_1001.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuffs/BuffAtkType_1001.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuffs/BuffAtkType_1003.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuffs/BuffAtkType_1003.pyc
new file mode 100644
index 0000000..0598ce2
--- /dev/null
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnBuffs/BuffAtkType_1003.pyc
Binary files differ
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.pyc b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.pyc
index 595113b..6e0ce15 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.pyc
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/TurnPassive.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 eadfa6c..969c524 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 c589ac1..fb552d3 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
@@ -439,14 +439,13 @@
TreeLVUP 42 4|300
AngerXP 50 100 50 5
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+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))
+ParryCfg int(min((dParryRate-aParryRateDef)*pow(0.7,parryNum), 8000)) [100, 0] 0.5
+ComboCfg 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))
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))
-ShieldFormula
InvestCost {} {} {"7":[101],"12":[102]} {} {}
InvestMaxDay {"7":28,"12":0} [7,8]
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/NPC.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/NPC.txt
index 566665a..ada47cf 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/NPC.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10010/PySysDB/NPC.txt
@@ -1,16 +1,16 @@
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 [100061, 100062] 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 {}
+10101001 机关傀儡 0 0 1 50000000 100000 200000000 [100601, 100602] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
+10101002 大耳妖狸 0 0 2 50000000 200000 300000000 [100101, 100102] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
+20103001 蜘蛛女皇 0 2 10 50000000 1000000 1000000000 [100101, 100102] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
+20103002 嗜海狂鲨 0 1 11 50000000 1000000 1000000000 [200101, 200102] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
+20103003 古墓石巨人 0 1 12 50000000 1000000 1000000000 [100101, 100102] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
+20103004 残暴海怪 0 2 13 50000000 1000000 1000000000 [200101, 200102] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
+20103005 寒冰古妖 0 1 14 50000000 1000000 1000000000 [100101, 100102] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
+20103006 翻水妖龙 0 1 15 50000000 1000000 1000000000 [200101, 200102] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
+20103007 深海之王 0 0 16 50000000 1000000 1000000000 [100101, 100102] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
+20203005 荒漠匪首 0 1 17 50000000 1000000 1000000000 [200101, 200102] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
+20203006 迷幻之灵 0 2 18 50000000 1000000 1000000000 [100101, 100102] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
+20203007 荒漠巨兽 0 1 19 50000000 1000000 1000000000 [200101, 200102] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
510006 机关傀儡 0 0 1 1000000 100000 200000000 [100101, 100102] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
510010 蜘蛛女皇 0 2 10 10000000 1000000 1000000000 [100101, 100102] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
510015 嗜海狂鲨 0 1 11 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
index 68de1f4..0c641ea 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,21 +1,27 @@
-SkillID SkillTypeID SkillLV SkillMaxLV SkillName FuncType SkillType HurtType AtkType TagAim TagFriendly TagAffect TagCount CalcType SkillPer SkillValue HappenRate EffectID1 EffectValues1 TriggerWay1 TriggerSrc1 TriggerParams1 EffectID2 EffectValues2 TriggerWay2 TriggerSrc2 TriggerParams2 EffectID3 EffectValues3 TriggerWay3 TriggerSrc3 TriggerParams3 ConnSkill CoolDownTime IgnoreStates BuffStates LastTime LayerCnt LayerMax BuffRepeat DieContinue EnhanceSkillList FightPower
-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 0
-200 200 1 1 眩晕 0 14 0 0 6 0 0 0 0 0 0 10000 0 0 0 0 0 3 1 0 0 0 0 0
-100101 100101 1 1 曹婴普技 1 1 1 1 0 0 1 1 0 10000 0 10000 0 0 0 0 0 0 0 0 0 0 0
-100102 100102 1 1 曹婴怒技 2 1 1 1 4 0 0 2 0 21000 0 10000 0 0 0 0 0 0 0 0 0 0 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
-100302 100302 1 1 庞德怒技 2 1 1 1 2 0 0 3 0 15000 0 10000 0 0 0 0 0 0 0 0 0 0 1003021 0
-1003021 1003021 1 1 卸甲 0 6 0 0 6 0 0 0 0 0 0 5000 17 5000|2 0 0 0 0 2 0 0 0 0 0
-200101 200101 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
-200102 200102 1 1 糜竺怒技 2 2 1 2 0 1 1 2 0 21000 0 10000 0 0 0 0 0 0 0 0 0 0 0
-300101 300101 1 1 潘璋普技 1 1 1 1 1 0 0 1 0 7000 0 10000 0 0 0 0 0 0 0 0 0 0 3001011 0
-3001011 3001011 1 1 灼烧 0 4 1 1001 6 0 0 0 0 7500 0 10000 5001 1 4 2 0 0 0 0 4 2 2 0 0 0 0
-300102 300102 1 1 潘璋怒技 2 1 1 1 1 0 0 1 0 30000 0 10000 0 0 0 0 0 0 0 0 0 0 3001021 0
-3001021 3001021 1 1 额外怒气 0 0 0 6 5 0 0 0 0 0 10 10000 0 0 0 0 0 0 0 0 0 0 0
-400101 400101 1 1 纪灵普技 1 1 1 1 1 0 0 1 0 12000 0 10000 0 0 0 0 0 0 0 0 0 0 0
-400102 400102 1 1 纪灵怒技 2 1 1 1 2 0 0 0 0 13000 0 10000 0 0 0 0 0 0 0 0 0 0 4001021 0
-4001021 4001021 1 1 额外击晕 0 14 0 0 6 0 0 0 0 0 0 2000 0 0 0 0 0 3 1 0 0 0 0 0
-400201 400201 1 1 郭汜普技 1 1 2 1 3 0 0 1 0 10000 0 10000 0 0 0 0 0 0 0 0 0 0 0
-400202 400202 1 1 郭汜怒技 2 1 2 1 3 0 0 2 0 22000 0 10000 0 0 0 0 0 0 0 0 0 0 0
-100601 100601 1 1 寒星 1 1 2 1 3 0 0 1 0 10000 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-100602 100602 1 1 寒霜叠嶂 2 1 2 1 3 0 0 3 0 18500 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+SkillID SkillTypeID SkillLV SkillMaxLV SkillName FuncType SkillType HurtType AtkType TagAim TagFriendly TagAffect TagCount CalcType SkillPer SkillValue HappenRate EffectID1 EffectValues1 TriggerWay1 TriggerSrc1 TriggerParams1 EffectID2 EffectValues2 TriggerWay2 TriggerSrc2 TriggerParams2 EffectID3 EffectValues3 TriggerWay3 TriggerSrc3 TriggerParams3 CoolDownTime IgnoreStates BuffState LastTime LayerCnt LayerMax BuffRepeat DieContinue EnhanceSkillList 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
+100101 100101 1 1 曹婴普技 1 1 1 1 0 0 1 1 0 10000 0 10000 0 0 0 0 0 0 0 0 0 0
+100102 100102 1 1 曹婴怒技 2 1 1 1 4 0 0 2 0 21000 0 10000 0 0 0 0 0 0 0 0 0 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
+100302 100302 1 1 庞德怒技 2 1 1 1 2 0 0 3 0 15000 0 10000 0 0 0 0 0 0 0 0 0 1003021 0
+1003021 1003021 1 1 卸甲 0 6 0 0 6 0 0 0 0 0 0 5000 17 5000|2 0 0 0 2 0 0 0 0 0
+101501 101501 1 1 曹仁普技 1 1 1 1 1 0 0 1 0 8000 0 10000 5010 1015011 9 101501 1|3|12 0 0 0 0 0 0 0 0 0
+1015011 1015011 1 1 护盾 0 5 0 1003 5 0 0 0 1 1000 0 10000 0 0 0 0 0 0 0 0 0 0
+101502 101502 1 1 曹仁怒技 2 5 1 1003 5 0 0 0 1 2000 0 10000 5011 1015022 11 2 5011 1015023 12 101502 0 0 2 0 0 0 0 1015021 0 attack
+1015021 1015021 1 1 嘲讽 0 6 1 0 0 0 4 2 0 0 0 10000 0 0 0 0 9 1 0 0 5 0 0
+1015022 1015022 1 1 冰冻 0 6 1 0 6 0 0 0 0 0 0 5000 0 0 0 0 1 2 0 0 0 0 0
+1015023 1015023 1 1 冰冻 0 6 1 0 6 0 0 0 0 0 0 10000 0 0 0 0 1 2 0 0 0 0 0
+200101 200101 1 1 糜竺普技 1 1 1 1 1 0 0 1 0 10500 0 10000 0 0 0 0 0 0 0 0 0 0
+200102 200102 1 1 糜竺怒技 2 2 1 2 0 1 1 2 0 21000 0 10000 0 0 0 0 0 0 0 0 0 0
+300101 300101 1 1 潘璋普技 1 1 1 1 1 0 0 1 0 7000 0 10000 0 0 0 0 0 0 0 0 0 3001011 0
+3001011 3001011 1 1 灼烧 0 4 1 1001 6 0 0 0 0 7500 0 10000 5001 1 4 2 0 0 0 4 2 2 0 0 0 0
+300102 300102 1 1 潘璋怒技 2 1 1 1 1 0 0 1 0 30000 0 10000 0 0 0 0 0 0 0 0 0 3001021 0
+3001021 3001021 1 1 额外怒气 0 0 0 6 5 0 0 0 0 0 10 10000 0 0 0 0 0 0 0 0 0 0
+400101 400101 1 1 纪灵普技 1 1 1 1 1 0 0 1 0 12000 0 10000 0 0 0 0 0 0 0 0 0 0
+400102 400102 1 1 纪灵怒技 2 1 1 1 2 0 0 0 0 13000 0 10000 0 0 0 0 0 0 0 0 0 4001021 0
+4001021 4001021 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
+400201 400201 1 1 郭汜普技 1 1 2 1 3 0 0 1 0 10000 0 10000 0 0 0 0 0 0 0 0 0 0
+400202 400202 1 1 郭汜怒技 2 1 2 1 3 0 0 2 0 22000 0 10000 0 0 0 0 0 0 0 0 0 0
+100601 100601 1 1 寒星 1 1 2 1 3 0 0 1 0 10000 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 attack
+100602 100602 1 1 寒霜叠嶂 2 1 2 1 3 0 0 3 0 18500 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 angerSkill
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 c589ac1..fb552d3 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
@@ -439,14 +439,13 @@
TreeLVUP 42 4|300
AngerXP 50 100 50 5
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+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))
+ParryCfg int(min((dParryRate-aParryRateDef)*pow(0.7,parryNum), 8000)) [100, 0] 0.5
+ComboCfg 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))
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))
-ShieldFormula
InvestCost {} {} {"7":[101],"12":[102]} {} {}
InvestMaxDay {"7":28,"12":0} [7,8]
diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/NPC.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/NPC.txt
index 566665a..ada47cf 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/NPC.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/ServerConfig/m_10020/PySysDB/NPC.txt
@@ -1,16 +1,16 @@
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 [100061, 100062] 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 {}
+10101001 机关傀儡 0 0 1 50000000 100000 200000000 [100601, 100602] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
+10101002 大耳妖狸 0 0 2 50000000 200000 300000000 [100101, 100102] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
+20103001 蜘蛛女皇 0 2 10 50000000 1000000 1000000000 [100101, 100102] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
+20103002 嗜海狂鲨 0 1 11 50000000 1000000 1000000000 [200101, 200102] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
+20103003 古墓石巨人 0 1 12 50000000 1000000 1000000000 [100101, 100102] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
+20103004 残暴海怪 0 2 13 50000000 1000000 1000000000 [200101, 200102] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
+20103005 寒冰古妖 0 1 14 50000000 1000000 1000000000 [100101, 100102] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
+20103006 翻水妖龙 0 1 15 50000000 1000000 1000000000 [200101, 200102] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
+20103007 深海之王 0 0 16 50000000 1000000 1000000000 [100101, 100102] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
+20203005 荒漠匪首 0 1 17 50000000 1000000 1000000000 [200101, 200102] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
+20203006 迷幻之灵 0 2 18 50000000 1000000 1000000000 [100101, 100102] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
+20203007 荒漠巨兽 0 1 19 50000000 1000000 1000000000 [200101, 200102] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
510006 机关傀儡 0 0 1 1000000 100000 200000000 [100101, 100102] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
510010 蜘蛛女皇 0 2 10 10000000 1000000 1000000000 [100101, 100102] 0 0 0 0 0 0 0 0 0 0 0 0 0 0 {}
510015 嗜海狂鲨 0 1 11 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
index 68de1f4..0c641ea 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,21 +1,27 @@
-SkillID SkillTypeID SkillLV SkillMaxLV SkillName FuncType SkillType HurtType AtkType TagAim TagFriendly TagAffect TagCount CalcType SkillPer SkillValue HappenRate EffectID1 EffectValues1 TriggerWay1 TriggerSrc1 TriggerParams1 EffectID2 EffectValues2 TriggerWay2 TriggerSrc2 TriggerParams2 EffectID3 EffectValues3 TriggerWay3 TriggerSrc3 TriggerParams3 ConnSkill CoolDownTime IgnoreStates BuffStates LastTime LayerCnt LayerMax BuffRepeat DieContinue EnhanceSkillList FightPower
-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 0
-200 200 1 1 眩晕 0 14 0 0 6 0 0 0 0 0 0 10000 0 0 0 0 0 3 1 0 0 0 0 0
-100101 100101 1 1 曹婴普技 1 1 1 1 0 0 1 1 0 10000 0 10000 0 0 0 0 0 0 0 0 0 0 0
-100102 100102 1 1 曹婴怒技 2 1 1 1 4 0 0 2 0 21000 0 10000 0 0 0 0 0 0 0 0 0 0 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
-100302 100302 1 1 庞德怒技 2 1 1 1 2 0 0 3 0 15000 0 10000 0 0 0 0 0 0 0 0 0 0 1003021 0
-1003021 1003021 1 1 卸甲 0 6 0 0 6 0 0 0 0 0 0 5000 17 5000|2 0 0 0 0 2 0 0 0 0 0
-200101 200101 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
-200102 200102 1 1 糜竺怒技 2 2 1 2 0 1 1 2 0 21000 0 10000 0 0 0 0 0 0 0 0 0 0 0
-300101 300101 1 1 潘璋普技 1 1 1 1 1 0 0 1 0 7000 0 10000 0 0 0 0 0 0 0 0 0 0 3001011 0
-3001011 3001011 1 1 灼烧 0 4 1 1001 6 0 0 0 0 7500 0 10000 5001 1 4 2 0 0 0 0 4 2 2 0 0 0 0
-300102 300102 1 1 潘璋怒技 2 1 1 1 1 0 0 1 0 30000 0 10000 0 0 0 0 0 0 0 0 0 0 3001021 0
-3001021 3001021 1 1 额外怒气 0 0 0 6 5 0 0 0 0 0 10 10000 0 0 0 0 0 0 0 0 0 0 0
-400101 400101 1 1 纪灵普技 1 1 1 1 1 0 0 1 0 12000 0 10000 0 0 0 0 0 0 0 0 0 0 0
-400102 400102 1 1 纪灵怒技 2 1 1 1 2 0 0 0 0 13000 0 10000 0 0 0 0 0 0 0 0 0 0 4001021 0
-4001021 4001021 1 1 额外击晕 0 14 0 0 6 0 0 0 0 0 0 2000 0 0 0 0 0 3 1 0 0 0 0 0
-400201 400201 1 1 郭汜普技 1 1 2 1 3 0 0 1 0 10000 0 10000 0 0 0 0 0 0 0 0 0 0 0
-400202 400202 1 1 郭汜怒技 2 1 2 1 3 0 0 2 0 22000 0 10000 0 0 0 0 0 0 0 0 0 0 0
-100601 100601 1 1 寒星 1 1 2 1 3 0 0 1 0 10000 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 0
-100602 100602 1 1 寒霜叠嶂 2 1 2 1 3 0 0 3 0 18500 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+SkillID SkillTypeID SkillLV SkillMaxLV SkillName FuncType SkillType HurtType AtkType TagAim TagFriendly TagAffect TagCount CalcType SkillPer SkillValue HappenRate EffectID1 EffectValues1 TriggerWay1 TriggerSrc1 TriggerParams1 EffectID2 EffectValues2 TriggerWay2 TriggerSrc2 TriggerParams2 EffectID3 EffectValues3 TriggerWay3 TriggerSrc3 TriggerParams3 CoolDownTime IgnoreStates BuffState LastTime LayerCnt LayerMax BuffRepeat DieContinue EnhanceSkillList 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
+100101 100101 1 1 曹婴普技 1 1 1 1 0 0 1 1 0 10000 0 10000 0 0 0 0 0 0 0 0 0 0
+100102 100102 1 1 曹婴怒技 2 1 1 1 4 0 0 2 0 21000 0 10000 0 0 0 0 0 0 0 0 0 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
+100302 100302 1 1 庞德怒技 2 1 1 1 2 0 0 3 0 15000 0 10000 0 0 0 0 0 0 0 0 0 1003021 0
+1003021 1003021 1 1 卸甲 0 6 0 0 6 0 0 0 0 0 0 5000 17 5000|2 0 0 0 2 0 0 0 0 0
+101501 101501 1 1 曹仁普技 1 1 1 1 1 0 0 1 0 8000 0 10000 5010 1015011 9 101501 1|3|12 0 0 0 0 0 0 0 0 0
+1015011 1015011 1 1 护盾 0 5 0 1003 5 0 0 0 1 1000 0 10000 0 0 0 0 0 0 0 0 0 0
+101502 101502 1 1 曹仁怒技 2 5 1 1003 5 0 0 0 1 2000 0 10000 5011 1015022 11 2 5011 1015023 12 101502 0 0 2 0 0 0 0 1015021 0 attack
+1015021 1015021 1 1 嘲讽 0 6 1 0 0 0 4 2 0 0 0 10000 0 0 0 0 9 1 0 0 5 0 0
+1015022 1015022 1 1 冰冻 0 6 1 0 6 0 0 0 0 0 0 5000 0 0 0 0 1 2 0 0 0 0 0
+1015023 1015023 1 1 冰冻 0 6 1 0 6 0 0 0 0 0 0 10000 0 0 0 0 1 2 0 0 0 0 0
+200101 200101 1 1 糜竺普技 1 1 1 1 1 0 0 1 0 10500 0 10000 0 0 0 0 0 0 0 0 0 0
+200102 200102 1 1 糜竺怒技 2 2 1 2 0 1 1 2 0 21000 0 10000 0 0 0 0 0 0 0 0 0 0
+300101 300101 1 1 潘璋普技 1 1 1 1 1 0 0 1 0 7000 0 10000 0 0 0 0 0 0 0 0 0 3001011 0
+3001011 3001011 1 1 灼烧 0 4 1 1001 6 0 0 0 0 7500 0 10000 5001 1 4 2 0 0 0 4 2 2 0 0 0 0
+300102 300102 1 1 潘璋怒技 2 1 1 1 1 0 0 1 0 30000 0 10000 0 0 0 0 0 0 0 0 0 3001021 0
+3001021 3001021 1 1 额外怒气 0 0 0 6 5 0 0 0 0 0 10 10000 0 0 0 0 0 0 0 0 0 0
+400101 400101 1 1 纪灵普技 1 1 1 1 1 0 0 1 0 12000 0 10000 0 0 0 0 0 0 0 0 0 0
+400102 400102 1 1 纪灵怒技 2 1 1 1 2 0 0 0 0 13000 0 10000 0 0 0 0 0 0 0 0 0 4001021 0
+4001021 4001021 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
+400201 400201 1 1 郭汜普技 1 1 2 1 3 0 0 1 0 10000 0 10000 0 0 0 0 0 0 0 0 0 0
+400202 400202 1 1 郭汜怒技 2 1 2 1 3 0 0 2 0 22000 0 10000 0 0 0 0 0 0 0 0 0 0
+100601 100601 1 1 寒星 1 1 2 1 3 0 0 1 0 10000 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 attack
+100602 100602 1 1 寒霜叠嶂 2 1 2 1 3 0 0 3 0 18500 0 10000 0 0 0 0 0 0 0 0 0 0 0 0 0 angerSkill
--
Gitblit v1.8.0