From c6f9199f9b6fbb8cda4585fa074357c57c61f5f5 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期三, 28 八月 2019 20:39:25 +0800
Subject: [PATCH] 0312 解析信息异常也发送邮件

---
 ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBattle.py |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBattle.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBattle.py
index 6e68615..ab6a1bb 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBattle.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerBattle.py
@@ -316,7 +316,11 @@
     if curTag == None or curTag.IsEmpty():
         return
     
-            
+    if curPlayer.GetAttackMode() == IPY_GameWorld.amContest and curTag.GetGameObjType() == IPY_GameWorld.gotPlayer:
+        if curPlayer.GetTeamID() and curPlayer.GetTeamID() == curTag.GetTeamID():
+            #GameWorld.DebugLog("锁定模式不锁定队友")
+            return
+        
     #这里不验证是否死亡
     curPlayer.SetDict(ChConfig.Def_PlayerKey_SelectObjID, clientData.ID)
     curPlayer.SetDict(ChConfig.Def_PlayerKey_SelectObjType, clientData.Type)

--
Gitblit v1.8.0