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
---
System/MainInterfacePanel/MainInterfaceWin.cs | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/System/MainInterfacePanel/MainInterfaceWin.cs b/System/MainInterfacePanel/MainInterfaceWin.cs
index 1d4ba02..afc62ce 100644
--- a/System/MainInterfacePanel/MainInterfaceWin.cs
+++ b/System/MainInterfacePanel/MainInterfaceWin.cs
@@ -264,7 +264,7 @@
if (inDungeon)
{
m_FunctionForecastTip.gameObject.SetActive(false);
- if (WindowCenter.Instance.CheckOpen<FunctionForecastWin>())
+ if (WindowCenter.Instance.IsOpen<FunctionForecastWin>())
{
WindowCenter.Instance.Close<FunctionForecastWin>();
}
@@ -292,7 +292,7 @@
}
else
{
- var isNeutralMap = GeneralConfig.Instance.neutralMaps.Contains(PlayerDatas.Instance.baseData.MapID);
+ var isNeutralMap = GeneralConfig.Instance.neutralBossMaps.Contains(PlayerDatas.Instance.baseData.MapID);
if (isNeutralMap)
{
@@ -384,7 +384,7 @@
PlayerTaskDatas.CompletionOfTaskEvent -= CompletionOfTaskEvent;
RedpointCenter.Instance.redpointValueChangeEvent -= RedpointValueChangeEvent;
NewBieCenter.Instance.guideBeginEvent -= GuideBeginEvent;
- if (WindowCenter.Instance.CheckOpen<FunctionForecastWin>())
+ if (WindowCenter.Instance.IsOpen<FunctionForecastWin>())
{
WindowCenter.Instance.CloseImmediately<FunctionForecastWin>();
}
@@ -529,7 +529,7 @@
}
}
var inDungeon = IsDungeon();
- var isNeutralMap = GeneralConfig.Instance.neutralMaps.Contains(PlayerDatas.Instance.baseData.MapID);
+ var isNeutralMap = GeneralConfig.Instance.neutralBossMaps.Contains(PlayerDatas.Instance.baseData.MapID);
if (_areaType == MapArea.E_Type.Boss && !_enter)
{
@@ -566,7 +566,7 @@
&& PlayerDatas.Instance.hero.State == E_ActorState.AutoRun
&& onMainModel.MoveBool)
{
- if (!WindowCenter.Instance.CheckOpen("PathfindingIconWin"))
+ if (!WindowCenter.Instance.IsOpen("PathfindingIconWin"))
{
WindowCenter.Instance.Open<PathfindingIconWin>(true);
}
@@ -574,7 +574,7 @@
else
{
onMainModel.MoveBool = false;
- if (WindowCenter.Instance.CheckOpen("PathfindingIconWin"))
+ if (WindowCenter.Instance.IsOpen("PathfindingIconWin"))
{
WindowCenter.Instance.CloseImmediately<PathfindingIconWin>();
}
@@ -582,9 +582,9 @@
if (runeTowerModel.newPassFloor > 0 && !IsDungeon())
{
- if (!WindowCenter.Instance.CheckOpen("NewBieWin") && !WindowCenter.Instance.CheckOpen("TreasureNewGotWin"))
+ if (!WindowCenter.Instance.IsOpen("NewBieWin") && !WindowCenter.Instance.IsOpen("TreasureNewGotWin"))
{
- if (!WindowCenter.Instance.CheckOpen("RuneNewGotWin"))
+ if (!WindowCenter.Instance.IsOpen("RuneNewGotWin"))
{
WindowCenter.Instance.Open<RuneNewGotWin>();
}
@@ -673,7 +673,7 @@
var inDungeon = IsDungeon();
bool IsBossBool = PlayerDatas.Instance.hero == null ? false : MapArea.IsInMapArea(PlayerDatas.Instance.hero.CurMapArea, MapArea.E_Type.Boss);//鏄惁鍦˙oss鍖哄煙
- var isNeutralMap = GeneralConfig.Instance.neutralMaps.Contains(PlayerDatas.Instance.baseData.MapID);
+ var isNeutralMap = GeneralConfig.Instance.neutralBossMaps.Contains(PlayerDatas.Instance.baseData.MapID);
if (!recordPositionBool)
{
@@ -739,7 +739,7 @@
}
LeftImage.SetActive(false);
RightImg.SetActive(true);
- if (WindowCenter.Instance.CheckOpen<FunctionForecastWin>())
+ if (WindowCenter.Instance.IsOpen<FunctionForecastWin>())
{
WindowCenter.Instance.Close<FunctionForecastWin>();
}
@@ -761,7 +761,7 @@
{
var inDungeon = IsDungeon();
bool IsBossBool = MapArea.IsInMapArea(PlayerDatas.Instance.hero.CurMapArea, MapArea.E_Type.Boss);
- var isNeutralMap = GeneralConfig.Instance.neutralMaps.Contains(PlayerDatas.Instance.baseData.MapID);
+ var isNeutralMap = GeneralConfig.Instance.neutralBossMaps.Contains(PlayerDatas.Instance.baseData.MapID);
if (recordPositionBool)//鏄剧ず鍔熻兘鍏ュ彛
{
@@ -1022,7 +1022,7 @@
void CheckChatTipOpen()
{
- bool _chatWinOpen = WindowCenter.Instance.CheckOpen<ChatWin>();
+ bool _chatWinOpen = WindowCenter.Instance.IsOpen<ChatWin>();
m_ChatTip.gameObject.SetActive(!_chatWinOpen);
if (!_chatWinOpen)
{
--
Gitblit v1.8.0