From 27dcefa84d62c0a491d159439df9b3d05f7b5c70 Mon Sep 17 00:00:00 2001
From: hxp <ale99527@vip.qq.com>
Date: 星期二, 25 十二月 2018 10:55:00 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode
---
ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/SummonNPC_Attack_Player.py | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/SummonNPC_Attack_Player.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/SummonNPC_Attack_Player.py
index d7a8a04..2f4abf4 100644
--- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/SummonNPC_Attack_Player.py
+++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Attack/AttackLogic/SummonNPC_Attack_Player.py
@@ -62,7 +62,8 @@
#人物的召唤兽,不能攻击自己的主人
if GameWorld.IsSameObj(summonOwner, curTagPlayer) :
- return ChNPC.OnGetOwnerRelation(curSummonNPC, curTagPlayer)
+ #return ChNPC.OnGetOwnerRelation(curSummonNPC, curTagPlayer)
+ return ChConfig.Type_Relation_Friend , ChConfig.Def_PASysMessage_None
#判断主人的攻击模式,判断是否可以攻击这个玩家
if not AttackCommon.CheckPlayerAttackMode_Player(summonOwner, curTagPlayer):
--
Gitblit v1.8.0