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

client_Hale

2018-09-20 56091a5a2b3df0681996731982f812003daf85e9

 System/Skill/SkillModel.cs

@@ -49,7 +49,6 @@
        public bool jumpToPass { get; set; }

        public int minTaskHole { get; private set; }

        public int maxTaskHole { get; private set; }

        public int immediatelyUnlockTask { get; private set; }

        void ParseConfig()

        {

            for (int i = 1; i <= 3; i++)

@@ -86,8 +85,6 @@
                passEquipCnt = int.Parse(funcCfg.Numerical2);

                taskHoleDict = ConfigParse.GetDic<int, int>(funcCfg.Numerical4);

            }

            funcCfg = Config.Instance.Get<FuncConfigConfig>("PassiveSkillTask");

            immediatelyUnlockTask = int.Parse(funcCfg.Numerical2);

            funcCfg = Config.Instance.Get<FuncConfigConfig>("PassSkillEquipGetWay");

            if (funcCfg != null)

            {

@@ -366,7 +363,7 @@
        }



        PlayerTaskDatas task { get { return ModelCenter.Instance.GetModel<PlayerTaskDatas>(); } }



        PlayerMainDate mainData { get { return ModelCenter.Instance.GetModel<PlayerMainDate>(); } }

        public void SendEquipPassSkill(int _page, int _index, int _skillId)

        {

            var pak = new CB407_tagCMPassiveSet();

@@ -662,7 +659,7 @@
            foreach (var hole in taskHoleDict.Keys)

            {

                var taskId = taskHoleDict[hole];

                if (taskId == immediatelyUnlockTask)

                if (IsImmediatelyUnlock(hole))

                {

                    var config = Config.Instance.Get<PyTaskConfig>(taskId);

                    if (PlayerDatas.Instance.baseData.LV >= config.lv

@@ -675,6 +672,16 @@
            }

        }



        public bool IsImmediatelyUnlock(int hole)

        {

            if (taskHoleDict.ContainsKey(hole))

            {

                var taskId = taskHoleDict[hole];

                return mainData.TaskId_Skill.Contains(taskId);

            }

            return false;

        }



        public void SetTaskHoleRemind()

        {

            DayRemind.Instance.SetDayRemind(DayRemind.TASK_SKILL_HOLE, true);