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

client_Hale

2018-12-28 6692e5c25baecdd4a2b015644ec80399e7ff672c

 System/CrossServerOneVsOne/SeasonRewardWin.cs

@@ -11,7 +11,8 @@
using TableConfig;
using EnhancedUI.EnhancedScroller;

namespace Snxxz.UI {

namespace Snxxz.UI

{

    //赛季奖励

    [XLua.Hotfix]
    public class SeasonRewardWin : Window
@@ -39,6 +40,7 @@
        {
            IsInquireReward();
            OnCreateGridLineCell(m_ScrollerController);
            m_ScrollerController.JumpIndex(JumpIndex());
        }

        protected override void OnAfterOpen()
@@ -53,7 +55,7 @@
            CrossServerOneVsOnePlayerInfo.Instance.UpdatePlayerInfoEvent -= UpdatePlayerInfoEvent;
        }



        


        protected override void OnAfterClose()
        {
        }

@@ -75,7 +77,7 @@
                gridCtrl.AddCell(ScrollerDataType.Header, key);

            }

            for (int i = SortList.Count - 1; i >= 0; i--)

           {

            {

                gridCtrl.AddCell(ScrollerDataType.Normal, SortList[i]);

            }

            gridCtrl.Restart();

@@ -84,17 +86,51 @@
        {

            int Index = cell.index;

            SeasonRewardCell seasonRewardCell = cell.GetComponent<SeasonRewardCell>();

            seasonRewardCell.ScrollerDataTypAndId(type, Index);                 
            seasonRewardCell.ScrollerDataTypAndId(type, Index);

        }

        private void IsInquireReward()

        {

            bool isbool = crossServerRewardModel.IsAwardState(CrossRealmPKAwardStateEnum.SeasonAwardState,-1);

            bool isbool = crossServerRewardModel.IsAwardState(CrossRealmPKAwardStateEnum.SeasonAwardState, -1);

            if (CrossServerOneVsOnePKSeason.Instance.SeasonState == 2 && !isbool)

            {

                crossServerRewardModel.ViewCrossPKBillboard(CrossServerOneVsOnePKSeason.Instance.ZoneID, CrossServerOneVsOnePKSeason.Instance.SeasonID);

            }

        }

        private int JumpIndex()

        {

            int Index = 0;

            if (CrossServerOneVsOnePKSeason.Instance.SeasonState != 2)

            {

                return Index;

            }

            if (crossServerRewardModel.MyRank > -1 && crossServerRewardModel.MyRank < 100)//存在世界排名

            {

                int Type = 0;

                foreach (var key in crossServerRewardModel.SeasonRewardDic.AwardDic.Keys)

                {

                    if (crossServerRewardModel.MyRank < key)

                    {

                        Index = Type;

                        return Index;

                    }

                    Type += 1;

                }

            }

            int Type1 = 3;

            for (int i = SortList.Count - 1; i >= 0; i--)

            {

                if (CrossServerOneVsOnePlayerInfo.Instance.DanLV == SortList[i])

                {

                    Index = Type1;

                    return Index;

                }

                Type1 += 1;

            }



            return Index;

        }
    }

}