Merge branch 'master' into leonard

client_Wu Xijin

2018-10-26 82931aabaaa3e479bc04e11630a77cd9c9dd5fe3

 System/Skill/TalentModel.cs

@@ -275,6 +275,16 @@
                        }

                    }

                }

                var requireProperty = skillConfig.RequireProperty();

                if (requireProperty != 0)

                {

                    var requirePropertyValue = skillConfig.RequirePropertyValue();

                    if (UIHelper.GetPropertyMapPlayerData((AttrEnum)requireProperty) < requirePropertyValue)

                    {

                        error = 5;

                        return false;

                    }

                }

            }

            return true;

        }

@@ -294,6 +304,9 @@
                    break;

                case 4:

                    SysNotifyMgr.Instance.ShowTip("PreTalentLevelLimit");

                    break;

                case 5:

                    SysNotifyMgr.Instance.ShowTip("TalentRequirePropertyLimit");

                    break;

            }

        }

@@ -487,6 +500,24 @@
            }

            return config.LearnSkillPointReq % 10000;

        }



        public static int RequireProperty(this SkillConfig config)

        {

            if (config == null)

            {

                return 0;

            }

            return config.StateSkillLV / 10000;

        }



        public static int RequirePropertyValue(this SkillConfig config)

        {

            if (config == null)

            {

                return 0;

            }

            return config.StateSkillLV % 10000;

        }

    }

}