From 6ef04a63b7411f2570c2c30414697bca8c45dd61 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期一, 18 三月 2019 13:58:09 +0800
Subject: [PATCH] 6335 【后端】【2.0】娲皇遗迹修改

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/EffGetSet.py |   19 +++++++++----------
 1 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/EffGetSet.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/EffGetSet.py
index 88dadc3..18fc960 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/EffGetSet.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Skill/EffGetSet.py
@@ -81,7 +81,7 @@
    [lambda curObj:curObj.GetGoldFoundRate(), lambda curObj, value:curObj.SetGoldFoundRate(value), IPY_PlayerDefine.CDBPlayerRefresh_GoldFoundRate, 1, 0],                          # 掉落金钱值增加
    [lambda curObj:PlayerControl.GetPetMinAtk(curObj), lambda curObj, value:PlayerControl.SetPetMinAtk(curObj, value), 0, 0, 0],      # 宠物最小攻击
    [lambda curObj:PlayerControl.GetPetMaxAtk(curObj), lambda curObj, value:PlayerControl.SetPetMaxAtk(curObj, value), 0, 0, 0],      # 宠物最大攻击
-   [lambda curObj:PlayerControl.GetPetDamPer(curObj), lambda curObj, value:PlayerControl.SetPetDamPer(curObj, value), 0, 0, 0],      # 宠物伤害百分比提升
+   [lambda curObj:GameObj.GetPetDamPer(curObj), lambda curObj, value:GameObj.SetPetDamPer(curObj, value), ShareDefine.CDBPlayerRefresh_PetDamPer, 1, 0],      # 宠物伤害百分比提升
    [lambda curObj:PlayerControl.GetPerLVAtk(curObj), lambda curObj, value:PlayerControl.SetPerLVAtk(curObj, value), 0, 0, 0],        # 每1级+%s攻击, 数值取万分率,支持小数算法
    [lambda curObj:PlayerControl.GetPerLVMaxHP(curObj), lambda curObj, value:PlayerControl.SetPerLVMaxHP(curObj, value), 0, 0, 0],    # 每1级+%s生命, 数值为固定值
    
@@ -119,7 +119,7 @@
    [lambda curObj:PlayerControl.GetDamagePerPVP(curObj), lambda curObj, value:PlayerControl.SetDamagePerPVP(curObj, value), ShareDefine.CDBPlayerRefresh_DamagePerPVP, 1, 0],            # 伤害输出计算百分比PVP
    [lambda curObj:PlayerControl.GetDamagePerPVPReduce(curObj), lambda curObj, value:PlayerControl.SetDamagePerPVPReduce(curObj, value), ShareDefine.CDBPlayerRefresh_DamagePerPVPReduce, 1, 0],# 伤害输出计算百分比PVP减少
    [lambda curObj:PlayerControl.GetDamagePerPVE(curObj), lambda curObj, value:PlayerControl.SetDamagePerPVE(curObj, value), 0, 0, 0],            # 伤害输出计算百分比PVE
-   [lambda curObj:PlayerControl.GetNPCHurtAddPer(curObj), lambda curObj, value:PlayerControl.SetNPCHurtAddPer(curObj, value), 0, 0, 0],          # 对怪物伤害加成
+   [lambda curObj:PlayerControl.GetNPCHurtAddPer(curObj), lambda curObj, value:PlayerControl.SetNPCHurtAddPer(curObj, value), ShareDefine.CDBPlayerRefresh_NPCHurtAddPer, 1, 0],          # 对怪物伤害加成
    [lambda curObj:PlayerControl.GetJobAHurtAddPer(curObj), lambda curObj, value:PlayerControl.SetJobAHurtAddPer(curObj, value), 0, 0, 0],        # 目标战士伤害加成
    [lambda curObj:PlayerControl.GetJobBHurtAddPer(curObj), lambda curObj, value:PlayerControl.SetJobBHurtAddPer(curObj, value), 0, 0, 0],        # 目标法师伤害加成
    [lambda curObj:PlayerControl.GetJobCHurtAddPer(curObj), lambda curObj, value:PlayerControl.SetJobCHurtAddPer(curObj, value), 0, 0, 0],        # 目标弓手伤害加成
@@ -140,12 +140,6 @@
    [lambda curObj:PlayerControl.GetBaseDefAddPer(curObj), lambda curObj, value:PlayerControl.SetBaseDefAddPer(curObj, value), 0, 0, 0],          # 基础防御百分比
    [lambda curObj:PlayerControl.GetBaseHitAddPer(curObj), lambda curObj, value:PlayerControl.SetBaseHitAddPer(curObj, value), 0, 0, 0],          # 基础命中百分比
    [lambda curObj:PlayerControl.GetBaseMissAddPer(curObj), lambda curObj, value:PlayerControl.SetBaseMissAddPer(curObj, value), 0, 0, 0],        # 基础闪避百分比
