From 31a441bf2842217a4fb215ae25d6e836980f52d4 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期四, 24 一月 2019 10:17:34 +0800
Subject: [PATCH] 5924 【后端】【1.5.100】诛仙Boss功能(杀人不红名)

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py |   75 +++++++++++++++++++++++++++++++++++--
 1 files changed, 71 insertions(+), 4 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py
index 71e9bed..bb89a25 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/AttackCommon.py
@@ -57,6 +57,7 @@
 import ChPyNetSendPack
 import NetPackCommon
 import FamilyRobBoss
+import EquipZhuXian
 import FBCommon
 import ChNPC
 
@@ -1301,11 +1302,12 @@
                           ChConfig.Def_HurtType_LuckyHit:[False, 0, 0],
                           ChConfig.Def_HurtType_SuperHit:[False, 0, 0],
                           ChConfig.Def_HurtType_Parry:[False, 0, 0],
+                          ChConfig.Def_HurtType_Zhuxian:[False, 0, 0],
                           }
     
     calcTypeList =  []
     if atkObjType == IPY_GameWorld.gotPlayer:
-        calcTypeList += [ChConfig.Def_HurtType_LuckyHit, ChConfig.Def_HurtType_SuperHit]
+        calcTypeList += [ChConfig.Def_HurtType_LuckyHit, ChConfig.Def_HurtType_SuperHit, ChConfig.Def_HurtType_Zhuxian]
     if defObjType == IPY_GameWorld.gotPlayer:
         calcTypeList += [ChConfig.Def_HurtType_Parry]
     # 暂时只计算玩家
@@ -1318,6 +1320,7 @@
                   ChConfig.Def_HurtType_LuckyHit:lambda aObj, dObj, hState:__HurtTypeHappen_LuckyHit(aObj, dObj, hState),
                   ChConfig.Def_HurtType_SuperHit:lambda aObj, dObj, hState:__HurtTypeHappen_SuperHit(aObj, dObj, hState),
                   ChConfig.Def_HurtType_Parry:lambda aObj, dObj, hState:__HurtTypeHappen_Parry(aObj, dObj, hState),
+                  ChConfig.Def_HurtType_Zhuxian:lambda aObj, dObj, hState:__HurtTypeHappen_Zhuxian(aObj, dObj, hState),
                   }
     
     hadCheckList = [] # 已经处理过的伤害类型列表
@@ -1404,6 +1407,55 @@
         return True, 0, chanceDefPer
     return
 
+def __HurtTypeHappen_Zhuxian(atkObj, defObj, happenState):
+    """诛仙一击"""
+    rate = PlayerControl.GetZhuXianRate(atkObj)
+    if not rate:
+        return
+    
+    if GameWorld.CanHappen(rate):
+        return True, PlayerControl.GetZhuXianHurtPer(atkObj), 0
+    return
+
+
+def ChangeSkillHurtPer(atkObj, defObj, curSkill, skillPer):
+    ## 改变技能伤害百分比
+    
+    if not curSkill:
+        return skillPer
+    
+    if atkObj.GetGameObjType() != IPY_GameWorld.gotPlayer:
+        return skillPer
+    
+    skillTypeID = curSkill.GetSkillTypeID()
+    
+    addPer = EquipZhuXian.GetZhuXianEquipSkillAddPer(atkObj.GetPlayerID(), skillTypeID)
+    reducePer = 0
+    
+    if defObj.GetGameObjType() == IPY_GameWorld.gotPlayer:
+        reducePer = EquipZhuXian.GetZhuXianEquipSkillReducePer(defObj.GetPlayerID(), skillTypeID)
+        
+        #根据防守方职业 计算攻击方伤害加成
+        if defObj.GetJob() in [ShareDefine.PlayerJob_Warrior, ShareDefine.PlayerJob_Knight]:
+            addPer += PlayerControl.GetJobAHurtAddPer(atkObj)
+        elif defObj.GetJob() in [ShareDefine.PlayerJob_Wizard, ShareDefine.PlayerJob_ForceUser]:
+            addPer += PlayerControl.GetJobBHurtAddPer(atkObj)
+        elif defObj.GetJob() in [ShareDefine.PlayerJob_Assassin, ShareDefine.PlayerJob_BowMaster]:
+            addPer += PlayerControl.GetJobCHurtAddPer(atkObj)
+        
+        #根据攻击方职业 计算防守方伤害减免
+        if atkObj.GetJob() in [ShareDefine.PlayerJob_Warrior, ShareDefine.PlayerJob_Knight]:
+            reducePer += PlayerControl.GetJobAAtkReducePer(defObj)
+        elif atkObj.GetJob() in [ShareDefine.PlayerJob_Wizard, ShareDefine.PlayerJob_ForceUser]:
+            reducePer += PlayerControl.GetJobBAtkReducePer(defObj)
+        elif atkObj.GetJob() in [ShareDefine.PlayerJob_Assassin, ShareDefine.PlayerJob_BowMaster]:
+            reducePer += PlayerControl.GetJobCAtkReducePer(defObj)
+        
+    if addPer or reducePer:
+        addSkillPer = (addPer - reducePer) / 10000.0
+        skillPer = max(0, skillPer + addSkillPer)
+        
+    return skillPer
 
 # 改变技能伤害(效果ID1010), 野外小怪1009替换1010伤害(2018-03-07增加精英怪)
 def ChangeSkillHurt(curPlayer, defObj, curSkill, skillPer, skillValue):
