Merge remote-tracking branch 'origin/master' into SpringFestival

client_Zxw

2019-01-28 f47ea60f59e0b2b8601583351e269151237c6708

 System/CrossServerOneVsOne/CrossServerOneVsOneRewardModel.cs

@@ -393,6 +393,8 @@
        {

            redPointStre1.state = RedPointState.None;

        }



        CrossServerUtility.UpdateCrossServerRedpoint();

    }



    private void RedPointSea()//赛季奖励红点

@@ -422,6 +424,7 @@
        {

            redPointStre2.state = RedPointState.None;

        }

        CrossServerUtility.UpdateCrossServerRedpoint();

    }



    private static int m_PkType = 0;