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

client_Zxw

2019-01-28 f47ea60f59e0b2b8601583351e269151237c6708

 System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs

@@ -641,6 +641,8 @@
            {

                crossDayAwardsRedpoint.state = RedPointState.None;

            }



            CrossServerUtility.UpdateCrossServerRedpoint();

        }



        public void UpdateCrossMatchRedpoint()

@@ -747,6 +749,8 @@
                    }

                }

            }



            CrossServerUtility.UpdateCrossServerRedpoint();

        }



        public bool TryGetRedTypeByShopId(int shopId, out int type)