Merge branch 'MainWinAdjust'

client_Wu Xijin

2019-03-27 44b5b3201f08c119429f5ec6da982677e47569a2

 System/MainInterfacePanel/LowSettingTip.cs

@@ -16,10 +16,9 @@
        [SerializeField] Button _SkillBtn;//技能按钮

        [SerializeField] Button _Pet1Btn;//宠物按钮

        [SerializeField] Button _Synthesis1Btn;//合成按钮

                                               // [SerializeField] Button _RealmBtn;//境界



        [SerializeField] Button _Rune1Btn;//符印按钮

        [SerializeField] Button _SetUp1Btn;//设置按钮





        [SerializeField] Button _RankingListBtn;//排行榜按钮

        [SerializeField] Button _Strengthen1Btn;//强化按钮

@@ -29,7 +28,9 @@
        [SerializeField] Button m_TreasureSoulBtn;//觉醒按钮

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

        [SerializeField] Button m_JadeDynastyBtn;//诛仙装备按钮

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



        TreasureModel treasureModel { get { return ModelCenter.Instance.GetModel<TreasureModel>(); } }



        public void Init()

        {

            _Role1Btn.onClick.AddListener(Role1Button);

@@ -43,7 +44,7 @@
            _SetUp1Btn.onClick.AddListener(SetUp1Btn);

            _RankingListBtn.onClick.AddListener(RankingListButton);

            m_BagualuBtn.AddListener(OnClickBagualuBtn);

            m_TreasureSoulBtn.AddListener(OnClickTreasureSoul);

            m_TreasureSoulBtn.AddListener(OpenTreasure);

            m_GodBeastBtn.AddListener(GodBeastBtn);

            m_JadeDynastyBtn.AddListener(OpenEquip);

        }

@@ -57,7 +58,6 @@
            _Synthesis1Btn.onClick.RemoveAllListeners();

            _Rune1Btn.onClick.RemoveAllListeners();

            _Pet1Btn.onClick.RemoveAllListeners();

            //  _RealmBtn.onClick.RemoveAllListeners();

            _SetUp1Btn.onClick.RemoveAllListeners();

            _RankingListBtn.onClick.RemoveAllListeners();

            m_BagualuBtn.RemoveAllListeners();

@@ -73,7 +73,6 @@
        }

        void OnClickBagualuBtn()

        {

            //DesignDebug.Log("德龙的八卦炉");

            WindowCenter.Instance.Close<MainInterfaceWin>();

            WindowCenter.Instance.Open<BlastFurnaceWin>();

        }

@@ -102,12 +101,39 @@
                WindowCenter.Instance.Open<SkillWin>();

            }



            //DesignDebug.Log("技能按钮");

        }

        void OnClickTreasureSoul()



        void OpenTreasure()

        {

            if (!treasureModel.SatisfyEntranceOpen())

            {

                treasureModel.DisplayEntranceLimitHint();

                return;

            }



            WindowCenter.Instance.Close<MainInterfaceWin>();

            if (treasureModel.IsRequireUnlockAnim(TreasureCategory.Human) != 0)

            {

                treasureModel.currentCategory = TreasureCategory.Human;

            }

            else if (treasureModel.IsRequireUnlockAnim(TreasureCategory.Demon) != 0)

            {

                treasureModel.currentCategory = TreasureCategory.Demon;

            }

            else if (RedpointCenter.Instance.GetRedpointState(TreasureModel.CATEGORY_REDPOINTIDS[(int)TreasureCategory.Human - 1])

                == RedPointState.Simple)

            {

                treasureModel.currentCategory = TreasureCategory.Human;

            }

            else if (RedpointCenter.Instance.GetRedpointState(TreasureModel.CATEGORY_REDPOINTIDS[(int)TreasureCategory.Demon - 1])

                == RedPointState.Simple)

            {

                treasureModel.currentCategory = TreasureCategory.Demon;

            }



            WindowCenter.Instance.Open<TreasureSelectWin>();

        }



        private void GodBeastBtn()

        {

            WindowCenter.Instance.Close<MainInterfaceWin>();