From c080c44a275c54783f6e0d3ee6cb86e1e16f562e Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 02 十一月 2018 10:17:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into DownLoad
---
System/MainInterfacePanel/MainInterfaceWin.cs | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/System/MainInterfacePanel/MainInterfaceWin.cs b/System/MainInterfacePanel/MainInterfaceWin.cs
index f65d300..eebbbbf 100644
--- a/System/MainInterfacePanel/MainInterfaceWin.cs
+++ b/System/MainInterfacePanel/MainInterfaceWin.cs
@@ -353,6 +353,11 @@
{
Event_Duplicates(true, CopyOfThePanelSpeed);
}
+ if (Vector3.Distance(CopyOfThePanel.position, CopyOfThePosition1.position) < 2)
+ {
+ CopyOfThePositionBool = true;
+ m_ContainerBossList.localPosition = CopyOfThePosition2.localPosition;
+ }
m_FunctionForecastTip.gameObject.SetActive(true);
}
mapId = PlayerDatas.Instance.baseData.MapID;
@@ -902,7 +907,8 @@
_ExpSlider.delay = _Delaytime;
}
ExpValueFloat = ((float)nowVlaue / (float)maxValue);
- if (ExpValueFloat != _ExpSlider.value)
+ int MapID = PlayerDatas.Instance.baseData.MapID;
+ if (ExpValueFloat != _ExpSlider.value && MapID== 31080)
{
m_UIEffect_A.Play();
if (m_UIEffect_A.IsPlaying)
--
Gitblit v1.8.0