1969 功能预告解锁到翅膀合成后，未开启的功能没有居中

client_Zxw

2018-09-19 ab3e936c7be0fdcc6c814cc0cb0e4c88a0f346eb

 System/Skill/SkillModel.cs

@@ -47,6 +47,9 @@
        public Dictionary<int, Dictionary<int, List<SkillConfig>>> skillActDict { get; private set; }

        public List<int> betterPassSkills { get; private set; }

        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++)

@@ -71,10 +74,20 @@
                    PassSkillLimit limit = JsonMapper.ToObject<PassSkillLimit>(jsonData[key].ToJson());

                    limit.hole = int.Parse(key);

                    passSkillLimits.Add(limit);

                    if (minTaskHole == 0 && limit.OpenSkillSlots > 0)

                    {

                        minTaskHole = limit.OpenSkillSlots;

                    }

                    if (limit.OpenSkillSlots > maxTaskHole)

                    {

                        maxTaskHole = limit.OpenSkillSlots;

                    }

                }

                passEquipCnt = int.Parse(funcCfg.Numerical2);

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

            }

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

            immediatelyUnlockTask = 0;//int.Parse(funcCfg.Numerical2);

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

            if (funcCfg != null)

            {

@@ -290,7 +303,7 @@


        public event Action taskUnlockUpdate;



        public int taskHoleCondition { get; private set; }

        public uint taskHoleCondition { get; private set; }



        public const string TASKHOLEKEY = "OpenSkillSlots";



@@ -305,9 +318,10 @@
            if (task._DicTaskInformation.ContainsKey(1)

                && task._DicTaskInformation[1].ContainsKey(TASKHOLEKEY))

            {

                var value = 0;

                int.TryParse(task._DicTaskInformation[1][TASKHOLEKEY], out value);

                return value >= condition;

                uint value = 0;

                uint.TryParse(task._DicTaskInformation[1][TASKHOLEKEY], out value);

                return MathUtility.GetBitValue(value, (ushort)condition);

                //return value >= condition;

            }

            return false;

        }

@@ -319,11 +333,18 @@
                var dict = _Dic[1];

                if (dict.ContainsKey(TASKHOLEKEY))

                {

                    var result = 0;

                    int.TryParse(dict[TASKHOLEKEY], out result);

                    if (result != taskHoleCondition && playerLoginOk)

                    uint result = 0;

                    uint.TryParse(dict[TASKHOLEKEY], out result);

                    if (playerLoginOk)

                    {

                        UnlockPassHole = result;

                        for (int k = minTaskHole; k <= maxTaskHole; k++)

                        {

                            if (!MathUtility.GetBitValue(taskHoleCondition, (ushort)k)

                                && MathUtility.GetBitValue(result, (ushort)k))

                            {

                                UnlockPassHole = k;

                            }

                        }

                        if (taskUnlockUpdate != null)

                        {

                            taskUnlockUpdate();

@@ -332,6 +353,7 @@
                    taskHoleCondition = result;

                }

            }

            UpdateTaskHoleRedpoint();

        }



        RolePromoteModel m_PromoteModel;

@@ -509,6 +531,7 @@
            }

            playerLoginOk = true;

            UpdateRedpoint();

            UpdateTaskHoleRedpoint();

        }



        public void CheckEquipPassSkill(PlayerSkillData _skill)

@@ -627,6 +650,36 @@
            DayRemind.Instance.SetDayRemind(DayRemind.PASS_SKILL_REDPOINT, true);

            UpdateRedpoint();

        }



        public Redpoint taskHoleRedpoint = new Redpoint(10302, 1030299);

        void UpdateTaskHoleRedpoint()

        {

            taskHoleRedpoint.state = RedPointState.None;

            if (DayRemind.Instance.GetDayRemind(DayRemind.TASK_SKILL_HOLE))

            {

                return;

            }

            foreach (var hole in taskHoleDict.Keys)

            {

                var taskId = taskHoleDict[hole];

                if (taskId == immediatelyUnlockTask)

                {

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

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

                        && !IsTaskHoleUnlock(hole))

                    {

                        taskHoleRedpoint.state = RedPointState.Simple;

                    }

                    return;

                }

            }

        }



        public void SetTaskHoleRemind()

        {

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

            UpdateTaskHoleRedpoint();

        }

        #endregion



        private void OnFuncStateChangeEvent(int _id)

@@ -634,6 +687,7 @@
            if (_id == 109)

            {

                UpdateRedpoint();

                UpdateTaskHoleRedpoint();

            }

        }

    }