3634【前端】骑宠争夺入口修改

client_linchunjie

2018-09-18 aa2647384fdfe1100f8d0d6f771c7e854706ec74

3634【前端】骑宠争夺入口修改

 System/Activity/ActivityNotifyBehaviour.cs

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

                        break;

                    case DailyQuestType.FairyGrabBoss:

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

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

                        break;

                }

            }


 System/DailyQuest/DailyQuestWin.cs

@@ -293,7 +293,7 @@
                    break;

                case DailyQuestType.FairyGrabBoss:

                    WindowCenter.Instance.CloseImmediately<DailyQuestWin>();

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

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

                    break;

                default:

                    break;


 System/FairyAu/FairyGrabBossModel.cs

@@ -486,7 +486,7 @@
                        {

                            if (_ok)

                            {

                                WindowCenter.Instance.Close<LootPreciousFrameWin>();

                                WindowCenter.Instance.Close<PetWin>();

                                MapTransferUtility.Instance.MoveToNPC(selectBoss);

                            }

                        }


 System/FairyAu/FairyGrabBossWin.cs

@@ -185,7 +185,7 @@
                    SysNotifyMgr.Instance.ShowTip("FairyGrabBossOver");

                }

                WindowJumpMgr.Instance.ClearJumpData();

                WindowCenter.Instance.Close<LootPreciousFrameWin>();

                WindowCenter.Instance.Close<PetWin>();

                MapTransferUtility.Instance.MoveToNPC(model.selectBoss);

            }

            else


 System/FindPrecious/LootPreciousFrameWin.cs

@@ -15,14 +15,11 @@

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

        [SerializeField] Button m_Left;
        [SerializeField] Button m_Right;
        [SerializeField] Button m_Close;

        FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } }

        #region Built-in
        protected override void BindController()
@@ -33,7 +30,6 @@
        {
            m_DemonJar.AddListener(ShowDemonJar);
            m_DogzDungeon.AddListener(ShowDogzDungeon);
            m_FairyGrabBoss.AddListener(FairyGrabBoss);
            m_Left.AddListener(ShowLastFunction);
            m_Right.AddListener(ShowNextFunction);
            m_Close.AddListener(CloseClick);
@@ -79,13 +75,6 @@
            functionOrder = m_DemonJar.order;
        }

        private void FairyGrabBoss()
        {
            CloseSubWindows();
            WindowCenter.Instance.Open<FairyGrabBossWin>();
            functionOrder = m_FairyGrabBoss.order;
        }

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

        private void ShowLastFunction()

 System/MainInterfacePanel/HighSettingTip.cs

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

        {

            WindowCenter.Instance.Close<MainInterfaceWin>();

            if (fairyGrabBossModel.InActivityTime)

            {

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

            }

            else

            {

                WindowCenter.Instance.Open<LootPreciousFrameWin>();

            }

        }



        void RechargeButton()//充值按钮


 System/MainInterfacePanel/LowSettingTip.cs

@@ -26,6 +26,8 @@


        [SerializeField] Button m_TreasureSoulBtn;//觉醒按钮

        [SerializeField] Button m_GodBeastBtn;//神兽按钮



        FairyGrabBossModel fairyGrabBossModel { get { return ModelCenter.Instance.GetModel<FairyGrabBossModel>(); } }

        public void Init()

        {

            _Role1Btn.onClick.AddListener(Role1Button);

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

        {

            WindowCenter.Instance.Close<MainInterfaceWin>();

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

            {

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

            }

            else

            {

            WindowCenter.Instance.Open<PetWin>();

            }

          

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

        }


 System/Pet/PetWin.cs

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

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

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

        [SerializeField] FunctionButton m_FairyGrabBoss;

        [SerializeField] FunctionButtonGroup FuncBtnGroup;

        [SerializeField] Button _CloseBtn;

        [SerializeField] Button _LeftBtn;

@@ -62,7 +63,7 @@
            base.OnActived();





            if (!WindowJumpMgr.Instance.IsJumpState)//是否进行跳转

            if (!WindowJumpMgr.Instance.IsJumpState && functionOrder < 2)//是否进行跳转

            {

                if (mountModel.IsHorsePanelState() > petmodel.IsPetPanelRedPointState())

                {

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

            _LeftBtn.AddListener(OnClickLeftBtn);

            _RightBtn.AddListener(OnClickRightBtn);

            m_FairyGrabBoss.AddListener(FairyGrabBoss);

        }





@@ -91,6 +93,20 @@
        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()

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

                WindowCenter.Instance.CloseImmediately<MountWin>();

            }

            WindowCenter.Instance.CloseImmediately<FairyGrabBossWin>();

        }

    }

}