Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_Zxw

2018-10-10 01638bd36dd973e2e925b3b41045b157f3e64d4e

 System/OpenServerActivity/OpenServerActivityWin.cs

@@ -30,6 +30,7 @@
            }

        }

        FairyLeagueModel fairyLeagueModel { get { return ModelCenter.Instance.GetModel<FairyLeagueModel>(); } }

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



        List<int> openActivitys = new List<int>();

        List<int> priorityActivitys = new List<int>();

@@ -181,6 +182,23 @@
                activityCell.title.text = TimeUtility.SecondsToHMS(seconds);

                activityCell.title.gameObject.SetActive(seconds > 0);

            }

            cell = m_ActivityCtrl.GetActiveCellView((int)OpenServerActivityCenter.OSActivityType.FairyGrabBossNotice);

            if (cell != null)

            {

                var activityCell = cell as OpenServerActivityCell;

                var seconds = fairyGrabBossModel.GetFirstOpenSeconds();

                bool isOpen = fairyGrabBossModel.IsOpen;

                activityCell.title.gameObject.SetActive(seconds > 0 || isOpen);

                activityCell.title.color = UIHelper.GetUIColor(TextColType.Green, true);

                if (seconds > 0)

                {

                    activityCell.title.text = TimeUtility.SecondsToHMS(seconds);

                }

                else if (isOpen)

                {

                    activityCell.title.text = Language.Get("FairyGrabBossOpened");

                }

            }

        }



        void CheckAlreadyOpen()

@@ -232,6 +250,8 @@
            });

            bool customIcon = !string.IsNullOrEmpty(customActivity.titleIcon);



            _cell.title.color = UIHelper.GetUIColor(TextColType.NavyBrown);



            OperationBase operationBase;

            switch (_cell.index)

            {

@@ -241,7 +261,6 @@
                        _cell.title.text = Language.Get("ExpActivity_Text5", (operationBase as OperationMultiExp).GetMultipleCHS());

                    }

                    _cell.title.gameObject.SetActive(!customIcon);

                    _cell.title.color = UIHelper.GetUIColor(TextColType.NavyBrown);

                    break;

                case 8:

                    if (OperationTimeHepler.Instance.TryGetOperationTime(Operation.MultipRealmPoint, out operationBase))

@@ -249,21 +268,37 @@
                        _cell.title.text = Language.Get("MultipleRealmPoint", Language.Get(StringUtility.Contact("Num_CHS_", (operationBase as OperationMultipleRealmPoint).multiplePractice)));

                    }

                    _cell.title.gameObject.SetActive(!customIcon);

                    _cell.title.color = UIHelper.GetUIColor(TextColType.NavyBrown);

                    break;

                case 12:

                    var seconds = fairyLeagueModel.GetBeforeFirstLeagueTime();

                    _cell.title.gameObject.SetActive(seconds > 0);

                    if (seconds > 0)

                    {

                        _cell.title.text = TimeUtility.SecondsToHMS(seconds);

                        var seconds = fairyLeagueModel.GetBeforeFirstLeagueTime();

                        _cell.title.gameObject.SetActive(seconds > 0);

                        if (seconds > 0)

                        {

                            _cell.title.text = TimeUtility.SecondsToHMS(seconds);

                            _cell.title.color = UIHelper.GetUIColor(TextColType.Green, true);

                        }

                    }

                    break;

                case 13:

                    {

                        var seconds = fairyGrabBossModel.GetFirstOpenSeconds();

                        bool isOpen = fairyGrabBossModel.IsOpen;

                        _cell.title.gameObject.SetActive(seconds > 0 || isOpen);

                        _cell.title.color = UIHelper.GetUIColor(TextColType.Green, true);

                        if (seconds > 0)

                        {

                            _cell.title.text = TimeUtility.SecondsToHMS(seconds);

                        }

                        else if (isOpen)

                        {

                            _cell.title.text = Language.Get("FairyGrabBossOpened");

                        }

                    }

                    break;

                default:

                    _cell.title.gameObject.SetActive(!customIcon);

                    _cell.title.text = Language.Get(StringUtility.Contact("OSActivityTitle_", _cell.index));

                    _cell.title.color = UIHelper.GetUIColor(TextColType.NavyBrown);

                    break;

            }

            _cell.order = _cell.index;

@@ -529,6 +564,16 @@
                        WindowCenter.Instance.Open<FairyLeagueNoticeWin>(true);

                    }

                    break;

                case 13:

                    if (windowState == WindowState.Opened)

                    {

                        WindowCenter.Instance.OpenWithoutAnimation<FairyGrabBossNoticeWin>();

                    }

                    else

                    {

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

                    }

                    break;

            }

        }



@@ -563,6 +608,7 @@
            WindowCenter.Instance.CloseImmediately<FairyJadeInvestmentWin>();

            WindowCenter.Instance.CloseImmediately<VipInvestWin>();

            WindowCenter.Instance.CloseImmediately<FairyLeagueNoticeWin>();

            WindowCenter.Instance.CloseImmediately<FairyGrabBossNoticeWin>();

        }



        private int Compare(int order_x, int order_y)