From e3321e6b7938660c85f21c1fab84aadaa634b4a5 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 01 四月 2019 12:06:45 +0800
Subject: [PATCH] 3335 优化代码
---
System/MainInterfacePanel/ChatFrame.cs | 102 +++++++--------------------------------------------
1 files changed, 14 insertions(+), 88 deletions(-)
diff --git a/System/MainInterfacePanel/ChatFrame.cs b/System/MainInterfacePanel/ChatFrame.cs
index 01af372..df748f4 100644
--- a/System/MainInterfacePanel/ChatFrame.cs
+++ b/System/MainInterfacePanel/ChatFrame.cs
@@ -18,7 +18,6 @@
[SerializeField] Button _MailBtn;//閭欢鎸夐挳
[SerializeField] Button _OneKeyBtn;//鍦板浘鎸傛満
[SerializeField] Button _AutoBtn;//鑷姩鎸傛満
- [SerializeField] Button _BackPack1Btn;//鑳屽寘鎸夐挳
[SerializeField] Button _SetupBtn;
[SerializeField] Image m_ImgAuto;//鍘熷湴鎸傛満
@@ -36,6 +35,9 @@
TeamModel teamModel { get { return ModelCenter.Instance.GetModel<TeamModel>(); } }
CoinTaskTipModel coinTaskTip { get { return ModelCenter.Instance.GetModel<CoinTaskTipModel>(); } }
+ DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }
+ PlayerMainDate main { get { return ModelCenter.Instance.GetModel<PlayerMainDate>(); } }
+ BossHomeModel bossHomeModel { get { return ModelCenter.Instance.GetModel<BossHomeModel>(); } }
void Awake()
{
@@ -46,14 +48,11 @@
public void Init()
{
MailAllModel.Instance.MailCntChangeEvent += MailCountChange;
- HeroBehaviour.OnStopHandupAI += OnHeroHandupAIStopPassive;
- HeroBehaviour.OnStartHandupAI += OnHeroHandupAIStarted;
FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;
_MailBtn.SetListener(MailButton);
_OneKeyBtn.SetListener(OneKeyButton);
_AutoBtn.SetListener(AutoButton);
- _BackPack1Btn.SetListener(BackPack1Buton);
_SetupBtn.SetListener(OnSetBtn);
m_TaskBtn.SetListener(TaskButton);
m_SocialBtn.SetListener(FriendsButton);
@@ -63,14 +62,6 @@
MailCountChange();
UpdateVoiceState();
m_VoiceWidget.Init();
-
- if (PlayerDatas.Instance.hero != null)
- {
- if (PlayerDatas.Instance.hero.aiHandler.IsAuto())
- {
- OnHeroHandupAIStopPassive();
- }
- }
}
public void UnInit()
@@ -79,8 +70,6 @@
teamModel.myTeamRefreshEvent -= UpdateVoiceState;
PlayerDatas.Instance.fairyData.OnRefreshFairyInfo -= UpdateVoiceState;
FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChangeEvent;
- HeroBehaviour.OnStopHandupAI -= OnHeroHandupAIStopPassive;
- HeroBehaviour.OnStartHandupAI -= OnHeroHandupAIStarted;
MailAllModel.Instance.DeleteMailEvent -= MailCountChange;
}
@@ -239,25 +228,12 @@
WindowCenter.Instance.Open<SocialWin>();
}
- void TeamChatButton()
- {
- SysNotifyMgr.Instance.ShowTip("UnopenedFunction");
- }
-
- void TongVoiceButton()
- {
- SysNotifyMgr.Instance.ShowTip("UnopenedFunction");
- }
-
void MailButton()//閭欢鎸夐挳
{
WindowCenter.Instance.Open<MailWin>();
WindowCenter.Instance.Close<MainInterfaceWin>();
}
- DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }
- PlayerMainDate main { get { return ModelCenter.Instance.GetModel<PlayerMainDate>(); } }
- BossHomeModel bossHomeModel { get { return ModelCenter.Instance.GetModel<BossHomeModel>(); } }
void OneKeyButton()//鍦板浘鎸傛満鎸夐挳
{
if (CrossServerUtility.IsCrossServerBoss())
@@ -309,12 +285,16 @@
{
GoToOneKeyButton();
}
-
}
-
void GoToOneKeyButton()
{
+ if (PlayerDatas.Instance.extersion.bossState == 1)
+ {
+ SysNotifyMgr.Instance.ShowTip("Task_Transfer1");
+ return;
+ }
+
var mapModel = ModelCenter.Instance.GetModel<MapModel>();
var point = mapModel.GetRecommendHangPoint();
var config = MapEventPointConfig.Get(point);
@@ -323,81 +303,27 @@
var isVipFreeTransfer = ModelCenter.Instance.GetModel<VipModel>().GetVipPrivilegeCnt(VipPrivilegeType.FreeTransfer) > 0;
if (isVipFreeTransfer || flyBootOwn > 0)
{
- if (PlayerDatas.Instance.extersion.bossState == 1)
- {
- SysNotifyMgr.Instance.ShowTip("Task_Transfer1");
- return;
- }
MapTransferUtility.Instance.MissionFlyTo(config.MapID, config.NPCID);
}
else
{
- if (PlayerDatas.Instance.extersion.bossState == 1)
- {
- SysNotifyMgr.Instance.ShowTip("Task_Transfer1");
- return;
- }
MapTransferUtility.Instance.MoveToNPC(config.NPCID);
}
}
void AutoButton()//鍘熷湴鎸傛満鎸夐挳
{
- var _hero = PlayerDatas.Instance.hero;
- if (_hero != null && !_hero.ActorInfo.serverDie)
+ var hero = PlayerDatas.Instance.hero;
+ if (hero != null && !hero.ActorInfo.serverDie)
{
- if (!_hero.aiHandler.IsAuto())
+ if (!hero.aiHandler.IsAuto())
{
- if (!WindowCenter.Instance.IsOpen<ExperienceOpenWin>())
- {
- WindowCenter.Instance.Open<ExperienceOpenWin>(true);
- }
- _hero.Behaviour.StartHandupAI();
+ hero.Behaviour.StartHandupAI();
}
else
{
- if (WindowCenter.Instance.IsOpen<ExperienceOpenWin>())
- {
- WindowCenter.Instance.Close<ExperienceOpenWin>();
- }
-
- _hero.Behaviour.StopHandupAI(true);
+ hero.Behaviour.StopHandupAI(true);
}
- }
-
- m_ImgAuto.gameObject.SetActive(!m_ImgAuto.gameObject.activeSelf);
- m_ImgUnAuto.gameObject.SetActive(!m_ImgUnAuto.gameObject.activeSelf);
- }
-
- void BackPack1Buton()//鑳屽寘鎸夐挳
- {
- WindowCenter.Instance.Open<KnapSackWin>();
- WindowCenter.Instance.Close<MainInterfaceWin>();
- }
-
- void OnHeroHandupAIStopPassive()
- {
- if (!m_ImgAuto.gameObject.activeSelf)
- {
- m_ImgAuto.gameObject.SetActive(true);
- }
-
- if (!m_ImgUnAuto.gameObject.activeSelf)
- {
- m_ImgUnAuto.gameObject.SetActive(false);
- }
- }
-
- void OnHeroHandupAIStarted()
- {
- if (m_ImgAuto.gameObject.activeSelf)
- {
- m_ImgAuto.gameObject.SetActive(false);
- }
-
- if (!m_ImgUnAuto.gameObject.activeSelf)
- {
- m_ImgUnAuto.gameObject.SetActive(true);
}
}
--
Gitblit v1.8.0