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

client_Hale

2019-01-22 40f24da259542a517e197316ed0333c8e2fe1958

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

 System/CrossServerOneVsOne/RankingWin.cs

@@ -204,6 +204,9 @@
                    if (CrossServerOneVsOnePKSeason.Instance.ZoneIDList[i].ZoneID == crossServerRewardModel.ZoneID)

                    {

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

                        int _Index = list.FindIndex(s => s.SeasonID == crossServerRewardModel.SeasonID);

                        if (_Index == -1)

                        {

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

                        {

                            if (list[j].SeasonID > _SeasonID)

@@ -212,6 +215,11 @@
                            }

                        }

                    }

                        else

                        {

                            _SeasonID = crossServerRewardModel.SeasonID;

                        }                  
                    }

                }

                crossServerRewardModel.SeasonID = _SeasonID;

                m_ClickScreenOtherSpace1.SetActive(false);