From 8a4d5abf1da4698a3b84b31cc3b36ef6841fbdb3 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 28 八月 2018 12:18:01 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index bfe3172..2c1d982 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
@@ -177,7 +177,7 @@
TYPE_Calc_JobCAtkReducePer, # 弓手攻击伤害减免
TYPE_Calc_CommMapExpRate, # 常规地图经验倍率加成
-TYPE_Calc_FujiaHitRate, # 富甲一击几率
+TYPE_Calc_FinalHurtPer, # 最终伤害百分比
TYPE_Calc_FuhaoHitRate, # 富豪一击几率 95
TYPE_Calc_BossIDHurt, # 对指定boss伤害加成固定值
TYPE_Calc_BossIDHurtAddPer, # 对指定boss伤害加成倍率
@@ -1096,8 +1096,6 @@
Def_LuckyHitVal = 11000
#卓越一击的攻击力相对普攻倍值
Def_GreatHitVal = 12500
-#富甲一击的攻击力相对普攻倍值
-Def_FujiaHitVal = 11000
#富豪一击的攻击力相对普攻倍值
Def_FuhaoHitVal = 11000
#服务器统一使用万分率(用于计算百分比 10000为100%)
@@ -2957,6 +2955,8 @@
Def_PlayerState_MissSneerAtk, # 对嘲讽攻击免疫表现为miss 16
) = range(17)
+#---SetDict 含NPC字典KEY，不存于数据库---
+Def_GameObjKey_InheritOwner = "InheritOwner" # 类暴风雪计算时用主人属性
#---SetDict 玩家字典KEY，不存于数据库---
# key的长度不能超过29个字节
@@ -3104,7 +3104,7 @@
Def_PlayerKey_LastHurtValue = "LastHurtValue" # 最后一次伤害值
Def_PlayerKey_ReduceSkillCDPer = "ReduceSkillCDPer" # 减技能CD万分率
Def_PlayerKey_CommMapExpRate = "CommMapExpRate" # 常规地图经验倍率加成
-Def_PlayerKey_FujiaHitRate = "FujiaHitRate" # 富甲一击概率
+Def_PlayerKey_FinalHurtPer = "FinalHurtPer" # 最终伤害百分比
Def_PlayerKey_FuhaoHitRate = "FuhaoHitRate" # 富豪一击概率
Def_PlayerKey_FinalHurt = "FinalHurt" # 最终固定伤害增加
Def_PlayerKey_BleedDamage = "BleedDamage" # 流血伤害
@@ -3897,7 +3897,7 @@
AttrName_GreatHitRateReduce = "GreatHitRateReduce" # 抗卓越一击概率
AttrName_SuperHitRateReduce = "SuperHitRateReduce" # 抗致命一击概率
AttrName_IgnoreDefRateReduce = "IgnoreDefRateReduce" # 抗无视防御概率
-AttrName_FujiaHitRate = "FujiaHitRate" # 富甲一击概率
+AttrName_FinalHurtPer = "FinalHurtPer" # 最终伤害百分比
AttrName_FuhaoHitRate = "FuhaoHitRate" # 富豪一击概率
AttrName_FinalHurt = "FinalHurt" # 最终固定伤害增加
AttrName_FinalHurtReduce = "FinalHurtReduce" # 最终固定伤害减少
@@ -4027,7 +4027,7 @@
ShareDefine.Def_Effect_SuperHitRateReduce:[[TYPE_Calc_SuperHitRateReduce], False, TYPE_Linear],
AttrName_DamReducePer:[[TYPE_Calc_AttrDamReduce], False, TYPE_Linear],
AttrName_DamagePer:[[TYPE_Calc_DamagePer], False, TYPE_Linear],
- AttrName_FujiaHitRate:[[TYPE_Calc_FujiaHitRate], False, TYPE_Linear],
+ AttrName_FinalHurtPer:[[TYPE_Calc_FinalHurtPer], False, TYPE_Linear],
AttrName_FuhaoHitRate:[[TYPE_Calc_FuhaoHitRate], False, TYPE_Linear],
ShareDefine.Def_Effect_FinalHurt:[[TYPE_Calc_FinalHurt], False, TYPE_Linear],
ShareDefine.Def_Effect_FinalHurtReduce:[[TYPE_Calc_FinalHurtReduce], False, TYPE_Linear],
--
Gitblit v1.8.0