Merge remote-tracking branch 'origin/master' into Skill_Polymorph_BeatBackP...

client_Hale

2018-08-22 2b47fde8e7902ddddd898309f281b9c310fc877f

 System/Activity/ActivityModel.cs

@@ -14,7 +14,7 @@


        public override void Init()

        {

            var dic = ConfigManager.Instance.GetAllValues<DailyQuestConfig>();

            var dic = Config.Instance.GetAllValues<DailyQuestConfig>();

            foreach (var cfg in dic)

            {

                DailyQuestOpenTime dailyQuestOpenTime;

@@ -36,7 +36,7 @@
            StageManager.Instance.onStageLoadFinish += OnStageLoadFinish;

            NewBieCenter.Instance.guideCompletedEvent += GuideCompletedEvent;



            var _funcCfg = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("SpecialActivitys");

            var _funcCfg = Config.Instance.Get<FuncConfigConfig>("SpecialActivitys");

            var _json = LitJson.JsonMapper.ToObject(_funcCfg.Numerical1);

            foreach (var _key in _json.Keys)

            {

@@ -126,7 +126,7 @@
        {

            if (StageManager.Instance.CurrentStage is DungeonStage)

            {

                var _mapConfig = ConfigManager.Instance.GetTemplate<MapConfig>(PlayerDatas.Instance.baseData.MapID);

                var _mapConfig = Config.Instance.Get<MapConfig>(PlayerDatas.Instance.baseData.MapID);

                if (_mapConfig.MapFBType == 0)

                {

                    mainStage = true;

@@ -202,7 +202,7 @@
            {

                return false;

            }

            DailyQuestConfig cfg = ConfigManager.Instance.GetTemplate<DailyQuestConfig>(type);

            DailyQuestConfig cfg = Config.Instance.Get<DailyQuestConfig>(type);

            if (cfg == null)

            {

                return false;

@@ -216,7 +216,7 @@


        private bool CheckLimit(int type)

        {

            DailyQuestConfig cfg = ConfigManager.Instance.GetTemplate<DailyQuestConfig>(type);

            DailyQuestConfig cfg = Config.Instance.Get<DailyQuestConfig>(type);

            switch ((DailyQuestType)type)

            {

                case DailyQuestType.FairyFeast:

@@ -266,7 +266,7 @@
            }

            if (cfg.RelatedType == 1)

            {

                DailyQuestOpenTimeConfig dailyQuestOpenTimeModel = ConfigManager.Instance.GetTemplate<DailyQuestOpenTimeConfig>(cfg.RelatedID);

                DailyQuestOpenTimeConfig dailyQuestOpenTimeModel = Config.Instance.Get<DailyQuestOpenTimeConfig>(cfg.RelatedID);

                if (TimeUtility.OpenDay <= dailyQuestOpenTimeModel.OpenServerDay - 1)

                {

                    return true;

@@ -274,7 +274,7 @@
            }

            else if (cfg.RelatedType == 2)

            {

                DungeonOpenTimeConfig dungeonOpenTimeModel = ConfigManager.Instance.GetTemplate<DungeonOpenTimeConfig>(cfg.RelatedID);

                DungeonOpenTimeConfig dungeonOpenTimeModel = Config.Instance.Get<DungeonOpenTimeConfig>(cfg.RelatedID);

                if (TimeUtility.OpenDay <= dungeonOpenTimeModel.OpenServerDay - 1)

                {

                    return true;