From 5048f6b535946e3c64a2cde4c3bb35ca732af9b4 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期二, 28 五月 2019 10:42:50 +0800
Subject: [PATCH] 3335 去掉旧骑宠争夺代码
---
System/MainInterfacePanel/MainButtonMisc.cs | 110 -------------------------------------------------------
1 files changed, 0 insertions(+), 110 deletions(-)
diff --git a/System/MainInterfacePanel/MainButtonMisc.cs b/System/MainInterfacePanel/MainButtonMisc.cs
index 0696d51..3a470f4 100644
--- a/System/MainInterfacePanel/MainButtonMisc.cs
+++ b/System/MainInterfacePanel/MainButtonMisc.cs
@@ -19,9 +19,6 @@
[SerializeField] Button m_WishingAwardImg;
[SerializeField] Button m_MysticalPurchaseImg;
[SerializeField] Button m_DungeonAssistImg;
- [SerializeField] RectTransform m_ContainerGotoGrabBoss;
- [SerializeField] Button m_GotoFairyGrabBoss;
- [SerializeField] Button m_FlyToFairyGrabBoss;
[SerializeField] Button m_FriendQuestBtn;
[SerializeField] Button m_FairyRequestBtn;
[SerializeField] Button m_ReikiResetRemind;
@@ -34,7 +31,6 @@
WishingPoolModel wishModel { get { return ModelCenter.Instance.GetModel<WishingPoolModel>(); } }
MysticalPurchaseModel purchaseModel { get { return ModelCenter.Instance.GetModel<MysticalPurchaseModel>(); } }
DungeonAssistModel assistModel { get { return ModelCenter.Instance.GetModel<DungeonAssistModel>(); } }
- FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } }
FriendsModel friendsModel { get { return ModelCenter.Instance.GetModel<FriendsModel>(); } }
FairyModel fairyModel { get { return ModelCenter.Instance.GetModel<FairyModel>(); } }
ReikiRootModel reikiRootModel { get { return ModelCenter.Instance.GetModel<ReikiRootModel>(); } }
@@ -46,8 +42,6 @@
m_WishingAwardImg.SetListener(ClickWishAward);
m_MysticalPurchaseImg.SetListener(ClickMysticalPurchase);
m_DungeonAssistImg.SetListener(ClickDungeonAssist);
- m_GotoFairyGrabBoss.SetListener(GotoFairyGrabBoss);
- m_FlyToFairyGrabBoss.SetListener(FlyToFairyGrabBoss);
m_FairyRequestBtn.SetListener(OnFairyRequestClick);
m_ReikiResetRemind.SetListener(OnReikiRemind);
}
@@ -57,7 +51,6 @@
friendsModel.askAddFriendEvent = FriendQuestBtn;
OnRedBagGet();//鍒ゆ柇鏄惁寮�鍚孩鍖呭叆鍙�
CheckSendRedpackBtn();
- ShowFairyGrabBoss();
IsCrossServerOneVsOne();
DisplayReikiRemind();
@@ -76,8 +69,6 @@
wishModel.UpdateWishAwardEvent += UpdateWishAwardImag;
purchaseModel.UpdateNewMysticalEvent += UpdateMysticalPurchaseImag;
assistModel.UpdateRedpointEvent += UpdateDungeonAssistImag;
- fairyGrabBossModel.bossGrabHintEvent += bossGrabHintEvent;
- fairyGrabBossModel.gotoBossStateUpdate += ShowFairyGrabBoss;
ChatTip.OnChatUpEvent += RefreshAdaptiveChat;
fairyModel.UpdateFairyRequestEvent += UpdateFairyRequest;
}
@@ -104,8 +95,6 @@
wishModel.UpdateWishAwardEvent -= UpdateWishAwardImag;
purchaseModel.UpdateNewMysticalEvent -= UpdateMysticalPurchaseImag;
assistModel.UpdateRedpointEvent -= UpdateDungeonAssistImag;
- fairyGrabBossModel.gotoBossStateUpdate -= ShowFairyGrabBoss;
- fairyGrabBossModel.bossGrabHintEvent -= bossGrabHintEvent;
ChatTip.OnChatUpEvent -= RefreshAdaptiveChat;
fairyModel.UpdateFairyRequestEvent -= UpdateFairyRequest;
m_CollectBehaviour.gameObject.SetActive(false);
@@ -268,17 +257,6 @@
m_DungeonAssistImg.gameObject.SetActive(assistModel.IsNewAssistInfo);
}
- private void ShowFairyGrabBoss()
- {
- m_ContainerGotoGrabBoss.gameObject.SetActive(fairyGrabBossModel.cacheGotoBossId != 0 &&
- !fairyGrabBossModel.grabBossHintOpen);
- }
-
- private void bossGrabHintEvent()
- {
- ShowFairyGrabBoss();
- }
-
private void RefreshAdaptiveChat()
{
if (ChatTip.Inst == null)
@@ -287,94 +265,6 @@
}
}
- private void GotoFairyGrabBoss()
- {
- if (fairyGrabBossModel.cacheGotoBossId != 0)
- {
- var error = 0;
- if (fairyGrabBossModel.TestEnterDungeon(fairyGrabBossModel.cacheGotoBossId, out error))
- {
- if (fairyGrabBossModel.IsBossKilled(fairyGrabBossModel.cacheGotoBossId))
- {
- SysNotifyMgr.Instance.ShowTip("FairyGrabBossOver");
- }
- MapTransferUtility.Instance.MoveToNPC(fairyGrabBossModel.cacheGotoBossId);
- }
- else
- {
- fairyGrabBossModel.DisplayErrorTip(error);
- }
- }
- }
- private void FlyToFairyGrabBoss()
- {
- if (fairyGrabBossModel.cacheGotoBossId != 0)
- {
- var error = 0;
- if (fairyGrabBossModel.TestEnterDungeon(fairyGrabBossModel.cacheGotoBossId, out error))
- {
- var bossInfoConfig = BossInfoConfig.Get(fairyGrabBossModel.cacheGotoBossId);
- var flyItemCount = ModelCenter.Instance.GetModel<PackModel>().GetItemCountByID(PackType.Item, GeneralDefine.flyBootItemId);
- var freeFly = ModelCenter.Instance.GetModel<VipModel>().GetVipPrivilegeCnt(VipPrivilegeType.FreeTransfer) > 0;
- if (bossInfoConfig != null)
- {
- if (freeFly || flyItemCount > 0)
- {
- MapTransferUtility.Instance.MissionFlyTo(bossInfoConfig.MapID, fairyGrabBossModel.cacheGotoBossId);
- }
- else
- {
- if (fairyGrabBossModel.flyToGrabBossRemind)
- {
- var money = (int)UIHelper.GetMoneyCnt(1);
- if (money >= 1)
- {
- FlyShoesUseCallback();
- }
- else
- {
- WindowCenter.Instance.Open<RechargeTipWin>();
- }
- }
- else
- {
- FlyShoseConfirmwin.useEnvironment = FlyShoseConfirmwin.UseEnvironment.FairyGrabBoss;
- FlyShoseConfirmwin.confirmCallBack = FlyShoesUseCallback;
- WindowCenter.Instance.Open<FlyShoseConfirmwin>();
- }
- }
- }
- }
- else
- {
- fairyGrabBossModel.DisplayErrorTip(error);
- }
- }
- }
- private void FlyShoesUseCallback()
- {
- switch (FlyShoseConfirmwin.useEnvironment)
- {
- case FlyShoseConfirmwin.UseEnvironment.FairyGrabBoss:
- if (fairyGrabBossModel.cacheGotoBossId != 0)
- {
- var error = 0;
- if (fairyGrabBossModel.TestEnterDungeon(fairyGrabBossModel.cacheGotoBossId, out error))
- {
- var bossInfoConfig = BossInfoConfig.Get(fairyGrabBossModel.cacheGotoBossId);
- if (bossInfoConfig != null)
- {
- MapTransferUtility.Instance.MissionFlyTo(bossInfoConfig.MapID, fairyGrabBossModel.cacheGotoBossId);
- }
- }
- else
- {
- fairyGrabBossModel.DisplayErrorTip(error);
- }
- }
- break;
- }
- }
public void FriendQuestBtn()
{
if (FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Friend))
--
Gitblit v1.8.0