From 4c33e9382b5ffa2611a8598bb5836db8eaf93538 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 26 九月 2018 15:38:06 +0800
Subject: [PATCH] 3687 天赋功能
---
System/Skill/TalentModel.cs | 45 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 34 insertions(+), 11 deletions(-)
diff --git a/System/Skill/TalentModel.cs b/System/Skill/TalentModel.cs
index 1d08b68..bc2e15e 100644
--- a/System/Skill/TalentModel.cs
+++ b/System/Skill/TalentModel.cs
@@ -17,10 +17,10 @@
get { return m_SelectSeries; }
set
{
- if (m_SelectSeries != value && OnSelectSeriesEvent != null)
+ if (m_SelectSeries != value && selectSeriesEvent != null)
{
m_SelectSeries = value;
- OnSelectSeriesEvent();
+ selectSeriesEvent();
}
m_SelectSeries = value;
}
@@ -31,10 +31,10 @@
get { return m_SelectTalentType; }
set
{
- if (m_SelectTalentType != value && OnSelectTalentTypeEvnet != null)
+ if (m_SelectTalentType != value && selectTalentTypeEvnet != null)
{
m_SelectTalentType = value;
- OnSelectTalentTypeEvnet();
+ selectTalentTypeEvnet();
}
m_SelectTalentType = value;
}
@@ -45,18 +45,18 @@
get { return m_SelectSkill; }
set
{
- if (m_SelectSkill != value && OnSelectSkillEvent != null)
+ if (m_SelectSkill != value && selectSkillEvent != null)
{
m_SelectSkill = value;
- OnSelectSkillEvent();
+ selectSkillEvent();
}
m_SelectSkill = value;
}
}
- public event Action OnSelectTalentTypeEvnet;
- public event Action OnSelectSeriesEvent;
- public event Action OnSelectSkillEvent;
+ public event Action selectTalentTypeEvnet;
+ public event Action selectSeriesEvent;
+ public event Action selectSkillEvent;
public event Action talentPointUpdate;
public event Action<int> talentSkillUpdate;
@@ -181,9 +181,11 @@
}
var talentConfig = talent.GetTalentConfig(talent.level + 1);
var skillConfig = talent.GetSkillConfig(talent.level + 1);
- if (skillConfig.LearnSkillPointReq != 0)
+ var requireSeriesPoint = skillConfig.RequireSeriesPoint();
+ if (requireSeriesPoint != 0)
{
- if (GetSeriesPoint(talentConfig.type, 1) < skillConfig.LearnSkillPointReq)
+ var requireSeries = skillConfig.RequireSeries();
+ if (GetSeriesPoint(talentConfig.type, requireSeries) < requireSeriesPoint)
{
error = 4;
return false;
@@ -337,5 +339,26 @@
return false;
}
}
+
+ public static class TalentHelper
+ {
+ public static int RequireSeries(this SkillConfig config)
+ {
+ if (config == null)
+ {
+ return 0;
+ }
+ return config.LearnSkillPointReq / 10000;
+ }
+
+ public static int RequireSeriesPoint(this SkillConfig config)
+ {
+ if (config == null)
+ {
+ return 0;
+ }
+ return config.LearnSkillPointReq % 10000;
+ }
+ }
}
--
Gitblit v1.8.0