From 10b4bfe74e3452f830115ab71a316102733b7122 Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期一, 12 十一月 2018 19:56:58 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/MainInterfaceWin.cs | 64 ++++++++++++++++----------------
1 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/System/MainInterfacePanel/MainInterfaceWin.cs b/System/MainInterfacePanel/MainInterfaceWin.cs
index d1357c1..f37b1a9 100644
--- a/System/MainInterfacePanel/MainInterfaceWin.cs
+++ b/System/MainInterfacePanel/MainInterfaceWin.cs
@@ -85,7 +85,7 @@
[SerializeField] Button m_SendRedbagBtn;
[SerializeField] Button WishingAwardImg;
[SerializeField] Button m_GotoFairyGrabBoss;
- //[SerializeField] Button m_FlyToFairyGrabBoss;
+ [SerializeField] Button m_FlyToFairyGrabBoss;
[SerializeField] Transform m_EffectTask;//浠诲姟瀹屾垚鐗规晥鎾斁浣嶇疆
private int m_CollectNPCID;
@@ -179,7 +179,7 @@
m_SendRedbagBtn.AddListener(SendRedpacketBtn);
WishingAwardImg.AddListener(ClickWishAward);
m_GotoFairyGrabBoss.AddListener(GotoFairyGrabBoss);
- //m_FlyToFairyGrabBoss.AddListener(FlyToFairyGrabBoss);
+ m_FlyToFairyGrabBoss.AddListener(FlyToFairyGrabBoss);
}
protected override void OnPreOpen()
@@ -1142,36 +1142,36 @@
}
}
- //private void FlyToFairyGrabBoss()
- //{
- // if (fairyGrabBossModel.cacheGotoBossId != 0)
- // {
- // var error = 0;
- // if (fairyGrabBossModel.TestEnterDungeon(fairyGrabBossModel.cacheGotoBossId, out error))
- // {
- // var bossInfoConfig = Config.Instance.Get<BossInfoConfig>(fairyGrabBossModel.cacheGotoBossId);
- // var flyItemCount = ModelCenter.Instance.GetModel<PlayerPackModel>().GetItemCountByID(PackType.rptItem, 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
- // {
- // FlyShoseConfirmwin.useEnvironment = FlyShoseConfirmwin.UseEnvironment.FairyGrabBoss;
- // FlyShoseConfirmwin.confirmCallBack = FlyShoesUseCallback;
- // WindowCenter.Instance.Open<FlyShoseConfirmwin>();
- // }
- // }
- // }
- // else
- // {
- // fairyGrabBossModel.DisplayErrorTip(error);
- // }
- // }
- //}
+ private void FlyToFairyGrabBoss()
+ {
+ if (fairyGrabBossModel.cacheGotoBossId != 0)
+ {
+ var error = 0;
+ if (fairyGrabBossModel.TestEnterDungeon(fairyGrabBossModel.cacheGotoBossId, out error))
+ {
+ var bossInfoConfig = Config.Instance.Get<BossInfoConfig>(fairyGrabBossModel.cacheGotoBossId);
+ var flyItemCount = ModelCenter.Instance.GetModel<PlayerPackModel>().GetItemCountByID(PackType.rptItem, 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
+ {
+ FlyShoseConfirmwin.useEnvironment = FlyShoseConfirmwin.UseEnvironment.FairyGrabBoss;
+ FlyShoseConfirmwin.confirmCallBack = FlyShoesUseCallback;
+ WindowCenter.Instance.Open<FlyShoseConfirmwin>();
+ }
+ }
+ }
+ else
+ {
+ fairyGrabBossModel.DisplayErrorTip(error);
+ }
+ }
+ }
private void FlyShoesUseCallback()
{
--
Gitblit v1.8.0