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

client_Zxw

2018-09-25 39be1d5c07fade0d6ff9c7f4e50a1338f63d7b48

 System/Skill/SkillModel.cs

@@ -350,7 +350,7 @@
                    taskHoleCondition = result;

                }

            }

            UpdateTaskHoleRedpoint();

            //UpdateTaskHoleRedpoint();

        }



        RolePromoteModel m_PromoteModel;

@@ -528,7 +528,7 @@
            }

            playerLoginOk = true;

            UpdateRedpoint();

            UpdateTaskHoleRedpoint();

            //UpdateTaskHoleRedpoint();

        }



        public void CheckEquipPassSkill(PlayerSkillData _skill)

@@ -648,29 +648,29 @@
            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 (IsImmediatelyUnlock(hole))

                {

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

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

                        && !IsTaskHoleUnlock(hole))

                    {

                        taskHoleRedpoint.state = RedPointState.Simple;

                    }

                    return;

                }

            }

        }

        //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 (IsImmediatelyUnlock(hole))

        //        {

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

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

        //                && !IsTaskHoleUnlock(hole))

        //            {

        //                taskHoleRedpoint.state = RedPointState.Simple;

        //            }

        //            return;

        //        }

        //    }

        //}



        public bool IsImmediatelyUnlock(int hole)

        {

@@ -685,7 +685,7 @@
        public void SetTaskHoleRemind()

        {

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

            UpdateTaskHoleRedpoint();

            //UpdateTaskHoleRedpoint();

        }

        #endregion



@@ -694,7 +694,7 @@
            if (_id == 109)

            {

                UpdateRedpoint();

                UpdateTaskHoleRedpoint();

                //UpdateTaskHoleRedpoint();

            }

        }

    }