From 531ef1778441b79979e3d5c9367a53f407a0c604 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期一, 27 八月 2018 19:13:35 +0800
Subject: [PATCH] fix:#1721 【BUG】娲皇遗迹,未获得奖励时,副本时间到,扣了次数

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/ChConfig.py
index a1feead..ee20cd5 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伤害加成倍率
@@ -744,7 +744,9 @@
 Def_HurtType_SuperHit,       # 暴击 7
 Def_HurtType_LuckyHit,       # 会心一击伤害 8
 Def_HurtType_Miss,           # 闪避 9
-) = range(1, 10)
+Def_HurtType_Immune,           # 免疫 10
+Def_HurtType_RealmSupress,     # 境界压制 11
+) = range(1, 12)
 #Def_HurtType_SuckBlood,      # 吸血 
 
 (
@@ -769,7 +771,8 @@
                        Def_HurtType_Parry,          # 格挡 5
                        Def_HurtType_DoubleHit,      # 连击 6
                        Def_HurtType_SuperHit,       # 暴击 7
-                       Def_HurtType_LuckyHit,       # 会心一击伤害 8]
+                       Def_HurtType_LuckyHit,       # 会心一击伤害 8
+                       Def_HurtType_RealmSupress,     # 境界压制 11
                        ]
 
 #---------------------------------------------------------------------
@@ -1093,8 +1096,6 @@
 Def_LuckyHitVal = 11000
 #卓越一击的攻击力相对普攻倍值
 Def_GreatHitVal = 12500
-#富甲一击的攻击力相对普攻倍值
-Def_FujiaHitVal = 11000
 #富豪一击的攻击力相对普攻倍值
 Def_FuhaoHitVal = 11000
 #服务器统一使用万分率(用于计算百分比 10000为100%)
@@ -3101,7 +3102,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" # 流血伤害
@@ -3894,7 +3895,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"  # 最终固定伤害减少
@@ -4024,7 +4025,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],
@@ -4857,7 +4858,10 @@
 Def_SkillFuncType_PetSkill, #6为宠物技能
 Def_SkillFuncType_GWSkill,  #7为神兵技能
 Def_SkillFuncType_NormalAttack,  #8为普攻
-) = range(9)
+Def_SkillFuncType_SP15,  #9为SP15级 服务端未用到
+Def_SkillFuncType_SkillRoll,  #10为翻滚    服务端未用到
+Def_SkillFuncType_RealmSuppress,  #11为境界压制 目前是NPC在用
+) = range(12)
 
 # 受技能效果完全影响的怪, 对应 Def_BattleRelationType_CommNoBoss
 Def_SkillAttack_NPCIsBoss = [ Def_NPCType_Ogre_Normal     ,  #平凡小怪 0    # c++ 定义为普通NPC视野刷新

--
Gitblit v1.8.0