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

Client_PangDeRong

2018-12-26 7785dbcf659941ffbdbb193fa05853c46cee05b5

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

 System/CrossServerOneVsOne/SeasonRewardWin.cs

@@ -37,6 +37,7 @@

        protected override void OnPreOpen()
        {
            IsInquireReward();
            OnCreateGridLineCell(m_ScrollerController);
        }

@@ -85,6 +86,15 @@
            SeasonRewardCell seasonRewardCell = cell.GetComponent<SeasonRewardCell>();

            seasonRewardCell.ScrollerDataTypAndId(type, Index);                 

        }

        private void IsInquireReward()

        {

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

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

            {

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

            }

        }
    }

}