From 428bb378be2dc9582d431e2f5d5ec908bb824cbd Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期四, 18 四月 2019 21:12:25 +0800
Subject: [PATCH] 382 修复玩家选中逻辑
---
Fight/GameActor/GA_Player.cs | 41 ++++++++++++++++++++++-------------------
1 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/Fight/GameActor/GA_Player.cs b/Fight/GameActor/GA_Player.cs
index 23367ca..4e94cdf 100644
--- a/Fight/GameActor/GA_Player.cs
+++ b/Fight/GameActor/GA_Player.cs
@@ -574,28 +574,31 @@
}
else if ((E_AttackMode)PlayerDatas.Instance.baseData.AttackMode == E_AttackMode.Family)
{
- // 鍒ゆ柇闃熶紞
- if (ActorInfo.teamID != 0
- && ActorInfo.teamID != 0
- && ActorInfo.teamID == ActorInfo.teamID)
+ if (_hero != null)
{
- return false;
- }
+ // 鍒ゆ柇闃熶紞
+ if (ActorInfo.teamID != 0
+ && _hero.ActorInfo.teamID != 0
+ && ActorInfo.teamID == _hero.ActorInfo.teamID)
+ {
+ return false;
+ }
- // 鍒ゆ柇闃佃惀
- if (ActorInfo.faction != 0
- && ActorInfo.faction != 0
- && ActorInfo.faction == ActorInfo.faction)
- {
- return false;
- }
+ // 鍒ゆ柇闃佃惀
+ if (ActorInfo.faction != 0
+ && _hero.ActorInfo.faction != 0
+ && ActorInfo.faction == _hero.ActorInfo.faction)
+ {
+ return false;
+ }
- // 鍒ゆ柇浠欑洘
- if (ActorInfo.familyID != 0
- && ActorInfo.familyID != 0
- && ActorInfo.familyID == ActorInfo.familyID)
- {
- return false;
+ // 鍒ゆ柇浠欑洘
+ if (ActorInfo.familyID != 0
+ && _hero.ActorInfo.familyID != 0
+ && ActorInfo.familyID == _hero.ActorInfo.familyID)
+ {
+ return false;
+ }
}
if (StatusMgr.Instance.IsExist(ServerInstID, StatusMgr.Instance.redNameBuffID))
--
Gitblit v1.8.0