From f8f70d5b7a786a9559427f62c7798d83b830fa11 Mon Sep 17 00:00:00 2001
From: cehua_LC <tingame100@163.com>
Date: 星期二, 28 八月 2018 15:42:52 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxx_server

---
 ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.pyc       |    0 
 ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt |    3 +++
 2 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
index c857cc7..2ad4076 100644
--- a/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
+++ b/ZoneServerGroup/map1_8G/MapServer/MapServerData/MapServerConfig/PlayerAttack/CalcAttackValue.txt
@@ -23,6 +23,7 @@
 #	suppressValueFP			战力最终压制值, 由公式 SuppressValueFP_是否boss 计算得出,无压制默认值为0
 #	suppressRealm			境界压制差, 可为负数 PVP 攻击方境界所属组 - 防守方境界所属组  PVE 攻击方境界等级 - 防守方境界等级
 #	SuppressValueRealmRate	境界最终压制伤害增减比例, 由公式 SuppressValueRealmAdd (高境界打低境界伤害增加)及 SuppressValueRealmDec (低境界打高境界伤害减少)计算得出, 默认10000,PVP PVE都有效,宠物无效
+# suppressRealmHurtPer  境界压制加成百分比,存在负数, 配表获取
 #	isLuckyHit				是否会心一击		0否1是
 #	isSuperHit				是否暴击			0否1是
 #
@@ -64,6 +65,7 @@
 #   dMaxHP                  防守方生命上限
 #   PVPSuppressValueRealm   PVP境界压制 境界最终压制伤害增减比例, 由公式 PVPSuppressValueRealm (高境界打低境界伤害增加)及 SuppressValueRealmDec计算得出, 默认10000 PVE有效,宠物无效  大境界压制
 #   PVESuppressValueRealm    PVE境界压制 境界最终压制伤害增减比例, 由公式 PVESuppressValueRealm (高境界打低境界伤害增加)及 SuppressValueRealmDec计算得出, 默认10000 PVE有效,宠物无效 小境界压制
+#   EVPSuppressValueRealm    EVP境界压制 境界最终压制伤害增减比例, 由公式 EVPSuppressValueRealm (高境界打低境界伤害增加)及 SuppressValueRealmDec计算得出, 默认10000 PVE有效,宠物无效 小境界压制
 (
 
 {
@@ -74,6 +76,7 @@
 	"SuppressValueFP_1":"min(max(suppressFightPower*1.0/suppressNPCFightPower-0,0),0.05)*5+min(max(suppressFightPower*1.0/suppressNPCFightPower-0.05,0),0.15)*8+min(max(suppressFightPower*1.0/suppressNPCFightPower-0.2,0),1)*10",
 	"PVPSuppressValueRealm":"min(max(5000, 10000+max(suppressRealm,-6)*1000),15000)",
 	"PVESuppressValueRealm":"min(max(5000, 10000+max(suppressRealm,-6)*1000),15000)",
+	"EVPSuppressValueRealm":"min(max(5000, 10000+max(suppressRealm,-6)*1000),15000)",
 	
 	#常规公式-通用
 	"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))",
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 88d0c5a..9f1235d 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

--
Gitblit v1.8.0