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

client_Wu Xijin

2018-12-28 248a4ed82ac737dd7f35c4c3142a824eaee8ad98

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

 System/CrossServerOneVsOne/CrossServerOneVsOnePKSeason.cs

@@ -247,7 +247,7 @@
                    return true;

                }

            }

            return true;

            return false;

        }



        public bool InPkSeason(DateTime time)


 System/CrossServerOneVsOne/CrossServerSettlementWin.cs

@@ -47,6 +47,8 @@
        #region Built-in
        CrossServerOneVsOneModel crossServerModel { get { return ModelCenter.Instance.GetModel<CrossServerOneVsOneModel>(); } }

        DungeonModel model { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }

        PlayerBuffDatas m_BuffModel;

        PlayerBuffDatas Buffmodel { get { return m_BuffModel ?? (m_BuffModel = ModelCenter.Instance.GetModel<PlayerBuffDatas>()); } }

        float timer = 0f;

        protected override void BindController()
        {
@@ -93,7 +95,8 @@

        protected override void OnPreClose()
        {
            CrossServerRewardModel.SetPkType(); 
            CrossServerRewardModel.SetPkType();

            Buffmodel.PkType = CrossServerRewardModel.PkType;
        }

        protected override void OnAfterClose()

 System/CrossServerOneVsOne/RankingWin.cs

@@ -35,6 +35,7 @@
        [SerializeField] GameObject m_ClickScreenOtherSpace2;
        [SerializeField] ScrollerController m_ScrollerController2;

        [SerializeField] Text m_Text_A;

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

        CrossServerRewardModel m_CrossServerRewardModel;

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

        private int NeedDanLv = 0;
@@ -54,8 +55,8 @@
            if (config != null)

            {

                m_Text_A.text = Language.Get("CrossServer121", config.Name);

            }
           
            }



        }

        protected override void AddListeners()
@@ -67,7 +68,7 @@

        protected override void OnPreOpen()
        {

           


            SetZoneIDAndSeasonID();
            ZoneAndSeasonpanel();
            m_NumberText.text = CrossServerOneVsOnePKSeason.Instance.SeasonID.ToString();
@@ -119,7 +120,7 @@
        }
        private void UpdatePlayerInfoEvent()

        {

            m_TextScores.text = CrossServerOneVsOnePlayerInfo.Instance.Score.ToString();

          
            SetTextMyRank();

        }
        void OnCreateGridLineCell(ScrollerController gridCtrl)

