Merge http://192.168.0.87:10010/r/snxxz_scripts into SpringFestival

client_Zxw

2019-01-21 26436be7f1ae7d7edae0d5b4bddf85cdf0367dfb

 System/CrossServerOneVsOne/CrossServerOneVsOneRewardModel.cs

@@ -405,13 +405,15 @@
        {

            Number = key;

        }

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



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

        {

            if ((MyRank > -1 && MyRank < Number) || SeasonRewardConfigDic.ContainsKey(Danlv))

            {

                Isbool = true;

            }

        }



        if (Isbool)

        {

            redPointStre2.state = RedPointState.Simple;