From b8bcfae71df34b7b422dd59741e1e9c0358e4142 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期四, 10 一月 2019 18:02:06 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Fight/MapTransferUtility.cs | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/Fight/MapTransferUtility.cs b/Fight/MapTransferUtility.cs
index a1283b9..0aca46b 100644
--- a/Fight/MapTransferUtility.cs
+++ b/Fight/MapTransferUtility.cs
@@ -268,14 +268,15 @@
MapModel _model = ModelCenter.Instance.GetModel<MapModel>();
GActor _npc = null;
// 鍔犲叆鍒ゆ柇鏄惁涓栫晫BOSS鍒ゆ柇
- var _worldBoss = Config.Instance.Get<WorldBossConfig>(npcID);
- var dogzBoss = Config.Instance.Get<DogzDungeonConfig>(npcID);
+ var isWorldBoss = Config.Instance.ContainKey<WorldBossConfig>(npcID);
+ var isDogzBoss = Config.Instance.ContainKey<DogzDungeonConfig>(npcID);
+ var isCrossServerBoss = Config.Instance.ContainKey<CrossServerBossConfig>(npcID);
if (_findLocation)
{
var _mapConfig = Config.Instance.Get<MapConfig>(_npcLocation.mapId);
// 涓珛鍦板浘
- if (_mapConfig.Camp == 5 && (_worldBoss != null || dogzBoss != null))
+ if (_mapConfig.Camp == 5 && (isWorldBoss || isDogzBoss||isCrossServerBoss))
{
if (_npcLocation.mapId == PlayerDatas.Instance.baseData.MapID)
{
@@ -305,8 +306,8 @@
}
}
- FairyGrabBossConfig _fairyBoss = Config.Instance.Get<FairyGrabBossConfig>(npcID);
- bool _isBoss = _worldBoss != null || _fairyBoss != null || dogzBoss != null;
+ var isFairyBoss = Config.Instance.ContainKey<FairyGrabBossConfig>(npcID);
+ bool _isBoss = isWorldBoss || isDogzBoss || isCrossServerBoss|| isFairyBoss ;
if (_isBoss && _findLocation)
{
// Debug.LogFormat("鐩爣鏄痓oss");
@@ -843,7 +844,15 @@
LineID = lineID,
ExData1 = (uint)_npcId
};
- GameNetSystem.Instance.SendInfo(_transfer);
+
+ if (GameNetSystem.Instance.crossServerSocketConnected)
+ {
+ GameNetSystem.Instance.SendToCrossServer(_transfer);
+ }
+ else
+ {
+ GameNetSystem.Instance.SendInfo(_transfer);
+ }
return true;
}
--
Gitblit v1.8.0