5398 子 【开发】【1.4】跨服竞技场 ,正在进入跨服时，限制进入副本

Client_PangDeRong

2018-12-22 30c8832c1503893c4958dd9594dbbc77c1a15ffd

5398 子 【开发】【1.4】跨服竞技场 ,正在进入跨服时，限制进入副本

 System/CrossServerOneVsOne/CrossServerArenaWin.cs

@@ -7,6 +7,7 @@
    [XLua.Hotfix]

    public class CrossServerArenaWin : Window

    {

        [SerializeField] Button scoreRankBtn;

        [SerializeField] Button matchBtn;

        [SerializeField] Image matchBtn_Img;

        [SerializeField] Text matchBtn_Text;

@@ -18,6 +19,9 @@
        [SerializeField] Text openTimeText;

        [SerializeField] Button buyTimesBtn;

        [SerializeField] Button matchRecordBtn;

        [SerializeField] GameObject inSeasonTimeObj;

        [SerializeField] GameObject outSeasonTimeObj;



        CrossServerRewardModel m_CrossServerRewardModel;

        CrossServerRewardModel crossServerRewardModel { get { return m_CrossServerRewardModel ?? (m_CrossServerRewardModel = ModelCenter.Instance.GetModel<CrossServerRewardModel>()); } }

        CrossServerModel crossServerModel { get { return ModelCenter.Instance.GetModel<CrossServerModel>(); } }

@@ -32,6 +36,7 @@
            matchBtn.AddListener(ClickMatch);

            buyTimesBtn.AddListener(ClickBuyTimes);

            matchRecordBtn.AddListener(ClickMatchRecord);

            scoreRankBtn.AddListener(ClickScoreRank);

        }



        protected override void OnPreOpen()

@@ -113,16 +118,13 @@
        {

            bool isInTime = CrossServerPKSeason.Instance.InDay(TimeUtility.ServerNow);

            bool isOpen = CrossServerPKSeason.Instance.InOpenTime();

            inSeasonTimeObj.SetActive(isInTime);

            outSeasonTimeObj.SetActive(!isInTime);

            matchBtn.RemoveAllListeners();

            if(!isInTime)

            {

                matchBtn_Text.text = Language.Get("CrossServer111");

                matchBtn_Img.material = MaterialUtility.GetDefaultSpriteGrayMaterial();

            }

            else

            if(isInTime)

            {

                matchBtn_Text.text = Language.Get("CrossServer109");

                if(isOpen)

                if (isOpen)

                {

                    matchBtn_Img.material = MaterialUtility.GetUIDefaultGraphicMaterial();

                    matchBtn.AddListener(ClickMatch);

@@ -132,7 +134,6 @@
                    matchBtn_Img.material = MaterialUtility.GetDefaultSpriteGrayMaterial();

                }

            }



        }



        private void ClickBuyTimes()

@@ -147,7 +148,13 @@
        {

            WindowCenter.Instance.Open<CrossServerDayAwardsWin>();

        }

       




        private void ClickScoreRank()

        {

            WindowCenter.Instance.Open<RankingWin>();

        }



        private void ClickMatch()

        {

            CloseImmediately();


 System/CrossServerOneVsOne/CrossServerWin.cs

@@ -24,7 +24,6 @@
        [SerializeField] Slider scoreSlider;

        [SerializeField] Text scorePerText;

        [SerializeField] GameObject danLvUpObj;

        [SerializeField] Button scoreRankBtn;

        [SerializeField] Button rankAwardBtn;

        [SerializeField] Button arenaBtn;

        [SerializeField] Button seasonAwardBtn;

@@ -45,7 +44,6 @@
            rightBtn.AddListener(ClickRight);

            arenaFunc.AddListener(ClickArenaFunc);

            bossFunc.AddListener(ClickBossFunc);

            scoreRankBtn.AddListener(ClickScoreRank);

            rankAwardBtn.AddListener(ClickRankAward);

            arenaBtn.AddListener(ClickArena);

            seasonAwardBtn.AddListener(ClickSeasonAward);

@@ -161,12 +159,6 @@
            WindowCenter.Instance.Open<SegmentRewardWin>();

        }



        private void ClickScoreRank()

        {

            CloseSubWindows();

            WindowCenter.Instance.Open<RankingWin>();

        }





        private void ClickClose()

        {

@@ -183,7 +175,6 @@
            //}

            WindowCenter.Instance.CloseImmediately<CrossServerArenaWin>();

            WindowCenter.Instance.CloseImmediately<HonorStoreWin>();

            WindowCenter.Instance.CloseImmediately<RankingWin>();

            WindowCenter.Instance.CloseImmediately<SeasonRewardWin>();

            WindowCenter.Instance.CloseImmediately<SegmentRewardWin>();

            WindowCenter.Instance.CloseImmediately<MatchWin>();