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

client_Wu Xijin

2019-03-15 0481e4b577d7bd44ed1b8ed1b61d17dbe543e7a2

 System/Activity/ActivityModel.cs

@@ -288,6 +288,10 @@
                case DailyQuestType.AllianceBoss1:

                case DailyQuestType.AllianceBoss2:

                    {

                        if (!PlayerDatas.Instance.fairyData.HasFairy)

                        {

                            return true;

                        }

                        if (allianceBossModel.isActivityOver)

                        {

                            return true;