From 5859e5dd0a45420d1eccc342ddbeb112e58cc189 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期三, 16 一月 2019 11:57:20 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Message/RichMoveEvent.cs | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/System/Message/RichMoveEvent.cs b/System/Message/RichMoveEvent.cs
index 1590ac5..bde13bf 100644
--- a/System/Message/RichMoveEvent.cs
+++ b/System/Message/RichMoveEvent.cs
@@ -138,24 +138,38 @@
{
if (PlayerDatas.Instance.baseData.MapID != _mapId)
{
- var currentMapConfig = Config.Instance.Get<MapConfig>(PlayerDatas.Instance.baseData.MapID);
- if (currentMapConfig.MapFBType != 0)
+ if (_mapId == CrossServerBossModel.DATA_MAPID)
{
- SysNotifyMgr.Instance.ShowTip("Map_Delivery");
- return;
+ var model = ModelCenter.Instance.GetModel<CrossServerBossModel>();
+ var error = 0;
+ if (!model.CanEnter(out error))
+ {
+ model.ProcessEnterError(error);
+ return;
+ }
+ model.RequestEnter();
}
-
- if (mapModel.IsMapUnlocked(_mapId) == false)
+ else
{
- SysNotifyMgr.Instance.ShowTip("Map_Delivery");
- return;
+ var currentMapConfig = Config.Instance.Get<MapConfig>(PlayerDatas.Instance.baseData.MapID);
+ if (currentMapConfig.MapFBType != 0)
+ {
+ SysNotifyMgr.Instance.ShowTip("Map_Delivery");
+ return;
+ }
+
+ if (mapModel.IsMapUnlocked(_mapId) == false)
+ {
+ SysNotifyMgr.Instance.ShowTip("Map_Delivery");
+ return;
+ }
+ mapModel.RequestMapTransport(_mapId, line);
}
WorldMapSkip.Instance.PushCMD(() =>
{
SnxxzGame.Instance.StartCoroutine(WaitForSkillFinished(new Vector3(x / 2, 0, y / 2)));
});
- mapModel.RequestMapTransport(_mapId, line);
}
else
{
--
Gitblit v1.8.0