-   [lambda curObj:PlayerControl.GetHorcruxBasePer(curObj), lambda curObj, value:PlayerControl.SetHorcruxBasePer(curObj, value), 0, 0, 0],        # 魂器基础百分比
-   [lambda curObj:PlayerControl.GetEquipBaseAddPer(curObj), lambda curObj, value:PlayerControl.SetEquipBaseAddPer(curObj, value), 0, 0, 0],      # 装备基础百分比
-   [lambda curObj:PlayerControl.GetWeaponAtkAddPer(curObj), lambda curObj, value:PlayerControl.SetWeaponAtkAddPer(curObj, value), 0, 0, 0],      # 武器基础攻击百分比
-   [lambda curObj:PlayerControl.GetRelicsAtkAddPer(curObj), lambda curObj, value:PlayerControl.SetRelicsAtkAddPer(curObj, value), 0, 0, 0],      # 圣器基础攻击百分比
-   [lambda curObj:PlayerControl.GetArmorMaxHPAddPer(curObj), lambda curObj, value:PlayerControl.SetArmorMaxHPAddPer(curObj, value), 0, 0, 0],    # 防具基础生命百分比
-   [lambda curObj:PlayerControl.GetArmorDefAddPer(curObj), lambda curObj, value:PlayerControl.SetArmorDefAddPer(curObj, value), 0, 0, 0],        # 防具基础防御百分比
    [lambda curObj:PlayerControl.GetGodWeaponMaxHPPer(curObj), lambda curObj, value:PlayerControl.SetGodWeaponMaxHPPer(curObj, value), 0, 0, 0],  # 神兵生命百分比
    [lambda curObj:PlayerControl.GetGodWeaponAtkPer(curObj), lambda curObj, value:PlayerControl.SetGodWeaponAtkPer(curObj, value), 0, 0, 0],      # 神兵攻击百分比
    [lambda curObj:PlayerControl.GetStoneMaxHPPer(curObj), lambda curObj, value:PlayerControl.SetStoneMaxHPPer(curObj, value), 0, 0, 0],          # 宝石生命百分比
@@ -166,6 +160,11 @@
    [lambda curObj:PlayerControl.GetWingHPPer(curObj), lambda curObj, value:PlayerControl.SetWingHPPer(curObj, value), 0, 0, 0],      # 翅膀生命百分比
    [lambda curObj:PlayerControl.GetSuiteBasePer(curObj), lambda curObj, value:PlayerControl.SetSuiteBasePer(curObj, value), 0, 0, 0],      # 套装基础属性百分比
    [lambda curObj:PlayerControl.GetPlusBaseAtkPer(curObj), lambda curObj, value:PlayerControl.SetPlusBaseAtkPer(curObj, value), 0, 0, 0],      # 强化基础攻击百分比
+   [lambda curObj:PlayerControl.GetProDef(curObj), lambda curObj, value:PlayerControl.SetProDef(curObj, value), IPY_PlayerDefine.CDBPlayerRefresh_ExAttr4, 1, 0],  # 当前防护值
+   [lambda curObj:PlayerControl.GetZhuXianRate(curObj), lambda curObj, value:PlayerControl.SetZhuXianRate(curObj, value), ShareDefine.CDBPlayerRefresh_ZhuxianRate, 1, 0],      # 诛仙一击概率
+   [lambda curObj:PlayerControl.GetZhuXianHurtPer(curObj), lambda curObj, value:PlayerControl.SetZhuXianHurtPer(curObj, value), ShareDefine.CDBPlayerRefresh_ZhuxianHurtPer, 1, 0],      # 诛仙一击伤害比
+
+
 ]
 
 ## 通过索引获得属性值
@@ -215,7 +214,7 @@
 def CopyPlayerFuncAttr(curPlayer):
     for i in xrange(len(ObjProperty_AttrByIndex)):
         # Get
-        if i+1 in [ChConfig.TYPE_Calc_AttrHP, ChConfig.TYPE_Calc_AttrMP]:
+        if i+1 in [ChConfig.TYPE_Calc_AttrHP, ChConfig.TYPE_Calc_AttrMP, ChConfig.TYPE_Calc_ProDef]:
             continue
         value = ObjProperty_AttrByIndex[i][0](curPlayer)
         if value == 0 and curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_CopyFuncAttr%i) == 0:
@@ -226,7 +225,7 @@
 # 恢复缓存功能属性的刷新结果,用于BUFF属性单独刷新
 def RestorePlayerFuncAttr(curPlayer):
     for i in xrange(len(ObjProperty_AttrByIndex)):
-        if i+1 in [ChConfig.TYPE_Calc_AttrHP, ChConfig.TYPE_Calc_AttrMP]:
+        if i+1 in [ChConfig.TYPE_Calc_AttrHP, ChConfig.TYPE_Calc_AttrMP, ChConfig.TYPE_Calc_ProDef]:
             continue
         ObjProperty_AttrByIndex[i][1](curPlayer, 
                                       curPlayer.GetDictByKey(ChConfig.Def_PlayerKey_CopyFuncAttr%i))

--
Gitblit v1.8.0