3243 【开发】开服限时活动定制

client_Wu Xijin

2018-09-18 bbd7bbe9ed3a1eae6cd9ca45ca149cc7f882daa2

 System/OpenServerActivity/OSRedEnvelopeModel.cs

@@ -103,15 +103,12 @@
        public List<int> m_AllFuncs { get; private set; }

        public int openDays { get; private set; }

        public int OSRedEnvelopeType { get; private set; }

        public int initialCount { get; private set; }

        public int addSeconds { get; private set; }

        public int limitCount { get; private set; }

        public float envelopeVoiceCD { get; private set; }

        public int addCounts { get; private set; }

        public DateTime overTime = DateTime.Now;

        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 +130,12 @@
                }

            }



            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");

            addCounts = int.Parse(_cfg.Numerical5);

            _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 +203,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;

@@ -228,11 +223,11 @@


        public void UpdateRedpackRedpoint(bool _checkVoice = false)

        {

            bool hasRed = m_OpenServerGetRedpin.state == RedPointState.Simple;

            bool hasRed = m_OpenServerGetRedpin.state == RedPointState.GetReward;

            m_OpenServerGetRedpin.state = RedPointState.None;

            if (CanGetEnvelope())

            {

                m_OpenServerGetRedpin.state = RedPointState.Simple;

                m_OpenServerGetRedpin.state = RedPointState.GetReward;

                if (_checkVoice && !hasRed && servereInited && HasOtherRedpack() && !HasSelfRedpack())

                {

                    CheckRedEnvelopeVoice();

@@ -425,7 +420,15 @@
            get

            {

                return m_RedAchieveRedpoint.state == RedPointState.Simple

                    || m_OpenServerGetRedpin.state == RedPointState.Simple;

                    || m_OpenServerGetRedpin.state == RedPointState.GetReward;

            }

        }



        public bool IsAdvance

        {

            get

            {

                return false;

            }

        }



@@ -436,7 +439,6 @@
        {

            totalJadeGet = (int)_pak.MoneyNum;

            getEnvelopeTimes = _pak.GrabCnt;

            coolDownTime = TimeUtility.GetTime(_pak.StartTime);

            if (OSRedEnvelopeInfoEnvent != null)

            {

                OSRedEnvelopeInfoEnvent();