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

Client_PangDeRong

2018-12-22 3f6ae5b7bd0a90e03d4e1f6e1b817d0252c73840

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

 System/CrossServerOneVsOne/CrossMatchResultCell.cs

@@ -10,7 +10,8 @@
    {

        [SerializeField] Text dateTime;

        [SerializeField] Text info;

        [SerializeField] Image resultImg;

        [SerializeField] GameObject victory;

        [SerializeField] GameObject failure;

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



        public override void Refresh(CellView cell)

@@ -60,7 +61,8 @@
            }



            bool isWinner = PlayerDatas.Instance.baseData.PlayerID == resultInfo.WinnerID ? true : false;

            resultImg.SetSprite(isWinner ? "" : "");

            victory.SetActive(isWinner);

            failure.SetActive(!isWinner);

        }

    }

}


 System/CrossServerOneVsOne/CrossServerArenaWin.cs

@@ -127,7 +127,14 @@
                if (isOpen)

                {

                    matchBtn_Img.material = MaterialUtility.GetUIDefaultGraphicMaterial();

                    matchBtn.AddListener(ClickMatch);

                    if (!crossServerRewardModel.IsOpenMatch)

                    {

                        matchBtn.AddListener(ClickMatch);

                    }

                    else

                    {

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

                    }

                }

                else

                {


 System/CrossServerOneVsOne/CrossServerPKSeason.cs

@@ -129,7 +129,7 @@
            {

                if(NextStartDate.Equals(default(OperationDate)))

                {

                    return Language.Get("107",Language.Get("CrossServer108"));

                    return Language.Get("CrossServer107", Language.Get("CrossServer108"));

                }

                else

                {


 System/CrossServerOneVsOne/CrossServerWin.cs

@@ -25,9 +25,13 @@
        [SerializeField] Text scorePerText;

        [SerializeField] GameObject danLvUpObj;

        [SerializeField] Button rankAwardBtn;

        [SerializeField] GameObject rankAward_SelectImg;

        [SerializeField] Button arenaBtn;

        [SerializeField] GameObject arena_SelectImg;

        [SerializeField] Button seasonAwardBtn;

        [SerializeField] GameObject seasonAward_SelectImg;

        [SerializeField] Button honorStoreBtn;

        [SerializeField] GameObject honorStore_SelectImg;

        CrossServerRewardModel m_CrossServerRewardModel;

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

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

@@ -115,6 +119,7 @@
        private void ClickArenaFunc()

        {

            CloseSubWindows();

            ClickArena();

        }



        private void ClickRight()

@@ -130,18 +135,26 @@


        private void ClickHonorStore()

        {

            if (honorStore_SelectImg.activeInHierarchy) return;

            CloseSubWindows();

            WindowCenter.Instance.Open<HonorStoreWin>();

            honorStore_SelectImg.SetActive(true);

        }



        private void ClickSeasonAward()

        {

            if (seasonAward_SelectImg.activeInHierarchy) return;



            CloseSubWindows();

            WindowCenter.Instance.Open<SeasonRewardWin>();

            seasonAward_SelectImg.SetActive(true);



        }



        private void ClickArena()

        {

            if (arena_SelectImg.activeInHierarchy) return;



            CloseSubWindows();

            if (crossServerRewardModel.IsOpenMatch)

            {

@@ -149,14 +162,25 @@
            }

            else

            {

                WindowCenter.Instance.Open<CrossServerArenaWin>();

                if (windowState == WindowState.Opened)

                {

                    WindowCenter.Instance.OpenWithoutAnimation<CrossServerArenaWin>();

                }

                else

                {

                    WindowCenter.Instance.Open<CrossServerArenaWin>();

                }

            }

            arena_SelectImg.SetActive(true);

        }



        private void ClickRankAward()

        {

            if (rankAward_SelectImg.activeInHierarchy) return;



            CloseSubWindows();

            WindowCenter.Instance.Open<SegmentRewardWin>();

            rankAward_SelectImg.SetActive(true);

        }





@@ -178,6 +202,10 @@
            WindowCenter.Instance.CloseImmediately<SeasonRewardWin>();

            WindowCenter.Instance.CloseImmediately<SegmentRewardWin>();

            WindowCenter.Instance.CloseImmediately<MatchWin>();

            arena_SelectImg.SetActive(false);

            rankAward_SelectImg.SetActive(false);

            seasonAward_SelectImg.SetActive(false);

            honorStore_SelectImg.SetActive(false);

        }

        #endregion

    }