1930【1.0.15】【主干】功能预告跳转八卦炉激活，功能预告界面未关闭

client_linchunjie

2018-09-14 a0ede150686a218c92b901b1f20aef12a9913890

 System/Activity/ActivityNotifyBehaviour.cs

@@ -53,18 +53,23 @@


        private void OnConfirmClick()

        {

            if((DailyQuestType)m_NotifyType != DailyQuestType.WyTaiChi)

            switch ((DailyQuestType)m_NotifyType)

            {

                if (PlayerDatas.Instance.extersion.pkState == 1)

                {

                    SysNotifyMgr.Instance.ShowTip("PK_Leave");

                    return;

                }

                if (PlayerDatas.Instance.extersion.bossState == 1)

                {

                    SysNotifyMgr.Instance.ShowTip("Boss_Leave");

                    return;

                }

                case DailyQuestType.FairyGrabBoss:

                case DailyQuestType.WyTaiChi:

                    break;

                default:

                    if (PlayerDatas.Instance.extersion.pkState == 1)

                    {

                        SysNotifyMgr.Instance.ShowTip("PK_Leave");

                        return;

                    }

                    if (PlayerDatas.Instance.extersion.bossState == 1)

                    {

                        SysNotifyMgr.Instance.ShowTip("Boss_Leave");

                        return;

                    }

                    break;

            }

         

            var config = Config.Instance.Get<DailyQuestConfig>((int)m_NotifyType);

@@ -79,7 +84,19 @@
                        WindowCenter.Instance.Open<NormalDungeonEntranceWin>();

                        break;

                    case DailyQuestType.GuardSky:

                        if (ModelCenter.Instance.GetModel<FairyModel>().completeGuardSky)

                        var fairyData = PlayerDatas.Instance.fairyData;

                        if (!fairyData.HasFairy)

                        {

                            break;

                        }

                        var fairyModel = ModelCenter.Instance.GetModel<FairyModel>();

                        if (fairyData.fairy == null

                            || fairyData.fairy.FamilyLV < fairyModel.guardSkyOpenFairyLv)

                        {

                            SysNotifyMgr.Instance.ShowTip("GuardSkyOpenLvError", fairyModel.guardSkyOpenFairyLv);

                            break;

                        }

                        if (fairyModel.completeGuardSky)

                        {

                            SysNotifyMgr.Instance.ShowTip("TheEmperor1");

                            break;

@@ -94,7 +111,7 @@
                        }

                        break;

                    case DailyQuestType.FairyFeast:

                        dungeonModel.SingleChallengeDungeon(config.RelatedID);

                        dungeonModel.SingleChallenge(config.RelatedID);

                        break;

                    case DailyQuestType.Trial:

                        {

@@ -121,6 +138,9 @@
                    case DailyQuestType.FairyLeague:

                        WindowCenter.Instance.Open<UnionPanel>(false, 4);

                        break;

                    case DailyQuestType.FairyGrabBoss:

                        WindowCenter.Instance.Open<LootPreciousFrameWin>(false, 1);

                        break;

                }

            }

            else