@@ -147,7 +148,7 @@
        void OnCreateGridLineCell_Z(ScrollerController gridCtrl)//赛区

        {

            gridCtrl.Refresh();

            for (int i = 1; i <= CrossServerOneVsOnePKSeason.Instance.ZoneCount; i++)

            for (int i = 0; i < CrossServerOneVsOnePKSeason.Instance.ZoneCount; i++)

            {

                gridCtrl.AddCell(ScrollerDataType.Header, i);

            }

@@ -156,10 +157,23 @@
        void OnCreateGridLineCell_S(ScrollerController gridCtrl)//赛季

        {

            gridCtrl.Refresh();

            for (int i = 1; i <= CrossServerOneVsOnePKSeason.Instance.SeasonID; i++)





            for (int i = 0; i < CrossServerOneVsOnePKSeason.Instance.ZoneCount; i++)

            {

                gridCtrl.AddCell(ScrollerDataType.Header, i);

                if (CrossServerOneVsOnePKSeason.Instance.ZoneIDList[i].ZoneID == crossServerRewardModel.ZoneID)

                {

                    var list = CrossServerOneVsOnePKSeason.Instance.ZoneIDList[i].SeasonList;

                    for (int j = 0; j < list.Count; j++)

                    {

                        gridCtrl.AddCell(ScrollerDataType.Header, list[j].SeasonID);

                    }

                }

            }

            //for (int i = 1; i <= CrossServerOneVsOnePKSeason.Instance.SeasonID; i++)

            //{

            //    gridCtrl.AddCell(ScrollerDataType.Header, i);

            //}

            gridCtrl.Restart();

        }

        private void OnRefreshGridCell(ScrollerDataType type, CellView cell)

@@ -171,10 +185,24 @@
            int Index = cell.index;

            Button Btn = cell.GetComponent<Button>();

            Text txt = cell.transform.Find("Text").GetComponent<Text>();

            txt.text = Language.Get("CrossServer_Z4") + Index;

            if (Index > CrossServerOneVsOnePKSeason.Instance.ZoneCount)

            {

                return;

            }



            string Name = CrossServerOneVsOnePKSeason.Instance.ZoneIDList[Index].ZoneName;

            txt.text = UIHelper.ServerStringTrim(Name);

            int Id = CrossServerOneVsOnePKSeason.Instance.ZoneIDList[Index].ZoneID;

            Btn.SetListener(() =>

            {

                crossServerRewardModel.ZoneID = Index;

                if (crossServerRewardModel.ZoneID == Id)

                {

                    m_ClickScreenOtherSpace1.SetActive(false);

                    return;

                }

                crossServerRewardModel.ZoneID = Id;

                crossServerRewardModel.ZoneName = UIHelper.ServerStringTrim(Name);

                crossServerRewardModel.SeasonID = 1;

                m_ClickScreenOtherSpace1.SetActive(false);

                crossServerRewardModel.ViewCrossPKBillboard(crossServerRewardModel.ZoneID, crossServerRewardModel.SeasonID);//关于赛季查询

            });

@@ -188,6 +216,11 @@
            txt.text = Language.Get("CrossServer_Z3") + Index;

            Btn.SetListener(() =>

            {

                if (crossServerRewardModel.SeasonID == Index)

                {

                    m_ClickScreenOtherSpace2.SetActive(false);

                    return;

                }

                crossServerRewardModel.SeasonID = Index;

                m_ClickScreenOtherSpace2.SetActive(false);

                crossServerRewardModel.ViewCrossPKBillboard(crossServerRewardModel.ZoneID, crossServerRewardModel.SeasonID);//关于赛季查询

@@ -200,24 +233,48 @@
            if (CrossServerOneVsOnePKSeason.Instance.ZoneID != crossServerRewardModel.ZoneID)

            {

                m_TextMyRank.text = Language.Get("CrossServer122");

                m_TextScores.text= Language.Get("CrossServer122");

            }

            else

            {

                if (crossServerRewardModel.MyRank > -1 && crossServerRewardModel.MyRank < 100)

                if (crossServerRewardModel.SeasonID == CrossServerOneVsOnePKSeason.Instance.SeasonID)

                {

                    m_TextMyRank.text = (crossServerRewardModel.MyRank + 1).ToString();

                    m_TextScores.text = CrossServerOneVsOnePlayerInfo.Instance.Score.ToString();

                    if (crossServerRewardModel.MyRank > -1 && crossServerRewardModel.MyRank < 100)

                    {

                        m_TextMyRank.text = (crossServerRewardModel.MyRank + 1).ToString();

                    }

                    else

                    {

                        m_TextMyRank.text = Language.Get("CrossServer123");

                    }

                }

                else

                {

                    m_TextMyRank.text = Language.Get("CrossServer123");

                    CrossServerOneVsOneModel.CrossServerOneVsOneHistory history;

                    if (crossServerModel.TryGetOneVsOneHistory(crossServerRewardModel.SeasonID,out history))

                    {

                        if (history.order > 0 && history.order < 101)

                        {

                            m_TextMyRank.text = history.order.ToString();

                        }

                        else

                        {

                            m_TextMyRank.text = Language.Get("CrossServer123");

                        }

                        m_TextScores.text = history.score.ToString();

                    }

                   


                }

               
            }

            


        }

        private void SetZoneAndSeasonNum()

        {

            m_DivisionNameText1.text = Language.Get("CrossServer_Z4") +crossServerRewardModel.ZoneID.ToString();

            m_DivisionNameText1.text = crossServerRewardModel.ZoneName;

            m_DivisionNameText2.text = Language.Get("CrossServer_Z3") + crossServerRewardModel.SeasonID.ToString();

        }


 System/MainInterfacePanel/MainInterfaceWin.cs

@@ -798,7 +798,6 @@
        void DownButton(GameObject go)

        {

            _ExpRate.gameObject.SetActive(true);

              WindowCenter.Instance.Open<RankingWin>();

        }

        void UpButton(GameObject go)

        {


 Utility/UIHelper.cs

@@ -693,6 +693,11 @@
                    Equation.Instance.AddKeyValue("MinAtk", _propertyDict[_key]);

                    Equation.Instance.AddKeyValue("MaxAtk", _propertyDict[_key]);

                }

                else if(_key == 24)

                {

                    Equation.Instance.AddKeyValue("PetMinAtk", _propertyDict[_key]);

                    Equation.Instance.AddKeyValue("PetMaxAtk", _propertyDict[_key]);

                }

                else

                {

                    float attrValue = _propertyDict[_key];