From fb4b1ed3c3366f993136e1f9a442bb2dc6d758ab Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期三, 26 九月 2018 22:35:18 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Fight/MapTransferUtility.cs | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/Fight/MapTransferUtility.cs b/Fight/MapTransferUtility.cs
index 3e5888d..d9d2a4f 100644
--- a/Fight/MapTransferUtility.cs
+++ b/Fight/MapTransferUtility.cs
@@ -126,7 +126,7 @@
#region npc
public int NpcID
{
- get; private set;
+ get; set;
}
#endregion
@@ -245,9 +245,31 @@
MapModel _model = ModelCenter.Instance.GetModel<MapModel>();
GActor _npc = null;
-
// 鍔犲叆鍒ゆ柇鏄惁涓栫晫BOSS鍒ゆ柇
WorldBossConfig _worldBoss = Config.Instance.Get<WorldBossConfig>(npcID);
+
+ if (_findLocation)
+ {
+ var _mapConfig = Config.Instance.Get<MapConfig>(_npcLocation.mapId);
+ // 涓珛鍦板浘
+ if (_mapConfig.Camp == 5 && _worldBoss != null)
+ {
+ if (_npcLocation.mapId == PlayerDatas.Instance.baseData.MapID)
+ {
+ Send_WorldTransfer(_npcLocation.mapId,
+ new Vector3(_hero.Pos.x * 2, 0, _hero.Pos.z * 2),
+ MapTransferType.WorldTransport, 0, npcID);
+ }
+ else
+ {
+ Send_WorldTransfer(_npcLocation.mapId,
+ new Vector3(_mapConfig.BornPoints[0].x, 0, _mapConfig.BornPoints[0].y),
+ MapTransferType.WorldTransport, 0, npcID);
+ }
+ return;
+ }
+ }
+
FairyGrabBossConfig _fairyBoss = Config.Instance.Get<FairyGrabBossConfig>(npcID);
bool _isBoss = _worldBoss != null || _fairyBoss != null;
if (_isBoss && _findLocation)
@@ -382,7 +404,7 @@
{
if (_config.NPCType == (int)E_NpcType.OpenWorldMap)
{
- if (!WindowCenter.Instance.CheckOpen<WorldMapWin>())
+ if (!WindowCenter.Instance.IsOpen<WorldMapWin>())
{
WindowCenter.Instance.Open<WorldMapWin>();
if (_hero.State == E_ActorState.AutoRun)
--
Gitblit v1.8.0