@@ -1569,7 +1621,7 @@
             # 理论伤害一致, 多加点预算伤害避免计算误差
             #hurtValue = min(ShareDefine.Def_UpperLimit_DWord, hurtValue+10)
             #atkObj.SetDict(ChConfig.Def_PlayerKey_ClientMaxHurtValue, int(hurtValue*1.2))
-            hurtValue = atkObj.GetMaxAtk()*atkSkillPer*20   # 加入被动计算不准确改成估算
+            hurtValue = atkObj.GetMaxAtk()*atkSkillPer*40   # 加入被动计算不准确改成估算
             
         clientValue, hurtType = SkillShell.GetClientHurtByObj(defObj.GetID(), defObjType)
         if clientValue <= hurtValue:
@@ -1617,9 +1669,21 @@
     reducePer += PassiveBuffEffMng.GetPassiveSkillValueByTriggerType(defObj, atkObj, None, ChConfig.TriggerType_ReduceHurtHPPer)
     hurtValue = int(hurtValue*(max(ChConfig.Def_MaxRateValue - reducePer, 0))*1.0/ChConfig.Def_MaxRateValue)
     
+    
+    # 终极斩杀新效果,必须和斩杀严格区分,会涉及到CD概率,已经触发其他技能等问题
+    if PassiveBuffEffMng.GetPassiveSkillValueByTriggerType(atkObj, defObj, curSkill, ChConfig.TriggerType_ZhongjiZhansha):
+        # 斩杀
+        hurtType = ChConfig.Def_HurtType_ZhognjiZhansha
+        hurtValue = GameObj.GetHP(defObj)
+        #伤害结构体
+        resultHurtType.HurtHP = hurtValue
+        resultHurtType.HurtType = hurtType
+        resultHurtType.RealHurtHP = hurtValue
+        
+        remainHP = 0 # 剩余血量
 
     # 斩杀,濒死等情况的处理
-    if PassiveBuffEffMng.GetPassiveSkillValueByTriggerType(atkObj, defObj, curSkill, ChConfig.TriggerType_AttackKill):
+    elif PassiveBuffEffMng.GetPassiveSkillValueByTriggerType(atkObj, defObj, curSkill, ChConfig.TriggerType_AttackKill):
         # 斩杀
         hurtType = ChConfig.Def_HurtType_Zhansha
         hurtValue = GameObj.GetHP(defObj)
@@ -1816,7 +1880,8 @@
     isLuckyHit, aLuckyHit, dLuckyHitReduce = hurtTypeResultDict[ChConfig.Def_HurtType_LuckyHit] # 幸运一击
     isSuperHit, aSuperHit, dSuperHitReduce = hurtTypeResultDict[ChConfig.Def_HurtType_SuperHit] # 暴击
     dDamChanceDef = hurtTypeResultDict[ChConfig.Def_HurtType_Parry][2] # 抵御, 大于0代表触发抵御效果
-
+    isZhuxianHit, aZhuxianHurtPer, dZhuxianReducePer = hurtTypeResultDict[ChConfig.Def_HurtType_Zhuxian] # 诛仙一击
+    
     if PassiveBuffEffMng.GetPassiveSkillValueByTriggerType(defObj, atkObj, None, ChConfig.TriggerType_OneDamage):
         return 1, hurtType
     
@@ -1829,6 +1894,8 @@
     # 改变技能伤害
     atkSkillPer, atkSkillValue = ChangeSkillHurt(atkObj, defObj, curSkill, atkSkillPer, atkSkillValue)
     
+    atkSkillPer = ChangeSkillHurtPer(atkObj, defObj, curSkill, atkSkillPer)
+    
     #  atkSkillPer 包含普攻,所以不是用技能增强处理
     atkSkillPer += PassiveBuffEffMng.GetPassiveSkillValueByTriggerType(atkObj, defObj, curSkill, ChConfig.TriggerType_AttackAddSkillPer)
     

--
Gitblit v1.8.0