From 3ad8237a1631be487f39ac3fdf6015acc9b0631f Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期一, 03 十二月 2018 20:32:55 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/MainInterfaceWin.cs | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/System/MainInterfacePanel/MainInterfaceWin.cs b/System/MainInterfacePanel/MainInterfaceWin.cs
index 056c47f..f9cbc75 100644
--- a/System/MainInterfacePanel/MainInterfaceWin.cs
+++ b/System/MainInterfacePanel/MainInterfaceWin.cs
@@ -86,6 +86,8 @@
[SerializeField] Button WishingAwardImg;
[SerializeField] Button MysticalPurchaseImg;
[SerializeField] Button DungeonAssistImg;
+ [SerializeField] RectTransform m_ContainerGotoGrabBoss;
+ [SerializeField] RectTransform m_ContainerAdaptiveChat;
[SerializeField] Button m_GotoFairyGrabBoss;
[SerializeField] Button m_FlyToFairyGrabBoss;
@@ -247,6 +249,7 @@
assistModel.UpdateRedpointEvent += UpdateDungeonAssistImag;
purchaseModel.UpdateNewMysticalEvent += UpdateMysticalPurchaseImag;
fairyGrabBossModel.gotoBossStateUpdate += ShowFairyGrabBoss;
+ ChatTip.OnChatUpEvent += RefreshAdaptiveChat;
}
private void CompletionOfTaskEvent(int obj)
@@ -259,6 +262,7 @@
{
m_HighSettingTip.OnActived();
IsShowTaskPanel();//鏄惁鏄剧ず浠诲姟闈㈡澘
+ RefreshAdaptiveChat();
}
IEnumerator Co_Load()
@@ -416,6 +420,7 @@
RedpointCenter.Instance.redpointValueChangeEvent -= RedpointValueChangeEvent;
NewBieCenter.Instance.guideBeginEvent -= GuideBeginEvent;
fairyGrabBossModel.gotoBossStateUpdate -= ShowFairyGrabBoss;
+ ChatTip.OnChatUpEvent -= RefreshAdaptiveChat;
if (WindowCenter.Instance.IsOpen<FunctionForecastWin>())
{
WindowCenter.Instance.CloseImmediately<FunctionForecastWin>();
@@ -1170,7 +1175,7 @@
private void ShowFairyGrabBoss()
{
- m_GotoFairyGrabBoss.gameObject.SetActive(fairyGrabBossModel.cacheGotoBossId != 0 &&
+ m_ContainerGotoGrabBoss.gameObject.SetActive(fairyGrabBossModel.cacheGotoBossId != 0 &&
!fairyGrabBossModel.grabBossHintOpen);
}
@@ -1264,6 +1269,16 @@
break;
}
}
+
+ private void RefreshAdaptiveChat()
+ {
+ if (ChatTip.Inst == null)
+ {
+ return;
+ }
+ m_ContainerAdaptiveChat.sizeDelta = m_ContainerAdaptiveChat.sizeDelta.SetY(
+ ChatTip.Inst.IsChatUp ? ChatTip.Inst.chatHighSize.y : ChatTip.Inst.chatLowSize.y);
+ }
}
}
--
Gitblit v1.8.0