From 7e9e5f96c58a7290b4c5055787dbe09336efffbd Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期六, 25 八月 2018 10:30:42 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/MainInterfaceWin.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/System/MainInterfacePanel/MainInterfaceWin.cs b/System/MainInterfacePanel/MainInterfaceWin.cs
index 75bb072..e92c5e9 100644
--- a/System/MainInterfacePanel/MainInterfaceWin.cs
+++ b/System/MainInterfacePanel/MainInterfaceWin.cs
@@ -457,7 +457,7 @@
}
}
- if (_areaType == MapArea.E_Type.Neutral && _enter)
+ if ((_areaType == MapArea.E_Type.Neutral || _areaType == MapArea.E_Type.Boss) && _enter)
{
WindowCenter.Instance.Open<NeutralMarkWin>();
int mapID = PlayerDatas.Instance.baseData.MapID;
@@ -479,7 +479,7 @@
}
}
- if ((_areaType == MapArea.E_Type.Boss && _enter) || (_areaType == MapArea.E_Type.Dazuo && _enter))
+ if (_areaType == MapArea.E_Type.Boss && _enter)
{
if (Vector3.Distance(m_TaskAndTeamPanel.localPosition, TaskListTipAnchor1.localPosition) < 2 && ListBossMapId.Contains(PlayerDatas.Instance.baseData.MapID))
{
@@ -507,7 +507,7 @@
var inDungeon = IsDungeon();
var isNeutralMap = GeneralConfig.Instance.neutralMaps.Contains(PlayerDatas.Instance.baseData.MapID);
- if ((_areaType == MapArea.E_Type.Boss && !_enter) || (_areaType == MapArea.E_Type.Dazuo && !_enter))
+ if (_areaType == MapArea.E_Type.Boss && !_enter)
{
if (Vector3.Distance(CopyOfThePanel.position, CopyOfThePosition1.position) > 2 && !inDungeon && !isNeutralMap)
{
--
Gitblit v1.8.0