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

client_Hale

2018-12-28 6692e5c25baecdd4a2b015644ec80399e7ff672c

 System/Activity/ActivityModel.cs

@@ -273,7 +273,8 @@
                    break;

                case DailyQuestType.CrossServerPk:

                    {

                        if(TimeUtility.OpenDay < ModelCenter.Instance.GetModel<CrossServerOneVsOneModel>().afterOpenDayOpenCross)

                        bool isStatify = CrossServerOneVsOnePKSeason.Instance.isSatisfyMatch;

                        if (!isStatify)

                        {

                            return true;

                        }