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

client_Zxw

2019-03-11 16a5213c9d6063f2efc929a5b48c902ee8eea49e

 System/Activity/ActivityModel.cs

@@ -13,6 +13,7 @@
    {

        HeavenBattleModel battleModel { get { return ModelCenter.Instance.GetModel<HeavenBattleModel>(); } }

        FairyModel fairyModel { get { return ModelCenter.Instance.GetModel<FairyModel>(); } }

        AllianceBossModel allianceBossModel { get { return ModelCenter.Instance.GetModel<AllianceBossModel>(); } }

        public override void Init()

        {

            var dic = DailyQuestConfig.GetValues();

@@ -227,6 +228,10 @@
        public bool CheckLimit(int type)

        {

            DailyQuestConfig config = DailyQuestConfig.Get(type);

            if (config == null)

            {

                return true;

            }

            switch ((DailyQuestType)type)

            {

                case DailyQuestType.FairyGrabBoss:

@@ -280,6 +285,15 @@
                        }

                    }

                    break;

                case DailyQuestType.AllianceBoss1:

                case DailyQuestType.AllianceBoss2:

                    {

                        if (allianceBossModel.isActivityOver)

                        {

                            return true;

                        }

                    }

                    break;

            }

            if (config.UnLockFuncID != 0)

            {