From 752d3ae1977661652d4489acc383ac065abdef12 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期五, 07 十二月 2018 21:12:42 +0800
Subject: [PATCH] 4632 子 【1.3.0】上古战场调上古战场机器人外观处理 修复技能无法释放问题
---
Fight/Actor/HeroBehaviour.cs | 43 +++++++++++++++++++++++--------------------
1 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/Fight/Actor/HeroBehaviour.cs b/Fight/Actor/HeroBehaviour.cs
index e183271..5720573 100644
--- a/Fight/Actor/HeroBehaviour.cs
+++ b/Fight/Actor/HeroBehaviour.cs
@@ -576,7 +576,8 @@
continue;
}
#endif
- if (_actorList[i] is GA_NpcClientFightNorm)
+ if (_actorList[i] is GA_NpcClientFightNorm
+ || _actorList[i] is GA_NpcFightSgzcZZ)
{
if (CheckCanAttackTarget(_actorList[i] as GActorFight, skill, _soSkill, skill.targetPosition))
{
@@ -754,7 +755,8 @@
continue;
}
- if (_target.ActorType == GameObjType.gotNPC)
+ if (_target.ActorType == GameObjType.gotNPC
+ && !(_target is GA_NpcFightSgzcZZ))
{
GActorNpcFight _npc = _target as GActorNpcFight;
if (_npc.NpcConfig.IsBoss != (int)E_MonsterType.Normal)
@@ -820,11 +822,11 @@
if (skill.hitClientBattleTargetList.Count > 0)
{
- GA_NpcClientFightNorm _target = null;
+ GActorFight _target = null;
for (int i = 0; i < skill.hitClientBattleTargetList.Count; ++i)
{
- _target = GAMgr.Instance.GetByCID(skill.hitClientBattleTargetList[i]) as GA_NpcClientFightNorm;
+ _target = GAMgr.Instance.GetByCID(skill.hitClientBattleTargetList[i]) as GActorFight;
AttackHandler.HurtObjs _hurtObject = new AttackHandler.HurtObjs
{
@@ -835,13 +837,13 @@
AttackHandler.CalculateDamage(m_Hero, _target, skill, i, ref _hurtValue, ref _attackType);
- if (_target.NpcConfig.NPCID == 1007)
- {
- if (_target.ActorInfo.RealHp < _hurtValue)
- {
- _hurtValue = (uint)(_target.ActorInfo.RealHp - 10);
- }
- }
+ //if (_target.NpcConfig.NPCID == 1007)
+ //{
+ // if (_target.ActorInfo.RealHp < _hurtValue)
+ // {
+ // _hurtValue = (uint)(_target.ActorInfo.RealHp - 10);
+ // }
+ //}
_hurtObject.HurtHP = _hurtValue;
_hurtObject.AttackType = _attackType;
@@ -865,14 +867,14 @@
}
// 鍓嶆湡鎴樻枟鍙彂閫佺煶澶翠汉鐨�
- if (1000 == _target.NpcConfig.NPCID)
- {
- CA225_tagCMClientTaskCount _a225 = new CA225_tagCMClientTaskCount
- {
- CountID = (uint)_target.NpcConfig.NPCID
- };
- GameNetSystem.Instance.SendInfo(_a225);
- }
+ //if (1000 == _target.NpcConfig.NPCID)
+ //{
+ // CA225_tagCMClientTaskCount _a225 = new CA225_tagCMClientTaskCount
+ // {
+ // CountID = (uint)_target.NpcConfig.NPCID
+ // };
+ // GameNetSystem.Instance.SendInfo(_a225);
+ //}
}
}
}
@@ -921,6 +923,7 @@
}
GActorNpcFight _fightNpc = actor as GActorNpcFight;
+ GA_NpcFightSgzcZZ _sgzcRobot = actor as GA_NpcFightSgzcZZ;
if (_fightNpc != null)
{
@@ -977,7 +980,7 @@
}
else
{
- if (_fightNpc == null)
+ if (_fightNpc == null && _sgzcRobot == null)
{
//Debug.LogFormat("<color=red>|-- 瀵硅薄绫诲瀷涓嶅: {0}</color>", actor.ServerObjID);
//Debug.LogFormat(" |-- 鐩爣: {0} 涓嶆槸鎴樻枟npc,涓嶈兘瀵瑰叾閫犳垚浼ゅ", _monster.ServerObjID);
--
Gitblit v1.8.0