From d82561629d51d3863002a3f1bbb32ef6b1b429bb Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 29 十月 2018 17:56:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into leonard
---
System/Skill/TalentModel.cs | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/System/Skill/TalentModel.cs b/System/Skill/TalentModel.cs
index 2969ea1..d65b9d3 100644
--- a/System/Skill/TalentModel.cs
+++ b/System/Skill/TalentModel.cs
@@ -63,6 +63,7 @@
public event Action selectSkillEvent;
public event Action talentPointUpdate;
public event Action<int> talentSkillUpdate;
+ public event Action<int> talentSkillLevelUp;
public override void Init()
{
@@ -336,10 +337,18 @@
if (talentSkills.ContainsKey(config.SkillTypeID))
{
var talentSkill = talentSkills[config.SkillTypeID];
+ bool levelUp = talentSkill.level < config.SkillLV;
talentSkill.level = config.SkillLV;
if (talentSkillUpdate != null)
{
talentSkillUpdate(config.SkillTypeID);
+ }
+ if (levelUp && serverInited)
+ {
+ if (talentSkillLevelUp != null)
+ {
+ talentSkillLevelUp(config.SkillTypeID);
+ }
}
}
}
@@ -406,14 +415,7 @@
public TalentConfig GetTalentConfig(int level = 0)
{
- if (level > 0)
- {
- return Config.Instance.Get<TalentConfig>(skillId + level - 1);
- }
- else
- {
- return Config.Instance.Get<TalentConfig>(skillId + level);
- }
+ return Config.Instance.Get<TalentConfig>(skillId);
}
}
--
Gitblit v1.8.0