From b18ba18338582fe72ae50bb97e3984d9dcf5836c Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 28 三月 2019 17:57:50 +0800
Subject: [PATCH] 3335 主界面修改.
---
System/MainInterfacePanel/ChatFrame.cs | 57 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 37 insertions(+), 20 deletions(-)
diff --git a/System/MainInterfacePanel/ChatFrame.cs b/System/MainInterfacePanel/ChatFrame.cs
index f412e84..11259c6 100644
--- a/System/MainInterfacePanel/ChatFrame.cs
+++ b/System/MainInterfacePanel/ChatFrame.cs
@@ -15,16 +15,17 @@
public class ChatFrame : MonoBehaviour
{
- [SerializeField] VoiceRecorder _TongVoiceBtn;//鐩熻闊�
- [SerializeField] VoiceRecorder _TeamChatBtn;//闃熻闊�
+ [SerializeField] Button m_Voice;
+ [SerializeField] VoiceRecorder m_TeamVoice;
+ [SerializeField] VoiceRecorder m_GuildVoice;
[SerializeField] Button _MailBtn;//閭欢鎸夐挳
[SerializeField] Button _OneKeyBtn;//鍦板浘鎸傛満
[SerializeField] Button _AutoBtn;//鑷姩鎸傛満
[SerializeField] Button _BackPack1Btn;//鑳屽寘鎸夐挳
[SerializeField] Button _SetupBtn;
- [SerializeField] GameObject _OneKeyBtnImg;//鍦板浘鎸傛満
- [SerializeField] GameObject AutoImg;//鍘熷湴鎸傛満
+ [SerializeField] Image m_ImgAuto;//鍘熷湴鎸傛満
+ [SerializeField] Image m_ImgUnAuto;
[SerializeField] Button m_TaskBtn;//浠诲姟鎸夐挳
[SerializeField] Button m_SocialBtn;//绀句氦鎸夐挳
@@ -50,8 +51,10 @@
HeroBehaviour.OnStartHandupAI += OnHeroHandupAIStarted;
PlayerDatas.Instance.fairyData.OnRefreshFairyInfo += OnRefreshFairyInfo;
FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;
- _TongVoiceBtn.voiceRecordSuccessEvent += OnVoiceRecordFairySuccessEvent;
- _TeamChatBtn.voiceRecordSuccessEvent += OnVoiceRecordTeamSuccessEvent;
+
+ m_GuildVoice.voiceRecordSuccessEvent += OnVoiceRecordFairySuccessEvent;
+ m_TeamVoice.voiceRecordSuccessEvent += OnVoiceRecordTeamSuccessEvent;
+
_MailBtn.SetListener(MailButton);
_OneKeyBtn.SetListener(OneKeyButton);
_AutoBtn.SetListener(AutoButton);
@@ -82,17 +85,17 @@
m_TaskBtn.gameObject.SetActive(false);
if (OneKeyList.Contains(MapId))
{
- _OneKeyBtnImg.SetActive(true);
+ _OneKeyBtn.gameObject.SetActive(true);
}
else
{
- _OneKeyBtnImg.SetActive(false);
+ _OneKeyBtn.gameObject.SetActive(false);
}
}
else
{
m_TaskBtn.gameObject.SetActive(true);
- _OneKeyBtnImg.SetActive(true);
+ _OneKeyBtn.gameObject.SetActive(true);
}
}
private void OnVoiceRecordTeamSuccessEvent(int _instId, float _seconds)
@@ -181,8 +184,8 @@
public void UnInit()
{
- _TongVoiceBtn.voiceRecordSuccessEvent -= OnVoiceRecordFairySuccessEvent;
- _TeamChatBtn.voiceRecordSuccessEvent -= OnVoiceRecordTeamSuccessEvent;
+ m_GuildVoice.voiceRecordSuccessEvent -= OnVoiceRecordFairySuccessEvent;
+ m_TeamVoice.voiceRecordSuccessEvent -= OnVoiceRecordTeamSuccessEvent;
model.myTeamRefreshEvent -= myTeamRefreshEvent;
PlayerDatas.Instance.fairyData.OnRefreshFairyInfo -= OnRefreshFairyInfo;
FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChangeEvent;
@@ -193,13 +196,13 @@
private void OnRefreshFairyInfo()
{
- _TongVoiceBtn.gameObject.SetActive(PlayerDatas.Instance.fairyData.HasFairy
+ m_GuildVoice.gameObject.SetActive(PlayerDatas.Instance.fairyData.HasFairy
&& FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Chat));
}
private void myTeamRefreshEvent()
{
- _TeamChatBtn.gameObject.SetActive(model.myTeam.inTeam
+ m_TeamVoice.gameObject.SetActive(model.myTeam.inTeam
&& FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Chat));
}
@@ -213,7 +216,8 @@
if (PlayerDatas.Instance.hero.aiHandler.IsAuto())
{
- AutoImg.SetActive(false);
+ m_ImgAuto.gameObject.SetActive(false);
+ m_ImgUnAuto.gameObject.SetActive(true);
if (!WindowCenter.Instance.IsOpen<ExperienceOpenWin>())
{
WindowCenter.Instance.Open<ExperienceOpenWin>(true);
@@ -221,7 +225,8 @@
}
else
{
- AutoImg.SetActive(true);
+ m_ImgAuto.gameObject.SetActive(true);
+ m_ImgUnAuto.gameObject.SetActive(false);
if (WindowCenter.Instance.IsOpen<ExperienceOpenWin>())
{
WindowCenter.Instance.Close<ExperienceOpenWin>();
@@ -360,7 +365,9 @@
_hero.Behaviour.StopHandupAI(true);
}
}
- AutoImg.SetActive(!AutoImg.activeSelf);
+
+ m_ImgAuto.gameObject.SetActive(!m_ImgAuto.gameObject.activeSelf);
+ m_ImgUnAuto.gameObject.SetActive(!m_ImgUnAuto.gameObject.activeSelf);
}
void BackPack1Buton()//鑳屽寘鎸夐挳
@@ -371,17 +378,27 @@
void OnHeroHandupAIStopPassive()
{
- if (!AutoImg.activeSelf)
+ if (!m_ImgAuto.gameObject.activeSelf)
{
- AutoImg.SetActive(true);
+ m_ImgAuto.gameObject.SetActive(true);
+ }
+
+ if (!m_ImgUnAuto.gameObject.activeSelf)
+ {
+ m_ImgUnAuto.gameObject.SetActive(false);
}
}
void OnHeroHandupAIStarted()
{
- if (AutoImg.activeSelf)
+ if (m_ImgAuto.gameObject.activeSelf)
{
- AutoImg.SetActive(false);
+ m_ImgAuto.gameObject.SetActive(false);
+ }
+
+ if (!m_ImgUnAuto.gameObject.activeSelf)
+ {
+ m_ImgUnAuto.gameObject.SetActive(true);
}
}
--
Gitblit v1.8.0