From 65c29381d30710afde3408603274d65f3f498954 Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期六, 25 八月 2018 17:05:11 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
index ef54f67..df97a32 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
@@ -40,6 +40,8 @@
 #	aDamagePerPVP			PVP伤害加成			万分率
 #	aFinalHurt				最终伤害加成		固定值
 #	aIceAtkSuperHit			真实伤害暴击倍值	倍值, 默认1
+#	FinalHurtPer			最终伤害百分比		万分率
+#	aOnlyFinalHurt			附加伤害		固定值
 #
 # 防守方:
 #	dMinAtk		最低攻击
@@ -75,7 +77,7 @@
 	
 	
 	"PVP_1"	:"int(SuppressValueRealmRate/10000.0*max((((max((aMaxAtk if isLuckyHit else (aMinAtk + (aMaxAtk - aMinAtk)*rand))- dDef*(1-max(aIgnoreDefRate - dIgnoreDefRateReduce,0)/10000.0),0))*(1+(aLuckyHit/10000.0 if isLuckyHit else 0))+ (aSuperHit*max(1-dSuperHitReduce/10000.0,0) if isSuperHit else 0)+ max(aIceAtkSuperHit*aIceAtk - dIceDef, 0))*(atkSkillPer+max(aSkillAtkRate-dSkillAtkRateReduce,0)/10000.0)*(1+(aDamagePer+aDamagePerPVP)/10000.0)*(1-min(dDamReduce,8000)/10000.0)*(1-min(dDamagePerPVPReduce,8000)/10000.0)*(1-min(dDamChanceDef,8000)/10000.0)+max(aFinalHurt+aOnlyFinalHurt-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0),(aMinAtk+aMaxAtk)/2*0.05 + (aMinAtk+aMaxAtk)/2*0.1*rand))",
-	"PVE_1"	:"int(max((((max((aMaxAtk if isLuckyHit else (aMinAtk + (aMaxAtk - aMinAtk)*rand))-dDef*max(1-aIgnoreDefRate/10000.0,0),1))*(1+(aLuckyHit/10000.0 if isLuckyHit else 0))+(aSuperHit if isSuperHit else 0)+ max(aIceAtkSuperHit*aIceAtk - dIceDef, 0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1+aDamagePer/10000.0)+max(aFinalHurt+aOnlyFinalHurt-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0),(aMinAtk+aMaxAtk)/2*0.05 + (aMinAtk+aMaxAtk)/2*0.1*rand))",
+	"PVE_1"	:"int(max((((max((aMaxAtk if isLuckyHit else (aMinAtk + (aMaxAtk - aMinAtk)*rand))-dDef*max(1-aIgnoreDefRate/10000.0,0),1))*(1+(aLuckyHit/10000.0 if isLuckyHit else 0))+(aSuperHit if isSuperHit else 0)+ max(aIceAtkSuperHit*aIceAtk - dIceDef, 0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1+aDamagePer/10000.0)+max(aFinalHurt+aOnlyFinalHurt-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0)*max(1+aFinalHurtPer/10000.0,1),(aMinAtk+aMaxAtk)/2*0.05 + (aMinAtk+aMaxAtk)/2*0.1*rand))",
 	"EVP_1"	:"int(max(((max((aMinAtk+aMaxAtk)/2.0*(1+suppressValueLV)-dDef,0)+max(aIceAtk - dIceDef, 0))*(atkSkillPer+aSkillAtkRate/10000.0)*(1-min(dDamReduce,8000)/10000.0)*(1-min(dDamChanceDef,8000)/10000.0)+max(aFinalHurt-dFinalHurtReduce, 0)+atkSkillValue)*(1+dBeHurtPer/10000.0)*(1+suppressValueFP),aMaxAtk*0.05+rand*aMaxAtk*0.05))",
 	"EVE_1"	:"max(aMaxAtk-dDef,1)",
 	"PetVE_1":"max(((aMinAtk + aMaxAtk)/2.0-dDef)*(atkSkillPer+aSkillAtkRate/10000.0)*(1+aDamagePer/10000.0),(aMinAtk+aMaxAtk)/2.0*0.05 + (aMinAtk+aMaxAtk)/2.0*0.1*rand)",

--
Gitblit v1.8.0