From 29ed6eeb05ad3bc5bec4792fdb03bc0c1143ed39 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 11 六月 2019 16:25:53 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/MainPositionTween.cs | 10 ++++++++++
System/FairyAu/ExchangeActiveTokenWin.cs | 2 +-
System/MainWin/HighSettingFadeInFadeOut.cs | 3 +++
System/MainInterfacePanel/MainInterfaceWin.cs | 2 ++
4 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/System/FairyAu/ExchangeActiveTokenWin.cs b/System/FairyAu/ExchangeActiveTokenWin.cs
index abd9810..913b6cb 100644
--- a/System/FairyAu/ExchangeActiveTokenWin.cs
+++ b/System/FairyAu/ExchangeActiveTokenWin.cs
@@ -55,7 +55,7 @@
private void ExchangeSuccess()
{
- Close();
+ RefreshEquipsScroll();
}
private void RefreshActiveCanGet()
diff --git a/System/MainInterfacePanel/MainInterfaceWin.cs b/System/MainInterfacePanel/MainInterfaceWin.cs
index a72259f..4a89c72 100644
--- a/System/MainInterfacePanel/MainInterfaceWin.cs
+++ b/System/MainInterfacePanel/MainInterfaceWin.cs
@@ -96,6 +96,7 @@
m_ChatTip.Init();
m_HighSettingTip.Init();
m_HighSettingFadeInFadeOut.Init();
+ m_MainPositionTween.Init();
m_TaskListTip.Init();
m_IsShowXp.Init();
m_TopRightTip.Init();
@@ -188,6 +189,7 @@
m_ChatTip.UnInit();
m_HighSettingTip.UnInit();
m_HighSettingFadeInFadeOut.UnInit();
+ m_MainPositionTween.UnInit();
m_TaskListTip.UnInit();
m_TopRightTip.UnInit();
m_FunctionForecastTip.Unit();
diff --git a/System/MainInterfacePanel/MainPositionTween.cs b/System/MainInterfacePanel/MainPositionTween.cs
index cb48d4e..42fb285 100644
--- a/System/MainInterfacePanel/MainPositionTween.cs
+++ b/System/MainInterfacePanel/MainPositionTween.cs
@@ -43,6 +43,16 @@
TreasureModel treasureModel { get { return ModelCenter.Instance.GetModel<TreasureModel>(); } }
+ public void Init()
+ {
+ this.enabled = true;
+ }
+
+ public void UnInit()
+ {
+ this.enabled = false;
+ }
+
void Start()
{
m_RayMask.AddListener(MarkRayButton);
diff --git a/System/MainWin/HighSettingFadeInFadeOut.cs b/System/MainWin/HighSettingFadeInFadeOut.cs
index 5090561..d04a6f1 100644
--- a/System/MainWin/HighSettingFadeInFadeOut.cs
+++ b/System/MainWin/HighSettingFadeInFadeOut.cs
@@ -52,6 +52,7 @@
public void Init()
{
+ this.enabled = true;
RefreshGridsActiveState();
TimeUtility.OnServerOpenDayRefresh += OnStepServerDay;
@@ -82,6 +83,8 @@
OpenServerModel.IsOpenEvent -= IsOpenEvent;
OpenServerModel.IsPreviewTimeUpdate -= IsOpenEvent;
OperationTimeHepler.Instance.operationAdvanceEvent -= OperationAdvanceEvent;
+
+ this.enabled = false;
}
void Switch(bool active)
--
Gitblit v1.8.0