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

client_Hale

2018-11-12 d957e7b9efc960e33a9ce72b9833387c0fda58fb

 System/Activity/ActivityModel.cs

@@ -70,7 +70,7 @@
        {

            CheckActivity();

            TimeMgr.Instance.OnMinuteEvent -= CheckActivity;

            TimeMgr.Instance.OnMinuteEvent += CheckActivity;         
            TimeMgr.Instance.OnMinuteEvent += CheckActivity;

        }



        public void OnBeforePlayerDataInitialize()

@@ -143,6 +143,12 @@
                    }

                }

            }

            else

            {

                ancientRandomName.Clear();

                firstNameRandoms.Clear();

                secondNameRandoms.Clear();

            }

        }



        IEnumerator Co_StageLoad()

@@ -203,6 +209,10 @@
            {

                return false;

            }

            if (type == (int)DailyQuestType.FairyGrabBoss)

            {

                return false;

            }

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

            if (cfg == null)

            {

@@ -215,9 +225,9 @@
            return true;

        }



        private bool CheckLimit(int type)

        public bool CheckLimit(int type)

        {

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

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

            switch ((DailyQuestType)type)

            {

                case DailyQuestType.FairyGrabBoss:

@@ -263,16 +273,16 @@
                    }

                    break;

            }

            if (cfg.UnLockFuncID != 0)

            if (config.UnLockFuncID != 0)

            {

                if (!FuncOpen.Instance.IsFuncOpen(cfg.UnLockFuncID))

                if (!FuncOpen.Instance.IsFuncOpen(config.UnLockFuncID))

                {

                    return true;

                }

            }



            int entertimes = dailyQuestModel.GetDailyQuestCompletedTimes(type);

            if (dailyQuestModel.GetDailyQuestTotalTimes(cfg.ID) <= entertimes)

            if (dailyQuestModel.GetDailyQuestTotalTimes(config.ID) <= entertimes)

            {

                return true;

            }

@@ -352,6 +362,33 @@
            public string Icon;

        }

        #endregion



        Dictionary<int, Dictionary<int, string>> ancientRandomName = new Dictionary<int, Dictionary<int, string>>();

        List<int> firstNameRandoms = new List<int>();

        List<int> secondNameRandoms = new List<int>();

        public string GetAncientRobotName(int objId, int npcId)

        {

            if (ancientRandomName.ContainsKey(objId)

                && ancientRandomName[objId].ContainsKey(npcId))

            {

                return ancientRandomName[objId][npcId];

            }

            var firstName = RandomNameConfig.GetFirstName(ref firstNameRandoms);

            var secondName = RandomNameConfig.GetSecondName(ref secondNameRandoms);

            var name = StringUtility.Contact(firstName, secondName);

            Dictionary<int, string> dict;

            if (!ancientRandomName.ContainsKey(objId))

            {

                dict = new Dictionary<int, string>();

                dict.Add(npcId, name);

                ancientRandomName.Add(objId, dict);

            }

            else

            {

                ancientRandomName[objId].Add(npcId, name);

            }

            return name;

        }

    }

}