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

client_Hale

2018-08-22 2b47fde8e7902ddddd898309f281b9c310fc877f

 System/OpenServerActivity/OSRedEnvelopeModel.cs

@@ -111,7 +111,7 @@
        public DateTime coolDownTime { get; private set; }

        void ParseConfig()

        {

            var _allCfgs = ConfigManager.Instance.GetAllValues<OSRedAchieveConfig>();

            var _allCfgs = Config.Instance.GetAllValues<OSRedAchieveConfig>();

            m_OSRedAchieveDict = new Dictionary<int, OSRedAchieve>();

            m_OSRedAchieves = new List<int>();

            m_AllFuncs = new List<int>();

@@ -133,14 +133,14 @@
                }

            }



            var _cfg = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("OpenServerRedPacketCfg");

            var _cfg = Config.Instance.Get<FuncConfigConfig>("OpenServerRedPacketCfg");

            openDays = int.Parse(_cfg.Numerical1);

            initialCount = int.Parse(_cfg.Numerical2);

            addSeconds = Mathf.Max(60, int.Parse(_cfg.Numerical3));

            limitCount = int.Parse(_cfg.Numerical4);

            _cfg = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("OpenServerRedPacketType");

            _cfg = Config.Instance.Get<FuncConfigConfig>("OpenServerRedPacketType");

            OSRedEnvelopeType = int.Parse(_cfg.Numerical1);

            _cfg = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("RedEnvelopeVoiceCd");

            _cfg = Config.Instance.Get<FuncConfigConfig>("RedEnvelopeVoiceCd");

            envelopeVoiceCD = float.Parse(_cfg.Numerical1) / 1000;

        }



@@ -208,7 +208,7 @@
            }

            foreach (var _achieve in m_OSRedAchieveDict.Values)

            {

                var _cfg = ConfigManager.Instance.GetTemplate<OSRedAchieveConfig>(_achieve.id);

                var _cfg = Config.Instance.Get<OSRedAchieveConfig>(_achieve.id);

                if (_cfg.func != 0 && FuncOpen.Instance.IsFuncOpen(_cfg.func))

                {

                    continue;