4602 【1.2】【前端】boss争夺战入口修改回封魔坛中，标签按钮在封魔坛后，异兽之地前

client_linchunjie

2018-11-07 2d5a0c0d80eae8aa07bd5c73f6c45f1af3e253e5

4602 【1.2】【前端】boss争夺战入口修改回封魔坛中，标签按钮在封魔坛后，异兽之地前

 System/Activity/ActivityNotifyBehaviour.cs

@@ -138,7 +138,7 @@
                        WindowCenter.Instance.Open<UnionPanel>(false, 4);

                        break;

                    case DailyQuestType.FairyGrabBoss:

                        WindowCenter.Instance.Open<PetWin>(false, 2);

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

                        break;

                }

            }


 System/DailyQuest/DailyQuestWin.cs

@@ -294,7 +294,7 @@
                    break;

                case DailyQuestType.FairyGrabBoss:

                    WindowCenter.Instance.CloseImmediately<DailyQuestWin>();

                    WindowCenter.Instance.Open<PetWin>(false, 2);

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

                    break;

                case DailyQuestType.KillMonster:

                    var point = mapModel.GetRecommendHangPoint();


 System/FindPrecious/LootPreciousFrameWin.cs

@@ -14,7 +14,8 @@
    {

        [SerializeField] FunctionButtonGroup m_FunctionGroup;
        [SerializeField] FunctionButton m_DemonJar;
        [SerializeField] FunctionButton m_DemonJar;

        [SerializeField] FunctionButton m_FairyGrabBoss;
        [SerializeField] FunctionButton m_DogzDungeon;

        [SerializeField] Button m_Left;
@@ -29,9 +30,10 @@
        protected override void AddListeners()
        {
            m_DemonJar.AddListener(ShowDemonJar);
            m_DogzDungeon.AddListener(ShowDogzDungeon);
            m_DogzDungeon.AddListener(ShowDogzDungeon);

            m_FairyGrabBoss.AddListener(FairyGrabBoss);
            m_Left.AddListener(ShowLastFunction);
            m_Right.AddListener(ShowNextFunction);
            m_Right.AddListener(ShowNextFunction);

            m_Close.AddListener(CloseClick);
        }

@@ -75,6 +77,13 @@
            functionOrder = m_DemonJar.order;
        }

        private void FairyGrabBoss()
        {
            CloseSubWindows();

            WindowCenter.Instance.Open<FairyGrabBossWin>();

            functionOrder = m_FairyGrabBoss.order;
        }

        private void ShowDogzDungeon()
        {
            CloseSubWindows();
@@ -86,6 +95,7 @@
        {
            WindowCenter.Instance.CloseImmediately<DemonJarWin>();
            WindowCenter.Instance.CloseImmediately<DogzDungeonWin>();
            WindowCenter.Instance.CloseImmediately<FairyGrabBossWin>();
        }

        private void ShowLastFunction()

 System/MainInterfacePanel/HighSettingTip.cs

@@ -254,7 +254,14 @@
        void LootPreciousButton()//夺宝

        {

            WindowCenter.Instance.Close<MainInterfaceWin>();

            WindowCenter.Instance.Open<LootPreciousFrameWin>();

            if (fairyGrabBossModel.InActivityTime && !NewBieCenter.Instance.inGuiding)

            {

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

            }

            else

            {

                WindowCenter.Instance.Open<LootPreciousFrameWin>();

            }

        }



        void RechargeButton()//充值按钮


 System/MainInterfacePanel/LowSettingTip.cs

@@ -135,14 +135,7 @@
        void Pet1Button()

        {

            WindowCenter.Instance.Close<MainInterfaceWin>();

            if (fairyGrabBossModel.InActivityTime && !NewBieCenter.Instance.inGuiding)

            {

                WindowCenter.Instance.Open<PetWin>(false, 2);

            }

            else

            {

                WindowCenter.Instance.Open<PetWin>();

            }

            WindowCenter.Instance.Open<PetWin>();



            //DesignDebug.Log("宠物按钮");

        }


 System/Pet/PetWin.cs

@@ -15,7 +15,6 @@
    {

        [SerializeField] FunctionButton PetPanelBtn;//灵宠面板按钮

        [SerializeField] FunctionButton EvolveTrainWinBtn;//灵宠培养面板按钮

        [SerializeField] FunctionButton m_FairyGrabBoss;

        [SerializeField] FunctionButtonGroup FuncBtnGroup;

        [SerializeField] Button _CloseBtn;

        [SerializeField] Button _LeftBtn;

@@ -81,7 +80,6 @@
            EvolveTrainWinBtn.AddListener(OnClickEvolveTrainWin);

            _LeftBtn.AddListener(OnClickLeftBtn);

            _RightBtn.AddListener(OnClickRightBtn);

            m_FairyGrabBoss.AddListener(FairyGrabBoss);

        }





@@ -93,20 +91,6 @@
        private void OnClickLeftBtn()

        {

            FuncBtnGroup.TriggerLast();

        }



        private void FairyGrabBoss()
        {
            CloseChild();

            if (windowState == WindowState.Opened)

            {

                WindowCenter.Instance.OpenWithoutAnimation<FairyGrabBossWin>();

            }

            else

            {

                WindowCenter.Instance.Open<FairyGrabBossWin>(true);

            }

            functionOrder = m_FairyGrabBoss.order;
        }



        private void OnClickPetPanel()

@@ -148,7 +132,6 @@
            {

                WindowCenter.Instance.CloseImmediately<MountWin>();

            }

            WindowCenter.Instance.CloseImmediately<FairyGrabBossWin>();

        }

    }

}