From 48ae6ad0561685c8755236ad93d69e316c556b64 Mon Sep 17 00:00:00 2001
From: xdh <xiefantasy@qq.com>
Date: 星期二, 23 四月 2019 16:05:08 +0800
Subject: [PATCH] 6588 【2.0】【后端】人族法宝界面优化

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.py |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.py
index ae42380..fc48a11 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/BaseAttack.py
@@ -77,7 +77,7 @@
 #    global hurtTypeIndance
 #    hurtTypeIndance = indance
 #
-### 获得本次攻击是否是致命一击
+### 获得本次攻击是否是暴击
 ##  @param 无参数
 ##  @return True or False
 ##  @remarks 函数详细说明.
@@ -914,12 +914,19 @@
     if attacker.GetGameObjType() != IPY_GameWorld.gotPlayer:
         return None
     
-    useSkillTagID = attacker.GetUseSkillTagID()
-    useSkillTagType = attacker.GetUseSkillTagType()
-    
-    curTag = GameWorld.GetObj(useSkillTagID, useSkillTagType)
+    curTag = None
+    if attacker.GetAttackMode() == IPY_GameWorld.amContest:
+        # 单一目标锁定模式
+        curTag = GameWorld.GetObj(attacker.SetDict(ChConfig.Def_PlayerKey_SelectObjID), 
+                                  attacker.SetDict(ChConfig.Def_PlayerKey_SelectObjType))
+        
     if not curTag:
-        return None
+        useSkillTagID = attacker.GetUseSkillTagID()
+        useSkillTagType = attacker.GetUseSkillTagType()
+        
+        curTag = GameWorld.GetObj(useSkillTagID, useSkillTagType)
+        if not curTag:
+            return None
     
     if SkillShell.GetSkillAffectTag(curSkill) == ChConfig.Def_UseSkillTag_CanAttackNPC:
         if NPCCommon.GetNpcObjOwnerIsPlayer(curTag):

--
Gitblit v1.8.0