From 4d05b52d78b592673bd93dd29f1668147cf89039 Mon Sep 17 00:00:00 2001 From: xdh <xiefantasy@qq.com> Date: 星期二, 16 十月 2018 15:04:06 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/SnxxServerCode --- ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.py b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.py index 5d48d00..3860726 100644 --- a/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.py +++ b/ServerPython/ZoneServerGroup/map1_8G/MapServer/MapServerData/Script/Player/PlayerState.py @@ -462,7 +462,7 @@ relation = BaseAttack.GetTagRelation(curPlayer, curTag, None, tick) #判断是否敌对关系 if relation[0] != ChConfig.Type_Relation_Enemy : - AttackCommon.PlayerAttackFailSysMessanage(curPlayer, relation[1]) + #AttackCommon.PlayerAttackFailSysMessanage(curPlayer, relation[1]) return return curTag -- Gitblit v1.8.0