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

client_Wu Xijin

2018-08-27 fb294bdf89b7977ea041c54d42dbcd3763fd9b7c

 System/LoginAd/LoginAdModel.cs

@@ -115,7 +115,7 @@
                            }

                            break;

                        case LoginAdCondition.ImpactRank:

                            if (TimeUtility.OpenDay >= impactRankModel.openServerActivityDays || !FuncOpen.Instance.IsFuncOpen(125))

                            if (!OpenServerActivityCenter.Instance.IsActivityOpen(0))

                            {

                                continue;

                            }