From 62667e194448b52fcc3c3b710852d9b178ceb3e9 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期一, 10 十二月 2018 21:23:26 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/Skill/TalentModel.cs | 31 +++++++++++++++++++++++++++----
1 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/System/Skill/TalentModel.cs b/System/Skill/TalentModel.cs
index b1fe2a0..bfffacd 100644
--- a/System/Skill/TalentModel.cs
+++ b/System/Skill/TalentModel.cs
@@ -281,13 +281,25 @@
}
if (skillConfig.LearnSkillReq != 0)
{
- TalentSkill learnTalent;
- if (TryGetTalent(skillConfig.LearnSkillReq, out learnTalent))
+ var reqSkillConfig = Config.Instance.Get<SkillConfig>(skillConfig.LearnSkillReq);
+ if (reqSkillConfig.FuncType == 1)
{
- if (learnTalent.level < skillConfig.LearnSkillLV)
+ if (PlayerDatas.Instance.skill.GetSKillById(skillConfig.LearnSkillReq) == null)
{
- error = 4;
+ error = 6;
return false;
+ }
+ }
+ else
+ {
+ TalentSkill learnTalent;
+ if (TryGetTalent(skillConfig.LearnSkillReq, out learnTalent))
+ {
+ if (learnTalent.level < skillConfig.LearnSkillLV)
+ {
+ error = 4;
+ return false;
+ }
}
}
}
@@ -324,6 +336,17 @@
case 5:
SysNotifyMgr.Instance.ShowTip("TalentRequirePropertyLimit");
break;
+ case 6:
+ TalentSkill talent;
+ if (TryGetTalent(talentId, out talent))
+ {
+ var skillConfig = talent.GetSkillConfig();
+ var treasureModel = ModelCenter.Instance.GetModel<TreasureModel>();
+ var treasureId = treasureModel.GetTreasureBySkillId(skillConfig.LearnSkillReq);
+ var treasureConfig = Config.Instance.Get<TreasureConfig>(treasureId);
+ SysNotifyMgr.Instance.ShowTip("PreTreasureSkillLimit", treasureConfig.Name);
+ }
+ break;
}
}
--
Gitblit v1.8.0