From 82931aabaaa3e479bc04e11630a77cd9c9dd5fe3 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 26 十月 2018 20:05:36 +0800
Subject: [PATCH] Merge branch 'master' into leonard

---
 System/Skill/TalentModel.cs |   31 +++++++++++++++++++++++++++++++
 1 files changed, 31 insertions(+), 0 deletions(-)

diff --git a/System/Skill/TalentModel.cs b/System/Skill/TalentModel.cs
index 1cfb1d7..2969ea1 100644
--- a/System/Skill/TalentModel.cs
+++ b/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;
+        }
     }
 }
 

--
Gitblit v1.8.0