From b73ea3db37f14ffb23392cd7a7adbbab9ae69641 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期三, 16 一月 2019 22:56:14 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Fight/MapTransferUtility.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Fight/MapTransferUtility.cs b/Fight/MapTransferUtility.cs
index 19af071..f69923f 100644
--- a/Fight/MapTransferUtility.cs
+++ b/Fight/MapTransferUtility.cs
@@ -276,7 +276,7 @@
{
var _mapConfig = Config.Instance.Get<MapConfig>(_npcLocation.mapId);
// 涓珛鍦板浘
- if (_mapConfig.Camp == 5 && (isWorldBoss || isDogzBoss||isCrossServerBoss))
+ if (_mapConfig.Camp == 5 && (isWorldBoss || isDogzBoss || isCrossServerBoss))
{
if (_npcLocation.mapId == PlayerDatas.Instance.baseData.MapID)
{
@@ -295,19 +295,19 @@
}
// 澧炲姞涓�椤归拡瀵笲OSS鐨勯�昏緫鍒ゆ柇
- if(_config.NPCType == (int)E_NpcType.Fight)
+ if (_config.NPCType == (int)E_NpcType.Fight)
{
var _boss = GAMgr.Instance.GetCloserNPC(_hero.Pos, npcID) as GA_NpcFightBoss;
- if(_boss != null)
+ if (_boss != null)
{
- _hero.MoveToPosition(_boss.Pos,_npcLocation.scope);
+ _hero.MoveToPosition(_boss.Pos, _npcLocation.scope);
_hero.SelectTarget = _hero.LockTarget = _boss;
return;
}
}
- var isFairyBoss = Config.Instance.ContainKey<FairyGrabBossConfig>(npcID);
- bool _isBoss = isWorldBoss || isDogzBoss || isCrossServerBoss|| isFairyBoss ;
+ var isFairyBoss = Config.Instance.ContainKey<FairyGrabBossConfig>(npcID);
+ bool _isBoss = isWorldBoss || isDogzBoss || isCrossServerBoss || isFairyBoss;
if (_isBoss && _findLocation)
{
// Debug.LogFormat("鐩爣鏄痓oss");
@@ -566,7 +566,7 @@
_destPos = npc.Pos;
}
- _hero.MoveToPosition(_destPos, _chkDist);
+ _hero.MoveToPosition(_destPos, _chkDist, true);
}
if (s_OnHeroStartMoveToNPC != null)
--
Gitblit v1.8.0